fcr-core 3.8.0-alpha → 3.8.1-alpha

package/lib/room-control/whiteboard-control-v2/base/main-window.js

@@ -1,6 +1,5 @@
 "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.map.delete-all.js");
@@ -23,11 +22,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrBoardMainWindowImpl = void 0;
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.some.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _forgeWhiteboard = require("@netless/forge-whiteboard");
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _utils = require("../utils");
@@ -37,29 +33,30 @@ var _schema = require("agora-foundation/lib/utilities/schema");
 var _validateParams = _interopRequireDefault(require("../../../utilities/validate-params"));
 var _schema2 = require("../../../schema");
 var _decorator = require("agora-foundation/lib/decorator");
-var _FcrBoardMainWindowImpl;
-let _initProto, _setBackgroundColorDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _insertImageDecs, _setContainerSizeRatioDecs, _setBoardTransparentDecs, _updateWindowSizeDecs, _setAutoCancelDrawDecs, _ref;
+let _initProto, _setBackgroundColorDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _insertImageDecs, _setContainerSizeRatioDecs, _setBoardTransparentDecs, _updateWindowSizeDecs, _setAutoCancelDrawDecs;
 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 = [_log.trace, (0, _validateParams.default)(_schema.stringSchema)], _setToolTypeDecs = [_log.trace, (0, _validateParams.default)(_schema2.fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _setStrokeColorDecs = [_log.trace, (0, _validateParams.default)(_schema2.z.union([_schema2.colorSchema, _schema.stringSchema]))], _setTextColorDecs = [_log.trace, (0, _validateParams.default)(_schema2.colorSchema)], _setTextSizeDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _insertImageDecs = [_log.trace, (0, _validateParams.default)(_schema.stringSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema)], _setContainerSizeRatioDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _setBoardTransparentDecs = [_log.trace, (0, _validateParams.default)(_schema2.booleanSchema)], _updateWindowSizeDecs = [_log.trace, (0, _validateParams.default)(_schema2.fcrSizeSchema)], _setAutoCancelDrawDecs = [_log.trace, (0, _validateParams.default)(_schema2.booleanSchema)], "logger");
 class FcrBoardMainWindowImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_log.trace, 2, "addPage"], [_log.trace, 2, "removePage"], [_log.trace, 2, "undo"], [_log.trace, 2, "redo"], [_log.trace, 2, "clean"], [_log.trace, 2, "getSnapshotImage"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [_log.trace, 2, "getPageInfo"], [_log.trace, 2, "prevPage"], [_log.trace, 2, "nextPage"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_insertImageDecs, 2, "insertImage"], [_log.trace, 2, "getContentView"], [_setContainerSizeRatioDecs, 2, "setContainerSizeRatio"], [_setBoardTransparentDecs, 2, "setBoardTransparent"], [_updateWindowSizeDecs, 2, "updateWindowSize"], [_setAutoCancelDrawDecs, 2, "setAutoCancelDraw"], [_log.trace, 2, "getWritable"], [[_decorator.bound, _log.trace], 2, "_handleApplicationLaunch"], [[_decorator.bound, _log.trace], 2, "_handleApplicationTerminal"], [_log.trace, 2, "_enableAutoCancel"]], []).e;
+  }
+  [(_setBackgroundColorDecs = [_log.trace, (0, _validateParams.default)(_schema.stringSchema)], _setToolTypeDecs = [_log.trace, (0, _validateParams.default)(_schema2.fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _setStrokeColorDecs = [_log.trace, (0, _validateParams.default)(_schema2.z.union([_schema2.colorSchema, _schema.stringSchema]))], _setTextColorDecs = [_log.trace, (0, _validateParams.default)(_schema2.colorSchema)], _setTextSizeDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _insertImageDecs = [_log.trace, (0, _validateParams.default)(_schema.stringSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema)], _setContainerSizeRatioDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _setBoardTransparentDecs = [_log.trace, (0, _validateParams.default)(_schema2.booleanSchema)], _updateWindowSizeDecs = [_log.trace, (0, _validateParams.default)(_schema2.fcrSizeSchema)], _setAutoCancelDrawDecs = [_log.trace, (0, _validateParams.default)(_schema2.booleanSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrBoardMainWindowImpl'
+  }));
+  _observable = new _observable.AgoraObservable();
+  _currentPage = 0;
+  _background = 'rgba(0, 0, 0, 0)';
+  _isAutoCancelEnabled = false;
   constructor(whiteboard, boardRoom, appId) {
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrBoardMainWindowImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_currentPage", 0);
-    (0, _defineProperty2.default)(this, "_background", 'rgba(0, 0, 0, 0)');
-    (0, _defineProperty2.default)(this, "_isAutoCancelEnabled", false);
     this._addLogObserver();
     this._boardView = document.createElement('div');
     this._boardView.classList.add('fcr-whiteboard-window-view');
     this._boardView.appendChild(whiteboard.view);
-    this._boardView.style.height = "100%";
-    this._boardView.style.width = "100%";
+    this._boardView.style.height = `100%`;
+    this._boardView.style.width = `100%`;
     this._boardView.setAttribute('data-app-id', appId);
     this._whiteboard = whiteboard;
     this._setBoardViewStyle(whiteboard.view);
@@ -68,7 +65,7 @@ class FcrBoardMainWindowImpl {
     boardRoom.applicationManager.on('terminal', this._handleApplicationTerminal);
 
     // @ts-ignore
-    this.logger.info("initialized, room: ".concat(boardRoom.roomId));
+    this.logger.info(`initialized, room: ${boardRoom.roomId}`);
   }
   async addPage() {
     this._whiteboard.addPage('next');
@@ -115,7 +112,7 @@ class FcrBoardMainWindowImpl {
   }
   async setBackgroundColor(color) {
     this._background = color;
-    this.logger.info("set canvas background color: ".concat(this._background));
+    this.logger.info(`set canvas background color: ${this._background}`);
     this._whiteboard.setCanvasBackgroundColor(color);
   }
   getPageInfo() {
@@ -146,7 +143,7 @@ class FcrBoardMainWindowImpl {
     }
   }
   async setStrokeColor(color) {
-    const c = typeof color === 'string' ? color : "rgb(".concat(color.r, ",").concat(color.g, ",").concat(color.b, ")");
+    const c = typeof color === 'string' ? color : `rgb(${color.r},${color.g},${color.b})`;
     if (this._whiteboard) {
       this._whiteboard.strokeColor = c;
     } else {
@@ -154,7 +151,7 @@ class FcrBoardMainWindowImpl {
     }
   }
   async setTextColor(color) {
-    const c = typeof color === 'string' ? color : "rgb(".concat(color.r, ",").concat(color.g, ",").concat(color.b, ")");
+    const c = typeof color === 'string' ? color : `rgb(${color.r},${color.g},${color.b})`;
     if (this._whiteboard) {
       this._whiteboard.fillColor = c;
     } else {
@@ -220,7 +217,7 @@ class FcrBoardMainWindowImpl {
     this._whiteboard = app;
     this._setBoardViewStyle(app.view);
     if (this._background) {
-      this.logger.info("set canvas background color: ".concat(this._background));
+      this.logger.info(`set canvas background color: ${this._background}`);
       this._whiteboard.setCanvasBackgroundColor(this._background);
     }
     this._enableAutoCancel(this._isAutoCancelEnabled);
@@ -234,18 +231,18 @@ class FcrBoardMainWindowImpl {
   _handleApplicationTerminal(appId, app) {
     try {
       if (this._boardView.contains(app.view)) {
-        this.logger.info("remove application view: ".concat(appId));
+        this.logger.info(`remove application view: ${appId}`);
         this._boardView.removeChild(app.view);
       } else {
-        this.logger.warn("application view not found in board view: ".concat(appId));
+        this.logger.warn(`application view not found in board view: ${appId}`);
       }
     } catch (e) {
-      this.logger.error("failed to handle terminal: ".concat(appId), e);
+      this.logger.error(`failed to handle terminal: ${appId}`, e);
     }
   }
   _setBoardViewStyle(view) {
-    view.style.height = "100%";
-    view.style.width = "100%";
+    view.style.height = `100%`;
+    view.style.width = `100%`;
     view.style.backgroundColor = 'rgba(0, 0, 0, 0)';
   }
   _enableAutoCancel(enable) {
@@ -258,6 +255,4 @@ class FcrBoardMainWindowImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onWritable', 'onPageInfoUpdated', 'onUndoStateUpdated', 'onRedoStateUpdated']));
   }
 }
-exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-_FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[_log.trace, 2, "addPage"], [_log.trace, 2, "removePage"], [_log.trace, 2, "undo"], [_log.trace, 2, "redo"], [_log.trace, 2, "clean"], [_log.trace, 2, "getSnapshotImage"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [_log.trace, 2, "getPageInfo"], [_log.trace, 2, "prevPage"], [_log.trace, 2, "nextPage"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_insertImageDecs, 2, "insertImage"], [_log.trace, 2, "getContentView"], [_setContainerSizeRatioDecs, 2, "setContainerSizeRatio"], [_setBoardTransparentDecs, 2, "setBoardTransparent"], [_updateWindowSizeDecs, 2, "updateWindowSize"], [_setAutoCancelDrawDecs, 2, "setAutoCancelDraw"], [_log.trace, 2, "getWritable"], [[_decorator.bound, _log.trace], 2, "_handleApplicationLaunch"], [[_decorator.bound, _log.trace], 2, "_handleApplicationTerminal"], [_log.trace, 2, "_enableAutoCancel"]], []).e;
+exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;

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

@@ -48,11 +48,11 @@ const getAnnotationConfigFromRoomProperties = (properties, logger) => {
   let width = (0, _imports.get)(properties, 'widgets.annotation.size.width');
   let height = (0, _imports.get)(properties, 'widgets.annotation.size.height');
   if (typeof width !== 'number') {
-    logger.warn("got invalid width for annotation board, width: ".concat(width));
+    logger.warn(`got invalid width for annotation board, width: ${width}`);
     width = 0;
   }
   if (typeof height !== 'number') {
-    logger.warn("got invalid height for annotation board, height: ".concat(height));
+    logger.warn(`got invalid height for annotation board, height: ${height}`);
     height = 0;
   }
   const boardWidthVal = width;
@@ -65,16 +65,16 @@ const getAnnotationConfigFromRoomProperties = (properties, logger) => {
       height: boardHeight
     } = resizeToMax(boardWidthVal, boardHeightVal, FCR_ANNOTATION_SCALE_BASE));
   } else {
-    logger.warn("got invalid width or height for annotation board, skip resizing, width: ".concat(boardWidthVal, ", height: ").concat(boardHeightVal));
+    logger.warn(`got invalid width or height for annotation board, skip resizing, width: ${boardWidthVal}, height: ${boardHeightVal}`);
   }
-  logger.info("got board config info, ".concat((0, _imports.jsonstring)({
+  logger.info(`got board config info, ${(0, _imports.jsonstring)({
     boardAppId,
     boardId,
     boardToken,
     boardRegion,
     boardWidth,
     boardHeight
-  })));
+  })}`);
   return {
     size: {
       width: boardWidth,
@@ -89,8 +89,7 @@ const getAnnotationConfigFromRoomProperties = (properties, logger) => {
   };
 };
 exports.getAnnotationConfigFromRoomProperties = getAnnotationConfigFromRoomProperties;
-const resizeToMax = function (w, h) {
-  let scaleBase = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : FCR_ANNOTATION_SCALE_BASE;
+const resizeToMax = (w, h, scaleBase = FCR_ANNOTATION_SCALE_BASE) => {
   const scale = scaleBase / Math.max(w, h);
   return {
     width: Math.round(w * scale),

package/lib/room-control/whiteboard-control-v2/whiteboard-control/control.d.ts

@@ -24,7 +24,6 @@ export declare class FcrWhiteboardControlImpl extends FcrBaseWhiteboardControlIm
     getBackgroundColor(): string;
     getActivity(): boolean;
     getOwnerId(): string | null;
-    protected getApplicationId(): string;
     private _onScenePropertiesUpdated;
     protected getWhiteboardOption(): WhiteboardOption;
     protected addLogObserver(): void;

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,8 +22,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrWhiteboardControlImpl = exports.FcrStandaloneWhiteboardControlImpl = void 0;
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../../../imports");
 var _user = require("../../../utilities/user");
 var _error = require("../../../utilities/error");
@@ -41,33 +34,33 @@ var _type = require("../../whiteboard-control/type");
 var _type2 = require("../../sharing-control/type");
 var _logger = require("../../../utilities/logger");
 var _utils = require("../utils");
-var _ref, _FcrWhiteboardControlImpl;
-let _initProto, _setBackgroundColorDecs, _ref2;
-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; }
+var _ref;
+let _initProto, _setBackgroundColorDecs;
 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; }
-_ref2 = (_setBackgroundColorDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger");
 class FcrWhiteboardControlImpl extends (_ref = _base.FcrBaseWhiteboardControlImpl) {
+  static {
+    [_initProto] = _applyDecs(this, [[_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;
+  }
+  [(_setBackgroundColorDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrWhiteboardControlImpl'
+  }));
+  _backgroundColor = '#ffffff';
+  _isActive = false;
+  _ownerId = null;
+  _notifyObservers = {
+    onScenePropertiesUpdated: this._onScenePropertiesUpdated
+  };
   constructor(rtmClient, config, hasOperationPrivilege, sharedCache, forgeInitConfigFetcher, _scene, _api) {
     super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
-    (0, _defineProperty2.default)(this, _ref2, (_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, "_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) {
@@ -77,7 +70,7 @@ class FcrWhiteboardControlImpl extends (_ref = _base.FcrBaseWhiteboardControlImp
     if (ownerId) {
       this._ownerId = ownerId;
     }
-    this.logger.info("initialized, hasOperationPrivilege: ".concat(hasOperationPrivilege));
+    this.logger.info(`initialized, hasOperationPrivilege: ${hasOperationPrivilege}`);
   }
   async active() {
     return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this.config.roomId, _type2.FcrSharePermissionState.ON), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'active failed');
@@ -121,15 +114,11 @@ class FcrWhiteboardControlImpl extends (_ref = _base.FcrBaseWhiteboardControlImp
   getOwnerId() {
     return this._ownerId;
   }
-  getApplicationId() {
-    return _constant.WHITEBOARD_APP_ID;
-  }
   _onScenePropertiesUpdated(sceneId, event) {
     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 state = (_getByKeyPath = getByKeyPath('widgets.netlessBoard.state')) !== null && _getByKeyPath !== void 0 ? _getByKeyPath : _type.FcrBoardPropertiesState.INACTIVE;
+      const state = getByKeyPath('widgets.netlessBoard.state') ?? _type.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');
@@ -151,27 +140,27 @@ class FcrWhiteboardControlImpl extends (_ref = _base.FcrBaseWhiteboardControlImp
     }
   }
   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', 'onActive', 'onInactive', 'onBackgroundColorUpdated']));
   }
 }
 exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-_FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[_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;
 class FcrStandaloneWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
   getApplicationId() {
     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;

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

@@ -1,6 +1,5 @@
 "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.map.delete-all.js");
@@ -18,21 +17,16 @@ 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.FcrWhiteboardControlFactoryImpl = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _logger = require("../../../utilities/logger");
 var _error = require("../../../utilities/error");
 var _log = require("agora-foundation/lib/decorator/log");
 var _base = require("../base");
 var _control = require("./control");
 var _sharedStorage = require("../../../utilities/shared-storage");
-var _FcrWhiteboardControlFactoryImpl;
 let _initProto;
 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 + ""; }
@@ -40,16 +34,17 @@ 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; }
 class FcrWhiteboardControlFactoryImpl {
-  constructor() {
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrWhiteboardControlFactory'
-    })));
+  static {
+    [_initProto] = _applyDecs(this, [[_log.trace, 2, "createForSubProcess"], [_log.trace, 2, "createForMainProcess"]], []).e;
   }
+  logger = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrWhiteboardControlFactory'
+  }));
   createForSubProcess(rtmClient, hasOperationPrivilege, boardConfig) {
     return new _base.FcrBaseWhiteboardControlImpl(rtmClient, boardConfig, hasOperationPrivilege, () => {
       const forgeInitConfig = (0, _sharedStorage.getWhiteboardOptions)();
       if (!forgeInitConfig) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, "whiteboard init config is not exist", new Error("whiteboard init config is not exist"));
+        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, `whiteboard init config is not exist`, new Error(`whiteboard init config is not exist`));
       }
       return Promise.resolve(forgeInitConfig);
     });
@@ -70,6 +65,4 @@ class FcrWhiteboardControlFactoryImpl {
     };
   }
 }
-exports.FcrWhiteboardControlFactoryImpl = FcrWhiteboardControlFactoryImpl;
-_FcrWhiteboardControlFactoryImpl = FcrWhiteboardControlFactoryImpl;
-[_initProto] = _applyDecs(_FcrWhiteboardControlFactoryImpl, [[_log.trace, 2, "createForSubProcess"], [_log.trace, 2, "createForMainProcess"]], []).e;
+exports.FcrWhiteboardControlFactoryImpl = FcrWhiteboardControlFactoryImpl;

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");
@@ -26,10 +22,6 @@ 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");
-require("core-js/modules/web.dom-collections.iterator.js");
-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");
@@ -40,10 +32,7 @@ var _retryHelpers = require("../utilities/retry-helpers");
 var _logger = require("../utilities/logger");
 var _validateParams = _interopRequireDefault(require("../utilities/validate-params"));
 var _type2 = require("./type");
-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); }
@@ -52,30 +41,34 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
-_ref = (_initDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _joinRoomDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrRoomJoinOptionsSchema)], "logger");
+
 class FcrRoomRouterImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [_imports.trace, 2, "leaveRoom"]], []).e;
+  }
+  [(_initDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _joinRoomDecs = [_imports.trace, (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) {
-    (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;
@@ -105,14 +98,17 @@ class FcrRoomRouterImpl {
     this._abortController = null;
     if (error) {
       this._handleJoinRoomError(error);
-      throw error;
+      return Promise.reject(error);
     }
+    if (!this._roomControl) {
+      return Promise.reject(new Error('Room control is not initialized'));
+    }
+    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;
   }
 
@@ -134,12 +130,11 @@ class FcrRoomRouterImpl {
     const abortController = this._abortController;
     return (0, _imports.retryAttempt)(() => this._performSingleJoinAttempt(options), [], {
       retriesMax: _type2.ROOM_ROUTER_CONSTANTS.MAX_JOIN_ATTEMPTS
-    }).fail(async _ref2 => {
-      let {
-        error,
-        timeFn: waitBeforeRetry,
-        currentRetry: attemptCount
-      } = _ref2;
+    }).fail(async ({
+      error,
+      timeFn: waitBeforeRetry,
+      currentRetry: attemptCount
+    }) => {
       return (0, _joinHelper.handleJoinRetryFailure)(error, waitBeforeRetry, attemptCount, _retryHelpers.canRetryJoinError, () => {
         this._throwIfAborted(abortController);
       }, 'join room via router');
@@ -192,14 +187,15 @@ class FcrRoomRouterImpl {
     } = 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
-    }));
+    });
     return roomControl;
   }
 
@@ -227,8 +223,8 @@ class FcrRoomRouterImpl {
    * @private
    */
   _handleJoinRoomError(error) {
-    this.logger.error("Failed to join the room: ".concat(error.message));
-    const fcrError = (0, _error.generateFcrCoreClientErrorNew)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, "join room failed: ".concat(error.message));
+    this.logger.error(`Failed to join the room: ${error.message}`);
+    const fcrError = (0, _error.generateFcrCoreClientErrorNew)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `join room failed: ${error.message}`);
     this._observable.notifyObservers('onErrorOccurred', fcrError);
   }
 
@@ -253,7 +249,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');
     }
   }
@@ -267,6 +263,4 @@ class FcrRoomRouterImpl {
     this._observable.removeObserver(observer);
   }
 }
-exports.FcrRoomRouterImpl = FcrRoomRouterImpl;
-_FcrRoomRouterImpl = FcrRoomRouterImpl;
-[_initProto] = _applyDecs(_FcrRoomRouterImpl, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [_imports.trace, 2, "leaveRoom"]], []).e;
+exports.FcrRoomRouterImpl = FcrRoomRouterImpl;

package/lib/room-router/type.d.ts

@@ -1,7 +1,7 @@
 import { FcrInterpreterRoomControlImpl } from '../room-control/interpreter-control/room';
 import { FcrJoinBeforeHostWaitingRoomControlImpl } from '../room-control/join-before-host-waitingroom-control';
 import { FcrMainRoomControlImpl } from '../room-control/mainroom-control';
-import { FcrJoinBeforeHostWaitingRoomControl, FcrMainRoomControl, FcrRoomJoinOptions, FcrRoomType, FcrWaitingRoomControl } from '../room-control/type';
+import { FcrBaseRoomControl, FcrJoinBeforeHostWaitingRoomControl, FcrMainRoomControl, FcrRoomJoinOptions, FcrRoomType, FcrWaitingRoomControl } from '../room-control/type';
 import { FcrWaitingRoomControlImpl } from '../room-control/waitingroom-control';
 import { FcrError } from '../utilities/error';
 export type FcrRoomControlType = FcrMainRoomControl | FcrWaitingRoomControl | FcrJoinBeforeHostWaitingRoomControl;
@@ -34,7 +34,7 @@ export interface FcrRoomRouter {
     /**
      * 加入会议
      */
-    joinRoom(options: FcrRoomJoinOptions): Promise<void>;
+    joinRoom(options: FcrRoomJoinOptions): Promise<FcrBaseRoomControl>;
     /**
      * 离开会议
      */