fcr-core 3.7.8 → 3.8.0-alpha

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

@@ -1,8 +1,12 @@
 "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,223 +26,152 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrWhiteboardControlImpl = 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");
+exports.FcrWhiteboardControlImpl = exports.FcrStandaloneWhiteboardControlImpl = void 0;
 require("core-js/modules/web.dom-collections.iterator.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _decorator = require("agora-foundation/lib/decorator");
-var _imports = require("agora-rte-sdk/lib/imports");
-var _type = require("./type");
-var _ = require("../../..");
-var _forgeRtm = require("@netless/forge-rtm");
-var _forgeRoom = require("@netless/forge-room");
-var _forgeWhiteboard = require("@netless/forge-whiteboard");
-var _mainWindow = require("../main-window");
+var _imports = require("../../../imports");
+var _user = require("../../../utilities/user");
 var _error = require("../../../utilities/error");
+var _schema = require("../../../schema");
+var _packageInfo = require("../../../utilities/package-info");
+var _validateParams = _interopRequireDefault(require("../../../utilities/validate-params"));
+var _base = require("../base");
+var _constant = require("../constant");
+var _type = require("../../whiteboard-control/type");
+var _type2 = require("../../sharing-control/type");
 var _logger = require("../../../utilities/logger");
-var _FcrWhiteboardControlImpl;
-let _initProto;
+var _utils = require("../utils");
+var _ref, _FcrWhiteboardControlImpl;
+let _initProto, _setBackgroundColorDecs, _ref2;
+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 FcrWhiteboardControlImpl {
-  constructor(_rtmClient, _config) {
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
+_ref2 = (_setBackgroundColorDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger");
+class FcrWhiteboardControlImpl extends (_ref = _base.FcrBaseWhiteboardControlImpl) {
+  constructor(rtmClient, config, hasOperationPrivilege, sharedCache, forgeInitConfigFetcher, _scene, _api) {
+    super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
+    (0, _defineProperty2.default)(this, _ref2, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrWhiteboardControlImpl'
     })));
-    (0, _defineProperty2.default)(this, "observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_connectState", _.FcrConnectionState.DISCONNECTED);
-    (0, _defineProperty2.default)(this, "_openAbortController", null);
-    this._rtmClient = _rtmClient;
-    this._config = _config;
-    this._addLogObserver();
-    // 用于 sub process 的 board config, 在 main process 中，board config 由 privilege control 提供
-    this._boardConfig = _config.boardConfig;
-    this.logger.info("[whiteboard][whiteboard-control]: constructor userId: ".concat(_config.userId, ", nickName: ").concat(_config.nickName, ", boardConfig: ").concat(JSON.stringify(_config.boardConfig)));
-  }
-  async openWithConfig(config) {
-    this.logger.info("[whiteboard][whiteboard-control]: openWithConfig config: ".concat(JSON.stringify(config)));
-    this._boardConfig = config;
-    return await this._connect();
-  }
-  async open() {
-    return await this._connect();
-  }
-  async close() {
-    try {
-      if (this._openAbortController) {
-        this._openAbortController.abort();
-        this._openAbortController = null;
-      }
-      const boardRoom = this.boardRoom;
-      this.boardRoom = undefined;
-      this._boardView = undefined;
-      if (boardRoom) {
-        boardRoom.applicationManager.removeAllListeners();
-        boardRoom.applicationManager.terminateApplication(_type.WHITEBOARD_APP_ID);
-        await boardRoom.leaveRoom();
-        this.logger.info('the whitebaord room is closed');
-        this.updateConnnectionState(_.FcrConnectionState.DISCONNECTED);
-      }
-    } catch (error) {
-      this.logger.error('close board failed', error);
+    (0, _defineProperty2.default)(this, "_backgroundColor", '#ffffff');
+    (0, _defineProperty2.default)(this, "_isActive", false);
+    (0, _defineProperty2.default)(this, "_ownerId", null);
+    (0, _defineProperty2.default)(this, "_notifyObservers", {
+      onScenePropertiesUpdated: this._onScenePropertiesUpdated
+    });
+    this._scene = _scene;
+    this._api = _api;
+    this._roomCache = sharedCache.getRoomCache(config.roomId);
+    this._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-room@").concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-rtm')));
+    this._isActive = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard').state === 1;
+    const backgroundColor = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard.extra.backgroundColor');
+    if (backgroundColor) {
+      this._backgroundColor = backgroundColor;
     }
+    const ownerId = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard.ownerUserUuid');
+    if (ownerId) {
+      this._ownerId = ownerId;
+    }
+    this.logger.info("initialized, hasOperationPrivilege: ".concat(hasOperationPrivilege));
   }
-  getConnectionState() {
-    return this._connectState;
-  }
-  getMainWindow() {
-    return this._boardView;
+  async active() {
+    return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this.config.roomId, _type2.FcrSharePermissionState.ON), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'active failed');
   }
-  addObserver(observer) {
-    this.observable.addObserver(observer);
+  async inactive() {
+    return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this.config.roomId, _type2.FcrSharePermissionState.OFF), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'inactive failed');
   }
-  removeObserver(observer) {
-    this.observable.removeObserver(observer);
+  getBoardActiveInfo() {
+    const {
+      state,
+      ownerUserUuid: ownerUserId
+    } = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard');
+    if (state === _type.FcrBoardPropertiesState.ACTIVE) {
+      return {
+        isActive: true,
+        ownerUserId
+      };
+    } else {
+      return {
+        isActive: false,
+        ownerUserId: null
+      };
+    }
   }
-  release() {
-    var _this$boardRoom, _this$boardRoom2;
-    (_this$boardRoom = this.boardRoom) === null || _this$boardRoom === void 0 || _this$boardRoom.applicationManager.terminateApplication(_type.WHITEBOARD_APP_ID);
-    (_this$boardRoom2 = this.boardRoom) === null || _this$boardRoom2 === void 0 || _this$boardRoom2.leaveRoom();
-    this.boardRoom = undefined;
-    this._boardView = undefined;
-    this.whiteboard = undefined;
+  async setBackgroundColor(backgroundColor) {
+    await this._api.setBackgroundColor({
+      roomId: this.config.roomId,
+      backgroundColor
+    });
+    this._backgroundColor = backgroundColor;
+    if (this.boardView) {
+      this.boardView.setBackgroundColor(backgroundColor);
+    }
   }
-  addPermission(permission) {
-    var _this$whiteboard;
-    (_this$whiteboard = this.whiteboard) === null || _this$whiteboard === void 0 || _this$whiteboard.permissions.addPermission(permission);
+  getBackgroundColor() {
+    return this._backgroundColor;
   }
-  removePermission(permission) {
-    var _this$whiteboard2;
-    (_this$whiteboard2 = this.whiteboard) === null || _this$whiteboard2 === void 0 || _this$whiteboard2.permissions.removePermission(permission);
+  getActivity() {
+    return this._isActive;
   }
-  updateConnnectionState(state) {
-    this._connectState = state;
-    this.logger.info("[whiteboard][whiteboard-control]: updateConnnectionState ".concat(_.FcrConnectionState[state]));
-    this.observable.notifyObservers('onConnectionStateUpdated', state);
+  getOwnerId() {
+    return this._ownerId;
   }
-  _addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onConnectionStateUpdated', 'onActive', 'onInactive', 'onBackgroundColorUpdated']));
+  getApplicationId() {
+    return _constant.WHITEBOARD_APP_ID;
   }
-  async _connect() {
-    if (this._boardView) {
-      this.logger.info('annotation 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,
-        nickName
-      } = this._config;
-      const width = 1920;
-      const height = 1080;
-      const {
-        boardAppId: appIdentifier,
-        boardId,
-        boardRegion: region,
-        boardToken: roomToken
-      } = this._boardConfig || {};
-      if (!appIdentifier) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'board boardAppId is required', new Error('board boardAppId is required'));
+  _onScenePropertiesUpdated(sceneId, event) {
+    const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
+    const getByKeyPath = value => this._scene.getScenePropertiesByKeyPath(value);
+    if (event.cause && event.cause.cmd === 10) {
+      var _getByKeyPath;
+      const state = (_getByKeyPath = getByKeyPath('widgets.netlessBoard.state')) !== null && _getByKeyPath !== void 0 ? _getByKeyPath : _type.FcrBoardPropertiesState.INACTIVE;
+      const backgroundColor = getByKeyPath('widgets.netlessBoard.extra.backgroundColor');
+      const widgetCauseReason = (0, _imports.get)(event.cause.data, 'widgetCause.data.reason');
+      const widgetCauseCmd = (0, _imports.get)(event.cause.data, 'widgetCause.cmd');
+      if (state === _type.FcrBoardPropertiesState.ACTIVE) {
+        const ownerUserId = getByKeyPath('widgets.netlessBoard.ownerUserUuid');
+        this._ownerId = ownerUserId;
+        this._isActive = true;
+        this.observable.notifyObservers('onActive', ownerUserId, operatorUser);
       }
-      if (!region) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'board region is required', new Error('board region is required'));
+      if (state === _type.FcrBoardPropertiesState.INACTIVE) {
+        this._ownerId = null;
+        this._isActive = false;
+        this.observable.notifyObservers('onInactive', widgetCauseReason, operatorUser);
       }
-      if (!boardId) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'boardId is required', new Error('boardId is required'));
-      }
-      if (!roomToken) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'boardToken is required', new Error('boardToken is required'));
-      }
-      this.logger.info("open annotation with boardId: ".concat(boardId, ", boardToken: ").concat(roomToken, ", region: ").concat(region));
-
-      // @ts-ignore
-      const rtmProvider = new _forgeRtm.RTMProvider_2_2(this._rtmClient);
-      const wbRoom = new _forgeRoom.Room(boardId, rtmProvider);
-      wbRoom.applicationManager.registerApplication(_forgeWhiteboard.WhiteboardApplication);
-      try {
-        this.updateConnnectionState(_.FcrConnectionState.CONNECTING);
-        const retriesMax = 10;
-        let error = null;
-        let boardView = null;
-        let whiteboard = null;
-        let boardRoom = wbRoom;
-        [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
-          const joinRoomParams = {
-            userId,
-            nickName,
-            roomToken,
-            sdkConfig: {
-              // @ts-ignore
-              region,
-              appIdentifier
-              // enableIFramePlugin: false,
-              // useMultiViews: true,
-            }
-          };
-          this.logger.info("join params: ".concat((0, _imports.jsonstring)(joinRoomParams)));
-          await wbRoom.joinRoom(joinRoomParams);
-          boardRoom = wbRoom;
-          whiteboard = await wbRoom.applicationManager.launchApplication(_forgeWhiteboard.WhiteboardApplication, {
-            width,
-            height,
-            defaultToolbarStyle: {
-              tool: 'laser'
-            },
-            maxScaleRatio: 1
-          }, _type.WHITEBOARD_APP_ID);
-        }, [], {
-          retriesMax
-        }).fail(async _ref => {
-          let {
-            error,
-            timeFn,
-            currentRetry
-          } = _ref;
-          if (abortController.signal.aborted) {
-            throw new Error('join board aborted');
-          }
-          this.logger.info("failed to join board, error: ".concat(error.message, ", current retry: ").concat(currentRetry));
-          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);
-        boardView.setBackgroundColor('rgba(255, 255, 255, 1)');
-        this.whiteboard = whiteboard;
-        this._boardView = boardView;
-        this.boardRoom = boardRoom;
-        this.updateConnnectionState(_.FcrConnectionState.CONNECTED);
-        resolve(boardView);
-      } catch (e) {
-        this.logger.error("join board failed");
-        this.updateConnnectionState(_.FcrConnectionState.DISCONNECTED);
-        reject(e);
-      } finally {
-        this._openAbortController = null;
+      if (widgetCauseCmd === _type.FcrBoardPropertiesState.BACKGROUND_COLOR_UPDATED) {
+        this._backgroundColor = backgroundColor;
+        this.observable.notifyObservers('onBackgroundColorUpdated', backgroundColor, operatorUser);
       }
+    }
+  }
+  getWhiteboardOption() {
+    return _objectSpread(_objectSpread({}, super.getWhiteboardOption()), {}, {
+      width: _utils.WHITEBOARD_WIDTH,
+      height: _utils.WHITEBOARD_HEIGHT
     });
   }
+  addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onConnectionStateUpdated', 'onActive', 'onInactive', 'onBackgroundColorUpdated']));
+  }
 }
 exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
 _FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[[_decorator.bound, _decorator.trace], 2, "openWithConfig"], [[_decorator.bound, _decorator.trace], 2, "close"], [[_decorator.bound, _decorator.trace], 2, "getConnectionState"], [[_decorator.bound, _decorator.trace], 2, "getMainWindow"], [[_decorator.bound, _decorator.trace], 2, "release"], [[_decorator.bound, _decorator.trace], 2, "addPermission"], [[_decorator.bound, _decorator.trace], 2, "removePermission"], [_decorator.bound, 2, "updateConnnectionState"]], []).e;
+[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[_imports.trace, 2, "active"], [_imports.trace, 2, "inactive"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [_imports.trace, 2, "getBackgroundColor"], [_imports.trace, 2, "getActivity"], [_imports.trace, 2, "getOwnerId"], [_imports.bound, 2, "_onScenePropertiesUpdated"]], [], 0, void 0, _ref).e;
+class FcrStandaloneWhiteboardControlImpl extends _base.FcrBaseWhiteboardControlImpl {
+  getApplicationId() {
+    return _constant.WHITEBOARD_APP_ID;
+  }
+  getWhiteboardOption() {
+    return _objectSpread(_objectSpread({}, super.getWhiteboardOption()), {}, {
+      width: _utils.WHITEBOARD_WIDTH,
+      height: _utils.WHITEBOARD_HEIGHT
+    });
+  }
+}
+exports.FcrStandaloneWhiteboardControlImpl = FcrStandaloneWhiteboardControlImpl;

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

@@ -0,0 +1,11 @@
+import { FcrCoreServiceApi } from '../../../service/api';
+import { FcrSharedCache } from '../../shared-cache';
+import { FcrBoardConfig, FcrStandaloneWhiteboardControl, FcrWhiteboardControl, FcrWhiteboardControlFactory } from './type';
+import type { RTMClient } from 'agora-rtm';
+import { AgoraRteScene } from 'agora-rte-sdk';
+export declare class FcrWhiteboardControlFactoryImpl implements FcrWhiteboardControlFactory {
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    createForSubProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, boardConfig: FcrBoardConfig): FcrStandaloneWhiteboardControl;
+    createForMainProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, boardConfig: FcrBoardConfig, scene: AgoraRteScene, api: FcrCoreServiceApi, sharedCache: FcrSharedCache): FcrWhiteboardControl;
+    private _createForgeInitConfigFetcher;
+}

package/lib/room-control/whiteboard-control-v2/{annotation-control/index.js → whiteboard-control/factory.js}

@@ -1,12 +1,8 @@
 "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");
@@ -26,59 +22,54 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrAnnotationControlFactoryImpl = void 0;
-require("core-js/modules/es.json.stringify.js");
+exports.FcrWhiteboardControlFactoryImpl = void 0;
+require("core-js/modules/es.error.cause.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;
+var _error = require("../../../utilities/error");
+var _log = require("agora-foundation/lib/decorator/log");
+var _base = require("../base");
+var _control = require("./control");
+var _sharedStorage = require("../../../utilities/shared-storage");
+var _FcrWhiteboardControlFactoryImpl;
 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 {
-  constructor(_rtmClient, _scene, _streamControl, _userControl, _privilegeControl, _api) {
+class FcrWhiteboardControlFactoryImpl {
+  constructor() {
     (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrAnnotationControlFactory'
+      prefix: 'FcrWhiteboardControlFactory'
     })));
-    this._rtmClient = _rtmClient;
-    this._scene = _scene;
-    this._streamControl = _streamControl;
-    this._userControl = _userControl;
-    this._privilegeControl = _privilegeControl;
-    this._api = _api;
-    this.logger.info("[annotation]: constructor initialized");
   }
-  createForSubProcess(config) {
-    this.logger.info("[annotation]: create for sub process with config: ".concat(JSON.stringify(config)));
-    return new _control.FcrAnnotationControlImpl(this._rtmClient, config);
+  createForSubProcess(rtmClient, hasOperationPrivilege, boardConfig) {
+    return new _base.FcrBaseWhiteboardControlImpl(rtmClient, boardConfig, hasOperationPrivilege, () => {
+      const forgeInitConfig = (0, _sharedStorage.getWhiteboardOptions)();
+      if (!forgeInitConfig) {
+        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, "whiteboard init config is not exist", new Error("whiteboard init config is not exist"));
+      }
+      return Promise.resolve(forgeInitConfig);
+    });
   }
-  createForMainProcess() {
-    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)));
-    const control = new _privilegeControl2.FcrPrivilegedAnnotationControlImpl(this._rtmClient, config, this._scene, this._streamControl, this._userControl, this._privilegeControl, this._api);
-    return control;
+  createForMainProcess(rtmClient, hasOperationPrivilege, boardConfig, scene, api, sharedCache) {
+    return new _control.FcrWhiteboardControlImpl(rtmClient, boardConfig, hasOperationPrivilege, sharedCache, this._createForgeInitConfigFetcher(api, boardConfig.roomId, boardConfig.userId), scene, api);
   }
-  _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 annotationConfig = (0, _utils.getAnnotationConfigFromRoomProperties)(roomProperties, this.logger);
-    return _objectSpread({
-      userId: localUser.userId,
-      nickName: localUser.userName
-    }, annotationConfig);
+  _createForgeInitConfigFetcher(api, roomId, userId) {
+    const getObjectInitConfig = async (roomId, userId) => {
+      return await (0, _error.handleRequestError)(() => api.getWhiteboardToken({
+        roomId,
+        userId
+      }), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'get whiteboard token failed');
+    };
+    return async () => {
+      const response = await getObjectInitConfig(roomId, userId);
+      return response.data;
+    };
   }
 }
-exports.FcrAnnotationControlFactoryImpl = FcrAnnotationControlFactoryImpl;
-_FcrAnnotationControlFactoryImpl = FcrAnnotationControlFactoryImpl;
-[_initProto] = _applyDecs(_FcrAnnotationControlFactoryImpl, [[_decorator.bound, 2, "_getBoardConfigInfoWithScene"]], []).e;
+exports.FcrWhiteboardControlFactoryImpl = FcrWhiteboardControlFactoryImpl;
+_FcrWhiteboardControlFactoryImpl = FcrWhiteboardControlFactoryImpl;
+[_initProto] = _applyDecs(_FcrWhiteboardControlFactoryImpl, [[_log.trace, 2, "createForSubProcess"], [_log.trace, 2, "createForMainProcess"]], []).e;

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

@@ -1,30 +1,21 @@
-import { FcrConnectionState } from '../../../type';
 import { FcrUserInfo } from '../../../type';
-import { FcrBaseWhiteboardControl, FcrBoardExtra, FcrBoardInactiveReason } from '../../whiteboard-control/types';
-import { FcrWhiteboardPermissionFlag } from '../../../imports';
-export declare const WHITEBOARD_APP_ID = "MainWhiteboard";
-export interface FcrWhiteboardControl extends FcrBaseWhiteboardControl {
-    addPermission(permission: FcrWhiteboardPermissionFlag): void;
-    removePermission(permission: FcrWhiteboardPermissionFlag): void;
-    addObserver(observer: FcrWhiteboardObserver): void;
-    removeObserver(observer: FcrWhiteboardObserver): void;
+import { FcrBaseWhiteboardControl, FcrBaseWhiteboardObserver } from '../type';
+import { AgoraRteScene } from '../../../imports';
+import { FcrCoreServiceApi } from '../../../service/api';
+import { FcrSharedCache } from '../../shared-cache';
+import type { RTMClient } from 'agora-rtm';
+import { FcrBoardInactiveReason } from '../../whiteboard-control/enum';
+export interface FcrStandaloneWhiteboardControl extends FcrBaseWhiteboardControl<FcrBaseWhiteboardObserver> {
 }
-export interface FcrPrivilegedWhiteboardControl extends FcrBaseWhiteboardControl {
+export interface FcrWhiteboardControl extends FcrBaseWhiteboardControl<FcrWhiteboardObserver> {
     active(): Promise<void>;
     inactive(): Promise<void>;
     getActivity(): boolean;
-    getOwnerId(): string;
-    getBackgroundColor(): string | undefined;
+    getOwnerId(): string | null;
+    getBackgroundColor(): string;
     setBackgroundColor(color: string): Promise<void>;
-    addObserver(observer: FcrWhiteboardObserver): void;
-    removeObserver(observer: FcrWhiteboardObserver): void;
 }
-export type FcrWhiteboardObserver = {
-    /**
-     * Callback to receive the connection state change.
-     * @param state
-     */
-    onConnectionStateUpdated?(state: FcrConnectionState): void;
+export interface FcrWhiteboardObserver extends FcrBaseWhiteboardObserver {
     /**
      * Callback to receive the background color of the whiteboard change.
      * @param info
@@ -41,18 +32,15 @@ export type FcrWhiteboardObserver = {
      * @param operatorUser
      */
     onInactive?(reason: FcrBoardInactiveReason, operatorUser?: FcrUserInfo): void;
-};
+}
 export type FcrBoardConfig = {
     userId: string;
-    nickName: string;
-    boardConfig?: FcrBoardExtra;
+    userName: string;
+    boardRatio: number;
+    roomId: string;
 };
-export declare enum FcrBoardPropertiesState {
-    ACTIVE = 1,
-    INACTIVE = 0,
-    BACKGROUND_COLOR_UPDATED = 100101
-}
+export type FcrBoardConfigForPrivilege = Pick<FcrBoardConfig, 'userId' | 'userName'>;
 export interface FcrWhiteboardControlFactory {
-    createForSubProcess(config: FcrBoardConfig): FcrBaseWhiteboardControl;
-    createForMainProcess(): FcrPrivilegedWhiteboardControl;
+    createForSubProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, boardConfig: FcrBoardConfig): FcrStandaloneWhiteboardControl;
+    createForMainProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, boardConfig: FcrBoardConfig, scene: AgoraRteScene, api: FcrCoreServiceApi, sharedCache: FcrSharedCache): FcrWhiteboardControl;
 }

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

@@ -2,12 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-exports.WHITEBOARD_APP_ID = exports.FcrBoardPropertiesState = void 0;
-const WHITEBOARD_APP_ID = exports.WHITEBOARD_APP_ID = 'MainWhiteboard';
-let FcrBoardPropertiesState = exports.FcrBoardPropertiesState = /*#__PURE__*/function (FcrBoardPropertiesState) {
-  FcrBoardPropertiesState[FcrBoardPropertiesState["ACTIVE"] = 1] = "ACTIVE";
-  FcrBoardPropertiesState[FcrBoardPropertiesState["INACTIVE"] = 0] = "INACTIVE";
-  FcrBoardPropertiesState[FcrBoardPropertiesState["BACKGROUND_COLOR_UPDATED"] = 100101] = "BACKGROUND_COLOR_UPDATED";
-  return FcrBoardPropertiesState;
-}({});
+});

package/lib/room-router/index.js

@@ -82,6 +82,7 @@ class FcrRoomRouterImpl {
     this._chatConnection = _chatConnection;
     this._sharedCache = _sharedCache;
     this._init(roomId);
+    this._addLogObserver();
   }
   get roomControl() {
     if (!this._roomControl) {
@@ -256,6 +257,9 @@ class FcrRoomRouterImpl {
       throw new Error('Join room attempt aborted');
     }
   }
+  _addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onErrorOccurred', 'onRoomJoined', 'onRoomRouteSwitched']));
+  }
   addObserver(observer) {
     this._observable.addObserver(observer);
   }