🚑️ fix: url for resuming should be different

harmonyland · May 17, 2024 · 027a8f8 · 027a8f8
1 parent eda5336
commit 027a8f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/gateway/handlers/ready.ts b/src/gateway/handlers/ready.ts
@@ -6,6 +6,7 @@ export const ready: GatewayEventHandler = async (
   gateway: Gateway,
   d: Ready
 ) => {
+  gateway._resumeGatewayURL = d.resume_gateway_url
   gateway._guildsToBeLoaded =
     gateway.client.intents!.includes(GatewayIntents.GUILDS) === true
       ? d.guilds.length

diff --git a/src/gateway/mod.ts b/src/gateway/mod.ts
@@ -70,6 +70,7 @@ export class Gateway extends HarmonyEventEmitter<GatewayTypedEvents> {
   shards?: number[]
   ping: number = 0
 
+  _resumeGatewayURL?: string
   _readyReceived: Promise<void>
   _resolveReadyReceived?: () => void
   _guildsToBeLoaded?: number
@@ -466,17 +467,21 @@ export class Gateway extends HarmonyEventEmitter<GatewayTypedEvents> {
     }
 
     this.closeGateway(RECONNECT_CODE, 'Reconnecting...')
-    this.initWebsocket()
+    this.initWebsocket(!(forceNew ?? false))
   }
 
-  initWebsocket(): void {
+  initWebsocket(resume: boolean = false): void {
     if (this.#destroyCalled) return
+    if (resume && this._resumeGatewayURL === undefined)
+      throw new Error('Resume was requested but no resume URL was found')
 
     this.emit('init')
     this.debug('Initializing WebSocket...')
+    const url = resume ? this._resumeGatewayURL : Constants.DISCORD_GATEWAY_URL
+    this._resumeGatewayURL = undefined
     this.websocket = new WebSocket(
       // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-      `${Constants.DISCORD_GATEWAY_URL}/?v=${Constants.DISCORD_API_VERSION}&encoding=json`,
+      `${url}/?v=${Constants.DISCORD_API_VERSION}&encoding=json`,
       []
     )
     this.websocket.binaryType = 'arraybuffer'