fcr-core 3.4.2 → 3.4.3

package/lib/room-control/whiteboard-control/board-window.js

@@ -1,14 +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.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.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");
@@ -24,16 +17,12 @@ 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.FcrBoardMainWindowImpl = void 0;
-require("core-js/modules/es.promise.finally.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+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 _whiteSnapshot = require("@netless/white-snapshot");
 var _windowManager = require("@netless/window-manager");
 require("@netless/window-manager/dist/style.css");
@@ -42,22 +31,20 @@ var _mountManager = require("./mount-manager");
 var _jsMd = require("js-md5");
 var _logger = require("../../utilities/logger");
 var _imports = require("../../imports");
-var _FcrBoardMainWindowImpl;
 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 FcrBoardMainWindowImpl {
+  static #_ = (() => [_initProto] = _applyDecs(this, [[[_imports.bound, _logger.trace], 2, "getSnapshotImage"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_logger.trace, 2, "getContentView"], [_logger.trace, 2, "setContainerSizeRatio"], [_logger.trace, 2, "getPageInfo"], [[_imports.bound, _logger.trace], 2, "addPage"], [[_imports.bound, _logger.trace], 2, "removePage"], [_logger.trace, 2, "prevPage"], [_logger.trace, 2, "nextPage"], [[_imports.bound, _logger.trace], 2, "undo"], [[_imports.bound, _logger.trace], 2, "redo"], [[_imports.bound, _logger.trace], 2, "clean"], [[_imports.bound, _logger.trace], 2, "setToolType"], [[_imports.bound, _logger.trace], 2, "setStrokeWidth"], [[_imports.bound, _logger.trace], 2, "setStrokeColor"], [[_imports.bound, _logger.trace], 2, "setTextColor"], [[_imports.bound, _logger.trace], 2, "setTextSize"], [[_imports.bound, _logger.trace], 2, "setBackgroundColor"], [[_imports.bound, _logger.trace], 2, "insertImage"], [_logger.trace, 2, "destroy"], [_imports.bound, 2, "_updateOperationPrivilege"], [_imports.bound, 2, "_mount"]], []).e)();
+  logger = (() => (_initProto(this), (0, _logger.getLogger)()))();
+  _hasOperationPrivilege = false;
+  _memberState = {};
+  _observable = (() => new _imports.AgoraObservable())();
+  _destroyed = false;
   constructor(room, privilegeControl) {
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.getLogger)()));
-    (0, _defineProperty2.default)(this, "_hasOperationPrivilege", false);
-    (0, _defineProperty2.default)(this, "_memberState", {});
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_destroyed", false);
     this._whiteBoardroom = room;
     this._whiteView = document.createElement('div');
     this._initView();
@@ -112,44 +99,39 @@ class FcrBoardMainWindowImpl {
     return this._whiteView;
   }
   async setContainerSizeRatio(ratio) {
-    var _this$_windowManager;
     this._preCheck();
-    (_this$_windowManager = this._windowManager) === null || _this$_windowManager === void 0 || _this$_windowManager.setContainerSizeRatio(ratio);
+    this._windowManager?.setContainerSizeRatio(ratio);
   }
   getPageInfo() {
     this._preCheck();
     const windowManager = this._windowManager;
     return {
-      showIndex: (windowManager === null || windowManager === void 0 ? void 0 : windowManager.mainViewSceneIndex) || 0,
-      count: (windowManager === null || windowManager === void 0 ? void 0 : windowManager.mainViewScenesLength) || 0
+      showIndex: windowManager?.mainViewSceneIndex || 0,
+      count: windowManager?.mainViewScenesLength || 0
     };
   }
   async addPage() {
-    var _this$_windowManager2;
     this._preCheck();
-    if ((_this$_windowManager2 = this._windowManager) !== null && _this$_windowManager2 !== void 0 && _this$_windowManager2.addPage) {
+    if (this._windowManager?.addPage) {
       await this._windowManager.addPage();
       await this._windowManager.nextPage();
     }
   }
   async removePage() {
-    var _this$_windowManager3;
     this._preCheck();
-    if ((_this$_windowManager3 = this._windowManager) !== null && _this$_windowManager3 !== void 0 && _this$_windowManager3.removePage) {
+    if (this._windowManager?.removePage) {
       await this._windowManager.removePage();
     }
   }
   async prevPage() {
-    var _this$_windowManager4;
     this._preCheck();
-    if ((_this$_windowManager4 = this._windowManager) !== null && _this$_windowManager4 !== void 0 && _this$_windowManager4.prevPage) {
+    if (this._windowManager?.prevPage) {
       await this._windowManager.prevPage();
     }
   }
   async nextPage() {
-    var _this$_windowManager5;
     this._preCheck();
-    if ((_this$_windowManager5 = this._windowManager) !== null && _this$_windowManager5 !== void 0 && _this$_windowManager5.nextPage) {
+    if (this._windowManager?.nextPage) {
       await this._windowManager.nextPage();
     }
   }
@@ -181,7 +163,10 @@ class FcrBoardMainWindowImpl {
       currentApplianceName: tool,
       shapeType: shape
     };
-    this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
+    this._memberState = {
+      ...this._memberState,
+      ...change
+    };
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
@@ -191,7 +176,10 @@ class FcrBoardMainWindowImpl {
     const change = {
       strokeWidth
     };
-    this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
+    this._memberState = {
+      ...this._memberState,
+      ...change
+    };
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
@@ -201,7 +189,10 @@ class FcrBoardMainWindowImpl {
     const change = {
       strokeColor: [color.r, color.g, color.b]
     };
-    this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
+    this._memberState = {
+      ...this._memberState,
+      ...change
+    };
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
@@ -211,7 +202,10 @@ class FcrBoardMainWindowImpl {
     const change = {
       textColor: [color.r, color.g, color.b]
     };
-    this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
+    this._memberState = {
+      ...this._memberState,
+      ...change
+    };
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
@@ -221,16 +215,18 @@ class FcrBoardMainWindowImpl {
     const change = {
       textSize: size
     };
-    this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
+    this._memberState = {
+      ...this._memberState,
+      ...change
+    };
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
   }
   async setBackgroundColor(color) {
-    var _this$_whiteView$quer;
     this._preCheck();
     this._backgroundColor = color;
-    (_this$_whiteView$quer = this._whiteView.querySelector('.netless-whiteboard')) === null || _this$_whiteView$quer === void 0 || _this$_whiteView$quer.style.setProperty('background-color', color);
+    this._whiteView.querySelector('.netless-whiteboard')?.style.setProperty('background-color', color);
   }
   async insertImage(resourceUrl, x, y, width, height) {
     const room = this._whiteBoardroom;
@@ -240,7 +236,6 @@ class FcrBoardMainWindowImpl {
     const preWidth = width;
     const preHeight = height;
     if (windowManager) {
-      var _this$_whiteView$clie, _this$_whiteView, _this$_whiteView$clie2, _this$_whiteView2;
       let originX = 0;
       let originY = 0;
       if (this._whiteView) {
@@ -251,12 +246,12 @@ class FcrBoardMainWindowImpl {
         x,
         y
       } = windowManager.mainView.convertToPointInWorld({
-        x: preX !== null && preX !== void 0 ? preX : originX,
-        y: preY !== null && preY !== void 0 ? preY : originY
+        x: preX ?? originX,
+        y: preY ?? originY
       });
       const containerSize = {
-        width: (_this$_whiteView$clie = (_this$_whiteView = this._whiteView) === null || _this$_whiteView === void 0 ? void 0 : _this$_whiteView.clientWidth) !== null && _this$_whiteView$clie !== void 0 ? _this$_whiteView$clie : window.innerWidth,
-        height: (_this$_whiteView$clie2 = (_this$_whiteView2 = this._whiteView) === null || _this$_whiteView2 === void 0 ? void 0 : _this$_whiteView2.clientHeight) !== null && _this$_whiteView$clie2 !== void 0 ? _this$_whiteView$clie2 : window.innerHeight
+        width: this._whiteView?.clientWidth ?? window.innerWidth,
+        height: this._whiteView?.clientHeight ?? window.innerHeight
       };
       const uuid = (0, _jsMd.md5)(resourceUrl);
       const {
@@ -267,8 +262,8 @@ class FcrBoardMainWindowImpl {
         uuid: uuid,
         centerX: x,
         centerY: y,
-        width: preWidth !== null && preWidth !== void 0 ? preWidth : width,
-        height: preHeight !== null && preHeight !== void 0 ? preHeight : height,
+        width: preWidth ?? width,
+        height: preHeight ?? height,
         locked: false
       };
       windowManager.switchMainViewToWriter();
@@ -311,24 +306,24 @@ class FcrBoardMainWindowImpl {
   }
   _addWindowManagerEventListeners() {
     const windowManager = this._windowManager;
-    windowManager === null || windowManager === void 0 || windowManager.emitter.on('mainViewSceneIndexChange', showIndex => {
+    windowManager?.emitter.on('mainViewSceneIndexChange', showIndex => {
       const state = {
         showIndex: showIndex,
-        count: (windowManager === null || windowManager === void 0 ? void 0 : windowManager.mainViewScenesLength) || 0
+        count: windowManager?.mainViewScenesLength || 0
       };
       this._observable.notifyObservers('onPageInfoUpdated', state);
     });
-    windowManager === null || windowManager === void 0 || windowManager.emitter.on('mainViewScenesLengthChange', count => {
+    windowManager?.emitter.on('mainViewScenesLengthChange', count => {
       const state = {
-        showIndex: (windowManager === null || windowManager === void 0 ? void 0 : windowManager.mainViewSceneIndex) || 0,
+        showIndex: windowManager?.mainViewSceneIndex || 0,
         count: count
       };
       this._observable.notifyObservers('onPageInfoUpdated', state);
     });
-    windowManager === null || windowManager === void 0 || windowManager.emitter.on('canUndoStepsChange', steps => {
+    windowManager?.emitter.on('canUndoStepsChange', steps => {
       this._observable.notifyObservers('onUndoStateUpdated', steps > 0);
     });
-    windowManager === null || windowManager === void 0 || windowManager.emitter.on('canRedoStepsChange', steps => {
+    windowManager?.emitter.on('canRedoStepsChange', steps => {
       this._observable.notifyObservers('onRedoStateUpdated', steps > 0);
     });
   }
@@ -374,8 +369,7 @@ class FcrBoardMainWindowImpl {
         this._updateOperationPrivilege(true);
         this._whiteBoardroom.setMemberState(this._memberState);
         if (this._backgroundColor) {
-          var _this$_whiteView$quer2;
-          (_this$_whiteView$quer2 = this._whiteView.querySelector('.netless-whiteboard')) === null || _this$_whiteView$quer2 === void 0 || _this$_whiteView$quer2.style.setProperty('background-color', this._backgroundColor);
+          this._whiteView.querySelector('.netless-whiteboard')?.style.setProperty('background-color', this._backgroundColor);
         }
       }).catch(e => {
         this.logger.error('[FcrBoardMainWindow] failed to mount', e);
@@ -394,6 +388,4 @@ class FcrBoardMainWindowImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onPageInfoUpdated', 'onPageInfoUpdated', 'onUndoStateUpdated', 'onRedoStateUpdated']));
   }
 }
-exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-_FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[[_imports.bound, _logger.trace], 2, "getSnapshotImage"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_logger.trace, 2, "getContentView"], [_logger.trace, 2, "setContainerSizeRatio"], [_logger.trace, 2, "getPageInfo"], [[_imports.bound, _logger.trace], 2, "addPage"], [[_imports.bound, _logger.trace], 2, "removePage"], [_logger.trace, 2, "prevPage"], [_logger.trace, 2, "nextPage"], [[_imports.bound, _logger.trace], 2, "undo"], [[_imports.bound, _logger.trace], 2, "redo"], [[_imports.bound, _logger.trace], 2, "clean"], [[_imports.bound, _logger.trace], 2, "setToolType"], [[_imports.bound, _logger.trace], 2, "setStrokeWidth"], [[_imports.bound, _logger.trace], 2, "setStrokeColor"], [[_imports.bound, _logger.trace], 2, "setTextColor"], [[_imports.bound, _logger.trace], 2, "setTextSize"], [[_imports.bound, _logger.trace], 2, "setBackgroundColor"], [[_imports.bound, _logger.trace], 2, "insertImage"], [_logger.trace, 2, "destroy"], [_imports.bound, 2, "_updateOperationPrivilege"], [_imports.bound, 2, "_mount"]], []).e;
+exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;

package/lib/room-control/whiteboard-control/enums.js

@@ -24,10 +24,25 @@ let FcrBoardShape = exports.FcrBoardShape = /*#__PURE__*/function (FcrBoardShape
   return FcrBoardShape;
 }({});
 let RoomPhase = exports.RoomPhase = /*#__PURE__*/function (RoomPhase) {
+  /**
+   * 连接中
+   */
   RoomPhase["Connecting"] = "connecting";
+  /**
+   * 已连接
+   */
   RoomPhase["Connected"] = "connected";
+  /**
+   * 正在重连
+   */
   RoomPhase["Reconnecting"] = "reconnecting";
+  /**
+   * 断开连接中
+   */
   RoomPhase["Disconnecting"] = "disconnecting";
+  /**
+   * 已断开连接
+   */
   RoomPhase["Disconnected"] = "disconnected";
   return RoomPhase;
 }({});
@@ -38,37 +53,106 @@ let FcrBoardMainWindowFailureReason = exports.FcrBoardMainWindowFailureReason =
   return FcrBoardMainWindowFailureReason;
 }({});
 let ViewMode = exports.ViewMode = /*#__PURE__*/function (ViewMode) {
+  /**
+   * 自由模式。不跟随任何人，也不被任何人跟随，自己可以自由操作视角。
+   */
   ViewMode["Freedom"] = "freedom";
+  /**
+   * 跟随模式。跟随当前房间的主播视角。
+   */
   ViewMode["Follower"] = "follower";
+  /**
+   * 主播模式。可以自由操作视角，但房间中处于跟随模式的人会跟随。
+   */
   ViewMode["Broadcaster"] = "broadcaster";
   return ViewMode;
 }({});
 let DeviceType = exports.DeviceType = /*#__PURE__*/function (DeviceType) {
+  /**
+   * 桌面设备，使用键盘鼠标
+   */
   DeviceType["Desktop"] = "desktop";
+  /**
+   * 触碰板设备，比如只能手机、平板电脑
+   */
   DeviceType["Touch"] = "touch";
+  /**
+   * 同时支持键盘、鼠标、触碰板的设备
+   */
   DeviceType["Surface"] = "surface";
   return DeviceType;
 }({});
 let ApplianceNames = exports.ApplianceNames = /*#__PURE__*/function (ApplianceNames) {
+  /**
+   * 选择工具
+   */
   ApplianceNames["selector"] = "selector";
+  /**
+   * 互动工具（无默认行为，可供 plugin 自定义）
+   */
   ApplianceNames["clicker"] = "clicker";
+  /**
+   * 激光笔
+   */
   ApplianceNames["laserPointer"] = "laserPointer";
+  /**
+   * 铅笔工具
+   */
   ApplianceNames["pencil"] = "pencil";
+  /**
+   * 矩形工具
+   */
   ApplianceNames["rectangle"] = "rectangle";
+  /**
+   * 圆形工具
+   */
   ApplianceNames["ellipse"] = "ellipse";
+  /**
+   * 图形工具
+   */
   ApplianceNames["shape"] = "shape";
+  /**
+   * 橡皮工具
+   */
   ApplianceNames["eraser"] = "eraser";
+  /**
+   * 橡皮工具（用来擦除铅笔笔迹的局部）
+   */
   ApplianceNames["pencilEraser"] = "pencilEraser";
+  /**
+   * 文字工具
+   */
   ApplianceNames["text"] = "text";
+  /**
+   * 直线工具
+   */
   ApplianceNames["straight"] = "straight";
+  /**
+   * 箭头工具
+   */
   ApplianceNames["arrow"] = "arrow";
+  /**
+   * 抓手工具
+   */
   ApplianceNames["hand"] = "hand";
   return ApplianceNames;
 }({});
 let ShapeType = exports.ShapeType = /*#__PURE__*/function (ShapeType) {
+  /**
+   * 三角形
+   */
   ShapeType["Triangle"] = "triangle";
+  /**
+   * 菱形
+   */
   ShapeType["Rhombus"] = "rhombus";
+  /**
+   * 五角星
+   */
   ShapeType["Pentagram"] = "pentagram";
+  /**
+   * 说话泡泡
+   */
   ShapeType["SpeechBalloon"] = "speechBalloon";
   return ShapeType;
 }({});

package/lib/room-control/whiteboard-control/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");
@@ -21,16 +19,12 @@ 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");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrWhiteboardControlImpl = void 0;
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+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 _whiteWebSdk = require("white-web-sdk");
 var netlessVideoPlugin = _interopRequireWildcard(require("@netless/video-js-plugin"));
 var _windowManager = require("@netless/window-manager");
@@ -44,7 +38,6 @@ var _user = require("../../utilities/user");
 var _2 = require("../..");
 var _logger = require("../../utilities/logger");
 var _error = require("../../utilities/error");
-var _FcrWhiteboardControlImpl;
 let _initProto;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -57,30 +50,29 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
  * @internal
  */
 class FcrWhiteboardControlImpl {
+  static #_ = (() => [_initProto] = _applyDecs(this, [[[_decorator.bound, _logger.trace], 2, "active"], [[_decorator.bound, _logger.trace], 2, "inactive"], [[_decorator.bound, _logger.trace], 2, "open"], [[_decorator.bound, _logger.trace], 2, "close"], [[_decorator.bound, _logger.trace], 2, "setBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getActivity"], [[_decorator.bound, _logger.trace], 2, "getOwnerId"], [[_decorator.bound, _logger.trace], 2, "getBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getConnectionState"], [[_decorator.bound, _logger.trace], 2, "getMainWindow"], [[_decorator.bound, _logger.trace], 2, "addObserver"], [[_decorator.bound, _logger.trace], 2, "removeObserver"], [_decorator.bound, 2, "getBoardActiveInfo"], [_logger.trace, 2, "leave"], [_decorator.bound, 2, "_getToken"], [_decorator.bound, 2, "_handleRoomStateUpdated"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_handleConnectionStateUpdated"]], []).e)();
+  logger = (() => (_initProto(this), (0, _logger.getLogger)()))();
+  _client = (() => ({}))();
+  _joined = false;
+  _connectState = (() => _2.FcrConnectionState.DISCONNECTED)();
+  _observable = (() => new _observable.AgoraObservable())();
+  _options = {
+    debug: false
+  };
   constructor(_scene, _privilegeControl, _api) {
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.getLogger)()));
-    (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
-    });
     this._scene = _scene;
     this._privilegeControl = _privilegeControl;
     this._api = _api;
     _scene.addObserver({
       onScenePropertiesUpdated: (_, event) => {
-        var _event$cause;
         const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser);
-        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'
@@ -90,10 +82,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);
           }
         }
@@ -108,11 +99,10 @@ class FcrWhiteboardControlImpl {
     return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _enums.FcrSharePermissionState.OFF), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'inactive failed');
   }
   async open() {
-    var _this$_scene$getUser;
     // 白板权限禁用状态下，主持人和联席主持人仍然可以发起共享，所以，不能根据是否禁用状态直接拒绝
     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 cursorName = this._scene.getUser(userId)?.userName;
     const {
       data
     } = await this._getToken(roomId, userId);
@@ -182,17 +172,17 @@ class FcrWhiteboardControlImpl {
         this._updateConnnectionState(_2.FcrConnectionState.CONNECTED);
       }, [], {
         retriesMax
-      }).fail(async _ref2 => {
+      }).fail(async _ref => {
         let {
           error,
           timeFn,
           currentRetry
-        } = _ref2;
-        this.logger.info("failed to join board room, error: ".concat(error.message, ", current retry: ").concat(currentRetry));
+        } = _ref;
+        this.logger.info(`failed to join board room, error: ${error.message}, current retry: ${currentRetry}`);
         if (this._joined) {
           await timeFn();
         }
-        this.logger.info("continue attemptting? ".concat(this._joined));
+        this.logger.info(`continue attemptting? ${this._joined}`);
         return this._joined;
       }).abort(() => {
         this._updateConnnectionState(_2.FcrConnectionState.DISCONNECTED);
@@ -266,11 +256,10 @@ class FcrWhiteboardControlImpl {
     };
   }
   async leave() {
-    var _this$_boardView, _this$_room;
     //@ts-ignore
-    (_this$_boardView = this._boardView) === null || _this$_boardView === void 0 || _this$_boardView.destroy();
+    this._boardView?.destroy();
     this._boardView = undefined;
-    (_this$_room = this._room) === null || _this$_room === void 0 || _this$_room.disconnect();
+    this._room?.disconnect();
     this._room = undefined;
   }
   _createPlugins() {
@@ -342,6 +331,4 @@ class FcrWhiteboardControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onActive', 'onInactive', 'onBackgroundColorUpdated', 'onConnectionStateUpdated']));
   }
 }
-exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-_FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[[_decorator.bound, _logger.trace], 2, "active"], [[_decorator.bound, _logger.trace], 2, "inactive"], [[_decorator.bound, _logger.trace], 2, "open"], [[_decorator.bound, _logger.trace], 2, "close"], [[_decorator.bound, _logger.trace], 2, "setBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getActivity"], [[_decorator.bound, _logger.trace], 2, "getOwnerId"], [[_decorator.bound, _logger.trace], 2, "getBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getConnectionState"], [[_decorator.bound, _logger.trace], 2, "getMainWindow"], [[_decorator.bound, _logger.trace], 2, "addObserver"], [[_decorator.bound, _logger.trace], 2, "removeObserver"], [_decorator.bound, 2, "getBoardActiveInfo"], [_logger.trace, 2, "leave"], [_decorator.bound, 2, "_getToken"], [_decorator.bound, 2, "_handleRoomStateUpdated"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_handleConnectionStateUpdated"]], []).e;
+exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;

package/lib/room-control/whiteboard-control/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/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.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 _enums = require("./enums");
 const heightPerTool = exports.heightPerTool = 36;
@@ -133,8 +130,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);
   });
@@ -216,22 +213,22 @@ const convertToFcrBoardToolShape = (tool, shape) => {
     case _enums.ApplianceNames.hand:
       return [_enums.FcrBoardToolType.HAND];
   }
-  switch ("".concat(tool || '').concat(shape || '')) {
-    case "".concat(_enums.ApplianceNames.rectangle):
+  switch (`${tool || ''}${shape || ''}`) {
+    case `${_enums.ApplianceNames.rectangle}`:
       return [, _enums.FcrBoardShape.Rectangle];
-    case "".concat(_enums.ApplianceNames.ellipse):
+    case `${_enums.ApplianceNames.ellipse}`:
       return [, _enums.FcrBoardShape.Ellipse];
-    case "".concat(_enums.ApplianceNames.straight):
+    case `${_enums.ApplianceNames.straight}`:
       return [, _enums.FcrBoardShape.Straight];
-    case "".concat(_enums.ApplianceNames.arrow):
+    case `${_enums.ApplianceNames.arrow}`:
       return [, _enums.FcrBoardShape.Arrow];
-    case "".concat(_enums.ApplianceNames.pencil):
+    case `${_enums.ApplianceNames.pencil}`:
       return [, _enums.FcrBoardShape.Curve];
-    case "".concat(_enums.ApplianceNames.shape).concat(_enums.ShapeType.Triangle):
+    case `${_enums.ApplianceNames.shape}${_enums.ShapeType.Triangle}`:
       return [, _enums.FcrBoardShape.Triangle];
-    case "".concat((_enums.ApplianceNames.shape, _enums.ShapeType.Pentagram)):
+    case `${_enums.ApplianceNames.shape, _enums.ShapeType.Pentagram}`:
       return [, _enums.FcrBoardShape.Pentagram];
-    case "".concat(_enums.ApplianceNames.shape).concat(_enums.ShapeType.Rhombus):
+    case `${_enums.ApplianceNames.shape}${_enums.ShapeType.Rhombus}`:
       return [, _enums.FcrBoardShape.Rhombus];
   }
   return [];
@@ -258,9 +255,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 = () => {