agent-messenger 2.10.1 → 2.11.0

package/src/platforms/discord/listener.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, mock, test } from 'bun:test'
+import { afterEach, describe, expect, mock, it } from 'bun:test'
 
 import { DiscordListener } from '@/platforms/discord/listener'
 import type {
@@ -16,12 +16,16 @@ let mockWsInstance: MockWs
 class MockWs {
   static OPEN = 1
   static CLOSED = 3
+  static lastUrl: string | null = null
   readyState = MockWs.OPEN
 
   private handlers = new Map<string, WsHandler[]>()
   sent: string[] = []
+  url: string
 
-  constructor(_url: string, _options?: any) {
+  constructor(url: string, _options?: any) {
+    this.url = url
+    MockWs.lastUrl = url
     // oxlint-disable-next-line typescript-eslint/no-this-alias
     mockWsInstance = this
   }
@@ -111,7 +115,7 @@ describe('DiscordListener', () => {
   })
 
   describe('start', () => {
-    test('calls gatewayConnect and opens WebSocket', async () => {
+    it('calls gatewayConnect and opens WebSocket', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -121,7 +125,7 @@ describe('DiscordListener', () => {
       expect(client.gatewayConnect).toHaveBeenCalledTimes(1)
     })
 
-    test('is idempotent', async () => {
+    it('is idempotent', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -133,7 +137,7 @@ describe('DiscordListener', () => {
   })
 
   describe('connected event', () => {
-    test('emits connected with user/sessionId on READY', async () => {
+    it('emits connected with user/sessionId on READY', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -152,7 +156,7 @@ describe('DiscordListener', () => {
   })
 
   describe('identify', () => {
-    test('sends Identify after Hello', async () => {
+    it('sends Identify after Hello', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -167,7 +171,7 @@ describe('DiscordListener', () => {
       expect(identifyMsg.d.token).toBe('fake-token')
     })
 
-    test('sends Identify with custom intents', async () => {
+    it('sends Identify with custom intents', async () => {
       const client = createMockClient()
       const customIntents = 1 << 9
       listener = new DiscordListener(client, { intents: customIntents })
@@ -185,7 +189,7 @@ describe('DiscordListener', () => {
   })
 
   describe('message events', () => {
-    test('emits message_create events', async () => {
+    it('emits message_create events', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -213,7 +217,7 @@ describe('DiscordListener', () => {
       expect(messages[0].channel_id).toBe('C123')
     })
 
-    test('emits message_update events', async () => {
+    it('emits message_update events', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -235,7 +239,7 @@ describe('DiscordListener', () => {
       expect(updates[0].content).toBe('edited')
     })
 
-    test('emits message_delete events', async () => {
+    it('emits message_delete events', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -254,7 +258,7 @@ describe('DiscordListener', () => {
   })
 
   describe('reaction events', () => {
-    test('emits message_reaction_add events', async () => {
+    it('emits message_reaction_add events', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -283,7 +287,7 @@ describe('DiscordListener', () => {
   })
 
   describe('discord_event catch-all', () => {
-    test('emits discord_event for every dispatch (not READY)', async () => {
+    it('emits discord_event for every dispatch (not READY)', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -308,7 +312,7 @@ describe('DiscordListener', () => {
   })
 
   describe('heartbeat', () => {
-    test('sends heartbeat after Hello (with jitter)', async () => {
+    it('sends heartbeat after Hello (with jitter)', async () => {
       const originalRandom = Math.random
       Math.random = () => 0
 
@@ -331,7 +335,7 @@ describe('DiscordListener', () => {
       }
     })
 
-    test('heartbeat ACK not emitted as user event', async () => {
+    it('heartbeat ACK not emitted as user event', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -347,7 +351,7 @@ describe('DiscordListener', () => {
       expect(events.length).toBe(0)
     })
 
-    test('zombie connection triggers reconnect (no ACK received)', async () => {
+    it('zombie connection triggers reconnect (no ACK received)', async () => {
       const originalRandom = Math.random
       Math.random = () => 0
 
@@ -372,7 +376,7 @@ describe('DiscordListener', () => {
   })
 
   describe('stop', () => {
-    test('closes WebSocket and prevents reconnection', async () => {
+    it('closes WebSocket and prevents reconnection', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -387,7 +391,7 @@ describe('DiscordListener', () => {
   })
 
   describe('reconnection', () => {
-    test('reconnects on WebSocket close when running', async () => {
+    it('reconnects on WebSocket close when running', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -404,7 +408,7 @@ describe('DiscordListener', () => {
       expect(client.gatewayConnect.mock.calls.length).toBeGreaterThanOrEqual(2)
     })
 
-    test('emits error and reconnects on gatewayConnect failure', async () => {
+    it('emits error and reconnects on gatewayConnect failure', async () => {
       let callCount = 0
       const client = createMockClient({
         gatewayConnect: mock(() => {
@@ -430,7 +434,7 @@ describe('DiscordListener', () => {
   })
 
   describe('on/off/once', () => {
-    test('off removes listener', async () => {
+    it('off removes listener', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -459,7 +463,7 @@ describe('DiscordListener', () => {
       expect(messages[0].content).toBe('a')
     })
 
-    test('once fires only once', async () => {
+    it('once fires only once', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -487,7 +491,7 @@ describe('DiscordListener', () => {
   })
 
   describe('opcode 7 Reconnect', () => {
-    test('triggers immediate reconnect without backoff', async () => {
+    it('triggers immediate reconnect without backoff', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -504,7 +508,7 @@ describe('DiscordListener', () => {
   })
 
   describe('opcode 9 InvalidSession', () => {
-    test('d=false clears session state, reconnects with fresh identify', async () => {
+    it('d=false clears session state, reconnects with fresh identify', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -522,7 +526,7 @@ describe('DiscordListener', () => {
       expect((listener as any).resumeGatewayUrl).toBeNull()
     })
 
-    test('d=true allows resume on reconnect', async () => {
+    it('d=true allows resume on reconnect', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -540,7 +544,7 @@ describe('DiscordListener', () => {
   })
 
   describe('resume', () => {
-    test('sends Resume instead of Identify when session exists', async () => {
+    it('sends Resume instead of Identify when session exists', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -565,7 +569,7 @@ describe('DiscordListener', () => {
   })
 
   describe('non-recoverable close codes', () => {
-    test('emits error and stops on code 4004', async () => {
+    it('emits error and stops on code 4004', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -585,7 +589,7 @@ describe('DiscordListener', () => {
   })
 
   describe('session reset close codes', () => {
-    test('4007 clears session and reconnects with fresh identify', async () => {
+    it('4007 clears session and reconnects with fresh identify', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -615,7 +619,7 @@ describe('DiscordListener', () => {
       expect(resumeMsg).toBeUndefined()
     })
 
-    test('4009 clears session and reconnects with fresh identify', async () => {
+    it('4009 clears session and reconnects with fresh identify', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -631,7 +635,7 @@ describe('DiscordListener', () => {
   })
 
   describe('duplicate Hello', () => {
-    test('does not stack heartbeat timers on second Hello', async () => {
+    it('does not stack heartbeat timers on second Hello', async () => {
       const originalRandom = Math.random
       Math.random = () => 0
 
@@ -659,7 +663,7 @@ describe('DiscordListener', () => {
   })
 
   describe('InvalidSession timer safety', () => {
-    test('stop cancels pending InvalidSession d=true timeout', async () => {
+    it('stop cancels pending InvalidSession d=true timeout', async () => {
       const originalRandom = Math.random
       Math.random = () => 0
 
@@ -682,7 +686,7 @@ describe('DiscordListener', () => {
       }
     })
 
-    test('InvalidSession d=false sends fresh identify on reconnect', async () => {
+    it('InvalidSession d=false sends fresh identify on reconnect', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -708,7 +712,7 @@ describe('DiscordListener', () => {
   })
 
   describe('server-requested heartbeat', () => {
-    test('responds to opcode 1 with heartbeat', async () => {
+    it('responds to opcode 1 with heartbeat', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -728,7 +732,7 @@ describe('DiscordListener', () => {
   })
 
   describe('sequence tracking', () => {
-    test('tracks sequence from dispatch events', async () => {
+    it('tracks sequence from dispatch events', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -746,7 +750,7 @@ describe('DiscordListener', () => {
       expect((listener as any).sequence).toBe(5)
     })
 
-    test('ignores null sequence values', async () => {
+    it('ignores null sequence values', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -773,7 +777,7 @@ describe('DiscordListener', () => {
   })
 
   describe('start after stop', () => {
-    test('resets reconnect attempts on fresh start', async () => {
+    it('resets reconnect attempts on fresh start', async () => {
       const client = createMockClient()
       listener = new DiscordListener(client)
 
@@ -785,4 +789,58 @@ describe('DiscordListener', () => {
       expect((listener as any).reconnectAttempts).toBe(0)
     })
   })
+
+  describe('reconnect URL', () => {
+    it('appends ?v=10&encoding=json to resume_gateway_url on reconnect', async () => {
+      const client = createMockClient()
+      listener = new DiscordListener(client)
+
+      await listener.start()
+      mockWsInstance.simulateOpen()
+      mockWsInstance.simulateHello()
+      mockWsInstance.simulateMessage({
+        op: 0,
+        t: 'READY',
+        s: 1,
+        d: {
+          session_id: 'session_xyz',
+          resume_gateway_url: 'wss://gateway-us-east1-b.discord.gg',
+          user: { id: 'U_SELF', username: 'user' },
+        },
+      })
+
+      mockWsInstance.simulateClose()
+      await new Promise((r) => setTimeout(r, 1500))
+
+      expect(MockWs.lastUrl).toBe('wss://gateway-us-east1-b.discord.gg?v=10&encoding=json')
+    })
+  })
+
+  describe('reconnectAttempts deferred to READY/RESUMED', () => {
+    it('does not reset reconnectAttempts on socket open alone', async () => {
+      const client = createMockClient()
+      listener = new DiscordListener(client)
+
+      await listener.start()
+      ;(listener as any).reconnectAttempts = 5
+
+      mockWsInstance.simulateOpen()
+
+      expect((listener as any).reconnectAttempts).toBe(5)
+    })
+
+    it('resets reconnectAttempts on READY dispatch', async () => {
+      const client = createMockClient()
+      listener = new DiscordListener(client)
+
+      await listener.start()
+      ;(listener as any).reconnectAttempts = 5
+
+      mockWsInstance.simulateOpen()
+      mockWsInstance.simulateHello()
+      mockWsInstance.simulateReady()
+
+      expect((listener as any).reconnectAttempts).toBe(0)
+    })
+  })
 })

package/src/platforms/discord/listener.ts

@@ -7,6 +7,7 @@ import type { DiscordListenerEventMap, DiscordGatewayGenericEvent } from './type
 import { DiscordGatewayOpcode, DiscordIntent } from './types'
 
 const GATEWAY_URL = 'wss://gateway.discord.gg/?v=10&encoding=json'
+const GATEWAY_QUERY = '?v=10&encoding=json'
 const RECONNECT_BASE_DELAY = 1_000
 const RECONNECT_MAX_DELAY = 30_000
 const NON_RECOVERABLE_CLOSE_CODES = [4004, 4010, 4011, 4012, 4013, 4014]
@@ -40,6 +41,7 @@ export class DiscordListener {
   private resumeGatewayUrl: string | null = null
   private token: string | null = null
   private cachedUser: { id: string; username: string } | null = null
+  private generation = 0
 
   constructor(client: DiscordClient, options?: { intents?: number }) {
     this.client = client
@@ -50,11 +52,13 @@ export class DiscordListener {
     if (this.running) return
     this.running = true
     this.reconnectAttempts = 0
-    await this.connect()
+    this.generation++
+    await this.connect(this.generation)
   }
 
   stop(): void {
     this.running = false
+    this.generation++
     this.clearTimers()
     if (this.ws) {
       this.ws.close()
@@ -82,39 +86,46 @@ export class DiscordListener {
     return this
   }
 
-  private async connect(): Promise<void> {
-    if (!this.running) return
+  private isCurrent(generation: number, ws?: WebSocket): boolean {
+    if (generation !== this.generation || !this.running) return false
+    if (ws !== undefined && this.ws !== ws) return false
+    return true
+  }
+
+  private async connect(generation: number): Promise<void> {
+    if (!this.isCurrent(generation)) return
 
     try {
       const { token } = await this.client.gatewayConnect()
-      if (!this.running) return
+      if (!this.isCurrent(generation)) return
 
       this.token = token
 
-      const url = this.resumeGatewayUrl ?? GATEWAY_URL
+      const url = this.resumeGatewayUrl ? `${this.resumeGatewayUrl}${GATEWAY_QUERY}` : GATEWAY_URL
       const ws = new WebSocket(url)
       this.ws = ws
 
       ws.on('open', () => {
-        if (!this.running) {
+        if (!this.isCurrent(generation, ws)) {
           ws.close()
           return
         }
-        this.reconnectAttempts = 0
       })
 
       ws.on('message', (raw) => {
+        if (!this.isCurrent(generation, ws)) return
         try {
           const data = JSON.parse(raw.toString())
-          this.handleMessage(data)
+          this.handleMessage(data, generation, ws)
         } catch {
-          // malformed message, ignore
+          // malformed gateway frame; ignore and let heartbeat handle liveness
         }
       })
 
       ws.on('close', (code) => {
+        if (!this.isCurrent(generation, ws)) return
         this.clearTimers()
-        if (this.ws === ws) this.ws = null
+        this.ws = null
         if (NON_RECOVERABLE_CLOSE_CODES.includes(code)) {
           this.emitter.emit('error', new Error(`Discord gateway closed with non-recoverable code ${code}`))
           this.running = false
@@ -132,9 +143,11 @@ export class DiscordListener {
       })
 
       ws.on('error', (err) => {
+        if (!this.isCurrent(generation, ws)) return
         this.emitter.emit('error', err instanceof Error ? err : new Error(String(err)))
       })
     } catch (error) {
+      if (!this.isCurrent(generation)) return
       this.emitter.emit('error', error instanceof Error ? error : new Error(String(error)))
       if (this.running) {
         this.scheduleReconnect()
@@ -142,12 +155,13 @@ export class DiscordListener {
     }
   }
 
-  private handleMessage(data: { op: number; d: any; s?: number; t?: string }): void {
+  private handleMessage(data: { op: number; d: any; s?: number; t?: string }, generation: number, ws: WebSocket): void {
+    if (!this.isCurrent(generation, ws)) return
     const { op, d, s, t } = data
 
     switch (op) {
       case DiscordGatewayOpcode.Hello:
-        this.startHeartbeat(d.heartbeat_interval)
+        this.startHeartbeat(d.heartbeat_interval, generation, ws)
         if (this.sessionId) {
           this.sendResume()
         } else {
@@ -166,22 +180,21 @@ export class DiscordListener {
 
       case DiscordGatewayOpcode.Reconnect:
         this.reconnectAttempts = 0
-        this.ws?.close()
+        ws.close()
         break
 
       case DiscordGatewayOpcode.InvalidSession: {
-        const currentWs = this.ws
         if (d === true) {
           const delay = 1000 + Math.random() * 4000
           this.invalidSessionTimer = setTimeout(() => {
             this.invalidSessionTimer = null
-            if (currentWs && currentWs === this.ws) currentWs.close()
+            if (this.isCurrent(generation, ws)) ws.close()
           }, delay)
         } else {
           this.sequence = null
           this.sessionId = null
           this.resumeGatewayUrl = null
-          currentWs?.close()
+          ws.close()
         }
         break
       }
@@ -197,11 +210,13 @@ export class DiscordListener {
       this.sessionId = d.session_id
       this.resumeGatewayUrl = d.resume_gateway_url
       this.cachedUser = d.user
+      this.reconnectAttempts = 0
       this.emitter.emit('connected', { user: d.user, sessionId: d.session_id })
       return
     }
 
     if (t === 'RESUMED') {
+      this.reconnectAttempts = 0
       this.emitter.emit('connected', { user: this.cachedUser!, sessionId: this.sessionId! })
       return
     }
@@ -246,18 +261,23 @@ export class DiscordListener {
     this.ws?.send(JSON.stringify({ op: DiscordGatewayOpcode.Heartbeat, d: this.sequence }))
   }
 
-  private startHeartbeat(interval: number): void {
+  private startHeartbeat(interval: number, generation: number, ws: WebSocket): void {
     this.clearHeartbeatTimers()
     this.heartbeatAckReceived = true
 
     this.heartbeatJitterTimer = setTimeout(() => {
       this.heartbeatJitterTimer = null
+      if (!this.isCurrent(generation, ws)) return
       this.heartbeatAckReceived = false
       this.sendHeartbeat()
 
       this.heartbeatTimer = setInterval(() => {
+        if (!this.isCurrent(generation, ws)) {
+          this.clearHeartbeatTimers()
+          return
+        }
         if (!this.heartbeatAckReceived) {
-          this.ws?.close()
+          ws.close()
           return
         }
         this.heartbeatAckReceived = false
@@ -269,7 +289,11 @@ export class DiscordListener {
   private scheduleReconnect(): void {
     const delay = Math.min(RECONNECT_BASE_DELAY * 2 ** this.reconnectAttempts, RECONNECT_MAX_DELAY)
     this.reconnectAttempts++
-    this.reconnectTimer = setTimeout(() => this.connect(), delay)
+    const generation = this.generation
+    this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = null
+      this.connect(generation)
+    }, delay)
   }
 
   private clearHeartbeatTimers(): void {