agent-messenger 2.27.0 → 2.27.2

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

@@ -107,11 +107,40 @@ function createMockClient(overrides: Record<string, any> = {}) {
   } as any
 }
 
+// start() now resolves only once the gateway emits READY, so the handshake must be
+// driven concurrently while start() is pending. This waits for connect() to create the
+// socket (after the awaited gatewayConnect microtask) before the caller drives it.
+async function waitForSocket(): Promise<MockWs> {
+  for (let i = 0; i < 50 && !mockWsInstance; i++) {
+    await Promise.resolve()
+  }
+  return mockWsInstance
+}
+
+async function startAndReady(listener: DiscordBotListener): Promise<void> {
+  const started = listener.start()
+  const ws = await waitForSocket()
+  ws.simulateOpen()
+  ws.simulateHello()
+  ws.simulateReady()
+  await started
+}
+
+// For tests that exercise pre-READY behavior (Identify/heartbeat/close paths): start() stays
+// pending here. The start promise's rejection is swallowed; afterEach stop() clears its timer.
+async function startConnecting(listener: DiscordBotListener): Promise<MockWs> {
+  listener.start().catch(() => {})
+  const ws = await waitForSocket()
+  ws.simulateOpen()
+  return ws
+}
+
 describe('DiscordBotListener', () => {
   let listener: DiscordBotListener
 
   afterEach(() => {
     listener?.stop()
+    mockWsInstance = undefined as unknown as MockWs
   })
 
   describe('start', () => {
@@ -119,21 +148,75 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
+      await startAndReady(listener)
 
       expect(client.gatewayConnect).toHaveBeenCalledTimes(1)
     })
 
+    it('does not resolve until a READY dispatch is delivered', async () => {
+      const client = createMockClient()
+      listener = new DiscordBotListener(client)
+
+      let resolved = false
+      const started = listener.start().then(() => {
+        resolved = true
+      })
+
+      const ws = await waitForSocket()
+      ws.simulateOpen()
+      ws.simulateHello()
+
+      // given: socket open + Hello (Identify sent) but no READY yet
+      await Promise.resolve()
+      expect(resolved).toBe(false)
+
+      // when: READY arrives
+      ws.simulateReady()
+      await started
+
+      expect(resolved).toBe(true)
+    })
+
     it('is idempotent', async () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
+      await startAndReady(listener)
       await listener.start()
 
       expect(client.gatewayConnect).toHaveBeenCalledTimes(1)
     })
+
+    it('shares one readiness promise across concurrent start() calls', async () => {
+      const client = createMockClient()
+      listener = new DiscordBotListener(client)
+
+      const first = listener.start()
+      const second = listener.start()
+
+      const ws = await waitForSocket()
+      ws.simulateOpen()
+      ws.simulateHello()
+      ws.simulateReady()
+
+      await Promise.all([first, second])
+      expect(client.gatewayConnect).toHaveBeenCalledTimes(1)
+    })
+
+    it('rejects an in-flight start() when stop() is called before READY', async () => {
+      const client = createMockClient()
+      listener = new DiscordBotListener(client)
+
+      const started = listener.start()
+      const ws = await waitForSocket()
+      ws.simulateOpen()
+      ws.simulateHello()
+
+      // given: start() is still awaiting READY when the consumer stops the listener
+      listener.stop()
+
+      await expect(started).rejects.toThrow(/stopped before becoming ready/)
+    })
   })
 
   describe('connected event', () => {
@@ -144,10 +227,7 @@ describe('DiscordBotListener', () => {
       const connected: any[] = []
       listener.on('connected', (info) => connected.push(info))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       expect(connected.length).toBe(1)
       expect(connected[0].user.id).toBe('BOT_SELF')
@@ -160,9 +240,8 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
+      const ws = await startConnecting(listener)
+      ws.simulateHello()
 
       const sentMessages = mockWsInstance.sent.map((s) => JSON.parse(s))
       const identifyMsg = sentMessages.find((m) => m.op === 2)
@@ -176,9 +255,8 @@ describe('DiscordBotListener', () => {
       const customIntents = (1 << 9) | (1 << 15) // GuildMessages | MessageContent
       listener = new DiscordBotListener(client, { intents: customIntents })
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
+      const ws = await startConnecting(listener)
+      ws.simulateHello()
 
       const sentMessages = mockWsInstance.sent.map((s) => JSON.parse(s))
       const identifyMsg = sentMessages.find((m) => m.op === 2)
@@ -191,9 +269,8 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
+      const ws = await startConnecting(listener)
+      ws.simulateHello()
 
       const sentMessages = mockWsInstance.sent.map((s) => JSON.parse(s))
       const identifyMsg = sentMessages.find((m) => m.op === 2)
@@ -214,10 +291,7 @@ describe('DiscordBotListener', () => {
       const messages: DiscordGatewayMessageCreateEvent[] = []
       listener.on('message_create', (event) => messages.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch(
         'MESSAGE_CREATE',
         {
@@ -242,10 +316,7 @@ describe('DiscordBotListener', () => {
       const messages: DiscordGatewayMessageCreateEvent[] = []
       listener.on('message_create', (event) => messages.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch(
         'MESSAGE_CREATE',
         {
@@ -283,10 +354,7 @@ describe('DiscordBotListener', () => {
       const updates: DiscordGatewayMessageUpdateEvent[] = []
       listener.on('message_update', (event) => updates.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch(
         'MESSAGE_UPDATE',
         { id: 'msg_1', channel_id: 'C123', content: 'edited', edited_timestamp: '2024-01-01T00:01:00Z' },
@@ -305,10 +373,7 @@ describe('DiscordBotListener', () => {
       const deletes: DiscordGatewayMessageDeleteEvent[] = []
       listener.on('message_delete', (event) => deletes.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch('MESSAGE_DELETE', { id: 'msg_1', channel_id: 'C123' }, 2)
 
       expect(deletes.length).toBe(1)
@@ -324,10 +389,7 @@ describe('DiscordBotListener', () => {
       const reactions: DiscordGatewayReactionEvent[] = []
       listener.on('message_reaction_add', (event) => reactions.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch(
         'MESSAGE_REACTION_ADD',
         {
@@ -353,10 +415,7 @@ describe('DiscordBotListener', () => {
       const interactions: any[] = []
       listener.on('interaction_create', (event) => interactions.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch(
         'INTERACTION_CREATE',
         {
@@ -383,10 +442,7 @@ describe('DiscordBotListener', () => {
       const events: DiscordGatewayGenericEvent[] = []
       listener.on('discord_event', (event) => events.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch(
         'MESSAGE_CREATE',
         { id: 'm1', channel_id: 'C1', content: 'hi', timestamp: 't', author: { id: 'U1', username: 'u' } },
@@ -409,9 +465,8 @@ describe('DiscordBotListener', () => {
         const client = createMockClient()
         listener = new DiscordBotListener(client)
 
-        await listener.start()
-        mockWsInstance.simulateOpen()
-        mockWsInstance.simulateHello(50)
+        const ws = await startConnecting(listener)
+        ws.simulateHello(50)
 
         await new Promise((r) => setTimeout(r, 150))
 
@@ -431,10 +486,7 @@ describe('DiscordBotListener', () => {
       const events: DiscordGatewayGenericEvent[] = []
       listener.on('discord_event', (event) => events.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateHeartbeatACK()
 
       expect(events.length).toBe(0)
@@ -451,9 +503,8 @@ describe('DiscordBotListener', () => {
         const disconnected: boolean[] = []
         listener.on('disconnected', () => disconnected.push(true))
 
-        await listener.start()
-        mockWsInstance.simulateOpen()
-        mockWsInstance.simulateHello(50)
+        const ws = await startConnecting(listener)
+        ws.simulateHello(50)
 
         await new Promise((r) => setTimeout(r, 300))
 
@@ -469,8 +520,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
+      await startConnecting(listener)
 
       listener.stop()
 
@@ -487,9 +537,8 @@ describe('DiscordBotListener', () => {
       const disconnected: boolean[] = []
       listener.on('disconnected', () => disconnected.push(true))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateClose()
+      const ws = await startConnecting(listener)
+      ws.simulateClose()
 
       expect(disconnected.length).toBe(1)
 
@@ -497,28 +546,20 @@ describe('DiscordBotListener', () => {
       expect(client.gatewayConnect.mock.calls.length).toBeGreaterThanOrEqual(2)
     })
 
-    it('emits error and reconnects on gatewayConnect failure', async () => {
-      let callCount = 0
+    it('rejects start() and stops on gatewayConnect failure during initial connect', async () => {
       const client = createMockClient({
-        gatewayConnect: mock(() => {
-          callCount++
-          if (callCount === 1) return Promise.reject(new Error('network_error'))
-          return Promise.resolve({ token: 'fake-bot-token' })
-        }),
+        gatewayConnect: mock(() => Promise.reject(new Error('network_error'))),
       })
 
       listener = new DiscordBotListener(client)
+      listener.on('error', () => {})
 
-      const errors: Error[] = []
-      listener.on('error', (err) => errors.push(err))
-
-      await listener.start()
+      await expect(listener.start()).rejects.toThrow('network_error')
 
+      // given: a pre-READY connect error tears down the listener (no resurrected reconnect loop)
       await new Promise((r) => setTimeout(r, 1500))
-
-      expect(errors.length).toBe(1)
-      expect(errors[0].message).toBe('network_error')
-      expect(client.gatewayConnect.mock.calls.length).toBeGreaterThanOrEqual(2)
+      expect((listener as any).running).toBe(false)
+      expect(client.gatewayConnect).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -531,10 +572,7 @@ describe('DiscordBotListener', () => {
       const handler = (event: DiscordGatewayMessageCreateEvent) => messages.push(event)
       listener.on('message_create', handler)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch(
         'MESSAGE_CREATE',
         { id: 'm1', channel_id: 'C1', content: 'a', timestamp: 't', author: { id: 'U1', username: 'u' } },
@@ -559,10 +597,7 @@ describe('DiscordBotListener', () => {
       const messages: DiscordGatewayMessageCreateEvent[] = []
       listener.once('message_create', (event) => messages.push(event))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
       mockWsInstance.simulateDispatch(
         'MESSAGE_CREATE',
         { id: 'm1', channel_id: 'C1', content: 'first', timestamp: 't', author: { id: 'U1', username: 'u' } },
@@ -584,10 +619,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       ;(listener as any).reconnectAttempts = 5
       mockWsInstance.simulateReconnect()
@@ -601,10 +633,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       expect((listener as any).sessionId).toBe('session_123')
 
@@ -619,10 +648,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       const sessionIdBefore = (listener as any).sessionId
 
@@ -637,10 +663,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       mockWsInstance.simulateClose()
 
@@ -658,39 +681,38 @@ describe('DiscordBotListener', () => {
   })
 
   describe('non-recoverable close codes', () => {
-    it('emits error and stops on code 4014 (privileged intent not approved)', async () => {
-      const client = createMockClient()
-      listener = new DiscordBotListener(client)
-
-      const errors: Error[] = []
-      listener.on('error', (err) => errors.push(err))
-
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateClose(4014)
+    for (const code of [4004, 4013, 4014]) {
+      it(`rejects start() and stops on non-recoverable close ${code}`, async () => {
+        const client = createMockClient()
+        listener = new DiscordBotListener(client)
+        listener.on('error', () => {})
 
-      await new Promise((r) => setTimeout(r, 50))
+        const started = listener.start()
+        const ws = await waitForSocket()
+        ws.simulateOpen()
+        ws.simulateClose(code)
 
-      expect(errors.length).toBe(1)
-      expect(errors[0].message).toContain('4014')
-      expect(client.gatewayConnect).toHaveBeenCalledTimes(1)
-    })
+        await expect(started).rejects.toThrow(String(code))
+        expect((listener as any).running).toBe(false)
+        expect(client.gatewayConnect).toHaveBeenCalledTimes(1)
+      })
+    }
+  })
 
-    it('emits error and stops on code 4004 (invalid token)', async () => {
+  describe('connect timeout', () => {
+    it('rejects start() and tears down when READY never arrives', async () => {
       const client = createMockClient()
-      listener = new DiscordBotListener(client)
-
-      const errors: Error[] = []
-      listener.on('error', (err) => errors.push(err))
-
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateClose(4004)
+      listener = new DiscordBotListener(client, { connectTimeoutMs: 100 })
+      listener.on('error', () => {})
 
-      await new Promise((r) => setTimeout(r, 50))
+      const started = listener.start()
+      const ws = await waitForSocket()
+      ws.simulateOpen()
+      ws.simulateHello()
+      // given: Identify sent but the gateway never delivers READY
 
-      expect(errors.length).toBe(1)
-      expect(errors[0].message).toContain('4004')
+      await expect(started).rejects.toThrow(/did not become ready/)
+      expect((listener as any).running).toBe(false)
     })
   })
 
@@ -699,10 +721,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       expect((listener as any).sessionId).toBe('session_123')
 
@@ -729,10 +748,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       mockWsInstance.simulateClose(4009)
 
@@ -749,10 +765,12 @@ describe('DiscordBotListener', () => {
         const client = createMockClient()
         listener = new DiscordBotListener(client)
 
-        await listener.start()
-        mockWsInstance.simulateOpen()
-        mockWsInstance.simulateHello(50)
-        mockWsInstance.simulateReady()
+        const started = listener.start()
+        const ws = await waitForSocket()
+        ws.simulateOpen()
+        ws.simulateHello(50)
+        ws.simulateReady()
+        await started
 
         mockWsInstance.simulateHello(50)
 
@@ -777,10 +795,7 @@ describe('DiscordBotListener', () => {
         const client = createMockClient()
         listener = new DiscordBotListener(client)
 
-        await listener.start()
-        mockWsInstance.simulateOpen()
-        mockWsInstance.simulateHello()
-        mockWsInstance.simulateReady()
+        await startAndReady(listener)
 
         mockWsInstance.simulateInvalidSession(true)
 
@@ -798,10 +813,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       const sentBefore = mockWsInstance.sent.length
       mockWsInstance.simulateMessage({ op: 1 })
@@ -818,10 +830,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       mockWsInstance.simulateDispatch(
         'MESSAGE_CREATE',
@@ -836,10 +845,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       mockWsInstance.simulateDispatch(
         'MESSAGE_CREATE',
@@ -863,11 +869,11 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
+      await startConnecting(listener)
       ;(listener as any).reconnectAttempts = 5
       listener.stop()
 
-      await listener.start()
+      await startConnecting(listener)
       expect((listener as any).reconnectAttempts).toBe(0)
     })
   })
@@ -877,10 +883,11 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateMessage({
+      const started = listener.start()
+      const ws = await waitForSocket()
+      ws.simulateOpen()
+      ws.simulateHello()
+      ws.simulateMessage({
         op: 0,
         t: 'READY',
         s: 1,
@@ -890,6 +897,7 @@ describe('DiscordBotListener', () => {
           user: { id: 'BOT', username: 'bot' },
         },
       })
+      await started
 
       mockWsInstance.simulateClose()
       await new Promise((r) => setTimeout(r, 1500))
@@ -901,7 +909,8 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
+      listener.start().catch(() => {})
+      await waitForSocket()
 
       expect(MockWs.lastUrl).toBe('wss://gateway.discord.gg/?v=10&encoding=json')
     })
@@ -912,10 +921,11 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
+      listener.start().catch(() => {})
+      const ws = await waitForSocket()
       ;(listener as any).reconnectAttempts = 5
 
-      mockWsInstance.simulateOpen()
+      ws.simulateOpen()
 
       // given: a socket opens but no READY received yet
       // then: reconnectAttempts must NOT be reset (open alone is not a successful session)
@@ -926,12 +936,14 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
+      const started = listener.start()
+      const ws = await waitForSocket()
       ;(listener as any).reconnectAttempts = 5
 
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      ws.simulateOpen()
+      ws.simulateHello()
+      ws.simulateReady()
+      await started
 
       expect((listener as any).reconnectAttempts).toBe(0)
     })
@@ -940,10 +952,7 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       mockWsInstance.simulateClose()
       await new Promise((r) => setTimeout(r, 1500))
@@ -966,10 +975,7 @@ describe('DiscordBotListener', () => {
       const connectedEvents: any[] = []
       listener.on('connected', (info) => connectedEvents.push(info))
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       expect(connectedEvents.length).toBe(1)
 
@@ -991,15 +997,13 @@ describe('DiscordBotListener', () => {
       const client = createMockClient()
       listener = new DiscordBotListener(client)
 
-      await listener.start()
-      mockWsInstance.simulateOpen()
-      mockWsInstance.simulateHello()
-      mockWsInstance.simulateReady()
+      await startAndReady(listener)
 
       const oldWs = mockWsInstance
 
       listener.stop()
-      await listener.start()
+      mockWsInstance = undefined as unknown as MockWs
+      await startConnecting(listener)
 
       // given: a fresh socket from the second start()
       // when: the OLD socket fires a stale close event
@@ -1018,10 +1022,7 @@ describe('DiscordBotListener', () => {
         const client = createMockClient()
         listener = new DiscordBotListener(client)
 
-        await listener.start()
-        mockWsInstance.simulateOpen()
-        mockWsInstance.simulateHello()
-        mockWsInstance.simulateReady()
+        await startAndReady(listener)
 
         const initialGeneration = (listener as any).generation
 
@@ -1029,7 +1030,8 @@ describe('DiscordBotListener', () => {
 
         // when: stop()+start() before the d=true delay fires
         listener.stop()
-        await listener.start()
+        mockWsInstance = undefined as unknown as MockWs
+        await startConnecting(listener)
 
         await new Promise((r) => setTimeout(r, 1500))