fcr-core 3.9.0-alpha → 3.9.1-alpha

package/lib/utilities/logger.js

@@ -3,11 +3,53 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLogger = exports.generateLogObserver = exports.createLogger = void 0;
+exports.getLogger = exports.generateLogObserver = exports.createLogger = exports.FcrCoreLoggerManagerHolder = void 0;
 var _imports = require("../imports");
-const loggerManager = new _imports.LoggerManager({
-  label: 'fcr-core'
-});
-const getLogger = exports.getLogger = loggerManager.getLogger.bind(loggerManager);
-const createLogger = exports.createLogger = loggerManager.createLogger.bind(loggerManager);
-const generateLogObserver = exports.generateLogObserver = loggerManager.generateLogObserver.bind(loggerManager);
+class FcrCoreLoggerManagerHolder {
+  static instance = null;
+  static isDestroying = false;
+  static label = 'fcr-core';
+  static initialize(opts) {
+    if (this.instance && !this.isDestroying) {
+      console.warn(`${this.label} LoggerManager is already initialized. Reinitializing...`);
+    }
+    this.destroy();
+    this.instance = new _imports.LoggerManager({
+      label: this.label,
+      maxSize: opts.maxSize
+    });
+  }
+  static getInstance() {
+    if (!this.instance) {
+      throw new Error(`LoggerManager is not initialized. Call ${this.label} LoggerManager.initialize() first.`);
+    }
+    return this.instance;
+  }
+  static createLogger(opts) {
+    return this.getInstance().createLogger(opts);
+  }
+  static getLogger() {
+    return this.getInstance().getLogger();
+  }
+  static generateLogObserver(logger, callbackMethods) {
+    return this.getInstance().generateLogObserver(logger, callbackMethods);
+  }
+  static destroy() {
+    if (this.instance && !this.isDestroying) {
+      this.isDestroying = true;
+      try {
+        this.instance.release();
+      } finally {
+        this.instance = null;
+        this.isDestroying = false;
+      }
+    }
+  }
+  static isInitialized() {
+    return this.instance !== null;
+  }
+}
+exports.FcrCoreLoggerManagerHolder = FcrCoreLoggerManagerHolder;
+const getLogger = exports.getLogger = FcrCoreLoggerManagerHolder.getLogger.bind(FcrCoreLoggerManagerHolder);
+const createLogger = exports.createLogger = FcrCoreLoggerManagerHolder.createLogger.bind(FcrCoreLoggerManagerHolder);
+const generateLogObserver = exports.generateLogObserver = FcrCoreLoggerManagerHolder.generateLogObserver.bind(FcrCoreLoggerManagerHolder);

package/lib/utilities/parameters.d.ts

@@ -6,5 +6,9 @@ export declare const getCoreIpList: (parameters?: FcrCoreEngineParameters) => st
 export declare const getEasemobChatIpList: (parameters?: FcrCoreEngineParameters) => string[];
 export declare const getEasemobRestIpList: (parameters?: FcrCoreEngineParameters) => string[];
 export declare const isEndpointRegionDisabled: (parameters?: FcrCoreEngineParameters) => boolean;
+export declare const getNeedLogUpload: (parameters?: FcrCoreEngineParameters) => boolean;
+export declare const getCoreLogFileSize: (parameters?: FcrCoreEngineParameters) => number;
+export declare const getEasemobLogFileSize: (parameters?: FcrCoreEngineParameters) => number;
+export declare const getNetlessLogFileSize: (parameters?: FcrCoreEngineParameters) => number;
 export declare const getRtcPresetParameters: () => string[];
 export {};

package/lib/utilities/parameters.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTrueValue = exports.isEndpointRegionDisabled = exports.getRtcPresetParameters = exports.getEasemobRestIpList = exports.getEasemobChatIpList = exports.getCoreIpList = void 0;
+exports.isTrueValue = exports.isEndpointRegionDisabled = exports.getRtcPresetParameters = exports.getNetlessLogFileSize = exports.getNeedLogUpload = exports.getEasemobRestIpList = exports.getEasemobLogFileSize = exports.getEasemobChatIpList = exports.getCoreLogFileSize = exports.getCoreIpList = void 0;
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.set.add-all.js");
 require("core-js/modules/esnext.set.delete-all.js");
@@ -29,6 +29,7 @@ require("core-js/modules/esnext.set.symmetric-difference.js");
 require("core-js/modules/esnext.set.union.v2.js");
 require("core-js/modules/esnext.set.union.js");
 var _imports = require("../imports");
+const DEFAULT_LOG_FILE_SIZE = 512;
 const isTrueValue = value => {
   return value === 'true' || !!value;
 };
@@ -106,8 +107,35 @@ const DESKTOP_COMMON_PARAMS = [
 }, {
   'che.video.lowest_dev_score_4_beauty': 0
 }];
-
+const getNeedLogUpload = parameters => {
+  if ((0, _imports.isBoolean)(parameters?.core?.needLogUpload)) {
+    return parameters.core.needLogUpload;
+  }
+  return true;
+};
+exports.getNeedLogUpload = getNeedLogUpload;
+const getCoreLogFileSize = parameters => {
+  if (!(0, _imports.isNumber)(parameters?.core?.coreLogFileSize)) {
+    return DEFAULT_LOG_FILE_SIZE;
+  }
+  return parameters.core.coreLogFileSize;
+};
+exports.getCoreLogFileSize = getCoreLogFileSize;
+const getEasemobLogFileSize = parameters => {
+  if (!(0, _imports.isNumber)(parameters?.core?.easemobLogFileSize)) {
+    return DEFAULT_LOG_FILE_SIZE;
+  }
+  return parameters.core.easemobLogFileSize;
+};
+exports.getEasemobLogFileSize = getEasemobLogFileSize;
+const getNetlessLogFileSize = parameters => {
+  if (!(0, _imports.isNumber)(parameters?.core?.netlessLogFileSize)) {
+    return DEFAULT_LOG_FILE_SIZE;
+  }
+  return parameters.core.netlessLogFileSize;
+};
 /** desktop platforms set */
+exports.getNetlessLogFileSize = getNetlessLogFileSize;
 const DESKTOP_PLATFORMS = new Set([_imports.FcrApplicationPlatform.WINDOWS, _imports.FcrApplicationPlatform.MACOS]);
 const getRtcPresetParameters = () => {
   const platform = (0, _imports.getPlatform)();

package/lib-es/engine/index.js

@@ -52,18 +52,16 @@ import { FcrCoreServiceApi } from '../service/api';
 import { FcrReturnCode, FcrUserRoleToStringMap } from '../type';
 import { CMD_PEER_MESSAGE } from '../utilities/cmd';
 import { ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM, FcrError, handleRequestError } from '../utilities/error';
-import { createLogger, generateLogObserver } from '../utilities/logger';
+import { FcrCoreLoggerManagerHolder, generateLogObserver } from '../utilities/logger';
 import { getDependenciesInfo, getVersion } from '../utilities/package-info';
-import { getCoreIpList, getEasemobChatIpList, getEasemobRestIpList, isEndpointRegionDisabled } from '../utilities/parameters';
+import { getCoreIpList, getCoreLogFileSize, getEasemobChatIpList, getEasemobRestIpList, isEndpointRegionDisabled } from '../utilities/parameters';
 import validateParams from '../utilities/validate-params';
 export class FcrCoreEngineImpl {
   static {
     [_initProto] = _applyDecs(this, [[trace, 2, "release"], [trace, 2, "login"], [trace, 2, "logout"], [_renewUserTokenDecs, 2, "renewUserToken"], [trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [trace, 2, "getDesktopMediaControl"], [trace, 2, "getMobileMediaControl"], [trace, 2, "getMonitorControl"], [trace, 2, "getPeerSessionControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e;
   }
   // @internal
-  [(_renewUserTokenDecs = trace(['token'], true), _createMainRoomControlDecs = [trace(['roomId']), validateParams(stringSchema)], _createWaitingRoomControlDecs = [trace(['roomId']), validateParams(stringSchema)], _createRoomRouterDecs = [trace(['roomId']), validateParams(stringSchema)], _createRoomControlAndJoinDecs = [trace(['roomId', 'options']), validateParams(stringSchema, fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [trace(['payload', 'guaranteedDelivery', 'receiverId'], true), validateParams(stringKeyUnknownValueSchema, booleanSchema, stringSchema)], _setParametersDecs = [trace(['parameters'], true), validateParams(stringKeyUnknownValueSchema)], "logger")] = (_initProto(this), createLogger({
-    prefix: 'FcrCoreEngine'
-  }));
+  [(_renewUserTokenDecs = trace(['token'], true), _createMainRoomControlDecs = [trace(['roomId']), validateParams(stringSchema)], _createWaitingRoomControlDecs = [trace(['roomId']), validateParams(stringSchema)], _createRoomRouterDecs = [trace(['roomId']), validateParams(stringSchema)], _createRoomControlAndJoinDecs = [trace(['roomId', 'options']), validateParams(stringSchema, fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [trace(['payload', 'guaranteedDelivery', 'receiverId'], true), validateParams(stringKeyUnknownValueSchema, booleanSchema, stringSchema)], _setParametersDecs = [trace(['parameters'], true), validateParams(stringKeyUnknownValueSchema)], "logger")] = void _initProto(this);
   // @internal
 
   // @internal
@@ -93,6 +91,13 @@ export class FcrCoreEngineImpl {
   constructor(config) {
     this._config = config;
     resetSharedDomainHolder();
+    const rteLogFileSize = getCoreLogFileSize(config.parameters);
+    FcrCoreLoggerManagerHolder.initialize({
+      maxSize: rteLogFileSize
+    });
+    this.logger = FcrCoreLoggerManagerHolder.createLogger({
+      prefix: 'FcrCoreEngine'
+    });
     this.logger.info('Fcr core engine is created, version: ', this.getVersion());
     this._rteEngine = new AgoraRteEngine({
       appId: config.appId,
@@ -147,9 +152,13 @@ export class FcrCoreEngineImpl {
         return await this._rteEngine.login();
       } finally {
         this._isLoggingIn = false;
-        this._rteEngine.getMonitor().uploadLog({
-          userUuid: this._config.userId
-        });
+        if (this._monitorControl.needLogUpload) {
+          this._rteEngine.getMonitor().uploadLog({
+            userUuid: this._config.userId
+          });
+        } else {
+          this.logger.info('log upload is disabled');
+        }
       }
     });
   }
@@ -197,7 +206,7 @@ export class FcrCoreEngineImpl {
     const scene = this._rteEngine.createScene({
       sceneId: roomId
     });
-    return new FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache, false));
+    return new FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache, false), this._monitorControl);
   }
 
   /**
@@ -218,7 +227,7 @@ export class FcrCoreEngineImpl {
    * @returns The room router.
    */
   createRoomRouter(roomId) {
-    const roomRouter = new FcrRoomRouterImpl(this._rteEngine, this._apiService, this._config, this._chatConnection, this._sharedCache, roomId);
+    const roomRouter = new FcrRoomRouterImpl(this._rteEngine, this._apiService, this._config, this._chatConnection, this._sharedCache, roomId, this._monitorControl);
     return roomRouter;
   }
 

package/lib-es/imports.js

@@ -56,4 +56,6 @@ export const localStorage = window.localStorage;
 export { v4 } from 'uuid';
 export { default as merge } from 'lodash/merge';
 export { DetailErrorCode, ErrorModuleCode, ErrorServiceType } from 'agora-foundation/lib/utilities/error/error-code';
-export { FcrChatRoomControlImpl } from './plugins/chat/chatroom';
+export { FcrChatRoomControlImpl } from './plugins/chat/chatroom';
+export { default as isBoolean } from 'lodash/isBoolean';
+export { default as isNumber } from 'lodash/isNumber';

package/lib-es/monitor-control/index.js

@@ -22,21 +22,31 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
 import { trace } from '../imports';
+import { getNeedLogUpload } from '../utilities/parameters';
 /**
  * @internal
  */
 export class FcrMonitorControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[_uploadEventDecs, 2, "uploadEvent"]], []).e;
+    [_initProto] = _applyDecs(this, [[_uploadEventDecs, 2, "uploadEvent"], [trace, 2, "setNeedLogUpload"]], []).e;
   }
   [(_uploadEventDecs = trace(['event']), "_monitor")] = void _initProto(this);
+  _needLogUpload = true;
   constructor(engine, _config) {
     this._config = _config;
     this._monitor = engine.getMonitor();
+    const needLogUpload = getNeedLogUpload(this._config.parameters);
+    this._needLogUpload = needLogUpload;
+  }
+  get needLogUpload() {
+    return this._needLogUpload;
   }
   async uploadEvent(event) {
     return this._monitor.uploadEvent(event);
   }
+  setNeedLogUpload(isNeed) {
+    this._needLogUpload = isNeed;
+  }
   addObserver(observer) {
     this._monitor.addObserver(observer);
   }

package/lib-es/plugins/chat/connector.js

@@ -110,10 +110,15 @@ export class FcrChatConnectorImpl {
       EasemobChatSDK.logger.setConsoleLogVisibility(false);
       this._conn = new EasemobChatSDK.connection(connParams);
       this._addEventListeners(this._conn);
-      await this._conn.open({
-        accessToken: this._initConfig.token,
-        user: this._userId
-      });
+      try {
+        await this._conn.open({
+          accessToken: this._initConfig.token,
+          user: this._userId
+        });
+      } catch (error) {
+        this.logger.error('connection open error', error.message);
+        throw error;
+      }
       this.logger.info(`login success, token: ${this._initConfig.token}, userId: ${this._userId}`);
     }, {
       retriesMax: Infinity
@@ -208,6 +213,7 @@ export class FcrChatConnectorImpl {
     if (this._chatIpList?.length || this._restIpList?.length) {
       const privateConfig = {
         isHttpDNS: false
+        // https: true,
       };
       if (this._chatIpList?.length) {
         privateConfig.url = this._chatIpList[0];
@@ -215,6 +221,7 @@ export class FcrChatConnectorImpl {
       if (this._restIpList?.length) {
         privateConfig.apiUrl = this._restIpList[0];
       }
+      privateConfig.url = 'wss://apaas-private-im.agoralab.co:13003/websocket';
       return privateConfig;
     }
   }

package/lib-es/room-control/ability-control/type.js

@@ -10,6 +10,9 @@ export let FcrAbility = /*#__PURE__*/function (FcrAbility) {
   FcrAbility["Board"] = "board";
   FcrAbility["SettingVirtualBackground"] = "setting:virtualBackground";
   FcrAbility["SettingBeautyMode"] = "setting:beautyMode";
-  FcrAbility["PstnCallOut"] = "pstn:callOut";
+  FcrAbility["CallOutPstn"] = "callOut:pstn";
+  FcrAbility["CallOutVolte"] = "callOut:volte";
+  FcrAbility["CallOutH323"] = "callOut:h323";
+  FcrAbility["CallOutSip"] = "callOut:sip";
   return FcrAbility;
 }({});

package/lib-es/room-control/mainroom-control/index.js

@@ -56,8 +56,9 @@ export class FcrMainRoomControlImpl extends FcrBaseRoomControlImpl {
     onLocalUserPermissionInfoAdded: this._onLocalUserPermissionInfoAdded,
     onLocalUserPermissionInfoDeleted: this._onLocalUserPermissionInfoDeleted
   };
-  constructor(engine, scene, api, config, sharedCache, chatConnection, chatRoomControl) {
+  constructor(engine, scene, api, config, sharedCache, chatConnection, chatRoomControl, monitorControl) {
     super(engine, scene, api, config, FcrRoomType.Mainroom, chatConnection, sharedCache, chatRoomControl);
+    this._monitorControl = monitorControl;
     this._groupControl = new FcrGroupControl(engine, scene, api, sharedCache);
     this._interpreterControl = new FcrInterpreterControlImpl(api, scene, config, engine, chatConnection, sharedCache);
     this._addLogObserver();
@@ -100,18 +101,12 @@ export class FcrMainRoomControlImpl extends FcrBaseRoomControlImpl {
       const privilegeControl = this.getPrivilegeControl();
       privilegeControl.addObserver(this._privilegeObserver);
       const task = sharedScheduler.addIntervalTask(() => {
-        this._engine.getMonitor().uploadLog({
-          userUuid: this._config.userId,
-          roomUuid: this._scene.sceneId
-        });
+        this._uploadLog();
       }, Duration.minute(5), false);
       this._logUploadTask = task;
       return FcrReturnCode.SUCCESS;
     } finally {
-      this._engine.getMonitor().uploadLog({
-        userUuid: this._config.userId,
-        roomUuid: this._scene.sceneId
-      });
+      this._uploadLog();
     }
   }
   async leave() {
@@ -121,10 +116,7 @@ export class FcrMainRoomControlImpl extends FcrBaseRoomControlImpl {
       return await super.leave();
     } finally {
       this._logUploadTask?.stop();
-      this._engine.getMonitor().uploadLog({
-        userUuid: this._config.userId,
-        roomUuid: this._scene.sceneId
-      });
+      this._uploadLog();
     }
   }
   addObserver(observer) {
@@ -239,6 +231,16 @@ export class FcrMainRoomControlImpl extends FcrBaseRoomControlImpl {
       }
     }
   }
+  _uploadLog() {
+    if (this._monitorControl.needLogUpload) {
+      this._engine.getMonitor().uploadLog({
+        userUuid: this._config.userId,
+        roomUuid: this._scene.sceneId
+      });
+    } else {
+      this.logger.info('log upload is disabled');
+    }
+  }
   _addLogObserver() {
     this.addObserver(generateLogObserver(this.logger, [['onCloudRecordingStateUpdated', ['roomId', 'state']], ['onJoinRoomFailure', ['roomId', 'error']], ['onJoinRoomSuccess', ['roomId']], ['onLiveStreamingStateUpdated', ['roomId', 'state', 'url', 'reason']],
     // 'onNetworkQualityUpdated',

package/lib-es/room-control/privilege-control/type.js

@@ -92,6 +92,7 @@ export let FcrPermissionAction = /*#__PURE__*/function (FcrPermissionAction) {
   FcrPermissionAction["CallInvite"] = "call:invite";
   FcrPermissionAction["CallMerge"] = "call:merge";
   FcrPermissionAction["CallSplit"] = "call:split";
+  FcrPermissionAction["CallOut"] = "call:callOut";
   FcrPermissionAction["BoardStart"] = "board:start";
   FcrPermissionAction["BoardClose"] = "board:close";
   FcrPermissionAction["BoardWrite"] = "board:write";

package/lib-es/room-control/room-connector-control/index.js

@@ -24,7 +24,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
-import { FcrIPConnectorSessionType, FcrRoomConnectorPhoneRegion, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from './type';
+import { FcrIPConnectorSessionType, FcrPhoneConnectorSessionType, FcrRoomConnectorPhoneRegion, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from './type';
 import { AgoraObservable, trace } from '../../imports';
 import { createLogger, generateLogObserver } from '../../utilities/logger';
 import { handleRequestError } from '../../utilities/error';
@@ -89,13 +89,18 @@ export class FcrRoomConnectorControlImpl {
     });
   }
   async startSessionByPhone(params) {
+    const callType = {
+      [FcrPhoneConnectorSessionType.PSTN]: 'pstn',
+      [FcrPhoneConnectorSessionType.VOLTE]: 'volte'
+    }[params.type];
     const {
       data
     } = await handleRequestError(() => this._api.callPstn({
       roomId: this._scene.sceneId,
       callNumber: params.phoneNumber,
       userId: params.phoneUserId,
-      userName: params.userName
+      userName: params.userName,
+      callType
     }), ErrorModuleCode.FCR_ROOM, 'start session by phone failed');
     return data.data.sessionUuid;
   }
@@ -149,7 +154,7 @@ export class FcrRoomConnectorControlImpl {
         7: FcrRoomConnectorSessionReason.SYSTEM_ERROR,
         8: FcrRoomConnectorSessionReason.UNSUPPORTED
       };
-      if (callType === 'pstn') {
+      if (callType === 'pstn' || callType === 'volte') {
         const session = {
           sessionId: sessionUuid,
           phoneNumber: callNumber

package/lib-es/room-control/room-connector-control/type.js

@@ -3,6 +3,19 @@ export let FcrIPConnectorSessionType = /*#__PURE__*/function (FcrIPConnectorSess
   FcrIPConnectorSessionType[FcrIPConnectorSessionType["SIP"] = 2] = "SIP";
   return FcrIPConnectorSessionType;
 }({});
+export let FcrPhoneConnectorSessionType = /*#__PURE__*/function (FcrPhoneConnectorSessionType) {
+  FcrPhoneConnectorSessionType[FcrPhoneConnectorSessionType["PSTN"] = 1] = "PSTN";
+  FcrPhoneConnectorSessionType[FcrPhoneConnectorSessionType["VOLTE"] = 2] = "VOLTE";
+  return FcrPhoneConnectorSessionType;
+}({});
+export const FcrIPConnectorSessionTypeToStringMap = {
+  [FcrIPConnectorSessionType.H323]: 'h323',
+  [FcrIPConnectorSessionType.SIP]: 'sip'
+};
+export const FcrPhoneConnectorSessionTypeToStringMap = {
+  [FcrPhoneConnectorSessionType.PSTN]: 'pstn',
+  [FcrPhoneConnectorSessionType.VOLTE]: 'volte'
+};
 export let FcrRoomConnectorSessionReason = /*#__PURE__*/function (FcrRoomConnectorSessionReason) {
   FcrRoomConnectorSessionReason[FcrRoomConnectorSessionReason["NONE"] = 0] = "NONE";
   FcrRoomConnectorSessionReason[FcrRoomConnectorSessionReason["ACCEPTED"] = 1] = "ACCEPTED";

package/lib-es/room-control/room-control-factory.js

@@ -43,7 +43,8 @@ export class RoomControlFactory {
       config,
       chatConnection,
       sharedCache,
-      roomResponse
+      roomResponse,
+      monitorControl
     } = params;
     const roomType = roomResponse.room.roomProperties.roomType;
     const RoomControlImpl = ROOM_CONTROL_IMPLEMENTATIONS[roomType];
@@ -55,7 +56,7 @@ export class RoomControlFactory {
     const chatRoomControl = new FcrChatRoomControlImpl(scene, chatConnection, sharedCache, false);
 
     // 创建房间控制实例
-    return new RoomControlImpl(engine, scene, apiService, config, sharedCache, chatConnection, chatRoomControl);
+    return new RoomControlImpl(engine, scene, apiService, config, sharedCache, chatConnection, chatRoomControl, monitorControl);
   }
 
   /**

package/lib-es/room-control/whiteboard-control-v2/whiteboard-control/control.js

@@ -15,7 +15,6 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-var _ref, _ref2;
 let _initProto, _setBackgroundColorDecs, _initProto2;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
@@ -36,9 +35,9 @@ import { FcrBoardPropertiesState } from '../../whiteboard-control/type';
 import { FcrBaseWhiteboardControlImpl } from '../base';
 import { WHITEBOARD_APP_ID } from '../constant';
 import { WHITEBOARD_HEIGHT, WHITEBOARD_WIDTH } from '../utils';
-export class FcrWhiteboardControlImpl extends (_ref = FcrBaseWhiteboardControlImpl) {
+export class FcrWhiteboardControlImpl extends FcrBaseWhiteboardControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "open"], [trace, 2, "close"], [trace, 2, "active"], [trace, 2, "inactive"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [trace, 2, "getBackgroundColor"], [trace, 2, "getActivity"], [trace, 2, "getOwnerId"], [bound, 2, "_onScenePropertiesUpdated"]], [], 0, void 0, _ref).e;
+    [_initProto] = _applyDecs(this, [[trace, 2, "open"], [trace, 2, "close"], [trace, 2, "active"], [trace, 2, "inactive"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [trace, 2, "getBackgroundColor"], [trace, 2, "getActivity"], [trace, 2, "getOwnerId"], [bound, 2, "_onScenePropertiesUpdated"]], [], 0, void 0, FcrBaseWhiteboardControlImpl).e;
   }
   [(_setBackgroundColorDecs = [trace(['backgroundColor']), validateParams(stringSchema)], "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrWhiteboardControlImpl'
@@ -180,9 +179,9 @@ export class FcrWhiteboardControlImpl extends (_ref = FcrBaseWhiteboardControlIm
     this.addObserver(generateLogObserver(this.logger, [['onConnectionStateUpdated', ['state']], ['onActive', ['ownerId', 'operatorUser']], ['onInactive', ['reason', 'operatorUser']], ['onBackgroundColorUpdated', ['color', 'operatorUser']]]));
   }
 }
-export class FcrStandaloneWhiteboardControlImpl extends (_ref2 = FcrBaseWhiteboardControlImpl) {
+export class FcrStandaloneWhiteboardControlImpl extends FcrBaseWhiteboardControlImpl {
   static {
-    [_initProto2] = _applyDecs(this, [[trace, 2, "open"]], [], 0, void 0, _ref2).e;
+    [_initProto2] = _applyDecs(this, [[trace, 2, "open"]], [], 0, void 0, FcrBaseWhiteboardControlImpl).e;
   }
   constructor(...args) {
     super(...args);

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

@@ -64,12 +64,13 @@ export class FcrRoomRouterImpl {
 
   // 接口中新增一个bypass字段，在第一次调用joinRoom的时候不传，在后续收到房间切换后的joinRoom时传true
   _bypass = undefined;
-  constructor(_rteEngine, _apiService, _config, _chatConnection, _sharedCache, roomId) {
+  constructor(_rteEngine, _apiService, _config, _chatConnection, _sharedCache, roomId, _monitorControl) {
     this._rteEngine = _rteEngine;
     this._apiService = _apiService;
     this._config = _config;
     this._chatConnection = _chatConnection;
     this._sharedCache = _sharedCache;
+    this._monitorControl = _monitorControl;
     this._init(roomId);
     this._addLogObserver();
   }
@@ -243,7 +244,8 @@ export class FcrRoomRouterImpl {
       config: this._config,
       chatConnection: this._chatConnection,
       sharedCache: this._sharedCache,
-      roomResponse
+      roomResponse,
+      monitorControl: this._monitorControl
     });
   }
   _throwIfAborted(abortController) {

package/lib-es/schema.js

@@ -2,7 +2,7 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.some.js";
 import { FcrLanguage } from './room-control/interpreter-control/types';
 import { FcrPermissionAction, FcrPrivilegeUserRole, FcrSecurityAction } from './room-control/privilege-control/type';
-import { FcrIPConnectorSessionType } from './room-control/room-connector-control/type';
+import { FcrIPConnectorSessionType, FcrPhoneConnectorSessionType } from './room-control/room-connector-control/type';
 import { FcrUserKickedOutType, FcrUserRole } from './room-control/user-control/type';
 import { FcrBoardToolType } from './room-control/whiteboard-control-v2/enum';
 import { FcrChatRoomMessageType } from './room-control/chatroom-control/type';
@@ -25,6 +25,7 @@ export const fcrUserKickedOutTypeSchema = z.nativeEnum(FcrUserKickedOutType);
 export const fcrBoardToolTypeSchema = z.nativeEnum(FcrBoardToolType);
 export const fcrLanguageSchema = z.nativeEnum(FcrLanguage);
 export const fcrIPConnectorSessionTypeSchema = z.nativeEnum(FcrIPConnectorSessionType);
+export const fcrPhoneConnectorSessionTypeSchema = z.nativeEnum(FcrPhoneConnectorSessionType);
 export const fcrDeviceTypeSchema = z.nativeEnum(FcrDeviceType);
 export const fcrChatRoomMessageTypeSchema = z.nativeEnum(FcrChatRoomMessageType);
 // Native Enum Schemas
@@ -75,7 +76,8 @@ export const fcrSecuritySendChatPayloadSchema = z.object({
 export const fcrPhoneConnectorSessionParamsSchema = z.object({
   phoneNumber: stringSchema,
   userName: stringSchema,
-  phoneUserId: stringSchema.optional()
+  phoneUserId: stringSchema.optional(),
+  type: fcrPhoneConnectorSessionTypeSchema
 });
 export const fcrIPConnectorSessionParamsSchema = z.object({
   address: stringSchema,

package/lib-es/service/api.js

@@ -785,10 +785,11 @@ export class FcrCoreServiceApi {
     roomId,
     userName,
     userId,
-    callNumber
+    callNumber,
+    callType
   }) {
     const res = await this._client.fetch({
-      path: `/v1/rooms/${roomId}/call/pstn`,
+      path: `/v1/rooms/${roomId}/call/${callType}`,
       method: 'POST',
       data: {
         callNumber,

package/lib-es/utilities/logger.js

@@ -1,7 +1,48 @@
 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);
+export class FcrCoreLoggerManagerHolder {
+  static instance = null;
+  static isDestroying = false;
+  static label = 'fcr-core';
+  static initialize(opts) {
+    if (this.instance && !this.isDestroying) {
+      console.warn(`${this.label} LoggerManager is already initialized. Reinitializing...`);
+    }
+    this.destroy();
+    this.instance = new LoggerManager({
+      label: this.label,
+      maxSize: opts.maxSize
+    });
+  }
+  static getInstance() {
+    if (!this.instance) {
+      throw new Error(`LoggerManager is not initialized. Call ${this.label} LoggerManager.initialize() first.`);
+    }
+    return this.instance;
+  }
+  static createLogger(opts) {
+    return this.getInstance().createLogger(opts);
+  }
+  static getLogger() {
+    return this.getInstance().getLogger();
+  }
+  static generateLogObserver(logger, callbackMethods) {
+    return this.getInstance().generateLogObserver(logger, callbackMethods);
+  }
+  static destroy() {
+    if (this.instance && !this.isDestroying) {
+      this.isDestroying = true;
+      try {
+        this.instance.release();
+      } finally {
+        this.instance = null;
+        this.isDestroying = false;
+      }
+    }
+  }
+  static isInitialized() {
+    return this.instance !== null;
+  }
+}
+export const getLogger = FcrCoreLoggerManagerHolder.getLogger.bind(FcrCoreLoggerManagerHolder);
+export const createLogger = FcrCoreLoggerManagerHolder.createLogger.bind(FcrCoreLoggerManagerHolder);
+export const generateLogObserver = FcrCoreLoggerManagerHolder.generateLogObserver.bind(FcrCoreLoggerManagerHolder);

package/lib-es/utilities/parameters.js

@@ -22,7 +22,8 @@ import "core-js/modules/esnext.set.symmetric-difference.v2.js";
 import "core-js/modules/esnext.set.symmetric-difference.js";
 import "core-js/modules/esnext.set.union.v2.js";
 import "core-js/modules/esnext.set.union.js";
-import { FcrApplicationPlatform, getPlatform } from '../imports';
+import { FcrApplicationPlatform, getPlatform, isBoolean, isNumber } from '../imports';
+const DEFAULT_LOG_FILE_SIZE = 512;
 export const isTrueValue = value => {
   return value === 'true' || !!value;
 };
@@ -95,7 +96,30 @@ const DESKTOP_COMMON_PARAMS = [
 }, {
   'che.video.lowest_dev_score_4_beauty': 0
 }];
-
+export const getNeedLogUpload = parameters => {
+  if (isBoolean(parameters?.core?.needLogUpload)) {
+    return parameters.core.needLogUpload;
+  }
+  return true;
+};
+export const getCoreLogFileSize = parameters => {
+  if (!isNumber(parameters?.core?.coreLogFileSize)) {
+    return DEFAULT_LOG_FILE_SIZE;
+  }
+  return parameters.core.coreLogFileSize;
+};
+export const getEasemobLogFileSize = parameters => {
+  if (!isNumber(parameters?.core?.easemobLogFileSize)) {
+    return DEFAULT_LOG_FILE_SIZE;
+  }
+  return parameters.core.easemobLogFileSize;
+};
+export const getNetlessLogFileSize = parameters => {
+  if (!isNumber(parameters?.core?.netlessLogFileSize)) {
+    return DEFAULT_LOG_FILE_SIZE;
+  }
+  return parameters.core.netlessLogFileSize;
+};
 /** desktop platforms set */
 const DESKTOP_PLATFORMS = new Set([FcrApplicationPlatform.WINDOWS, FcrApplicationPlatform.MACOS]);
 export const getRtcPresetParameters = () => {