@zeewain/3d-avatar-sdk 1.2.4 → 2.1.1

package/dist/index.es5.umd.js

@@ -12194,6 +12194,8 @@
 	  ResourceErrorCode[ResourceErrorCode["NOT_FOUND"] = 3003] = "NOT_FOUND";
 	  /** 资源格式不支持 */
 	  ResourceErrorCode[ResourceErrorCode["UNSUPPORTED_FORMAT"] = 3004] = "UNSUPPORTED_FORMAT";
+	  /** 资源版本不兼容 */
+	  ResourceErrorCode[ResourceErrorCode["VERSION_INCOMPATIBLE"] = 3005] = "VERSION_INCOMPATIBLE";
 	})(exports.ResourceErrorCode || (exports.ResourceErrorCode = {}));
 	/**
 	 * 系统错误码 (4xxx)
@@ -12286,6 +12288,9 @@
 	}, _a[exports.ResourceErrorCode.UNSUPPORTED_FORMAT] = {
 	  category: exports.ErrorCategory.RESOURCE,
 	  message: '资源格式不支持'
+	}, _a[exports.ResourceErrorCode.VERSION_INCOMPATIBLE] = {
+	  category: exports.ErrorCategory.RESOURCE,
+	  message: '资源版本不兼容'
 	},
 	// 系统错误
 	_a[exports.SystemErrorCode.OUT_OF_MEMORY] = {
@@ -12471,6 +12476,48 @@
 	  return SDKError;
 	}(Error);
 
+	/**
+	 * Unity服务日志级别枚举
+	 * @enum {string}
+	 * @description 定义日志记录的级别
+	 */
+	var LogLevel;
+	(function (LogLevel) {
+	  LogLevel["DEBUG"] = "debug";
+	  LogLevel["INFO"] = "info";
+	  LogLevel["WARN"] = "warn";
+	  LogLevel["ERROR"] = "error";
+	})(LogLevel || (LogLevel = {}));
+	/**
+	 * 简单日志记录器实现
+	 * @class SimpleLogger
+	 * @implements {ISimpleLogger}
+	 * @description 提供基础的日志记录功能
+	 */
+	var SimpleLogger = /** @class */function () {
+	  function SimpleLogger(enableDebug) {
+	    if (enableDebug === void 0) {
+	      enableDebug = false;
+	    }
+	    this.enableDebug = enableDebug;
+	  }
+	  SimpleLogger.prototype.debug = function (message, data) {
+	    if (this.enableDebug) {
+	      console.debug("[SDK DEBUG] ".concat(message), data);
+	    }
+	  };
+	  SimpleLogger.prototype.info = function (message, data) {
+	    console.info("[SDK INFO] ".concat(message), data);
+	  };
+	  SimpleLogger.prototype.warn = function (message, data) {
+	    console.warn("[SDK WARN] ".concat(message), data);
+	  };
+	  SimpleLogger.prototype.error = function (message, error, data) {
+	    console.error("[SDK ERROR] ".concat(message), error, error instanceof SDKError ? error.code : null, data);
+	  };
+	  return SimpleLogger;
+	}();
+
 	/**
 	 * @fileoverview Unity服务基础类型定义
 	 * @description 定义Unity服务的通用接口和类型，为所有Unity服务提供统一的基础类型
@@ -12491,18 +12538,6 @@
 	  /** 操作取消 */
 	  UnityOperationStatus[UnityOperationStatus["CANCELLED"] = 3] = "CANCELLED";
 	})(exports.UnityOperationStatus || (exports.UnityOperationStatus = {}));
-	/**
-	 * Unity服务日志级别枚举
-	 * @enum {string}
-	 * @description 定义日志记录的级别
-	 */
-	exports.LogLevel = void 0;
-	(function (LogLevel) {
-	  LogLevel["DEBUG"] = "debug";
-	  LogLevel["INFO"] = "info";
-	  LogLevel["WARN"] = "warn";
-	  LogLevel["ERROR"] = "error";
-	})(exports.LogLevel || (exports.LogLevel = {}));
 
 	/**
 	 * 默认Unity服务配置
@@ -12844,35 +12879,6 @@
 	  };
 	  return UnityBaseService;
 	}();
-	/**
-	 * 简单日志记录器实现
-	 * @class SimpleLogger
-	 * @implements {IUnityLogger}
-	 * @description 提供基础的日志记录功能
-	 */
-	var SimpleLogger = /** @class */function () {
-	  function SimpleLogger(enableDebug) {
-	    if (enableDebug === void 0) {
-	      enableDebug = false;
-	    }
-	    this.enableDebug = enableDebug;
-	  }
-	  SimpleLogger.prototype.debug = function (message, data) {
-	    if (this.enableDebug) {
-	      console.debug("[Unity Debug] ".concat(message), data);
-	    }
-	  };
-	  SimpleLogger.prototype.info = function (message, data) {
-	    console.info("[Unity Info] ".concat(message), data);
-	  };
-	  SimpleLogger.prototype.warn = function (message, data) {
-	    console.warn("[Unity Warning] ".concat(message), data);
-	  };
-	  SimpleLogger.prototype.error = function (message, error, data) {
-	    console.error("[Unity Error] ".concat(message), error, error instanceof SDKError ? error.code : null, data);
-	  };
-	  return SimpleLogger;
-	}();
 
 	/**
 	 * @fileoverview Avatar API接口定义
@@ -12987,6 +12993,9 @@
 	      });
 	    });
 	  };
+	  AvatarService.prototype.handleCallback = function (operation, code, message, data) {
+	    _super.prototype.handleCallback.call(this, operation, code, message, data);
+	  };
 	  /**
 	   * 播放数字人动作
 	   * @param clipCode - 动作编码
@@ -13316,6 +13325,16 @@
 	      containerId: config.containerId || 'unity-container'
 	    });
 	  };
+	  /**
+	   * 更新SDK配置
+	   * @param config - SDK配置对象
+	   * @description 更新全局SDK配置
+	   */
+	  ConfigManager.prototype.updateConfig = function (config) {
+	    if (this.config) {
+	      this.config = __assign(__assign({}, this.config), config);
+	    }
+	  };
 	  /**
 	   * 获取SDK配置
 	   * @returns IAvatarSDKConfig | null SDK配置对象或null
@@ -13324,24 +13343,6 @@
 	  ConfigManager.prototype.getConfig = function () {
 	    return this.config;
 	  };
-	  /**
-	   * 获取认证token
-	   * @returns string 认证token
-	   * @description 获取当前配置的认证token
-	   */
-	  ConfigManager.prototype.getToken = function () {
-	    var _a;
-	    return ((_a = this.config) === null || _a === void 0 ? void 0 : _a.token) || '';
-	  };
-	  /**
-	   * 获取环境类型
-	   * @returns string 环境类型
-	   * @description 获取当前配置的环境类型
-	   */
-	  ConfigManager.prototype.getEnv = function () {
-	    var _a;
-	    return ((_a = this.config) === null || _a === void 0 ? void 0 : _a.env) || 'prod';
-	  };
 	  /**
 	   * 获取API基础URL
 	   * @param withApiModule 是否包含模块路径
@@ -13359,15 +13360,6 @@
 	    }
 	    return ((_d = getEnvConfig(((_c = this.config) === null || _c === void 0 ? void 0 : _c.env) || 'prod', withApiModule)) === null || _d === void 0 ? void 0 : _d.apiBaseUrl) || '';
 	  };
-	  /**
-	   * 获取自定义API URL
-	   * @returns string | undefined 自定义API URL
-	   * @description 获取自定义API URL配置
-	   */
-	  ConfigManager.prototype.getCustomApiUrl = function () {
-	    var _a;
-	    return (_a = this.config) === null || _a === void 0 ? void 0 : _a.apiUrl;
-	  };
 	  /**
 	   * 重置配置
 	   * @description 清空当前配置
@@ -13819,14 +13811,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: config
@@ -13843,7 +13835,7 @@
 	   * @override
 	   */
 	  BroadcastService.prototype.handleCallback = function (operation, code, message, data) {
-	    var _a, _b, _c, _d, _e, _f, _g, _h;
+	    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
 	    // 提取 isBroadcastCompleted 参数
 	    var isBroadcastCompleted = JSON.parse(data || '{}').isBroadcastCompleted;
 	    // 先调用基类处理逻辑
@@ -13853,19 +13845,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++;
+	            var status_1 = this.getStatus();
+	            if (((_a = status_1.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;
 	      }
@@ -13936,7 +13940,7 @@
 	            });
 	            // 触发开始回调
 	            (_b = (_a = this.callbacks).onStart) === null || _b === void 0 ? void 0 : _b.call(_a);
-	            this.isGeneratingAudio = true;
+	            this.isBroadcastingAudio = true;
 	            _c.label = 2;
 	          case 2:
 	            task = this.createBroadcastTask(params);
@@ -14044,8 +14048,9 @@
 	            // 取消所有队列中的任务
 	            this.cancelAllTasks();
 	            // 重置状态
-	            this.isGeneratingAudio = false;
+	            this.isBroadcastingAudio = false;
 	            this.hasReceivedAudio = false;
+	            this.broadcastCompletedCount = 0;
 	            _a.label = 1;
 	          case 1:
 	            _a.trys.push([1, 3,, 4]);
@@ -14079,27 +14084,32 @@
 	   * @description 获取当前播报服务的状态信息，包括队列状态
 	   */
 	  BroadcastService.prototype.getStatus = function () {
+	    var completedTasks = this.taskQueue.filter(function (t) {
+	      return t.status === BroadcastTaskStatus.COMPLETED;
+	    }).length;
+	    var requestingTasks = this.taskQueue.filter(function (t) {
+	      return t.status === BroadcastTaskStatus.REQUESTING;
+	    }).length;
+	    var failedTasks = this.taskQueue.filter(function (t) {
+	      return t.status === BroadcastTaskStatus.FAILED;
+	    }).length;
+	    var totalPendingResponses = this.taskQueue.reduce(function (sum, t) {
+	      return sum + t.pendingResponses.length;
+	    }, 0);
+	    var currentSendingSequence = this.currentSendingSequence;
+	    var isGeneratingAudio = completedTasks + failedTasks !== this.taskQueue.length;
 	    return {
-	      isActive: this.taskQueue.length > 0 || this.isGeneratingAudio,
-	      isGeneratingAudio: this.isGeneratingAudio,
+	      isActive: this.isBroadcastingAudio || isGeneratingAudio,
+	      // 是否正在播报音频或正在生成音频
+	      isGeneratingAudio: isGeneratingAudio,
 	      hasReceivedAudio: this.hasReceivedAudio,
-	      pendingCallbacks: this.getPendingCallbackCount(),
-	      hasController: this.activeController !== null,
 	      queueInfo: {
 	        totalTasks: this.taskQueue.length,
-	        requestingTasks: this.taskQueue.filter(function (t) {
-	          return t.status === BroadcastTaskStatus.REQUESTING;
-	        }).length,
-	        completedTasks: this.taskQueue.filter(function (t) {
-	          return t.status === BroadcastTaskStatus.COMPLETED;
-	        }).length,
-	        failedTasks: this.taskQueue.filter(function (t) {
-	          return t.status === BroadcastTaskStatus.FAILED;
-	        }).length,
-	        totalPendingResponses: this.taskQueue.reduce(function (sum, t) {
-	          return sum + t.pendingResponses.length;
-	        }, 0),
-	        currentSendingSequence: this.currentSendingSequence
+	        requestingTasks: requestingTasks,
+	        completedTasks: completedTasks,
+	        failedTasks: failedTasks,
+	        totalPendingResponses: totalPendingResponses,
+	        currentSendingSequence: currentSendingSequence
 	      }
 	    };
 	  };
@@ -14109,10 +14119,7 @@
 	   */
 	  BroadcastService.prototype.destroy = function () {
 	    // 清理队列处理定时器
-	    if (this.queueProcessTimer) {
-	      clearInterval(this.queueProcessTimer);
-	      this.queueProcessTimer = null;
-	    }
+	    this.clearQueueProcessTimer();
 	    // 取消所有任务
 	    this.cancelAllTasks();
 	    // 调用基类销毁方法
@@ -14190,12 +14197,12 @@
 	    if (nextTask) {
 	      this.sendNextResponse(nextTask);
 	    }
-	    // 清理已完成的任务
-	    this.cleanupCompletedTasks();
-	    // 如果队列为空，停止定时器
-	    if (this.taskQueue.length === 0 && this.queueProcessTimer) {
-	      clearInterval(this.queueProcessTimer);
-	      this.queueProcessTimer = null;
+	    // 如果队列中没有剩余任务，则停止定时器
+	    var remainingTasks = this.taskQueue.filter(function (task) {
+	      return task.status !== BroadcastTaskStatus.COMPLETED && task.status !== BroadcastTaskStatus.FAILED && task.status !== BroadcastTaskStatus.CANCELLED;
+	    });
+	    if (remainingTasks.length === 0) {
+	      this.clearQueueProcessTimer();
 	    }
 	  };
 	  /**
@@ -14208,7 +14215,8 @@
 	    return __awaiter(this, void 0, void 0, function () {
 	      var apiUrl, requestBody;
 	      var _this = this;
-	      return __generator(this, function (_a) {
+	      var _a;
+	      return __generator(this, function (_b) {
 	        task.status = BroadcastTaskStatus.REQUESTING;
 	        this.logger.debug('Starting task request', {
 	          taskId: task.id
@@ -14219,7 +14227,8 @@
 	            humanCode: task.params.humanCode,
 	            speed: task.params.speed,
 	            volume: task.params.volume >= 0 ? task.params.volume * 100 : undefined,
-	            isSubtitle: task.params.isSubtitle
+	            isSubtitle: task.params.isSubtitle,
+	            audioDrivenVersion: ConfigManager.getInstance().getConfig().audioDrivenVersion
 	          };
 	          // 根据播报类型设置特定参数
 	          if (task.params.type === exports.BroadcastType.TEXT) {
@@ -14234,7 +14243,7 @@
 	            method: 'POST',
 	            headers: {
 	              'Content-Type': 'application/json',
-	              'x_auth_token': ConfigManager.getInstance().getToken()
+	              'x_auth_token': ((_a = ConfigManager.getInstance().getConfig()) === null || _a === void 0 ? void 0 : _a.token) || ''
 	            },
 	            body: JSON.stringify(requestBody),
 	            signal: task.controller.signal,
@@ -14274,6 +14283,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;
@@ -14426,7 +14436,6 @@
 	   * @private
 	   */
 	  BroadcastService.prototype.getBroadcastApiPath = function (type) {
-	    ConfigManager.getInstance().getEnv();
 	    switch (type) {
 	      case exports.BroadcastType.TEXT:
 	        return '/aiep-openapi/avatar-interaction/v1/broadcast/text';
@@ -14463,11 +14472,6 @@
 	  BroadcastService.prototype.handleError = function (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);
 	  };
@@ -14496,6 +14500,17 @@
 	        break;
 	    }
 	  };
+	  /**
+	   * 清理队列处理定时器
+	   * @description 清理队列处理定时器
+	   * @private
+	   */
+	  BroadcastService.prototype.clearQueueProcessTimer = function () {
+	    if (this.queueProcessTimer) {
+	      clearInterval(this.queueProcessTimer);
+	      this.queueProcessTimer = null;
+	    }
+	  };
 	  return BroadcastService;
 	}(UnityBaseService);
 
@@ -14514,13 +14529,11 @@
 	   * @param config - Unity配置对象
 	   * @description 初始化数字人加载器，创建Unity加载器实例
 	   */
-	  function ZEEAvatarLoader(config) {
+	  function ZEEAvatarLoader() {
 	    /** Avatar API实例 */
 	    this.apiService = null;
 	    /** Unity实例 */
 	    this.unityInstance = null;
-	    // 同时设置到配置管理器中
-	    ConfigManager.getInstance().setConfig(config);
 	    this.loader = new UnityLoader();
 	  }
 	  /**
@@ -14634,14 +14647,22 @@
 	   * @protected
 	   */
 	  ZEEAvatarLoader.prototype.initGlobalConfig = function () {
-	    var params = {
-	      token: ConfigManager.getInstance().getToken(),
+	    var config = ConfigManager.getInstance().getConfig();
+	    var globalParams = {
+	      token: config === null || config === void 0 ? void 0 : config.token,
 	      apiBaseUrl: ConfigManager.getInstance().getApiBaseUrl(false),
-	      idleMotionList: ConfigManager.getInstance().getConfig().idleMotionList,
-	      assetsUrl: ConfigManager.getInstance().getConfig().assetsUrl
+	      idleMotionList: config === null || config === void 0 ? void 0 : config.idleMotionList
+	      // 純AB包方案在SDK 2.1.0 中已弃用
+	      // assetsUrl: config?.assetsUrl
+	    };
+	    var assetModuleParams = {
+	      isZip: true,
+	      assetBundlePath: config === null || config === void 0 ? void 0 : config.assetsUrl
 	    };
-	    console.warn('[ Send Unity message ]: AvatarSDK.InitializeConfig', params);
-	    this.unityInstance.SendMessage('AvatarSDK', 'InitializeConfig', JSON.stringify(params));
+	    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);
 	  };
 	  return ZEEAvatarLoader;
 	}();