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

package/dist/AIStreamTypes.d.ts

@@ -692,18 +692,18 @@ export declare enum AIStreamErrorCode {
     ASR_EMPTY = "asr-empty"
 }
 export declare enum AIStreamAppErrorCode {
-    GENERIC_ERROR = 39001,
-    INVALID_PARAMS = 39002,
-    HTTP_REQUEST_FAILED = 39003,
-    CONNECTION_INVALID = 39004,
-    SESSION_ID_INVALID = 39005,
-    EVENT_ID_INVALID = 39006,
-    DATA_CHANNEL_NOT_FOUND = 39007,
-    INVALID_DATA_PACKET = 39008,
-    FILE_DATA_READ_ERROR = 39009,
-    DATA_SEND_FAILED = 39010,
-    CONNECTION_CLOSED_BY_REMOTE = 39012,
-    AUDIO_UNEXPECTEDLY_RESET = 39014,
+    GENERIC_ERROR = 39001,// 通用错误，用于一些杂项错误
+    INVALID_PARAMS = 39002,// 参数不合法，详见备注
+    HTTP_REQUEST_FAILED = 39003,// HTTP 请求失败
+    CONNECTION_INVALID = 39004,// Connection 未连接
+    SESSION_ID_INVALID = 39005,// SessionId 不存在
+    EVENT_ID_INVALID = 39006,// EventId 为空
+    DATA_CHANNEL_NOT_FOUND = 39007,// DataChannel 不存在
+    INVALID_DATA_PACKET = 39008,// 数据包不合法
+    FILE_DATA_READ_ERROR = 39009,// 文件数据读取异常
+    DATA_SEND_FAILED = 39010,// 发送数据失败
+    CONNECTION_CLOSED_BY_REMOTE = 39012,// Connection 被远端关闭
+    AUDIO_UNEXPECTEDLY_RESET = 39014,// 音频组件被重置
     RECONNECT = 39016
 }
 export declare enum AIStreamServerErrorCode {
@@ -1031,7 +1031,7 @@ export type RecordAmplitudesBody = {
     amplitudes: number[];
 };
 export declare enum NetworkType {
-    NONE = "none",
+    NONE = "none",// 无网络
     CELL_2G = "2g",
     CELL_3G = "3g",
     CELL_4G = "4g",
@@ -1703,8 +1703,8 @@ export type InsertRecordParams = {
     complete?: () => void;
 };
 export declare enum ReceivedTextPacketType {
-    ASR = "ASR",
-    SKILL = "SKILL",
+    ASR = "ASR",// ASR 识别的文本
+    SKILL = "SKILL",// 数据
     NLG = "NLG"
 }
 export declare enum ReceivedTextPacketEof {
@@ -1731,7 +1731,7 @@ export type ReceivedTextNlgPacket = ReceivedTextPacketBase<ReceivedTextPacketTyp
     finish: boolean;
 }>;
 export declare enum BuildInSkillCode {
-    SEARCH_KNOWLEDGE = "searchKnowledge",
+    SEARCH_KNOWLEDGE = "searchKnowledge",// 知识库搜索
     SMART_HOME = "smart_home"
 }
 export type ReceivedTextSkillPacketBody<Code = BuildInSkillCode | string, G = any, C = any> = {

package/dist/asr/AsrAgent.d.ts

@@ -36,9 +36,9 @@ export interface AsrAgentOptions {
     eventIdPrefix?: string;
 }
 export declare enum AsrAgentStatus {
-    PENDING = "pending",
-    RECORDING = "recording",
-    ASR = "asr",
+    PENDING = "pending",// 等待开始
+    RECORDING = "recording",// 录音中
+    ASR = "asr",// ASR 处理中
     ABORTING = "aborting"
 }
 export declare class AsrAgent {

package/dist/asr/AsrAgent.js

@@ -347,6 +347,7 @@ export class AsrAgent {
     if (this.disposed) {
       return;
     }
+    this.disposed = true;
     if (this.activeSession) {
       this.activeSession.close();
     }

package/dist/polyfill.js

@@ -1,4 +1,5 @@
 import "core-js/modules/web.queue-microtask.js";
+/* istanbul ignore file */
 // @ts-ignore
 globalThis.queueMicrotask = callback => {
   Promise.resolve().then(callback).catch(err => {

package/dist/utils/AIStream.d.ts

@@ -70,7 +70,7 @@ export declare class AIStreamSession {
     private promise;
     tokenExtParamsResolvable: import("./object").Resolvable<{
         [key: string]: any;
-        chatId?: string | undefined;
+        chatId?: string;
     }>;
     private listeners;
     constructor(connection: AIStreamConnection, pool: AIStreamObserverPool, options: AIStreamSessionOptions);

package/dist/utils/AIStream.js

@@ -23,6 +23,7 @@ export class AIStreamClient {
     let connection = this.cached.get(key);
     if (!connection) {
       connection = new AIStreamConnection(this.pool, options);
+      this.cached.set(key, connection);
     }
     return connection;
   }
@@ -287,7 +288,7 @@ export class AIStreamSession {
         }));
         if (err) {
           finErr = err;
-          if (err.code === AIStreamAppErrorCode.RECONNECT) {
+          if (err.originalCode === AIStreamAppErrorCode.RECONNECT) {
             // 200 毫秒后再试
             await new Promise(resolve => {
               setTimeout(resolve, 200);

package/dist/utils/errors.js

@@ -96,9 +96,11 @@ export async function tryCatchTTT(fn) {
       code,
       message
     } = error;
-    message = "".concat(message, " (original_code: ").concat(code || '-', ")");
+    const originalCode = code;
+    message = "".concat(message, " (original_code: ").concat(originalCode || '-', ")");
     code = transformErrorCode(code);
     const e = removeTopStackFrame(new AIStreamError(message, code));
+    e.originalCode = originalCode;
     return [e, null];
   }
   return [null, result];

package/dist/utils/mock.d.ts

@@ -54,9 +54,9 @@ declare const mock: {
     emitter: Emitter;
     hooks: import("hookable").Hookable<MockHooks, string>;
     getRecords: <T = any>() => Row<T>[];
-    getRecord: <T_1 = any>(id: number) => Row<T_1> | undefined;
-    setRecord: <T_2 = any>(entry: Row<T_2>) => void;
-    updateRecord: <T_3 = any>(entry: Row<T_3>) => void;
+    getRecord: <T = any>(id: number) => Row<T> | undefined;
+    setRecord: <T = any>(entry: Row<T>) => void;
+    updateRecord: <T = any>(entry: Row<T>) => void;
     deleteRecord: (id: number) => void;
     clearRecords: () => void;
     getId: () => number;

package/dist/utils/promisify.d.ts

@@ -13,6 +13,6 @@ interface AsyncTTTFnParams<P> {
 }
 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]>;
+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]>;
 export declare function listening<T>(on: (listener: (params: T) => void) => void, off: (listener: (params: T) => void) => void, enableMock?: boolean): (listener: (params: T) => void) => () => void;
 export {};

package/dist/utils/sendMessage.js

@@ -65,8 +65,10 @@ export function sendBlocksToAIStream(params) {
         if (!closed) {
           logger.debug('sendBlocksToAIStream close');
           closed = true;
-          if (!canceled && !(signal !== null && signal !== void 0 && signal.aborted)) {
+          try {
             controller.close();
+          } catch (error) {
+            logger.debug('sendBlocksToAIStream close ignored', error);
           }
         }
       };
@@ -251,7 +253,7 @@ export function sendBlocksToAIStream(params) {
           if (data.body.sessionState === SessionState.CLOSED || data.body.sessionState === SessionState.CREATE_FAILED) {
             const msg = SessionState[data.body.sessionState];
             const e = new AIStreamError("Session Error: ".concat(msg, ", (original_code: ").concat(data.body.code, ")"), transformErrorCode(data.body.code));
-            emitError(error);
+            emitError(e);
             if (audioEmitter) {
               audioEmitter.dispatchEvent(new EmitterEvent('error', {
                 detail: e
@@ -262,7 +264,7 @@ export function sendBlocksToAIStream(params) {
         } else if (data.type === 'connectionState') {
           if (data.body.connectState === ConnectState.DISCONNECTED || data.body.connectState === ConnectState.CLOSED) {
             const e = new AIStreamError("Session disconnected, (original_code: ".concat(data.body.code, ")"), transformErrorCode(data.body.code));
-            emitError(error);
+            emitError(e);
             if (audioEmitter) {
               audioEmitter.dispatchEvent(new EmitterEvent('error', {
                 detail: e
@@ -303,14 +305,14 @@ export function sendBlocksToAIStream(params) {
         } else if (block.type === 'file_path') {
           event.write({
             type: 'file',
-            format: mimeTypeToFormatMap[block.file_url.mimeType] || 0,
+            format: mimeTypeToFormatMap[block.file_path.mimeType] || 0,
             path: block.file_path.path
           }).catch(emitError);
         } else if (block.type === 'video_path') {
           event.write({
             type: 'file',
             format: FileFormat.MP4,
-            path: block.file_path.path
+            path: block.video_path.path
           }).catch(emitError);
         }
       }

package/dist/utils/ttt.d.ts

@@ -36,11 +36,11 @@ export declare const getAppInfo: (options?: Omit<GetAppInfoParams, "success" | "
     regionCode: string;
     appName: string;
     appIcon: string;
-    appEnv?: number | undefined;
+    appEnv?: number;
     appBundleId: string;
     appScheme: string;
     appId: string;
-    clientId?: string | undefined;
+    clientId?: string;
 }>;
 export declare const canIUseRouter: (options?: Omit<CanIUseRouterParams, "success" | "fail"> | undefined) => Promise<{
     result: boolean;
@@ -57,7 +57,7 @@ export declare const openMiniWidget: (options?: Omit<OpenMiniWidgetParams, "succ
 export declare const isConnected: (options?: Omit<IsConnectedParams, "success" | "fail"> | undefined) => Promise<{
     connected: boolean;
     state: number;
-    connectionId?: string | undefined;
+    connectionId?: string;
 }>;
 export declare const connect: (options?: Omit<ConnectParams, "success" | "fail"> | undefined) => Promise<{
     connectionId: string;
@@ -66,7 +66,7 @@ export declare const disconnect: (options?: Omit<DisconnectParams, "success" | "
 export declare const queryAgentToken: (options?: Omit<QueryAgentTokenParams, "success" | "fail"> | undefined) => Promise<{
     agentToken: string;
     bizConfig: import("../AIStreamTypes").BizConfig;
-    extParams?: string | undefined;
+    extParams?: string;
 }>;
 export declare const createSession: (options?: Omit<CreateSessionParams, "success" | "fail"> | undefined) => Promise<{
     sessionId: string;

package/dist/withAIStream.d.ts

@@ -73,10 +73,10 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
             metaPromise: Promise<Record<string, any>>;
         };
         chat: (blocks: InputBlock[], signal?: AbortSignalObject, options?: {
-            sendBy?: string | undefined;
-            responseBy?: string | undefined;
-            userData?: AIStreamUserData | undefined;
-        } | undefined) => Promise<ChatMessage[]>;
+            sendBy?: string;
+            responseBy?: string;
+            userData?: AIStreamUserData;
+        }) => Promise<ChatMessage[]>;
         options: AIStreamOptions;
         removeMessage: (message: ChatMessage) => Promise<void>;
         clearAllMessages: () => Promise<void>;
@@ -87,15 +87,15 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
             thingjson?: any;
             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;
-        onUserDataRead: (fn: AIStreamHooks['onUserDataRead']) => () => void;
-        onSessionEventReceived: (fn: AIStreamHooks['onSessionEventReceived']) => () => void;
+        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;
+        onUserDataRead: (fn: AIStreamHooks["onUserDataRead"]) => () => void;
+        onSessionEventReceived: (fn: AIStreamHooks["onSessionEventReceived"]) => () => void;
         sendEvent: (params: SendAIStreamEventParams) => Promise<null>;
-        onTTTAction: (fn: AIStreamHooks['onTTTAction']) => () => void;
+        onTTTAction: (fn: AIStreamHooks["onTTTAction"]) => () => void;
         getChatId: () => Promise<string>;
     };
 };

package/dist/withAIStream.js

@@ -611,7 +611,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);
           }
         }

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.2",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -21,7 +21,9 @@
   "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",
@@ -35,5 +37,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "040499ca11aedda3246121f880807da0f8af3cc9"
+  "gitHead": "450ca8d41536094b3bea57198fd7724ba6812438"
 }