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

package/dist/ChatHistoryStore.d.ts

@@ -1,5 +1,5 @@
 import { ChatMessageObject } from '@ray-js/t-agent';
-import { QueryRecordListParams } from './AIStreamTypes';
+import { BizCode } from './AIStreamTypes';
 export interface StoredMessageObject {
     message: ChatMessageObject;
     id: number;
@@ -10,28 +10,10 @@ export interface StoredMessageObject {
     homeId?: number;
     indexId?: string;
 }
-type Condition = Omit<QueryRecordListParams, 'success' | 'fail' | 'complete' | 'offset' | 'limit' | 'index2'>;
-type DeleteCondition = Pick<QueryRecordListParams, 'id' | 'bizCode' | 'devId' | 'homeId' | 'index' | 'index1'>;
 interface Pagination {
     sort?: 'asc' | 'desc';
-    pageSize: number;
-    pageNo: number;
-}
-export declare abstract class ChatHistoryStore {
-    /** 查询消息 */
-    abstract query(id: number): Promise<StoredMessageObject>;
-    /** 批量查询 */
-    abstract queryBy(condition: Condition, pagination: Pagination): Promise<{
-        total: number;
-        records: StoredMessageObject[];
-    }>;
-    /** 更新消息 */
-    abstract update(id: number, body: ChatMessageObject): Promise<void>;
-    abstract remove(id: number): Promise<void>;
-    abstract removeBy(condition: Condition): Promise<void>;
-    abstract insert(body: Partial<ChatMessageObject>): Promise<{
-        id: number;
-    }>;
+    offset: number;
+    limit: number;
 }
 export interface ChatHistoryStoreOptions {
     /** 家庭ID */
@@ -42,24 +24,41 @@ export interface ChatHistoryStoreOptions {
     agentId?: string;
     deviceId?: string;
     /** biz Code 大类目 */
-    bizCode?: number;
+    bizCode?: BizCode;
+}
+export interface ChatHistoryStore<Key = number> {
+    /** 查询消息 */
+    query(id: Key): Promise<StoredMessageObject>;
+    /** 批量查询 */
+    queryAll(pagination: Pagination): Promise<{
+        total: number;
+        records: StoredMessageObject[];
+    }>;
+    /** 更新消息 */
+    update(id: Key, body: ChatMessageObject): Promise<void>;
+    remove(id: Key): Promise<void>;
+    removeAll(): Promise<void>;
+    insert(body: ChatMessageObject): Promise<{
+        id: Key;
+    }>;
 }
 export declare class ChatHistoryLocalStore implements ChatHistoryStore {
     /** 版本号，会作为内部索引的一部分 */
     private readonly version;
-    /** 消息的meta数据，新增查询都会以此为条件 */
-    private messageMeta;
-    private getAgentIndexId;
+    private options;
     constructor(options: ChatHistoryStoreOptions);
-    query(id: number): Promise<StoredMessageObject>;
-    queryBy(condition: Condition, pagination: Pagination): Promise<{
+    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>;
-    removeBy(condition: DeleteCondition): Promise<void>;
-    insert(body: Partial<ChatMessageObject>): Promise<{
+    removeAll(): Promise<void>;
+    insert(message: ChatMessageObject): Promise<{
         id: number;
     }>;
 }

package/dist/ChatHistoryStore.js

@@ -1,160 +1,179 @@
+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/ttt';
-import { safeParseInt } from './utils/parsers';
+import { insertRecord, deleteRecordList, updateRecord, queryRecordList } from './utils';
 import logger from './utils/logger';
-export class ChatHistoryStore {}
 export class ChatHistoryLocalStore {
-  getAgentIndexId() {
-    return "t-agent-".concat(this.version);
-  }
   constructor(options) {
     /** 版本号，会作为内部索引的一部分 */
     _defineProperty(this, "version", 'v1');
-    /** 消息的meta数据，新增查询都会以此为条件 */
-    _defineProperty(this, "messageMeta", {});
-    this.messageMeta = {
-      bizCode: options.bizCode,
-      solutionCode: options.agentId,
-      // 使用 agentId 填充
-      agentId: options.agentId,
-      devId: options.deviceId,
-      homeId: options.homeId,
-      index: this.getAgentIndexId(),
-      index2: options.indexId
+    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('query id is not number', {
+      logger.warn('ChatHistoryLocalStore query id is not number', {
         id
       });
       return null;
     }
-    const msgList = await this.queryBy({
-      id: [id]
-    }, {
-      pageSize: 1,
-      pageNo: 0
+    const queryCondition = _objectSpread(_objectSpread({}, this.getQueryCondition()), {}, {
+      id: [id],
+      offset: 0,
+      limit: 1,
+      sortType: 1
     });
-    return msgList.records[0];
+    const {
+      records
+    } = await queryRecordList(queryCondition);
+    return records[0] ? this.itemToMessage(records[0]) : null;
   }
-  async queryBy(condition, pagination) {
-    var _msgListRes, _msgListRes2;
-    const queryCondition = {};
-    // 参数严格校验，过滤空值和空[]
-    if (condition && typeof condition === 'object') {
-      for (const key in condition) {
-        if (!(condition[key] === undefined || condition[key] === null || Array.isArray(condition[key]) && condition[key].length === 0)) {
-          queryCondition[key] = condition[key];
-        }
-      }
-    }
-    // 系统使用index索引，这里使用index2填充业务的index
-    if (Array.isArray(condition.index) && condition.index.length > 0) {
-      queryCondition.index2 = condition.index;
-    }
-    queryCondition.index = [this.getAgentIndexId()];
-    let {
-      pageNo,
-      pageSize
+  async queryAll(pagination) {
+    const queryCondition = _objectSpread(_objectSpread({}, this.getQueryCondition()), {}, {
+      offset: 0,
+      sortType: 1
+    });
+    const {
+      offset,
+      limit
     } = pagination || {};
-    pageNo = safeParseInt(pageNo, 0);
-    pageSize = safeParseInt(pageSize, 0);
-    queryCondition.offset = pageNo * pageSize;
-    if (pageSize) {
-      queryCondition.limit = pageSize;
+    if (offset) {
+      queryCondition.offset = offset;
+    }
+    if (limit) {
+      queryCondition.limit = limit;
     }
     queryCondition.sortType = pagination.sort === 'desc' ? 0 : 1;
-    let msgListRes = null;
     try {
-      msgListRes = await queryRecordList(queryCondition);
+      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('queryRecordList error', error);
-      msgListRes = {
+      logger.error('ChatHistoryLocalStore queryRecordList error', error);
+      return {
         total: 0,
         records: []
       };
     }
-    const msgList = (((_msgListRes = msgListRes) === null || _msgListRes === void 0 ? void 0 : _msgListRes.records) || []).map(item => {
-      const messageInfo = safeParseJSON(item.data) || {};
-      return _objectSpread(_objectSpread({}, item), {}, {
-        createdAt: messageInfo.createdAt,
-        updatedAt: messageInfo.updatedAt,
-        message: messageInfo.message
-      });
-    });
-    return {
-      total: (_msgListRes2 = msgListRes) === null || _msgListRes2 === void 0 ? void 0 : _msgListRes2.total,
-      records: msgList
-    };
   }
   async update(id, body) {
     if (typeof id !== 'number') {
-      logger.warn('query id is not number', {
-        id
-      });
-      return null;
+      throw new Error('query id is not number');
     }
-    const messageInfo = await this.query(id);
-    if (!messageInfo) {
-      logger.error('query messageInfo is null', {
-        id
-      });
-      return null;
+    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: messageInfo.createdAt,
+      createdAt: stored.createdAt,
       updatedAt: nowTime
     };
-    return updateRecord(_objectSpread(_objectSpread({}, this.messageMeta), {}, {
+    stored.message.meta.updatedAt = nowTime;
+    return updateRecord({
       id,
       data: JSON.stringify(msgObject)
-    }));
+    });
   }
   async remove(id) {
     if (typeof id !== 'number') {
-      logger.warn('query id is not number', {
-        id
-      });
-      return null;
+      throw new Error('query id is not number');
     }
-    const isExist = await this.query(id);
-    if (!isExist) {
-      logger.error('query messageInfo is null', {
+    const stored = await this.query(id);
+    if (!stored) {
+      logger.warn('ChatHistoryLocalStore not find by id', {
         id
       });
-      return null;
     }
-    return deleteRecordList({
+    await deleteRecordList({
       id: [id]
     });
   }
-  async removeBy(condition) {
-    const deleteCondition = _objectSpread(_objectSpread({}, condition), {}, {
-      index: [this.getAgentIndexId()]
-    });
-    // 系统使用index索引，这里使用index2填充业务的index
-    if (condition.index) {
-      deleteCondition.index2 = condition.index;
-    }
-    return deleteRecordList(condition);
+  async removeAll() {
+    await deleteRecordList(this.getQueryCondition());
   }
-  async insert(body) {
+  async insert(message) {
     const nowTime = Date.now();
-    return insertRecord(_objectSpread(_objectSpread({}, this.messageMeta), {}, {
-      data: JSON.stringify({
-        message: body,
-        createdAt: nowTime,
-        updatedAt: nowTime
-      })
+
+    // 先把 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/utils/AIStream.d.ts

@@ -1,4 +1,4 @@
-import { Attribute, BizTag, ConnectClientType, FileFormat, VideoCameraType } from '../AIStreamTypes';
+import { Attribute, BizTag, ConnectClientType, ConnectState, FileFormat, VideoCameraType } from '../AIStreamTypes';
 import { AIStreamDataEntry, AIStreamObserverPool } from './observer';
 interface AIStreamConnectionOptions {
     /** client 类型: 1-作为设备代理, 2-作为 App */
@@ -15,7 +15,7 @@ export declare class AIStreamConnection {
     private readonly pool;
     readonly options: AIStreamConnectionOptions;
     private connectionId;
-    private state;
+    state: ConnectState;
     private activeSessions;
     private promise;
     private observer;
@@ -55,7 +55,7 @@ export declare class AIStreamSession {
     private activeObserver?;
     private promise;
     constructor(connection: AIStreamConnection, pool: AIStreamObserverPool, options: AIStreamSessionOptions);
-    private ensureSession;
+    ensureSession(): Promise<void>;
     _onStateChanged: (entry: AIStreamDataEntry) => void;
     startEvent(options?: AIStreamEventOptions): Promise<AIStreamEvent>;
     private onDataEntry;
@@ -91,7 +91,7 @@ type AIStreamEventSource = {
     cameraType?: VideoCameraType;
     userData?: Attribute[];
 };
-interface AIStreamEventStream {
+export interface AIStreamEventStream {
     type: 'video' | 'audio';
     dataChannel: string;
     started: boolean;

package/dist/utils/AIStream.js

@@ -6,7 +6,7 @@ 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, queryAgentToken, registerRecordAmplitudes, sendEventChatBreak, sendEventEnd, sendEventPayloadEnd, sendEventStart, sendImageData, sendTextData, startRecordAndSendAudioData, stopRecordAndSendAudioData, unregisterVoiceAmplitudes } from './ttt';
+import { closeSession, connect, createSession, disconnect, getCurrentHomeInfo, isConnectSync, 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';
 export class AIStreamClient {
@@ -32,6 +32,7 @@ export class AIStreamConnection {
     _defineProperty(this, "observer", null);
     _defineProperty(this, "onStateChanged", entry => {
       if (entry.type === 'connectionState' && entry.body.connectionId === this.connectionId) {
+        this.state = entry.body.connectState;
         this.activeSessions.forEach(session => {
           if (session.sessionId) {
             session._onStateChanged(entry);
@@ -39,7 +40,6 @@ export class AIStreamConnection {
         });
         if (entry.body.connectState === ConnectState.DISCONNECTED || entry.body.connectState === ConnectState.CLOSED) {
           // 事件触发的时候，只做清理
-          this.state = entry.body.connectState;
           this.cleanup();
         }
       }
@@ -61,16 +61,22 @@ export class AIStreamConnection {
     if (this.promise) {
       return this.promise;
     }
-    if (this.state === ConnectState.CONNECTED) {
-      return Promise.resolve();
-    }
-    this.promise = (async () => {
-      // 监听断开事件，重置 state & 清理
+    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();
+    }
+    this.promise = (async () => {
       // 调用 SDK connect
       const res = await connect(this.options);
       this.connectionId = res.connectionId;
@@ -83,6 +89,7 @@ export class AIStreamConnection {
     var _this$observer;
     (_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());
@@ -190,6 +197,7 @@ export class AIStreamSession {
       this.sessionId = res.sessionId;
       this.sendDataChannels = res.sendDataChannels;
       this.revDataChannels = res.revDataChannels;
+      this.promise = null;
     })();
     return this.promise;
   }

package/dist/utils/apis.d.ts

@@ -1,4 +1,4 @@
-interface ItAgentMessageAppraise {
+interface MessageAppraiseParams {
     aiPtChannel: string;
     /** 小程序 ID */
     miniProgramId: string;
@@ -8,7 +8,7 @@ interface ItAgentMessageAppraise {
     approveStatus: 1 | 2;
 }
 /** 聊天智能体消息的反馈评价 */
-export declare const tAgentMessageAppraise: (params: ItAgentMessageAppraise) => Promise<{
+export declare const messageAppraise: (params: MessageAppraiseParams) => Promise<{
     thingjson?: any;
     data: string;
 }>;

package/dist/utils/apis.js

@@ -1,7 +1,7 @@
 import { apiRequestByHighway } from './ttt';
 import { HighwayMethod } from '../AIStreamTypes';
 /** 聊天智能体消息的反馈评价 */
-export const tAgentMessageAppraise = params => {
+export const messageAppraise = params => {
   return apiRequestByHighway({
     api: '/v1.0/m/life/ai/agent/chat-panel-mini/mini/history/appraise',
     data: params,

package/dist/utils/createAsrAgent.d.ts

@@ -0,0 +1,79 @@
+import { ConnectClientType } from '../AIStreamTypes';
+export interface AsrAgentOptions {
+    agentId: string;
+    tokenApi?: string;
+    tokenApiVersion?: string;
+    clientType?: ConnectClientType;
+    deviceId?: string;
+    /** 最长录制时长，单位：秒 */
+    maxDuration?: number;
+    onMessage?: (message: {
+        text: string;
+    }) => void;
+    onFinish?: () => void;
+    onError?: (error: any) => void;
+    /** 主动中断或者超过录制时长，会调用onAbort */
+    onAbort?: () => void;
+}
+declare class AsrAgent {
+    /** 数据链接，一个agent保持一个链接就可以 */
+    private streamConn;
+    /** 当前请求的session，每次请求都需要是一个新的session */
+    private activeSession;
+    private activeEvent;
+    /** 音频流监听 */
+    private audioStream;
+    options: AsrAgentOptions;
+    /** 录音时长定时器 */
+    private recordDurationTimer;
+    constructor(options: any);
+    /** 获取录音权限 */
+    getRecordScope(): Promise<boolean>;
+    /** 获取数据链接，一般只有一个链接就可以 */
+    private getConnection;
+    private createSession;
+    /** 开始录音时长监听 */
+    private startRecordTimer;
+    start(): Promise<void>;
+    stop(isAbort?: boolean): Promise<void>;
+    abort(): Promise<void>;
+}
+/**
+ * 创建一个AsrAgent实例，用于语音转文本
+ * @param options AsrAgentOptions
+ * @param options.agentId 必填 语音转文本的agentId
+ * @param options.tokenApi 语音转文本的tokenApi
+ * @param options.tokenApiVersion 语音转文本的tokenApiVersion
+ * @param options.clientType 语音转文本的clientType
+ * @param options.deviceId 语音转文本的deviceId
+ * @example
+ * const asrAgent = createAsrAgent({
+ *   agentId: 'asr-agent',
+ *   tokenApi: 'm.thing.aigc.basic.server.token',
+ *   tokenApiVersion: '1.0',
+ *   clientType: ConnectClientType.APP,
+ *   deviceId: 'deviceId',
+ *   maxDuration: 60,
+ *   onMessage: (message) => {
+ *     console.log('onMessage', message);
+ *   },
+ *   onFinish: () => {
+ *     console.log('onFinish');
+ *   },
+ *   onError: (error) => {
+ *     console.log('onError', error);
+ *   },
+ *   onAbort: () => {
+ *     console.log('onAbort');
+ *   },
+ * });
+ * // 开始录音
+ * asrAgent.start()
+ * // 停止录音
+ * asrAgent.stop()
+ * // 中断录音
+ * asrAgent.abort()
+ * @returns
+ */
+export declare function createAsrAgent(options: AsrAgentOptions): AsrAgent;
+export {};