@ray-js/t-agent-plugin-aistream 0.2.0-beta-3 → 0.2.0-beta-5

package/dist/AIStreamTypes.d.ts

@@ -651,6 +651,7 @@ export declare enum FileFormat {
     SWEEPER_MAP = 6
 }
 export declare enum AIStreamErrorCode {
+    AIStreamError = -1,
     OK = 200,
     BadRequest = 400,
     Unauthenticated = 401,
@@ -828,6 +829,29 @@ export type CheckConnectResult = {
     /** 连接的唯一标识 */
     connectionId?: string;
 };
+export type IsConnectedParams = {
+    /** client 类型: 1-作为设备代理, 2-作为 App */
+    clientType: number;
+    /** 代理的设备ID, clientType == 1 时必传 */
+    deviceId?: string;
+    success?: (params: {
+        /** 是否已连接 */
+        connected: boolean;
+        /** 通道连接状态: 0-初始化，1-连接中，2-鉴权中，3-已连接，4-被云端断开，5-主动关闭 */
+        state: number;
+        /** 连接的唯一标识 */
+        connectionId?: string;
+    }) => void;
+    fail?: (params: {
+        errorMsg: string;
+        errorCode: string | number;
+        innerError: {
+            errorCode: string | number;
+            errorMsg: string;
+        };
+    }) => void;
+    complete?: () => void;
+};
 /**
  *@description 发起通道连接，若此前已连接会直接回调成功
  */

package/dist/AIStreamTypes.js

@@ -118,6 +118,7 @@ export let FileFormat = /*#__PURE__*/function (FileFormat) {
   return FileFormat;
 }({});
 export let AIStreamErrorCode = /*#__PURE__*/function (AIStreamErrorCode) {
+  AIStreamErrorCode[AIStreamErrorCode["AIStreamError"] = -1] = "AIStreamError";
   AIStreamErrorCode[AIStreamErrorCode["OK"] = 200] = "OK";
   AIStreamErrorCode[AIStreamErrorCode["BadRequest"] = 400] = "BadRequest";
   AIStreamErrorCode[AIStreamErrorCode["Unauthenticated"] = 401] = "Unauthenticated";

package/dist/ChatHistoryStore.d.ts

@@ -36,8 +36,11 @@ export interface ChatHistoryStore<Key = number> {
     }>;
     /** 更新消息 */
     update(id: Key, body: ChatMessageObject): Promise<void>;
+    /** 删除消息 */
     remove(id: Key): Promise<void>;
-    removeAll(): Promise<void>;
+    /** 批量删除消息 */
+    removeAll(ids?: Key[]): Promise<void>;
+    /** 插入消息 */
     insert(body: ChatMessageObject): Promise<{
         id: Key;
     }>;
@@ -57,7 +60,7 @@ export declare class ChatHistoryLocalStore implements ChatHistoryStore {
     }>;
     update(id: number, body: ChatMessageObject): Promise<void>;
     remove(id: number): Promise<void>;
-    removeAll(): Promise<void>;
+    removeAll(ids?: number[]): Promise<void>;
     insert(message: ChatMessageObject): Promise<{
         id: number;
     }>;

package/dist/ChatHistoryStore.js

@@ -150,8 +150,20 @@ export class ChatHistoryLocalStore {
       id: [id]
     });
   }
-  async removeAll() {
-    await deleteRecordList(this.getQueryCondition());
+  async removeAll(ids) {
+    if (ids) {
+      if (!Array.isArray(ids)) {
+        throw new Error('ids is not array');
+      }
+      if (ids.length === 0) {
+        return;
+      }
+      await deleteRecordList(_objectSpread({
+        id: ids
+      }, this.getQueryCondition()));
+    } else {
+      await deleteRecordList(this.getQueryCondition());
+    }
   }
   async insert(message) {
     const nowTime = Date.now();

package/dist/utils/AIStream.d.ts

@@ -51,6 +51,7 @@ export declare class AIStreamSession {
     sessionId: string | null;
     sendDataChannels: string[];
     revDataChannels: string[];
+    disposed: boolean;
     private activeEvent?;
     private activeObserver?;
     private promise;

package/dist/utils/AIStream.js

@@ -6,9 +6,12 @@ import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import { AIStreamErrorCode, BizTag, ConnectClientType, ConnectState, EventType, SessionState } from '../AIStreamTypes';
-import { closeSession, connect, createSession, disconnect, getCurrentHomeInfo, isConnectSync, queryAgentToken, registerRecordAmplitudes, sendEventChatBreak, sendEventEnd, sendEventPayloadEnd, sendEventStart, sendImageData, sendTextData, startRecordAndSendAudioData, stopRecordAndSendAudioData, unregisterVoiceAmplitudes } from './ttt';
+import { closeSession, connect, createSession, disconnect, getCurrentHomeInfo, isConnected, queryAgentToken, registerRecordAmplitudes, sendEventChatBreak, sendEventEnd, sendEventPayloadEnd, sendEventStart, sendImageData, sendTextData, startRecordAndSendAudioData, stopRecordAndSendAudioData, unregisterVoiceAmplitudes } from './ttt';
 import { AIStreamObserver, AIStreamObserverPool } from './observer';
 import { isAbortError } from '@ray-js/t-agent';
+import logger from './logger';
+import { AIStreamConnectionError, AIStreamEventError } from './errors';
+import { tryCatch } from './misc';
 export class AIStreamClient {
   constructor() {
     _defineProperty(this, "pool", new AIStreamObserverPool());
@@ -38,8 +41,8 @@ export class AIStreamConnection {
             session._onStateChanged(entry);
           }
         });
-        if (entry.body.connectState === ConnectState.DISCONNECTED || entry.body.connectState === ConnectState.CLOSED) {
-          // 事件触发的时候，只做清理
+        if (entry.body.connectState === ConnectState.DISCONNECTED || entry.body.connectState === ConnectState.CLOSED || entry.body.connectState === ConnectState.CONNECTING || entry.body.connectState === ConnectState.AUTHORIZING) {
+          // 断开事件触发时只做清理，因为连接已经关掉了
           this.cleanup();
         }
       }
@@ -47,9 +50,6 @@ export class AIStreamConnection {
         this.activeSessions.forEach(session => {
           if (session.sessionId && session.sessionId === entry.body.sessionId) {
             session._onStateChanged(entry);
-            if (entry.body.sessionState === SessionState.CLOSED || entry.body.sessionState === SessionState.CREATE_FAILED) {
-              this.activeSessions.delete(session);
-            }
           }
         });
       }
@@ -61,39 +61,52 @@ export class AIStreamConnection {
     if (this.promise) {
       return this.promise;
     }
-    const result = isConnectSync(this.options);
-
-    // 监听断开事件，重置 state & 清理
-    if (!this.observer) {
-      this.observer = new AIStreamObserver(this.onStateChanged, this.pool);
-      this.observer.observe({
-        connectionState: true,
-        sessionState: true
-      });
-    }
-    if (result.connected) {
-      this.state = result.state;
-      this.connectionId = result.connectionId;
-      return Promise.resolve();
-    }
+    const observe = () => {
+      if (!this.observer) {
+        this.observer = new AIStreamObserver(this.onStateChanged, this.pool);
+        this.observer.observe({
+          connectionState: true,
+          sessionState: true
+        });
+      }
+    };
     this.promise = (async () => {
-      // 调用 SDK connect
-      const res = await connect(this.options);
-      this.connectionId = res.connectionId;
-      this.state = ConnectState.CONNECTED;
-      this.promise = null;
+      {
+        const [error, result] = await tryCatch(() => isConnected(this.options));
+        if (error) {
+          throw new AIStreamConnectionError(error.message, error.code || AIStreamErrorCode.AIStreamError);
+        }
+        if (result.connected) {
+          this.state = result.state;
+          this.connectionId = result.connectionId;
+          observe();
+          return;
+        }
+      }
+      {
+        // 调用 SDK connect
+        const [error, result] = await tryCatch(() => connect(this.options));
+        if (error) {
+          throw new AIStreamConnectionError(error.message, error.code || AIStreamErrorCode.AIStreamError);
+        }
+        this.connectionId = result.connectionId;
+        this.state = ConnectState.CONNECTED;
+        this.promise = null;
+        observe();
+      }
     })();
     return this.promise;
   }
   cleanup() {
     var _this$observer;
+    logger.debug('AIStreamConnection cleanup');
     (_this$observer = this.observer) === null || _this$observer === void 0 || _this$observer.disconnect();
     this.observer = null;
     this.state = ConnectState.CLOSED;
     this.connectionId = null;
     this.promise = null;
     this.activeSessions.forEach(s => s.cleanup());
-    this.activeSessions.clear();
+    // session 不清空，closeSession 被调用时才清空
   }
   createSession(options) {
     const session = new AIStreamSession(this, this.pool, options);
@@ -129,6 +142,7 @@ export class AIStreamSession {
     _defineProperty(this, "sessionId", null);
     _defineProperty(this, "sendDataChannels", []);
     _defineProperty(this, "revDataChannels", []);
+    _defineProperty(this, "disposed", false);
     _defineProperty(this, "promise", null);
     _defineProperty(this, "_onStateChanged", entry => {
       var _this$activeEvent;
@@ -203,8 +217,11 @@ export class AIStreamSession {
   }
   async startEvent() {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    if (this.disposed) {
+      throw new AIStreamEventError('Event has been disposed', AIStreamErrorCode.AIStreamError);
+    }
     if (this.activeEvent) {
-      throw new Error('Cannot start a new event while another is active');
+      throw new AIStreamEventError('Cannot start a new event while another is active', AIStreamErrorCode.AIStreamError);
     }
     await this.ensureSession();
     const {
@@ -251,12 +268,14 @@ export class AIStreamSession {
   }
   cleanupEvent() {
     var _this$activeObserver, _this$activeEvent4;
+    logger.debug('AIStreamSession cleanupEvent');
     (_this$activeObserver = this.activeObserver) === null || _this$activeObserver === void 0 || _this$activeObserver.disconnect();
     this.activeObserver = null;
     (_this$activeEvent4 = this.activeEvent) === null || _this$activeEvent4 === void 0 || _this$activeEvent4.emit('close');
     this.activeEvent = null;
   }
   cleanup() {
+    logger.debug('AIStreamSession cleanup');
     this.cleanupEvent();
     this.sessionId = null;
     this.sendDataChannels = [];
@@ -265,10 +284,10 @@ export class AIStreamSession {
 
   // 会话关闭清理
   async close() {
+    logger.debug('AIStreamSession close');
+    this.disposed = true;
     await this.connection.closeSession(this);
-    if (this.sessionId) {
-      this.cleanup();
-    }
+    this.cleanup();
   }
 }
 export class AIStreamEvent {
@@ -289,13 +308,13 @@ export class AIStreamEvent {
   findFirstCode(type) {
     const code = this.sendDataChannels.find(code => code.startsWith(type));
     if (!code) {
-      throw new Error("No available data code for type: ".concat(type));
+      throw new AIStreamEventError("No available data code for type: ".concat(type), AIStreamErrorCode.AIStreamError);
     }
     return code;
   }
   write(chunk) {
     if (this.closed) {
-      throw new Error('Cannot write to a closed event');
+      throw new AIStreamEventError('Cannot write to a closed event', AIStreamErrorCode.AIStreamError);
     }
     const dataChannel = chunk.dataChannel || this.findFirstCode(chunk.type);
     let promise = this.chains[dataChannel];
@@ -341,11 +360,11 @@ export class AIStreamEvent {
   }
   stream(source) {
     if (this.closed) {
-      throw new Error('Cannot stream to a closed event');
+      throw new AIStreamEventError('Cannot stream to a closed event', AIStreamErrorCode.AIStreamError);
     }
     const dataChannel = source.dataChannel || this.findFirstCode(source.type);
     if (this.streams[dataChannel]) {
-      throw new Error("".concat(dataChannel, " stream already exists"));
+      throw new AIStreamEventError("".concat(dataChannel, " stream already exists"), AIStreamErrorCode.AIStreamError);
     }
     const stream = {
       dataChannel,
@@ -353,7 +372,7 @@ export class AIStreamEvent {
       started: false,
       start: async () => {
         if (this.closed) {
-          throw new Error('Cannot stream to a closed event');
+          throw new AIStreamEventError('Cannot stream to a closed event', AIStreamErrorCode.AIStreamError);
         }
         if (stream.started) {
           return;

package/dist/utils/defaultMock.js

@@ -8,13 +8,17 @@ import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import { mock } from './mock';
 import { EmitterEvent, generateId } from '@ray-js/t-agent';
-import { BizCode, EventType, ReceivedTextPacketEof, ReceivedTextPacketType, StreamFlag } from '../AIStreamTypes';
+import { BizCode, ConnectState, EventType, ReceivedTextPacketEof, ReceivedTextPacketType, StreamFlag } from '../AIStreamTypes';
 import AbortController from './abort';
 function splitString(input) {
   return input.match(/[a-zA-Z0-9]+\s*|[\u4e00-\u9fff]+\s*|[^\w\s\u4e00-\u9fff]+\s*|[\s]+/g) || [];
 }
 mock.data.set('sessionMap', new Map());
 const getSession = (sessionId, eventId) => {
+  const connection = getCurrentConnection();
+  if (!connection) {
+    throw new Error('not connected');
+  }
   const map = mock.data.get('sessionMap');
   const session = map.get(sessionId);
   if (!session) {
@@ -35,19 +39,35 @@ mock.hooks.hook('getMiniAppConfig', context => {
     config: {}
   };
 });
+const getCurrentConnection = () => {
+  return mock.data.get('currentConnection');
+};
+mock.hooks.hook('isConnected', context => {
+  const connection = getCurrentConnection();
+  if (connection) {
+    context.result = {
+      connected: true,
+      state: ConnectState.CONNECTED,
+      connectionId: connection.connectionId
+    };
+  } else {
+    context.result = {
+      connected: false,
+      state: ConnectState.DISCONNECTED
+    };
+  }
+});
 mock.hooks.hook('connect', context => {
-  const {
-    options
-  } = context;
-  const key = "connection-".concat(options.clientType, "-").concat(options.deviceId || '');
-  if (!mock.data.has(key)) {
-    const connectionId = generateId();
-    mock.data.set(key, {
-      connectionId
-    });
-    mock.data.set("connection-".concat(connectionId), key);
+  let connection = getCurrentConnection();
+  if (connection) {
+    throw new Error('already connected');
+  } else {
+    connection = {
+      connectionId: generateId()
+    };
+    mock.data.set('currentConnection', connection);
   }
-  context.result = mock.data.get(key);
+  context.result = connection;
 });
 mock.hooks.hook('disconnect', context => {
   const {
@@ -55,9 +75,15 @@ mock.hooks.hook('disconnect', context => {
       connectionId
     }
   } = context;
-  const key = mock.data.get("connection-".concat(connectionId));
-  mock.data.delete(key);
-  mock.data.delete("connection-".concat(connectionId));
+  const connection = getCurrentConnection();
+  if (!connection) {
+    throw new Error('not connected');
+  }
+  if (connection.connectionId !== connectionId) {
+    throw new Error('connectionId mismatch');
+  }
+  mock.data.set('currentConnection', null);
+  mock.data.set('sessionMap', new Map());
 });
 mock.hooks.hook('queryAgentToken', context => {
   context.result = {
@@ -75,14 +101,25 @@ const dispatch = (type, detail) => {
   }));
 };
 mock.hooks.hook('createSession', context => {
+  const connection = getCurrentConnection();
+  if (!connection) {
+    throw new Error('not connected');
+  }
   const map = mock.data.get('sessionMap');
   const session = {
+    closed: false,
     sessionId: generateId(),
     sendDataChannels: ['audio', 'video', 'text', 'image'],
     revDataChannels: ['text', 'audio'],
     currentEvent: null,
     replyText: function (streamFlag) {
       let data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+      if (session.closed) {
+        return;
+      }
+      if (!session.currentEvent) {
+        throw new Error('replyText event not exists');
+      }
       dispatch('onTextReceived', {
         dataChannel: 'text',
         sessionIdList: [session.sessionId],
@@ -91,6 +128,9 @@ mock.hooks.hook('createSession', context => {
       });
     },
     replyEvent: eventType => {
+      if (session.closed) {
+        return;
+      }
       if (!session.currentEvent) {
         throw new Error('replyEvent event not exists');
       }
@@ -107,6 +147,32 @@ mock.hooks.hook('createSession', context => {
     sendDataChannels: session.sendDataChannels,
     revDataChannels: session.revDataChannels
   };
+
+  // 用于测试断开连接;
+  // setTimeout(() => {
+  //   dispatch('onConnectStateChanged', {
+  //     connectionId: getCurrentConnection().connectionId,
+  //     connectState: ConnectState.DISCONNECTED,
+  //     code: 200,
+  //   });
+  //   mock.data.set('currentConnection', null);
+  //   const map: Map<string, MockSession> = mock.data.get('sessionMap');
+  //   map.forEach(s => {
+  //     s.closed = true;
+  //   });
+  //   mock.data.set('sessionMap', new Map());
+  // }, 3000);
+
+  // 用于测试断开会话
+  // setTimeout(() => {
+  //   dispatch('onSessionStateChanged', {
+  //     sessionId: session.sessionId,
+  //     sessionState: SessionState.CREATE_FAILED,
+  //     code: 200,
+  //   });
+  //   session.closed = true;
+  //   map.delete(session.sessionId);
+  // }, 3000);
 });
 mock.hooks.hook('closeSession', context => {
   const map = mock.data.get('sessionMap');
@@ -259,6 +325,7 @@ mock.hooks.hook('startRecordAndSendAudioData', context => {
     let text = '';
     controller.signal.addEventListener('abort', async () => {
       var _finishResolve;
+      // 终止识别到出完整结果的延迟
       await mock.sleep(300);
       session.replyText(StreamFlag.IN_PROGRESS, {
         bizType: ReceivedTextPacketType.ASR,
@@ -278,6 +345,8 @@ mock.hooks.hook('startRecordAndSendAudioData', context => {
       }
       (_finishResolve = finishResolve) === null || _finishResolve === void 0 || _finishResolve();
     });
+
+    // 识别 ASR 的延迟
     await mock.sleep(100);
     if (controller.signal.aborted) {
       return;

package/dist/utils/errors.d.ts

@@ -0,0 +1,26 @@
+export declare class BaseError extends Error {
+    message: string;
+    code: string | number;
+    constructor(message: string, code: string | number);
+    toString(): string;
+}
+export declare class TTTError extends BaseError {
+    message: string;
+    code: string | number;
+    constructor(message: string, code: string | number);
+}
+export declare class AIStreamConnectionError extends BaseError {
+    message: string;
+    code: string | number;
+    constructor(message: string, code: string | number);
+}
+export declare class AIStreamSessionError extends BaseError {
+    message: string;
+    code: string | number;
+    constructor(message: string, code: string | number);
+}
+export declare class AIStreamEventError extends BaseError {
+    message: string;
+    code: string | number;
+    constructor(message: string, code: string | number);
+}

package/dist/utils/errors.js

@@ -0,0 +1,42 @@
+export class BaseError extends Error {
+  constructor(message, code) {
+    super(message);
+    this.message = message;
+    this.code = code;
+  }
+  toString() {
+    return "".concat(this.name, "(").concat(this.code, "): ").concat(this.message);
+  }
+}
+export class TTTError extends BaseError {
+  constructor(message, code) {
+    super(message, code);
+    this.message = message;
+    this.code = code;
+    this.name = 'TTTError';
+  }
+}
+export class AIStreamConnectionError extends BaseError {
+  constructor(message, code) {
+    super(message, code);
+    this.message = message;
+    this.code = code;
+    this.name = 'AIStreamConnectionError';
+  }
+}
+export class AIStreamSessionError extends BaseError {
+  constructor(message, code) {
+    super(message, code);
+    this.message = message;
+    this.code = code;
+    this.name = 'AIStreamSessionError';
+  }
+}
+export class AIStreamEventError extends BaseError {
+  constructor(message, code) {
+    super(message, code);
+    this.message = message;
+    this.code = code;
+    this.name = 'AIStreamEventError';
+  }
+}

package/dist/utils/promisify.d.ts

@@ -11,12 +11,6 @@ interface AsyncTTTFnParams<P> {
     }) => void;
     [key: string]: any;
 }
-export declare class TTTError extends Error {
-    message: string;
-    errorCode: string | number;
-    constructor(message: string, errorCode: string | number);
-    toString(): string;
-}
 export declare const getEnableMock: () => boolean;
 export declare const setEnableMock: (enable: boolean) => boolean;
 export declare function promisify<T extends AsyncTTTFnParams<any>>(fn: (options: any) => void, enableMock?: boolean): (options?: Omit<T, 'success' | 'fail'>) => Promise<Parameters<NonNullable<T["success"]>>[0]>;

package/dist/utils/promisify.js

@@ -2,16 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { isDevTools } from './ttt';
 import logger from './logger';
 import { mock } from './mock';
-export class TTTError extends Error {
-  constructor(message, errorCode) {
-    super(message);
-    this.message = message;
-    this.errorCode = errorCode;
-  }
-  toString() {
-    return "TTTError: ".concat(this.message, ", errorCode: ").concat(this.errorCode);
-  }
-}
+import { TTTError } from './errors';
 let callId = 100000;
 export const getEnableMock = () => {
   try {
@@ -44,7 +35,7 @@ export function promisify(fn) {
   return options => {
     return new Promise((_resolve, _reject) => {
       if (!fn) {
-        _reject(new Error('fn is not a function'));
+        _reject(new Error('promisify: fn is not a function'));
       }
       const id = callId++;
       logger.debug("TTT call  #".concat(id, " %c").concat(fn.name), 'background: blue; color: white', options);

package/dist/utils/sendMessage.d.ts

@@ -11,10 +11,6 @@ export declare class AIStreamSessionError extends Error {
     readonly code: number;
     constructor(message: string, code: number);
 }
-export declare class AIStreamConnectionError extends Error {
-    readonly code: number;
-    constructor(message: string, code: number);
-}
 export declare function sendBlocksToAIStream(params: SendBlocksToAIStreamParams): {
     response: StreamResponse;
     metaPromise: Promise<Record<string, any>>;

package/dist/utils/sendMessage.js

@@ -6,6 +6,7 @@ import { ReadableStream } from 'web-streams-polyfill';
 import { AIStreamAttributePayloadType, AIStreamAttributeType, AIStreamChatSysWorkflow, ConnectState, FileFormat, ReceivedTextPacketEof, ReceivedTextPacketType, SessionState, StreamFlag } from '../AIStreamTypes';
 import { EmitterEvent, generateId, safeParseJSON, StreamResponse } from '@ray-js/t-agent';
 import { tryCatch } from './misc';
+import { AIStreamConnectionError } from './errors';
 const mimeTypeToFormatMap = {
   'video/mp4': FileFormat.MP4,
   'text/json': FileFormat.JSON,
@@ -19,13 +20,6 @@ export class AIStreamSessionError extends Error {
     this.code = code;
   }
 }
-export class AIStreamConnectionError extends Error {
-  constructor(message, code) {
-    super(message);
-    this.name = 'AIStreamConnectionError';
-    this.code = code;
-  }
-}
 export function sendBlocksToAIStream(params) {
   const {
     session,
@@ -48,6 +42,7 @@ export function sendBlocksToAIStream(params) {
     'sys.workflow': audioEmitter ? AIStreamChatSysWorkflow.ASR_LLM : AIStreamChatSysWorkflow.LLM
   }, params.attribute);
   let canceled = false;
+  let closed = false;
   let event = null;
   let metaResolve;
   const metaPromise = new Promise(resolve => {
@@ -56,7 +51,7 @@ export function sendBlocksToAIStream(params) {
   const stream = new ReadableStream({
     async start(controller) {
       const enqueue = part => {
-        if (canceled) {
+        if (canceled || closed) {
           return;
         }
         controller.enqueue(part);
@@ -71,6 +66,7 @@ export function sendBlocksToAIStream(params) {
       }));
       if (error) {
         controller.error(error);
+        closed = true;
         controller.close();
         return;
       }
@@ -155,7 +151,7 @@ export function sendBlocksToAIStream(params) {
             audioId = null;
           }
         } else if (data.type === 'sessionState') {
-          if (data.body.sessionState === SessionState.CLOSED) {
+          if (data.body.sessionState === SessionState.CLOSED || data.body.sessionState === SessionState.CREATE_FAILED) {
             enqueue({
               type: 'error',
               error: new AIStreamSessionError('Session closed', data.body.code),
@@ -164,7 +160,7 @@ export function sendBlocksToAIStream(params) {
             });
           }
         } else if (data.type === 'connectionState') {
-          if (data.body.connectState === ConnectState.DISCONNECTED) {
+          if (data.body.connectState === ConnectState.DISCONNECTED || data.body.connectState === ConnectState.CLOSED) {
             enqueue({
               type: 'error',
               error: new AIStreamConnectionError('Connection disconnected', data.body.code),
@@ -174,8 +170,15 @@ export function sendBlocksToAIStream(params) {
           }
         }
       });
+      event.on('close', () => {
+        if (!canceled && !closed) {
+          // 当取消后，不需要关闭控制器
+          controller.close();
+        }
+      });
       event.on('finish', () => {
         if (!canceled) {
+          closed = true;
           // 当取消后，不需要关闭控制器
           controller.close();
         }

package/dist/utils/ttt.d.ts

@@ -1,4 +1,4 @@
-import { ApiRequestByAtopParams, ApiRequestByHighwayParams, AudioBody, AuthorizeParams, AuthorizePolicyStatusParams, CanIUseRouterParams, CheckConnectParams, CheckConnectResult, CloseSessionParams, ConnectParams, ConnectStateBody, CreateSessionParams, DeleteRecordListParams, DisconnectParams, EventBody, EventChannelMessageParams, GetAppInfoParams, GetCurrentHomeInfoParams, GetMiniAppConfigParams, GetAccountInfoParams, ImageBody, InsertRecordParams, NavigateToMiniProgramParams, OpenInnerH5Params, OpenMiniWidgetParams, QueryAgentTokenParams, QueryRecordListParams, RecordAmplitudesBody, RegisterChannelParams, RouterParams, SendEventChatBreakParams, SendEventEndParams, SendEventPayloadEndParams, SendEventStartParams, SendImageDataParams, SendTextDataParams, SessionStateBody, StartRecordAndSendAudioDataParams, StopRecordAndSendAudioDataParams, TextBody, UpdateRecordParams } from '../AIStreamTypes';
+import { ApiRequestByAtopParams, ApiRequestByHighwayParams, AudioBody, AuthorizeParams, AuthorizePolicyStatusParams, CanIUseRouterParams, CloseSessionParams, ConnectParams, ConnectStateBody, CreateSessionParams, DeleteRecordListParams, DisconnectParams, EventBody, EventChannelMessageParams, GetAppInfoParams, GetCurrentHomeInfoParams, GetMiniAppConfigParams, GetAccountInfoParams, ImageBody, InsertRecordParams, NavigateToMiniProgramParams, OpenInnerH5Params, OpenMiniWidgetParams, QueryAgentTokenParams, QueryRecordListParams, RecordAmplitudesBody, RegisterChannelParams, RouterParams, SendEventChatBreakParams, SendEventEndParams, SendEventPayloadEndParams, SendEventStartParams, SendImageDataParams, SendTextDataParams, SessionStateBody, StartRecordAndSendAudioDataParams, StopRecordAndSendAudioDataParams, TextBody, UpdateRecordParams, IsConnectedParams } from '../AIStreamTypes';
 export declare const getMiniAppConfig: (options?: Omit<GetMiniAppConfigParams, "success" | "fail"> | undefined) => Promise<{
     config: any;
 }>;
@@ -52,7 +52,11 @@ export declare const authorizePolicyStatus: (options?: Omit<AuthorizePolicyStatu
 export declare const registerChannel: (options?: Omit<RegisterChannelParams, "success" | "fail"> | undefined) => Promise<null>;
 export declare const listenReceiveMessage: (listener: (params: EventChannelMessageParams) => void) => () => void;
 export declare const openMiniWidget: (options?: Omit<OpenMiniWidgetParams, "success" | "fail"> | undefined) => Promise<null>;
-export declare const isConnectSync: (params: CheckConnectParams) => CheckConnectResult;
+export declare const isConnected: (options?: Omit<IsConnectedParams, "success" | "fail"> | undefined) => Promise<{
+    connected: boolean;
+    state: number;
+    connectionId?: string | undefined;
+}>;
 export declare const connect: (options?: Omit<ConnectParams, "success" | "fail"> | undefined) => Promise<{
     connectionId: string;
 }>;

package/dist/utils/ttt.js

@@ -1,8 +1,6 @@
 import { listening, promisify } from './promisify';
-import { ConnectClientType, ConnectState } from '../AIStreamTypes';
-import { generateId } from '@ray-js/t-agent';
 export const getMiniAppConfig = promisify(ty.getMiniAppConfig, true);
-export const getAccountInfo = promisify(ty.getAccountInfo, true);
+export const getAccountInfo = promisify(ty.getAccountInfo);
 export const isDevTools = () => {
   return ty.getSystemInfoSync().brand === 'devtools';
 };
@@ -30,17 +28,7 @@ ty.authorizePolicyStatus);
 export const registerChannel = promisify(ty.registerChannel);
 export const listenReceiveMessage = listening(ty.onReceiveMessage, ty.offReceiveMessage);
 export const openMiniWidget = promisify(ty.openMiniWidget);
-export const isConnectSync = params => {
-  if (isDevTools()) {
-    return {
-      connected: true,
-      state: ConnectState.CONNECTED,
-      connectionId: generateId(),
-      clientType: ConnectClientType.APP
-    };
-  }
-  return ty.aistream.isConnectedSync(params);
-};
+export const isConnected = promisify(ty.aistream.isConnected, true);
 export const connect = promisify(ty.aistream.connect, true);
 export const disconnect = promisify(ty.aistream.disconnect, true);
 export const queryAgentToken = promisify(ty.aistream.queryAgentToken, true);

package/dist/withAIStream.js

@@ -5,7 +5,6 @@ import "core-js/modules/es.array.flat.js";
 import "core-js/modules/es.array.reverse.js";
 import "core-js/modules/es.array.unscopables.flat.js";
 import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import { BubbleTileStatus, ChatMessageStatus, createHooks } from '@ray-js/t-agent';
@@ -351,10 +350,19 @@ export function withAIStream() {
         payload
       } = context;
       const message = session.messages.get(payload.messageId);
+      if (!message) {
+        throw new Error('message not found');
+      }
       const {
         eventId,
         sessionId
-      } = (message === null || message === void 0 ? void 0 : message.meta) || {};
+      } = message.meta;
+      if (!eventId || !sessionId) {
+        context.result = {
+          success: true
+        };
+        return;
+      }
       await feedback({
         requestId: [eventId, sessionId].join('#'),
         type: payload.rate
@@ -440,12 +448,7 @@ export function withAIStream() {
         clearAllMessages: async () => {
           // 删除内存中的消息
           const messages = agent.session.messages.values();
-          Array.from(messages).forEach(message => {
-            message.remove();
-          });
-          if (options !== null && options !== void 0 && options.indexId) {
-            return;
-          }
+          await Promise.all(Array.from(messages).map(message => message.remove()));
           // 清空缓存的数据
           const historyStore = getHistoryStore();
           if (historyStore) {

package/package.json

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