Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-12 01:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(WebSocketShard): handle initial connect being a resume (#9549)

Browse Source 
* fix(WebSocketShard): handle initial connect being a resume

* chore: remove leftover

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
DD
2023-05-11 20:42:10 +03:00
committed by GitHub
parent a51c48e743
commit 4dcc9c50f8
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/ws/src/ws/WebSocketShard.ts
View File

@@ -128,10 +128,26 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
} }
public async connect() { public async connect() {
const promise = this.initialConnectResolved ? Promise.resolve() : once(this, WebSocketShardEvents.Ready); const controller = new AbortController();
let promise;
if (!this.initialConnectResolved) {
// Sleep for the remaining time, but if the connection closes in the meantime, we shouldn't wait the remainder to avoid blocking the new conn
promise = Promise.race([
once(this, WebSocketShardEvents.Ready, { signal: controller.signal }),
once(this, WebSocketShardEvents.Resumed, { signal: controller.signal }),
]);
}
void this.internalConnect(); void this.internalConnect();
await promise; try {
await promise;
} finally {
// cleanup hanging listeners
controller.abort();
}
this.initialConnectResolved = true; this.initialConnectResolved = true;
} }