@ray-js/t-agent-plugin-aistream 0.2.0-beta-12 → 0.2.0-beta-14

package/dist/utils/AIStream.js

@@ -34,7 +34,8 @@ export class AIStreamConnection {
     _defineProperty(this, "promise", null);
     _defineProperty(this, "observer", null);
     _defineProperty(this, "onStateChanged", entry => {
-      if (entry.type === 'connectionState' && entry.body.connectionId === this.connectionId) {
+      // 一个小程序只能启动一个 connection，所以这里不判断 id
+      if (entry.type === 'connectionState') {
         this.state = entry.body.connectState;
         this.activeSessions.forEach(session => {
           if (session.sessionId) {
@@ -71,9 +72,11 @@ export class AIStreamConnection {
       }
     };
     this.promise = (async () => {
+      // 检查连接状态
       {
         const [error, result] = await tryCatch(() => isConnected(this.options));
         if (error) {
+          this.promise = null;
           throw new AIStreamConnectionError(error.message, error.code || AIStreamErrorCode.AIStreamError);
         }
         if (result.connected) {
@@ -83,10 +86,12 @@ export class AIStreamConnection {
           return;
         }
       }
+
+      // 未连接的情况，调用 connect
       {
-        // 调用 SDK connect
         const [error, result] = await tryCatch(() => connect(this.options));
         if (error) {
+          this.promise = null;
           throw new AIStreamConnectionError(error.message, error.code || AIStreamErrorCode.AIStreamError);
         }
         this.connectionId = result.connectionId;
@@ -180,38 +185,41 @@ export class AIStreamSession {
       return Promise.resolve();
     }
     this.promise = (async () => {
-      await this.connection._ensureConnected();
-      let ownerId = this.options.ownerId;
-      if (!ownerId) {
-        if (this.connection.options.clientType === ConnectClientType.APP) {
-          const {
-            homeId
-          } = await getCurrentHomeInfo();
-          ownerId = homeId;
-        } else {
-          ownerId = this.connection.options.deviceId;
+      try {
+        await this.connection._ensureConnected();
+        let ownerId = this.options.ownerId;
+        if (!ownerId) {
+          if (this.connection.options.clientType === ConnectClientType.APP) {
+            const {
+              homeId
+            } = await getCurrentHomeInfo();
+            ownerId = homeId;
+          } else {
+            ownerId = this.connection.options.deviceId;
+          }
+          this.options.ownerId = ownerId;
         }
-        this.options.ownerId = ownerId;
+        const options = _objectSpread({
+          bizTag: BizTag.DEFAULT,
+          ownerId,
+          extParams: {}
+        }, this.options);
+        const {
+          agentToken,
+          bizConfig
+        } = await queryAgentToken(options);
+        const res = await createSession({
+          bizTag: options.bizTag,
+          agentToken,
+          bizConfig,
+          userData: options.userData
+        });
+        this.sessionId = res.sessionId;
+        this.sendDataChannels = res.sendDataChannels;
+        this.revDataChannels = res.revDataChannels;
+      } finally {
+        this.promise = null;
       }
-      const options = _objectSpread({
-        bizTag: BizTag.DEFAULT,
-        ownerId,
-        extParams: {}
-      }, this.options);
-      const {
-        agentToken,
-        bizConfig
-      } = await queryAgentToken(options);
-      const res = await createSession({
-        bizTag: options.bizTag,
-        agentToken,
-        bizConfig,
-        userData: options.userData
-      });
-      this.sessionId = res.sessionId;
-      this.sendDataChannels = res.sendDataChannels;
-      this.revDataChannels = res.revDataChannels;
-      this.promise = null;
     })();
     return this.promise;
   }

package/dist/withAIStream.js

@@ -288,7 +288,7 @@ export function withAIStream() {
           });
           const onError = async () => {
             end = true;
-            if (userMsg.isShow) {
+            if (userMsg.isShow && userMsg.status !== ChatMessageStatus.FINISH) {
               await userMsg.remove();
             }
             audioEmitter.removeEventListener('error', onError);

package/package.json

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