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

src: update client options and shards value if fetching shard count (#3787)

Browse Source 
* src: Update client options and shards value if fetching shard count

* src: Fix bug and remove more dead code
This commit is contained in:
Vlad Frangu
2020-02-16 20:41:37 +02:00
committed by GitHub
parent 46ee06b424
commit e4e977f447
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/client/websocket/WebSocketManager.js
View File

@@ -18,7 +18,7 @@ const BeforeReadyWhitelist = [
WSEvents.GUILD_MEMBER_REMOVE, WSEvents.GUILD_MEMBER_REMOVE,
]; ];
const UNRECOVERABLE_CLOSE_CODES = Object.keys(WSCodes).slice(1); const UNRECOVERABLE_CLOSE_CODES = Object.keys(WSCodes).slice(1).map(Number);
const UNRESUMABLE_CLOSE_CODES = [1000, 4006, 4007]; const UNRESUMABLE_CLOSE_CODES = [1000, 4006, 4007];
/** /**
@@ -153,24 +153,17 @@ class WebSocketManager extends EventEmitter {
this.gateway = `${gatewayURL}/`; this.gateway = `${gatewayURL}/`;
const { shards } = this.client.options; let { shards } = this.client.options;
if (shards === 'auto') { if (shards === 'auto') {
this.debug(`Using the recommended shard count provided by Discord: ${recommendedShards}`); this.debug(`Using the recommended shard count provided by Discord: ${recommendedShards}`);
this.totalShards = this.client.options.shardCount = recommendedShards; this.totalShards = this.client.options.shardCount = recommendedShards;
if (!this.client.options.shards.length) { shards = this.client.options.shards = Array.from({ length: recommendedShards }, (_, i) => i);
this.client.options.shards = Array.from({ length: recommendedShards }, (_, i) => i);
}
} }
if (Array.isArray(shards)) { this.totalShards = shards.length;
this.totalShards = shards.length; this.debug(`Spawning shards: ${shards.join(', ')}`);
this.debug(`Spawning shards: ${shards.join(', ')}`); this.shardQueue = new Set(shards.map(id => new WebSocketShard(this, id)));
this.shardQueue = new Set(shards.map(id => new WebSocketShard(this, id)));
} else {
this.debug(`Spawning ${this.totalShards} shards`);
this.shardQueue = new Set(Array.from({ length: this.totalShards }, (_, id) => new WebSocketShard(this, id)));
}
await this._handleSessionLimit(remaining, reset_after); await this._handleSessionLimit(remaining, reset_after);
@@ -340,7 +333,7 @@ class WebSocketManager extends EventEmitter {
this.debug(`Manager was destroyed. Called by:\n${new Error('MANAGER_DESTROYED').stack}`); this.debug(`Manager was destroyed. Called by:\n${new Error('MANAGER_DESTROYED').stack}`);
this.destroyed = true; this.destroyed = true;
this.shardQueue.clear(); this.shardQueue.clear();
for (const shard of this.shards.values()) shard.destroy({ closeCode: 1000, reset: true, emit: false }); for (const shard of this.shards.values()) shard.destroy({ closeCode: 1000, reset: true, emit: false, log: false });
} }
/** /**