fcr-core 3.7.8 → 3.8.0-alpha

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

@@ -0,0 +1,317 @@
+"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");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+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");
+var _forgeRoom = require("@netless/forge-room");
+var _logger = require("../../../utilities/logger");
+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 + ""; }
+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 FcrBaseWhiteboardControlImpl {
+  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.forgeInitConfigTask.stop();
+      if (this._isOpen) {
+        this.connect();
+      }
+    }, _constant.INIT_CONFIG_FETCH_INTERVAL);
+    this.addLogObserver();
+  }
+  setOperationPrivilege(hasOperationPrivilege) {
+    if (this.hasOperationPrivilege !== hasOperationPrivilege) {
+      this.hasOperationPrivilege = hasOperationPrivilege;
+      const whiteboard = this.whiteboard;
+      const boardView = this.boardView;
+      if (whiteboard) {
+        if (hasOperationPrivilege) {
+          whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+          if (boardView) {
+            // @ts-expect-error
+            boardView._observable.notifyObservers('onWritable', true);
+          }
+        } else {
+          whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+          if (boardView) {
+            // @ts-expect-error
+            boardView._observable.notifyObservers('onWritable', false);
+          }
+        }
+      }
+    }
+  }
+  async open() {
+    this._isOpen = true;
+    const isReadyToConnect = this._checkForConnect();
+    if (isReadyToConnect) {
+      return this.connect();
+    }
+    if (!this._waitPromise) {
+      this._waitPromise = new Promise((resolve, reject) => {
+        this._waitPromiseResolve = resolve;
+        this._waitPromiseReject = reject;
+        this.logger.info('waiting for forge config to be ready');
+      });
+    }
+    return this._waitPromise;
+  }
+  async close() {
+    this._isOpen = false;
+    if (!this.forgeInitConfigTask.isStopped) {
+      this.forgeInitConfigTask.stop();
+    }
+    if (this._waitPromiseReject) {
+      this._waitPromiseReject(new Error('closed before connection established'));
+      this._clearWaitPromise();
+    }
+    try {
+      if (this._openAbortController) {
+        this._openAbortController.abort();
+        this._openAbortController = null;
+      }
+      const boardRoom = this.boardRoom;
+      this.boardRoom = null;
+      this.boardView = null;
+      this.whiteboard = null;
+      if (boardRoom) {
+        boardRoom.applicationManager.removeAllListeners();
+        boardRoom.applicationManager.terminateApplication(this.getApplicationId());
+        await boardRoom.leaveRoom();
+      }
+    } catch (e) {
+      this.logger.error('leave board room failed', e);
+    } finally {
+      this.updateConnectionState(_type.FcrConnectionState.DISCONNECTED);
+    }
+  }
+  getConnectionState() {
+    return this.connectState;
+  }
+  getMainWindow() {
+    return this.boardView;
+  }
+  addObserver(observer) {
+    this.observable.addObserver(observer);
+  }
+  removeObserver(observer) {
+    this.observable.removeObserver(observer);
+  }
+  updateConnectionState(state) {
+    if (this.connectState === state) {
+      return;
+    }
+    const oldState = this.connectState;
+    this.connectState = state;
+    this.logger.info("Connection state updated: ".concat(_type.FcrConnectionState[oldState], " -> ").concat(_type.FcrConnectionState[state]));
+    this.observable.notifyObservers('onConnectionStateUpdated', state);
+  }
+  async connect() {
+    if (this.boardView) {
+      this.logger.info('board already connected, returning existing board view');
+      return this.boardView;
+    }
+    const abortController = new AbortController();
+    this._openAbortController = abortController;
+    return new Promise(async (resolve, reject) => {
+      // 监听中止信号
+      abortController.signal.addEventListener('abort', () => {
+        reject(new Error('join board aborted'));
+      });
+      const {
+        userId,
+        userName
+      } = this.config;
+      const {
+        boardAppId,
+        boardId,
+        boardRegion,
+        boardToken
+      } = this.forgeInitConfig || {};
+      if (!boardAppId) {
+        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'boardAppId is required', new Error('boardAppId is required'));
+      }
+      if (!boardId) {
+        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'boardId is required', new Error('boardId is required'));
+      }
+      if (!boardToken) {
+        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'boardToken is required', new Error('boardToken is required'));
+      }
+      const whiteboardOption = this.getWhiteboardOption();
+      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"));
+        whiteboardOption.width = 800;
+      }
+      if (!height) {
+        this.logger.warn("board height is a invalid value: ".concat(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)));
+      const rtmProvider = new _forgeRtm.RTMProvider_2_2(this.rtmClient);
+      const wbRoom = new _forgeRoom.Room(boardId, rtmProvider);
+      wbRoom.applicationManager.registerApplication(_forgeWhiteboard.WhiteboardApplication);
+      try {
+        this.updateConnectionState(_type.FcrConnectionState.CONNECTING);
+        let error = null;
+        let boardView = null;
+        let whiteboard = null;
+        let boardRoom = wbRoom;
+        const appId = this.getApplicationId();
+        [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
+          const joinRoomParams = {
+            userId,
+            nickName: userName || userId,
+            roomToken: boardToken,
+            sdkConfig: {
+              region: boardRegion,
+              appIdentifier: boardAppId
+            }
+            // verboseLog: true,
+          };
+          this.logger.info("join params: ".concat((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;
+          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);
+          await timeFn();
+          return true;
+        }).exec());
+        if (abortController.signal.aborted) {
+          throw new Error('join board aborted');
+        }
+        if (error) {
+          this.logger.error("join board failed, ".concat(error.message, "-").concat(JSON.stringify(error)));
+          throw error;
+        }
+        whiteboard.enableCameraByMouse = false;
+        whiteboard.enableCameraByTouch = false;
+        whiteboard.setViewModeToMain();
+        boardView = new _mainWindow.FcrBoardMainWindowImpl(whiteboard, wbRoom, appId);
+        boardView.setBackgroundColor(this.getBackgroundColor());
+        this.whiteboard = whiteboard;
+        this.boardView = boardView;
+        this.boardRoom = boardRoom;
+        if (this.hasOperationPrivilege) {
+          whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+        } else {
+          whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+        }
+        this.updateConnectionState(_type.FcrConnectionState.CONNECTED);
+        resolve(boardView);
+        if (this._waitPromiseResolve) {
+          this._waitPromiseResolve(boardView);
+          this._clearWaitPromise();
+        }
+      } catch (e) {
+        this.logger.error("join board failed");
+        this.updateConnectionState(_type.FcrConnectionState.DISCONNECTED);
+        reject(e);
+        if (this._waitPromiseReject) {
+          this._waitPromiseReject(e);
+          this._clearWaitPromise();
+        }
+      } finally {
+        this._openAbortController = null;
+      }
+    });
+  }
+  getApplicationId() {
+    return '';
+  }
+  getWhiteboardOption() {
+    return {
+      width: 800,
+      height: 600,
+      defaultToolbarStyle: {
+        tool: 'laser'
+      },
+      maxScaleRatio: 1
+    };
+  }
+  getBackgroundColor() {
+    return 'rgba(0, 0, 0, 0)';
+  }
+  addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onConnectionStateUpdated']));
+  }
+  _checkForConnect() {
+    return !!this.forgeInitConfig;
+  }
+  _clearWaitPromise() {
+    this._waitPromiseResolve = null;
+    this._waitPromiseReject = null;
+    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;

package/lib/room-control/whiteboard-control-v2/{main-window.d.ts → base/main-window.d.ts}

@@ -1,8 +1,9 @@
-import { FcrBoardToolType } from '../whiteboard-control/enums';
-import { FcrColor, FcrBoardMainWindow, FcrBoardMainWindowObserver, FcrBoardPageInfo } from '../whiteboard-control/types';
+import { FcrBoardToolType } from '../enum';
+import { FcrBoardMainWindow, FcrBoardMainWindowObserver } from '../type';
 import { Whiteboard } from '@netless/forge-whiteboard';
 import { Room } from '@netless/forge-room';
-import { FcrSize } from '../stream-control/type';
+import { FcrSize } from '../../stream-control/type';
+import { FcrBoardPageInfo, FcrColor } from '../../whiteboard-control/type';
 export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _whiteboard;
@@ -11,7 +12,7 @@ export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     private _currentPage;
     private _background;
     private _isAutoCancelEnabled;
-    constructor(whiteboard: Whiteboard, boardRoom: Room);
+    constructor(whiteboard: Whiteboard, boardRoom: Room, appId: string);
     addPage(): Promise<void>;
     removePage(): Promise<void>;
     undo(): Promise<void>;
@@ -33,6 +34,7 @@ export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     setBoardTransparent(isTransparent: boolean): Promise<void>;
     updateWindowSize(size: FcrSize): void;
     setAutoCancelDraw(enable: boolean): void;
+    getWritable(): boolean;
     addObserver(observer: FcrBoardMainWindowObserver): void;
     removeObserver(observer: FcrBoardMainWindowObserver): void;
     private _addWindowManagerEventListeners;

package/lib/room-control/whiteboard-control-v2/{main-window.js → base/main-window.js}

@@ -24,24 +24,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrBoardMainWindowImpl = void 0;
 require("core-js/modules/es.error.cause.js");
+require("core-js/modules/esnext.iterator.constructor.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 _forgeWhiteboard = require("@netless/forge-whiteboard");
 var _observable = require("agora-foundation/lib/utilities/observable");
-var _utils = require("./utils");
-var _logger = require("../../utilities/logger");
-var _imports = require("../../imports");
-var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
-var _schema = require("../../schema");
+var _utils = require("../utils");
+var _logger = require("../../../utilities/logger");
+var _log = require("agora-foundation/lib/decorator/log");
+var _schema = require("agora-foundation/lib/utilities/schema");
+var _validateParams = _interopRequireDefault(require("../../../utilities/validate-params"));
+var _schema2 = require("../../../schema");
+var _decorator = require("agora-foundation/lib/decorator");
 var _FcrBoardMainWindowImpl;
-let _initProto, _setBackgroundColorDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _insertImageDecs, _setContainerSizeRatioDecs, _updateWindowSizeDecs, _setAutoCancelDrawDecs, _ref;
+let _initProto, _setBackgroundColorDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _insertImageDecs, _setContainerSizeRatioDecs, _setBoardTransparentDecs, _updateWindowSizeDecs, _setAutoCancelDrawDecs, _ref;
 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)], _setToolTypeDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.numberSchema)], _setStrokeColorDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.z.union([_schema.colorSchema, _schema.stringSchema]))], _setTextColorDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.colorSchema)], _setTextSizeDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.numberSchema)], _insertImageDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.numberSchema, _schema.numberSchema, _schema.numberSchema, _schema.numberSchema)], _setContainerSizeRatioDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.numberSchema)], _updateWindowSizeDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrSizeSchema)], _setAutoCancelDrawDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.booleanSchema)], "logger");
+_ref = (_setBackgroundColorDecs = [_log.trace, (0, _validateParams.default)(_schema.stringSchema)], _setToolTypeDecs = [_log.trace, (0, _validateParams.default)(_schema2.fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _setStrokeColorDecs = [_log.trace, (0, _validateParams.default)(_schema2.z.union([_schema2.colorSchema, _schema.stringSchema]))], _setTextColorDecs = [_log.trace, (0, _validateParams.default)(_schema2.colorSchema)], _setTextSizeDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _insertImageDecs = [_log.trace, (0, _validateParams.default)(_schema.stringSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema, _schema2.numberSchema)], _setContainerSizeRatioDecs = [_log.trace, (0, _validateParams.default)(_schema2.numberSchema)], _setBoardTransparentDecs = [_log.trace, (0, _validateParams.default)(_schema2.booleanSchema)], _updateWindowSizeDecs = [_log.trace, (0, _validateParams.default)(_schema2.fcrSizeSchema)], _setAutoCancelDrawDecs = [_log.trace, (0, _validateParams.default)(_schema2.booleanSchema)], "logger");
 class FcrBoardMainWindowImpl {
-  constructor(whiteboard, boardRoom) {
+  constructor(whiteboard, boardRoom, appId) {
     (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrBoardMainWindowImpl'
     })));
@@ -55,6 +60,7 @@ class FcrBoardMainWindowImpl {
     this._boardView.appendChild(whiteboard.view);
     this._boardView.style.height = "100%";
     this._boardView.style.width = "100%";
+    this._boardView.setAttribute('data-app-id', appId);
     this._whiteboard = whiteboard;
     this._setBoardViewStyle(whiteboard.view);
     this._addWindowManagerEventListeners();
@@ -162,9 +168,7 @@ class FcrBoardMainWindowImpl {
       throw new Error('Whiteboard is not initialized');
     }
   }
-  async insertImage(resourceUrl, x, y, width, height) {
-    // this._whiteboard.insertImage(resourceUrl);
-  }
+  async insertImage(resourceUrl, x, y, width, height) {}
   getContentView() {
     return this._boardView;
   }
@@ -177,6 +181,11 @@ class FcrBoardMainWindowImpl {
     this._isAutoCancelEnabled = enable;
     this._enableAutoCancel(enable);
   }
+  getWritable() {
+    return this._whiteboard.permissions.getPermissionFlags().some(flag => {
+      return flag === _forgeWhiteboard.WhiteboardPermissionFlag.all;
+    });
+  }
   addObserver(observer) {
     this._observable.addObserver(observer);
   }
@@ -223,11 +232,15 @@ class FcrBoardMainWindowImpl {
     this._boardView.appendChild(app.view);
   }
   _handleApplicationTerminal(appId, app) {
-    if (this._boardView.contains(app.view)) {
-      this.logger.info("remove application view: ".concat(appId));
-      this._boardView.removeChild(app.view);
-    } else {
-      this.logger.warn("application view not found in board view: ".concat(appId));
+    try {
+      if (this._boardView.contains(app.view)) {
+        this.logger.info("remove application view: ".concat(appId));
+        this._boardView.removeChild(app.view);
+      } else {
+        this.logger.warn("application view not found in board view: ".concat(appId));
+      }
+    } catch (e) {
+      this.logger.error("failed to handle terminal: ".concat(appId), e);
     }
   }
   _setBoardViewStyle(view) {
@@ -242,9 +255,9 @@ class FcrBoardMainWindowImpl {
     this._whiteboard.__delayTranslateOut = enable ? 4000 : -1;
   }
   _addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onPageInfoUpdated', 'onUndoStateUpdated', 'onRedoStateUpdated']));
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onWritable', 'onPageInfoUpdated', 'onUndoStateUpdated', 'onRedoStateUpdated']));
   }
 }
 exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
 _FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[[_imports.bound, _imports.trace], 2, "addPage"], [[_imports.bound, _imports.trace], 2, "removePage"], [[_imports.bound, _imports.trace], 2, "undo"], [[_imports.bound, _imports.trace], 2, "redo"], [[_imports.bound, _imports.trace], 2, "clean"], [[_imports.bound, _imports.trace], 2, "getSnapshotImage"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_imports.bound, _imports.trace], 2, "getPageInfo"], [[_imports.bound, _imports.trace], 2, "prevPage"], [[_imports.bound, _imports.trace], 2, "nextPage"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_insertImageDecs, 2, "insertImage"], [[_imports.bound, _imports.trace], 2, "getContentView"], [_setContainerSizeRatioDecs, 2, "setContainerSizeRatio"], [[_imports.bound, _imports.trace], 2, "setBoardTransparent"], [_updateWindowSizeDecs, 2, "updateWindowSize"], [_setAutoCancelDrawDecs, 2, "setAutoCancelDraw"], [[_imports.bound, _imports.trace], 2, "_handleApplicationLaunch"], [[_imports.bound, _imports.trace], 2, "_handleApplicationTerminal"], [_imports.trace, 2, "_enableAutoCancel"]], []).e;
+[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[_log.trace, 2, "addPage"], [_log.trace, 2, "removePage"], [_log.trace, 2, "undo"], [_log.trace, 2, "redo"], [_log.trace, 2, "clean"], [_log.trace, 2, "getSnapshotImage"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [_log.trace, 2, "getPageInfo"], [_log.trace, 2, "prevPage"], [_log.trace, 2, "nextPage"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_insertImageDecs, 2, "insertImage"], [_log.trace, 2, "getContentView"], [_setContainerSizeRatioDecs, 2, "setContainerSizeRatio"], [_setBoardTransparentDecs, 2, "setBoardTransparent"], [_updateWindowSizeDecs, 2, "updateWindowSize"], [_setAutoCancelDrawDecs, 2, "setAutoCancelDraw"], [_log.trace, 2, "getWritable"], [[_decorator.bound, _log.trace], 2, "_handleApplicationLaunch"], [[_decorator.bound, _log.trace], 2, "_handleApplicationTerminal"], [_log.trace, 2, "_enableAutoCancel"]], []).e;

package/lib/room-control/whiteboard-control-v2/constant.d.ts

@@ -0,0 +1,6 @@
+export declare const BOARD_VIEW_WIDTH = 1920;
+export declare const BOARD_VIEW_HEIGHT = 1220;
+export declare const INIT_CONFIG_FETCH_INTERVAL = 3000;
+export declare const BOARD_RETRY_MAX = 99999;
+export declare const WHITEBOARD_APP_ID = "MainWhiteboard";
+export declare const ANNOTATION_APP_ID = "Annotation";

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

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WHITEBOARD_APP_ID = exports.INIT_CONFIG_FETCH_INTERVAL = exports.BOARD_VIEW_WIDTH = exports.BOARD_VIEW_HEIGHT = exports.BOARD_RETRY_MAX = exports.ANNOTATION_APP_ID = void 0;
+// 此宽高为 HLD 中约定的白板尺寸
+const BOARD_VIEW_WIDTH = exports.BOARD_VIEW_WIDTH = 1920;
+const BOARD_VIEW_HEIGHT = exports.BOARD_VIEW_HEIGHT = 1220;
+const INIT_CONFIG_FETCH_INTERVAL = exports.INIT_CONFIG_FETCH_INTERVAL = 3000;
+
+// 永久重试
+const BOARD_RETRY_MAX = exports.BOARD_RETRY_MAX = 99999;
+const WHITEBOARD_APP_ID = exports.WHITEBOARD_APP_ID = 'MainWhiteboard';
+const ANNOTATION_APP_ID = exports.ANNOTATION_APP_ID = 'Annotation';

package/lib/room-control/whiteboard-control-v2/enum.d.ts

@@ -0,0 +1,26 @@
+export declare enum FcrBoardShape {
+    Curve = 1,
+    Straight = 2,
+    Arrow = 3,
+    Rectangle = 4,
+    Triangle = 5,
+    Rhombus = 6,
+    Pentagram = 7,
+    Ellipse = 8
+}
+export declare enum FcrBoardToolType {
+    NONE = 0,
+    SELECTOR = 1,
+    LASER_POINTER = 2,
+    ERASER = 3,
+    TEXT = 4,
+    HAND = 5,
+    CURVE = 6,
+    STRAIGHT = 7,
+    ARROW = 8,
+    RECTANGLE = 9,
+    TRIANGLE = 10,
+    RHOMBUS = 11,
+    PENTAGRAM = 12,
+    ELLIPSE = 13
+}

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

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrBoardToolType = exports.FcrBoardShape = void 0;
+let FcrBoardShape = exports.FcrBoardShape = /*#__PURE__*/function (FcrBoardShape) {
+  FcrBoardShape[FcrBoardShape["Curve"] = 1] = "Curve";
+  FcrBoardShape[FcrBoardShape["Straight"] = 2] = "Straight";
+  FcrBoardShape[FcrBoardShape["Arrow"] = 3] = "Arrow";
+  FcrBoardShape[FcrBoardShape["Rectangle"] = 4] = "Rectangle";
+  FcrBoardShape[FcrBoardShape["Triangle"] = 5] = "Triangle";
+  FcrBoardShape[FcrBoardShape["Rhombus"] = 6] = "Rhombus";
+  FcrBoardShape[FcrBoardShape["Pentagram"] = 7] = "Pentagram";
+  FcrBoardShape[FcrBoardShape["Ellipse"] = 8] = "Ellipse";
+  return FcrBoardShape;
+}({});
+let FcrBoardToolType = exports.FcrBoardToolType = /*#__PURE__*/function (FcrBoardToolType) {
+  FcrBoardToolType[FcrBoardToolType["NONE"] = 0] = "NONE";
+  FcrBoardToolType[FcrBoardToolType["SELECTOR"] = 1] = "SELECTOR";
+  FcrBoardToolType[FcrBoardToolType["LASER_POINTER"] = 2] = "LASER_POINTER";
+  FcrBoardToolType[FcrBoardToolType["ERASER"] = 3] = "ERASER";
+  FcrBoardToolType[FcrBoardToolType["TEXT"] = 4] = "TEXT";
+  FcrBoardToolType[FcrBoardToolType["HAND"] = 5] = "HAND";
+  FcrBoardToolType[FcrBoardToolType["CURVE"] = 6] = "CURVE";
+  FcrBoardToolType[FcrBoardToolType["STRAIGHT"] = 7] = "STRAIGHT";
+  FcrBoardToolType[FcrBoardToolType["ARROW"] = 8] = "ARROW";
+  FcrBoardToolType[FcrBoardToolType["RECTANGLE"] = 9] = "RECTANGLE";
+  FcrBoardToolType[FcrBoardToolType["TRIANGLE"] = 10] = "TRIANGLE";
+  FcrBoardToolType[FcrBoardToolType["RHOMBUS"] = 11] = "RHOMBUS";
+  FcrBoardToolType[FcrBoardToolType["PENTAGRAM"] = 12] = "PENTAGRAM";
+  FcrBoardToolType[FcrBoardToolType["ELLIPSE"] = 13] = "ELLIPSE";
+  return FcrBoardToolType;
+}({});