agent-messenger 2.19.1 → 2.19.2

package/src/platforms/line/listener.ts

@@ -2,7 +2,6 @@ import { EventEmitter } from 'events'
 
 import type { LineClient } from './client'
 import type { LineListenerEventMap, LinePushGenericEvent, LinePushMessageEvent } from './types'
-import { LineError } from './types'
 
 const RECONNECT_BASE_DELAY = 1_000
 const RECONNECT_MAX_DELAY = 30_000
@@ -61,59 +60,13 @@ export class LineListener {
       await this.lineClient.login()
       if (!this.running) return
 
-      const internalClient = (this.lineClient as any).client
-      if (!internalClient) {
-        throw new LineError('not_connected', 'Failed to get internal LINE client')
-      }
-
+      const profile = await this.lineClient.getProfile()
+      if (!this.running) return
       this.abortController = new AbortController()
-
-      internalClient.on('message', (msg: any) => {
-        try {
-          const toType = msg.raw.toType
-          const isGroupOrRoom = toType === 'GROUP' || toType === 'ROOM' || toType === 0 || toType === 1
-          const chatId = isGroupOrRoom ? msg.to.id : msg.isMyMessage ? msg.to.id : msg.from.id
-
-          const event: LinePushMessageEvent = {
-            type: 'message',
-            chat_id: chatId,
-            message_id: String(msg.raw.id),
-            author_id: msg.from.id,
-            text: msg.text ?? null,
-            content_type: String(msg.raw.contentType ?? 'NONE'),
-            sent_at: new Date(Number(msg.raw.createdTime)).toISOString(),
-          }
-          this.emitter.emit('message', event)
-          this.emitter.emit('line_event', { ...event })
-        } catch (error) {
-          this.emitter.emit('error', error instanceof Error ? error : new Error(String(error)))
-        }
-      })
-
-      internalClient.on('event', (op: any) => {
-        const event: LinePushGenericEvent = {
-          type: String(op.type ?? 'unknown'),
-          ...(op.revision !== undefined && { revision: String(op.revision) }),
-          ...(op.createdTime !== undefined && {
-            created_time: new Date(Number(op.createdTime)).toISOString(),
-          }),
-        }
-        this.emitter.emit('line_event', event)
-      })
-
-      internalClient.listen({ signal: this.abortController.signal })?.catch((error: unknown) => {
-        if (!this.running) return
-        const err = error instanceof Error ? error : new Error(String(error))
-        if (err.name === 'AbortError') return
-        this.emitter.emit('error', err)
-        this.emitter.emit('disconnected')
-        this.scheduleReconnect()
-      })
-
       this.reconnectAttempts = 0
-
-      const profile = await internalClient.base.talk.getProfile()
       this.emitter.emit('connected', { account_id: profile.mid })
+
+      void this.pump(this.abortController.signal)
     } catch (error) {
       this.emitter.emit('error', error instanceof Error ? error : new Error(String(error)))
       if (this.running) {
@@ -122,6 +75,58 @@ export class LineListener {
     }
   }
 
+  private async pump(signal: AbortSignal): Promise<void> {
+    try {
+      for await (const event of this.lineClient.streamEvents(signal)) {
+        if (event.kind === 'message') {
+          this.emitMessage(event.message)
+        } else {
+          this.emitOperation(event.op)
+        }
+      }
+    } catch (error) {
+      if (!this.running || signal.aborted) return
+      const err = error instanceof Error ? error : new Error(String(error))
+      if (err.name === 'AbortError') return
+      this.emitter.emit('error', err)
+      this.emitter.emit('disconnected')
+      this.scheduleReconnect()
+    }
+  }
+
+  private emitMessage(msg: any): void {
+    try {
+      const toType = msg.raw.toType
+      const isGroupOrRoom = toType === 'GROUP' || toType === 'ROOM' || toType === 0 || toType === 1
+      const chatId = isGroupOrRoom ? msg.to.id : msg.isMyMessage ? msg.to.id : msg.from.id
+
+      const event: LinePushMessageEvent = {
+        type: 'message',
+        chat_id: chatId,
+        message_id: String(msg.raw.id),
+        author_id: msg.from.id,
+        text: msg.text ?? null,
+        content_type: String(msg.raw.contentType ?? 'NONE'),
+        sent_at: new Date(Number(msg.raw.createdTime)).toISOString(),
+      }
+      this.emitter.emit('message', event)
+      this.emitter.emit('line_event', { ...event })
+    } catch (error) {
+      this.emitter.emit('error', error instanceof Error ? error : new Error(String(error)))
+    }
+  }
+
+  private emitOperation(op: any): void {
+    const event: LinePushGenericEvent = {
+      type: String(op.type ?? 'unknown'),
+      ...(op.revision !== undefined && { revision: String(op.revision) }),
+      ...(op.createdTime !== undefined && {
+        created_time: new Date(Number(op.createdTime)).toISOString(),
+      }),
+    }
+    this.emitter.emit('line_event', event)
+  }
+
   private scheduleReconnect(): void {
     this.clearTimers()
     const delay = Math.min(RECONNECT_BASE_DELAY * 2 ** this.reconnectAttempts, RECONNECT_MAX_DELAY)