fcr-core 3.10.5 → 3.10.6

package/lib/room-control/whiteboard-control-v2/base/index.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,17 +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.FcrBaseWhiteboardControlImpl = void 0;
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.json.stringify.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 _forgeRoom = require("@netless/forge-room");
 var _forgeRtm = require("@netless/forge-rtm");
 var _forgeWhiteboard = require("@netless/forge-whiteboard");
@@ -38,7 +31,6 @@ var _error = require("../../../utilities/error");
 var _logger = require("../../../utilities/logger");
 var _constant = require("../constant");
 var _mainWindow = require("./main-window");
-var _FcrBaseWhiteboardControlImpl;
 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 + ""; }
@@ -49,31 +41,34 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 
 const WHITEBOARD_ROOM_JOIN_TIMEOUT = 20000;
 class FcrBaseWhiteboardControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "release"], [_imports.trace, 2, "getConnectionState"], [_imports.trace, 2, "getMainWindow"]], []).e;
+  }
+  logger = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrBaseWhiteboardControl'
+  }));
+  observable = new _imports.AgoraObservable();
+  boardView = null;
+  boardRoom = null;
+  whiteboard = null;
+  connectState = _type.FcrConnectionState.DISCONNECTED;
+  boardRoomConfig = null;
+  _waitPromise = null;
+  _waitPromiseResolve = null;
+  _waitPromiseReject = null;
+  _openAbortController = null;
+  _openState = {
+    isOpen: false,
+    isNeedLaunch: undefined
+  };
   constructor(rtmClient, config, boardRoomConfigFetcher, api) {
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrBaseWhiteboardControl'
-    })));
-    (0, _defineProperty2.default)(this, "observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "boardView", null);
-    (0, _defineProperty2.default)(this, "boardRoom", null);
-    (0, _defineProperty2.default)(this, "whiteboard", null);
-    (0, _defineProperty2.default)(this, "connectState", _type.FcrConnectionState.DISCONNECTED);
-    (0, _defineProperty2.default)(this, "boardRoomConfig", null);
-    (0, _defineProperty2.default)(this, "_waitPromise", null);
-    (0, _defineProperty2.default)(this, "_waitPromiseResolve", null);
-    (0, _defineProperty2.default)(this, "_waitPromiseReject", null);
-    (0, _defineProperty2.default)(this, "_openAbortController", null);
-    (0, _defineProperty2.default)(this, "_openState", {
-      isOpen: false,
-      isNeedLaunch: undefined
-    });
     this.rtmClient = rtmClient;
     this.config = config;
     this.api = api;
     this.boardRoomConfigFetcherTask = _imports.AgoraScheduler.shared.addPollingTask(async () => {
       const boardRoomConfig = await boardRoomConfigFetcher();
       this.boardRoomConfig = boardRoomConfig;
-      this.logger.info("fetch board room config success, config: ".concat((0, _imports.jsonstring)(boardRoomConfig)));
+      this.logger.info(`fetch board room config success, config: ${(0, _imports.jsonstring)(boardRoomConfig)}`);
       this.boardRoomConfigFetcherTask.stop();
       if (this._openState.isOpen) {
         this.connect(this._openState.isNeedLaunch);
@@ -158,7 +153,7 @@ class FcrBaseWhiteboardControlImpl {
     }
     const oldState = this.connectState;
     this.connectState = state;
-    this.logger.info("Connection state updated: ".concat(_type.FcrConnectionState[oldState], " -> ").concat(_type.FcrConnectionState[state]));
+    this.logger.info(`Connection state updated: ${_type.FcrConnectionState[oldState]} -> ${_type.FcrConnectionState[state]}`);
     this.observable.notifyObservers('onConnectionStateUpdated', state);
   }
   async connect(isNeedLaunch) {
@@ -173,15 +168,18 @@ class FcrBaseWhiteboardControlImpl {
       abortController.signal.addEventListener('abort', () => {
         reject(new Error('join board aborted'));
       });
-      const _this$config = this.config,
-        userId = _this$config.userId,
-        userName = _this$config.userName,
-        ipList = _this$config.ipList;
-      const _ref = this.boardRoomConfig || {},
-        boardAppId = _ref.boardAppId,
-        boardId = _ref.boardId,
-        boardRegion = _ref.boardRegion,
-        boardToken = _ref.boardToken;
+      const {
+        userId,
+        userName,
+        ipList
+      } = this.config;
+      const {
+        boardAppId,
+        boardId,
+        boardRegion,
+        boardToken
+        // boardPerformance = false,
+      } = this.boardRoomConfig || {};
       if (!boardAppId) {
         throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.UNDEFINED_ERROR, 'boardAppId is required');
       }
@@ -195,21 +193,21 @@ class FcrBaseWhiteboardControlImpl {
       let width = whiteboardOption.width;
       let height = whiteboardOption.height;
       if (!width) {
-        this.logger.warn("board width is a invalid vlaue: ".concat(width, ", using default value 800"));
+        this.logger.warn(`board width is a invalid vlaue: ${width}, using default value 800`);
         whiteboardOption.width = 800;
       }
       if (!height) {
-        this.logger.warn("board height is a invalid value: ".concat(height, ", using default value 600"));
+        this.logger.warn(`board height is a invalid value: ${height}, using default value 600`);
         whiteboardOption.height = 600;
       }
-      this.logger.info("open board with boardId: ".concat(boardId, ", boardToken: ").concat(boardToken, ", region: ").concat(boardRegion, ", appIdentifier: ").concat(boardAppId, " whiteboardOption: ").concat((0, _imports.jsonstring)(whiteboardOption)));
+      this.logger.info(`open board with boardId: ${boardId}, boardToken: ${boardToken}, region: ${boardRegion}, appIdentifier: ${boardAppId} whiteboardOption: ${(0, _imports.jsonstring)(whiteboardOption)}`);
       let endpoint = undefined;
       if (ipList !== undefined) {
         if (Array.isArray(ipList) && ipList[0]) {
-          this.logger.info("use ipList from config: ".concat((0, _imports.jsonstring)(ipList)));
+          this.logger.info(`use ipList from config: ${(0, _imports.jsonstring)(ipList)}`);
           endpoint = ipList[0];
         } else {
-          this.logger.error("ipList in config is empty or invalid: ".concat((0, _imports.jsonstring)(ipList), ", ignore ipList config"));
+          this.logger.error(`ipList in config is empty or invalid: ${(0, _imports.jsonstring)(ipList)}, ignore ipList config`);
         }
       }
       const rtmProvider = new _forgeRtm.RTMProvider_2_2(this.rtmClient);
@@ -228,14 +226,14 @@ class FcrBaseWhiteboardControlImpl {
         // 第一个开启白板的人需要调用 launch 方法, 其他人监听 launch 事件获取白板实例
         if (isNeedLaunch) {
           getWhiteboard = () => {
-            this.logger.info("ApplicationManager.launchApplication calling, appId: ".concat(appId, ", option: ").concat((0, _imports.jsonstring)(whiteboardOption)));
+            this.logger.info(`ApplicationManager.launchApplication calling, appId: ${appId}, option: ${(0, _imports.jsonstring)(whiteboardOption)}`);
             return wbRoom.applicationManager.launchApplication(_forgeWhiteboard.WhiteboardApplication, whiteboardOption, appId);
           };
         } else {
           const launchPromise = new Promise((launchPromseResolve, launchPromseReject) => {
             this.logger.info('ApplicationManager.once launch event listening');
             wbRoom.applicationManager.once('launch', (appId, app) => {
-              this.logger.info("ApplicationManager.launch event received, appId: ".concat(appId));
+              this.logger.info(`ApplicationManager.launch event received, appId: ${appId}`);
               launchPromseResolve(app);
             });
           });
@@ -243,7 +241,7 @@ class FcrBaseWhiteboardControlImpl {
             return launchPromise;
           };
         }
-        var _await$to = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
+        [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
           const joinRoomParams = {
             userId,
             nickName: userName || userId,
@@ -256,7 +254,7 @@ class FcrBaseWhiteboardControlImpl {
             writable: true
             // verboseLog: true,
           };
-          this.logger.info("Room.joinRoom calling, params: ".concat((0, _imports.jsonstring)(joinRoomParams), ", timeout: ").concat(WHITEBOARD_ROOM_JOIN_TIMEOUT));
+          this.logger.info(`Room.joinRoom calling, params: ${(0, _imports.jsonstring)(joinRoomParams)}, timeout: ${WHITEBOARD_ROOM_JOIN_TIMEOUT}`);
 
           // 20 秒超时
           await wbRoom.joinRoom(joinRoomParams, WHITEBOARD_ROOM_JOIN_TIMEOUT);
@@ -265,29 +263,28 @@ class FcrBaseWhiteboardControlImpl {
           if (isNeedLaunch) {
             // 在同一个房间内只有第一次调用 launchApplication 时传入的宽高参数会生效, 后续的调用不会生效, 所以需要在这里更新宽高
             // 只有 launch 的用户需要更新宽、高, 白板会自动同步给后加入的用户
-            this.logger.info("Whiteboard.updateViewport calling, width: ".concat(width, ", height: ").concat(height));
+            this.logger.info(`Whiteboard.updateViewport calling, width: ${width}, height: ${height}`);
             whiteboard.updateViewport(width, height);
           }
         }, [], {
           retriesMax: 0
-        }).fail(async _ref2 => {
-          let error = _ref2.error,
-            timeFn = _ref2.timeFn,
-            currentRetry = _ref2.currentRetry;
+        }).fail(async ({
+          error,
+          timeFn,
+          currentRetry
+        }) => {
           if (abortController.signal.aborted) {
             throw new Error('join board aborted');
           }
-          this.logger.error("failed to join board, error: ".concat(error.message, ", current retry: ").concat(currentRetry), error);
+          this.logger.error(`failed to join board, error: ${error.message}, current retry: ${currentRetry}`, error);
           await timeFn();
           return true;
         }).exec());
-        var _await$to2 = (0, _slicedToArray2.default)(_await$to, 1);
-        error = _await$to2[0];
         if (abortController.signal.aborted) {
           throw new Error('join board aborted');
         }
         if (error) {
-          this.logger.error("join board failed, ".concat(error.message, "-").concat(JSON.stringify(error)));
+          this.logger.error(`join board failed, ${error.message}-${JSON.stringify(error)}`);
           throw error;
         }
         this.logger.info('Whiteboard camera settings: enableCameraByMouse=false, enableCameraByTouch=false');
@@ -315,7 +312,7 @@ class FcrBaseWhiteboardControlImpl {
           this._clearWaitPromise();
         }
       } catch (e) {
-        this.logger.error("join board failed");
+        this.logger.error(`join board failed`);
         this.updateConnectionState(_type.FcrConnectionState.DISCONNECTED);
         reject(e);
         if (this._waitPromiseReject) {
@@ -355,9 +352,4 @@ class FcrBaseWhiteboardControlImpl {
     this._waitPromise = null;
   }
 }
-exports.FcrBaseWhiteboardControlImpl = FcrBaseWhiteboardControlImpl;
-_FcrBaseWhiteboardControlImpl = FcrBaseWhiteboardControlImpl;
-var _applyDecs$e = _applyDecs(_FcrBaseWhiteboardControlImpl, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "release"], [_imports.trace, 2, "getConnectionState"], [_imports.trace, 2, "getMainWindow"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrBaseWhiteboardControlImpl = FcrBaseWhiteboardControlImpl;

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");
@@ -18,15 +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.FcrBoardMainWindowImpl = void 0;
-require("core-js/modules/es.error.cause.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _utils = require("../utils");
 var _logger = require("../../../utilities/logger");
@@ -38,24 +33,25 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _type = require("../../../type");
 var _error = require("../../../utilities/error");
 var _imports = require("../../../imports");
-var _FcrBoardMainWindowImpl;
-let _initProto, _setBackgroundColorDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _insertImageDecs, _setContainerSizeRatioDecs, _setBoardTransparentDecs, _updateWindowSizeDecs, _setAutoCancelDrawDecs, _handleApplicationLaunchDecs, _handleApplicationTerminalDecs, _enableAutoCancelDecs, _ref;
+let _initProto, _setBackgroundColorDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _insertImageDecs, _setContainerSizeRatioDecs, _setBoardTransparentDecs, _updateWindowSizeDecs, _setAutoCancelDrawDecs, _handleApplicationLaunchDecs, _handleApplicationTerminalDecs, _enableAutoCancelDecs;
 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, _log.trace)(['color']), (0, _validateParams.default)(_schema.stringSchema)], _setToolTypeDecs = [(0, _log.trace)(['type']), (0, _validateParams.default)(_schema2.fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [(0, _log.trace)(['strokeWidth']), (0, _validateParams.default)(_schema2.numberSchema)], _setStrokeColorDecs = [(0, _log.trace)(['color']), (0, _validateParams.default)(_schema2.z.union([_schema2.colorSchema, _schema.stringSchema]))], _setTextColorDecs = [(0, _log.trace)(['color']), (0, _validateParams.default)(_schema2.colorSchema)], _setTextSizeDecs = [(0, _log.trace)(['textSize']), (0, _validateParams.default)(_schema2.numberSchema)], _insertImageDecs = [(0, _log.trace)(['resourceUrl', 'x', 'y', 'width', 'height']), (0, _validateParams.default)(_schema.stringSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema)], _setContainerSizeRatioDecs = [(0, _log.trace)(['ratio']), (0, _validateParams.default)(_schema2.numberSchema)], _setBoardTransparentDecs = [(0, _log.trace)(['isTransparent']), (0, _validateParams.default)(_schema2.booleanSchema)], _updateWindowSizeDecs = [(0, _log.trace)(['size']), (0, _validateParams.default)(_schema2.fcrSizeSchema)], _setAutoCancelDrawDecs = [(0, _log.trace)(['enable']), (0, _validateParams.default)(_schema2.booleanSchema)], _handleApplicationLaunchDecs = [_decorator.bound, (0, _log.trace)(['appId', 'app'])], _handleApplicationTerminalDecs = [_decorator.bound, (0, _log.trace)(['appId', 'app'])], _enableAutoCancelDecs = (0, _log.trace)(['enable']), "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"], [_handleApplicationLaunchDecs, 2, "_handleApplicationLaunch"], [_handleApplicationTerminalDecs, 2, "_handleApplicationTerminal"], [_enableAutoCancelDecs, 2, "_enableAutoCancel"]], []).e;
+  }
+  [(_setBackgroundColorDecs = [(0, _log.trace)(['color']), (0, _validateParams.default)(_schema.stringSchema)], _setToolTypeDecs = [(0, _log.trace)(['type']), (0, _validateParams.default)(_schema2.fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [(0, _log.trace)(['strokeWidth']), (0, _validateParams.default)(_schema2.numberSchema)], _setStrokeColorDecs = [(0, _log.trace)(['color']), (0, _validateParams.default)(_schema2.z.union([_schema2.colorSchema, _schema.stringSchema]))], _setTextColorDecs = [(0, _log.trace)(['color']), (0, _validateParams.default)(_schema2.colorSchema)], _setTextSizeDecs = [(0, _log.trace)(['textSize']), (0, _validateParams.default)(_schema2.numberSchema)], _insertImageDecs = [(0, _log.trace)(['resourceUrl', 'x', 'y', 'width', 'height']), (0, _validateParams.default)(_schema.stringSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema)], _setContainerSizeRatioDecs = [(0, _log.trace)(['ratio']), (0, _validateParams.default)(_schema2.numberSchema)], _setBoardTransparentDecs = [(0, _log.trace)(['isTransparent']), (0, _validateParams.default)(_schema2.booleanSchema)], _updateWindowSizeDecs = [(0, _log.trace)(['size']), (0, _validateParams.default)(_schema2.fcrSizeSchema)], _setAutoCancelDrawDecs = [(0, _log.trace)(['enable']), (0, _validateParams.default)(_schema2.booleanSchema)], _handleApplicationLaunchDecs = [_decorator.bound, (0, _log.trace)(['appId', 'app'])], _handleApplicationTerminalDecs = [_decorator.bound, (0, _log.trace)(['appId', 'app'])], _enableAutoCancelDecs = (0, _log.trace)(['enable']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrBoardMainWindowImpl'
+  }));
+  _observable = new _observable.AgoraObservable();
+  _currentPage = 0;
+  _background = 'rgba(0, 0, 0, 0)';
+  _isAutoCancelEnabled = false;
+  _isWritable = false;
   constructor(whiteboard, boardRoom, appId, _roomId, _userId, _api) {
-    (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);
-    (0, _defineProperty2.default)(this, "_isWritable", false);
     this._roomId = _roomId;
     this._userId = _userId;
     this._api = _api;
@@ -63,8 +59,8 @@ class FcrBoardMainWindowImpl {
     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._boardRoom = boardRoom;
@@ -74,17 +70,17 @@ 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}`);
   }
   internalSetWritable(isWritable) {
-    this.logger.info("internalSetWritable called, isWritable: ".concat(isWritable, ", previous state: ").concat(this._isWritable));
+    this.logger.info(`internalSetWritable called, isWritable: ${isWritable}, previous state: ${this._isWritable}`);
     this._boardRoom.setWritable(isWritable);
     this._isWritable = isWritable;
     this._observable.notifyObservers('onWritable', isWritable);
-    this.logger.info("Writable state updated to ".concat(isWritable));
+    this.logger.info(`Writable state updated to ${isWritable}`);
   }
   async setWritable(isWritable) {
-    this.logger.info("setWritable called, isWritable: ".concat(isWritable, ", current state: ").concat(this._isWritable));
+    this.logger.info(`setWritable called, isWritable: ${isWritable}, current state: ${this._isWritable}`);
     if (!this._api) {
       // api deops not exist in sub process, directly set writable state
       this.internalSetWritable(isWritable);
@@ -94,8 +90,8 @@ class FcrBoardMainWindowImpl {
       roomId: this._roomId,
       userId: this._userId,
       state: isWritable ? 1 : 0
-    }), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, "set whiteboard write permission to ".concat(isWritable, " failed"));
-    this.logger.info("Set writable to ".concat(isWritable, " successfully"));
+    }), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, `set whiteboard write permission to ${isWritable} failed`);
+    this.logger.info(`Set writable to ${isWritable} successfully`);
     this.internalSetWritable(isWritable);
     return _type.FcrReturnCode.SUCCESS;
   }
@@ -149,7 +145,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);
     return _type.FcrReturnCode.SUCCESS;
   }
@@ -185,7 +181,7 @@ class FcrBoardMainWindowImpl {
     return _type.FcrReturnCode.SUCCESS;
   }
   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 {
@@ -194,7 +190,7 @@ class FcrBoardMainWindowImpl {
     return _type.FcrReturnCode.SUCCESS;
   }
   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 {
@@ -262,7 +258,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);
@@ -277,19 +273,19 @@ 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);
     }
     return _type.FcrReturnCode.SUCCESS;
   }
   _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) {
@@ -303,9 +299,4 @@ class FcrBoardMainWindowImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onWritable', ['isWritable']], ['onPageInfoUpdated', ['info']], ['onUndoStateUpdated', ['enable']], ['onRedoStateUpdated', ['enable']]]));
   }
 }
-exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-_FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-var _applyDecs$e = _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"], [_handleApplicationLaunchDecs, 2, "_handleApplicationLaunch"], [_handleApplicationTerminalDecs, 2, "_handleApplicationTerminal"], [_enableAutoCancelDecs, 2, "_enableAutoCancel"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$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;
@@ -60,20 +60,21 @@ const getAnnotationConfigFromRoomProperties = (properties, logger) => {
   let boardWidth = 0;
   let boardHeight = 0;
   if (boardWidthVal !== 0 && boardHeightVal !== 0) {
-    var _resizeToMax = resizeToMax(boardWidthVal, boardHeightVal, FCR_ANNOTATION_SCALE_BASE);
-    boardWidth = _resizeToMax.width;
-    boardHeight = _resizeToMax.height;
+    ({
+      width: boardWidth,
+      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,
@@ -88,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),