@ray-js/t-agent-plugin-aistream 0.2.8-beta.1 → 0.2.8-beta.3

package/dist/withAIStream.js

@@ -93,65 +93,79 @@ export function withAIStream() {
         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),
-        getSessionUserData: async () => {
-          const result = {
-            userData: {}
-          };
-          await hooks.callHook('onUserDataRead', 'create-session', {}, result);
-          return result.userData;
-        }
-      });
-      streamSession.on('sessionEvent', event => {
-        hooks.callHook('onSessionEventReceived', event);
-      });
-      await session.set('AIStream.streamSession', streamSession);
-      if (options.earlyStart) {
-        // 故意异步，不阻塞消息列表加载
-        streamSession.ensureSession().catch(error => {
-          logger.error('earlyStart failed', error);
+      let streamSession = null;
+      try {
+        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),
+          getSessionUserData: async () => {
+            const result = {
+              userData: {}
+            };
+            await hooks.callHook('onUserDataRead', 'create-session', {}, result);
+            return result.userData;
+          }
         });
-      }
-
-      /*
-       * 2. 获取历史消息
-       */
-      let historyStore;
-      if (typeof options.createChatHistoryStore === 'function') {
-        historyStore = options.createChatHistoryStore(agent);
-      } else {
-        historyStore = new ChatHistoryLocalStore({
-          bizCode: BizCode.CHAT,
-          agentId,
-          deviceId,
-          homeId,
-          indexId
+        streamSession.on('sessionEvent', event => {
+          hooks.callHook('onSessionEventReceived', event);
         });
-      }
-      if (historyStore) {
-        await agent.session.set('AIStream.historyStore', historyStore);
-        const {
-          records
-        } = await historyStore.queryAll({
-          sort: 'desc',
-          // id 倒序去获取最新的消息list，然后再reverse，保证最新的消息在最前面
-          limit: options.historySize || 1000,
-          offset: 0
+        await session.set('AIStream.connection', connection);
+        await session.set('AIStream.streamSession', streamSession);
+        if (options.earlyStart) {
+          // 故意异步，不阻塞消息列表加载
+          streamSession.ensureSession().catch(error => {
+            logger.error('earlyStart failed', error);
+          });
+        }
+
+        /*
+         * 2. 获取历史消息
+         */
+        let historyStore;
+        if (typeof options.createChatHistoryStore === 'function') {
+          historyStore = options.createChatHistoryStore(agent);
+        } else {
+          historyStore = new ChatHistoryLocalStore({
+            bizCode: BizCode.CHAT,
+            agentId,
+            deviceId,
+            homeId,
+            indexId
+          });
+        }
+        if (historyStore) {
+          await agent.session.set('AIStream.historyStore', historyStore);
+          const {
+            records
+          } = await historyStore.queryAll({
+            sort: 'desc',
+            // id 倒序去获取最新的消息list，然后再reverse，保证最新的消息在最前面
+            limit: options.historySize || 1000,
+            offset: 0
+          });
+          await session.set('AIStream.rawMessages', records.reverse());
+          session.isNewChat = records.length === 0;
+        } else {
+          session.isNewChat = true;
+        }
+        session.sessionId = indexId;
+      } catch (error) {
+        if (streamSession) {
+          await streamSession.close().catch(closeError => {
+            logger.error('withAIStream cleanup streamSession failed', closeError);
+          });
+        }
+        await connection.close().catch(closeError => {
+          logger.error('withAIStream cleanup connection failed', closeError);
         });
-        await session.set('AIStream.rawMessages', records.reverse());
-        session.isNewChat = records.length === 0;
-      } else {
-        session.isNewChat = true;
+        throw error;
       }
-      session.sessionId = indexId;
     });
     const getHistoryStore = () => {
       const historyStore = session.get('AIStream.historyStore');
@@ -431,6 +445,7 @@ export function withAIStream() {
       });
       await hooks.callHook('onChatMessageSent', userMsg, message);
       const skills = [];
+      const attachments = [];
       logger.debug('withAIStream chat agent.flushStreamToShow');
       const result = {
         messages: await agent.flushStreamToShow(message, response, {
@@ -445,17 +460,28 @@ export function withAIStream() {
             const result = {
               messages: []
             };
+            await hooks.callHook('onAttachmentCompose', part, respMsg, result);
+            attachments.push(part);
             if (part.attachmentType === 'skill') {
-              skills.push(part.attachment);
-              await hooks.callHook('onSkillCompose', part.attachment, respMsg, result);
+              const skill = part.attachment;
+              skills.push(skill);
+              await hooks.callHook('onSkillCompose', skill, respMsg, result);
             }
             return result.messages;
           }
         })
       };
       logger.debug('withAIStream chat agent.flushStreamToShow end');
+      let changed = false;
       if (skills.length) {
+        changed = true;
         await hooks.callHook('onSkillsEnd', skills, message, result);
+      }
+      if (attachments.length) {
+        changed = true;
+        await hooks.callHook('onAttachmentsEnd', attachments, message, result);
+      }
+      if (changed) {
         await message.update();
       }
       let valid = false;
@@ -533,6 +559,7 @@ export function withAIStream() {
     });
     onAgentDispose(async () => {
       const streamSession = session.get('AIStream.streamSession');
+      const connection = session.get('AIStream.connection');
 
       // 比较低的概率 onAgentStart 还没跑完（卡在获取获取家庭信息）就调用了 dispose
       if (streamSession) {
@@ -541,6 +568,9 @@ export function withAIStream() {
          */
         await streamSession.close();
       }
+      if (connection) {
+        await connection.close();
+      }
     });
     const handleTTTAction = async (tile, tttAction) => {
       const result = {
@@ -611,7 +641,7 @@ export function withAIStream() {
           }
         }
         if ((_skill$general = skill.general) !== null && _skill$general !== void 0 && (_skill$general = _skill$general.data) !== null && _skill$general !== void 0 && _skill$general.aiCards) {
-          for (const card of skill.custom.data.aiCards) {
+          for (const card of skill.general.data.aiCards) {
             cards.push(card);
           }
         }
@@ -664,6 +694,12 @@ export function withAIStream() {
         onSessionEventReceived: fn => {
           return hooks.hook('onSessionEventReceived', fn);
         },
+        onAttachmentCompose: fn => {
+          return hooks.hook('onAttachmentCompose', fn);
+        },
+        onAttachmentsEnd: fn => {
+          return hooks.hook('onAttachmentsEnd', fn);
+        },
         sendEvent: params => sendEventToAIStream(params),
         onTTTAction: fn => {
           return hooks.hook('onTTTAction', fn);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-plugin-aistream",
-  "version": "0.2.8-beta.1",
+  "version": "0.2.8-beta.3",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -21,10 +21,11 @@
   "scripts": {
     "dev": "ray start --type=component --output dist --emit-declaration-dev",
     "build": "ray build --type=component --output dist",
-    "clean": "rimraf ./dist"
+    "clean": "rimraf ./dist",
+    "test": "jest --runInBand",
+    "test:coverage": "jest --runInBand --coverage"
   },
   "dependencies": {
-    "dayjs": "^1.10.4",
     "url-parse": "^1.5.10",
     "web-streams-polyfill": "^4.0.0"
   },
@@ -35,5 +36,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "040499ca11aedda3246121f880807da0f8af3cc9"
+  "gitHead": "938bc0c7da7d23dbbad8c3c14c97e5f4007f06f7"
 }