fcr-core 3.10.5 → 3.10.6

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

@@ -1,12 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -27,9 +22,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrWhiteboardControlImpl = exports.FcrStandaloneWhiteboardControlImpl = void 0;
-require("core-js/modules/web.dom-collections.iterator.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../../../imports");
 var _schema = require("../../../schema");
 var _type = require("../../../type");
@@ -43,34 +35,33 @@ var _type3 = require("../../whiteboard-control/type");
 var _base = require("../base");
 var _constant = require("../constant");
 var _utils = require("../utils");
-var _FcrWhiteboardControlImpl, _FcrStandaloneWhiteboardControlImpl;
-let _initProto, _setBackgroundColorDecs, _ref, _initProto2;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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; }
-_ref = (_setBackgroundColorDecs = [(0, _imports.trace)(['backgroundColor']), (0, _validateParams.default)(_schema.stringSchema)], "logger");
 class FcrWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "release"], [_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'
+  }));
+  _backgroundColor = '#ffffff';
+  _isActive = false;
+  _ownerId = null;
+  _preloadLock = false;
+  _notifyObservers = {
+    onScenePropertiesUpdated: this._onScenePropertiesUpdated
+  };
   constructor(rtmClient, config, sharedCache, boardRoomConfigFetcher, _scene, _api) {
     super(rtmClient, config, boardRoomConfigFetcher, _api);
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrWhiteboardControlImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_backgroundColor", '#ffffff');
-    (0, _defineProperty2.default)(this, "_isActive", false);
-    (0, _defineProperty2.default)(this, "_ownerId", null);
-    (0, _defineProperty2.default)(this, "_preloadLock", false);
-    (0, _defineProperty2.default)(this, "_notifyObservers", {
-      onScenePropertiesUpdated: this._onScenePropertiesUpdated
-    });
     this._scene = _scene;
     this._api = _api;
     this._roomCache = sharedCache.getRoomCache(config.roomId);
     this._scene.addObserver(this._notifyObservers);
-    this.logger.info("Whitebaord Version: forge-whiteboard@".concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-whiteboard'), ", forge-room@").concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-room'), ", forge-room@").concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-rtm')));
+    this.logger.info(`Whitebaord Version: forge-whiteboard@${(0, _packageInfo.getDependenciesInfo)('@netless/forge-whiteboard')}, forge-room@${(0, _packageInfo.getDependenciesInfo)('@netless/forge-room')}, forge-room@${(0, _packageInfo.getDependenciesInfo)('@netless/forge-rtm')}`);
     this._isActive = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard').state === 1;
     const backgroundColor = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard.extra.backgroundColor');
     if (backgroundColor) {
@@ -121,9 +112,10 @@ class FcrWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
     return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this.config.roomId, _type2.FcrSharePermissionState.OFF), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'inactive failed');
   }
   getBoardActiveInfo() {
-    const _ref2 = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard'),
-      state = _ref2.state,
-      ownerUserId = _ref2.ownerUserUuid;
+    const {
+      state,
+      ownerUserUuid: ownerUserId
+    } = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard');
     if (state === _type3.FcrBoardPropertiesState.ACTIVE) {
       return {
         isActive: true,
@@ -163,12 +155,11 @@ class FcrWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
     const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
     const getByKeyPath = value => this._scene.getScenePropertiesByKeyPath(value);
     if (event.cause && event.cause.cmd === 10) {
-      var _getByKeyPath;
       const causeData = event.cause.data;
-      if (causeData !== null && causeData !== void 0 && causeData.widgetUuid && causeData.widgetUuid !== 'netlessBoard') {
+      if (causeData?.widgetUuid && causeData.widgetUuid !== 'netlessBoard') {
         return;
       }
-      const state = (_getByKeyPath = getByKeyPath('widgets.netlessBoard.state')) !== null && _getByKeyPath !== void 0 ? _getByKeyPath : _type3.FcrBoardPropertiesState.INACTIVE;
+      const state = getByKeyPath('widgets.netlessBoard.state') ?? _type3.FcrBoardPropertiesState.INACTIVE;
       const backgroundColor = getByKeyPath('widgets.netlessBoard.extra.backgroundColor');
       const widgetCauseReason = (0, _imports.get)(event.cause.data, 'widgetCause.data.reason');
       const widgetCauseCmd = (0, _imports.get)(event.cause.data, 'widgetCause.cmd');
@@ -196,22 +187,23 @@ class FcrWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
     }
   }
   getWhiteboardOption() {
-    return _objectSpread(_objectSpread({}, super.getWhiteboardOption()), {}, {
+    return {
+      ...super.getWhiteboardOption(),
       width: _utils.WHITEBOARD_WIDTH,
       height: _utils.WHITEBOARD_HEIGHT
-    });
+    };
   }
   addLogObserver() {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onConnectionStateUpdated', ['state']], ['onActive', ['ownerId', 'operatorUser']], ['onInactive', ['reason', 'operatorUser']], ['onBackgroundColorUpdated', ['color', 'operatorUser']]]));
   }
 }
 exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-_FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-var _applyDecs$e = (0, _slicedToArray2.default)(_applyDecs(_FcrWhiteboardControlImpl, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "release"], [_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, 1);
-_initProto = _applyDecs$e[0];
 class FcrStandaloneWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
-  constructor() {
-    super(...arguments);
+  static {
+    [_initProto2] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "release"]], [], 0, void 0, _base.FcrBaseWhiteboardControlImpl).e;
+  }
+  constructor(...args) {
+    super(...args);
     _initProto2(this);
   }
   async open() {
@@ -224,15 +216,11 @@ class FcrStandaloneWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlI
     return _constant.WHITEBOARD_APP_ID;
   }
   getWhiteboardOption() {
-    return _objectSpread(_objectSpread({}, super.getWhiteboardOption()), {}, {
+    return {
+      ...super.getWhiteboardOption(),
       width: _utils.WHITEBOARD_WIDTH,
       height: _utils.WHITEBOARD_HEIGHT
-    });
+    };
   }
 }
-exports.FcrStandaloneWhiteboardControlImpl = FcrStandaloneWhiteboardControlImpl;
-_FcrStandaloneWhiteboardControlImpl = FcrStandaloneWhiteboardControlImpl;
-var _applyDecs$e2 = _applyDecs(_FcrStandaloneWhiteboardControlImpl, [[_imports.trace, 2, "open"], [_imports.trace, 2, "release"]], [], 0, void 0, _base.FcrBaseWhiteboardControlImpl).e;
-var _applyDecs$e3 = (0, _slicedToArray2.default)(_applyDecs$e2, 1);
-_initProto2 = _applyDecs$e3[0];
-_applyDecs$e2;
+exports.FcrStandaloneWhiteboardControlImpl = FcrStandaloneWhiteboardControlImpl;

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

@@ -1,12 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -22,14 +17,10 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrWhiteboardControlFactoryImpl = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _log = require("agora-foundation/lib/decorator/log");
 var _errorCode = require("agora-foundation/lib/utilities/error/error-code");
 var _error = require("../../../utilities/error");
@@ -37,27 +28,24 @@ var _logger = require("../../../utilities/logger");
 var _sharedStorage = require("../../../utilities/shared-storage");
 var _control = require("./control");
 var _sceneProperties = require("../../../utilities/scene-properties");
-var _FcrWhiteboardControlFactoryImpl;
-let _initProto, _createForSubProcessDecs, _createForMainProcessDecs, _ref;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+let _initProto, _createForSubProcessDecs, _createForMainProcessDecs;
 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; }
-_ref = (_createForSubProcessDecs = (0, _log.trace)(['rtmClient', 'boardConfig']), _createForMainProcessDecs = (0, _log.trace)(['rtmClient', 'boardConfig', 'scene', 'api', 'sharedCache']), "logger");
 class FcrWhiteboardControlFactoryImpl {
-  constructor() {
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrWhiteboardControlFactory'
-    })));
+  static {
+    [_initProto] = _applyDecs(this, [[_createForSubProcessDecs, 2, "createForSubProcess"], [_createForMainProcessDecs, 2, "createForMainProcess"]], []).e;
   }
+  [(_createForSubProcessDecs = (0, _log.trace)(['rtmClient', 'boardConfig']), _createForMainProcessDecs = (0, _log.trace)(['rtmClient', 'boardConfig', 'scene', 'api', 'sharedCache']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrWhiteboardControlFactory'
+  }));
   createForSubProcess(rtmClient, boardConfig) {
     return new _control.FcrStandaloneWhiteboardControlImpl(rtmClient, boardConfig, () => {
       const forgeInitConfig = (0, _sharedStorage.getWhiteboardOptions)();
       if (!forgeInitConfig) {
-        throw (0, _error.generateFcrCoreClientError)(_errorCode.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _errorCode.DetailErrorCode.UNDEFINED_ERROR, "whiteboard init config is not exist");
+        throw (0, _error.generateFcrCoreClientError)(_errorCode.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _errorCode.DetailErrorCode.UNDEFINED_ERROR, `whiteboard init config is not exist`);
       }
       return Promise.resolve(forgeInitConfig);
     });
@@ -75,15 +63,11 @@ class FcrWhiteboardControlFactoryImpl {
     };
     return async () => {
       const response = await getObjectInitConfig(roomId, userId);
-      return _objectSpread(_objectSpread({}, response.data), {}, {
+      return {
+        ...response.data,
         boardPerformance
-      });
+      };
     };
   }
 }
-exports.FcrWhiteboardControlFactoryImpl = FcrWhiteboardControlFactoryImpl;
-_FcrWhiteboardControlFactoryImpl = FcrWhiteboardControlFactoryImpl;
-var _applyDecs$e = _applyDecs(_FcrWhiteboardControlFactoryImpl, [[_createForSubProcessDecs, 2, "createForSubProcess"], [_createForMainProcessDecs, 2, "createForMainProcess"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrWhiteboardControlFactoryImpl = FcrWhiteboardControlFactoryImpl;

package/lib/room-control/widget-control/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.map.delete-all.js");
@@ -19,20 +17,15 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrWidgetControlImpl = void 0;
-require("core-js/modules/web.dom-collections.iterator.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../../imports");
 var _type = require("../../type");
 var _error = require("../../utilities/error");
 var _logger = require("../../utilities/logger");
-var _FcrWidgetControlImpl;
-let _initProto, _getActivityDecs, _activeDecs, _inactiveDecs, _ref;
+let _initProto, _getActivityDecs, _activeDecs, _inactiveDecs;
 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); }
@@ -48,44 +41,46 @@ var WidgetState = /*#__PURE__*/function (WidgetState) {
 /**
  * @internal
  */
-_ref = (_getActivityDecs = (0, _imports.trace)(['widgetId']), _activeDecs = (0, _imports.trace)(['widgetId']), _inactiveDecs = (0, _imports.trace)(['widgetId']), "logger");
 class FcrWidgetControlImpl {
-  constructor(_scene, _api, _sharedCache) {
-    //@internal
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrWidgetControlImpl'
-    })));
-    //@internal
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    //@internal
-    (0, _defineProperty2.default)(this, "_sceneObserver", {
-      onScenePropertiesUpdated: (sceneId, event) => {
-        var _event$cause, _event$changedPropert;
-        if (((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.cmd) !== WIDGET_SCENE_PROPERTIES_CMD) {
-          return;
-        }
-        const changedWidgets = (_event$changedPropert = event.changedProperties) === null || _event$changedPropert === void 0 ? void 0 : _event$changedPropert.flexWidgets;
-        if (!changedWidgets || typeof changedWidgets !== 'object') {
-          return;
-        }
-        for (const widgetId of Object.keys(changedWidgets)) {
-          var _changedWidgets$widge;
-          const state = (_changedWidgets$widge = changedWidgets[widgetId]) === null || _changedWidgets$widge === void 0 ? void 0 : _changedWidgets$widge.state;
-          if (state === WidgetState.ACTIVE) {
-            this._observable.notifyObservers('onWidgetActive', sceneId, widgetId);
-          } else if (state === WidgetState.INACTIVE) {
-            this._observable.notifyObservers('onWidgetInactive', sceneId, widgetId);
-          }
+  static {
+    [_initProto] = _applyDecs(this, [[_getActivityDecs, 2, "getActivity"], [_activeDecs, 2, "active"], [_inactiveDecs, 2, "inactive"], [_imports.trace, 2, "release"]], []).e;
+  }
+  //@internal
+  [(_getActivityDecs = (0, _imports.trace)(['widgetId']), _activeDecs = (0, _imports.trace)(['widgetId']), _inactiveDecs = (0, _imports.trace)(['widgetId']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrWidgetControlImpl'
+  }));
+
+  //@internal
+  _observable = new _imports.AgoraObservable();
+
+  //@internal
+  _sceneObserver = {
+    onScenePropertiesUpdated: (sceneId, event) => {
+      if (event.cause?.cmd !== WIDGET_SCENE_PROPERTIES_CMD) {
+        return;
+      }
+      const changedWidgets = event.changedProperties?.flexWidgets;
+      if (!changedWidgets || typeof changedWidgets !== 'object') {
+        return;
+      }
+      for (const widgetId of Object.keys(changedWidgets)) {
+        const state = changedWidgets[widgetId]?.state;
+        if (state === WidgetState.ACTIVE) {
+          this._observable.notifyObservers('onWidgetActive', sceneId, widgetId);
+        } else if (state === WidgetState.INACTIVE) {
+          this._observable.notifyObservers('onWidgetInactive', sceneId, widgetId);
         }
       }
-    });
+    }
+  };
+  constructor(_scene, _api, _sharedCache) {
     this._scene = _scene;
     this._api = _api;
     this._scene.addObserver(this._sceneObserver);
     this._addLogObserver();
   }
   getActivity(widgetId) {
-    const state = this._scene.getScenePropertiesByKeyPath("flexWidgets.".concat(widgetId, ".state"));
+    const state = this._scene.getScenePropertiesByKeyPath(`flexWidgets.${widgetId}.state`);
     return state === WidgetState.ACTIVE;
   }
   active(widgetId) {
@@ -117,9 +112,4 @@ class FcrWidgetControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onWidgetActive', ['roomId', 'widgetId']], ['onWidgetInactive', ['roomId', 'widgetId']]]));
   }
 }
-exports.FcrWidgetControlImpl = FcrWidgetControlImpl;
-_FcrWidgetControlImpl = FcrWidgetControlImpl;
-var _applyDecs$e = _applyDecs(_FcrWidgetControlImpl, [[_getActivityDecs, 2, "getActivity"], [_activeDecs, 2, "active"], [_inactiveDecs, 2, "inactive"], [_imports.trace, 2, "release"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrWidgetControlImpl = FcrWidgetControlImpl;

package/lib/room-router/index.js

@@ -1,11 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -21,16 +17,11 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrRoomRouterImpl = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.regexp.exec.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../imports");
 var _roomControlFactory = require("../room-control/room-control-factory");
 var _type = require("../room-control/type");
@@ -43,10 +34,7 @@ var _logger = require("../utilities/logger");
 var _validateParams = _interopRequireDefault(require("../utilities/validate-params"));
 var _type3 = require("./type");
 var _convertRoomType = require("../utilities/convertRoomType");
-var _FcrRoomRouterImpl;
-let _initProto, _initDecs, _joinRoomDecs, _ref;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+let _initProto, _initDecs, _joinRoomDecs;
 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); }
@@ -55,30 +43,34 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
-_ref = (_initDecs = [(0, _imports.trace)(['roomId']), (0, _validateParams.default)(_schema.stringSchema)], _joinRoomDecs = [(0, _imports.trace)(['options']), (0, _validateParams.default)(_schema.fcrRoomJoinOptionsSchema)], "logger");
+
 class FcrRoomRouterImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [_imports.trace, 2, "leaveRoom"]], []).e;
+  }
+  [(_initDecs = [(0, _imports.trace)(['roomId']), (0, _validateParams.default)(_schema.stringSchema)], _joinRoomDecs = [(0, _imports.trace)(['options']), (0, _validateParams.default)(_schema.fcrRoomJoinOptionsSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrRoomRouterImpl'
+  }));
+  _abortController = null;
+  _observable = new _imports.AgoraObservable();
+  _roomControlObservable = {
+    onRoomRouteSwitched: async event => {
+      this._nextRoomRoute = event.targetRouting;
+      this._observable.notifyObservers('onRoomRouteSwitched', this._nextRoomRoute);
+      this.roomControl.removeObserver(this._roomControlObservable);
+      this._roomControl = null;
+    }
+  };
+  _roomControl = null;
+  _nextRoomRoute = {
+    roomId: '',
+    roomType: _type.FcrRoomType.Mainroom,
+    isJoined: false
+  };
+
+  // 接口中新增一个bypass字段，在第一次调用joinRoom的时候不传，在后续收到房间切换后的joinRoom时传true
+  _bypass = undefined;
   constructor(_rteEngine, _apiService, _config, _chatConnection, _sharedCache, roomId, _monitorControl) {
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrRoomRouterImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_abortController", null);
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_roomControlObservable", {
-      onRoomRouteSwitched: async event => {
-        this._nextRoomRoute = event.targetRouting;
-        this._observable.notifyObservers('onRoomRouteSwitched', this._nextRoomRoute);
-        this.roomControl.removeObserver(this._roomControlObservable);
-        this._roomControl = null;
-      }
-    });
-    (0, _defineProperty2.default)(this, "_roomControl", null);
-    (0, _defineProperty2.default)(this, "_nextRoomRoute", {
-      roomId: '',
-      roomType: _type.FcrRoomType.Mainroom,
-      isJoined: false
-    });
-    // 接口中新增一个bypass字段，在第一次调用joinRoom的时候不传，在后续收到房间切换后的joinRoom时传true
-    (0, _defineProperty2.default)(this, "_bypass", undefined);
     this._rteEngine = _rteEngine;
     this._apiService = _apiService;
     this._config = _config;
@@ -106,9 +98,7 @@ class FcrRoomRouterImpl {
   async joinRoom(options) {
     this._abortController = new AbortController();
     this._validateRoomJoinState();
-    const _await$to = await (0, _imports.to)(this._executeJoinRoomWithRetry(options)),
-      _await$to2 = (0, _slicedToArray2.default)(_await$to, 1),
-      error = _await$to2[0];
+    const [error] = await (0, _imports.to)(this._executeJoinRoomWithRetry(options));
     this._abortController = null;
     if (error) {
       this._handleJoinRoomError(error);
@@ -120,10 +110,9 @@ class FcrRoomRouterImpl {
     return Promise.resolve(this._roomControl);
   }
   async leaveRoom() {
-    var _this$_abortControlle, _this$_roomControl;
-    (_this$_abortControlle = this._abortController) === null || _this$_abortControlle === void 0 || _this$_abortControlle.abort();
+    this._abortController?.abort();
     this._abortController = null;
-    (_this$_roomControl = this._roomControl) === null || _this$_roomControl === void 0 || _this$_roomControl.leave();
+    this._roomControl?.leave();
     this._roomControl = null;
     return _type2.FcrReturnCode.SUCCESS;
   }
@@ -146,10 +135,11 @@ class FcrRoomRouterImpl {
     const abortController = this._abortController;
     return (0, _imports.retryAttempt)(() => this._performSingleJoinAttempt(options), [], {
       retriesMax: _type3.ROOM_ROUTER_CONSTANTS.MAX_JOIN_ATTEMPTS
-    }).fail(async _ref2 => {
-      let error = _ref2.error,
-        waitBeforeRetry = _ref2.timeFn,
-        attemptCount = _ref2.currentRetry;
+    }).fail(async ({
+      error,
+      timeFn: waitBeforeRetry,
+      currentRetry: attemptCount
+    }) => {
       return (0, _joinHelper.handleJoinRetryFailure)(error, waitBeforeRetry, attemptCount, _retryHelpers.canRetryJoinError, () => {
         this._throwIfAborted(abortController);
       }, 'join room via router');
@@ -174,15 +164,17 @@ class FcrRoomRouterImpl {
    * @private
    */
   async _performCheckIn(options) {
-    const _this$_rteEngine$getC = this._rteEngine.getConfig(),
-      userId = _this$_rteEngine$getC.userId;
+    const {
+      userId
+    } = this._rteEngine.getConfig();
     const checkInParams = _joinHelper.FcrJoinHelper.buildCheckInParams(options, userId, this._nextRoomRoute.roomId, {
       bypass: this._bypass,
       avatar: options.avatar
     });
-    const _await$handleRequestE = await (0, _error.handleRequestError)(() => this._apiService.checkIn(checkInParams), _imports.ErrorModuleCode.FCR_ENGINE),
-      data = _await$handleRequestE.data,
-      ts = _await$handleRequestE.ts;
+    const {
+      data,
+      ts
+    } = await (0, _error.handleRequestError)(() => this._apiService.checkIn(checkInParams), _imports.ErrorModuleCode.FCR_ENGINE);
     return {
       data,
       ts
@@ -194,19 +186,22 @@ class FcrRoomRouterImpl {
    * @private
    */
   async _joinRoomControl(options, roomResponse) {
-    const data = roomResponse.data,
-      ts = roomResponse.ts;
+    const {
+      data,
+      ts
+    } = roomResponse;
     const abortController = this._abortController;
     const roomControl = this._createRoomControl(data);
-    abortController === null || abortController === void 0 || abortController.signal.addEventListener('abort', () => {
+    abortController?.signal.addEventListener('abort', () => {
       roomControl.leave();
     });
-    await roomControl.join(_objectSpread(_objectSpread({}, options), {}, {
+    await roomControl.join({
+      ...options,
       snapshot: data,
       timestamp: ts,
       createStreamConfigs: options.createStreamConfigs,
       roomToken: options.roomToken || this._config.token
-    }));
+    });
     return roomControl;
   }
 
@@ -215,10 +210,12 @@ class FcrRoomRouterImpl {
    * @private
    */
   _updateRoomState(roomResponse, roomControl) {
-    const data = roomResponse.data;
+    const {
+      data
+    } = roomResponse;
     const fcrRoomType = (0, _convertRoomType.convertServerRoomTypeToFcrRoomType)(data.room.roomProperties.roomType);
     if (fcrRoomType === null) {
-      const fcrError = (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM, _imports.DetailErrorCode.UNDEFINED_ERROR, "update room state failed: Unknown room type: ".concat(data.room.roomProperties.roomType));
+      const fcrError = (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM, _imports.DetailErrorCode.UNDEFINED_ERROR, `update room state failed: Unknown room type: ${data.room.roomProperties.roomType}`);
       throw fcrError;
     }
     this._nextRoomRoute = {
@@ -237,8 +234,8 @@ class FcrRoomRouterImpl {
    * @private
    */
   _handleJoinRoomError(error) {
-    this.logger.error("Failed to join the room: ".concat(error.message));
-    const fcrError = (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM, _imports.DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, "join room failed: ".concat(error.message));
+    this.logger.error(`Failed to join the room: ${error.message}`);
+    const fcrError = (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM, _imports.DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, `join room failed: ${error.message}`);
     this._observable.notifyObservers('onErrorOccurred', fcrError);
   }
 
@@ -264,7 +261,7 @@ class FcrRoomRouterImpl {
     });
   }
   _throwIfAborted(abortController) {
-    if (abortController !== null && abortController !== void 0 && abortController.signal.aborted) {
+    if (abortController?.signal.aborted) {
       throw new Error('Join room attempt aborted');
     }
   }
@@ -278,9 +275,4 @@ class FcrRoomRouterImpl {
     this._observable.removeObserver(observer);
   }
 }
-exports.FcrRoomRouterImpl = FcrRoomRouterImpl;
-_FcrRoomRouterImpl = FcrRoomRouterImpl;
-var _applyDecs$e = _applyDecs(_FcrRoomRouterImpl, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [_imports.trace, 2, "leaveRoom"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrRoomRouterImpl = FcrRoomRouterImpl;