fcr-core 3.10.5 → 3.10.6

package/lib/room-control/whiteboard-control-v1/index.js

@@ -1,11 +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.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");
@@ -23,7 +19,6 @@ require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -31,8 +26,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.FcrWhiteboardControlImpl = void 0;
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _appSlide = _interopRequireDefault(require("@netless/app-slide"));
 var _appliancePlugin = require("@netless/appliance-plugin");
 var netlessVideoPlugin = _interopRequireWildcard(require("@netless/video-js-plugin"));
@@ -51,11 +44,8 @@ var _type2 = require("../sharing-control/type");
 var _type3 = require("../whiteboard-control/type");
 var _boardWindow = require("./board-window");
 var _utils = require("./utils");
-var _FcrWhiteboardControlImpl;
-let _initProto, _openDecs, _setBackgroundColorDecs, _setOperationPrivilegeDecs, _setBoardWritableDecs, _ref;
+let _initProto, _openDecs, _setBackgroundColorDecs, _setOperationPrivilegeDecs, _setBoardWritableDecs;
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-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; }
 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); }
@@ -64,20 +54,22 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
-_ref = (_openDecs = [_decorator.bound, (0, _imports.trace)(['params'])], _setBackgroundColorDecs = [_decorator.bound, (0, _imports.trace)(['backgroundColor'])], _setOperationPrivilegeDecs = [_decorator.bound, (0, _imports.trace)(['hasPrivilege'])], _setBoardWritableDecs = (0, _imports.trace)(['granted']), "logger");
 class FcrWhiteboardControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[[_decorator.bound, _imports.trace], 2, "active"], [[_decorator.bound, _imports.trace], 2, "inactive"], [_openDecs, 2, "open"], [[_decorator.bound, _imports.trace], 2, "close"], [[_decorator.bound, _imports.trace], 2, "release"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getActivity"], [[_decorator.bound, _imports.trace], 2, "getOwnerId"], [[_decorator.bound, _imports.trace], 2, "getBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getConnectionState"], [[_decorator.bound, _imports.trace], 2, "getMainWindow"], [[_decorator.bound, _imports.trace], 2, "addObserver"], [[_decorator.bound, _imports.trace], 2, "removeObserver"], [[_decorator.bound, _imports.trace], 2, "getBoardActiveInfo"], [[_decorator.bound, _imports.trace], 2, "hasOperationPrivilege"], [_setOperationPrivilegeDecs, 2, "setOperationPrivilege"], [_setBoardWritableDecs, 2, "_setBoardWritable"], [_decorator.bound, 2, "_getToken"], [_decorator.bound, 2, "_handleRoomStateUpdated"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_handleConnectionStateUpdated"], [_imports.trace, 2, "_connect"], [_imports.trace, 2, "_clean"]], []).e;
+  }
+  [(_openDecs = [_decorator.bound, (0, _imports.trace)(['params'])], _setBackgroundColorDecs = [_decorator.bound, (0, _imports.trace)(['backgroundColor'])], _setOperationPrivilegeDecs = [_decorator.bound, (0, _imports.trace)(['hasPrivilege'])], _setBoardWritableDecs = (0, _imports.trace)(['granted']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrWhiteboardControlImpl'
+  }));
+  _client = {};
+  _joined = false;
+  _connectState = _2.FcrConnectionState.DISCONNECTED;
+  _observable = new _observable.AgoraObservable();
+  _options = {
+    debug: false
+  };
+  _hasOperationPrivilege = false;
   constructor(_scene, _api, _sharedCache, hasOperationPrivilege) {
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrWhiteboardControlImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_client", {});
-    (0, _defineProperty2.default)(this, "_joined", false);
-    (0, _defineProperty2.default)(this, "_connectState", _2.FcrConnectionState.DISCONNECTED);
-    (0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_options", {
-      debug: false
-    });
-    (0, _defineProperty2.default)(this, "_hasOperationPrivilege", false);
     this._scene = _scene;
     this._api = _api;
     this._sharedCache = _sharedCache;
@@ -86,26 +78,26 @@ class FcrWhiteboardControlImpl {
     this._addLogObserver();
     _scene.addObserver({
       onScenePropertiesUpdated: (_, event) => {
-        var _event$cause;
         const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
-        if (((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.cmd) === 10) {
-          var _ref3, _event$cause$data$wid2;
-          const _ref2 = (_ref3 = _scene.getScenePropertiesByKeyPath('widgets.netlessBoard')) !== null && _ref3 !== void 0 ? _ref3 : {
-              state: 0,
-              extra: {
-                backgroundColor: '#fff'
-              }
-            },
-            state = _ref2.state,
-            bgColor = _ref2.extra.backgroundColor;
+        if (event.cause?.cmd === 10) {
+          const {
+            state,
+            extra: {
+              backgroundColor: bgColor
+            }
+          } = _scene.getScenePropertiesByKeyPath('widgets.netlessBoard') ?? {
+            state: 0,
+            extra: {
+              backgroundColor: '#fff'
+            }
+          };
           if (state === 1) {
             this._observable.notifyObservers('onActive', _scene.getScenePropertiesByKeyPath('widgets.netlessBoard').ownerUserUuid, operatorUser);
           }
           if (state === 0) {
-            var _event$cause$data$wid;
-            this._observable.notifyObservers('onInactive', (_event$cause$data$wid = event.cause.data.widgetCause) === null || _event$cause$data$wid === void 0 || (_event$cause$data$wid = _event$cause$data$wid.data) === null || _event$cause$data$wid === void 0 ? void 0 : _event$cause$data$wid.reason, operatorUser);
+            this._observable.notifyObservers('onInactive', event.cause.data.widgetCause?.data?.reason, operatorUser);
           }
-          if (((_event$cause$data$wid2 = event.cause.data.widgetCause) === null || _event$cause$data$wid2 === void 0 ? void 0 : _event$cause$data$wid2.cmd) === 100101) {
+          if (event.cause.data.widgetCause?.cmd === 100101) {
             this._observable.notifyObservers('onBackgroundColorUpdated', bgColor, operatorUser);
           }
         }
@@ -122,8 +114,7 @@ class FcrWhiteboardControlImpl {
   async inactive() {
     return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _type2.FcrSharePermissionState.OFF), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'inactive failed');
   }
-  async open() {
-    let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  async open(params = {}) {
     this._whiteboardPrivateParameters = params;
     // 白板权限禁用状态下，主持人和联席主持人仍然可以发起共享，所以，不能根据是否禁用状态直接拒绝
 
@@ -174,12 +165,13 @@ class FcrWhiteboardControlImpl {
     return _type.FcrReturnCode.SUCCESS;
   }
   getBoardActiveInfo() {
-    const _ref4 = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard') || {
-        isActive: false,
-        ownerUserUuid: null
-      },
-      state = _ref4.state,
-      ownerUserId = _ref4.ownerUserUuid;
+    const {
+      state,
+      ownerUserUuid: ownerUserId
+    } = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard') || {
+      isActive: false,
+      ownerUserUuid: null
+    };
     if (state === _type3.FcrBoardPropertiesState.ACTIVE) {
       return {
         isActive: true,
@@ -248,25 +240,23 @@ class FcrWhiteboardControlImpl {
     }), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'get whiteboard token failed');
   }
   _handleRoomStateUpdated(state) {
-    const memberState = state.memberState;
+    const {
+      memberState
+    } = state;
     if (memberState) {
-      const strokeColor = memberState.strokeColor,
-        strokeWidth = memberState.strokeWidth,
-        currentApplianceName = memberState.currentApplianceName,
-        textSize = memberState.textSize,
-        shapeType = memberState.shapeType;
+      const {
+        strokeColor,
+        strokeWidth,
+        currentApplianceName,
+        textSize,
+        shapeType
+      } = memberState;
       const localState = {};
-      const _convertToFcrBoardToo = (0, _utils.convertToFcrBoardToolShape)(currentApplianceName, shapeType),
-        _convertToFcrBoardToo2 = (0, _slicedToArray2.default)(_convertToFcrBoardToo, 2),
-        tool = _convertToFcrBoardToo2[0],
-        shape = _convertToFcrBoardToo2[1];
+      const [tool, shape] = (0, _utils.convertToFcrBoardToolShape)(currentApplianceName, shapeType);
       localState.tool = tool;
       localState.shape = shape;
       if (typeof strokeColor !== 'undefined') {
-        const _strokeColor = (0, _slicedToArray2.default)(strokeColor, 3),
-          r = _strokeColor[0],
-          g = _strokeColor[1],
-          b = _strokeColor[2];
+        const [r, g, b] = strokeColor;
         localState.strokeColor = {
           r,
           g,
@@ -322,21 +312,22 @@ class FcrWhiteboardControlImpl {
   }
   async _connect() {
     try {
-      var _this$_scene$getUser, _this$_whiteboardPriv, _this$_whiteboardPriv2, _this$_whiteboardPriv3, _this$_whiteboardPriv4;
       this._updateConnnectionState(_2.FcrConnectionState.CONNECTING);
       const roomId = this._scene.sceneId;
       const userId = this._scene.localUser.getLocalUserId();
-      const cursorName = (_this$_scene$getUser = this._scene.getUser(userId)) === null || _this$_scene$getUser === void 0 ? void 0 : _this$_scene$getUser.userName;
-      const syncMode = (_this$_whiteboardPriv = (_this$_whiteboardPriv2 = this._whiteboardPrivateParameters) === null || _this$_whiteboardPriv2 === void 0 ? void 0 : _this$_whiteboardPriv2.syncMode) !== null && _this$_whiteboardPriv !== void 0 ? _this$_whiteboardPriv : false;
-      const _await$this$_getToken = await this._getToken(roomId, userId),
-        data = _await$this$_getToken.data;
-      const _ref5 = data || {},
-        boardAppId = _ref5.boardAppId,
-        boardId = _ref5.boardId,
-        boardRegion = _ref5.boardRegion,
-        boardToken = _ref5.boardToken;
+      const cursorName = this._scene.getUser(userId)?.userName;
+      const syncMode = this._whiteboardPrivateParameters?.syncMode ?? false;
+      const {
+        data
+      } = await this._getToken(roomId, userId);
+      const {
+        boardAppId,
+        boardId,
+        boardRegion,
+        boardToken
+      } = data || {};
       const plugins = this._createPlugins();
-      this._client = new _whiteWebSdk.WhiteWebSdk(_objectSpread({
+      this._client = new _whiteWebSdk.WhiteWebSdk({
         appIdentifier: boardAppId,
         useMobXState: true,
         pptParams: {
@@ -350,8 +341,9 @@ class FcrWhiteboardControlImpl {
           reportDebugLogMode: _whiteWebSdk.LoggerReportMode.AlwaysReport,
           reportLevelMask: this._options.debug ? 'debug' : 'info',
           printLevelMask: this._options.debug ? 'debug' : 'info'
-        }
-      }, this._whiteboardPrivateParameters));
+        },
+        ...this._whiteboardPrivateParameters
+      });
       const hasPermission = this._hasOperationPrivilege;
       const joinParams = {
         region: boardRegion,
@@ -373,7 +365,7 @@ class FcrWhiteboardControlImpl {
           cursorName,
           disappearCursor: true
         },
-        floatBar: (_this$_whiteboardPriv3 = (_this$_whiteboardPriv4 = this._whiteboardPrivateParameters) === null || _this$_whiteboardPriv4 === void 0 ? void 0 : _this$_whiteboardPriv4.floatBar) !== null && _this$_whiteboardPriv3 !== void 0 ? _this$_whiteboardPriv3 : {
+        floatBar: this._whiteboardPrivateParameters?.floatBar ?? {
           colors: _utils.textColors.map(color => (0, _utils.hexColorToWhiteboardColor)(color))
         }
       };
@@ -385,7 +377,7 @@ class FcrWhiteboardControlImpl {
       if (hasPermission) {
         room.setViewMode(_whiteWebSdk.ViewMode.Broadcaster);
       }
-      this.logger.info("set whiteboard sync mode: ".concat(syncMode));
+      this.logger.info(`set whiteboard sync mode: ${syncMode}`);
       room.syncMode = syncMode;
       const mountOptions = {};
       const privateParams = this._whiteboardPrivateParameters;
@@ -445,9 +437,4 @@ class FcrWhiteboardControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onActive', ['ownerId', 'operatorUser']], ['onInactive', ['reason', 'operatorUser']], ['onBackgroundColorUpdated', ['color', 'operatorUser']], ['onConnectionStateUpdated', ['state']]]));
   }
 }
-exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-_FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-var _applyDecs$e = _applyDecs(_FcrWhiteboardControlImpl, [[[_decorator.bound, _imports.trace], 2, "active"], [[_decorator.bound, _imports.trace], 2, "inactive"], [_openDecs, 2, "open"], [[_decorator.bound, _imports.trace], 2, "close"], [[_decorator.bound, _imports.trace], 2, "release"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getActivity"], [[_decorator.bound, _imports.trace], 2, "getOwnerId"], [[_decorator.bound, _imports.trace], 2, "getBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getConnectionState"], [[_decorator.bound, _imports.trace], 2, "getMainWindow"], [[_decorator.bound, _imports.trace], 2, "addObserver"], [[_decorator.bound, _imports.trace], 2, "removeObserver"], [[_decorator.bound, _imports.trace], 2, "getBoardActiveInfo"], [[_decorator.bound, _imports.trace], 2, "hasOperationPrivilege"], [_setOperationPrivilegeDecs, 2, "setOperationPrivilege"], [_setBoardWritableDecs, 2, "_setBoardWritable"], [_decorator.bound, 2, "_getToken"], [_decorator.bound, 2, "_handleRoomStateUpdated"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_handleConnectionStateUpdated"], [_imports.trace, 2, "_connect"], [_imports.trace, 2, "_clean"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;

package/lib/room-control/whiteboard-control-v1/mount-manager.js

@@ -1,15 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BoardMountManager = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 class BoardMountManager {
+  static isMounting = false;
   static setIsMounting(isMounting) {
     BoardMountManager.isMounting = isMounting;
   }
 }
-exports.BoardMountManager = BoardMountManager;
-(0, _defineProperty2.default)(BoardMountManager, "isMounting", false);
+exports.BoardMountManager = BoardMountManager;

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

@@ -5,9 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.windowClassName = exports.widgetContainerClassName = exports.videoRowClassName = exports.verticalPadding = exports.toolbarClassName = exports.textColors = exports.src2DataURL = exports.sceneNavHeight = exports.mergeCanvasImage = exports.mediaMimeTypes = exports.layoutContentClassName = exports.hexColorToWhiteboardColor = exports.heightPerTool = exports.heightPerColor = exports.getImageSize = exports.fetchImageInfoByUrl = exports.defaultToolsRetain = exports.defaultTextSize = exports.defaultStrokeColor = exports.convertToNetlessStorkeType = exports.convertToNetlessBoardTool = exports.convertToFcrBoardToolShape = exports.WINDOW_TITLE_HEIGHT = exports.WINDOW_REMAIN_SIZE = exports.WINDOW_REMAIN_POSITION = exports.WINDOW_MIN_SIZE = exports.WINDOW_ASPECT_RATIO = void 0;
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.string.replace.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _jsMd = require("js-md5");
 var _enum = require("./enum");
 var _appliancePlugin = require("@netless/appliance-plugin");
@@ -134,8 +131,8 @@ const mergeCanvasImage = async scenes => {
       canvasArray.push(canvas);
     }
   }
-  bigCanvas.setAttribute('width', "".concat(width));
-  bigCanvas.setAttribute('height', "".concat(height * canvasArray.length));
+  bigCanvas.setAttribute('width', `${width}`);
+  bigCanvas.setAttribute('height', `${height * canvasArray.length}`);
   canvasArray.forEach((canvas, index) => {
     ctx && ctx.drawImage(canvas, 0, index * height, width, height);
   });
@@ -233,22 +230,22 @@ const convertToFcrBoardToolShape = (tool, shape) => {
     case _enum.ApplianceNames.hand:
       return [_enum.FcrBoardToolType.HAND];
   }
-  switch ("".concat(tool || '').concat(shape || '')) {
-    case "".concat(_enum.ApplianceNames.rectangle):
+  switch (`${tool || ''}${shape || ''}`) {
+    case `${_enum.ApplianceNames.rectangle}`:
       return [, _enum.FcrBoardShape.Rectangle];
-    case "".concat(_enum.ApplianceNames.ellipse):
+    case `${_enum.ApplianceNames.ellipse}`:
       return [, _enum.FcrBoardShape.Ellipse];
-    case "".concat(_enum.ApplianceNames.straight):
+    case `${_enum.ApplianceNames.straight}`:
       return [, _enum.FcrBoardShape.Straight];
-    case "".concat(_enum.ApplianceNames.arrow):
+    case `${_enum.ApplianceNames.arrow}`:
       return [, _enum.FcrBoardShape.Arrow];
-    case "".concat(_enum.ApplianceNames.pencil):
+    case `${_enum.ApplianceNames.pencil}`:
       return [, _enum.FcrBoardShape.Curve];
-    case "".concat(_enum.ApplianceNames.shape).concat(_enum.ShapeType.Triangle):
+    case `${_enum.ApplianceNames.shape}${_enum.ShapeType.Triangle}`:
       return [, _enum.FcrBoardShape.Triangle];
-    case "".concat((_enum.ApplianceNames.shape, _enum.ShapeType.Pentagram)):
+    case `${_enum.ApplianceNames.shape, _enum.ShapeType.Pentagram}`:
       return [, _enum.FcrBoardShape.Pentagram];
-    case "".concat(_enum.ApplianceNames.shape).concat(_enum.ShapeType.Rhombus):
+    case `${_enum.ApplianceNames.shape}${_enum.ShapeType.Rhombus}`:
       return [, _enum.FcrBoardShape.Rhombus];
   }
   return [];
@@ -275,9 +272,9 @@ const src2DataURL = src => {
     const ctx = canvas.getContext('2d');
     const image = new Image();
     image.onload = () => {
-      canvas.setAttribute('width', "".concat(image.width));
-      canvas.setAttribute('height', "".concat(image.height));
-      ctx === null || ctx === void 0 || ctx.drawImage(image, 0, 0);
+      canvas.setAttribute('width', `${image.width}`);
+      canvas.setAttribute('height', `${image.height}`);
+      ctx?.drawImage(image, 0, 0);
       resolve(canvas.toDataURL('image/jpeg', 0.8));
     };
     image.onerror = () => {

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

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrStandaloneAnnotationControlImpl = exports.FcrAnnotationControlImpl = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _error = require("../../../utilities/error");
 var _logger = require("../../../utilities/logger");
 var _base = require("../base");
@@ -18,22 +16,20 @@ const addBoardConnectingObserver = (board, sceneConfig) => {
     onConnectionStateUpdated: state => {
       if (state === _type2.AgoraRteConnectionState.CONNECTED) {
         if (sceneConfig.isAndroidByOwner()) {
-          var _board$getMainWindow;
-          (_board$getMainWindow = board.getMainWindow()) === null || _board$getMainWindow === void 0 || _board$getMainWindow.setAutoCancelDraw(true);
+          board.getMainWindow()?.setAutoCancelDraw(true);
         } else {
-          var _board$getMainWindow2;
-          (_board$getMainWindow2 = board.getMainWindow()) === null || _board$getMainWindow2 === void 0 || _board$getMainWindow2.setAutoCancelDraw(false);
+          board.getMainWindow()?.setAutoCancelDraw(false);
         }
       }
     }
   });
 };
 class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
+  logger = (0, _logger.createLogger)({
+    prefix: 'FcrAnnotationControlImpl'
+  });
   constructor(rtmClient, config, forgeInitConfigFetcher, _sceneConfig, _api) {
     super(rtmClient, config, forgeInitConfigFetcher, _api);
-    (0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
-      prefix: 'FcrAnnotationControlImpl'
-    }));
     this.rtmClient = rtmClient;
     this.config = config;
     this._sceneConfig = _sceneConfig;
@@ -47,7 +43,7 @@ class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
     } catch (e) {
       const error = e;
       const errorMessage = error.message;
-      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, "sync screen share owner annotation open done failed: ".concat(errorMessage), errorMessage);
+      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `sync screen share owner annotation open done failed: ${errorMessage}`, errorMessage);
     }
   }
   async syncWhiteboardWriteCount(isWritable) {
@@ -55,7 +51,7 @@ class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
       roomId: this.config.roomId,
       userId: this.config.userId,
       state: isWritable ? 1 : 0
-    }), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, "set whiteboard write permission to ".concat(isWritable, " failed"));
+    }), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, `set whiteboard write permission to ${isWritable} failed`);
     return 0;
   }
   async open() {
@@ -82,11 +78,11 @@ class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
 }
 exports.FcrAnnotationControlImpl = FcrAnnotationControlImpl;
 class FcrStandaloneAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
+  logger = (0, _logger.createLogger)({
+    prefix: 'FcrStandaloneAnnotationControlImpl'
+  });
   constructor(rtmClient, config, forgeInitConfigFetcher, _sceneConfig) {
     super(rtmClient, config, forgeInitConfigFetcher);
-    (0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
-      prefix: 'FcrStandaloneAnnotationControlImpl'
-    }));
     this.rtmClient = rtmClient;
     this.config = config;
     this._sceneConfig = _sceneConfig;

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

@@ -1,35 +1,25 @@
 "use strict";
 
-require("core-js/modules/es.array.push.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");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrAnnotationControlFactoryImpl = void 0;
 require("core-js/modules/es.json.stringify.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _control = require("./control");
 var _logger = require("../../../utilities/logger");
 var _error = require("../../../utilities/error");
 var _sharedStorage = require("../../../utilities/shared-storage");
 var _imports = require("../../../imports");
-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; }
 class FcrAnnotationControlFactoryImpl {
-  constructor() {
-    (0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
-      prefix: 'FcrAnnotationControlFactory'
-    }));
-  }
+  logger = (0, _logger.createLogger)({
+    prefix: 'FcrAnnotationControlFactory'
+  });
   createForSubProcess(rtmClient, config, annotationSceneConfig) {
-    this.logger.info("create for sub process with config: ".concat(JSON.stringify(config)));
+    this.logger.info(`create for sub process with config: ${JSON.stringify(config)}`);
     return new _control.FcrStandaloneAnnotationControlImpl(rtmClient, config, () => {
       const forgeInitConfig = (0, _sharedStorage.getAnnotationBoardOptions)();
       if (!forgeInitConfig) {
-        throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.UNDEFINED_ERROR, "whiteboard init config is not exist");
+        throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.UNDEFINED_ERROR, `whiteboard init config is not exist`);
       }
       return Promise.resolve(forgeInitConfig);
     }, annotationSceneConfig);
@@ -48,9 +38,10 @@ class FcrAnnotationControlFactoryImpl {
     };
     return async () => {
       const response = await getObjectInitConfig(roomId, userId);
-      return _objectSpread(_objectSpread({}, response.data), {}, {
+      return {
+        ...response.data,
         boardPerformance
-      });
+      };
     };
   }
 }