From 70a4a1f9554530a5552afcff45d005c11db18229 Mon Sep 17 00:00:00 2001 From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com> Date: Wed, 14 Apr 2021 18:06:11 +0000 Subject: [PATCH] fix: use private close clode --- src/ws/create_shard.ts | 18 ++++++++++-------- src/ws/resume.ts | 2 +- src/ws/tell_cluster_to_identify.ts | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/ws/create_shard.ts b/src/ws/create_shard.ts index a5c503356..cecbc20a0 100644 --- a/src/ws/create_shard.ts +++ b/src/ws/create_shard.ts @@ -16,14 +16,7 @@ export async function createShard(shardId: number) { socket.onclose = (event) => { ws.log("CLOSED", { shardId, payload: event }); - if ( - event.code === 4009 && - ["Resharded!", "Resuming the shard, closing old shard."].includes( - event.reason, - ) - ) { - return ws.log("CLOSED_RECONNECT", { shardId, payload: event }); - } + if ( event.code === 3064 || event.reason === "Discordeno Testing Finished! Do Not RESUME!" @@ -31,6 +24,15 @@ export async function createShard(shardId: number) { return; } + if ( + event.code === 3065 || + ["Resharded!", "Resuming the shard, closing old shard."].includes( + event.reason, + ) + ) { + return ws.log("CLOSED_RECONNECT", { shardId, payload: event }); + } + // TODO: ENUM FOR THESE CODES? switch (event.code) { case 4001: diff --git a/src/ws/resume.ts b/src/ws/resume.ts index f212c8d0c..4c35ed60e 100644 --- a/src/ws/resume.ts +++ b/src/ws/resume.ts @@ -13,7 +13,7 @@ export async function resume(shardId: number) { if (oldShard) { // HOW TO CLOSE OLD SHARD SOCKET!!! - oldShard.ws.close(4009, "Resuming the shard, closing old shard."); + oldShard.ws.close(3065, "Resuming the shard, closing old shard."); // STOP OLD HEARTBEAT clearInterval(oldShard.heartbeat.intervalId); } diff --git a/src/ws/tell_cluster_to_identify.ts b/src/ws/tell_cluster_to_identify.ts index ec212fcc7..5f3b86fab 100644 --- a/src/ws/tell_cluster_to_identify.ts +++ b/src/ws/tell_cluster_to_identify.ts @@ -11,6 +11,6 @@ export async function tellClusterToIdentify( await ws.identify(shardId, ws.maxShards); if (oldShard) { - oldShard.ws.close(4009, "Resharded!"); + oldShard.ws.close(3065, "Resharded!"); } }