@ray-js/t-agent-plugin-aistream 0.2.6-beta-6 → 0.2.6-beta-8

package/dist/withAIStream.d.ts

@@ -42,6 +42,7 @@ export interface AIStreamHooks {
     onMessageParse: (msgItem: StoredMessageObject, result: {
         messages: ChatMessage[];
     }) => void;
+    onChatMessageSent: (userMessage: ChatMessage, respMessage: ChatMessage) => void;
     onTextCompose: (respMsg: ChatMessage, status: ChatMessageStatus, result: {
         text: string;
     }) => void;
@@ -81,6 +82,7 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
             data: string;
         }>;
         onSkillCompose: (fn: AIStreamHooks['onSkillCompose']) => () => void;
+        onChatMessageSent: (fn: AIStreamHooks['onChatMessageSent']) => () => void;
         onTextCompose: (fn: AIStreamHooks['onTextCompose']) => () => void;
         onSkillsEnd: (fn: AIStreamHooks['onSkillsEnd']) => () => void;
         onCardsReceived: (fn: AIStreamHooks['onCardsReceived']) => () => void;

package/dist/withAIStream.js

@@ -73,6 +73,31 @@ export function withAIStream() {
       await agent.session.set('AIStream.agentId', agentId);
       await agent.session.set('AIStream.deviceId', deviceId);
 
+      // 消息列表可能耗时久，优先创建 streamSession 再去加载消息列表
+
+      // 创建 streamSession
+      const connection = globalAIStreamClient.getConnection({
+        clientType,
+        deviceId
+      });
+      const streamSession = connection.createSession({
+        ownerId: clientType === ConnectClientType.DEVICE ? deviceId : "".concat(homeId),
+        api: tokenOptions.api,
+        apiVersion: tokenOptions.version,
+        solutionCode: agentId,
+        extParams: _objectSpread({
+          needTts: !!options.enableTts,
+          deviceId
+        }, tokenOptions.extParams)
+      });
+      await session.set('AIStream.streamSession', streamSession);
+      if (options.earlyStart) {
+        // 故意异步，不阻塞消息列表加载
+        streamSession.ensureSession().catch(error => {
+          logger.error('earlyStart failed', error);
+        });
+      }
+
       /*
        * 2. 获取历史消息
        */
@@ -104,29 +129,6 @@ export function withAIStream() {
         session.isNewChat = true;
       }
       session.sessionId = indexId;
-
-      // 创建 streamSession
-      const connection = globalAIStreamClient.getConnection({
-        clientType,
-        deviceId
-      });
-      const streamSession = connection.createSession({
-        ownerId: clientType === ConnectClientType.DEVICE ? deviceId : "".concat(homeId),
-        api: tokenOptions.api,
-        apiVersion: tokenOptions.version,
-        solutionCode: agentId,
-        extParams: _objectSpread({
-          needTts: !!options.enableTts,
-          deviceId
-        }, tokenOptions.extParams)
-      });
-      await session.set('AIStream.streamSession', streamSession);
-      if (options.earlyStart) {
-        // 故意异步，不阻塞消息列表加载
-        streamSession.ensureSession().catch(error => {
-          logger.error('earlyStart failed', error);
-        });
-      }
     });
     const getHistoryStore = () => {
       const historyStore = session.get('AIStream.historyStore');
@@ -229,6 +231,7 @@ export function withAIStream() {
         attribute: _objectSpread({}, extraOptions)
       });
       signal === null || signal === void 0 || signal.addEventListener('abort', event => {
+        logger.debug('withAIStream signal aborted, response.started:', result.response.started);
         if (result.response.started) {
           result.response.cancel(event.reason);
         }
@@ -265,7 +268,8 @@ export function withAIStream() {
         audioPromise = new Promise((resolve, reject) => {
           // 当确认发送时，展示 loading
           let userMsgShow = false;
-          const onConfirm = async () => {
+          audioEmitter.addEventListener('confirm', async () => {
+            logger.debug('withAIStream chat agent.chat audioEmitter onConfirm');
             if (end) {
               return;
             }
@@ -275,15 +279,18 @@ export function withAIStream() {
             userMsg.bubble.setStatus(BubbleTileStatus.NORMAL);
             userMsgShow = true; // show 会延迟变更 isShow 状态，所以使用 userMsgShow
             await userMsg.show();
-            audioEmitter.removeEventListener('confirm', onConfirm);
-          };
-          audioEmitter.addEventListener('confirm', onConfirm);
+          }, {
+            once: true
+          });
 
           // 当音频识别完毕时，展示文本
-          const onFinished = async event => {
+
+          audioEmitter.addEventListener('finish', async event => {
+            logger.debug('withAIStream chat agent.chat audioEmitter onFinished');
             if (end) {
               return;
             }
+            end = true;
             if (!event.detail.text && userMsgShow) {
               await userMsg.remove();
               reject(new Error('No text found in audio event'));
@@ -296,33 +303,35 @@ export function withAIStream() {
             });
             await userMsg.update();
             await userMsg.persist();
-            end = true;
-            audioEmitter.removeEventListener('finish', onFinished);
             resolve();
-          };
-          audioEmitter.addEventListener('finish', onFinished);
-          const onCancel = async () => {
+          }, {
+            once: true
+          });
+          audioEmitter.addEventListener('cancel', async () => {
+            logger.debug('withAIStream chat agent.chat audioEmitter onCancel');
             end = true;
+            // 取消时，有可能 userMsg.persist 还在执行，所以这里不 await，先 reject
+            reject(new Error('User cancel'));
             if (!response.started && userMsgShow) {
               await userMsg.remove();
             }
-            audioEmitter.removeEventListener('cancel', onCancel);
-            reject(new Error('User cancel'));
-          };
-          audioEmitter.addEventListener('cancel', onCancel);
+          }, {
+            once: true
+          });
           signal.addEventListener('abort', () => {
-            logger.log('withAIStream chat agent.chat audioEmitter onAbort');
+            logger.debug('withAIStream chat agent.chat audioEmitter onAbort');
             audioEmitter.dispatchEvent(new EmitterEvent('cancel'));
           });
-          const onError = async () => {
+          audioEmitter.addEventListener('error', async () => {
+            logger.debug('withAIStream chat agent.chat audioEmitter onError');
             end = true;
+            reject(new Error('Audio emitter error'));
             if (userMsgShow && userMsg.status !== ChatMessageStatus.FINISH) {
               await userMsg.remove();
             }
-            audioEmitter.removeEventListener('error', onError);
-            reject(new Error('Audio emitter error'));
-          };
-          audioEmitter.addEventListener('error', onError);
+          }, {
+            once: true
+          });
         });
       } else {
         userMsg.set({
@@ -350,6 +359,7 @@ export function withAIStream() {
       const message = createMessage({
         role: responseBy
       });
+      await hooks.callHook('onChatMessageSent', userMsg, message);
       const skills = [];
       logger.debug('withAIStream chat agent.flushStreamToShow');
       const result = {
@@ -453,10 +463,13 @@ export function withAIStream() {
     onAgentDispose(async () => {
       const streamSession = session.get('AIStream.streamSession');
 
-      /**
-       * 关闭session
-       */
-      await streamSession.close();
+      // 比较低的概率 onAgentStart 还没跑完（卡在获取获取家庭信息）就调用了 dispose
+      if (streamSession) {
+        /**
+         * 关闭session
+         */
+        await streamSession.close();
+      }
     });
     const handleTTTAction = async (tile, tttAction) => {
       const result = {
@@ -562,6 +575,9 @@ export function withAIStream() {
         onSkillCompose: fn => {
           return hooks.hook('onSkillCompose', fn);
         },
+        onChatMessageSent: fn => {
+          return hooks.hook('onChatMessageSent', fn);
+        },
         onTextCompose: fn => {
           return hooks.hook('onTextCompose', fn);
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-plugin-aistream",
-  "version": "0.2.6-beta-6",
+  "version": "0.2.6-beta-8",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -35,5 +35,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "2f18554f908818b62ab24ead773d4e74fd5ef7fc"
+  "gitHead": "6fc9a8195706d72c2bab10479e8d65a26854bdde"
 }