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

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,
@@ -65,8 +65,10 @@ export function sendBlocksToAIStream(params) {
         if (!closed) {
           logger.debug('sendBlocksToAIStream close');
           closed = true;
-          if (!canceled && !(signal !== null && signal !== void 0 && signal.aborted)) {
+          try {
             controller.close();
+          } catch (error) {
+            logger.debug('sendBlocksToAIStream close ignored', error);
           }
         }
       };
@@ -116,7 +118,7 @@ export function sendBlocksToAIStream(params) {
       if (getUserData) {
         eventUserData = await getUserData();
       }
-      const userData = deepMerge({
+      const userData = deepmerge({
         chatAttributes
       }, eventUserData);
       let error;
@@ -251,7 +253,7 @@ export function sendBlocksToAIStream(params) {
           if (data.body.sessionState === SessionState.CLOSED || data.body.sessionState === SessionState.CREATE_FAILED) {
             const msg = SessionState[data.body.sessionState];
             const e = new AIStreamError("Session Error: ".concat(msg, ", (original_code: ").concat(data.body.code, ")"), transformErrorCode(data.body.code));
-            emitError(error);
+            emitError(e);
             if (audioEmitter) {
               audioEmitter.dispatchEvent(new EmitterEvent('error', {
                 detail: e
@@ -262,7 +264,7 @@ export function sendBlocksToAIStream(params) {
         } else if (data.type === 'connectionState') {
           if (data.body.connectState === ConnectState.DISCONNECTED || data.body.connectState === ConnectState.CLOSED) {
             const e = new AIStreamError("Session disconnected, (original_code: ".concat(data.body.code, ")"), transformErrorCode(data.body.code));
-            emitError(error);
+            emitError(e);
             if (audioEmitter) {
               audioEmitter.dispatchEvent(new EmitterEvent('error', {
                 detail: e
@@ -303,14 +305,14 @@ export function sendBlocksToAIStream(params) {
         } else if (block.type === 'file_path') {
           event.write({
             type: 'file',
-            format: mimeTypeToFormatMap[block.file_url.mimeType] || 0,
+            format: mimeTypeToFormatMap[block.file_path.mimeType] || 0,
             path: block.file_path.path
           }).catch(emitError);
         } else if (block.type === 'video_path') {
           event.write({
             type: 'file',
             format: FileFormat.MP4,
-            path: block.file_path.path
+            path: block.video_path.path
           }).catch(emitError);
         }
       }

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;
 }>;
@@ -36,11 +36,11 @@ export declare const getAppInfo: (options?: Omit<GetAppInfoParams, "success" | "
     regionCode: string;
     appName: string;
     appIcon: string;
-    appEnv?: number | undefined;
+    appEnv?: number;
     appBundleId: string;
     appScheme: string;
     appId: string;
-    clientId?: string | undefined;
+    clientId?: string;
 }>;
 export declare const canIUseRouter: (options?: Omit<CanIUseRouterParams, "success" | "fail"> | undefined) => Promise<{
     result: boolean;
@@ -57,7 +57,7 @@ export declare const openMiniWidget: (options?: Omit<OpenMiniWidgetParams, "succ
 export declare const isConnected: (options?: Omit<IsConnectedParams, "success" | "fail"> | undefined) => Promise<{
     connected: boolean;
     state: number;
-    connectionId?: string | undefined;
+    connectionId?: string;
 }>;
 export declare const connect: (options?: Omit<ConnectParams, "success" | "fail"> | undefined) => Promise<{
     connectionId: string;
@@ -66,7 +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;
+    extParams?: string;
 }>;
 export declare const createSession: (options?: Omit<CreateSessionParams, "success" | "fail"> | undefined) => Promise<{
     sessionId: string;
@@ -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>>;
@@ -72,10 +73,10 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
             metaPromise: Promise<Record<string, any>>;
         };
         chat: (blocks: InputBlock[], signal?: AbortSignalObject, options?: {
-            sendBy?: string | undefined;
-            responseBy?: string | undefined;
-            userData?: AIStreamUserData | undefined;
-        } | undefined) => Promise<ChatMessage[]>;
+            sendBy?: string;
+            responseBy?: string;
+            userData?: AIStreamUserData;
+        }) => Promise<ChatMessage[]>;
         options: AIStreamOptions;
         removeMessage: (message: ChatMessage) => Promise<void>;
         clearAllMessages: () => Promise<void>;
@@ -86,13 +87,15 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
             thingjson?: any;
             data: string;
         }>;
-        onSkillCompose: (fn: AIStreamHooks['onSkillCompose']) => () => void;
-        onChatMessageSent: (fn: AIStreamHooks['onChatMessageSent']) => () => void;
-        onTextCompose: (fn: AIStreamHooks['onTextCompose']) => () => void;
-        onSkillsEnd: (fn: AIStreamHooks['onSkillsEnd']) => () => void;
-        onCardsReceived: (fn: AIStreamHooks['onCardsReceived']) => () => void;
-        onUserDataRead: (fn: AIStreamHooks['onUserDataRead']) => () => void;
-        onTTTAction: (fn: AIStreamHooks['onTTTAction']) => () => void;
+        onSkillCompose: (fn: AIStreamHooks["onSkillCompose"]) => () => void;
+        onChatMessageSent: (fn: AIStreamHooks["onChatMessageSent"]) => () => void;
+        onTextCompose: (fn: AIStreamHooks["onTextCompose"]) => () => void;
+        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

@@ -16,12 +16,12 @@ function _asyncIterator(r) { var n, t, o, e = 2; for ("undefined" != typeof Symb
 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] : {};
@@ -110,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) {
         // 故意异步，不阻塞消息列表加载
@@ -255,9 +258,8 @@ 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;
         }
       });
@@ -609,7 +611,7 @@ export function withAIStream() {
           }
         }
         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) {
+          for (const card of skill.general.data.aiCards) {
             cards.push(card);
           }
         }
@@ -659,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",
+  "version": "0.2.8-beta.2",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -21,7 +21,9 @@
   "scripts": {
     "dev": "ray start --type=component --output dist --emit-declaration-dev",
     "build": "ray build --type=component --output dist",
-    "clean": "rimraf ./dist"
+    "clean": "rimraf ./dist",
+    "test": "jest --runInBand",
+    "test:coverage": "jest --runInBand --coverage"
   },
   "dependencies": {
     "dayjs": "^1.10.4",
@@ -35,5 +37,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "3afabdd5b9a063d70157f69158ef8edccfdac012"
+  "gitHead": "450ca8d41536094b3bea57198fd7724ba6812438"
 }