Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-04-24 06:56:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SplatNet 3 monitor attempts to update once when stopping after an error

Browse Source
This commit is contained in:
Samuel Elliott 2022-09-21 16:35:14 +01:00
parent f4447e6014
commit 32327a0531
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/discord/titles/nintendo/splatoon3.ts
View File

@ -144,7 +144,7 @@ export default class SplatNet3Monitor extends EmbeddedLoop {
this.friend = null;
this.discord_presence.refreshPresence();
if (result === ErrorResult.STOP) this.disable();
if (result === ErrorResult.STOP) return LoopResult.STOP;
return LoopResult.OK;
}
}

20
src/util/loop.ts
View File

@ -38,6 +38,9 @@ export default abstract class Loop {
await new Promise(rs => setTimeout(this.timeout_resolve = rs, this.update_interval * 1000));
}
}
if (result === LoopResult.STOP) {
return LoopResult.STOP;
}
} finally {
this.is_loop_active--;
this.skip_interval_once = false;
@ -59,10 +62,12 @@ export default abstract class Loop {
const LoopRunOk = Symbol('LoopRunOk');
const LoopRunOkSkipInterval = Symbol('LoopRunOkSkipInterval');
const LoopRunStop = Symbol('LoopRunStopNow');
export enum LoopResult {
OK = LoopRunOk as any,
OK_SKIP_INTERVAL = LoopRunOkSkipInterval as any,
STOP = LoopRunStop as any,
}
export abstract class EmbeddedLoop extends Loop {
@ -88,18 +93,23 @@ export abstract class EmbeddedLoop extends Loop {
const i = this._running;
try {
await this.loop(true);
const result = await this.loop(true);
if (result === LoopResult.STOP) return;
while (i === this._running) {
await this.loop();
}
const result = await this.loop();
if (result === LoopResult.STOP) {
await this.onStop?.();
return;
}
}
if (this._running === 0 && !this.onStop) {
// Run one more time after the loop ends
const result = await this.loopRun();
}
await this.onStop?.();
} finally {
this._running = 0;
}