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

package/dist/AIStreamTypes.d.ts

@@ -1117,6 +1117,8 @@ export type QueryAgentTokenParams = {
         agentToken: string;
         /** 业务配置 */
         bizConfig: BizConfig;
+        /** 额外字段, JSON 字符串 */
+        extParams?: string;
     }) => void;
     fail?: (params: {
         errorMsg: string;
@@ -1208,6 +1210,7 @@ export type DisconnectParams = {
 export type SendEventStartParams = {
     /** 会话 id */
     sessionId: string;
+    eventIdPrefix?: string;
     /** 扩展属性 */
     userData?: Attribute[];
     success?: (params: {

package/dist/asr/AsrAgent.d.ts

@@ -33,6 +33,7 @@ export interface AsrAgentOptions {
         maxDuration?: number;
     };
     enableLog?: boolean;
+    eventIdPrefix?: string;
 }
 export declare enum AsrAgentStatus {
     PENDING = "pending",

package/dist/asr/AsrAgent.js

@@ -182,6 +182,7 @@ export class AsrAgent {
       'asr.enableVad': 'false'
     };
     const [startEventError, activeEvent] = await tryCatch(() => activeSession.startEvent({
+      eventIdPrefix: this.options.eventIdPrefix,
       userData: [{
         type: AIStreamAttributeType.AI_CHAT,
         payloadType: AIStreamAttributePayloadType.STRING,

package/dist/utils/AIStream.d.ts

@@ -45,6 +45,7 @@ interface AIStreamSessionOptions {
 interface AIStreamEventOptions {
     signal?: AbortSignal;
     userData?: Attribute[];
+    eventIdPrefix?: string;
 }
 export declare class AIStreamSession {
     private connection;
@@ -57,6 +58,10 @@ export declare class AIStreamSession {
     private activeEvent?;
     private activeObserver?;
     private promise;
+    tokenExtParamsResolvable: import("./object").Resolvable<{
+        [key: string]: any;
+        chatId?: string | undefined;
+    }>;
     constructor(connection: AIStreamConnection, pool: AIStreamObserverPool, options: AIStreamSessionOptions);
     ensureSession(): Promise<void>;
     _onStateChanged: (entry: AIStreamDataEntry) => void;

package/dist/utils/AIStream.js

@@ -10,9 +10,10 @@ import "core-js/modules/web.dom-collections.iterator.js";
 import { AIStreamAttributeType, AIStreamErrorCode, AIStreamServerErrorCode, BizTag, ConnectClientType, ConnectState, EventType, NetworkType, SessionState } from '../AIStreamTypes';
 import { closeSession, connect, createSession, disconnect, getCurrentHomeInfo, getNetworkType, isConnected, queryAgentToken, sendEventChatBreak, sendEventEnd, sendEventPayloadEnd, sendEventStart, sendImageData, sendTextData, startRecordAndSendAudioData, stopRecordAndSendAudioData } from './ttt';
 import { AIStreamObserver, AIStreamObserverPool } from './observer';
-import { isAbortError } from '@ray-js/t-agent';
+import { isAbortError, safeParseJSON } from '@ray-js/t-agent';
 import logger from './logger';
 import { AIStreamError, tryCatchTTT } from './errors';
+import { createResolvable } from './object';
 export class AIStreamClient {
   constructor() {
     _defineProperty(this, "pool", new AIStreamObserverPool());
@@ -163,6 +164,7 @@ export class AIStreamSession {
     _defineProperty(this, "revDataChannels", []);
     _defineProperty(this, "disposed", false);
     _defineProperty(this, "promise", null);
+    _defineProperty(this, "tokenExtParamsResolvable", createResolvable());
     _defineProperty(this, "_onStateChanged", entry => {
       var _this$activeEvent;
       (_this$activeEvent = this.activeEvent) === null || _this$activeEvent === void 0 || _this$activeEvent.emit('data', entry);
@@ -213,7 +215,7 @@ export class AIStreamSession {
     if (this.sessionId) {
       return Promise.resolve();
     }
-    this.promise = (async () => {
+    this.promise = (async _this$options => {
       try {
         await this.connection._ensureConnected();
       } catch (e) {
@@ -240,11 +242,22 @@ export class AIStreamSession {
         }
         this.options.ownerId = ownerId;
       }
-      const options = _objectSpread({
+
+      // 如果之前有 chatId，带上
+      let chatId = (_this$options = this.options) === null || _this$options === void 0 || (_this$options = _this$options.extParams) === null || _this$options === void 0 ? void 0 : _this$options.chatId;
+      if (!chatId && this.tokenExtParamsResolvable.state === 'fulfilled') {
+        var _await$this$tokenExtP;
+        chatId = (_await$this$tokenExtP = await this.tokenExtParamsResolvable.promise) === null || _await$this$tokenExtP === void 0 ? void 0 : _await$this$tokenExtP.chatId;
+      }
+      const options = _objectSpread(_objectSpread({
         bizTag: BizTag.DEFAULT,
-        ownerId,
-        extParams: {}
-      }, this.options);
+        ownerId
+      }, this.options), {}, {
+        extParams: _objectSpread(_objectSpread({}, this.options.extParams), {}, {
+          // chatId 之前可能是 undefined，这里要覆盖掉
+          chatId
+        })
+      });
       const [error, result] = await tryCatchTTT(() => queryAgentToken(options));
       if (error) {
         this.promise = null;
@@ -252,8 +265,15 @@ export class AIStreamSession {
       }
       const {
         agentToken,
-        bizConfig
+        bizConfig,
+        extParams
       } = result;
+      if (extParams) {
+        const ext = safeParseJSON(extParams) || {};
+        this.tokenExtParamsResolvable.resolve(ext);
+      } else {
+        this.tokenExtParamsResolvable.resolve({});
+      }
       {
         const [err, res] = await tryCatchTTT(() => createSession({
           bizTag: options.bizTag,

package/dist/utils/defaultMock.js

@@ -95,20 +95,34 @@ mock.hooks.hook('disconnect', context => {
   mock.data.set('sessionMap', new Map());
 });
 mock.hooks.hook('queryAgentToken', context => {
-  var _context$options$extP, _context$options$extP2;
+  var _context$options$extP, _context$options$extP2, _context$options$extP3;
   const agentToken = generateId();
   const map = mock.data.get('tokenMap');
   map.set(agentToken, {
     onlyAsr: ((_context$options$extP = context.options.extParams) === null || _context$options$extP === void 0 ? void 0 : _context$options$extP.onlyAsr) || false,
     needTts: ((_context$options$extP2 = context.options.extParams) === null || _context$options$extP2 === void 0 ? void 0 : _context$options$extP2.needTts) || false
   });
+  let chatId;
+  if (((_context$options$extP3 = context.options.extParams) === null || _context$options$extP3 === void 0 ? void 0 : _context$options$extP3.dialogueMode) === 1) {
+    var _context$options$extP4;
+    if ((_context$options$extP4 = context.options.extParams) !== null && _context$options$extP4 !== void 0 && _context$options$extP4.chatId) {
+      // 如果参数有传吗，则使用传入的 chatId
+      chatId = context.options.extParams.chatId;
+    } else {
+      // 使用生成的 id
+      chatId = "chatId-".concat(generateId());
+    }
+  }
   context.result = {
     agentToken,
     bizConfig: {
       bizCode: BizCode.CHAT,
       sendData: ['audio', 'video', 'text', 'image'],
       revData: ['text', 'audio']
-    }
+    },
+    extParams: JSON.stringify({
+      chatId
+    })
   };
 });
 const dispatch = (type, detail) => {

package/dist/utils/object.d.ts

@@ -0,0 +1,7 @@
+export interface Resolvable<T = void> {
+    resolve: (value?: T) => void;
+    reject: (reason?: any) => void;
+    promise: Promise<T>;
+    state: 'pending' | 'fulfilled' | 'rejected';
+}
+export declare const createResolvable: <T = void>() => Resolvable<T>;

package/dist/utils/object.js

@@ -0,0 +1,25 @@
+export const createResolvable = () => {
+  const ret = {
+    resolve: null,
+    reject: null,
+    promise: null,
+    state: 'pending'
+  };
+  ret.promise = new Promise((resolve, reject) => {
+    ret.resolve = value => {
+      if (ret.state !== 'pending') {
+        return;
+      }
+      ret.state = 'fulfilled';
+      resolve(value);
+    };
+    ret.reject = reason => {
+      if (ret.state !== 'pending') {
+        return;
+      }
+      ret.state = 'rejected';
+      reject(reason);
+    };
+  });
+  return ret;
+};

package/dist/utils/promisify.js

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "core-js/modules/es.global-this.js";
 import { isDevTools } from './ttt';
 import logger from './logger';
 import { mock } from './mock';
@@ -6,6 +7,9 @@ import { TTTError } from './errors';
 let callId = 100000;
 export const getEnableMock = () => {
   try {
+    if ((globalThis === null || globalThis === void 0 ? void 0 : globalThis.__AIStreamEnableMock) != null) {
+      return globalThis.__AIStreamEnableMock;
+    }
     const result = ty.getStorageSync({
       key: 'AIStreamEnableMock'
     });

package/dist/utils/sendMessage.d.ts

@@ -8,6 +8,7 @@ export interface SendBlocksToAIStreamParams {
     attribute?: AIStreamChatAttribute;
     signal?: AbortSignal;
     enableTts?: boolean;
+    eventIdPrefix?: string;
 }
 export declare function sendBlocksToAIStream(params: SendBlocksToAIStreamParams): {
     response: StreamResponse;

package/dist/utils/sendMessage.js

@@ -19,7 +19,8 @@ export function sendBlocksToAIStream(params) {
   const {
     session,
     blocks,
-    signal
+    signal,
+    eventIdPrefix
   } = params;
   let audioEmitter = null;
   for (const block of blocks) {
@@ -105,6 +106,7 @@ export function sendBlocksToAIStream(params) {
       let error;
       [error, event] = await tryCatch(() => session.startEvent({
         signal,
+        eventIdPrefix,
         userData: [{
           type: AIStreamAttributeType.AI_CHAT,
           payloadType: AIStreamAttributePayloadType.STRING,

package/dist/utils/ttt.d.ts

@@ -66,6 +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;
 }>;
 export declare const createSession: (options?: Omit<CreateSessionParams, "success" | "fail"> | undefined) => Promise<{
     sessionId: string;

package/dist/withAIStream.d.ts

@@ -14,7 +14,11 @@ export interface AIStreamOptions {
         api: string;
         /** 如果是 clientType == 3，则是 highway 接口，可以不传 */
         version?: string;
-        extParams?: Record<string, any>;
+        extParams?: {
+            deviceId?: string;
+            chatId?: string;
+            [key: string]: any;
+        };
     };
     /** 历史消息数量，默认1000，为0的话，则已分页的方式取全部数据 */
     historySize?: number;
@@ -30,6 +34,8 @@ export interface AIStreamOptions {
     createChatHistoryStore?: (agent: ChatAgent) => ChatHistoryStore | null;
     /** 是否开启音频合成 */
     enableTts?: boolean;
+    /** eventId 前缀，用于方便云端调试 */
+    eventIdPrefix?: string;
 }
 export type AIStreamPlugin = GetChatPluginHandler<typeof withAIStream>;
 export interface AIStreamHooks {
@@ -75,5 +81,6 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
         onSkillsEnd: (fn: AIStreamHooks['onSkillsEnd']) => () => void;
         onCardsReceived: (fn: AIStreamHooks['onCardsReceived']) => () => void;
         onTTTAction: (fn: AIStreamHooks['onTTTAction']) => () => void;
+        getChatId: () => Promise<string>;
     };
 };

package/dist/withAIStream.js

@@ -225,6 +225,7 @@ export function withAIStream() {
         blocks,
         session: streamSession,
         signal,
+        eventIdPrefix: options.eventIdPrefix,
         attribute: _objectSpread({}, extraOptions)
       });
       signal === null || signal === void 0 || signal.addEventListener('abort', event => {
@@ -560,6 +561,21 @@ export function withAIStream() {
         },
         onTTTAction: fn => {
           return hooks.hook('onTTTAction', fn);
+        },
+        getChatId: async () => {
+          var _options$tokenOptions;
+          if ((_options$tokenOptions = options.tokenOptions) !== null && _options$tokenOptions !== void 0 && (_options$tokenOptions = _options$tokenOptions.extParams) !== null && _options$tokenOptions !== void 0 && _options$tokenOptions.chatId) {
+            return options.tokenOptions.extParams.chatId;
+          }
+          const streamSession = session.get('AIStream.streamSession');
+          if (!streamSession) {
+            throw new Error('Stream session is not started');
+          }
+          const data = await streamSession.tokenExtParamsResolvable.promise;
+          if (data) {
+            return data.chatId;
+          }
+          return null;
         }
       }
     };

package/package.json

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