fcr-core 3.9.0-alpha → 3.9.1-alpha

package/lib/engine/index.js

@@ -68,9 +68,7 @@ class FcrCoreEngineImpl {
     [_initProto] = _applyDecs(this, [[_decorator.trace, 2, "release"], [_decorator.trace, 2, "login"], [_decorator.trace, 2, "logout"], [_renewUserTokenDecs, 2, "renewUserToken"], [_decorator.trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [_decorator.trace, 2, "getDesktopMediaControl"], [_decorator.trace, 2, "getMobileMediaControl"], [_decorator.trace, 2, "getMonitorControl"], [_decorator.trace, 2, "getPeerSessionControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e;
   }
   // @internal
-  [(_renewUserTokenDecs = (0, _decorator.trace)(['token'], true), _createMainRoomControlDecs = [(0, _decorator.trace)(['roomId']), (0, _validateParams.default)(_schema.stringSchema)], _createWaitingRoomControlDecs = [(0, _decorator.trace)(['roomId']), (0, _validateParams.default)(_schema.stringSchema)], _createRoomRouterDecs = [(0, _decorator.trace)(['roomId']), (0, _validateParams.default)(_schema.stringSchema)], _createRoomControlAndJoinDecs = [(0, _decorator.trace)(['roomId', 'options']), (0, _validateParams.default)(_schema.stringSchema, _schema.fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [(0, _decorator.trace)(['payload', 'guaranteedDelivery', 'receiverId'], true), (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema, _schema.booleanSchema, _schema.stringSchema)], _setParametersDecs = [(0, _decorator.trace)(['parameters'], true), (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
-    prefix: 'FcrCoreEngine'
-  }));
+  [(_renewUserTokenDecs = (0, _decorator.trace)(['token'], true), _createMainRoomControlDecs = [(0, _decorator.trace)(['roomId']), (0, _validateParams.default)(_schema.stringSchema)], _createWaitingRoomControlDecs = [(0, _decorator.trace)(['roomId']), (0, _validateParams.default)(_schema.stringSchema)], _createRoomRouterDecs = [(0, _decorator.trace)(['roomId']), (0, _validateParams.default)(_schema.stringSchema)], _createRoomControlAndJoinDecs = [(0, _decorator.trace)(['roomId', 'options']), (0, _validateParams.default)(_schema.stringSchema, _schema.fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [(0, _decorator.trace)(['payload', 'guaranteedDelivery', 'receiverId'], true), (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema, _schema.booleanSchema, _schema.stringSchema)], _setParametersDecs = [(0, _decorator.trace)(['parameters'], true), (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema)], "logger")] = void _initProto(this);
   // @internal
 
   // @internal
@@ -100,6 +98,13 @@ class FcrCoreEngineImpl {
   constructor(config) {
     this._config = config;
     (0, _domainHolder.resetSharedDomainHolder)();
+    const rteLogFileSize = (0, _parameters.getCoreLogFileSize)(config.parameters);
+    _logger.FcrCoreLoggerManagerHolder.initialize({
+      maxSize: rteLogFileSize
+    });
+    this.logger = _logger.FcrCoreLoggerManagerHolder.createLogger({
+      prefix: 'FcrCoreEngine'
+    });
     this.logger.info('Fcr core engine is created, version: ', this.getVersion());
     this._rteEngine = new _agoraRteSdk.AgoraRteEngine({
       appId: config.appId,
@@ -154,9 +159,13 @@ 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');
+        }
       }
     });
   }
@@ -204,7 +213,7 @@ class FcrCoreEngineImpl {
     const scene = this._rteEngine.createScene({
       sceneId: roomId
     });
-    return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache, false));
+    return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache, false), this._monitorControl);
   }
 
   /**
@@ -225,7 +234,7 @@ class FcrCoreEngineImpl {
    * @returns The room router.
    */
   createRoomRouter(roomId) {
-    const roomRouter = new _roomRouter.FcrRoomRouterImpl(this._rteEngine, this._apiService, this._config, this._chatConnection, this._sharedCache, roomId);
+    const roomRouter = new _roomRouter.FcrRoomRouterImpl(this._rteEngine, this._apiService, this._config, this._chatConnection, this._sharedCache, roomId, this._monitorControl);
     return roomRouter;
   }
 

package/lib/imports.d.ts

@@ -69,3 +69,5 @@ 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 type Unknown = unknown;
+export { default as isBoolean } from 'lodash/isBoolean';
+export { default as isNumber } from 'lodash/isNumber';

package/lib/imports.js

@@ -408,6 +408,18 @@ Object.defineProperty(exports, "getVersion", {
     return _packageInfo.getVersion;
   }
 });
+Object.defineProperty(exports, "isBoolean", {
+  enumerable: true,
+  get: function () {
+    return _isBoolean.default;
+  }
+});
+Object.defineProperty(exports, "isNumber", {
+  enumerable: true,
+  get: function () {
+    return _isNumber.default;
+  }
+});
 Object.defineProperty(exports, "jsonstring", {
   enumerable: true,
   get: function () {
@@ -571,6 +583,8 @@ var _uuid = require("uuid");
 var _merge = _interopRequireDefault(require("lodash/merge"));
 var _errorCode = require("agora-foundation/lib/utilities/error/error-code");
 var _chatroom = require("./plugins/chat/chatroom");
+var _isBoolean = _interopRequireDefault(require("lodash/isBoolean"));
+var _isNumber = _interopRequireDefault(require("lodash/isNumber"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Other utility exports
 

package/lib/monitor-control/index.js

@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrMonitorControlImpl = void 0;
 var _imports = require("../imports");
+var _parameters = require("../utilities/parameters");
 let _initProto, _uploadEventDecs;
 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 + ""; }
@@ -33,16 +34,25 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
  */
 class FcrMonitorControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[_uploadEventDecs, 2, "uploadEvent"]], []).e;
+    [_initProto] = _applyDecs(this, [[_uploadEventDecs, 2, "uploadEvent"], [_imports.trace, 2, "setNeedLogUpload"]], []).e;
   }
   [(_uploadEventDecs = (0, _imports.trace)(['event']), "_monitor")] = void _initProto(this);
+  _needLogUpload = true;
   constructor(engine, _config) {
     this._config = _config;
     this._monitor = engine.getMonitor();
+    const needLogUpload = (0, _parameters.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/monitor-control/type.d.ts

@@ -3,6 +3,11 @@ export interface FcrMonitorObserver {
     onPerformanceInfoUpdated?: (status: FcrPerformanceInfo) => void;
 }
 export interface FcrMonitorControl {
+    /**
+     * Get whether to upload the log.
+     * @returns Whether to upload the log.
+     */
+    get needLogUpload(): boolean;
     /**
      * Uploads an event to the Agora Real-Time Engagement Monitor.
      * @param event The event to be uploaded.
@@ -10,6 +15,11 @@ export interface FcrMonitorControl {
      * @param failure Callback function to be called if the upload fails, with an error parameter.
      */
     uploadEvent(event: FcrMonitorUploadEvent): Promise<void>;
+    /**
+     * Set whether to upload the log.
+     * @param isNeed Whether to upload the log.
+     */
+    setNeedLogUpload(isNeed: boolean): void;
     /**
      * Add an observer to the monitor.
      * @param observer

package/lib/plugins/chat/connector.js

@@ -116,10 +116,15 @@ class FcrChatConnectorImpl {
       _imports.EasemobChatSDK.logger.setConsoleLogVisibility(false);
       this._conn = new _imports.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
@@ -214,6 +219,7 @@ class FcrChatConnectorImpl {
     if (this._chatIpList?.length || this._restIpList?.length) {
       const privateConfig = {
         isHttpDNS: false
+        // https: true,
       };
       if (this._chatIpList?.length) {
         privateConfig.url = this._chatIpList[0];
@@ -221,6 +227,7 @@ 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/room-control/ability-control/type.d.ts

@@ -11,7 +11,10 @@ export declare enum FcrAbility {
     Board = "board",
     SettingVirtualBackground = "setting:virtualBackground",
     SettingBeautyMode = "setting:beautyMode",
-    PstnCallOut = "pstn:callOut"
+    CallOutPstn = "callOut:pstn",
+    CallOutVolte = "callOut:volte",
+    CallOutH323 = "callOut:h323",
+    CallOutSip = "callOut:sip"
 }
 export interface FcrAbilityControl {
     isAbilitySupported(ability: FcrAbility): boolean;

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

@@ -16,6 +16,9 @@ let FcrAbility = exports.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/room-control/mainroom-control/index.js

@@ -63,8 +63,9 @@ 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, _type2.FcrRoomType.Mainroom, chatConnection, sharedCache, chatRoomControl);
+    this._monitorControl = monitorControl;
     this._groupControl = new _groupControl.FcrGroupControl(engine, scene, api, sharedCache);
     this._interpreterControl = new _interpreterControl.FcrInterpreterControlImpl(api, scene, config, engine, chatConnection, sharedCache);
     this._addLogObserver();
@@ -107,18 +108,12 @@ 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 _type.FcrReturnCode.SUCCESS;
     } finally {
-      this._engine.getMonitor().uploadLog({
-        userUuid: this._config.userId,
-        roomUuid: this._scene.sceneId
-      });
+      this._uploadLog();
     }
   }
   async leave() {
@@ -128,10 +123,7 @@ 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) {
@@ -246,6 +238,16 @@ 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((0, _logger.generateLogObserver)(this.logger, [['onCloudRecordingStateUpdated', ['roomId', 'state']], ['onJoinRoomFailure', ['roomId', 'error']], ['onJoinRoomSuccess', ['roomId']], ['onLiveStreamingStateUpdated', ['roomId', 'state', 'url', 'reason']],
     // 'onNetworkQualityUpdated',

package/lib/room-control/privilege-control/type.d.ts

@@ -282,6 +282,7 @@ export declare enum FcrPermissionAction {
     CallInvite = "call:invite",
     CallMerge = "call:merge",
     CallSplit = "call:split",
+    CallOut = "call:callOut",
     BoardStart = "board:start",
     BoardClose = "board:close",
     BoardWrite = "board:write",

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

@@ -98,6 +98,7 @@ let FcrPermissionAction = exports.FcrPermissionAction = /*#__PURE__*/function (F
   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/room-control/room-connector-control/index.js

@@ -94,13 +94,18 @@ class FcrRoomConnectorControlImpl {
     });
   }
   async startSessionByPhone(params) {
+    const callType = {
+      [_type.FcrPhoneConnectorSessionType.PSTN]: 'pstn',
+      [_type.FcrPhoneConnectorSessionType.VOLTE]: 'volte'
+    }[params.type];
     const {
       data
     } = await (0, _error.handleRequestError)(() => this._api.callPstn({
       roomId: this._scene.sceneId,
       callNumber: params.phoneNumber,
       userId: params.phoneUserId,
-      userName: params.userName
+      userName: params.userName,
+      callType
     }), _imports.ErrorModuleCode.FCR_ROOM, 'start session by phone failed');
     return data.data.sessionUuid;
   }
@@ -154,7 +159,7 @@ class FcrRoomConnectorControlImpl {
         7: _type.FcrRoomConnectorSessionReason.SYSTEM_ERROR,
         8: _type.FcrRoomConnectorSessionReason.UNSUPPORTED
       };
-      if (callType === 'pstn') {
+      if (callType === 'pstn' || callType === 'volte') {
         const session = {
           sessionId: sessionUuid,
           phoneNumber: callNumber

package/lib/room-control/room-connector-control/type.d.ts

@@ -3,6 +3,18 @@ export declare enum FcrIPConnectorSessionType {
     H323 = 1,
     SIP = 2
 }
+export declare enum FcrPhoneConnectorSessionType {
+    PSTN = 1,
+    VOLTE = 2
+}
+export declare const FcrIPConnectorSessionTypeToStringMap: {
+    readonly 1: "h323";
+    readonly 2: "sip";
+};
+export declare const FcrPhoneConnectorSessionTypeToStringMap: {
+    readonly 1: "pstn";
+    readonly 2: "volte";
+};
 export declare enum FcrRoomConnectorSessionReason {
     NONE = 0,
     ACCEPTED = 1,

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

@@ -3,12 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrRoomConnectorSessionState = exports.FcrRoomConnectorSessionReason = exports.FcrRoomConnectorPhoneRegion = exports.FcrIPConnectorSessionType = void 0;
+exports.FcrRoomConnectorSessionState = exports.FcrRoomConnectorSessionReason = exports.FcrRoomConnectorPhoneRegion = exports.FcrPhoneConnectorSessionTypeToStringMap = exports.FcrPhoneConnectorSessionType = exports.FcrIPConnectorSessionTypeToStringMap = exports.FcrIPConnectorSessionType = void 0;
 let FcrIPConnectorSessionType = exports.FcrIPConnectorSessionType = /*#__PURE__*/function (FcrIPConnectorSessionType) {
   FcrIPConnectorSessionType[FcrIPConnectorSessionType["H323"] = 1] = "H323";
   FcrIPConnectorSessionType[FcrIPConnectorSessionType["SIP"] = 2] = "SIP";
   return FcrIPConnectorSessionType;
 }({});
+let FcrPhoneConnectorSessionType = exports.FcrPhoneConnectorSessionType = /*#__PURE__*/function (FcrPhoneConnectorSessionType) {
+  FcrPhoneConnectorSessionType[FcrPhoneConnectorSessionType["PSTN"] = 1] = "PSTN";
+  FcrPhoneConnectorSessionType[FcrPhoneConnectorSessionType["VOLTE"] = 2] = "VOLTE";
+  return FcrPhoneConnectorSessionType;
+}({});
+const FcrIPConnectorSessionTypeToStringMap = exports.FcrIPConnectorSessionTypeToStringMap = {
+  [FcrIPConnectorSessionType.H323]: 'h323',
+  [FcrIPConnectorSessionType.SIP]: 'sip'
+};
+const FcrPhoneConnectorSessionTypeToStringMap = exports.FcrPhoneConnectorSessionTypeToStringMap = {
+  [FcrPhoneConnectorSessionType.PSTN]: 'pstn',
+  [FcrPhoneConnectorSessionType.VOLTE]: 'volte'
+};
 let FcrRoomConnectorSessionReason = exports.FcrRoomConnectorSessionReason = /*#__PURE__*/function (FcrRoomConnectorSessionReason) {
   FcrRoomConnectorSessionReason[FcrRoomConnectorSessionReason["NONE"] = 0] = "NONE";
   FcrRoomConnectorSessionReason[FcrRoomConnectorSessionReason["ACCEPTED"] = 1] = "ACCEPTED";

package/lib/room-control/room-control-factory.d.ts

@@ -1,7 +1,7 @@
 import { FcrChatConnector } from '../chat-connector/type';
 import { AgoraRteEngine, AgoraRteEntryRoomResponse, AgoraRteScene } from '../imports';
 import { FcrCoreServiceApi } from '../service/api';
-import { FcrCoreEngineConfig } from '../type';
+import { FcrCoreEngineConfig, FcrMonitorControl } from '../type';
 import { FcrSharedCache } from './shared-cache';
 import { FcrRoomType } from './type';
 /**
@@ -15,6 +15,7 @@ export interface RoomControlCreationParams {
     chatConnection: FcrChatConnector;
     sharedCache: FcrSharedCache;
     roomResponse: AgoraRteEntryRoomResponse;
+    monitorControl: FcrMonitorControl;
 }
 /**
  * 房间控制工厂类

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

@@ -48,7 +48,8 @@ class RoomControlFactory {
       config,
       chatConnection,
       sharedCache,
-      roomResponse
+      roomResponse,
+      monitorControl
     } = params;
     const roomType = roomResponse.room.roomProperties.roomType;
     const RoomControlImpl = ROOM_CONTROL_IMPLEMENTATIONS[roomType];
@@ -60,7 +61,7 @@ class RoomControlFactory {
     const chatRoomControl = new _imports.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/room-control/whiteboard-control-v2/whiteboard-control/control.js

@@ -35,16 +35,15 @@ var _type3 = require("../../whiteboard-control/type");
 var _base = require("../base");
 var _constant = require("../constant");
 var _utils = require("../utils");
-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 + ""; }
 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; }
-class FcrWhiteboardControlImpl extends (_ref = _base.FcrBaseWhiteboardControlImpl) {
+class FcrWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "active"], [_imports.trace, 2, "inactive"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [_imports.trace, 2, "getBackgroundColor"], [_imports.trace, 2, "getActivity"], [_imports.trace, 2, "getOwnerId"], [_imports.bound, 2, "_onScenePropertiesUpdated"]], [], 0, void 0, _ref).e;
+    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "active"], [_imports.trace, 2, "inactive"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [_imports.trace, 2, "getBackgroundColor"], [_imports.trace, 2, "getActivity"], [_imports.trace, 2, "getOwnerId"], [_imports.bound, 2, "_onScenePropertiesUpdated"]], [], 0, void 0, _base.FcrBaseWhiteboardControlImpl).e;
   }
   [(_setBackgroundColorDecs = [(0, _imports.trace)(['backgroundColor']), (0, _validateParams.default)(_schema.stringSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
     prefix: 'FcrWhiteboardControlImpl'
@@ -187,9 +186,9 @@ class FcrWhiteboardControlImpl extends (_ref = _base.FcrBaseWhiteboardControlImp
   }
 }
 exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-class FcrStandaloneWhiteboardControlImpl extends (_ref2 = _base.FcrBaseWhiteboardControlImpl) {
+class FcrStandaloneWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
   static {
-    [_initProto2] = _applyDecs(this, [[_imports.trace, 2, "open"]], [], 0, void 0, _ref2).e;
+    [_initProto2] = _applyDecs(this, [[_imports.trace, 2, "open"]], [], 0, void 0, _base.FcrBaseWhiteboardControlImpl).e;
   }
   constructor(...args) {
     super(...args);

package/lib/room-router/index.js

@@ -69,12 +69,13 @@ 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();
   }
@@ -248,7 +249,8 @@ class FcrRoomRouterImpl {
       config: this._config,
       chatConnection: this._chatConnection,
       sharedCache: this._sharedCache,
-      roomResponse
+      roomResponse,
+      monitorControl: this._monitorControl
     });
   }
   _throwIfAborted(abortController) {

package/lib/schema.d.ts

@@ -1,6 +1,6 @@
 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';
@@ -31,6 +31,7 @@ export type FcrBoardToolTypeSchema = z.infer<typeof fcrBoardToolTypeSchema>;
 export declare const fcrLanguageSchema: z.ZodNativeEnum<typeof FcrLanguage>;
 export type FcrLanguageSchema = z.infer<typeof fcrLanguageSchema>;
 export declare const fcrIPConnectorSessionTypeSchema: z.ZodNativeEnum<typeof FcrIPConnectorSessionType>;
+export declare const fcrPhoneConnectorSessionTypeSchema: z.ZodNativeEnum<typeof FcrPhoneConnectorSessionType>;
 export type FcrIPConnectorSessionTypeSchema = z.infer<typeof fcrIPConnectorSessionTypeSchema>;
 export declare const fcrDeviceTypeSchema: z.ZodNativeEnum<typeof FcrDeviceType>;
 export type FcrDeviceTypeSchema = z.infer<typeof fcrDeviceTypeSchema>;
@@ -163,11 +164,14 @@ export declare const fcrPhoneConnectorSessionParamsSchema: z.ZodObject<{
     phoneNumber: z.ZodString;
     userName: z.ZodString;
     phoneUserId: z.ZodOptional<z.ZodString>;
+    type: z.ZodNativeEnum<typeof FcrPhoneConnectorSessionType>;
 }, "strip", z.ZodTypeAny, {
+    type: FcrPhoneConnectorSessionType;
     userName: string;
     phoneNumber: string;
     phoneUserId?: string | undefined;
 }, {
+    type: FcrPhoneConnectorSessionType;
     userName: string;
     phoneNumber: string;
     phoneUserId?: string | undefined;

package/lib/schema.js

@@ -35,7 +35,7 @@ Object.defineProperty(exports, "createUnionSchema", {
     return _imports.createUnionSchema;
   }
 });
-exports.fcrRenderModeSchema = exports.fcrRenderConfigSchema = exports.fcrPrivilegeUserRoleSchema = exports.fcrPrivilegeUserRoleArraySchema = exports.fcrPhoneConnectorSessionParamsSchema = exports.fcrPermissionActionSchema = exports.fcrPeerSessionParamsSchema = exports.fcrMobileDeviceIdOrNameSchema = exports.fcrMediaStreamTypeSchema = exports.fcrMediaStreamCreateConfigSchema = exports.fcrMediaSourceStateSchema = exports.fcrLocalStreamCreateArrayConfigSchema = exports.fcrLineTypeSchema = exports.fcrLatencyLevelTypeSchema = exports.fcrLanguageSchema = exports.fcrLanguageConfigSchema = exports.fcrInterpreterUsersParamsSchema = exports.fcrInterpreterUsersParamsArraySchema = exports.fcrIPConnectorSessionTypeSchema = exports.fcrIPConnectorSessionParamsSchema = exports.fcrGroupUpdateOptionsSchema = exports.fcrGroupUpdateOptionsArraySchema = exports.fcrGroupCreateConfigSchema = exports.fcrGroupCreateConfigArraySchema = exports.fcrEncryptionModeSchema = exports.fcrDeviceTypeSchema = exports.fcrChatRoomSendTextMessageSchema = exports.fcrChatRoomSendImageMessageSchema = exports.fcrChatRoomSendBaseMessageSchema = exports.fcrChatRoomMessageTypeSchema = exports.fcrChatRoomFileSchema = exports.fcrCapabilitySchema = exports.fcrBoardToolTypeSchema = exports.fcrAudioSourceTypeSchema = void 0;
+exports.fcrRenderModeSchema = exports.fcrRenderConfigSchema = exports.fcrPrivilegeUserRoleSchema = exports.fcrPrivilegeUserRoleArraySchema = exports.fcrPhoneConnectorSessionTypeSchema = exports.fcrPhoneConnectorSessionParamsSchema = exports.fcrPermissionActionSchema = exports.fcrPeerSessionParamsSchema = exports.fcrMobileDeviceIdOrNameSchema = exports.fcrMediaStreamTypeSchema = exports.fcrMediaStreamCreateConfigSchema = exports.fcrMediaSourceStateSchema = exports.fcrLocalStreamCreateArrayConfigSchema = exports.fcrLineTypeSchema = exports.fcrLatencyLevelTypeSchema = exports.fcrLanguageSchema = exports.fcrLanguageConfigSchema = exports.fcrInterpreterUsersParamsSchema = exports.fcrInterpreterUsersParamsArraySchema = exports.fcrIPConnectorSessionTypeSchema = exports.fcrIPConnectorSessionParamsSchema = exports.fcrGroupUpdateOptionsSchema = exports.fcrGroupUpdateOptionsArraySchema = exports.fcrGroupCreateConfigSchema = exports.fcrGroupCreateConfigArraySchema = exports.fcrEncryptionModeSchema = exports.fcrDeviceTypeSchema = exports.fcrChatRoomSendTextMessageSchema = exports.fcrChatRoomSendImageMessageSchema = exports.fcrChatRoomSendBaseMessageSchema = exports.fcrChatRoomMessageTypeSchema = exports.fcrChatRoomFileSchema = exports.fcrCapabilitySchema = exports.fcrBoardToolTypeSchema = exports.fcrAudioSourceTypeSchema = void 0;
 Object.defineProperty(exports, "fcrRenderViewSchema", {
   enumerable: true,
   get: function () {
@@ -95,6 +95,7 @@ const fcrUserKickedOutTypeSchema = exports.fcrUserKickedOutTypeSchema = _imports
 const fcrBoardToolTypeSchema = exports.fcrBoardToolTypeSchema = _imports.z.nativeEnum(_enum.FcrBoardToolType);
 const fcrLanguageSchema = exports.fcrLanguageSchema = _imports.z.nativeEnum(_types.FcrLanguage);
 const fcrIPConnectorSessionTypeSchema = exports.fcrIPConnectorSessionTypeSchema = _imports.z.nativeEnum(_type2.FcrIPConnectorSessionType);
+const fcrPhoneConnectorSessionTypeSchema = exports.fcrPhoneConnectorSessionTypeSchema = _imports.z.nativeEnum(_type2.FcrPhoneConnectorSessionType);
 const fcrDeviceTypeSchema = exports.fcrDeviceTypeSchema = _imports.z.nativeEnum(_type5.FcrDeviceType);
 const fcrChatRoomMessageTypeSchema = exports.fcrChatRoomMessageTypeSchema = _imports.z.nativeEnum(_type4.FcrChatRoomMessageType);
 // Native Enum Schemas
@@ -145,7 +146,8 @@ const fcrSecuritySendChatPayloadSchema = exports.fcrSecuritySendChatPayloadSchem
 const fcrPhoneConnectorSessionParamsSchema = exports.fcrPhoneConnectorSessionParamsSchema = _imports.z.object({
   phoneNumber: _imports.stringSchema,
   userName: _imports.stringSchema,
-  phoneUserId: _imports.stringSchema.optional()
+  phoneUserId: _imports.stringSchema.optional(),
+  type: fcrPhoneConnectorSessionTypeSchema
 });
 const fcrIPConnectorSessionParamsSchema = exports.fcrIPConnectorSessionParamsSchema = _imports.z.object({
   address: _imports.stringSchema,

package/lib/service/api.d.ts

@@ -229,11 +229,12 @@ export declare class FcrCoreServiceApi {
         callType: string;
         ipAddress: string;
     }): Promise<any>;
-    callPstn({ roomId, userName, userId, callNumber, }: {
+    callPstn({ roomId, userName, userId, callNumber, callType, }: {
         roomId: string;
         userId?: string;
         userName: string;
         callNumber: string;
+        callType: string;
     }): Promise<any>;
     hangup({ roomId, userId, callId }: {
         roomId: string;

package/lib/service/api.js

@@ -791,10 +791,11 @@ 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/utilities/logger.d.ts

@@ -1,6 +1,21 @@
-export declare const getLogger: () => import("agora-foundation/lib/logger/type").Logger;
-export declare const createLogger: (opts: {
-    prefix: string;
-    database?: boolean;
-}) => import("agora-foundation/lib/logger/type").Logger;
-export declare const generateLogObserver: <T>(logger: import("agora-foundation/lib/logger/type").Logger, callbackMethods: (keyof T | [keyof T, string[]])[]) => T;
+import { Logger, LoggerManager } from '../imports';
+export declare class FcrCoreLoggerManagerHolder {
+    private static instance;
+    private static isDestroying;
+    private static label;
+    static initialize(opts: {
+        maxSize?: number;
+    }): void;
+    static getInstance(): LoggerManager;
+    static createLogger(opts: {
+        prefix: string;
+        database?: boolean;
+    }): Logger;
+    static getLogger(): Logger;
+    static generateLogObserver<T>(logger: Logger, callbackMethods: (keyof T | [keyof T, string[]])[]): T;
+    static destroy(): void;
+    static isInitialized(): boolean;
+}
+export declare const getLogger: typeof FcrCoreLoggerManagerHolder.getLogger;
+export declare const createLogger: typeof FcrCoreLoggerManagerHolder.createLogger;
+export declare const generateLogObserver: typeof FcrCoreLoggerManagerHolder.generateLogObserver;