SheWhoReignsSupreme/revenge-bundle-next
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(lib/plugins): handle force stopping after timing out properly

Browse source
This commit is contained in:
PalmDevs 2025-05-19 02:22:12 +07:00
parent fa21c4ddc0
commit d56067d1d1
No known key found for this signature in database
GPG key ID: 6FAE8F8677ACA8BA
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/plugins/src/_internal.ts
View file

@ -1,4 +1,4 @@
import { allSettled, sleep } from '@revenge-mod/utils/promises'
import { allSettled, sleepReject } from '@revenge-mod/utils/promises'
import { _uapi } from './apis'
@ -195,7 +195,7 @@ export async function startPlugin(plugin: InternalPlugin) {
}
}
const MaxLifecycleWaitTime = 5000
const MaxWaitTime = 5000
export async function stopPlugin(plugin: InternalPlugin) {
const { manifest, lifecycles } = plugin
@ -211,10 +211,15 @@ export async function stopPlugin(plugin: InternalPlugin) {
// If the plugin is running its lifecycles, we need to wait for it to finish, then we'll stop it
// We want to wait at max 5 seconds for the lifecycles to finish
if (plugin.status & (Status.PreIniting | Status.Initing | Status.Starting))
await Promise.race([Promise.all(promises), sleep(MaxLifecycleWaitTime)]).then(finished => {
// If the lifecycles don't finish in 5 seconds, a reload is probably required to unapply the changes
if (!finished) plugin.flags |= Flag.ReloadRequired
})
await Promise.race([
Promise.all(promises),
sleepReject(MaxWaitTime, 'Plugin lifecycles timed out, force stopping'),
])
.then(finished => {
// If the lifecycles don't finish in 5 seconds, a reload is probably required to unapply the changes
if (!finished) plugin.flags |= Flag.ReloadRequired
})
.catch(e => handlePluginError(e, plugin))
else if (!(plugin.status & (Status.PreInited | Status.Inited | Status.Started)))
throw new Error(`Plugin "${manifest.id}" is not running`)
@ -225,7 +230,11 @@ export async function stopPlugin(plugin: InternalPlugin) {
plugin.status |= Status.Stopping
try {
await lifecycles.stop?.(meta[0] as PluginApi)
if (lifecycles.stop)
await Promise.race([
lifecycles.stop(meta[0] as PluginApi),
sleepReject(MaxWaitTime, 'Plugin stop lifecycle timed out, force stopping'),
])
} catch (e) {
await handlePluginError(e, plugin)
} finally {