fcr-core 3.8.2 → 3.9.0-alpha

package/lib-es/room-router/index.js

@@ -25,12 +25,14 @@ import { AgoraObservable, retryAttempt, to, trace } from '../imports';
 import { RoomControlFactory } from '../room-control/room-control-factory';
 import { FcrRoomType } from '../room-control/type';
 import { fcrRoomJoinOptionsSchema, stringSchema } from '../schema';
-import { FcrErrorCode, FcrErrorModuleCode, generateFcrCoreClientError, generateFcrCoreClientErrorNew, handleRequestError } from '../utilities/error';
+import { FcrReturnCode } from '../type';
+import { generateFcrCoreClientError, handleRequestError } from '../utilities/error';
 import { FcrJoinHelper, handleJoinRetryFailure } from '../utilities/join-helper';
 import { canRetryJoinError } from '../utilities/retry-helpers';
 import { createLogger, generateLogObserver } from '../utilities/logger';
 import validateParams from '../utilities/validate-params';
 import { ROOM_ROUTER_CONSTANTS } from './type';
+import { DetailErrorCode, ErrorModuleCode } from '../imports';
 
 /**
  * @internal
@@ -40,7 +42,7 @@ export class FcrRoomRouterImpl {
   static {
     [_initProto] = _applyDecs(this, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [trace, 2, "leaveRoom"]], []).e;
   }
-  [(_initDecs = [trace, validateParams(stringSchema)], _joinRoomDecs = [trace, validateParams(fcrRoomJoinOptionsSchema)], "logger")] = (_initProto(this), createLogger({
+  [(_initDecs = [trace(['roomId']), validateParams(stringSchema)], _joinRoomDecs = [trace(['options']), validateParams(fcrRoomJoinOptionsSchema)], "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrRoomRouterImpl'
   }));
   _abortController = null;
@@ -84,6 +86,7 @@ export class FcrRoomRouterImpl {
       isJoined: false
     };
     this._bypass = undefined;
+    return FcrReturnCode.SUCCESS;
   }
   async joinRoom(options) {
     this._abortController = new AbortController();
@@ -104,6 +107,7 @@ export class FcrRoomRouterImpl {
     this._abortController = null;
     this._roomControl?.leave();
     this._roomControl = null;
+    return FcrReturnCode.SUCCESS;
   }
 
   /**
@@ -112,7 +116,7 @@ export class FcrRoomRouterImpl {
    */
   _validateRoomJoinState() {
     if (this._nextRoomRoute.isJoined) {
-      throw generateFcrCoreClientError(FcrErrorModuleCode.ROOM, FcrErrorCode.UNDEFINED_ERROR, 'Room join failed: The user has an active connection to the room.', new Error('Room join failed: The user has an active connection to the room.'));
+      throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM, DetailErrorCode.UNDEFINED_ERROR, 'Room join failed: The user has an active connection to the room.', new Error('Room join failed: The user has an active connection to the room.'));
     }
   }
 
@@ -163,7 +167,7 @@ export class FcrRoomRouterImpl {
     const {
       data,
       ts
-    } = await handleRequestError(() => this._apiService.checkIn(checkInParams), FcrErrorModuleCode.ENGINE);
+    } = await handleRequestError(() => this._apiService.checkIn(checkInParams), ErrorModuleCode.FCR_ENGINE);
     return {
       data,
       ts
@@ -218,7 +222,7 @@ export class FcrRoomRouterImpl {
    */
   _handleJoinRoomError(error) {
     this.logger.error(`Failed to join the room: ${error.message}`);
-    const fcrError = generateFcrCoreClientErrorNew(FcrErrorModuleCode.ROOM, FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `join room failed: ${error.message}`);
+    const fcrError = generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM, DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, `join room failed: ${error.message}`);
     this._observable.notifyObservers('onErrorOccurred', fcrError);
   }
 
@@ -248,7 +252,7 @@ export class FcrRoomRouterImpl {
     }
   }
   _addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onErrorOccurred', 'onRoomJoined', 'onRoomRouteSwitched']));
+    this.addObserver(generateLogObserver(this.logger, [['onErrorOccurred', ['error']], ['onRoomJoined', ['roomControl']], ['onRoomRouteSwitched', ['nextRoomRoute']]]));
   }
   addObserver(observer) {
     this._observable.addObserver(observer);

package/lib-es/schema.js

@@ -137,8 +137,7 @@ export const AgoraRtcDimensions = z.object({
 export const agoraRtcVideoEncoderConfigurationSchema = z.object({
   dimensions: AgoraRtcDimensions,
   frameRate: numberSchema,
-  bitrate: numberSchema,
-  isMirror: booleanSchema
+  bitrate: numberSchema
 });
 // Stream Config Schemas
 export const fcrStreamJoinConfig = z.object({

package/lib-es/service/api.js

@@ -12,7 +12,7 @@ export class FcrCoreServiceApi {
     if (pathIncludeRegion) {
       pathPrefix = `/${toLower(region)}${pathPrefix}`;
     }
-    this.logger.info('[FcrCoreServiceApi] set path prefix for Core Service API:', pathPrefix);
+    this.logger.info('set path prefix for Core Service API:', pathPrefix);
     this._pathPrefix = pathPrefix;
     this._client.setPathPrefix(pathPrefix);
   }
@@ -423,9 +423,7 @@ export class FcrCoreServiceApi {
     const res = await this._client.fetch({
       path: `/v1/rooms/${roomId}/users/${userUuid}/properties`,
       method: 'DELETE',
-      data: {
-        users: data
-      }
+      data: data
     });
     return res.data;
   }
@@ -714,16 +712,13 @@ export class FcrCoreServiceApi {
   }
   async revokeUserRole({
     roomId,
-    remoteRole,
-    localRole,
-    userId
+    remoteRole
   }) {
     const res = await this._client.fetch({
-      path: `/v1/rooms/${roomId}/users/${userId}/role`,
-      method: 'DELETE',
+      path: `/v1/rooms/${roomId}/claim/host`,
+      method: 'POST',
       data: {
-        remoteRole,
-        localRole
+        remoteRole
       }
     });
     return res.data;
@@ -923,12 +918,22 @@ export class FcrCoreServiceApi {
     });
   }
 
+  /**
+   * @description 准备 / 取消白板
+   */
+  async toggleWhiteboardPreloadState(roomId, state) {
+    return this._client.fetch({
+      path: `/v1/rooms/${roomId}/widgets/netlessBoard/preload/${state}`,
+      method: 'PUT'
+    });
+  }
+
   /**
    * @description 开 / 关白板
    */
   async toggleWhiteboardActivityState(roomId, state) {
     return this._client.fetch({
-      path: `/v1/rooms/${roomId}/widgets/netlessBoard/states/${state}`,
+      path: `/v2/rooms/${roomId}/widgets/netlessBoard/states/${state}`,
       method: 'PUT'
     });
   }

package/lib-es/type.js

@@ -7,12 +7,14 @@ import { FcrUserRole } from './room-control/user-control/type';
 // 模块类型导出（按功能模块分组）
 // 聊天连接模块
 
-// 引擎核心配置
+import { getRtcPresetParameters } from './utilities/parameters';
 
 // 第三方类型别名（统一前缀避免冲突）
-export { AgoraRteRegion as FcrRegion, AgoraRteMediaStreamType as FcrStreamType, AgoraRteUserUpdatedReason as FcrUserUpdatedReason, AgoraRteRoomConnectorType as FcrRoomConnectorType, AgoraRtcVideoSourceType as FcrVideoSourceType, AgoraRtcAudioSourceType as FcrAudioSourceType, AgoraRtcMediaSourceState as FcrMediaSourceState, AgoraRtcRenderMode as FcrVideoRenderMode, AgoraRtcVideoStreamType as FcrVideoStreamType, AgoraRtcCapability as FcrCapability, AgoraRtcAiDenoiseLevel as FcrAiDenoiseLevel, AgoraRteStreamPrivilegeOperation as FcrStreamPrivilegeOperation, AgoraRteStreamPrivilegeVideoSourceType as FcrStreamPrivilegeVideoSourceType, AgoraRteStreamPrivilegeAudioSourceType as FcrStreamPrivilegeAudioSourceType, AgoraRteConnectionState as FcrConnectionState, AgoraRteLatencyLevel as FcrStreamLatencyLevel, AgoraRteScreenCaptureType as FcrScreenCaptureType, AgoraRteVideoOrientation as FcrVideoOrientation, FcrCoreEngine, registerPlugin } from './imports';
-
+export { AgoraRtcAiDenoiseLevel as FcrAiDenoiseLevel, AgoraRtcAudioSourceType as FcrAudioSourceType, AgoraRtcCapability as FcrCapability, AgoraRteConnectionState as FcrConnectionState, AgoraRtcMediaSourceState as FcrMediaSourceState, AgoraRteRegion as FcrRegion, AgoraRteRoomConnectorType as FcrRoomConnectorType, AgoraRteScreenCaptureType as FcrScreenCaptureType, AgoraRteLatencyLevel as FcrStreamLatencyLevel, AgoraRteStreamPrivilegeAudioSourceType as FcrStreamPrivilegeAudioSourceType, AgoraRteStreamPrivilegeOperation as FcrStreamPrivilegeOperation, AgoraRteStreamPrivilegeVideoSourceType as FcrStreamPrivilegeVideoSourceType, AgoraRteMediaStreamType as FcrStreamType, AgoraRteUserUpdatedReason as FcrUserUpdatedReason, AgoraRteVideoOrientation as FcrVideoOrientation, AgoraRtcRenderMode as FcrVideoRenderMode, AgoraRtcVideoSourceType as FcrVideoSourceType, AgoraRtcVideoStreamType as FcrVideoStreamType, registerPlugin } from './imports';
+import { FcrDualVideoStreamConfig } from './utilities/dual-video-stream-config';
+import { FcrVideoEncoderConfig } from './utilities/video-encoder-config';
 // 基础类型别名（简化常用类型引用）
+export { FcrDualVideoStreamConfig };
 
 // 媒体控制模块
 
@@ -21,36 +23,28 @@ export { AgoraRteRegion as FcrRegion, AgoraRteMediaStreamType as FcrStreamType,
 // 点对点会话模块
 
 // 房间控制模块 - 能力控制
-
 export { FcrAbility } from './room-control/ability-control/type';
-
 // 房间控制模块 - 聊天室控制
-
 export { FcrChatRoomConnectionState, FcrChatRoomMessageType } from './room-control/chatroom-control/type';
-
 // 房间控制模块 - 翻译控制
-
-export { FcrLanguage, FcrInterpreterActionType } from './room-control/interpreter-control/types';
+export { FcrInterpreterActionType, FcrLanguage } from './room-control/interpreter-control/types';
 
 // 房间控制模块 - 权限控制
 
-export { FcrPrivilegeUserRole, FcrPermissionAction, FcrOperatePermissionType, FcrChatPermissionType, FcrSecurityAction, FcrWatermarkPermissionState, FcrPrivilegeUserRoleToStringMap, FcrPrivilegeUserStringToRoleMap } from './room-control/privilege-control/type';
+export { FcrChatPermissionType, FcrOperatePermissionType, FcrPermissionAction, FcrPrivilegeUserRole, FcrPrivilegeUserRoleToStringMap, FcrPrivilegeUserStringToRoleMap, FcrSecurityAction, FcrWatermarkPermissionState } from './room-control/privilege-control/type';
 
 // 房间控制模块 - 连接器控制
-
-export { FcrIPConnectorSessionType, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState, FcrRoomConnectorPhoneRegion } from './room-control/room-connector-control/type';
+export { FcrIPConnectorSessionType, FcrRoomConnectorPhoneRegion, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from './room-control/room-connector-control/type';
 
 // 房间控制模块 - 房间会话
 
 // 房间控制模块 - 共享控制
-
 export { FcrScreenSharingState, FcrWhiteboardState } from './room-control/sharing-control/type';
 
 // 房间控制模块 - 流控制
 
 // 房间控制模块 - 用户控制
-
-export { FcrUserLeftReason, FcrUserKickedOutType, FcrUserRole } from './room-control/user-control/type';
+export { FcrUserKickedOutType, FcrUserLeftReason, FcrUserRole } from './room-control/user-control/type';
 
 // 房间控制模块 - 白板标注控制
 
@@ -60,6 +54,8 @@ export { FcrUserLeftReason, FcrUserKickedOutType, FcrUserRole } from './room-con
 
 // 服务相关类型
 
+export { FcrVideoEncoderConfig };
+
 // 核心引擎类型扩展
 
 // 房间相关核心类型
@@ -141,6 +137,11 @@ export const FcrUserStringToRoleMap = {
   observer: FcrUserRole.OBSERVER,
   robot: FcrUserRole.ROBOT
 };
+export let FcrReturnCode = /*#__PURE__*/function (FcrReturnCode) {
+  FcrReturnCode[FcrReturnCode["UNDEFINED"] = -1] = "UNDEFINED";
+  FcrReturnCode[FcrReturnCode["SUCCESS"] = 0] = "SUCCESS";
+  return FcrReturnCode;
+}({});
 
 // 直播相关类型
 export let FcrLiveStreamingLayoutType = /*#__PURE__*/function (FcrLiveStreamingLayoutType) {
@@ -159,12 +160,63 @@ export let RoomMessageKey = /*#__PURE__*/function (RoomMessageKey) {
   RoomMessageKey["USER_WAITING_ROOM_JOINED"] = "USER_WAITING_ROOM_JOINED";
   return RoomMessageKey;
 }({});
-export { FcrLineType } from './room-control/type';
 export { FcrDeviceType } from './media-control/type';
+export { FcrLineType } from './room-control/type';
+export { FcrError } from './utilities/error';
 export let FcrStreamState = /*#__PURE__*/function (FcrStreamState) {
   FcrStreamState[FcrStreamState["UNPUBLISH"] = 0] = "UNPUBLISH";
   FcrStreamState[FcrStreamState["PUBLISH"] = 1] = "PUBLISH";
   return FcrStreamState;
 }({});
-export { FcrError } from './utilities/error';
-export { FcrBoardToolType, FcrBoardShape } from './room-control/whiteboard-control-v2/enum';
+export { FcrBoardShape, FcrBoardToolType } from './room-control/whiteboard-control-v2/enum';
+/** 引擎配置类 */
+export class FcrCoreEngineConfig {
+  /** 应用唯一标识 */
+
+  /** 身份验证令牌 */
+
+  /** 用户唯一标识 */
+
+  /** 服务区域 */
+
+  /** 双摄像头视频流配置 */
+
+  /** 双屏幕视频流配置 */
+
+  /** 额外参数配置 */
+
+  constructor(params) {
+    this.appId = params.appId;
+    this.token = params.token;
+    this.userId = params.userId;
+    this.region = params.region;
+    this.dualCameraVideoStreamConfig = params.dualCameraVideoStreamConfig;
+    this.dualScreenVideoStreamConfig = params.dualScreenVideoStreamConfig;
+    this.parameters = params.parameters;
+    this._prependInternalParameters();
+  }
+  static createDefaultConfig(appId, token, region, userId, parameters) {
+    return new FcrCoreEngineConfig({
+      appId,
+      token,
+      userId,
+      region,
+      dualCameraVideoStreamConfig: FcrDualVideoStreamConfig.createDefaultCameraConfig(),
+      dualScreenVideoStreamConfig: FcrDualVideoStreamConfig.createDefaultScreenConfig(),
+      parameters
+    });
+  }
+  _prependInternalParameters() {
+    const rtcPresetParameters = getRtcPresetParameters();
+    if (!this.parameters) {
+      this.parameters = {
+        rtc: rtcPresetParameters
+      };
+    } else if (!this.parameters.rtc) {
+      this.parameters.rtc = rtcPresetParameters;
+    } else {
+      // 将内部参数插入到数组前列
+      this.parameters.rtc.unshift(...rtcPresetParameters);
+    }
+  }
+}

package/lib-es/utilities/abortable-retry.js

@@ -0,0 +1,54 @@
+import "core-js/modules/web.dom-exception.stack.js";
+import { retryAttempt, to } from '../imports';
+/**
+ * Creates an abortable retry operation that can be cancelled at any time.
+ *
+ * The handler function will be retried up to `retriesMax` times if it fails.
+ * The operation can be cancelled by calling the returned abort function,
+ * which will cause the promise to reject with an AbortError.
+ *
+ * @example
+ * ```typescript
+ * const [abort, promise] = abortableRetry(async (signal) => {
+ *   await asyncFunction1();
+ *   // Check if aborted after each async operation
+ *   signal.throwIfAborted();
+ *
+ *   await asyncFunction2();
+ *   signal.throwIfAborted();
+ *
+ *   return result;
+ * }, { retriesMax: 10 });
+ *
+ * // Cancel the operation at any time
+ * setTimeout(() => abort(), 5000);
+ *
+ * const [err, result] = await promise;
+ * if (err?.name === 'AbortError') {
+ *   console.log('Operation was cancelled');
+ * }
+ * ```
+ *
+ * @param handler - Async function that receives an AbortSignal.
+ *                  Should call `signal.throwIfAborted()` periodically to check for cancellation.
+ * @param options - Retry configuration
+ * @returns Tuple of [abort function, result promise]. The promise resolves to [error, result].
+ */
+export const abortableRetry = (handler, options) => {
+  const abortController = new AbortController();
+  const promise = to(retryAttempt(async () => {
+    abortController.signal.throwIfAborted();
+    const result = await handler(abortController.signal);
+    abortController.signal.throwIfAborted();
+    return result;
+  }, [], {
+    retriesMax: options.retriesMax
+  }).fail(async options => {
+    if (abortController.signal.aborted) {
+      throw new DOMException('Operation aborted', 'AbortError');
+    }
+    await options.timeFn();
+    return true;
+  }).exec());
+  return [() => abortController.abort(), promise];
+};

package/lib-es/utilities/dual-video-stream-config.js

@@ -0,0 +1,19 @@
+import { FcrVideoEncoderConfig } from './video-encoder-config';
+export let FcrDualVideoStreamConfig;
+(function (_FcrDualVideoStreamConfig) {
+  function createDefaultCameraConfig() {
+    return {
+      highVideoEncoderConfig: FcrVideoEncoderConfig.createDefaultHighCameraConfig(),
+      lowVideoEncoderConfig: FcrVideoEncoderConfig.createDefaultLowCameraConfig(),
+      enableDualStreamMode: true
+    };
+  }
+  _FcrDualVideoStreamConfig.createDefaultCameraConfig = createDefaultCameraConfig;
+  function createDefaultScreenConfig() {
+    return {
+      highVideoEncoderConfig: FcrVideoEncoderConfig.createDefaultClarityScreenConfig(),
+      enableDualStreamMode: false
+    };
+  }
+  _FcrDualVideoStreamConfig.createDefaultScreenConfig = createDefaultScreenConfig;
+})(FcrDualVideoStreamConfig || (FcrDualVideoStreamConfig = {}));

package/lib-es/utilities/error-helpers.js

@@ -4,7 +4,8 @@
  * 提供统一的错误创建和处理机制，支持实例化配置
  */
 
-import { FcrErrorCode, FcrErrorModuleCode, generateFcrCoreClientErrorNew } from './error';
+import { DetailErrorCode, ErrorModuleCode } from '../imports';
+import { generateFcrCoreClientError } from './error';
 
 /**
  * 控制器类型枚举
@@ -35,7 +36,7 @@ export let ControllerType = /*#__PURE__*/function (ControllerType) {
 export class FcrErrorHelper {
   constructor(config = {}) {
     this.config = {
-      defaultModuleCode: FcrErrorModuleCode.ROOM,
+      defaultModuleCode: ErrorModuleCode.FCR_ROOM,
       enableDetailedMessages: true,
       logPrefix: 'FCR',
       autoLog: false,
@@ -51,7 +52,7 @@ export class FcrErrorHelper {
   createControllerNotInitializedError(controllerType, moduleCode) {
     const module = moduleCode ?? this.config.defaultModuleCode;
     const message = this.config.enableDetailedMessages ? `[${this.config.logPrefix}] The ${controllerType} controller is not initialized, please join the room first` : `${controllerType} controller not initialized`;
-    const error = generateFcrCoreClientErrorNew(module, FcrErrorCode.NOT_JOINED_ROOM, message);
+    const error = generateFcrCoreClientError(module, DetailErrorCode.NOT_JOINED_ROOM, message);
     if (this.config.autoLog) {
       console.error(`${this.config.logPrefix}: ${message}`);
     }
@@ -68,7 +69,7 @@ export class FcrErrorHelper {
   createOperationConflictError(operation, reason, moduleCode) {
     const module = moduleCode ?? this.config.defaultModuleCode;
     const message = this.config.enableDetailedMessages ? `[${this.config.logPrefix}] Failed to ${operation}: ${reason}` : `${operation} failed: ${reason}`;
-    const error = generateFcrCoreClientErrorNew(module, FcrErrorCode.JOIN_CONFLICT, message);
+    const error = generateFcrCoreClientError(module, DetailErrorCode.JOIN_CONFLICT, message);
     if (this.config.autoLog) {
       console.error(`${this.config.logPrefix}: ${message}`);
     }
@@ -84,7 +85,7 @@ export class FcrErrorHelper {
   createOperationCanceledError(operation, moduleCode) {
     const module = moduleCode ?? this.config.defaultModuleCode;
     const message = this.config.enableDetailedMessages ? `[${this.config.logPrefix}] ${operation} operation has been cancelled` : `${operation} cancelled`;
-    const error = generateFcrCoreClientErrorNew(module, FcrErrorCode.NOT_JOINED_ROOM, message);
+    const error = generateFcrCoreClientError(module, DetailErrorCode.NOT_JOINED_ROOM, message);
     if (this.config.autoLog) {
       console.error(`${this.config.logPrefix}: ${message}`);
     }
@@ -100,7 +101,7 @@ export class FcrErrorHelper {
   createSendMessageError(originalError, moduleCode) {
     const module = moduleCode ?? this.config.defaultModuleCode;
     const message = this.config.enableDetailedMessages ? `[${this.config.logPrefix}] Send message failed: ${originalError.message}` : 'send message failed';
-    const error = generateFcrCoreClientErrorNew(module, FcrErrorCode.UNDEFINED_ERROR, message);
+    const error = generateFcrCoreClientError(module, DetailErrorCode.UNDEFINED_ERROR, message);
     if (this.config.autoLog) {
       console.error(`${this.config.logPrefix}: ${message}`, originalError);
     }
@@ -117,7 +118,7 @@ export class FcrErrorHelper {
   createOperationError(operation, originalError, moduleCode) {
     const module = moduleCode ?? this.config.defaultModuleCode;
     const message = this.config.enableDetailedMessages ? `[${this.config.logPrefix}] ${operation} failed${originalError ? `: ${originalError.message}` : ''}` : `${operation} failed`;
-    const error = generateFcrCoreClientErrorNew(module, FcrErrorCode.NOT_JOINED_ROOM, message);
+    const error = generateFcrCoreClientError(module, DetailErrorCode.NOT_JOINED_ROOM, message);
     if (this.config.autoLog) {
       console.error(`${this.config.logPrefix}: ${message}`, originalError);
     }
@@ -133,7 +134,7 @@ export class FcrErrorHelper {
   createNetworkError(message, moduleCode) {
     const module = moduleCode ?? this.config.defaultModuleCode;
     const formattedMessage = this.config.enableDetailedMessages ? `[${this.config.logPrefix}] Network error: ${message}` : message;
-    const error = generateFcrCoreClientErrorNew(module, FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, formattedMessage);
+    const error = generateFcrCoreClientError(module, DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, formattedMessage);
     if (this.config.autoLog) {
       console.error(`${this.config.logPrefix}: ${formattedMessage}`);
     }
@@ -150,7 +151,7 @@ export class FcrErrorHelper {
   createInvalidParamsError(paramName, reason, moduleCode) {
     const module = moduleCode ?? this.config.defaultModuleCode;
     const message = this.config.enableDetailedMessages ? `[${this.config.logPrefix}] Invalid parameter '${paramName}': ${reason}` : `Invalid parameter '${paramName}': ${reason}`;
-    const error = generateFcrCoreClientErrorNew(module, FcrErrorCode.INVALID_PARAMS, message);
+    const error = generateFcrCoreClientError(module, DetailErrorCode.INVALID_PARAMS, message);
     if (this.config.autoLog) {
       console.error(`${this.config.logPrefix}: ${message}`);
     }
@@ -177,7 +178,7 @@ export class FcrErrorHelper {
    */
   static forRoomControl() {
     return new FcrErrorHelper({
-      defaultModuleCode: FcrErrorModuleCode.ROOM,
+      defaultModuleCode: ErrorModuleCode.FCR_ROOM,
       logPrefix: 'RoomControl',
       enableDetailedMessages: true
     });
@@ -188,7 +189,7 @@ export class FcrErrorHelper {
    */
   static forEngine() {
     return new FcrErrorHelper({
-      defaultModuleCode: FcrErrorModuleCode.ENGINE,
+      defaultModuleCode: ErrorModuleCode.FCR_ENGINE,
       logPrefix: 'Engine',
       enableDetailedMessages: true
     });
@@ -199,7 +200,7 @@ export class FcrErrorHelper {
    */
   static forLiveStreaming() {
     return new FcrErrorHelper({
-      defaultModuleCode: FcrErrorModuleCode.ROOM_LIVE_STREAMING,
+      defaultModuleCode: ErrorModuleCode.FCR_ROOM_LIVE_STREAMING,
       logPrefix: 'LiveStreaming',
       enableDetailedMessages: true
     });

package/lib-es/utilities/error.js

@@ -1,60 +1,16 @@
-import { padStart, padEnd, AgoraRestfulClientError, FcrError } from '../imports';
+import { DetailErrorCode, ErrorServiceType } from '../imports';
+import { padStart, AgoraRestfulClientError, FcrError } from '../imports';
 export { FcrError } from '../imports';
-export let FcrErrorCodeType = /*#__PURE__*/function (FcrErrorCodeType) {
-  FcrErrorCodeType[FcrErrorCodeType["CLIENT"] = 6] = "CLIENT";
-  FcrErrorCodeType[FcrErrorCodeType["SERVER"] = 7] = "SERVER";
-  return FcrErrorCodeType;
-}({});
-export let FcrErrorModuleCode = /*#__PURE__*/function (FcrErrorModuleCode) {
-  FcrErrorModuleCode[FcrErrorModuleCode["ENGINE"] = 10] = "ENGINE";
-  FcrErrorModuleCode[FcrErrorModuleCode["ENGINE_PEER_SESSION"] = 11] = "ENGINE_PEER_SESSION";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM"] = 20] = "ROOM";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_USER"] = 21] = "ROOM_USER";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_STREAM"] = 22] = "ROOM_STREAM";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_GROUP"] = 23] = "ROOM_GROUP";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_CHATROOM"] = 24] = "ROOM_CHATROOM";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_SESSION"] = 25] = "ROOM_SESSION";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_PRIVILEGE"] = 26] = "ROOM_PRIVILEGE";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_WHITEBOARD"] = 27] = "ROOM_WHITEBOARD";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_CONNECTOR"] = 28] = "ROOM_CONNECTOR";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_INTERPRETER"] = 29] = "ROOM_INTERPRETER";
-  FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL"] = 30] = "MEDIA_CONTROL";
-  FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_CAMERA"] = 31] = "MEDIA_CONTROL_CAMERA";
-  FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_MICROPHONE"] = 32] = "MEDIA_CONTROL_MICROPHONE";
-  FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_LOOPBACK"] = 33] = "MEDIA_CONTROL_LOOPBACK";
-  FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_SCREEN"] = 34] = "MEDIA_CONTROL_SCREEN";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_STT"] = 35] = "ROOM_STT";
-  FcrErrorModuleCode[FcrErrorModuleCode["MONITOR"] = 40] = "MONITOR";
-  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_LIVE_STREAMING"] = 41] = "ROOM_LIVE_STREAMING";
-  return FcrErrorModuleCode;
-}({});
-export let FcrErrorCode = /*#__PURE__*/function (FcrErrorCode) {
-  FcrErrorCode[FcrErrorCode["UNDEFINED_ERROR"] = 1] = "UNDEFINED_ERROR";
-  FcrErrorCode[FcrErrorCode["INVALID_PARAMS"] = 10] = "INVALID_PARAMS";
-  FcrErrorCode[FcrErrorCode["JSON_PARSE_ERROR"] = 11] = "JSON_PARSE_ERROR";
-  FcrErrorCode[FcrErrorCode["LOCAL_HTTP_REQUEST_FAILED"] = 12] = "LOCAL_HTTP_REQUEST_FAILED";
-  FcrErrorCode[FcrErrorCode["NOT_LOGGED_IN"] = 13] = "NOT_LOGGED_IN";
-  FcrErrorCode[FcrErrorCode["NOT_JOINED_ROOM"] = 14] = "NOT_JOINED_ROOM";
-  FcrErrorCode[FcrErrorCode["JOIN_CONFLICT"] = 15] = "JOIN_CONFLICT";
-  FcrErrorCode[FcrErrorCode["EXPIRED"] = 15] = "EXPIRED";
-  return FcrErrorCode;
-}({});
+
+// Export aliases for compatibility
+export { DetailErrorCode as FcrErrorCode, ErrorModuleCode as FcrErrorModuleCode } from '../imports';
 
 // helpers
 export const generateFcrCoreClientError = (module, code, message, origin) => {
-  const errorType = padEnd(String(FcrErrorCodeType.CLIENT), 3, '0'); // 如：'100'
-  const moduleCode = padStart(String(module), 3, '0'); // 如：'020'
-  const errorCode = padStart(String(code), 3, '0'); // 如：'001'
-  const fullErrorCode = Number(`${errorType}${moduleCode}${errorCode}`); // 如：'100020001'
-
-  const errorMessage = `domain: RTE-CLIENT, info: ${message}`;
-  return new FcrError({
-    code: fullErrorCode,
-    message: errorMessage
-  });
+  return FcrError.create(ErrorServiceType.FCR_CLIENT, module, code, message, origin);
 };
 export const generateFcrCoreServerError = (code, message, origin) => {
-  const errorCode = Number(`${FcrErrorCodeType.SERVER}${padStart(String(code), 8, '0')}`);
+  const errorCode = Number(`${ErrorServiceType.FCR_SERVER}${padStart(String(code), 8, '0')}`);
   const error = new FcrError({
     message: message,
     code: errorCode
@@ -71,7 +27,7 @@ export const handleRequestError = async (action, errorModuleCode, errorMessage)
       throw generateFcrCoreServerError(e.serviceCode ?? -1, e.message, e);
     }
     const error = e;
-    throw generateFcrCoreClientError(errorModuleCode, FcrErrorCode.UNDEFINED_ERROR, errorMessage ?? error.message, error);
+    throw generateFcrCoreClientError(errorModuleCode, DetailErrorCode.UNDEFINED_ERROR, errorMessage ?? error.message, error);
   }
 };
 
@@ -84,26 +40,4 @@ export const handleRequestError = async (action, errorModuleCode, errorMessage)
 // 400000010 // 加入web rtc频道超时了（rtc私有化）
 // 730403100 // 被永久踢出房间
 // error codes that cannot be retried when joining a room
-export const ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM = [720410100, 720404100, 732403100, 732403101, 100050051, 300000010, 400000010, 730403100];
-
-// New
-export const generateFcrCoreClientErrorNew = (module, code, message) => {
-  const errorType = padEnd(String(FcrErrorCodeType.CLIENT), 3, '0'); // 如：'100'
-  const moduleCode = padStart(String(module), 3, '0'); // 如：'020'
-  const errorCode = padStart(String(code), 3, '0'); // 如：'001'
-  const fullErrorCode = Number(`${errorType}${moduleCode}${errorCode}`); // 如：'100020001'
-
-  const errorMessage = `domain: RTE-CLIENT, info: ${message}`;
-  return new FcrError({
-    code: fullErrorCode,
-    message: errorMessage
-  });
-};
-export const generateFcrCoreServerErrorNew = (code, message) => {
-  const errorCode = Number(`${FcrErrorCodeType.SERVER}${padStart(String(code), 8, '0')}`);
-  const error = new FcrError({
-    message: message,
-    code: errorCode
-  });
-  return error;
-};
+export const ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM = [720410100, 720404100, 732403100, 732403101, 100050051, 300000010, 400000010, 730403100];

package/lib-es/utilities/join-helper.js

@@ -9,7 +9,8 @@ import "core-js/modules/esnext.iterator.map.js";
 import { convertStreamTypeToPublishState, getPlatform, getVersion, retryAttempt } from '../imports';
 import { FcrUserRoleToStringMap, FcrStreamLatencyLevel } from '../type';
 import { canRetryJoinError } from './retry-helpers';
-import { FcrErrorModuleCode, handleRequestError } from './error';
+import { handleRequestError } from './error';
+import { ErrorModuleCode } from '../imports';
 import { ROOM_CONTROL_CONSTANTS } from '../room-control/helpers/constants';
 
 /**
@@ -115,7 +116,7 @@ export class FcrJoinHelper {
     const checkInParams = this._buildCheckInParams(options, extraParams);
     const apiCall = useInternalApi ? () => this._api.checkInInternal(checkInParams) : () => this._api.checkIn(checkInParams);
     const errorMessage = useInternalApi ? 'check in internal failed' : 'check in failed';
-    const res = await handleRequestError(apiCall, FcrErrorModuleCode.ROOM, errorMessage);
+    const res = await handleRequestError(apiCall, ErrorModuleCode.FCR_ROOM, errorMessage);
     return res;
   }
 
@@ -168,7 +169,7 @@ export class FcrJoinHelper {
    * @private
    */
   async _joinScene(streamLatency, streamEncryptionConfig, snapshot, timestamp, onJoinAborted) {
-    await this._scene.join({
+    await this._scene.joinWithSnapshot({
       streamLatency: streamLatency,
       streamEncryptionConfig,
       snapshot,

package/lib-es/utilities/logger.js

@@ -1,23 +1,7 @@
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.for-each.js";
-import { getLogger as _getLogger, createLogger as _createLogger, serializeArgs, randomString } from '../imports';
-export const getLogger = () => {
-  return _getLogger({
-    label: 'fcr-core'
-  });
-};
-export const createLogger = opts => {
-  return _createLogger({
-    label: 'fcr-core',
-    prefix: `${opts.prefix}@${randomString(5)}`
-  });
-};
-export const generateLogObserver = (logger, callbackMethods) => {
-  const observer = {};
-  callbackMethods.forEach(method => {
-    observer[method] = (...args) => {
-      logger.info(`[API Callback] ${method} [parameters: ${serializeArgs(args)}]`);
-    };
-  });
-  return observer;
-};
+import { LoggerManager } from '../imports';
+const loggerManager = new LoggerManager({
+  label: 'fcr-core'
+});
+export const getLogger = loggerManager.getLogger.bind(loggerManager);
+export const createLogger = loggerManager.createLogger.bind(loggerManager);
+export const generateLogObserver = loggerManager.generateLogObserver.bind(loggerManager);

package/lib-es/utilities/package-info.js

@@ -1,7 +1,5 @@
 import packageInfo from '../../package.json';
-export const getVersion = () => {
-  return packageInfo.version;
-};
-export const getDependenciesInfo = packageName => {
-  return packageInfo.dependencies[packageName];
-};
+import { PackageInfo } from 'agora-foundation/lib/utilities/package-info';
+const packageInfoObj = new PackageInfo(packageInfo);
+export const getVersion = packageInfoObj.getVersion.bind(packageInfoObj);
+export const getDependenciesInfo = packageInfoObj.getDependenciesInfo.bind(packageInfoObj);