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

package/dist/utils/sendMessage.js

@@ -7,7 +7,7 @@ import { EmitterEvent, generateId, safeParseJSON, StreamResponse } from '@ray-js
 import { tryCatch } from './misc';
 import { AIStreamError, transformErrorCode } from './errors';
 import logger from './logger';
-import { deepMerge } from './object';
+import { deepmerge } from '@ray-js/t-agent';
 const mimeTypeToFormatMap = {
   'video/mp4': FileFormat.MP4,
   'text/json': FileFormat.JSON,
@@ -42,6 +42,7 @@ export function sendBlocksToAIStream(params) {
   });
   const stream = new ReadableStream({
     async start(controller) {
+      var _cleanupPreEventListe2;
       const enqueue = part => {
         if (signal !== null && signal !== void 0 && signal.aborted || canceled || closed) {
           return;
@@ -84,22 +85,28 @@ export function sendBlocksToAIStream(params) {
         });
       };
       let pendingCancel = false;
+      // phase-1: 事件创建前监听 confirm/cancel，用于捕获"边界竞态"时的取消意图
+      // 使用具名函数以便在 startEvent 后统一解绑，避免监听器残留在 audioEmitter 上
+      let cleanupPreEventListeners;
       if (audioEmitter) {
-        audioEmitter.addEventListener('confirm', () => {
-          // 在确认发送时，如果事件还没创建，则取消发送
+        const onPreEventConfirm = () => {
           if (!event) {
             logger.debug('sendBlocksToAIStream audioEmitter confirm before event start');
-            // event 留到后面再关
             pendingCancel = true;
           }
-        });
-        audioEmitter.addEventListener('cancel', () => {
+        };
+        const onPreEventCancel = () => {
           if (!event) {
             logger.debug('sendBlocksToAIStream audioEmitter cancel before event start');
-            // event 留到后面再关
             pendingCancel = true;
           }
-        });
+        };
+        audioEmitter.addEventListener('confirm', onPreEventConfirm);
+        audioEmitter.addEventListener('cancel', onPreEventCancel);
+        cleanupPreEventListeners = () => {
+          audioEmitter.removeEventListener('confirm', onPreEventConfirm);
+          audioEmitter.removeEventListener('cancel', onPreEventCancel);
+        };
       }
       const chatAttributes = {
         'processing.interrupt': 'false',
@@ -109,7 +116,7 @@ export function sendBlocksToAIStream(params) {
       if (getUserData) {
         eventUserData = await getUserData();
       }
-      const userData = deepMerge({
+      const userData = deepmerge({
         chatAttributes
       }, eventUserData);
       let error;
@@ -124,7 +131,10 @@ export function sendBlocksToAIStream(params) {
         }]
       }));
       if (error) {
+        var _cleanupPreEventListe;
         emitError(error);
+        // startEvent 失败，phase-1 监听已无用，立即解绑
+        (_cleanupPreEventListe = cleanupPreEventListeners) === null || _cleanupPreEventListe === void 0 || _cleanupPreEventListe();
         if (audioEmitter) {
           audioEmitter.dispatchEvent(new EmitterEvent('error', {
             detail: error
@@ -133,6 +143,9 @@ export function sendBlocksToAIStream(params) {
         close();
         return;
       }
+
+      // startEvent 已成功（event 已创建），phase-1 监听完成使命，解绑
+      (_cleanupPreEventListe2 = cleanupPreEventListeners) === null || _cleanupPreEventListe2 === void 0 || _cleanupPreEventListe2();
       if (signal !== null && signal !== void 0 && signal.aborted || pendingCancel) {
         logger.debug('sendBlocksToAIStream pendingCancel aborted');
         abort();
@@ -306,20 +319,40 @@ export function sendBlocksToAIStream(params) {
           const s = event.stream({
             type: 'audio'
           });
-          audioEmitter.addEventListener('confirm', async () => {
+          let audioDone = false;
+
+          // cleanupPostEventListeners 先初始化为 noop，让两个 handler 可在闭包里安全引用
+          // 后面赋值为真正的清理函数
+          let cleanupPostEventListeners = () => {};
+          const onPostEventConfirm = async () => {
+            // 任一监听触发后，立即同时解绑两者，防止另一个因偶发二次触发产生副作用
+            cleanupPostEventListeners();
             if (!canceled) {
               await s.stop();
             }
-            resolve();
-          });
-          audioEmitter.addEventListener('cancel', async () => {
+            if (!audioDone) {
+              audioDone = true;
+              resolve();
+            }
+          };
+          const onPostEventCancel = async () => {
+            cleanupPostEventListeners();
             if (!canceled) {
               await s.stop();
             }
             logger.debug('sendBlocksToAIStream audio cancel aborted');
             abort();
-            resolve();
-          });
+            if (!audioDone) {
+              audioDone = true;
+              resolve();
+            }
+          };
+          cleanupPostEventListeners = () => {
+            audioEmitter.removeEventListener('confirm', onPostEventConfirm);
+            audioEmitter.removeEventListener('cancel', onPostEventCancel);
+          };
+          audioEmitter.addEventListener('confirm', onPostEventConfirm);
+          audioEmitter.addEventListener('cancel', onPostEventCancel);
           s.start();
         });
         if (signal !== null && signal !== void 0 && signal.aborted) {

package/dist/utils/track.js

@@ -1,5 +1,5 @@
 import "core-js/modules/es.json.stringify.js";
-import { getAccountInfo, sendEvent } from './ttt';
+import { getAccountInfo, sendTrackEvent } from './ttt';
 const eventId = 'thing_jKaquNvaV2qMDvTpKcNQvb1ZppBZnlNq';
 let accountInfoPromise = null;
 export async function trackEvent(agent_code, type) {
@@ -11,7 +11,7 @@ export async function trackEvent(agent_code, type) {
     miniProgram
   } = await accountInfoPromise;
   try {
-    await sendEvent({
+    await sendTrackEvent({
       eventId,
       event: {
         type,

package/dist/utils/ttt.d.ts

@@ -1,4 +1,4 @@
-import { ApiRequestByAtopParams, ApiRequestByHighwayParams, AudioBody, AuthorizeParams, AuthorizePolicyStatusParams, CanIUseRouterParams, CloseSessionParams, ConnectParams, ConnectStateBody, CreateSessionParams, DeleteRecordListParams, DisconnectParams, EventBody, EventChannelMessageParams, GetAppInfoParams, GetCurrentHomeInfoParams, GetMiniAppConfigParams, GetAccountInfoParams, ImageBody, InsertRecordParams, NavigateToMiniProgramParams, OpenInnerH5Params, OpenMiniWidgetParams, QueryAgentTokenParams, QueryRecordListParams, RecordAmplitudesBody, RegisterChannelParams, RouterParams, SendEventChatBreakParams, SendEventEndParams, SendEventPayloadEndParams, SendEventStartParams, SendImageDataParams, SendTextDataParams, SessionStateBody, StartRecordAndSendAudioDataParams, StopRecordAndSendAudioDataParams, TextBody, UpdateRecordParams, IsConnectedParams, GetNetworkTypeParams, StartPlayAudioParams, InitAudioRecorderParams, StopPlayAudioParams, AudioPlayChangedBody, EventParams } from '../AIStreamTypes';
+import { ApiRequestByAtopParams, ApiRequestByHighwayParams, AudioBody, AuthorizeParams, AuthorizePolicyStatusParams, CanIUseRouterParams, CloseSessionParams, ConnectParams, ConnectStateBody, CreateSessionParams, DeleteRecordListParams, DisconnectParams, EventBody, EventChannelMessageParams, GetAppInfoParams, GetCurrentHomeInfoParams, GetMiniAppConfigParams, GetAccountInfoParams, ImageBody, InsertRecordParams, NavigateToMiniProgramParams, OpenInnerH5Params, OpenMiniWidgetParams, QueryAgentTokenParams, QueryRecordListParams, RecordAmplitudesBody, RegisterChannelParams, RouterParams, SendAIStreamEventParams, SendEventChatBreakParams, SendEventEndParams, SendEventPayloadEndParams, SendEventStartParams, SendImageDataParams, SendTextDataParams, SessionStateBody, StartRecordAndSendAudioDataParams, StopRecordAndSendAudioDataParams, TextBody, UpdateRecordParams, IsConnectedParams, GetNetworkTypeParams, StartPlayAudioParams, InitAudioRecorderParams, StopPlayAudioParams, AudioPlayChangedBody, EventParams } from '../AIStreamTypes';
 export declare const getMiniAppConfig: (options?: Omit<GetMiniAppConfigParams, "success" | "fail"> | undefined) => Promise<{
     config: any;
 }>;
@@ -81,6 +81,7 @@ export declare const sendEventStart: (options?: Omit<SendEventStartParams, "succ
 export declare const sendEventPayloadEnd: (options?: Omit<SendEventPayloadEndParams, "success" | "fail"> | undefined) => Promise<null>;
 export declare const sendEventEnd: (options?: Omit<SendEventEndParams, "success" | "fail"> | undefined) => Promise<null>;
 export declare const sendEventChatBreak: (options?: Omit<SendEventChatBreakParams, "success" | "fail"> | undefined) => Promise<null>;
+export declare const sendEventToAIStream: (options?: Omit<SendAIStreamEventParams, "success" | "fail"> | undefined) => Promise<null>;
 export declare const startRecordAndSendAudioData: (options?: Omit<StartRecordAndSendAudioDataParams, "success" | "fail"> | undefined) => Promise<null>;
 export declare const stopRecordAndSendAudioData: (options?: Omit<StopRecordAndSendAudioDataParams, "success" | "fail"> | undefined) => Promise<import("../AIStreamTypes").AIStreamAudioFile | null>;
 export declare const sendImageData: (options?: Omit<SendImageDataParams, "success" | "fail"> | undefined) => Promise<null>;
@@ -113,4 +114,4 @@ export declare const getNetworkType: (options?: Omit<GetNetworkTypeParams, "succ
     networkType: import("../AIStreamTypes").NetworkType;
     signalStrength: number;
 }>;
-export declare const sendEvent: (options?: Omit<EventParams, "success" | "fail"> | undefined) => Promise<null>;
+export declare const sendTrackEvent: (options?: Omit<EventParams, "success" | "fail"> | undefined) => Promise<null>;

package/dist/utils/ttt.js

@@ -42,6 +42,7 @@ export const sendEventStart = promisify(ty.aistream.sendEventStart, true);
 export const sendEventPayloadEnd = promisify(ty.aistream.sendEventPayloadEnd, true);
 export const sendEventEnd = promisify(ty.aistream.sendEventEnd, true);
 export const sendEventChatBreak = promisify(ty.aistream.sendEventChatBreak, true);
+export const sendEventToAIStream = promisify(ty.aistream.sendEvent, true);
 export const startRecordAndSendAudioData = promisify(ty.aistream.startRecordAndSendAudioData, true);
 export const stopRecordAndSendAudioData = promisify(ty.aistream.stopRecordAndSendAudioData, true);
 
@@ -92,4 +93,4 @@ export const deleteRecordList = promisify(ty.aistream.deleteRecordList, true);
 export const updateRecord = promisify(ty.aistream.updateRecord, true);
 export const insertRecord = promisify(ty.aistream.insertRecord, true);
 export const getNetworkType = promisify(ty.getNetworkType, true);
-export const sendEvent = promisify(ty.event);
+export const sendTrackEvent = promisify(ty.event);

package/dist/withAIStream.d.ts

@@ -1,6 +1,6 @@
 import { AbortSignalObject, ChatAgent, ChatCardObject, ChatMessage, ChatMessageStatus, ChatTile, GetChatPluginHandler, InputBlock } from '@ray-js/t-agent';
 import { TTTAction } from './utils';
-import { AIStreamUserData, ConnectClientType, ReceivedTextSkillPacketBody } from './AIStreamTypes';
+import { AIStreamUserData, ConnectClientType, ReceivedTextSkillPacketBody, SendAIStreamEventParams, SessionEventBody } from './AIStreamTypes';
 import { ChatHistoryStore, StoredMessageObject } from './ChatHistoryStore';
 export interface AIStreamOptions {
     /** client 类型: 1-作为设备代理, 2-作为 App，3-作为开发者（行业 App） */
@@ -63,6 +63,7 @@ export interface AIStreamHooks {
     }, result: {
         userData: AIStreamUserData;
     }) => void;
+    onSessionEventReceived: (event: SessionEventBody) => void;
 }
 export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAgent) => {
     hooks: import("hookable").Hookable<AIStreamHooks, import("hookable").HookKeys<AIStreamHooks>>;
@@ -92,6 +93,8 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
         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;
         getChatId: () => Promise<string>;
     };

package/dist/withAIStream.js

@@ -1,20 +1,27 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _wrapAsyncGenerator from "@babel/runtime/helpers/esm/wrapAsyncGenerator";
+import _awaitAsyncGenerator from "@babel/runtime/helpers/esm/awaitAsyncGenerator";
+import _asyncGeneratorDelegate from "@babel/runtime/helpers/esm/asyncGeneratorDelegate";
 const _excluded = ["message"];
+import "core-js/modules/es.symbol.description.js";
+import "core-js/modules/es.symbol.async-iterator.js";
 import "core-js/modules/es.array.flat.js";
 import "core-js/modules/es.array.reverse.js";
 import "core-js/modules/es.array.unscopables.flat.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.dom-collections.iterator.js";
+function _asyncIterator(r) { var n, t, o, e = 2; for ("undefined" != typeof Symbol && (t = Symbol.asyncIterator, o = Symbol.iterator); e--;) { if (t && null != (n = r[t])) return n.call(r); if (o && null != (n = r[o])) return new AsyncFromSyncIterator(n.call(r)); t = "@@asyncIterator", o = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
+function AsyncFromSyncIterator(r) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var n = r.done; return Promise.resolve(r.value).then(function (r) { return { value: r, done: n }; }); } return AsyncFromSyncIterator = function (r) { this.s = r, this.n = r.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function () { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, return: function (r) { var n = this.s.return; return void 0 === n ? Promise.resolve({ value: r, done: !0 }) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments)); }, throw: function (r) { var n = this.s.return; return void 0 === n ? Promise.reject(r) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(r); }
 import { BubbleTileStatus, ChatMessageStatus, createHooks, EmitterEvent } from '@ray-js/t-agent';
 import { messageAppraise } from './utils/apis';
-import { getAccountInfo, getCurrentHomeInfo, runTTTAction, sendBlocksToAIStream } from './utils';
+import { getAccountInfo, getCurrentHomeInfo, runTTTAction, sendBlocksToAIStream, sendEventToAIStream } from './utils';
 import { BizCode, ConnectClientType } from './AIStreamTypes';
 import { DEFAULT_TOKEN_API, DEFAULT_TOKEN_API_VERSION, globalAIStreamClient } from './global';
 import logger from './utils/logger';
 import { ChatHistoryLocalStore } from './ChatHistoryLocalStore';
-import { deepMerge } from './utils/object';
+import { deepmerge } from '@ray-js/t-agent';
 import { trackEvent } from './utils/track';
 export function withAIStream() {
   let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -103,6 +110,9 @@ export function withAIStream() {
           return result.userData;
         }
       });
+      streamSession.on('sessionEvent', event => {
+        hooks.callHook('onSessionEventReceived', event);
+      });
       await session.set('AIStream.streamSession', streamSession);
       if (options.earlyStart) {
         // 故意异步，不阻塞消息列表加载
@@ -248,19 +258,42 @@ export function withAIStream() {
           await hooks.callHook('onUserDataRead', 'start-event', {
             blocks
           }, userDataResult);
-          const userData = {};
-          deepMerge(userData, userDataResult.userData);
-          deepMerge(userData, eventUserData);
+          let userData = deepmerge({}, userDataResult.userData);
+          userData = deepmerge(userData, eventUserData);
           return userData;
         }
       });
-      signal === null || signal === void 0 || signal.addEventListener('abort', event => {
-        logger.debug('withAIStream signal aborted, response.started:', result.response.started);
-        if (result.response.started) {
-          result.response.cancel(event.reason);
-        }
-        agent.hooks.callHook('onUserAbort', event.reason);
-      });
+      if (signal) {
+        const onAbort = event => {
+          logger.debug('withAIStream signal aborted, response.started:', result.response.started);
+          if (result.response.started) {
+            result.response.cancel(event.reason);
+          }
+          agent.hooks.callHook('onUserAbort', event.reason);
+        };
+
+        // once:true 保证 abort 触发后自动解绑，避免监听器残留
+        signal.addEventListener('abort', onAbort, {
+          once: true
+        });
+
+        // 正常消费流时（未触发 abort）在 parts() 的 finally 里解绑，防止 signal 长期持有闭包
+        const _parts = result.response.parts.bind(result.response);
+        result.response.parts = () => {
+          const iterable = _parts();
+          return {
+            [Symbol.asyncIterator]() {
+              return _wrapAsyncGenerator(function* () {
+                try {
+                  yield* _asyncGeneratorDelegate(_asyncIterator(iterable), _awaitAsyncGenerator);
+                } finally {
+                  signal.removeEventListener('abort', onAbort);
+                }
+              })();
+            }
+          };
+        };
+      }
       signal === null || signal === void 0 || signal.throwIfAborted();
       return result;
     };
@@ -291,8 +324,18 @@ export function withAIStream() {
       if (audioEmitter) {
         let end = false;
         audioPromise = new Promise((resolve, reject) => {
-          // 当确认发送时，展示 loading
           let userMsgShow = false;
+
+          // onAbort 先定义，让后续终态处理器可引用它来解绑
+          const onAbort = () => {
+            logger.debug('withAIStream chat agent.chat audioEmitter onAbort');
+            audioEmitter.dispatchEvent(new EmitterEvent('cancel'));
+          };
+          // signal 可选：仅在传入时注册
+          signal === null || signal === void 0 || signal.addEventListener('abort', onAbort);
+
+          // 当确认发送时，展示 loading
+
           audioEmitter.addEventListener('confirm', async () => {
             logger.debug('withAIStream chat agent.chat audioEmitter onConfirm');
             if (end) {
@@ -316,6 +359,8 @@ export function withAIStream() {
               return;
             }
             end = true;
+            // 终态：解绑 signal 上的 abort 监听，避免 signal 长期持有本轮闭包
+            signal === null || signal === void 0 || signal.removeEventListener('abort', onAbort);
             if (!event.detail.text && userMsgShow) {
               await userMsg.remove();
               reject(new Error('No text found in audio event'));
@@ -335,6 +380,8 @@ export function withAIStream() {
           audioEmitter.addEventListener('cancel', async () => {
             logger.debug('withAIStream chat agent.chat audioEmitter onCancel');
             end = true;
+            // 终态：解绑 signal 上的 abort 监听
+            signal === null || signal === void 0 || signal.removeEventListener('abort', onAbort);
             // 取消时，有可能 userMsg.persist 还在执行，所以这里不 await，先 reject
             reject(new Error('User cancel'));
             if (!response.started && userMsgShow) {
@@ -343,13 +390,11 @@ export function withAIStream() {
           }, {
             once: true
           });
-          signal.addEventListener('abort', () => {
-            logger.debug('withAIStream chat agent.chat audioEmitter onAbort');
-            audioEmitter.dispatchEvent(new EmitterEvent('cancel'));
-          });
           audioEmitter.addEventListener('error', async () => {
             logger.debug('withAIStream chat agent.chat audioEmitter onError');
             end = true;
+            // 终态：解绑 signal 上的 abort 监听
+            signal === null || signal === void 0 || signal.removeEventListener('abort', onAbort);
             reject(new Error('Audio emitter error'));
             if (userMsgShow && userMsg.status !== ChatMessageStatus.FINISH) {
               await userMsg.remove();
@@ -616,6 +661,10 @@ export function withAIStream() {
         onUserDataRead: fn => {
           return hooks.hook('onUserDataRead', fn);
         },
+        onSessionEventReceived: fn => {
+          return hooks.hook('onSessionEventReceived', fn);
+        },
+        sendEvent: params => sendEventToAIStream(params),
         onTTTAction: fn => {
           return hooks.hook('onTTTAction', fn);
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-plugin-aistream",
-  "version": "0.2.7-beta.9",
+  "version": "0.2.8-beta.1",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -35,5 +35,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "31a0d88f88eddae8bfd802e4861c76cd02c07692"
+  "gitHead": "040499ca11aedda3246121f880807da0f8af3cc9"
 }