agent-messenger 2.12.1 → 2.12.2

package/src/platforms/kakaotalk/listener.ts

@@ -1,7 +1,6 @@
 import { EventEmitter } from 'events'
 
-import type { KakaoTalkClient } from './client'
-import { LocoSession } from './protocol/session'
+import type { KakaoSessionEvent, KakaoTalkClient } from './client'
 import type { LocoPacket } from './protocol/types'
 import type {
   KakaoTalkListenerEventMap,
@@ -11,9 +10,6 @@ import type {
   KakaoTalkPushReadEvent,
 } from './types'
 
-const RECONNECT_BASE_DELAY = 1_000
-const RECONNECT_MAX_DELAY = 30_000
-
 type EventKey = keyof KakaoTalkListenerEventMap
 
 function longToString(v: unknown): string {
@@ -27,11 +23,9 @@ function longToString(v: unknown): string {
 export class KakaoTalkListener {
   private client: KakaoTalkClient
   private running = false
-  private session: LocoSession | null = null
   private emitter = new EventEmitter()
-  private reconnectTimer: ReturnType<typeof setTimeout> | null = null
-  private reconnectAttempts = 0
-  private userId: string | null = null
+  private unsubscribePush: (() => void) | null = null
+  private unsubscribeSession: (() => void) | null = null
 
   constructor(client: KakaoTalkClient) {
     this.client = client
@@ -40,17 +34,33 @@ export class KakaoTalkListener {
   async start(): Promise<void> {
     if (this.running) return
     this.running = true
-    this.reconnectAttempts = 0
-    await this.connect()
+
+    this.unsubscribePush = this.client.onPush((packet) => this.handlePush(packet))
+    this.unsubscribeSession = this.client.onSessionEvent((event) => this.handleSessionEvent(event))
+
+    const alreadyConnected = this.client.isConnected()
+
+    try {
+      await this.client.acquireSession()
+      if (!this.running) return
+      if (alreadyConnected) {
+        const { userId } = this.client.getCredentials()
+        this.emitter.emit('connected', { userId })
+      }
+    } catch (error) {
+      this.emitter.emit('error', error instanceof Error ? error : new Error(String(error)))
+      this.running = false
+      this.teardown()
+    }
   }
 
   stop(): void {
-    this.running = false
-    this.clearTimers()
-    if (this.session) {
-      this.session.close()
-      this.session = null
+    if (!this.running) {
+      this.teardown()
+      return
     }
+    this.running = false
+    this.teardown()
   }
 
   on<K extends EventKey>(event: K, listener: (...args: KakaoTalkListenerEventMap[K]) => void): this {
@@ -68,41 +78,28 @@ export class KakaoTalkListener {
     return this
   }
 
-  private async connect(): Promise<void> {
-    if (!this.running) return
-
-    try {
-      const { oauthToken, userId, deviceUuid, deviceType } = this.client.getCredentials()
-      if (!this.running) return
-
-      this.userId = userId
-      const session = new LocoSession()
-
-      session.onPush((packet) => this.handlePush(packet))
-      session.onClose(() => {
-        if (this.session !== session) return
-        this.session = null
-        if (this.running) {
-          this.emitter.emit('disconnected')
-          this.scheduleReconnect()
-        }
-      })
-
-      await session.login(oauthToken, userId, deviceUuid, undefined, deviceType)
+  private teardown(): void {
+    this.unsubscribePush?.()
+    this.unsubscribePush = null
+    this.unsubscribeSession?.()
+    this.unsubscribeSession = null
+  }
 
-      if (!this.running) {
-        session.close()
-        return
-      }
+  private handleSessionEvent(event: KakaoSessionEvent): void {
+    if (!this.running) return
 
-      this.reconnectAttempts = 0
-      this.session = session
-      this.emitter.emit('connected', { userId })
-    } catch (error) {
-      this.emitter.emit('error', error instanceof Error ? error : new Error(String(error)))
-      if (this.running) {
-        this.scheduleReconnect()
-      }
+    switch (event.type) {
+      case 'connected':
+        this.emitter.emit('connected', { userId: event.userId })
+        break
+      case 'disconnected':
+        this.emitter.emit('disconnected')
+        break
+      case 'kicked':
+        this.emitter.emit('error', new Error(event.reason))
+        this.running = false
+        this.teardown()
+        break
     }
   }
 
@@ -162,23 +159,6 @@ export class KakaoTalkListener {
         break
       }
 
-      case 'CHANGESVR': {
-        this.reconnectAttempts = 0
-        const prev = this.session
-        this.session = null
-        prev?.close()
-        this.connect()
-        break
-      }
-
-      case 'KICKOUT': {
-        this.emitter.emit('error', new Error('Session kicked — another device logged in'))
-        this.running = false
-        this.session?.close()
-        this.session = null
-        break
-      }
-
       default: {
         const event: KakaoTalkPushGenericEvent = { type: method, ...body }
         this.emitter.emit('kakaotalk_event', event)
@@ -186,18 +166,4 @@ export class KakaoTalkListener {
       }
     }
   }
-
-  private scheduleReconnect(): void {
-    this.clearTimers()
-    const delay = Math.min(RECONNECT_BASE_DELAY * 2 ** this.reconnectAttempts, RECONNECT_MAX_DELAY)
-    this.reconnectAttempts++
-    this.reconnectTimer = setTimeout(() => this.connect(), delay)
-  }
-
-  private clearTimers(): void {
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer)
-      this.reconnectTimer = null
-    }
-  }
 }