fcr-core 3.7.8 → 3.7.9-alpha

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

@@ -1,12 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -22,63 +17,57 @@ 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.FcrAnnotationControlFactoryImpl = void 0;
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _control = require("./control");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("../../../utilities/logger");
 var _privilegeControl2 = require("./privilege-control");
 var _utils = require("../utils");
-var _FcrAnnotationControlFactoryImpl;
 let _initProto;
-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); }
 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 FcrAnnotationControlFactoryImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_decorator.bound, 2, "_getBoardConfigInfoWithScene"]], []).e;
+  }
+  logger = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrAnnotationControlFactory'
+  }));
   constructor(_rtmClient, _scene, _streamControl, _userControl, _privilegeControl, _api) {
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrAnnotationControlFactory'
-    })));
     this._rtmClient = _rtmClient;
     this._scene = _scene;
     this._streamControl = _streamControl;
     this._userControl = _userControl;
     this._privilegeControl = _privilegeControl;
     this._api = _api;
-    this.logger.info("[annotation]: constructor initialized");
+    this.logger.info(`[annotation]: constructor initialized`);
   }
   createForSubProcess(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.FcrAnnotationControlImpl(this._rtmClient, config);
   }
   createForMainProcess() {
-    this.logger.info("[annotation]: start create for main process");
+    this.logger.info(`[annotation]: start create for main process`);
     const config = this._getBoardConfigInfoWithScene();
-    this.logger.info("[annotation]: create for main process with config: ".concat(JSON.stringify(config)));
+    this.logger.info(`[annotation]: create for main process with config: ${JSON.stringify(config)}`);
     const control = new _privilegeControl2.FcrPrivilegedAnnotationControlImpl(this._rtmClient, config, this._scene, this._streamControl, this._userControl, this._privilegeControl, this._api);
     return control;
   }
   _getBoardConfigInfoWithScene() {
-    var _this$_userControl;
     const roomProperties = this._scene.getSceneProperties();
-    const localUser = (_this$_userControl = this._userControl) === null || _this$_userControl === void 0 ? void 0 : _this$_userControl.getLocalUser();
+    const localUser = this._userControl?.getLocalUser();
     const annotationConfig = (0, _utils.getAnnotationConfigFromRoomProperties)(roomProperties, this.logger);
-    return _objectSpread({
+    return {
       userId: localUser.userId,
-      nickName: localUser.userName
-    }, annotationConfig);
+      nickName: localUser.userName,
+      ...annotationConfig
+    };
   }
 }
-exports.FcrAnnotationControlFactoryImpl = FcrAnnotationControlFactoryImpl;
-_FcrAnnotationControlFactoryImpl = FcrAnnotationControlFactoryImpl;
-[_initProto] = _applyDecs(_FcrAnnotationControlFactoryImpl, [[_decorator.bound, 2, "_getBoardConfigInfoWithScene"]], []).e;
+exports.FcrAnnotationControlFactoryImpl = FcrAnnotationControlFactoryImpl;

package/lib/room-control/whiteboard-control-v2/annotation-control/privilege-control.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,18 +17,13 @@ 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.FcrPrivilegedAnnotationControlImpl = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.some.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("../../../type");
 var _control = require("./control");
 var _forgeWhiteboard = require("@netless/forge-whiteboard");
@@ -38,7 +32,6 @@ var _imports = require("../../../imports");
 var _error = require("../../../utilities/error");
 var _logger = require("../../../utilities/logger");
 var _utils = require("../utils");
-var _FcrPrivilegedAnnotationControlImpl;
 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 + ""; }
@@ -46,52 +39,55 @@ 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 FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlImpl {
-  constructor(rtmClient, config, _scene, _streamControl, _userControl, _privilegeControl, _api) {
-    super(rtmClient, config);
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrPrivilegedAnnotationControlImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_isOpen", false);
-    (0, _defineProperty2.default)(this, "_waitPromise", null);
-    (0, _defineProperty2.default)(this, "_waitPromiseResolve", null);
-    (0, _defineProperty2.default)(this, "_waitPromiseReject", null);
-    (0, _defineProperty2.default)(this, "_privilegeObserver", {
-      onLocalUserPermissionInfoAdded: (roomId, event) => {
-        if (this._hasBoardWritePermission(event)) {
-          this.logger.info("add board write permission");
-          const whiteboard = this.annotation;
-          if (whiteboard) {
-            whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
-          } else {
-            this.logger.warn('whiteboard is not initialized yet, should add permission when application launched');
-          }
+  static {
+    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "syncScreenShareOwnerAnnotationOpenDone"], [[_imports.bound, _imports.trace], 2, "_handleApplicationLaunch"], [[_imports.bound, _imports.trace], 2, "_handleApplicationTerminal"]], [], 0, void 0, _control.FcrAnnotationControlImpl).e;
+  }
+  logger = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrPrivilegedAnnotationControlImpl'
+  }));
+  _isOpen = false;
+  _waitPromise = null;
+  _waitPromiseResolve = null;
+  _waitPromiseReject = null;
+  _privilegeObserver = {
+    onLocalUserPermissionInfoAdded: (roomId, event) => {
+      if (this._hasBoardWritePermission(event)) {
+        this.logger.info(`add board write permission`);
+        const whiteboard = this.annotation;
+        if (whiteboard) {
+          whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+        } else {
+          this.logger.warn('whiteboard is not initialized yet, should add permission when application launched');
         }
-      },
-      onLocalUserPermissionInfoDeleted: (roomId, event) => {
-        if (this._hasBoardWritePermission(event)) {
-          this.logger.info("remove board write permission");
-          const whiteboard = this.annotation;
-          if (whiteboard) {
-            whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
-          } else {
-            this.logger.warn('whiteboard is not initialized yet, should remove permission when application launched');
-          }
+      }
+    },
+    onLocalUserPermissionInfoDeleted: (roomId, event) => {
+      if (this._hasBoardWritePermission(event)) {
+        this.logger.info(`remove board write permission`);
+        const whiteboard = this.annotation;
+        if (whiteboard) {
+          whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+        } else {
+          this.logger.warn('whiteboard is not initialized yet, should remove permission when application launched');
         }
       }
-    });
-    (0, _defineProperty2.default)(this, "_sceneObserver", {
-      onScenePropertiesUpdated: async (sceneId, event) => {
-        const hasKey = Object.keys(event.changedProperties).some(changeKey => {
-          return changeKey === 'widgets.annotation.extra.boardAppId';
-        });
-        if (hasKey) {
-          this.logger.info('widgets.annotation.extra.boardAppId updated, re-initializing annotation info');
-          if (this._isOpen && (await this._checkForConnect())) {
-            this._connect();
-          }
+    }
+  };
+  _sceneObserver = {
+    onScenePropertiesUpdated: async (sceneId, event) => {
+      const hasKey = Object.keys(event.changedProperties).some(changeKey => {
+        return changeKey === 'widgets.annotation.extra.boardAppId';
+      });
+      if (hasKey) {
+        this.logger.info('widgets.annotation.extra.boardAppId updated, re-initializing annotation info');
+        if (this._isOpen && (await this._checkForConnect())) {
+          this._connect();
         }
       }
-    });
+    }
+  };
+  constructor(rtmClient, config, _scene, _streamControl, _userControl, _privilegeControl, _api) {
+    super(rtmClient, config);
     this._scene = _scene;
     this._streamControl = _streamControl;
     this._userControl = _userControl;
@@ -100,7 +96,7 @@ class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlIm
     this._config = config;
     this._privilegeControl.addObserver(this._privilegeObserver);
     this._scene.addObserver(this._sceneObserver);
-    this.logger.info("initialized, config: ".concat(JSON.stringify(config)));
+    this.logger.info(`initialized, config: ${JSON.stringify(config)}`);
   }
   addObserver(observer) {
     this.observable.addObserver(observer);
@@ -110,7 +106,7 @@ class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlIm
   }
   async open() {
     this._isOpen = true;
-    this.logger.info("open privileged annotation control with config: ".concat((0, _imports.jsonstring)(this._config)));
+    this.logger.info(`open privileged annotation control with config: ${(0, _imports.jsonstring)(this._config)}`);
     const isReadyToConnect = await this._checkForConnect();
     if (isReadyToConnect) {
       return this._connect();
@@ -138,7 +134,7 @@ class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlIm
     } catch (e) {
       const error = e;
       const errorMessage = error.message;
-      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, "sync screen share owner annotation open done failed: ".concat(errorMessage), error);
+      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `sync screen share owner annotation open done failed: ${errorMessage}`, error);
     }
   }
   updateConnnectionState(state) {
@@ -166,13 +162,12 @@ class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlIm
       const stream = this._streamControl.getStreamList().find(stream => stream.videoSourceType === _type.FcrVideoSourceType.SCREEN);
       const localUserId = this._userControl.getLocalUser().userId;
       if (stream) {
-        var _this$_userControl$ge;
         const ownerId = stream.owner.userId;
         const isNotMeSharing = ownerId !== localUserId;
-        const platform = (_this$_userControl$ge = this._userControl.getUser(ownerId)) === null || _this$_userControl$ge === void 0 ? void 0 : _this$_userControl$ge.platform;
+        const platform = this._userControl.getUser(ownerId)?.platform;
         const isPcPlatform = platform && [_type.FcrPlatform.WEB_DESKTOP, _type.FcrPlatform.WINDOWS, _type.FcrPlatform.MACOS].includes(platform);
         const isAndroidPlatform = platform && platform === _type.FcrPlatform.ANDROID;
-        this.logger.debug("isPcPlatform: ".concat(isPcPlatform, ", isAndroidPlatform: ").concat(isAndroidPlatform, ", isNotMeSharing: ").concat(isNotMeSharing, ", ownerId: ").concat(ownerId, ", localUserId: ").concat(localUserId, ", platform: ").concat(platform));
+        this.logger.debug(`isPcPlatform: ${isPcPlatform}, isAndroidPlatform: ${isAndroidPlatform}, isNotMeSharing: ${isNotMeSharing}, ownerId: ${ownerId}, localUserId: ${localUserId}, platform: ${platform}`);
         if (isPcPlatform) {
           mainWindow.setAutoCancelDraw(false);
         }
@@ -211,10 +206,7 @@ class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlIm
     return promise;
   }
   _hasBoardWritePermission(event) {
-    const hasPermissionNow = event.permissionInfo.some(perm => {
-      var _perm$info;
-      return ((_perm$info = perm.info) === null || _perm$info === void 0 ? void 0 : _perm$info.action) === _type.FcrPermissionAction.BoardWrite;
-    });
+    const hasPermissionNow = event.permissionInfo.some(perm => perm.info?.action === _type.FcrPermissionAction.BoardWrite);
     return hasPermissionNow;
   }
   async _checkForConnect() {
@@ -222,7 +214,7 @@ class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlIm
     const userId = this._scene.localUser.getLocalUserId();
     const boardOptions = (await this._getToken(roomId, userId)).data;
     if (boardOptions && boardOptions.boardAppId) {
-      this.logger.info("board options found, ready to connect: ".concat((0, _imports.jsonstring)(boardOptions)));
+      this.logger.info(`board options found, ready to connect: ${(0, _imports.jsonstring)(boardOptions)}`);
       if (this.annotationConfig) {
         this.annotationConfig.extra = this.annotationConfig.extra || {};
         this.annotationConfig.extra.boardAppId = boardOptions.boardAppId;
@@ -233,7 +225,7 @@ class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlIm
         const annotationConfig = (0, _utils.getAnnotationConfigFromRoomProperties)(roomProperties, this.logger);
         this.annotationConfig.size.width = annotationConfig.size.width;
         this.annotationConfig.size.height = annotationConfig.size.height;
-        this.logger.info("update annotation config, config: ".concat((0, _imports.jsonstring)(this.annotationConfig)));
+        this.logger.info(`update annotation config, config: ${(0, _imports.jsonstring)(this.annotationConfig)}`);
       }
       return true;
     }
@@ -257,6 +249,4 @@ class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlIm
     this.annotation = app;
   }
 }
-exports.FcrPrivilegedAnnotationControlImpl = FcrPrivilegedAnnotationControlImpl;
-_FcrPrivilegedAnnotationControlImpl = FcrPrivilegedAnnotationControlImpl;
-[_initProto] = _applyDecs(_FcrPrivilegedAnnotationControlImpl, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "syncScreenShareOwnerAnnotationOpenDone"], [[_imports.bound, _imports.trace], 2, "_handleApplicationLaunch"], [[_imports.bound, _imports.trace], 2, "_handleApplicationTerminal"]], [], 0, void 0, _control.FcrAnnotationControlImpl).e;
+exports.FcrPrivilegedAnnotationControlImpl = FcrPrivilegedAnnotationControlImpl;

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

@@ -1,7 +1,5 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.map.delete-all.js");
@@ -24,9 +22,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrWhiteboardControlImpl = void 0;
-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 _enums = require("../whiteboard-control/enums");
 var _forgeRoom = require("@netless/forge-room");
 var _forgeWhiteboard = require("@netless/forge-whiteboard");
@@ -43,23 +38,24 @@ var _validateParams = _interopRequireDefault(require("../../utilities/validate-p
 var _schema = require("../../schema");
 var _type2 = require("./whiteboard-control/type");
 var _packageInfo = require("../../utilities/package-info");
-var _FcrWhiteboardControlImpl;
-let _initProto, _setBackgroundColorDecs, _ref;
+let _initProto, _setBackgroundColorDecs;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
-_ref = (_setBackgroundColorDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger");
 class FcrWhiteboardControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "active"], [_imports.trace, 2, "inactive"], [[_imports.bound, _imports.trace], 2, "getConnectionState"], [[_imports.bound, _imports.trace], 2, "getMainWindow"], [_imports.bound, 2, "getBoardActiveInfo"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_imports.bound, _imports.trace], 2, "getBackgroundColor"], [[_imports.bound, _imports.trace], 2, "getActivity"], [[_imports.bound, _imports.trace], 2, "getOwnerId"], [_imports.bound, 2, "_notifyObservers"], [_imports.bound, 2, "_updateConnnectionState"], [_imports.bound, 2, "_getToken"]], []).e;
+  }
+  [(_setBackgroundColorDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrWhiteboardControlImpl'
+  }));
+  _observable = new _observable.AgoraObservable();
+  _connectState = _type.FcrConnectionState.DISCONNECTED;
+  _needRetry = true;
+  _FORGE_WHITEBOARD_APP_ID = 'MainWhiteboard';
   constructor(_scene, _api, _engine, _sharedCache) {
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrWhiteboardControlImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_connectState", _type.FcrConnectionState.DISCONNECTED);
-    (0, _defineProperty2.default)(this, "_needRetry", true);
-    (0, _defineProperty2.default)(this, "_FORGE_WHITEBOARD_APP_ID", 'MainWhiteboard');
     this._scene = _scene;
     this._api = _api;
     this._engine = _engine;
@@ -67,16 +63,15 @@ class FcrWhiteboardControlImpl {
     this._roomCache = _sharedCache.getRoomCache(this._scene.sceneId);
     this._addLogObserver();
     _scene.addObserver(this._notifyObservers());
-    this.logger.info("Whitebaord Version: forge-whiteboard@".concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-whiteboard'), ", forge-room@").concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-room'), ", forge-rtm@").concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-rtm')));
+    this.logger.info(`Whitebaord Version: forge-whiteboard@${(0, _packageInfo.getDependenciesInfo)('@netless/forge-whiteboard')}, forge-room@${(0, _packageInfo.getDependenciesInfo)('@netless/forge-room')}, forge-rtm@${(0, _packageInfo.getDependenciesInfo)('@netless/forge-rtm')}`);
   }
   async open() {
-    var _this$_scene$getUser;
     // 此宽高为设计稿中的白板尺寸，如无特殊需求，不建议修改
     const width = 1920;
     const height = 1220;
     const roomId = this._scene.sceneId;
     const userId = this._scene.localUser.getLocalUserId();
-    const nickName = (_this$_scene$getUser = this._scene.getUser(userId)) === null || _this$_scene$getUser === void 0 ? void 0 : _this$_scene$getUser.userName;
+    const nickName = this._scene.getUser(userId)?.userName;
     const {
       data
     } = await this._getToken(roomId, userId);
@@ -153,15 +148,14 @@ class FcrWhiteboardControlImpl {
         this._updateConnnectionState(_type.FcrConnectionState.CONNECTED);
       }, [], {
         retriesMax
-      }).fail(async _ref2 => {
-        let {
-          error,
-          timeFn,
-          currentRetry
-        } = _ref2;
-        this.logger.info("[whiteboard]: failed to join board room, error: ".concat(error.message, ", current retry: ").concat(currentRetry));
+      }).fail(async ({
+        error,
+        timeFn,
+        currentRetry
+      }) => {
+        this.logger.info(`[whiteboard]: failed to join board room, error: ${error.message}, current retry: ${currentRetry}`);
         this._needRetry && (await timeFn());
-        this.logger.info("[whiteboard]: continue attemptting? need retry: ".concat(this._needRetry));
+        this.logger.info(`[whiteboard]: continue attemptting? need retry: ${this._needRetry}`);
         return this._needRetry;
       }).abort(() => {
         this.logger.info('[whiteboard]: join board room aborted, state: DISCONNECTED');
@@ -174,10 +168,9 @@ class FcrWhiteboardControlImpl {
     return this._boardView;
   }
   async close() {
-    var _this$_boardRoom, _this$_boardRoom2;
     this._needRetry = false;
-    (_this$_boardRoom = this._boardRoom) === null || _this$_boardRoom === void 0 || _this$_boardRoom.applicationManager.terminateApplication(this._FORGE_WHITEBOARD_APP_ID);
-    await ((_this$_boardRoom2 = this._boardRoom) === null || _this$_boardRoom2 === void 0 ? void 0 : _this$_boardRoom2.leaveRoom());
+    this._boardRoom?.applicationManager.terminateApplication(this._FORGE_WHITEBOARD_APP_ID);
+    await this._boardRoom?.leaveRoom();
     this._boardRoom = undefined;
     this._boardView = undefined;
   }
@@ -211,12 +204,11 @@ class FcrWhiteboardControlImpl {
     }
   }
   async setBackgroundColor(backgroundColor) {
-    var _this$_boardView;
     await this._api.setBackgroundColor({
       roomId: this._scene.sceneId,
       backgroundColor
     });
-    (_this$_boardView = this._boardView) === null || _this$_boardView === void 0 || _this$_boardView.setBackgroundColor(backgroundColor);
+    this._boardView?.setBackgroundColor(backgroundColor);
   }
   getBackgroundColor() {
     return this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard.extra.backgroundColor');
@@ -236,24 +228,22 @@ class FcrWhiteboardControlImpl {
   _notifyObservers() {
     return {
       onScenePropertiesUpdated: (_, event) => {
-        var _event$cause;
         const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
         const getByKeyPath = value => this._scene.getScenePropertiesByKeyPath(value);
-        if (((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.cmd) === 10) {
-          var _ref3, _ref4, _event$cause$data;
+        if (event.cause?.cmd === 10) {
           const {
             state,
             ownerUserUuid
-          } = (_ref3 = getByKeyPath('widgets.netlessBoard')) !== null && _ref3 !== void 0 ? _ref3 : {
+          } = getByKeyPath('widgets.netlessBoard') ?? {
             state: 0
           };
           const {
             backgroundColor: bgColor
-          } = (_ref4 = getByKeyPath('widgets.netlessBoard.extra')) !== null && _ref4 !== void 0 ? _ref4 : {
+          } = getByKeyPath('widgets.netlessBoard.extra') ?? {
             backgroundColor: '#ffffff'
           };
           const widgetCauseReason = getByKeyPath('event.cause.data.widgetCause.data.reason');
-          const widgetCauseCmd = (_event$cause$data = event.cause.data) === null || _event$cause$data === void 0 || (_event$cause$data = _event$cause$data.widgetCause) === null || _event$cause$data === void 0 ? void 0 : _event$cause$data.cmd;
+          const widgetCauseCmd = event.cause.data?.widgetCause?.cmd;
           if (state === 1) {
             this._observable.notifyObservers('onActive', ownerUserUuid, operatorUser);
           }
@@ -281,6 +271,4 @@ class FcrWhiteboardControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onActive', 'onInactive', 'onBackgroundColorUpdated', 'onConnectionStateUpdated']));
   }
 }
-exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-_FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "active"], [_imports.trace, 2, "inactive"], [[_imports.bound, _imports.trace], 2, "getConnectionState"], [[_imports.bound, _imports.trace], 2, "getMainWindow"], [_imports.bound, 2, "getBoardActiveInfo"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_imports.bound, _imports.trace], 2, "getBackgroundColor"], [[_imports.bound, _imports.trace], 2, "getActivity"], [[_imports.bound, _imports.trace], 2, "getOwnerId"], [_imports.bound, 2, "_notifyObservers"], [_imports.bound, 2, "_updateConnnectionState"], [_imports.bound, 2, "_getToken"]], []).e;
+exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;