@ray-js/t-agent-plugin-aistream 0.2.5 → 0.2.6-beta-2

package/dist/AIStreamTypes.d.ts

@@ -614,7 +614,9 @@ export declare enum ConnectClientType {
     /** 作为设备代理 */
     DEVICE = 1,
     /** 作为 App */
-    APP = 2
+    APP = 2,
+    /** 作为开发者(行业 APP） */
+    DEVELOPER = 3
 }
 export declare enum EventType {
     /** 事件开始 */
@@ -1101,13 +1103,13 @@ export type ConnectParams = {
  */
 export type QueryAgentTokenParams = {
     /** Owner ID: HomeID 或 设备id */
-    ownerId: string;
+    ownerId?: string;
     /** 智能解决方案 code */
     solutionCode: string;
     /** 业务接口 */
     api: string;
     /** 接口版本 */
-    apiVersion: string;
+    apiVersion?: string;
     /** 业务额外参数 */
     extParams: any;
     success?: (params: {
@@ -1115,6 +1117,8 @@ export type QueryAgentTokenParams = {
         agentToken: string;
         /** 业务配置 */
         bizConfig: BizConfig;
+        /** 额外字段, JSON 字符串 */
+        extParams?: string;
     }) => void;
     fail?: (params: {
         errorMsg: string;
@@ -1206,6 +1210,7 @@ export type DisconnectParams = {
 export type SendEventStartParams = {
     /** 会话 id */
     sessionId: string;
+    eventIdPrefix?: string;
     /** 扩展属性 */
     userData?: Attribute[];
     success?: (params: {

package/dist/AIStreamTypes.js

@@ -90,6 +90,7 @@ export let SessionState = /*#__PURE__*/function (SessionState) {
 export let ConnectClientType = /*#__PURE__*/function (ConnectClientType) {
   ConnectClientType[ConnectClientType["DEVICE"] = 1] = "DEVICE";
   ConnectClientType[ConnectClientType["APP"] = 2] = "APP";
+  ConnectClientType[ConnectClientType["DEVELOPER"] = 3] = "DEVELOPER";
   return ConnectClientType;
 }({});
 export let EventType = /*#__PURE__*/function (EventType) {

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

@@ -37,7 +37,7 @@ interface AIStreamSessionOptions {
     /** 业务接口 */
     api: string;
     /** 接口版本 */
-    apiVersion: string;
+    apiVersion?: string;
     /** 业务额外参数 */
     extParams?: any;
     userData?: Attribute[];
@@ -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) {
@@ -221,7 +223,10 @@ export class AIStreamSession {
         throw e;
       }
       let ownerId = this.options.ownerId;
-      if (!ownerId) {
+      if (this.connection.options.clientType === ConnectClientType.DEVELOPER) {
+        ownerId = undefined;
+        this.options.ownerId = undefined;
+      } else if (!ownerId) {
         if (this.connection.options.clientType === ConnectClientType.APP) {
           try {
             const {
@@ -237,11 +242,21 @@ 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({
+          chatId
+        }, this.options.extParams)
+      });
       const [error, result] = await tryCatchTTT(() => queryAgentToken(options));
       if (error) {
         this.promise = null;
@@ -249,8 +264,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/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/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

@@ -3,7 +3,7 @@ import { TTTAction } from './utils';
 import { ConnectClientType, ReceivedTextSkillPacketBody } from './AIStreamTypes';
 import { ChatHistoryStore, StoredMessageObject } from './ChatHistoryStore';
 export interface AIStreamOptions {
-    /** client 类型: 1-作为设备代理, 2-作为 App */
+    /** client 类型: 1-作为设备代理, 2-作为 App，3-作为开发者（行业 App） */
     clientType?: ConnectClientType;
     /** 代理的设备ID, clientType == 1 时必传 */
     deviceId?: string;
@@ -12,8 +12,13 @@ export interface AIStreamOptions {
     /** 获取 agent token 的参数 */
     tokenOptions?: {
         api: string;
-        version: string;
-        extParams?: Record<string, any>;
+        /** 如果是 clientType == 3，则是 highway 接口，可以不传 */
+        version?: string;
+        extParams?: {
+            deviceId?: string;
+            chatId?: string;
+            [key: string]: any;
+        };
     };
     /** 历史消息数量，默认1000，为0的话，则已分页的方式取全部数据 */
     historySize?: number;
@@ -29,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 {
@@ -74,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

@@ -47,7 +47,11 @@ export function withAIStream() {
       if (!agentId) {
         throw new Error('agentId is required');
       }
-      if (!tokenOptions.api || !tokenOptions.version) {
+      if (clientType === ConnectClientType.DEVELOPER) {
+        if (!tokenOptions.api) {
+          throw new Error('tokenOptions.api is required');
+        }
+      } else if (!tokenOptions.api || !tokenOptions.version) {
         throw new Error('tokenOptions.api and tokenOptions.version are required');
       }
       if (clientType === ConnectClientType.DEVICE && !deviceId) {
@@ -57,6 +61,9 @@ export function withAIStream() {
         throw new Error('deviceId is not allowed when clientType is app');
       }
       let homeId = options.homeId;
+      if (clientType === ConnectClientType.DEVELOPER) {
+        homeId = 1;
+      }
       if (!homeId) {
         const info = await getCurrentHomeInfo();
         homeId = +info.homeId;
@@ -218,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 => {
@@ -553,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.5",
+  "version": "0.2.6-beta-2",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -35,5 +35,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "5c2ee8c15695fa858e00d9f58147487479ca0121"
+  "gitHead": "fa6602d3d1a9c14187a8f524302317ed22fec7c3"
 }