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

feat: Add message to send resume event to shard #9626

Merged
merged 7 commits into from
Jun 14, 2023
Merged

feat: Add message to send resume event to shard #9626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3615ae
fix(WebSocketManager): Fix not ready after reconnect
GrapeColor Jun 6, 2023
c328035
fix(WebSocketManager): Move fixes from Ready to Resume
GrapeColor Jun 6, 2023
dbabb62
fix: undo changes
GrapeColor Jun 7, 2023
6e9c02c
feat: Add message to send resume event to shard
GrapeColor Jun 7, 2023
4745438
Merge branch 'main' into fix-not-ready-after-reconnect
GrapeColor Jun 9, 2023
f9350e4
Merge branch 'main' into fix-not-ready-after-reconnect
GrapeColor Jun 9, 2023
736434b
Merge branch 'main' into fix-not-ready-after-reconnect
kodiakhq[bot] Jun 14, 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: 6 additions & 0 deletions packages/discord.js/src/sharding/Shard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,12 @@ class Shard extends EventEmitter {
return;
}

// Shard has resumed
if (message._resume) {
this.ready = true;
return;
}

// Shard is requesting a property fetch
if (message._sFetchProp) {
const resp = { _sFetchProp: message._sFetchProp, _sFetchPropShard: message._sFetchPropShard };
Expand Down
6 changes: 6 additions & 0 deletions packages/discord.js/src/sharding/ShardClientUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ class ShardClientUtil {
client.on(Events.ShardReconnecting, () => {
process.send({ _reconnecting: true });
});
client.on(Events.ShardResume, () => {
process.send({ _resume: true });
});
break;
case 'worker':
this.parentPort = require('node:worker_threads').parentPort;
Expand All @@ -55,6 +58,9 @@ class ShardClientUtil {
client.on(Events.ShardReconnecting, () => {
this.parentPort.postMessage({ _reconnecting: true });
});
client.on(Events.ShardResume, () => {
this.parentPort.postMessage({ _resume: true });
});
break;
}
}
Expand Down