agent-messenger 2.21.0 → 2.23.0

package/src/platforms/webexbot/listener.ts

@@ -1,255 +1,23 @@
-import { EventEmitter } from 'events'
-
-import { WebexMessageHandler } from 'webex-message-handler'
-import type {
-  AttachmentAction,
-  DecryptedMessage,
-  DeletedMessage,
-  HandlerStatus,
-  InjectedWebSocket,
-  MembershipActivity,
-  RoomActivity,
-  WebexMessageHandlerConfig,
-  WebexMessageHandlerEvents,
-} from 'webex-message-handler'
-import WebSocket from 'ws'
-
-import type { WebexBotClient } from './client'
-import type { WebexBotListenerEventMap } from './types'
-import { createWdmRewriteFetch, discoverWdmDevicesUrl } from './wdm-discovery'
-
-type EventKey = keyof WebexBotListenerEventMap
-type WebexBotClientLike = Pick<WebexBotClient, 'getToken'>
-
-interface WebexMessageHandlerLike {
-  connect(): Promise<void>
-  disconnect(): Promise<void>
-  status(): HandlerStatus
-  get connected(): boolean
-  on<K extends keyof WebexMessageHandlerEvents>(event: K, listener: WebexMessageHandlerEvents[K]): this
-  off<K extends keyof WebexMessageHandlerEvents>(event: K, listener: WebexMessageHandlerEvents[K]): this
-  once<K extends keyof WebexMessageHandlerEvents>(event: K, listener: WebexMessageHandlerEvents[K]): this
-}
-
-export interface WebexBotListenerOptions {
-  ignoreSelfMessages?: boolean
-  pingInterval?: number
-  pongTimeout?: number
-  reconnectBackoffMax?: number
-  maxReconnectAttempts?: number
-  _handlerFactory?: (config: WebexMessageHandlerConfig) => WebexMessageHandlerLike
-}
-
-export class WebexBotListener {
-  private client: WebexBotClientLike
-  private options: WebexBotListenerOptions
-  private running = false
-  private emitter = new EventEmitter()
-  private handler: WebexMessageHandlerLike | null = null
-  private generation = 0
-  private detachHandler: (() => void) | null = null
-  private startPromise: Promise<void> | null = null
-
-  constructor(client: WebexBotClientLike, options: WebexBotListenerOptions = {}) {
-    this.client = client
-    this.options = options
-  }
-
+import { WebexListener } from '../webex/listener'
+import { WebexError } from '../webex/types'
+import { WebexBotError } from './types'
+
+export type {
+  WebexListenerClient as WebexBotListenerClient,
+  WebexListenerOptions as WebexBotListenerOptions,
+} from '../webex/listener'
+
+export class WebexBotListener extends WebexListener {
+  // Preserve the bot error contract: WDM discovery (shared with the user platform)
+  // throws WebexError, but existing bot callers catch WebexBotError.
   async start(): Promise<void> {
-    if (this.startPromise) return this.startPromise
-    if (this.running) return
-
-    this.running = true
-    const generation = ++this.generation
-
-    let startPromise!: Promise<void>
-    startPromise = (async () => {
-      let handler: WebexMessageHandlerLike | null = null
-      try {
-        handler = await this.createHandler()
-
-        if (!this.running || this.generation !== generation) {
-          await handler.disconnect().catch(() => undefined)
-          return
-        }
-        this.handler = handler
-        this.detachHandler = this.wireHandler(handler, generation)
-
-        await handler.connect()
-
-        if (!this.running || this.handler !== handler || this.generation !== generation) {
-          await handler.disconnect().catch(() => undefined)
-          return
-        }
-      } catch (error) {
-        if (this.handler === handler && this.generation === generation) {
-          this.detachHandler?.()
-          this.detachHandler = null
-          this.handler = null
-        }
-        if (this.generation === generation) {
-          this.running = false
-        }
-        await handler?.disconnect().catch(() => undefined)
-        throw error
-      } finally {
-        if (this.startPromise === startPromise) {
-          this.startPromise = null
-        }
+    try {
+      await super.start()
+    } catch (error) {
+      if (error instanceof WebexError) {
+        throw new WebexBotError(error.message, error.code)
       }
-    })()
-
-    this.startPromise = startPromise
-    return startPromise
-  }
-
-  async stop(): Promise<void> {
-    const pendingStart = this.startPromise
-    this.startPromise = null
-
-    this.running = false
-    this.generation++
-
-    const detach = this.detachHandler
-    this.detachHandler = null
-    detach?.()
-
-    const handler = this.handler
-    this.handler = null
-    if (handler) {
-      await handler.disconnect().catch(() => undefined)
-    }
-
-    if (pendingStart) {
-      await pendingStart.catch(() => undefined)
-    }
-  }
-
-  on<K extends EventKey>(event: K, listener: (...args: WebexBotListenerEventMap[K]) => void): this {
-    this.emitter.on(event, listener as (...args: any[]) => void)
-    return this
-  }
-
-  off<K extends EventKey>(event: K, listener: (...args: WebexBotListenerEventMap[K]) => void): this {
-    this.emitter.off(event, listener as (...args: any[]) => void)
-    return this
-  }
-
-  once<K extends EventKey>(event: K, listener: (...args: WebexBotListenerEventMap[K]) => void): this {
-    this.emitter.once(event, listener as (...args: any[]) => void)
-    return this
-  }
-
-  private isCurrent(handler: WebexMessageHandlerLike, generation: number): boolean {
-    return this.running && this.handler === handler && this.generation === generation
-  }
-
-  // Node's EventEmitter throws synchronously if an 'error' event is emitted with
-  // no registered listener. Guard it so SDK consumers that only subscribe to
-  // message events are never crashed by a transient connection error.
-  private emitError(error: Error): void {
-    if (this.emitter.listenerCount('error') > 0) {
-      this.emitter.emit('error', error)
-    }
-  }
-
-  private async createHandler(): Promise<WebexMessageHandlerLike> {
-    const token = this.client.getToken()
-    const config: WebexMessageHandlerConfig = { token }
-    if (this.options.ignoreSelfMessages !== undefined) config.ignoreSelfMessages = this.options.ignoreSelfMessages
-    if (this.options.pingInterval !== undefined) config.pingInterval = this.options.pingInterval
-    if (this.options.pongTimeout !== undefined) config.pongTimeout = this.options.pongTimeout
-    if (this.options.reconnectBackoffMax !== undefined) config.reconnectBackoffMax = this.options.reconnectBackoffMax
-    if (this.options.maxReconnectAttempts !== undefined) config.maxReconnectAttempts = this.options.maxReconnectAttempts
-
-    if (this.options._handlerFactory) {
-      return this.options._handlerFactory(config)
-    }
-
-    const wdmDevicesUrl = await discoverWdmDevicesUrl(token)
-    config.mode = 'injected'
-    config.fetch = createWdmRewriteFetch(wdmDevicesUrl)
-    config.webSocketFactory = (url: string) => new WebSocket(url) as unknown as InjectedWebSocket
-    return new WebexMessageHandler(config)
-  }
-
-  private wireHandler(handler: WebexMessageHandlerLike, generation: number): () => void {
-    const onMessageCreated = (event: DecryptedMessage) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('message_created', event)
-      this.emitter.emit('webex_event', event)
-    }
-    const onMessageUpdated = (event: DecryptedMessage) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('message_updated', event)
-      this.emitter.emit('webex_event', event)
-    }
-    const onMessageDeleted = (event: DeletedMessage) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('message_deleted', event)
-      this.emitter.emit('webex_event', event)
-    }
-    const onMembershipCreated = (event: MembershipActivity) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('membership_created', event)
-      this.emitter.emit('webex_event', event)
-    }
-    const onAttachmentAction = (event: AttachmentAction) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('attachment_action', event)
-      this.emitter.emit('webex_event', event)
-    }
-    const onRoomCreated = (event: RoomActivity) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('room_created', event)
-      this.emitter.emit('webex_event', event)
-    }
-    const onRoomUpdated = (event: RoomActivity) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('room_updated', event)
-      this.emitter.emit('webex_event', event)
-    }
-    const onConnected = () => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('connected', { connected: handler.connected, status: handler.status() })
-    }
-    const onReconnecting = (attempt: number) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('reconnecting', attempt)
-    }
-    const onDisconnected = (reason: string) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitter.emit('disconnected', reason)
-    }
-    const onError = (error: Error) => {
-      if (!this.isCurrent(handler, generation)) return
-      this.emitError(error)
-    }
-
-    handler.on('message:created', onMessageCreated)
-    handler.on('message:updated', onMessageUpdated)
-    handler.on('message:deleted', onMessageDeleted)
-    handler.on('membership:created', onMembershipCreated)
-    handler.on('attachmentAction:created', onAttachmentAction)
-    handler.on('room:created', onRoomCreated)
-    handler.on('room:updated', onRoomUpdated)
-    handler.on('connected', onConnected)
-    handler.on('reconnecting', onReconnecting)
-    handler.on('disconnected', onDisconnected)
-    handler.on('error', onError)
-
-    return () => {
-      handler.off('message:created', onMessageCreated)
-      handler.off('message:updated', onMessageUpdated)
-      handler.off('message:deleted', onMessageDeleted)
-      handler.off('membership:created', onMembershipCreated)
-      handler.off('attachmentAction:created', onAttachmentAction)
-      handler.off('room:created', onRoomCreated)
-      handler.off('room:updated', onRoomUpdated)
-      handler.off('connected', onConnected)
-      handler.off('reconnecting', onReconnecting)
-      handler.off('disconnected', onDisconnected)
-      handler.off('error', onError)
+      throw error
     }
   }
 }

package/src/platforms/webexbot/types.ts

@@ -1,13 +1,7 @@
-import type {
-  AttachmentAction,
-  DecryptedMessage,
-  DeletedMessage,
-  HandlerStatus,
-  MembershipActivity,
-  RoomActivity,
-} from 'webex-message-handler'
 import { z } from 'zod'
 
+export type { WebexListenerEventMap as WebexBotListenerEventMap } from '../webex/listener'
+
 export interface WebexBotEntry {
   bot_id: string
   bot_name: string
@@ -55,18 +49,3 @@ export const WebexBotCredentialsSchema = z.object({
   bot_id: z.string(),
   bot_name: z.string(),
 })
-
-export interface WebexBotListenerEventMap {
-  message_created: [event: DecryptedMessage]
-  message_updated: [event: DecryptedMessage]
-  message_deleted: [event: DeletedMessage]
-  membership_created: [event: MembershipActivity]
-  attachment_action: [event: AttachmentAction]
-  room_created: [event: RoomActivity]
-  room_updated: [event: RoomActivity]
-  webex_event: [event: DecryptedMessage | DeletedMessage | MembershipActivity | AttachmentAction | RoomActivity]
-  connected: [info: { connected: boolean; status: HandlerStatus }]
-  reconnecting: [attempt: number]
-  disconnected: [reason: string]
-  error: [error: Error]
-}

package/dist/src/platforms/webexbot/wdm-discovery.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wdm-discovery.d.ts","sourceRoot":"","sources":["../../../../src/platforms/webexbot/wdm-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAA+B,MAAM,uBAAuB,CAAA;AAavF,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAa1E;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,aAAa,CAc1E"}

package/dist/src/platforms/webexbot/wdm-discovery.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wdm-discovery.js","sourceRoot":"","sources":["../../../../src/platforms/webexbot/wdm-discovery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,MAAM,eAAe,GAAG,wDAAwD,CAAA;AAChF,MAAM,yBAAyB,GAAG,2CAA2C,CAAA;AAE7E,kFAAkF;AAClF,gFAAgF;AAChF,gFAAgF;AAChF,mFAAmF;AACnF,+EAA+E;AAC/E,4BAA4B;AAC5B,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,KAAa;IACvD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;IAChG,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,aAAa,CAAC,8CAA8C,QAAQ,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAA;IAClH,CAAC;IAED,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAwC,CAAA;IAC9E,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,CAAA;IACrC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,aAAa,CAAC,oDAAoD,EAAE,sBAAsB,CAAC,CAAA;IACvG,CAAC;IAED,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAA;AAC5C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,aAAqB;IACzD,OAAO,KAAK,EAAE,GAAiB,EAA0B,EAAE;QACzD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,yBAAyB,CAAC;YACvD,CAAC,CAAC,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,MAAM,CAAC;YACjE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAA;QAEX,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QAC1F,OAAO;YACL,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE;YACtB,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE;SACvB,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}