Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
},
"dependencies": {
"debug": "^4.4.1",
"eventemitter2": "^6.4.9",
"ws": "^8.18.2"
}
}
8 changes: 5 additions & 3 deletions src/websocket/bot-api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import debug from 'debug';
import http, { IncomingMessage } from 'node:http';
import { EventEmitter } from 'node:events';
import ee2 from 'eventemitter2';
const { EventEmitter2 } = ee2;
import { WebSocket, WebSocketServer } from 'ws';
import { BotConversationWebSocket } from './bot-conversation.js';
import { ProtocolMessage } from './types.js';
Expand All @@ -14,7 +15,7 @@ export interface BotApiServerOptions {
token?: string;
}

export class BotApiWebSocket extends EventEmitter {
export class BotApiWebSocket extends EventEmitter2 {
private server?: http.Server;
#port = 8080;

Expand All @@ -39,8 +40,9 @@ export class BotApiWebSocket extends EventEmitter {
});
webSockServer.on('connection', (websocket: WebSocket, request: IncomingMessage) => {
const conversation = new BotConversationWebSocket(websocket);
// eslint-disable-next-line @typescript-eslint/no-misused-promises
conversation.on('conversation.start', (initiateMessage: ProtocolMessage) => {
this.emit('conversation', conversation, { request, initiateMessage });
return this.emitAsync('conversation', conversation, { request, initiateMessage });
});
});

Expand Down
32 changes: 25 additions & 7 deletions src/websocket/bot-conversation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import {
ProtocolMessage,
VaicToBotMessageName
} from './types.js';
import { EventEmitter } from 'events';
import ee2, { type Listener } from 'eventemitter2';
import { PassThrough, Readable, } from 'stream';
const { EventEmitter2 } = ee2;

const log = debug('ac-bot-api');

Expand All @@ -24,8 +25,15 @@ function redactMessage(message: ProtocolMessage) {
};
}

// TODO: EventEmitter<BotConversationEvents>
export class BotConversationWebSocket extends EventEmitter {

declare interface BotConversationEvents {
on(event: 'conversation.start', listener: (message: ProtocolMessage) => Promise<void>): this | Listener;
on(event: 'userStream', listener: (stream: PassThrough, options: { message: ProtocolMessage }) => void): this | Listener;
on(event: 'activity', listener: (activity: BotActivity) => void): this | Listener;
on(event: 'end', listener: (message?: ProtocolMessage) => void): this | Listener;
on(event: 'error', listener: (error: Error) => void): this | Listener;
}
export class BotConversationWebSocket extends EventEmitter2 implements BotConversationEvents {
private ended = false;
private conversationId = '';
private mediaFormat = MediaFormat.RAW_LINEAR_16;
Expand Down Expand Up @@ -108,10 +116,20 @@ export class BotConversationWebSocket extends EventEmitter {
switch (msgJson.type) {
case VaicToBotMessageName.sessionInitiate: {
this.conversationId = msgJson.conversationId!;
this.emit('conversation.start', msgJson);
await this.send(BotToVaicMessageName.sessionAccepted, {
mediaFormat: this.mediaFormat
});
try {
await this.emitAsync('conversation.start', msgJson);
await this.send(BotToVaicMessageName.sessionAccepted, {
mediaFormat: this.mediaFormat
});
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (error: any) {
this.#log('Error handling conversation.start:', error);
await this.send(BotToVaicMessageName.sessionError, {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
reason: `Error handling conversation.start: ${error.message || error}`,
});
this.close();
}
break;
}
case VaicToBotMessageName.sessionResume:
Expand Down