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

fix: resharder bugs from testing gamer

Browse Source
This commit is contained in:
Skillz4Killz
2022-02-21 05:17:08 +00:00
committed by GitHub
parent 7914ef1d11
commit 0afd928650
5 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gateway/resharder.ts
+18 -10
View File
@@ -1,6 +1,6 @@
import { transformGatewayBot } from "../transformers/gatewayBot.ts";
import { GetGatewayBot } from "../types/gateway/getGatewayBot.ts";
import { DiscordReady } from "../types/gateway/ready.ts";
import { Collection } from "../util/collection.ts";
import { createGatewayManager, GatewayManager } from "./gateway_manager.ts";
/** The handler to automatically reshard when necessary. */
@@ -12,15 +12,23 @@ export async function resharder(
const gateway = createGatewayManager({
...oldGateway,
// IGNORE EVENTS FOR NOW
handleDiscordPayload: async function (_, data, shardId) {
if (data.t === "READY") {
const payload = data.d as DiscordReady;
await gateway.resharding.markNewGuildShardId(payload.guilds.map((g) => BigInt(g.id)), shardId);
}
},
});
for (const key of Object.keys(oldGateway)) {
if (key === "handleDiscordPayload") {
gateway.handleDiscordPayload = async function (_, data, shardId) {
if (data.t === "READY") {
const payload = data.d as DiscordReady;
await gateway.resharding.markNewGuildShardId(payload.guilds.map((g) => BigInt(g.id)), shardId);
}
};
continue;
}
// USE ANY CUSTOMIZED HANDLERS FROM OLD GATEWAY
if (typeof key === "function") gateway[key] = oldGateway[key];
}
// Begin resharding
gateway.maxShards = results.shards;
// FOR MANUAL SHARD CONTROL, OVERRIDE THIS SHARD ID!
@@ -31,7 +39,7 @@ export async function resharder(
gateway.sessionStartLimitResetAfter = results.sessionStartLimit.resetAfter;
gateway.maxConcurrency = results.sessionStartLimit.maxConcurrency;
// If more than 100K servers, begin switching to 16x sharding
if (gateway.maxShards && gateway.useOptimalLargeBotSharding) {
if (gateway.maxShards > 60 && gateway.useOptimalLargeBotSharding) {
gateway.debug("[Resharding] Using optimal large bot sharding solution.");
gateway.maxShards = Math.ceil(
gateway.maxShards /
@@ -115,7 +123,7 @@ export async function startReshardingChecks(gateway: GatewayManager) {
headers: {
Authorization: `Bot ${gateway.token}`,
},
}).then((res) => res.json())) as GetGatewayBot;
}).then((res) => res.json()).then((res) => transformGatewayBot(res))) as GetGatewayBot;
const percentage = ((results.shards - gateway.maxShards) / gateway.maxShards) * 100;
// Less than necessary% being used so do nothing