@zeewain/3d-avatar-sdk 1.2.4-1 → 1.2.5

package/dist/index.esm.js

@@ -1556,14 +1556,14 @@ class BroadcastService extends UnityBaseService {
         this.taskSequence = 0;
         /** 当前发送任务的序号 */
         this.currentSendingSequence = 0;
-        /** 是否正在生成音频 */
-        this.isGeneratingAudio = false;
+        /** 是否正在播报音频 */
+        this.isBroadcastingAudio = false;
         /** 是否已经收到音频 */
         this.hasReceivedAudio = false;
         /** 队列处理定时器 */
         this.queueProcessTimer = null;
-        /** 主请求控制器（兼容性保留） */
-        this.activeController = null;
+        /** 播报完成次数 */
+        this.broadcastCompletedCount = 0;
         this.callbacks = config.callbacks || {};
         this.logger.info('Broadcast service initialized', { config });
     }
@@ -1577,7 +1577,7 @@ class BroadcastService extends UnityBaseService {
      * @override
      */
     handleCallback(operation, code, message, data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // 提取 isBroadcastCompleted 参数
         const { isBroadcastCompleted } = JSON.parse(data || '{}');
         // 先调用基类处理逻辑
@@ -1587,19 +1587,31 @@ class BroadcastService extends UnityBaseService {
             switch (operation) {
                 case BroadcastOperationType.START_BROADCAST:
                     if (isBroadcastCompleted) {
-                        (_b = (_a = this.callbacks).onFinish) === null || _b === void 0 ? void 0 : _b.call(_a);
+                        this.broadcastCompletedCount++;
+                        const status = this.getStatus();
+                        if (((_a = status.queueInfo) === null || _a === void 0 ? void 0 : _a.completedTasks) === this.broadcastCompletedCount) {
+                            // 重置状态、计数
+                            this.isBroadcastingAudio = false;
+                            this.hasReceivedAudio = false;
+                            this.currentSendingSequence = 0;
+                            // 清理已完成的任务
+                            this.cleanupCompletedTasks();
+                            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);
                     }
                     break;
                 case BroadcastOperationType.PAUSE_BROADCAST:
-                    (_d = (_c = this.callbacks).onPause) === null || _d === void 0 ? void 0 : _d.call(_c);
+                    (_e = (_d = this.callbacks).onPause) === null || _e === void 0 ? void 0 : _e.call(_d);
                     this.logger.debug('Broadcast paused callback triggered');
                     break;
                 case BroadcastOperationType.RESUME_BROADCAST:
-                    (_f = (_e = this.callbacks).onResume) === null || _f === void 0 ? void 0 : _f.call(_e);
+                    (_g = (_f = this.callbacks).onResume) === null || _g === void 0 ? void 0 : _g.call(_f);
                     this.logger.debug('Broadcast resumed callback triggered');
                     break;
                 case BroadcastOperationType.STOP_BROADCAST:
-                    (_h = (_g = this.callbacks).onStop) === null || _h === void 0 ? void 0 : _h.call(_g);
+                    (_j = (_h = this.callbacks).onStop) === null || _j === void 0 ? void 0 : _j.call(_h);
                     this.logger.debug('Broadcast stopped callback triggered');
                     break;
             }
@@ -1665,7 +1677,7 @@ class BroadcastService extends UnityBaseService {
                 });
                 // 触发开始回调
                 (_b = (_a = this.callbacks).onStart) === null || _b === void 0 ? void 0 : _b.call(_a);
-                this.isGeneratingAudio = true;
+                this.isBroadcastingAudio = true;
             }
             // 创建新的播报任务
             const task = this.createBroadcastTask(params);
@@ -1740,8 +1752,9 @@ class BroadcastService extends UnityBaseService {
             // 取消所有队列中的任务
             this.cancelAllTasks();
             // 重置状态
-            this.isGeneratingAudio = false;
+            this.isBroadcastingAudio = false;
             this.hasReceivedAudio = false;
+            this.broadcastCompletedCount = 0;
             try {
                 yield this.sendAsyncMessage('StopBroadcast', BroadcastOperationType.STOP_BROADCAST, {});
                 this.logger.info('Broadcast stopped successfully');
@@ -1767,19 +1780,23 @@ class BroadcastService extends UnityBaseService {
      * @description 获取当前播报服务的状态信息，包括队列状态
      */
     getStatus() {
+        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;
         return {
-            isActive: this.taskQueue.length > 0 || this.isGeneratingAudio,
-            isGeneratingAudio: this.isGeneratingAudio,
+            isActive: this.isBroadcastingAudio || isGeneratingAudio, // 是否正在播报音频或正在生成音频
+            isGeneratingAudio,
             hasReceivedAudio: this.hasReceivedAudio,
-            pendingCallbacks: this.getPendingCallbackCount(),
-            hasController: this.activeController !== null,
             queueInfo: {
                 totalTasks: this.taskQueue.length,
-                requestingTasks: this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.REQUESTING).length,
-                completedTasks: this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.COMPLETED).length,
-                failedTasks: this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.FAILED).length,
-                totalPendingResponses: this.taskQueue.reduce((sum, t) => sum + t.pendingResponses.length, 0),
-                currentSendingSequence: this.currentSendingSequence
+                requestingTasks,
+                completedTasks,
+                failedTasks,
+                totalPendingResponses,
+                currentSendingSequence
             }
         };
     }
@@ -1789,10 +1806,7 @@ class BroadcastService extends UnityBaseService {
      */
     destroy() {
         // 清理队列处理定时器
-        if (this.queueProcessTimer) {
-            clearInterval(this.queueProcessTimer);
-            this.queueProcessTimer = null;
-        }
+        this.clearQueueProcessTimer();
         // 取消所有任务
         this.cancelAllTasks();
         // 调用基类销毁方法
@@ -1861,12 +1875,12 @@ class BroadcastService extends UnityBaseService {
         if (nextTask) {
             this.sendNextResponse(nextTask);
         }
-        // 清理已完成的任务
-        this.cleanupCompletedTasks();
-        // 如果队列为空，停止定时器
-        if (this.taskQueue.length === 0 && this.queueProcessTimer) {
-            clearInterval(this.queueProcessTimer);
-            this.queueProcessTimer = null;
+        // 如果队列中没有剩余任务，则停止定时器
+        const remainingTasks = this.taskQueue.filter(task => task.status !== BroadcastTaskStatus.COMPLETED
+            && task.status !== BroadcastTaskStatus.FAILED
+            && task.status !== BroadcastTaskStatus.CANCELLED);
+        if (remainingTasks.length === 0) {
+            this.clearQueueProcessTimer();
         }
     }
     /**
@@ -1940,6 +1954,7 @@ class BroadcastService extends UnityBaseService {
             }
             // 处理音频数据
             if (response.data) {
+                this.hasReceivedAudio = true;
                 // 自定义音频播报时，如果服务器未返回音频URL，使用传入的audioUrl
                 if (task.params.type === BroadcastType.AUDIO && task.params.audioUrl && !response.data.voiceUrl) {
                     response.data.voiceUrl = task.params.audioUrl;
@@ -2062,20 +2077,12 @@ class BroadcastService extends UnityBaseService {
      * @private
      */
     getBroadcastApiPath(type) {
-        const env = ConfigManager.getInstance().getEnv();
+        ConfigManager.getInstance().getEnv();
         switch (type) {
             case BroadcastType.TEXT:
-                // 临时处理，开发和测试环境使用新接口
-                if (env === 'dev' || env === 'test') {
-                    return '/aiep-openapi/avatar-interaction/v1/broadcast/text';
-                }
-                return '/dh-talker/user/agent/broadcast/text';
+                return '/aiep-openapi/avatar-interaction/v1/broadcast/text';
             case BroadcastType.AUDIO:
-                // 临时处理，开发和测试环境使用新接口
-                if (env === 'dev' || env === 'test') {
-                    return '/aiep-openapi/avatar-interaction/v1/broadcast/audio';
-                }
-                return '/dh-talker/user/agent/broadcast/customAudio';
+                return '/aiep-openapi/avatar-interaction/v1/broadcast/audio';
             default:
                 throw new SDKError(ConfigErrorCode.INVALID_CONFIG, `未知的播报类型: ${type}`);
         }
@@ -2108,11 +2115,6 @@ class BroadcastService extends UnityBaseService {
     handleError(error) {
         var _a, _b;
         this.logger.error('Broadcast error occurred', error);
-        // 清理控制器
-        if (this.activeController) {
-            this.activeController.abort();
-            this.activeController = null;
-        }
         // 触发错误回调
         (_b = (_a = this.callbacks).onError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
     }
@@ -2141,6 +2143,17 @@ class BroadcastService extends UnityBaseService {
                 break;
         }
     }
+    /**
+     * 清理队列处理定时器
+     * @description 清理队列处理定时器
+     * @private
+     */
+    clearQueueProcessTimer() {
+        if (this.queueProcessTimer) {
+            clearInterval(this.queueProcessTimer);
+            this.queueProcessTimer = null;
+        }
+    }
 }
 
 /**

package/dist/index.umd.cjs

@@ -1562,14 +1562,14 @@
             this.taskSequence = 0;
             /** 当前发送任务的序号 */
             this.currentSendingSequence = 0;
-            /** 是否正在生成音频 */
-            this.isGeneratingAudio = false;
+            /** 是否正在播报音频 */
+            this.isBroadcastingAudio = false;
             /** 是否已经收到音频 */
             this.hasReceivedAudio = false;
             /** 队列处理定时器 */
             this.queueProcessTimer = null;
-            /** 主请求控制器（兼容性保留） */
-            this.activeController = null;
+            /** 播报完成次数 */
+            this.broadcastCompletedCount = 0;
             this.callbacks = config.callbacks || {};
             this.logger.info('Broadcast service initialized', { config });
         }
@@ -1583,7 +1583,7 @@
          * @override
          */
         handleCallback(operation, code, message, data) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             // 提取 isBroadcastCompleted 参数
             const { isBroadcastCompleted } = JSON.parse(data || '{}');
             // 先调用基类处理逻辑
@@ -1593,19 +1593,31 @@
                 switch (operation) {
                     case exports.BroadcastOperationType.START_BROADCAST:
                         if (isBroadcastCompleted) {
-                            (_b = (_a = this.callbacks).onFinish) === null || _b === void 0 ? void 0 : _b.call(_a);
+                            this.broadcastCompletedCount++;
+                            const status = this.getStatus();
+                            if (((_a = status.queueInfo) === null || _a === void 0 ? void 0 : _a.completedTasks) === this.broadcastCompletedCount) {
+                                // 重置状态、计数
+                                this.isBroadcastingAudio = false;
+                                this.hasReceivedAudio = false;
+                                this.currentSendingSequence = 0;
+                                // 清理已完成的任务
+                                this.cleanupCompletedTasks();
+                                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);
                         }
                         break;
                     case exports.BroadcastOperationType.PAUSE_BROADCAST:
-                        (_d = (_c = this.callbacks).onPause) === null || _d === void 0 ? void 0 : _d.call(_c);
+                        (_e = (_d = this.callbacks).onPause) === null || _e === void 0 ? void 0 : _e.call(_d);
                         this.logger.debug('Broadcast paused callback triggered');
                         break;
                     case exports.BroadcastOperationType.RESUME_BROADCAST:
-                        (_f = (_e = this.callbacks).onResume) === null || _f === void 0 ? void 0 : _f.call(_e);
+                        (_g = (_f = this.callbacks).onResume) === null || _g === void 0 ? void 0 : _g.call(_f);
                         this.logger.debug('Broadcast resumed callback triggered');
                         break;
                     case exports.BroadcastOperationType.STOP_BROADCAST:
-                        (_h = (_g = this.callbacks).onStop) === null || _h === void 0 ? void 0 : _h.call(_g);
+                        (_j = (_h = this.callbacks).onStop) === null || _j === void 0 ? void 0 : _j.call(_h);
                         this.logger.debug('Broadcast stopped callback triggered');
                         break;
                 }
@@ -1671,7 +1683,7 @@
                     });
                     // 触发开始回调
                     (_b = (_a = this.callbacks).onStart) === null || _b === void 0 ? void 0 : _b.call(_a);
-                    this.isGeneratingAudio = true;
+                    this.isBroadcastingAudio = true;
                 }
                 // 创建新的播报任务
                 const task = this.createBroadcastTask(params);
@@ -1746,8 +1758,9 @@
                 // 取消所有队列中的任务
                 this.cancelAllTasks();
                 // 重置状态
-                this.isGeneratingAudio = false;
+                this.isBroadcastingAudio = false;
                 this.hasReceivedAudio = false;
+                this.broadcastCompletedCount = 0;
                 try {
                     yield this.sendAsyncMessage('StopBroadcast', exports.BroadcastOperationType.STOP_BROADCAST, {});
                     this.logger.info('Broadcast stopped successfully');
@@ -1773,19 +1786,23 @@
          * @description 获取当前播报服务的状态信息，包括队列状态
          */
         getStatus() {
+            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;
             return {
-                isActive: this.taskQueue.length > 0 || this.isGeneratingAudio,
-                isGeneratingAudio: this.isGeneratingAudio,
+                isActive: this.isBroadcastingAudio || isGeneratingAudio, // 是否正在播报音频或正在生成音频
+                isGeneratingAudio,
                 hasReceivedAudio: this.hasReceivedAudio,
-                pendingCallbacks: this.getPendingCallbackCount(),
-                hasController: this.activeController !== null,
                 queueInfo: {
                     totalTasks: this.taskQueue.length,
-                    requestingTasks: this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.REQUESTING).length,
-                    completedTasks: this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.COMPLETED).length,
-                    failedTasks: this.taskQueue.filter((t) => t.status === BroadcastTaskStatus.FAILED).length,
-                    totalPendingResponses: this.taskQueue.reduce((sum, t) => sum + t.pendingResponses.length, 0),
-                    currentSendingSequence: this.currentSendingSequence
+                    requestingTasks,
+                    completedTasks,
+                    failedTasks,
+                    totalPendingResponses,
+                    currentSendingSequence
                 }
             };
         }
@@ -1795,10 +1812,7 @@
          */
         destroy() {
             // 清理队列处理定时器
-            if (this.queueProcessTimer) {
-                clearInterval(this.queueProcessTimer);
-                this.queueProcessTimer = null;
-            }
+            this.clearQueueProcessTimer();
             // 取消所有任务
             this.cancelAllTasks();
             // 调用基类销毁方法
@@ -1867,12 +1881,12 @@
             if (nextTask) {
                 this.sendNextResponse(nextTask);
             }
-            // 清理已完成的任务
-            this.cleanupCompletedTasks();
-            // 如果队列为空，停止定时器
-            if (this.taskQueue.length === 0 && this.queueProcessTimer) {
-                clearInterval(this.queueProcessTimer);
-                this.queueProcessTimer = null;
+            // 如果队列中没有剩余任务，则停止定时器
+            const remainingTasks = this.taskQueue.filter(task => task.status !== BroadcastTaskStatus.COMPLETED
+                && task.status !== BroadcastTaskStatus.FAILED
+                && task.status !== BroadcastTaskStatus.CANCELLED);
+            if (remainingTasks.length === 0) {
+                this.clearQueueProcessTimer();
             }
         }
         /**
@@ -1946,6 +1960,7 @@
                 }
                 // 处理音频数据
                 if (response.data) {
+                    this.hasReceivedAudio = true;
                     // 自定义音频播报时，如果服务器未返回音频URL，使用传入的audioUrl
                     if (task.params.type === exports.BroadcastType.AUDIO && task.params.audioUrl && !response.data.voiceUrl) {
                         response.data.voiceUrl = task.params.audioUrl;
@@ -2068,20 +2083,12 @@
          * @private
          */
         getBroadcastApiPath(type) {
-            const env = ConfigManager.getInstance().getEnv();
+            ConfigManager.getInstance().getEnv();
             switch (type) {
                 case exports.BroadcastType.TEXT:
-                    // 临时处理，开发和测试环境使用新接口
-                    if (env === 'dev' || env === 'test') {
-                        return '/aiep-openapi/avatar-interaction/v1/broadcast/text';
-                    }
-                    return '/dh-talker/user/agent/broadcast/text';
+                    return '/aiep-openapi/avatar-interaction/v1/broadcast/text';
                 case exports.BroadcastType.AUDIO:
-                    // 临时处理，开发和测试环境使用新接口
-                    if (env === 'dev' || env === 'test') {
-                        return '/aiep-openapi/avatar-interaction/v1/broadcast/audio';
-                    }
-                    return '/dh-talker/user/agent/broadcast/customAudio';
+                    return '/aiep-openapi/avatar-interaction/v1/broadcast/audio';
                 default:
                     throw new SDKError(exports.ConfigErrorCode.INVALID_CONFIG, `未知的播报类型: ${type}`);
             }
@@ -2114,11 +2121,6 @@
         handleError(error) {
             var _a, _b;
             this.logger.error('Broadcast error occurred', error);
-            // 清理控制器
-            if (this.activeController) {
-                this.activeController.abort();
-                this.activeController = null;
-            }
             // 触发错误回调
             (_b = (_a = this.callbacks).onError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
         }
@@ -2147,6 +2149,17 @@
                     break;
             }
         }
+        /**
+         * 清理队列处理定时器
+         * @description 清理队列处理定时器
+         * @private
+         */
+        clearQueueProcessTimer() {
+            if (this.queueProcessTimer) {
+                clearInterval(this.queueProcessTimer);
+                this.queueProcessTimer = null;
+            }
+        }
     }
 
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zeewain/3d-avatar-sdk",
   "type": "module",
-  "version": "1.2.4-1",
+  "version": "1.2.5",
   "description": "SDK for ZEE Avatar WebGL integration",
   "author": "ZEEWain",
   "license": "MIT",