@zeewain/3d-avatar-sdk 2.1.2 → 2.1.4

package/dist/index.esm.js

@@ -502,7 +502,7 @@ class UnityBaseService {
         const finalConfig = Object.assign(Object.assign({}, DEFAULT_CONFIG), config);
         this.unityInstance = finalConfig.unityInstance;
         this.targetObjectName = finalConfig.targetObjectName;
-        this.timeout = finalConfig.timeout;
+        this.timeout = finalConfig.timeout || DEFAULT_CONFIG.timeout;
         this.maxRetries = finalConfig.maxRetries;
         this.instanceId = finalConfig.instanceId || 'default';
         this.logger = new SimpleLogger(finalConfig.enableDebugLog);
@@ -1023,7 +1023,7 @@ const ENV_MAP = {
     },
     /** 生产环境配置 */
     prod: {
-        apiBaseUrl: 'https://aiip.zeewain.com'
+        apiBaseUrl: 'https://ai.zeewain3d.com'
     }
 };
 /**
@@ -1034,7 +1034,7 @@ const ENV_MAP = {
  * @example
  * ```typescript
  * const config = getEnvConfig('prod');
- * console.log(config.apiBaseUrl); // https://aiip.zeewain.com/api/dh-talker
+ * console.log(config.apiBaseUrl); // https://ai.zeewain3d.com/api/dh-talker
  * ```
  */
 function getEnvConfig(env = 'dev', withApiModule = true) {
@@ -1505,6 +1505,8 @@ var BroadcastType;
  */
 var BroadcastTaskStatus;
 (function (BroadcastTaskStatus) {
+    /** 等待中（尚未开始请求） */
+    BroadcastTaskStatus["PENDING"] = "pending";
     /** 请求中 */
     BroadcastTaskStatus["REQUESTING"] = "requesting";
     /** 已完成 */
@@ -1570,7 +1572,7 @@ class BroadcastService extends UnityBaseService {
      * @override
      */
     handleCallback(operation, code, message, data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         // 提取 isBroadcastCompleted 参数
         const { isBroadcastCompleted } = JSON.parse(data || '{}');
         // 先调用基类处理逻辑
@@ -1582,7 +1584,14 @@ class BroadcastService extends UnityBaseService {
                     if (isBroadcastCompleted) {
                         this.broadcastCompletedCount++;
                         const status = this.getStatus();
-                        if (((_a = status.queueInfo) === null || _a === void 0 ? void 0 : _a.completedTasks) === this.broadcastCompletedCount) {
+                        // 判断是否所有任务都已完成：
+                        // 1. 没有待请求的任务 (PENDING)
+                        // 2. 没有正在请求的任务 (REQUESTING)
+                        // 3. Unity播放完成次数等于已完成任务数
+                        const isAllTasksCompleted = ((_a = status.queueInfo) === null || _a === void 0 ? void 0 : _a.pendingTasks) === 0
+                            && ((_b = status.queueInfo) === null || _b === void 0 ? void 0 : _b.requestingTasks) === 0
+                            && ((_c = status.queueInfo) === null || _c === void 0 ? void 0 : _c.completedTasks) === this.broadcastCompletedCount;
+                        if (isAllTasksCompleted) {
                             // 重置状态、计数
                             this.isBroadcastingAudio = false;
                             this.hasReceivedAudio = false;
@@ -1592,19 +1601,19 @@ class BroadcastService extends UnityBaseService {
                             this.logger.warn('Broadcast all completed');
                         }
                         // this.logger.warn('AAAAAA', { status: this.getStatus(), broadcastCompletedCount: this.broadcastCompletedCount });
-                        (_c = (_b = this.callbacks).onFinish) === null || _c === void 0 ? void 0 : _c.call(_b);
+                        (_e = (_d = this.callbacks).onFinish) === null || _e === void 0 ? void 0 : _e.call(_d);
                     }
                     break;
                 case BroadcastOperationType.PAUSE_BROADCAST:
-                    (_e = (_d = this.callbacks).onPause) === null || _e === void 0 ? void 0 : _e.call(_d);
+                    (_g = (_f = this.callbacks).onPause) === null || _g === void 0 ? void 0 : _g.call(_f);
                     this.logger.debug('Broadcast paused callback triggered');
                     break;
                 case BroadcastOperationType.RESUME_BROADCAST:
-                    (_g = (_f = this.callbacks).onResume) === null || _g === void 0 ? void 0 : _g.call(_f);
+                    (_j = (_h = this.callbacks).onResume) === null || _j === void 0 ? void 0 : _j.call(_h);
                     this.logger.debug('Broadcast resumed callback triggered');
                     break;
                 case BroadcastOperationType.STOP_BROADCAST:
-                    (_j = (_h = this.callbacks).onStop) === null || _j === void 0 ? void 0 : _j.call(_h);
+                    (_l = (_k = this.callbacks).onStop) === null || _l === void 0 ? void 0 : _l.call(_k);
                     this.logger.debug('Broadcast stopped callback triggered');
                     break;
             }
@@ -1661,7 +1670,7 @@ class BroadcastService extends UnityBaseService {
                 // 重置序号计数器
                 this.taskSequence = 0;
                 this.currentSendingSequence = 0;
-                // 通知Unity开始新任务（清空队列）
+                // 通知Unity开始新任务（清空队列），这里不使用sendAsyncMessage，因为startBroadcast不需要等待完成，而是在任务播报完成后通过回调通知
                 this.sendMessage('StartBroadcast', {
                     callbackFun: this.uniqueCallbackName,
                     operationType: BroadcastOperationType.START_BROADCAST,
@@ -1773,18 +1782,20 @@ class BroadcastService extends UnityBaseService {
      * @description 获取当前播报服务的状态信息，包括队列状态
      */
     getStatus() {
+        const pendingTasks = this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.PENDING).length;
         const completedTasks = this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.COMPLETED).length;
         const requestingTasks = this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.REQUESTING).length;
         const failedTasks = this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.FAILED).length;
         const totalPendingResponses = this.taskQueue.reduce((sum, t) => sum + t.pendingResponses.length, 0);
         const currentSendingSequence = this.currentSendingSequence;
-        const isGeneratingAudio = completedTasks + failedTasks !== this.taskQueue.length;
+        const isGeneratingAudio = pendingTasks + requestingTasks > 0;
         return {
             isActive: this.isBroadcastingAudio || isGeneratingAudio, // 是否正在播报音频或正在生成音频
             isGeneratingAudio,
             hasReceivedAudio: this.hasReceivedAudio,
             queueInfo: {
                 totalTasks: this.taskQueue.length,
+                pendingTasks,
                 requestingTasks,
                 completedTasks,
                 failedTasks,
@@ -1818,7 +1829,7 @@ class BroadcastService extends UnityBaseService {
             id: `broadcast_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
             sequence: ++this.taskSequence,
             params,
-            status: BroadcastTaskStatus.REQUESTING,
+            status: BroadcastTaskStatus.PENDING,
             controller: new AbortController(),
             pendingResponses: [],
             isGenerationComplete: false,
@@ -1830,46 +1841,58 @@ class BroadcastService extends UnityBaseService {
     /**
      * 添加任务到队列
      * @param task - 播报任务
-     * @description 将任务添加到队列并立即开始请求
+     * @description 将任务添加到队列，只有当没有正在请求的任务时才开始请求（串行请求模式）
      * @private
      */
     addTaskToQueue(task) {
         this.taskQueue.push(task);
-        this.logger.debug('Task added to queue', { taskId: task.id, queueLength: this.taskQueue.length });
-        // 立即开始该任务的请求
-        this.startTaskRequest(task);
+        this.logger.debug('Task added to queue', { taskId: task.id, params: task.params, queueLength: this.taskQueue.length });
+        // 检查是否有正在请求的任务
+        const hasRequestingTask = this.taskQueue.some((t) => t.status === BroadcastTaskStatus.REQUESTING);
+        // 只有当没有正在请求的任务时，才开始当前任务的请求
+        if (!hasRequestingTask) {
+            this.startTaskRequest(task);
+        }
+        else {
+            this.logger.debug('Task queued, waiting for previous task to complete', {
+                taskId: task.id,
+                pendingTasks: this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.PENDING).length
+            });
+        }
         // 开始处理队列
-        this.processQueue();
+        this.processTaskQueue();
     }
     /**
      * 处理队列
-     * @description 处理队列中的任务，发起请求生成音频
+     * @description 处理队列中的任务响应，按序号发送给unity播放
      * @private
      */
-    processQueue() {
+    processTaskQueue() {
         // 启动队列处理定时器（如果尚未启动）
         if (!this.queueProcessTimer) {
             this.queueProcessTimer = setInterval(() => {
-                this.processQueueStep();
+                this.processTaskQueueStep();
             }, 100); // 每100ms检查一次队列状态
         }
         // 立即处理一次
-        this.processQueueStep();
+        this.processTaskQueueStep();
     }
     /**
      * 队列处理步骤
-     * @description 处理队列中的单个步骤，包括发起请求和发送音频
+     * @description 处理队列中的单个步骤，按序号发送给unity播放
      * @private
      */
-    processQueueStep() {
-        // 按序号找到下一个要处理的任务
+    processTaskQueueStep() {
+        // 按序号找到下一个要处理的任务（只处理已开始请求的任务，排除 PENDING 状态）
         const nextTask = this.taskQueue.find((task) => task.sequence === this.currentSendingSequence + 1
+            && task.status !== BroadcastTaskStatus.PENDING
             && task.pendingResponses.length > 0);
         if (nextTask) {
             this.sendNextResponse(nextTask);
         }
-        // 如果队列中没有剩余任务，则停止定时器
-        const remainingTasks = this.taskQueue.filter(task => task.status !== BroadcastTaskStatus.COMPLETED
+        // 如果队列中没有剩余任务（排除待处理、已完成、失败和取消的任务），则停止定时器
+        const remainingTasks = this.taskQueue.filter(task => task.status !== BroadcastTaskStatus.PENDING
+            && task.status !== BroadcastTaskStatus.COMPLETED
             && task.status !== BroadcastTaskStatus.FAILED
             && task.status !== BroadcastTaskStatus.CANCELLED);
         if (remainingTasks.length === 0) {
@@ -1961,7 +1984,7 @@ class BroadcastService extends UnityBaseService {
             const response = JSON.parse(data);
             // 错误处理
             if (response.code !== 0) {
-                this.handleBroadcastError(response.code);
+                this.handleBroadcastError(response.code, response.message);
                 return;
             }
             // 处理音频数据
@@ -1973,7 +1996,7 @@ class BroadcastService extends UnityBaseService {
                 }
                 // 添加处理后的响应对象到待发送队列
                 task.pendingResponses.push(response);
-                this.logger.debug('Response added to task', { taskId: task.id, pendingCount: task.pendingResponses.length });
+                this.logger.debug('Response added to task', { taskId: task.id, response, pendingCount: task.pendingResponses.length });
                 // 检查是否完成
                 if (response.data.done) {
                     task.isGenerationComplete = true;
@@ -1982,13 +2005,13 @@ class BroadcastService extends UnityBaseService {
             }
         }
         catch (error) {
-            this.handleTaskError(task, error);
+            this.handleTaskError(task, new SDKError(OperationErrorCode.OPERATION_FAILED, typeof error === 'string' ? error : (error.message || '播报服务错误')));
         }
     }
     /**
-     * 发送下一个响应
+     * 发送下一个响应给unity播放
      * @param task - 播报任务
-     * @description 发送任务中的第一个待发送响应到Unity，发送后立即删除
+     * @description 发送任务的响应数组中的第一个待发送响应到Unity（按顺序发送），发送后立即删除
      * @private
      */
     sendNextResponse(task) {
@@ -2003,7 +2026,7 @@ class BroadcastService extends UnityBaseService {
             remainingResponses: task.pendingResponses.length,
             voiceUrl: (_a = response.data) === null || _a === void 0 ? void 0 : _a.voiceUrl
         });
-        // 发送响应到Unity
+        // 发送响应到Unity，这里不使用sendAsyncMessage，因为appendBroadcast不需要等待完成，而是在任务播报完成后通过startBroadcast回调通知
         this.sendMessage('AppendBroadcast', {
             response,
             callbackFun: this.uniqueCallbackName,
@@ -2019,7 +2042,7 @@ class BroadcastService extends UnityBaseService {
     /**
      * 处理任务关闭
      * @param task - 播报任务
-     * @description 处理任务的流式连接关闭
+     * @description 处理任务的流式连接关闭，并启动下一个待处理任务的请求
      * @private
      */
     handleTaskClose(task) {
@@ -2028,12 +2051,14 @@ class BroadcastService extends UnityBaseService {
         if (!task.isGenerationComplete && task.status === BroadcastTaskStatus.REQUESTING) {
             task.isGenerationComplete = true;
         }
+        // 当前任务请求完成后（流断开后），启动下一个待处理任务的请求
+        this.startNextPendingTask();
     }
     /**
      * 处理任务错误
      * @param task - 播报任务
      * @param error - 错误对象
-     * @description 处理任务执行过程中的错误，防止重复触发错误回调
+     * @description 处理任务执行过程中的错误，防止重复触发错误回调，并启动下一个待处理任务
      * @private
      */
     handleTaskError(task, error) {
@@ -2136,10 +2161,11 @@ class BroadcastService extends UnityBaseService {
     /**
      * 处理播报错误
      * @param errorCode - 错误码
+     * @param errorMessage - 错误消息
      * @description 处理播报过程中的错误
      * @private
      */
-    handleBroadcastError(errorCode) {
+    handleBroadcastError(errorCode, errorMessage) {
         // 用户权益额度不存在错误码 14001
         // 用户权益额度不足错误码 14002
         // 用户权益额度冻结失败 14003
@@ -2154,10 +2180,31 @@ class BroadcastService extends UnityBaseService {
                 this.handleError(new SDKError(OperationErrorCode.BROADCAST_EQUITY_FREEZE_FAILED, '用户权益额度冻结失败'));
                 break;
             default:
-                this.handleError(new SDKError(OperationErrorCode.OPERATION_FAILED, '播报服务错误'));
+                this.handleError(new SDKError(OperationErrorCode.OPERATION_FAILED, `${errorMessage}(${errorCode})` || `播报服务错误(${errorCode})`));
                 break;
         }
     }
+    /**
+     * 启动下一个待处理任务的请求
+     * @description 在当前任务请求完成或失败后，检查并启动下一个待处理任务
+     * @private
+     */
+    startNextPendingTask() {
+        // 查找下一个待处理的任务（按序号排序，取第一个 PENDING 状态的任务）
+        const nextPendingTask = this.taskQueue
+            .filter((t) => t.status === BroadcastTaskStatus.PENDING)
+            .sort((a, b) => a.sequence - b.sequence)[0];
+        if (nextPendingTask) {
+            this.logger.debug('Starting next pending task', {
+                taskId: nextPendingTask.id,
+                sequence: nextPendingTask.sequence
+            });
+            this.startTaskRequest(nextPendingTask);
+        }
+        else {
+            this.logger.debug('No pending tasks to start');
+        }
+    }
     /**
      * 清理队列处理定时器
      * @description 清理队列处理定时器
@@ -2167,6 +2214,7 @@ class BroadcastService extends UnityBaseService {
         if (this.queueProcessTimer) {
             clearInterval(this.queueProcessTimer);
             this.queueProcessTimer = null;
+            this.logger.debug('Queue process timer cleared');
         }
     }
     /**
@@ -2359,6 +2407,7 @@ class ZEEAvatarLoader {
      */
     initGlobalConfig() {
         const config = ConfigManager.getInstance().getConfig();
+        const { assetsFrom } = config;
         const globalParams = {
             token: config === null || config === void 0 ? void 0 : config.token,
             apiBaseUrl: ConfigManager.getInstance().getApiBaseUrl(false),
@@ -2366,14 +2415,17 @@ class ZEEAvatarLoader {
             // 純AB包方案在SDK 2.1.0 中已弃用
             // assetsUrl: config?.assetsUrl
         };
-        const assetModuleParams = {
-            isZip: true,
-            assetBundlePath: config === null || config === void 0 ? void 0 : config.assetsUrl
-        };
         this.unityInstance.SendMessage('AvatarSDK', 'InitializeConfig', JSON.stringify(globalParams));
-        this.unityInstance.SendMessage('AvatarSDK', 'InitAssetBundleModule', JSON.stringify(assetModuleParams));
         console.warn('[ Send Unity message ]: AvatarSDK.InitializeConfig', globalParams);
-        console.warn('[ Send Unity message ]: AvatarSDK.InitAssetBundleModule', assetModuleParams);
+        //
+        if (assetsFrom !== 'cloud') {
+            const assetModuleParams = {
+                isZip: true,
+                assetBundlePath: config === null || config === void 0 ? void 0 : config.assetsUrl
+            };
+            this.unityInstance.SendMessage('AvatarSDK', 'InitAssetBundleModule', JSON.stringify(assetModuleParams));
+            console.warn('[ Send Unity message ]: AvatarSDK.InitAssetBundleModule', assetModuleParams);
+        }
     }
 }
 
@@ -2411,7 +2463,7 @@ function compareVersionCompatibility(version1, version2) {
  * SDK 版本号
  * @const {string} SDK_VERSION
  */
-const SDK_VERSION = '2.1.2';
+const SDK_VERSION = '2.1.4';
 
 /**
  * @fileoverview 统一的3D数字人SDK入口类
@@ -2477,14 +2529,16 @@ class ZEEAvatarSDK {
                 this.avatarService = new AvatarService({
                     unityInstance: this.unityInstance,
                     instanceId: this.instanceId,
-                    enableDebugLog: config.enableDebugLog
+                    enableDebugLog: config.enableDebugLog,
+                    timeout: config.operationTimeout
                 });
                 // 5. 创建带有唯一标识符的播报服务
                 this.broadcastService = new BroadcastService({
                     unityInstance: this.unityInstance,
                     instanceId: this.instanceId,
                     callbacks: config.broadcastCallbacks,
-                    enableDebugLog: config.enableDebugLog
+                    enableDebugLog: config.enableDebugLog,
+                    timeout: config.operationTimeout
                 });
                 // 6. 初始化数字人
                 const result = yield this.avatarService.initializeAvatar(avatarCode, cameraType);