daenamnu/discordeno
1
0
Fork 0
mirror of https://github.com/discordeno/discordeno.git synced 2026-06-03 09:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(gateway): close not resolving in some cases (#4046)

Browse Source 
* Fix close not resolving in some cases

* update some logging in close()
This commit is contained in:
Fleny
2024-12-10 06:31:51 +01:00
committed by GitHub
parent 82ebf5a4cc
commit 618d8dd108
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/gateway/src/Shard.ts
View File

@@ -128,15 +128,27 @@ export class DiscordenoShard {
/** Close the socket connection to discord if present. */
async close(code: number, reason: string): Promise<void> {
if (this.socket?.readyState !== NodeWebSocket.OPEN) return
this.logger.debug(`[Shard] Request for Shard #${this.id} to close the socket.`)
this.socket?.close(code, reason)
if (this.socket?.readyState !== NodeWebSocket.OPEN) {
this.logger.debug(`[Shard] Shard #${this.id}'s ready state is ${this.socket?.readyState}, Unable to close.`)
return
}
// We need to wait for the socket to be fully closed, otherwise there'll be race condition issues if we try to connect again, resulting in unexpected behavior.
await new Promise((resolve) => {
// This has to be created before the actual call to socket.close as for example Bun calls socket.onclose immediately on the .close() call instead of waiting for the connection to end
const promise = new Promise((resolve) => {
this.resolveAfterClose = resolve
})
this.socket.close(code, reason)
this.logger.debug(`[Shard] Waiting for Shard #${this.id} to close the socket.`)
// We need to wait for the socket to be fully closed, otherwise there'll be race condition issues if we try to connect again, resulting in unexpected behavior.
await promise
this.logger.debug(`[Shard] Shard #${this.id} closed the socket.`)
// Reset the resolveAfterClose function after it has been resolved.
this.resolveAfterClose = undefined
}
@@ -583,6 +595,7 @@ export class DiscordenoShard {
break
}
case GatewayOpcodes.Reconnect: {
this.logger.debug(`[Shard] Received a Reconnect for Shard #${this.id}`)
this.events.requestedReconnect?.(this)
await this.resume()