agent-messenger 2.23.3 → 2.23.5

package/src/platforms/webex/id-normalizer.ts

@@ -7,7 +7,16 @@ import type {
   RoomActivity,
 } from 'webex-message-handler'
 
-import type { WebexMembership, WebexMessage, WebexPerson } from './types'
+import type {
+  WebexAttachmentActionEvent,
+  WebexDeletedMessageEvent,
+  WebexMembership,
+  WebexMembershipEvent,
+  WebexMessage,
+  WebexMessageEvent,
+  WebexPerson,
+  WebexRoomEvent,
+} from './types'
 
 export { fromRestId }
 
@@ -51,7 +60,7 @@ export function toRestId(uuid: string, type: WebexRestIdType): string {
   return Buffer.from(`ciscospark://us/${type}/${uuid}`).toString('base64url')
 }
 
-export function normalizeMessage(message: DecryptedMessage): DecryptedMessage {
+export function normalizeMessage(message: DecryptedMessage): WebexMessageEvent {
   const id = toRestId(message.id, 'MESSAGE')
   const parentId = message.parentId ? toRestId(message.parentId, 'MESSAGE') : message.parentId
   const roomId = toRestId(message.roomId, 'ROOM')
@@ -72,7 +81,7 @@ export function normalizeMessage(message: DecryptedMessage): DecryptedMessage {
   }
 }
 
-export function normalizeDeletedMessage(message: DeletedMessage): DeletedMessage {
+export function normalizeDeletedMessage(message: DeletedMessage): WebexDeletedMessageEvent {
   const messageId = toRestId(message.messageId, 'MESSAGE')
   const roomId = toRestId(message.roomId, 'ROOM')
   const personId = toRestId(message.personId, 'PEOPLE')
@@ -86,7 +95,7 @@ export function normalizeDeletedMessage(message: DeletedMessage): DeletedMessage
   }
 }
 
-export function normalizeMembership(activity: MembershipActivity): MembershipActivity {
+export function normalizeMembership(activity: MembershipActivity): WebexMembershipEvent {
   // `id` stays raw: it is a Mercury activity UUID, not a REST membership ID, so
   // its ref is the id itself rather than a decoded REST id.
   const actorId = toRestId(activity.actorId, 'PEOPLE')
@@ -104,7 +113,7 @@ export function normalizeMembership(activity: MembershipActivity): MembershipAct
   }
 }
 
-export function normalizeAttachmentAction(action: AttachmentAction): AttachmentAction {
+export function normalizeAttachmentAction(action: AttachmentAction): WebexAttachmentActionEvent {
   const id = toRestId(action.id, 'ATTACHMENT_ACTION')
   const messageId = action.messageId ? toRestId(action.messageId, 'MESSAGE') : action.messageId
   const personId = toRestId(action.personId, 'PEOPLE')
@@ -122,7 +131,7 @@ export function normalizeAttachmentAction(action: AttachmentAction): AttachmentA
   }
 }
 
-export function normalizeRoomActivity(activity: RoomActivity): RoomActivity {
+export function normalizeRoomActivity(activity: RoomActivity): WebexRoomEvent {
   // `id` stays raw: the Mercury conversation activity UUID has no consumer-facing
   // REST resource, so its ref is the id itself (the comparable REST id is `roomId`).
   const roomId = toRestId(activity.roomId, 'ROOM')

package/src/platforms/webex/index.ts

@@ -9,7 +9,19 @@ export type { PasswordLoginOptions, PasswordLoginResult } from './password-login
 export { WebexTokenExtractor } from './token-extractor'
 export type { ExtractedWebexToken } from './token-extractor'
 export { WebexError } from './types'
-export type { WebexConfig, WebexMembership, WebexMessage, WebexPerson, WebexSpace } from './types'
+export type {
+  WebexAttachmentActionEvent,
+  WebexConfig,
+  WebexDeletedMessageEvent,
+  WebexMembership,
+  WebexMembershipEvent,
+  WebexMessage,
+  WebexMessageEvent,
+  WebexPerson,
+  WebexRealtimeEvent,
+  WebexRoomEvent,
+  WebexSpace,
+} from './types'
 export {
   WebexConfigSchema,
   WebexMembershipSchema,

package/src/platforms/webex/listener.ts

@@ -21,6 +21,14 @@ import {
   normalizeMessage,
   normalizeRoomActivity,
 } from './id-normalizer'
+import type {
+  WebexAttachmentActionEvent,
+  WebexDeletedMessageEvent,
+  WebexMembershipEvent,
+  WebexMessageEvent,
+  WebexRealtimeEvent,
+  WebexRoomEvent,
+} from './types'
 import { createWdmRewriteFetch, discoverWdmDevicesUrl } from './wdm-discovery'
 
 type EventKey = keyof WebexListenerEventMap
@@ -49,14 +57,14 @@ export interface WebexListenerOptions {
 }
 
 export interface WebexListenerEventMap {
-  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]
+  message_created: [event: WebexMessageEvent]
+  message_updated: [event: WebexMessageEvent]
+  message_deleted: [event: WebexDeletedMessageEvent]
+  membership_created: [event: WebexMembershipEvent]
+  attachment_action: [event: WebexAttachmentActionEvent]
+  room_created: [event: WebexRoomEvent]
+  room_updated: [event: WebexRoomEvent]
+  webex_event: [event: WebexRealtimeEvent]
   connected: [info: { connected: boolean; status: HandlerStatus }]
   reconnecting: [attempt: number]
   disconnected: [reason: string]

package/src/platforms/webex/types.ts

@@ -1,3 +1,10 @@
+import type {
+  AttachmentAction,
+  DecryptedMessage,
+  DeletedMessage,
+  MembershipActivity,
+  RoomActivity,
+} from 'webex-message-handler'
 import { z } from 'zod'
 
 export interface WebexSpace {
@@ -71,6 +78,47 @@ export interface WebexConfig {
   encryptionKeys?: Record<string, string>
 }
 
+export type WebexMessageEvent = DecryptedMessage & {
+  ref: string
+  parentRef?: string
+  roomRef: string
+  personRef: string
+  mentionedPeopleRefs: string[]
+}
+
+export type WebexDeletedMessageEvent = DeletedMessage & {
+  messageRef: string
+  roomRef: string
+  personRef: string
+}
+
+export type WebexMembershipEvent = MembershipActivity & {
+  ref: string
+  actorRef: string
+  personRef: string
+  roomRef: string
+}
+
+export type WebexAttachmentActionEvent = AttachmentAction & {
+  ref: string
+  messageRef: string
+  personRef: string
+  roomRef: string
+}
+
+export type WebexRoomEvent = RoomActivity & {
+  ref: string
+  roomRef: string
+  actorRef: string
+}
+
+export type WebexRealtimeEvent =
+  | WebexMessageEvent
+  | WebexDeletedMessageEvent
+  | WebexMembershipEvent
+  | WebexAttachmentActionEvent
+  | WebexRoomEvent
+
 export class WebexError extends Error {
   code: string
 

package/src/platforms/webexbot/index.ts

@@ -6,5 +6,16 @@ export { WebexBotListener } from './listener'
 export type { WebexBotListenerOptions } from './listener'
 export type { WebexBotConfig, WebexBotCredentials, WebexBotEntry, WebexBotListenerEventMap } from './types'
 export { WebexBotConfigSchema, WebexBotCredentialsSchema, WebexBotEntrySchema, WebexBotError } from './types'
-export type { WebexMembership, WebexMessage, WebexPerson, WebexSpace } from '../webex/types'
+export type {
+  WebexAttachmentActionEvent,
+  WebexDeletedMessageEvent,
+  WebexMembership,
+  WebexMembershipEvent,
+  WebexMessage,
+  WebexMessageEvent,
+  WebexPerson,
+  WebexRealtimeEvent,
+  WebexRoomEvent,
+  WebexSpace,
+} from '../webex/types'
 export { WebexMembershipSchema, WebexMessageSchema, WebexPersonSchema, WebexSpaceSchema } from '../webex/types'