liz/discord.js-selfbot-v13
liz/discord.js-selfbot-v13
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(websocketshard): backport zombie connection fix

Browse Source 
#9003 djs
This commit is contained in:
March 7th 2023-01-06 17:37:46 +07:00
parent 9b62eede06
commit 32faedc883
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/client/websocket/WebSocketShard.js
View File

@ -582,14 +582,9 @@ class WebSocketShard extends EventEmitter {
} }
this.wsCloseTimeout = setTimeout(() => { this.wsCloseTimeout = setTimeout(() => {
this.setWsCloseTimeout(-1); this.setWsCloseTimeout(-1);
this.debug(`[WebSocket] Close Emitted: ${this.closeEmitted}`);
// Check if close event was emitted. // Check if close event was emitted.
if (this.closeEmitted) { if (this.closeEmitted) {
this.debug( this.debug(`[WebSocket] close was already emitted, assuming the connection was closed properly.`);
`[WebSocket] was closed. | WS State: ${
CONNECTION_STATE[this.connection?.readyState ?? WebSocket.CLOSED]
} | Close Emitted: ${this.closeEmitted}`,
);
// Setting the variable false to check for zombie connections. // Setting the variable false to check for zombie connections.
this.closeEmitted = false; this.closeEmitted = false;
return; return;
@ -597,13 +592,17 @@ class WebSocketShard extends EventEmitter {
this.debug( this.debug(
// eslint-disable-next-line max-len // eslint-disable-next-line max-len
`[WebSocket] did not close properly, assuming a zombie connection.\nEmitting close and reconnecting again.`, `[WebSocket] Close Emitted: ${this.closeEmitted} | did not close properly, assuming a zombie connection.\nEmitting close and reconnecting again.`,
); );
this.emitClose(); if (this.connection) this._cleanupConnection();
// Setting the variable false to check for zombie connections.
this.closeEmitted = false; this.emitClose({
}, time).unref(); code: 4009,
reason: 'Session time out.',
wasClean: false,
});
}, time);
} }
/** /**
@ -841,14 +840,11 @@ class WebSocketShard extends EventEmitter {
this._emitDestroyed(); this._emitDestroyed();
} }
if (this.connection?.readyState === WebSocket.CLOSING || this.connection?.readyState === WebSocket.CLOSED) {
this.closeEmitted = false;
this.debug( this.debug(
`[WebSocket] Adding a WebSocket close timeout to ensure a correct WS reconnect. `[WebSocket] Adding a WebSocket close timeout to ensure a correct WS reconnect.
Timeout: ${this.manager.client.options.closeTimeout}ms`, Timeout: ${this.manager.client.options.closeTimeout}ms`,
); );
this.setWsCloseTimeout(this.manager.client.options.closeTimeout); this.setWsCloseTimeout(this.manager.client.options.closeTimeout);
}
// Step 2: Null the connection object // Step 2: Null the connection object
this.connection = null; this.connection = null;