From 69099e04fcda64cb6b76662b5e664ae799dc9be9 Mon Sep 17 00:00:00 2001 From: ayntee Date: Sat, 26 Dec 2020 20:23:57 +0400 Subject: [PATCH] Better debug type --- src/types/options.ts | 16 ++++++++-------- src/ws/shard.ts | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/types/options.ts b/src/types/options.ts index e4b743517..028ba77ef 100644 --- a/src/types/options.ts +++ b/src/types/options.ts @@ -48,7 +48,7 @@ export interface OldMessage { export interface DebugArg { /** Red is for errors or urgent issues. Yellow is for warnings/alerts. Green is for actions being taken. Blue is for */ type?: - | "identifying" + | "gatewayIdentify" | "error" | "requestManager" | "globallyRateLimited" @@ -56,13 +56,13 @@ export interface DebugArg { | "requestManagerFetching" | "requestManagerFetched" | "requestMembersProcessing" - | "heartbeat" - | "heartbeatStopped" - | "createShard" - | "invalidSession" - | "reconnect" - | "resuming" - | "resumed" + | "gatewayHeartbeat" + | "gatewayHeartbeatStopped" + | "shardCreate" + | "gatewayInvalidSession" + | "gatewayReconnect" + | "gatewayResume" + | "gatewayResumed" | "wsClose" | "wsError" | "wsReconnect" diff --git a/src/ws/shard.ts b/src/ws/shard.ts index 1b7d2058f..1125106ee 100644 --- a/src/ws/shard.ts +++ b/src/ws/shard.ts @@ -103,14 +103,14 @@ export async function createShard( break; case GatewayOpcode.Reconnect: eventHandlers.debug?.( - { type: "reconnect", data: { shardID: basicShard.id } }, + { type: "gatewayReconnect", data: { shardID: basicShard.id } }, ); basicShard.needToResume = true; resumeConnection(data, identifyPayload, basicShard.id); break; case GatewayOpcode.InvalidSession: eventHandlers.debug?.( - { type: "invalidSession", data: { shardID: basicShard.id, data } }, + { type: "gatewayInvalidSession", data: { shardID: basicShard.id, data } }, ); // When d is false we need to reidentify if (!data.d) { @@ -123,7 +123,7 @@ export async function createShard( default: if (data.t === "RESUMED") { eventHandlers.debug?.( - { type: "resumed", data: { shardID: basicShard.id } }, + { type: "gatewayResumed", data: { shardID: basicShard.id } }, ); basicShard.needToResume = false; @@ -207,7 +207,7 @@ export async function createShard( function identify(shard: BasicShard, payload: IdentifyPayload) { eventHandlers.debug?.( { - type: "identifying", + type: "gatewayIdentify", data: { shardID: shard.id, }, @@ -255,7 +255,7 @@ async function heartbeat( if (!receivedACK) { eventHandlers.debug?.( { - type: "heartbeatStopped", + type: "gatewayHeartbeatStopped", data: { interval, previousSequenceNumber: shard.previousSequenceNumber, @@ -277,7 +277,7 @@ async function heartbeat( ); eventHandlers.debug?.( { - type: "heartbeat", + type: "gatewayHeartbeat", data: { interval, previousSequenceNumber: shard.previousSequenceNumber, @@ -304,7 +304,7 @@ async function resumeConnection( if (!shard.needToResume) return; - eventHandlers.debug?.({ type: "resuming", data: { shardID: shard.id } }); + eventHandlers.debug?.({ type: "gatewayResume", data: { shardID: shard.id } }); // Run it once createShard(data, payload, true, shard.id); // Then retry every 15 seconds