diff --git a/module/shard.ts b/module/shard.ts index aaf792cb5..070f4207d 100644 --- a/module/shard.ts +++ b/module/shard.ts @@ -16,6 +16,27 @@ import { sendConstantHeartbeats, previousSequenceNumber } from "./gateway.ts"; /** The session id is needed for RESUME functionality when discord disconnects randomly. */ let sessionID = ""; console.log("shard made"); + +async function resumeConnection( + payload: object, + botGatewayData: DiscordBotGatewayData, + socket: WebSocket, +) { + return setInterval(async () => { + socket = await connectWebSocket(botGatewayData.url); + await socket.send( + JSON.stringify({ + op: GatewayOpcode.Resume, + d: { + ...payload, + session_id: sessionID, + seq: previousSequenceNumber, + }, + }), + ); + }, 1000 * 15); +} + export const createShard = async ( botGatewayData: DiscordBotGatewayData, identifyPayload: object, @@ -84,23 +105,3 @@ onmessage = (message) => { ); } }; - -async function resumeConnection( - payload: object, - botGatewayData: DiscordBotGatewayData, - socket: WebSocket, -) { - return setInterval(async () => { - socket = await connectWebSocket(botGatewayData.url); - await socket.send( - JSON.stringify({ - op: GatewayOpcode.Resume, - d: { - ...payload, - session_id: sessionID, - seq: previousSequenceNumber, - }, - }), - ); - }, 1000 * 15); -} diff --git a/module/shardingManager.ts b/module/shardingManager.ts index 315a2167f..c7bb9e915 100644 --- a/module/shardingManager.ts +++ b/module/shardingManager.ts @@ -58,14 +58,14 @@ import { createMessage } from "../structures/message.ts"; let shardCounter = 0; function createShardWorker() { - console.log("shard creating url", import.meta.url); + // console.log("shard creating url", import.meta.url); const path = new URL("./shard.ts", import.meta.url).toString(); - console.log("shard creating path", path); + // console.log("shard creating path", path); const shard = new Worker(path, { type: "module", deno: true }); - console.log("shard made on manager"); + // console.log("shard made on manager"); shard.onmessage = (message) => { if (message.data.type === "REQUEST_CLIENT_OPTIONS") { - console.log("sending client options"); + // console.log("sending client options"); identifyPayload.shard = [shardCounter++, botGatewayData.shards]; shard.postMessage( { @@ -75,7 +75,7 @@ function createShardWorker() { }, ); } else if (message.data.type === "HANDLE_DISCORD_PAYLOAD") { - console.log("manager payload"); + // console.log("manager payload"); handleDiscordPayload(JSON.parse(message.data.payload)); } };