fcr-core 3.8.0-alpha → 3.8.1-alpha

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");
@@ -30,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");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _appSlide = _interopRequireDefault(require("@netless/app-slide"));
 var _whiteWebSdk = require("white-web-sdk");
 var netlessVideoPlugin = _interopRequireWildcard(require("@netless/video-js-plugin"));
@@ -49,11 +43,8 @@ var _imports = require("../../imports");
 var _error = require("../../utilities/error");
 var _imports2 = require("agora-rte-sdk/lib/imports");
 var _type2 = require("../sharing-control/type");
-var _FcrWhiteboardControlImpl;
 let _initProto;
 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); }
@@ -63,18 +54,21 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
  * @internal
  */
 class FcrWhiteboardControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[[_decorator.bound, _imports.trace], 2, "active"], [[_decorator.bound, _imports.trace], 2, "inactive"], [[_decorator.bound, _imports.trace], 2, "open"], [[_decorator.bound, _imports.trace], 2, "close"], [[_decorator.bound, _imports.trace], 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"], [[_decorator.bound, _imports.trace], 2, "setOperationPrivilege"], [_imports.trace, 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;
+  }
+  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, "logger", (_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;
@@ -83,16 +77,14 @@ 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 _ref, _event$cause$data$wid2;
+        if (event.cause?.cmd === 10) {
           const {
             state,
             extra: {
               backgroundColor: bgColor
             }
-          } = (_ref = _scene.getScenePropertiesByKeyPath('widgets.netlessBoard')) !== null && _ref !== void 0 ? _ref : {
+          } = _scene.getScenePropertiesByKeyPath('widgets.netlessBoard') ?? {
             state: 0,
             extra: {
               backgroundColor: '#fff'
@@ -102,10 +94,9 @@ class FcrWhiteboardControlImpl {
             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 +113,7 @@ class FcrWhiteboardControlImpl {
   async inactive() {
     return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _type2.FcrSharePermissionState.OFF), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'inactive failed');
   }
-  async open() {
-    let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  async open(params = {}) {
     this._whiteboardPrivateParameters = params;
     // 白板权限禁用状态下，主持人和联席主持人仍然可以发起共享，所以，不能根据是否禁用状态直接拒绝
 
@@ -311,12 +301,11 @@ 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 cursorName = this._scene.getUser(userId)?.userName;
+      const syncMode = this._whiteboardPrivateParameters?.syncMode ?? false;
       const {
         data
       } = await this._getToken(roomId, userId);
@@ -327,7 +316,7 @@ class FcrWhiteboardControlImpl {
         boardToken
       } = data || {};
       const plugins = this._createPlugins();
-      this._client = new _whiteWebSdk.WhiteWebSdk(_objectSpread({
+      this._client = new _whiteWebSdk.WhiteWebSdk({
         appIdentifier: boardAppId,
         useMobXState: true,
         pptParams: {
@@ -341,8 +330,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,
@@ -364,7 +354,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))
         }
       };
@@ -376,7 +366,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;
@@ -435,6 +425,4 @@ class FcrWhiteboardControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onActive', 'onInactive', 'onBackgroundColorUpdated', 'onConnectionStateUpdated']));
   }
 }
-exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-_FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[[_decorator.bound, _imports.trace], 2, "active"], [[_decorator.bound, _imports.trace], 2, "inactive"], [[_decorator.bound, _imports.trace], 2, "open"], [[_decorator.bound, _imports.trace], 2, "close"], [[_decorator.bound, _imports.trace], 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"], [[_decorator.bound, _imports.trace], 2, "setOperationPrivilege"], [_imports.trace, 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;
+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,23 +1,21 @@
 "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 _logger = require("../../../utilities/logger");
 var _base = require("../base");
 var _constant = require("../constant");
 class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
+  logger = (0, _logger.createLogger)({
+    prefix: 'FcrAnnotationControlImpl'
+  });
   constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher) {
     super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
-    (0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
-      prefix: 'FcrAnnotationControlImpl'
-    }));
     this.rtmClient = rtmClient;
     this.config = config;
-    this.logger.info("initialized, hasOperationPrivilege: ".concat(hasOperationPrivilege));
+    this.logger.info(`initialized, hasOperationPrivilege: ${hasOperationPrivilege}`);
   }
   getApplicationId() {
     return _constant.ANNOTATION_APP_ID;

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

@@ -1,29 +1,24 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrAnnotationControlFactoryImpl = void 0;
-require("core-js/modules/es.error.cause.js");
 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");
 class FcrAnnotationControlFactoryImpl {
-  constructor() {
-    (0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
-      prefix: 'FcrAnnotationControlFactory'
-    }));
-  }
+  logger = (0, _logger.createLogger)({
+    prefix: 'FcrAnnotationControlFactory'
+  });
   createForSubProcess(rtmClient, hasOperationPrivilege, config) {
-    this.logger.info("[annotation]: create for sub process with config: ".concat(JSON.stringify(config)));
+    this.logger.info(`[annotation]: create for sub process with config: ${JSON.stringify(config)}`);
     return new _control.FcrStandaloneAnnotationControlImpl(rtmClient, config, hasOperationPrivilege, () => {
       const forgeInitConfig = (0, _sharedStorage.getAnnotationBoardOptions)();
       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);
     });

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,16 +17,11 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-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");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _forgeRtm = require("@netless/forge-rtm");
 var _imports = require("../../../imports");
 var _constant = require("../constant");
@@ -37,7 +31,6 @@ var _forgeWhiteboard = require("@netless/forge-whiteboard");
 var _error = require("../../../utilities/error");
 var _mainWindow = require("./main-window");
 var _type = require("../../../type");
-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 + ""; }
@@ -45,29 +38,32 @@ 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 FcrBaseWhiteboardControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "setOperationPrivilege"], [_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_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;
+  forgeInitConfig = null;
+  hasOperationPrivilege = false;
+  _waitPromise = null;
+  _waitPromiseResolve = null;
+  _waitPromiseReject = null;
+  _openAbortController = null;
+  _isOpen = false;
   constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher) {
-    (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, "forgeInitConfig", null);
-    (0, _defineProperty2.default)(this, "hasOperationPrivilege", false);
-    (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, "_isOpen", false);
     this.rtmClient = rtmClient;
     this.config = config;
     this.hasOperationPrivilege = hasOperationPrivilege;
     this.forgeInitConfigTask = _imports.AgoraScheduler.shared.addPollingTask(async () => {
       const forgeInitConfig = await forgeInitConfigFetcher();
       this.forgeInitConfig = forgeInitConfig;
-      this.logger.info("fetch forge init config success, config: ".concat((0, _imports.jsonstring)(forgeInitConfig)));
+      this.logger.info(`fetch forge init config success, config: ${(0, _imports.jsonstring)(forgeInitConfig)}`);
       this.forgeInitConfigTask.stop();
       if (this._isOpen) {
         this.connect();
@@ -159,7 +155,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() {
@@ -197,14 +193,14 @@ 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, ", whiteboardOption: ").concat((0, _imports.jsonstring)(whiteboardOption)));
+      this.logger.info(`open board with boardId: ${boardId}, boardToken: ${boardToken}, region: ${boardRegion}, whiteboardOption: ${(0, _imports.jsonstring)(whiteboardOption)}`);
       const rtmProvider = new _forgeRtm.RTMProvider_2_2(this.rtmClient);
       const wbRoom = new _forgeRoom.Room(boardId, rtmProvider);
       wbRoom.applicationManager.registerApplication(_forgeWhiteboard.WhiteboardApplication);
@@ -226,22 +222,21 @@ class FcrBaseWhiteboardControlImpl {
             }
             // verboseLog: true,
           };
-          this.logger.info("join params: ".concat((0, _imports.jsonstring)(joinRoomParams)));
+          this.logger.info(`join params: ${(0, _imports.jsonstring)(joinRoomParams)}`);
           await wbRoom.joinRoom(joinRoomParams);
           boardRoom = wbRoom;
           whiteboard = await wbRoom.applicationManager.launchApplication(_forgeWhiteboard.WhiteboardApplication, whiteboardOption, appId);
         }, [], {
           retriesMax: _constant.BOARD_RETRY_MAX
-        }).fail(async _ref => {
-          let {
-            error,
-            timeFn,
-            currentRetry
-          } = _ref;
+        }).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());
@@ -249,7 +244,7 @@ class FcrBaseWhiteboardControlImpl {
           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;
         }
         whiteboard.enableCameraByMouse = false;
@@ -272,7 +267,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) {
@@ -285,7 +280,7 @@ class FcrBaseWhiteboardControlImpl {
     });
   }
   getApplicationId() {
-    return '';
+    return _constant.WHITEBOARD_APP_ID;
   }
   getWhiteboardOption() {
     return {
@@ -312,6 +307,4 @@ class FcrBaseWhiteboardControlImpl {
     this._waitPromise = null;
   }
 }
-exports.FcrBaseWhiteboardControlImpl = FcrBaseWhiteboardControlImpl;
-_FcrBaseWhiteboardControlImpl = FcrBaseWhiteboardControlImpl;
-[_initProto] = _applyDecs(_FcrBaseWhiteboardControlImpl, [[_imports.trace, 2, "setOperationPrivilege"], [_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "getConnectionState"], [_imports.trace, 2, "getMainWindow"]], []).e;
+exports.FcrBaseWhiteboardControlImpl = FcrBaseWhiteboardControlImpl;