@ray-js/t-agent-plugin-aistream 0.2.1-beta.3 → 0.2.2-beta-2

package/dist/AIStreamTypes.d.ts

@@ -1573,8 +1573,7 @@ export type ReceivedTextAsrPacket = ReceivedTextPacketBase<ReceivedTextPacketTyp
     text: string;
 }>;
 export type ReceivedTextNlgPacket = ReceivedTextPacketBase<ReceivedTextPacketType.NLG, {
-    reasoningContent?: string;
-    content?: string;
+    content: string;
     appendMode: 'append';
     finish: boolean;
 }>;
@@ -1602,17 +1601,17 @@ export type ReceivedSearchKnowledgeSkill = ReceivedTextSkillPacketBody<BuildInSk
     };
 }>;
 export interface ReceivedSmartHomeSkillDevice {
-    devId: string;
-    devIcon: string;
+    deviceId: string;
+    icon: string;
     dps?: Record<string, string>;
-    devName: string;
+    name: string;
     room: string;
     success: boolean;
 }
 export interface ReceivedSmartHomeSkillScene {
     sceneId: string;
-    sceneName: string;
-    sceneIcon: string;
+    name: string;
+    icon: string;
     type: number;
     valid: boolean;
     displayColor: string;

package/dist/ChatHistoryStore.d.ts

@@ -10,7 +10,7 @@ export interface StoredMessageObject {
     homeId?: number;
     indexId?: string;
 }
-export interface ChatHistoryStorePagination {
+interface Pagination {
     sort?: 'asc' | 'desc';
     offset: number;
     limit: number;
@@ -30,7 +30,7 @@ export interface ChatHistoryStore<Key = number> {
     /** 查询消息 */
     query(id: Key): Promise<StoredMessageObject>;
     /** 批量查询 */
-    queryAll(pagination: ChatHistoryStorePagination): Promise<{
+    queryAll(pagination: Pagination): Promise<{
         total: number;
         records: StoredMessageObject[];
     }>;
@@ -45,3 +45,24 @@ export interface ChatHistoryStore<Key = number> {
         id: Key;
     }>;
 }
+export declare class ChatHistoryLocalStore implements ChatHistoryStore {
+    /** 版本号，会作为内部索引的一部分 */
+    private readonly version;
+    private options;
+    constructor(options: ChatHistoryStoreOptions);
+    private itemToMessage;
+    private getRecordIndex;
+    private getQueryCondition;
+    query(id: number): Promise<StoredMessageObject | null>;
+    queryAll(pagination: Pagination): Promise<{
+        total: number;
+        records: StoredMessageObject[];
+    }>;
+    update(id: number, body: ChatMessageObject): Promise<void>;
+    remove(id: number): Promise<void>;
+    removeAll(ids?: number[]): Promise<void>;
+    insert(message: ChatMessageObject): Promise<{
+        id: number;
+    }>;
+}
+export {};

package/dist/ChatHistoryStore.js

@@ -1 +1,191 @@
-export {};
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+const _excluded = ["id"];
+import "core-js/modules/es.array.sort.js";
+import "core-js/modules/es.json.stringify.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
+import "core-js/modules/esnext.iterator.map.js";
+import { safeParseJSON } from '@ray-js/t-agent';
+import { insertRecord, deleteRecordList, updateRecord, queryRecordList } from './utils';
+import logger from './utils/logger';
+export class ChatHistoryLocalStore {
+  constructor(options) {
+    /** 版本号，会作为内部索引的一部分 */
+    _defineProperty(this, "version", 'v1');
+    if (!options.agentId) {
+      throw new Error('agentId is required');
+    }
+    if (!options.bizCode) {
+      throw new Error('indexId is required');
+    }
+    this.options = _objectSpread({
+      indexId: 'default',
+      homeId: 0
+    }, options);
+  }
+  itemToMessage(item) {
+    const messageInfo = safeParseJSON(item.data);
+    if (!messageInfo) {
+      logger.error('ChatHistoryLocalStore failed parse item: ', item);
+      return null;
+    }
+    messageInfo.message.meta.id = item.id;
+    return {
+      id: item.id,
+      indexId: item.index2,
+      agentId: item.solutionCode,
+      deviceId: item.devId,
+      homeId: item.homeId,
+      createdAt: messageInfo.createdAt,
+      updatedAt: messageInfo.updatedAt,
+      message: messageInfo.message
+    };
+  }
+  getRecordIndex() {
+    return {
+      bizCode: this.options.bizCode,
+      solutionCode: this.options.agentId,
+      homeId: this.options.homeId,
+      index: "t-agent-".concat(this.version),
+      index2: this.options.indexId,
+      deviceId: this.options.deviceId
+    };
+  }
+  getQueryCondition() {
+    const indexes = this.getRecordIndex();
+    const params = {
+      bizCode: [indexes.bizCode],
+      solutionCode: [indexes.solutionCode],
+      homeId: [indexes.homeId],
+      index: [indexes.index],
+      index2: [indexes.index2]
+    };
+    if (indexes.deviceId) {
+      params.devId = [indexes.deviceId];
+    }
+    return params;
+  }
+  async query(id) {
+    if (typeof id !== 'number') {
+      logger.warn('ChatHistoryLocalStore query id is not number', {
+        id
+      });
+      return null;
+    }
+    const queryCondition = _objectSpread(_objectSpread({}, this.getQueryCondition()), {}, {
+      id: [id],
+      offset: 0,
+      limit: 1,
+      sortType: 1
+    });
+    const {
+      records
+    } = await queryRecordList(queryCondition);
+    return records[0] ? this.itemToMessage(records[0]) : null;
+  }
+  async queryAll(pagination) {
+    const queryCondition = _objectSpread(_objectSpread({}, this.getQueryCondition()), {}, {
+      offset: 0,
+      sortType: 1
+    });
+    const {
+      offset,
+      limit
+    } = pagination || {};
+    if (offset) {
+      queryCondition.offset = offset;
+    }
+    if (limit) {
+      queryCondition.limit = limit;
+    }
+    queryCondition.sortType = pagination.sort === 'desc' ? 0 : 1;
+    try {
+      const result = await queryRecordList(queryCondition);
+      const list = result.records.map(this.itemToMessage).filter(item => !!item);
+      return {
+        total: result.total,
+        records: list
+      };
+    } catch (error) {
+      logger.error('ChatHistoryLocalStore queryRecordList error', error);
+      return {
+        total: 0,
+        records: []
+      };
+    }
+  }
+  async update(id, body) {
+    if (typeof id !== 'number') {
+      throw new Error('query id is not number');
+    }
+    const stored = await this.query(id);
+    if (!stored) {
+      throw new Error("could not find message: ".concat(id));
+    }
+    const nowTime = Date.now();
+    const msgObject = {
+      message: body,
+      createdAt: stored.createdAt,
+      updatedAt: nowTime
+    };
+    stored.message.meta.updatedAt = nowTime;
+    return updateRecord({
+      id,
+      data: JSON.stringify(msgObject)
+    });
+  }
+  async remove(id) {
+    if (typeof id !== 'number') {
+      throw new Error('query id is not number');
+    }
+    const stored = await this.query(id);
+    if (!stored) {
+      logger.warn('ChatHistoryLocalStore not find by id', {
+        id
+      });
+    }
+    await deleteRecordList({
+      id: [id]
+    });
+  }
+  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();
+
+    // 先把 id 提取出来不存，id 始终是在数据库里自增的
+    const _message$meta = message.meta,
+      {
+        id
+      } = _message$meta,
+      meta = _objectWithoutProperties(_message$meta, _excluded);
+    const msgObject = {
+      message: _objectSpread(_objectSpread({}, message), {}, {
+        meta: _objectSpread(_objectSpread(_objectSpread({}, meta), this.options), {}, {
+          createdAt: nowTime,
+          updatedAt: nowTime
+        })
+      }),
+      createdAt: nowTime,
+      updatedAt: nowTime
+    };
+    return insertRecord(_objectSpread(_objectSpread({}, this.getRecordIndex()), {}, {
+      data: JSON.stringify(msgObject)
+    }));
+  }
+}

package/dist/buildIn/withBuildIn.js

@@ -41,41 +41,18 @@ export function withBuildIn() {
 
     // 关联文档
 
+    // 关联智能家居卡片
     (() => {
       onSkillsEnd((skills, responseMessage) => {
         if (!responseMessage) {
           return;
         }
-        const data = {
-          documents: []
+        const operateData = {
+          deviceInfo: [],
+          sceneInfo: [],
+          changeInfo: []
         };
-        for (const skill of skills) {
-          var _content$custom;
-          if (skill.code !== BuildInSkillCode.SEARCH_KNOWLEDGE) {
-            continue;
-          }
-          const content = skill;
-          if (!((_content$custom = content.custom) !== null && _content$custom !== void 0 && (_content$custom = _content$custom.data) !== null && _content$custom !== void 0 && _content$custom.documents)) {
-            continue;
-          }
-          for (const doc of content.custom.data.documents) {
-            data.documents.push({
-              title: doc.title,
-              url: doc.url
-            });
-          }
-        }
-        if (data.documents.length) {
-          responseMessage.bubble.addTile('documents', data);
-        }
-      });
-    })();
-    (() => {
-      onSkillsEnd((skills, responseMessage) => {
-        if (!responseMessage) {
-          return;
-        }
-        const data = {
+        const executeData = {
           deviceInfo: [],
           sceneInfo: [],
           changeInfo: []
@@ -87,11 +64,11 @@ export function withBuildIn() {
           const content = skill;
           if (content.general.action === ReceivedSmartHomeSkillAction.QUERY_SCENE) {
             for (const scene of content.general.data.scenes) {
-              data.sceneInfo.push({
+              executeData.sceneInfo.push({
                 type: scene.type,
                 enabled: scene.enable,
-                icon: scene.sceneIcon,
-                name: scene.sceneName,
+                icon: scene.icon,
+                name: scene.name,
                 sceneId: scene.sceneId,
                 intent: 'queryScene',
                 valid: scene.valid,
@@ -101,10 +78,10 @@ export function withBuildIn() {
             }
           } else if (content.general.action === ReceivedSmartHomeSkillAction.CONTROL_SCENE) {
             for (const scene of content.general.data.scenes) {
-              data.sceneInfo.push({
+              operateData.sceneInfo.push({
                 type: scene.type,
-                icon: scene.sceneIcon,
-                name: scene.sceneName,
+                icon: scene.icon,
+                name: scene.name,
                 sceneId: scene.sceneId,
                 intent: 'controlScene',
                 valid: scene.valid,
@@ -114,10 +91,10 @@ export function withBuildIn() {
             }
           } else if (content.general.action === ReceivedSmartHomeSkillAction.QUERY_DEVICE) {
             for (const dev of content.general.data.devices) {
-              data.deviceInfo.push({
-                icon: dev.devIcon,
-                name: dev.devName,
-                deviceId: dev.devId,
+              executeData.deviceInfo.push({
+                icon: dev.icon,
+                name: dev.name,
+                deviceId: dev.deviceId,
                 intent: 'queryDevice',
                 room: dev.room,
                 success: dev.success
@@ -125,18 +102,51 @@ export function withBuildIn() {
             }
           } else if (content.general.action === ReceivedSmartHomeSkillAction.CONTROL_DEVICE) {
             for (const dev of content.general.data.devices) {
-              data.deviceInfo.push({
-                icon: dev.devIcon,
-                name: dev.devName,
-                deviceId: dev.devId,
+              operateData.deviceInfo.push({
+                icon: dev.icon,
+                name: dev.name,
+                deviceId: dev.deviceId,
                 intent: 'controlDevice',
                 success: null
               });
             }
           }
         }
-        if (data.deviceInfo.length) {
-          responseMessage.bubble.addTile('operateCard', data);
+        if (executeData.deviceInfo.length || executeData.sceneInfo.length || executeData.changeInfo.length) {
+          responseMessage.bubble.addTile('executeCard', executeData);
+        }
+        if (operateData.deviceInfo.length || operateData.sceneInfo.length || operateData.changeInfo.length) {
+          responseMessage.bubble.addTile('operateCard', operateData);
+        }
+      });
+    })();
+    // 最后是关联文档
+    (() => {
+      onSkillsEnd((skills, responseMessage) => {
+        if (!responseMessage) {
+          return;
+        }
+        const data = {
+          documents: []
+        };
+        for (const skill of skills) {
+          var _content$custom;
+          if (skill.code !== BuildInSkillCode.SEARCH_KNOWLEDGE) {
+            continue;
+          }
+          const content = skill;
+          if (!((_content$custom = content.custom) !== null && _content$custom !== void 0 && (_content$custom = _content$custom.data) !== null && _content$custom !== void 0 && _content$custom.documents)) {
+            continue;
+          }
+          for (const doc of content.custom.data.documents) {
+            data.documents.push({
+              title: doc.title,
+              url: doc.url
+            });
+          }
+        }
+        if (data.documents.length) {
+          responseMessage.bubble.addTile('documents', data);
         }
       });
     })();

package/dist/index.d.ts

@@ -3,4 +3,3 @@ export * from './AIStreamTypes';
 export * from './withAIStream';
 export * from './ChatHistoryStore';
 export * from './buildIn';
-export * from './ChatHistoryLocalStore';

package/dist/index.js

@@ -2,5 +2,4 @@ export * from './utils';
 export * from './AIStreamTypes';
 export * from './withAIStream';
 export * from './ChatHistoryStore';
-export * from './buildIn';
-export * from './ChatHistoryLocalStore';
+export * from './buildIn';

package/dist/utils/observer.d.ts

@@ -1,4 +1,4 @@
-import { AudioBody, ConnectStateBody, EventBody, FileBody, ImageBody, RecordAmplitudesBody, SessionStateBody, TextBody, VideoBody } from '../AIStreamTypes';
+import { AudioBody, ConnectStateBody, EventBody, FileBody, ImageBody, SessionStateBody, TextBody, VideoBody } from '../AIStreamTypes';
 export type AIStreamDataEntry = {
     type: 'text';
     body: TextBody;
@@ -23,9 +23,6 @@ export type AIStreamDataEntry = {
 } | {
     type: 'sessionState';
     body: SessionStateBody;
-} | {
-    type: 'amplitudes';
-    body: RecordAmplitudesBody;
 };
 export interface AIStreamObserverOptions {
     sessionState?: boolean;
@@ -38,7 +35,6 @@ export interface AIStreamObserverOptions {
     image?: boolean;
     dataChannels?: string[];
     sessionId?: string;
-    amplitudes?: boolean;
 }
 export declare class AIStreamObserverPool {
     isStarted: boolean;

package/dist/utils/observer.js

@@ -3,9 +3,9 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import { ConnectState, EventType, SessionState, StreamFlag } from '../AIStreamTypes';
-import { listenAudioReceived, listenConnectStateChanged, listenEventReceived, listenImageReceived, listenRecordAmplitudes, listenSessionStateChanged, listenTextReceived } from './ttt';
+import { listenAudioReceived, listenConnectStateChanged, listenEventReceived, listenImageReceived, listenSessionStateChanged, listenTextReceived } from './ttt';
 import logger from './logger';
-const types = ['connectionState', 'sessionState', 'event', 'text', 'audio', 'video', 'file', 'image', 'amplitudes'];
+const types = ['connectionState', 'sessionState', 'event', 'text', 'audio', 'video', 'file', 'image'];
 export class AIStreamObserverPool {
   constructor() {
     _defineProperty(this, "isStarted", false);
@@ -18,8 +18,7 @@ export class AIStreamObserverPool {
       audio: new Set(),
       video: new Set(),
       file: new Set(),
-      image: new Set(),
-      amplitudes: new Set()
+      image: new Set()
     };
   }
   start() {
@@ -27,21 +26,19 @@ export class AIStreamObserverPool {
       return;
     }
     const handle = entry => {
+      var _entry$body;
       const observers = this.observerMap[entry.type];
       let state = '';
-      if (entry.type !== 'amplitudes') {
-        var _entry$body;
-        if (entry.type === 'connectionState') {
-          state = "".concat(ConnectState[entry.body.connectState], " ").concat(entry.body.code || '');
-        } else if (entry.type === 'sessionState') {
-          state = "".concat(SessionState[entry.body.sessionState], " ").concat(entry.body.code || '');
-        } else if (entry.type === 'event') {
-          state = "".concat(EventType[entry.body.eventType]);
-        } else if ((_entry$body = entry.body) !== null && _entry$body !== void 0 && _entry$body.streamFlag) {
-          state = "".concat(StreamFlag[entry.body.streamFlag]);
-        }
-        logger.debug("Pool received: %c".concat(observers.size ? '⊕' : '×').concat(entry.type, " ").concat(state), 'background: black; color: white', entry);
+      if (entry.type === 'connectionState') {
+        state = "".concat(ConnectState[entry.body.connectState], " ").concat(entry.body.code || '');
+      } else if (entry.type === 'sessionState') {
+        state = "".concat(SessionState[entry.body.sessionState], " ").concat(entry.body.code || '');
+      } else if (entry.type === 'event') {
+        state = "".concat(EventType[entry.body.eventType]);
+      } else if ((_entry$body = entry.body) !== null && _entry$body !== void 0 && _entry$body.streamFlag) {
+        state = "".concat(StreamFlag[entry.body.streamFlag]);
       }
+      logger.debug("Pool received: %c".concat(observers.size ? '⊕' : '×').concat(entry.type, " ").concat(state), 'background: black; color: white', entry);
       observers.forEach(observer => {
         if (entry.type === 'text' || entry.type === 'audio' || entry.type === 'video' || entry.type === 'file' || entry.type === 'image') {
           const {
@@ -81,9 +78,6 @@ export class AIStreamObserverPool {
     })), listenImageReceived(body => handle({
       type: 'image',
       body
-    })), listenRecordAmplitudes(body => handle({
-      type: 'amplitudes',
-      body
     }))
     // listenVideoReceived(body => handle({ type: 'video', body })),
     // listenFileReceived(body => handle({ type: 'file', body })),
@@ -102,8 +96,7 @@ export class AIStreamObserverPool {
       audio: new Set(),
       video: new Set(),
       file: new Set(),
-      image: new Set(),
-      amplitudes: new Set()
+      image: new Set()
     };
   }
   connect(observer) {

package/dist/utils/sendMessage.js

@@ -144,13 +144,11 @@ export function sendBlocksToAIStream(params) {
           }
           const packet = safeParseJSON(data.body.text);
           if (packet.bizType === ReceivedTextPacketType.NLG) {
-            // TODO: 处理 reasoningContent 推理能力
-            const delta = packet.data.content || '';
-            logger.debug('sendBlocksToAIStream Receive NLG', delta);
-            const text = prevText + delta;
+            logger.debug('sendBlocksToAIStream Receive NLG', packet.data.content);
+            const text = prevText + packet.data.content;
             enqueue({
               type: 'text',
-              delta,
+              delta: packet.data.content,
               text,
               meta
             });

package/dist/withAIStream.d.ts

@@ -1,7 +1,6 @@
-import { ChatAgent, ChatMessage, ChatTile, GetChatPluginHandler, InputBlock } from '@ray-js/t-agent';
-import { TTTAction } from './utils';
+import { ChatAgent, ChatCardObject, ChatMessage, GetChatPluginHandler, InputBlock } from '@ray-js/t-agent';
 import { ConnectClientType, ReceivedTextSkillPacketBody } from './AIStreamTypes';
-import { ChatHistoryStore, StoredMessageObject } from './ChatHistoryStore';
+import { ChatHistoryLocalStore, StoredMessageObject } from './ChatHistoryStore';
 export interface AIStreamOptions {
     /** client 类型: 1-作为设备代理, 2-作为 App */
     clientType?: ConnectClientType;
@@ -25,8 +24,8 @@ export interface AIStreamOptions {
     homeId?: number;
     /** 是否在 onAgentStart 阶段就建立连接 */
     earlyStart?: boolean;
-    /** 自定义消息存储, 返回的实例需要实现 ChatHistoryStore 接口, 返回null则不存储历史聊天记录 */
-    createChatHistoryStore?: (agent: ChatAgent) => ChatHistoryStore | null;
+    /** 自定义消息存储, 返回的实例需要实现 ChatHistoryLocalStore 接口, 返回null则不存储历史聊天记录 */
+    createChatHistoryStore?: (agent: ChatAgent) => ChatHistoryLocalStore | null;
     /** 是否开启音频合成 */
     enableTts?: boolean;
 }
@@ -41,15 +40,15 @@ export interface AIStreamHooks {
     onSkillsEnd: (skills: ReceivedTextSkillPacketBody[], respMsg: ChatMessage, result: {
         messages: ChatMessage[];
     }) => void;
-    onTTTAction: (tile: ChatTile | null, result: {
-        action?: TTTAction;
+    onCardsReceived: (skills: ReceivedTextSkillPacketBody[], result: {
+        cards: ChatCardObject[];
     }) => void;
 }
 export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAgent) => {
-    hooks: import("hookable").Hookable<AIStreamHooks, import("hookable").HookKeys<AIStreamHooks>>;
+    hooks: import("hookable").Hookable<any, string>;
     aiStream: {
         send: (blocks: InputBlock[], signal?: AbortSignal, extraOptions?: Record<string, any>) => {
-            response: import("@ray-js/t-agent").StreamResponse; /** 历史消息数量，默认1000，为0的话，则已分页的方式取全部数据 */
+            response: import("@ray-js/t-agent").StreamResponse;
             metaPromise: Promise<Record<string, any>>;
         };
         chat: (blocks: InputBlock[], signal?: AbortSignal, options?: {
@@ -60,6 +59,9 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
         options: AIStreamOptions;
         removeMessage: (message: ChatMessage) => Promise<void>;
         clearAllMessages: () => Promise<void>;
+        onSkillCompose: (fn: AIStreamHooks['onSkillCompose']) => () => void;
+        onSkillsEnd: (fn: AIStreamHooks['onSkillsEnd']) => () => void;
+        onCardsReceived: (fn: AIStreamHooks['onCardsReceived']) => () => void;
         feedback: ({ requestId, type }: {
             requestId: string;
             type: string;
@@ -67,8 +69,5 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
             thingjson?: any;
             data: string;
         }>;
-        onSkillCompose: (fn: AIStreamHooks['onSkillCompose']) => () => void;
-        onSkillsEnd: (fn: AIStreamHooks['onSkillsEnd']) => () => void;
-        onTTTAction: (fn: AIStreamHooks['onTTTAction']) => () => void;
     };
 };

package/dist/withAIStream.js

@@ -9,11 +9,11 @@ import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import { BubbleTileStatus, ChatMessageStatus, createHooks, EmitterEvent } from '@ray-js/t-agent';
 import { messageAppraise } from './utils/apis';
-import { AIStreamObserver, getAccountInfo, getCurrentHomeInfo, runTTTAction, sendBlocksToAIStream } from './utils';
-import { BizCode, ConnectClientType, ConnectState } from './AIStreamTypes';
+import { getAccountInfo, getCurrentHomeInfo, runTTTAction, sendBlocksToAIStream } from './utils';
+import { BizCode, ConnectClientType } from './AIStreamTypes';
+import { ChatHistoryLocalStore } from './ChatHistoryStore';
 import { DEFAULT_TOKEN_API, DEFAULT_TOKEN_API_VERSION, globalAIStreamClient } from './global';
 import logger from './utils/logger';
-import { ChatHistoryLocalStore } from './ChatHistoryLocalStore';
 export function withAIStream() {
   let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const hooks = createHooks();
@@ -38,24 +38,11 @@ export function withAIStream() {
       const {
         deviceId,
         agentId,
-        clientType = ConnectClientType.APP,
         tokenOptions = {
           api: DEFAULT_TOKEN_API,
           version: DEFAULT_TOKEN_API_VERSION
         }
       } = options;
-      if (!agentId) {
-        throw new Error('agentId is required');
-      }
-      if (!tokenOptions.api || !tokenOptions.version) {
-        throw new Error('tokenOptions.api and tokenOptions.version are required');
-      }
-      if (clientType === ConnectClientType.DEVICE && !deviceId) {
-        throw new Error('deviceId is required when clientType is device');
-      }
-      if (clientType === ConnectClientType.APP && deviceId) {
-        throw new Error('deviceId is not allowed when clientType is app');
-      }
       let homeId = options.homeId;
       if (!homeId) {
         const info = await getCurrentHomeInfo();
@@ -69,7 +56,7 @@ export function withAIStream() {
       /*
        * 2. 获取历史消息
        */
-      let historyStore;
+      let historyStore = null;
       if (typeof options.createChatHistoryStore === 'function') {
         historyStore = options.createChatHistoryStore(agent);
       } else {
@@ -100,18 +87,21 @@ export function withAIStream() {
 
       // 创建 streamSession
       const connection = globalAIStreamClient.getConnection({
-        clientType,
-        deviceId
+        clientType: options.clientType || ConnectClientType.APP,
+        deviceId: options.deviceId
       });
+      if (options.clientType === ConnectClientType.DEVICE && !options.deviceId) {
+        throw new Error('deviceId is required when clientType is device');
+      }
       const streamSession = connection.createSession({
-        ownerId: clientType === ConnectClientType.DEVICE ? deviceId : "".concat(homeId),
+        ownerId: options.clientType === ConnectClientType.DEVICE ? options.deviceId : "".concat(homeId),
         api: tokenOptions.api,
         apiVersion: tokenOptions.version,
         solutionCode: agentId,
-        extParams: _objectSpread({
+        extParams: _objectSpread(_objectSpread({}, tokenOptions.extParams), {}, {
           needTts: !!options.enableTts,
-          deviceId
-        }, tokenOptions.extParams)
+          deviceId: options.deviceId || undefined
+        })
       });
       await session.set('AIStream.streamSession', streamSession);
       if (options.earlyStart) {
@@ -120,20 +110,6 @@ export function withAIStream() {
           logger.error('earlyStart failed', error);
         });
       }
-      const observer = new AIStreamObserver(data => {
-        if (data.type === 'amplitudes') {
-          ui.emitEvent('amplitudes', data);
-        } else if (data.type === 'connectionState') {
-          ui.emitEvent('networkChange', {
-            online: data.body.connectState === ConnectState.CONNECTED
-          });
-        }
-      }, globalAIStreamClient.pool);
-      observer.observe({
-        connectionState: true,
-        amplitudes: true
-      });
-      await session.set('AIStream.observer', observer);
     });
     const getHistoryStore = () => {
       const historyStore = session.get('AIStream.historyStore');
@@ -355,12 +331,24 @@ export function withAIStream() {
         await hooks.callHook('onSkillsEnd', skills, message, result);
         await message.update();
       }
+      let valid = false;
       if (message.bubble.text) {
+        valid = true;
         await message.persist();
       } else if (message.bubble.status === BubbleTileStatus.NORMAL) {
-        await message.remove();
+        valid = false;
       } else {
+        valid = true;
+      }
+      if (valid) {
         await message.persist();
+        const [_, ...rest] = result.messages;
+        for (const m of rest) {
+          await m.show();
+          await m.persist();
+        }
+      } else {
+        await message.remove();
       }
       return [userMsg, ...result.messages];
     };
@@ -415,10 +403,6 @@ export function withAIStream() {
       };
     });
     onAgentDispose(async () => {
-      const observer = session.get('AIStream.observer');
-      if (observer) {
-        observer.disconnect();
-      }
       const streamSession = session.get('AIStream.streamSession');
 
       /**
@@ -480,6 +464,43 @@ export function withAIStream() {
         }
       }
     });
+    const onSkillsEnd = fn => {
+      return hooks.hook('onSkillsEnd', fn);
+    };
+    onSkillsEnd(async (skills, respMsg, result) => {
+      const cards = [];
+      for (const skill of skills) {
+        var _skill$custom, _skill$general;
+        if ((_skill$custom = skill.custom) !== null && _skill$custom !== void 0 && (_skill$custom = _skill$custom.data) !== null && _skill$custom !== void 0 && _skill$custom.aiCards) {
+          for (const card of skill.custom.data.aiCards) {
+            cards.push(card);
+          }
+        }
+        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) {
+            cards.push(card);
+          }
+        }
+      }
+      const r = {
+        cards: cards
+      };
+      await hooks.callHook('onCardsReceived', skills, r);
+      for (const card of cards) {
+        const m = createMessage({
+          role: respMsg.role,
+          status: ChatMessageStatus.FINISH,
+          meta: {
+            eventId: respMsg.meta.eventId,
+            sessionId: respMsg.meta.sessionId
+          }
+        });
+        m.addTile('card', {
+          card
+        });
+        result.messages.push(m);
+      }
+    });
     return {
       hooks,
       aiStream: {
@@ -497,16 +518,14 @@ export function withAIStream() {
             await historyStore.removeAll();
           }
         },
-        feedback,
         onSkillCompose: fn => {
           return hooks.hook('onSkillCompose', fn);
         },
-        onSkillsEnd: fn => {
-          return hooks.hook('onSkillsEnd', fn);
+        onSkillsEnd,
+        onCardsReceived: fn => {
+          return hooks.hook('onCardsReceived', fn);
         },
-        onTTTAction: fn => {
-          return hooks.hook('onTTTAction', fn);
-        }
+        feedback
       }
     };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-plugin-aistream",
-  "version": "0.2.1-beta.3",
+  "version": "0.2.2-beta-2",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -35,5 +35,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "6fb3ba83a8b1a980b000506781a43e75403f3211"
+  "gitHead": "33a1985d3a14487fe5f354411b0c46c8a8af19c7"
 }

package/dist/ChatHistoryLocalStore.d.ts

@@ -1,22 +0,0 @@
-import { ChatMessageObject } from '@ray-js/t-agent';
-import { ChatHistoryStore, ChatHistoryStoreOptions, StoredMessageObject, ChatHistoryStorePagination } from './ChatHistoryStore';
-export declare class ChatHistoryLocalStore implements ChatHistoryStore {
-    /** 版本号，会作为内部索引的一部分 */
-    private readonly version;
-    private options;
-    constructor(options: ChatHistoryStoreOptions);
-    private itemToMessage;
-    private getRecordIndex;
-    private getQueryCondition;
-    query(id: number): Promise<StoredMessageObject | null>;
-    queryAll(pagination: ChatHistoryStorePagination): Promise<{
-        total: number;
-        records: StoredMessageObject[];
-    }>;
-    update(id: number, body: ChatMessageObject): Promise<void>;
-    remove(id: number): Promise<void>;
-    removeAll(ids?: number[]): Promise<void>;
-    insert(message: ChatMessageObject): Promise<{
-        id: number;
-    }>;
-}

package/dist/ChatHistoryLocalStore.js

@@ -1,191 +0,0 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-const _excluded = ["id"];
-import "core-js/modules/es.array.sort.js";
-import "core-js/modules/es.json.stringify.js";
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.filter.js";
-import "core-js/modules/esnext.iterator.map.js";
-import { safeParseJSON } from '@ray-js/t-agent';
-import logger from './utils/logger';
-import { deleteRecordList, insertRecord, queryRecordList, updateRecord } from './utils';
-export class ChatHistoryLocalStore {
-  constructor(options) {
-    /** 版本号，会作为内部索引的一部分 */
-    _defineProperty(this, "version", 'v1');
-    if (!options.agentId) {
-      throw new Error('agentId is required');
-    }
-    if (!options.bizCode) {
-      throw new Error('bizCode is required');
-    }
-    this.options = _objectSpread({
-      indexId: 'default',
-      homeId: 0
-    }, options);
-  }
-  itemToMessage(item) {
-    const messageInfo = safeParseJSON(item.data);
-    if (!messageInfo) {
-      logger.error('ChatHistoryLocalStore failed parse item: ', item);
-      return null;
-    }
-    messageInfo.message.meta.id = item.id;
-    return {
-      id: item.id,
-      indexId: item.index2,
-      agentId: item.solutionCode,
-      deviceId: item.devId,
-      homeId: item.homeId,
-      createdAt: messageInfo.createdAt,
-      updatedAt: messageInfo.updatedAt,
-      message: messageInfo.message
-    };
-  }
-  getRecordIndex() {
-    return {
-      bizCode: this.options.bizCode,
-      solutionCode: this.options.agentId,
-      homeId: this.options.homeId,
-      index: "t-agent-".concat(this.version),
-      index2: this.options.indexId,
-      devId: this.options.deviceId
-    };
-  }
-  getQueryCondition() {
-    const indexes = this.getRecordIndex();
-    const params = {
-      bizCode: [indexes.bizCode],
-      solutionCode: [indexes.solutionCode],
-      homeId: [indexes.homeId],
-      index: [indexes.index],
-      index2: [indexes.index2]
-    };
-    if (indexes.devId) {
-      params.devId = [indexes.devId];
-    }
-    return params;
-  }
-  async query(id) {
-    if (typeof id !== 'number') {
-      logger.warn('ChatHistoryLocalStore query id is not number', {
-        id
-      });
-      return null;
-    }
-    const queryCondition = _objectSpread(_objectSpread({}, this.getQueryCondition()), {}, {
-      id: [id],
-      offset: 0,
-      limit: 1,
-      sortType: 1
-    });
-    const {
-      records
-    } = await queryRecordList(queryCondition);
-    return records[0] ? this.itemToMessage(records[0]) : null;
-  }
-  async queryAll(pagination) {
-    const queryCondition = _objectSpread(_objectSpread({}, this.getQueryCondition()), {}, {
-      offset: 0,
-      sortType: 1
-    });
-    const {
-      offset,
-      limit
-    } = pagination || {};
-    if (offset) {
-      queryCondition.offset = offset;
-    }
-    if (limit) {
-      queryCondition.limit = limit;
-    }
-    queryCondition.sortType = pagination.sort === 'desc' ? 0 : 1;
-    try {
-      const result = await queryRecordList(queryCondition);
-      const list = result.records.map(this.itemToMessage).filter(item => !!item);
-      return {
-        total: result.total,
-        records: list
-      };
-    } catch (error) {
-      logger.error('ChatHistoryLocalStore queryRecordList error', error);
-      return {
-        total: 0,
-        records: []
-      };
-    }
-  }
-  async update(id, body) {
-    if (typeof id !== 'number') {
-      throw new Error('query id is not number');
-    }
-    const stored = await this.query(id);
-    if (!stored) {
-      throw new Error("could not find message: ".concat(id));
-    }
-    const nowTime = Date.now();
-    const msgObject = {
-      message: body,
-      createdAt: stored.createdAt,
-      updatedAt: nowTime
-    };
-    stored.message.meta.updatedAt = nowTime;
-    return updateRecord({
-      id,
-      data: JSON.stringify(msgObject)
-    });
-  }
-  async remove(id) {
-    if (typeof id !== 'number') {
-      throw new Error('query id is not number');
-    }
-    const stored = await this.query(id);
-    if (!stored) {
-      logger.warn('ChatHistoryLocalStore not find by id', {
-        id
-      });
-    }
-    await deleteRecordList({
-      id: [id]
-    });
-  }
-  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();
-
-    // 先把 id 提取出来不存，id 始终是在数据库里自增的
-    const _message$meta = message.meta,
-      {
-        id
-      } = _message$meta,
-      meta = _objectWithoutProperties(_message$meta, _excluded);
-    const msgObject = {
-      message: _objectSpread(_objectSpread({}, message), {}, {
-        meta: _objectSpread(_objectSpread(_objectSpread({}, meta), this.options), {}, {
-          createdAt: nowTime,
-          updatedAt: nowTime
-        })
-      }),
-      createdAt: nowTime,
-      updatedAt: nowTime
-    };
-    return insertRecord(_objectSpread(_objectSpread({}, this.getRecordIndex()), {}, {
-      data: JSON.stringify(msgObject)
-    }));
-  }
-}