Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: prevent 'undefined' debug message on intentional shard closure #9846

Merged
merged 4 commits into from
Oct 21, 2023
Merged

fix: prevent 'undefined' debug message on intentional shard closure #9846

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87fced4
style: prevent 'undefined' debug message on intentional shard closure
Renegade334 Sep 21, 2023
425bfb5
refactor(WebSocketManager#destroy): improve debug messaging
Renegade334 Sep 28, 2023
5b16d57
style: unresumable debug messaging
Renegade334 Oct 20, 2023
49f06d0
Merge branch 'main' into issue-9594
almeidx Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/discord.js/src/client/websocket/WebSocketManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ class WebSocketManager extends EventEmitter {
* @param {number} id The shard id that disconnected
*/
this.client.emit(Events.ShardDisconnect, { code, reason: reasonIsDeprecated, wasClean: true }, shardId);
this.debug(GatewayCloseCodes[code], shardId);
this.debug(`Shard not resumable: ${code} (${GatewayCloseCodes[code] ?? CloseCodes[code]})`, shardId);
return;
}

Expand Down Expand Up @@ -324,9 +324,9 @@ class WebSocketManager extends EventEmitter {
async destroy() {
if (this.destroyed) return;
// TODO: Make a util for getting a stack
this.debug(`Manager was destroyed. Called by:\n${new Error().stack}`);
this.debug(Object.assign(new Error(), { name: 'Manager was destroyed:' }).stack);
this.destroyed = true;
await this._ws?.destroy({ code: CloseCodes.Normal });
await this._ws?.destroy({ code: CloseCodes.Normal, reason: 'Manager was destroyed' });
}

/**
Expand Down