fcr-core 3.8.2 → 3.9.0-alpha

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

@@ -15,27 +15,32 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto;
+let _initProto, _setOperationPrivilegeDecs;
 import "core-js/modules/es.json.stringify.js";
 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; }
+import { Room } from '@netless/forge-room';
 import { RTMProvider_2_2 } from '@netless/forge-rtm';
+import { WhiteboardApplication } from '@netless/forge-whiteboard';
+import { DetailErrorCode, ErrorModuleCode } from '../../../imports';
 import { AgoraObservable, AgoraScheduler, jsonstring, retryAttempt, to, trace } from '../../../imports';
-import { BOARD_RETRY_MAX, INIT_CONFIG_FETCH_INTERVAL, WHITEBOARD_APP_ID } from '../constant';
-import { Room } from '@netless/forge-room';
-import { createLogger, generateLogObserver } from '../../../utilities/logger';
-import { WhiteboardApplication, WhiteboardPermissionFlag } from '@netless/forge-whiteboard';
+import { FcrConnectionState, FcrReturnCode } from '../../../type';
 import { generateFcrCoreClientError, FcrErrorModuleCode, FcrErrorCode } from '../../../utilities/error';
+import { createLogger, generateLogObserver } from '../../../utilities/logger';
+import { INIT_CONFIG_FETCH_INTERVAL, WHITEBOARD_APP_ID } from '../constant';
 import { FcrBoardMainWindowImpl } from './main-window';
-import { FcrConnectionState } from '../../../type';
+
+/** @param isNeedLaunch 是否需要调用白板 luanch 函数 */
+
+const WHITEBOARD_ROOM_JOIN_TIMEOUT = 20000;
 export class FcrBaseWhiteboardControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "setOperationPrivilege"], [trace, 2, "open"], [trace, 2, "close"], [trace, 2, "getConnectionState"], [trace, 2, "getMainWindow"]], []).e;
+    [_initProto] = _applyDecs(this, [[_setOperationPrivilegeDecs, 2, "setOperationPrivilege"], [trace, 2, "open"], [trace, 2, "close"], [trace, 2, "getConnectionState"], [trace, 2, "getMainWindow"]], []).e;
   }
-  logger = (_initProto(this), createLogger({
+  [(_setOperationPrivilegeDecs = trace(['hasOperationPrivilege']), "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrBaseWhiteboardControl'
   }));
   observable = new AgoraObservable();
@@ -49,7 +54,10 @@ export class FcrBaseWhiteboardControlImpl {
   _waitPromiseResolve = null;
   _waitPromiseReject = null;
   _openAbortController = null;
-  _isOpen = false;
+  _openState = {
+    isOpen: false,
+    isNeedLaunch: undefined
+  };
   constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher) {
     this.rtmClient = rtmClient;
     this.config = config;
@@ -59,8 +67,8 @@ export class FcrBaseWhiteboardControlImpl {
       this.forgeInitConfig = forgeInitConfig;
       this.logger.info(`fetch forge init config success, config: ${jsonstring(forgeInitConfig)}`);
       this.forgeInitConfigTask.stop();
-      if (this._isOpen) {
-        this.connect();
+      if (this._openState.isOpen) {
+        this.connect(this._openState.isNeedLaunch);
       }
     }, INIT_CONFIG_FETCH_INTERVAL);
     this.addLogObserver();
@@ -68,17 +76,17 @@ export class FcrBaseWhiteboardControlImpl {
   setOperationPrivilege(hasOperationPrivilege) {
     if (this.hasOperationPrivilege !== hasOperationPrivilege) {
       this.hasOperationPrivilege = hasOperationPrivilege;
-      const whiteboard = this.whiteboard;
+      const boardRoom = this.boardRoom;
       const boardView = this.boardView;
-      if (whiteboard) {
+      if (boardRoom) {
         if (hasOperationPrivilege) {
-          whiteboard.permissions.addPermission(WhiteboardPermissionFlag.all);
+          boardRoom.setWritable(true);
           if (boardView) {
             // @ts-expect-error
             boardView._observable.notifyObservers('onWritable', true);
           }
         } else {
-          whiteboard.permissions.removePermission(WhiteboardPermissionFlag.all);
+          boardRoom.setWritable(false);
           if (boardView) {
             // @ts-expect-error
             boardView._observable.notifyObservers('onWritable', false);
@@ -86,24 +94,17 @@ export class FcrBaseWhiteboardControlImpl {
         }
       }
     }
+    return FcrReturnCode.SUCCESS;
   }
   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;
+    this.logger.error('subclass must implement open method, not call base class method');
+    throw generateFcrCoreClientError(FcrErrorModuleCode.FCR_ROOM_WHITEBOARD, FcrErrorCode.UNDEFINED_ERROR, 'subclass must implement open method, not call base class method', new Error('subclass must implement open method, not call base class method'));
   }
   async close() {
-    this._isOpen = false;
+    this._openState = {
+      isOpen: false,
+      isNeedLaunch: undefined
+    };
     if (!this.forgeInitConfigTask.isStopped) {
       this.forgeInitConfigTask.stop();
     }
@@ -122,7 +123,6 @@ export class FcrBaseWhiteboardControlImpl {
       this.whiteboard = null;
       if (boardRoom) {
         boardRoom.applicationManager.removeAllListeners();
-        boardRoom.applicationManager.terminateApplication(this.getApplicationId());
         await boardRoom.leaveRoom();
       }
     } catch (e) {
@@ -130,6 +130,7 @@ export class FcrBaseWhiteboardControlImpl {
     } finally {
       this.updateConnectionState(FcrConnectionState.DISCONNECTED);
     }
+    return FcrReturnCode.SUCCESS;
   }
   getConnectionState() {
     return this.connectState;
@@ -143,6 +144,24 @@ export class FcrBaseWhiteboardControlImpl {
   removeObserver(observer) {
     this.observable.removeObserver(observer);
   }
+  internalOpen(isNeedLaunch) {
+    this._openState = {
+      isOpen: true,
+      isNeedLaunch: isNeedLaunch
+    };
+    const isReadyToConnect = this._checkForConnect();
+    if (isReadyToConnect) {
+      return this.connect(isNeedLaunch);
+    }
+    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;
+  }
   updateConnectionState(state) {
     if (this.connectState === state) {
       return;
@@ -152,7 +171,7 @@ export class FcrBaseWhiteboardControlImpl {
     this.logger.info(`Connection state updated: ${FcrConnectionState[oldState]} -> ${FcrConnectionState[state]}`);
     this.observable.notifyObservers('onConnectionStateUpdated', state);
   }
-  async connect() {
+  async connect(isNeedLaunch) {
     if (this.boardView) {
       this.logger.info('board already connected, returning existing board view');
       return this.boardView;
@@ -175,13 +194,13 @@ export class FcrBaseWhiteboardControlImpl {
         boardToken
       } = this.forgeInitConfig || {};
       if (!boardAppId) {
-        throw generateFcrCoreClientError(FcrErrorModuleCode.ROOM_WHITEBOARD, FcrErrorCode.UNDEFINED_ERROR, 'boardAppId is required', new Error('boardAppId is required'));
+        throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM_WHITEBOARD, DetailErrorCode.UNDEFINED_ERROR, 'boardAppId is required', new Error('boardAppId is required'));
       }
       if (!boardId) {
-        throw generateFcrCoreClientError(FcrErrorModuleCode.ROOM_WHITEBOARD, FcrErrorCode.UNDEFINED_ERROR, 'boardId is required', new Error('boardId is required'));
+        throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM_WHITEBOARD, DetailErrorCode.UNDEFINED_ERROR, 'boardId is required', new Error('boardId is required'));
       }
       if (!boardToken) {
-        throw generateFcrCoreClientError(FcrErrorModuleCode.ROOM_WHITEBOARD, FcrErrorCode.UNDEFINED_ERROR, 'boardToken is required', new Error('boardToken is required'));
+        throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM_WHITEBOARD, DetailErrorCode.UNDEFINED_ERROR, 'boardToken is required', new Error('boardToken is required'));
       }
       const whiteboardOption = this.getWhiteboardOption();
       let width = whiteboardOption.width;
@@ -194,7 +213,7 @@ export class FcrBaseWhiteboardControlImpl {
         this.logger.warn(`board height is a invalid value: ${height}, using default value 600`);
         whiteboardOption.height = 600;
       }
-      this.logger.info(`open board with boardId: ${boardId}, boardToken: ${boardToken}, region: ${boardRegion}, whiteboardOption: ${jsonstring(whiteboardOption)}`);
+      this.logger.info(`open board with boardId: ${boardId}, boardToken: ${boardToken}, region: ${boardRegion}, appIdentifier: ${boardAppId} whiteboardOption: ${jsonstring(whiteboardOption)}`);
       const rtmProvider = new RTMProvider_2_2(this.rtmClient);
       const wbRoom = new Room(boardId, rtmProvider);
       wbRoom.applicationManager.registerApplication(WhiteboardApplication);
@@ -205,6 +224,23 @@ export class FcrBaseWhiteboardControlImpl {
         let whiteboard = null;
         let boardRoom = wbRoom;
         const appId = this.getApplicationId();
+        let getWhiteboard;
+
+        // 第一个开启白板的人需要调用 launch 方法, 其他人监听 launch 事件获取白板实例
+        if (isNeedLaunch) {
+          getWhiteboard = () => {
+            return wbRoom.applicationManager.launchApplication(WhiteboardApplication, whiteboardOption, appId);
+          };
+        } else {
+          const launchPromise = new Promise((launchPromseResolve, launchPromseReject) => {
+            wbRoom.applicationManager.once('launch', (appId, app) => {
+              launchPromseResolve(app);
+            });
+          });
+          getWhiteboard = () => {
+            return launchPromise;
+          };
+        }
         [error] = await to(retryAttempt(async () => {
           const joinRoomParams = {
             userId,
@@ -213,15 +249,23 @@ export class FcrBaseWhiteboardControlImpl {
             sdkConfig: {
               region: boardRegion,
               appIdentifier: boardAppId
-            }
+            },
+            writable: true
             // verboseLog: true,
           };
           this.logger.info(`join params: ${jsonstring(joinRoomParams)}`);
-          await wbRoom.joinRoom(joinRoomParams);
+
+          // 20 秒超时
+          await wbRoom.joinRoom(joinRoomParams, WHITEBOARD_ROOM_JOIN_TIMEOUT);
           boardRoom = wbRoom;
-          whiteboard = await wbRoom.applicationManager.launchApplication(WhiteboardApplication, whiteboardOption, appId);
+          whiteboard = await getWhiteboard();
+          if (isNeedLaunch) {
+            // 在同一个房间内只有第一次调用 launchApplication 时传入的宽高参数会生效, 后续的调用不会生效, 所以需要在这里更新宽高
+            // 只有 launch 的用户需要更新宽、高, 白板会自动同步给后加入的用户
+            whiteboard.updateViewport(width, height);
+          }
         }, [], {
-          retriesMax: BOARD_RETRY_MAX
+          retriesMax: 0
         }).fail(async ({
           error,
           timeFn,
@@ -250,9 +294,9 @@ export class FcrBaseWhiteboardControlImpl {
         this.boardView = boardView;
         this.boardRoom = boardRoom;
         if (this.hasOperationPrivilege) {
-          whiteboard.permissions.addPermission(WhiteboardPermissionFlag.all);
+          this.boardRoom.setWritable(true);
         } else {
-          whiteboard.permissions.removePermission(WhiteboardPermissionFlag.all);
+          this.boardRoom.setWritable(false);
         }
         this.updateConnectionState(FcrConnectionState.CONNECTED);
         resolve(boardView);
@@ -290,7 +334,7 @@ export class FcrBaseWhiteboardControlImpl {
     return 'rgba(0, 0, 0, 0)';
   }
   addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onConnectionStateUpdated']));
+    this.addObserver(generateLogObserver(this.logger, [['onConnectionStateUpdated', ['state']]]));
   }
   _checkForConnect() {
     return !!this.forgeInitConfig;

package/lib-es/room-control/whiteboard-control-v2/base/main-window.js

@@ -15,7 +15,7 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto, _setBackgroundColorDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _insertImageDecs, _setContainerSizeRatioDecs, _setBoardTransparentDecs, _updateWindowSizeDecs, _setAutoCancelDrawDecs;
+let _initProto, _setBackgroundColorDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _insertImageDecs, _setContainerSizeRatioDecs, _setBoardTransparentDecs, _updateWindowSizeDecs, _setAutoCancelDrawDecs, _handleApplicationLaunchDecs, _handleApplicationTerminalDecs, _enableAutoCancelDecs;
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.some.js";
 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)]; } }; }
@@ -32,11 +32,12 @@ import { stringSchema } from 'agora-foundation/lib/utilities/schema';
 import validateParams from '../../../utilities/validate-params';
 import { booleanSchema, colorSchema, fcrBoardToolTypeSchema, fcrSizeSchema, numberSchema, z } from '../../../schema';
 import { bound } from 'agora-foundation/lib/decorator';
+import { FcrReturnCode } from '../../../type';
 export class FcrBoardMainWindowImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "addPage"], [trace, 2, "removePage"], [trace, 2, "undo"], [trace, 2, "redo"], [trace, 2, "clean"], [trace, 2, "getSnapshotImage"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [trace, 2, "getPageInfo"], [trace, 2, "prevPage"], [trace, 2, "nextPage"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_insertImageDecs, 2, "insertImage"], [trace, 2, "getContentView"], [_setContainerSizeRatioDecs, 2, "setContainerSizeRatio"], [_setBoardTransparentDecs, 2, "setBoardTransparent"], [_updateWindowSizeDecs, 2, "updateWindowSize"], [_setAutoCancelDrawDecs, 2, "setAutoCancelDraw"], [trace, 2, "getWritable"], [[bound, trace], 2, "_handleApplicationLaunch"], [[bound, trace], 2, "_handleApplicationTerminal"], [trace, 2, "_enableAutoCancel"]], []).e;
+    [_initProto] = _applyDecs(this, [[trace, 2, "addPage"], [trace, 2, "removePage"], [trace, 2, "undo"], [trace, 2, "redo"], [trace, 2, "clean"], [trace, 2, "getSnapshotImage"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [trace, 2, "getPageInfo"], [trace, 2, "prevPage"], [trace, 2, "nextPage"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_insertImageDecs, 2, "insertImage"], [trace, 2, "getContentView"], [_setContainerSizeRatioDecs, 2, "setContainerSizeRatio"], [_setBoardTransparentDecs, 2, "setBoardTransparent"], [_updateWindowSizeDecs, 2, "updateWindowSize"], [_setAutoCancelDrawDecs, 2, "setAutoCancelDraw"], [trace, 2, "getWritable"], [_handleApplicationLaunchDecs, 2, "_handleApplicationLaunch"], [_handleApplicationTerminalDecs, 2, "_handleApplicationTerminal"], [_enableAutoCancelDecs, 2, "_enableAutoCancel"]], []).e;
   }
-  [(_setBackgroundColorDecs = [trace, validateParams(stringSchema)], _setToolTypeDecs = [trace, validateParams(fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [trace, validateParams(numberSchema)], _setStrokeColorDecs = [trace, validateParams(z.union([colorSchema, stringSchema]))], _setTextColorDecs = [trace, validateParams(colorSchema)], _setTextSizeDecs = [trace, validateParams(numberSchema)], _insertImageDecs = [trace, validateParams(stringSchema, numberSchema, numberSchema, numberSchema, numberSchema)], _setContainerSizeRatioDecs = [trace, validateParams(numberSchema)], _setBoardTransparentDecs = [trace, validateParams(booleanSchema)], _updateWindowSizeDecs = [trace, validateParams(fcrSizeSchema)], _setAutoCancelDrawDecs = [trace, validateParams(booleanSchema)], "logger")] = (_initProto(this), createLogger({
+  [(_setBackgroundColorDecs = [trace(['color']), validateParams(stringSchema)], _setToolTypeDecs = [trace(['type']), validateParams(fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [trace(['strokeWidth']), validateParams(numberSchema)], _setStrokeColorDecs = [trace(['color']), validateParams(z.union([colorSchema, stringSchema]))], _setTextColorDecs = [trace(['color']), validateParams(colorSchema)], _setTextSizeDecs = [trace(['textSize']), validateParams(numberSchema)], _insertImageDecs = [trace(['resourceUrl', 'x', 'y', 'width', 'height']), validateParams(stringSchema, numberSchema, numberSchema, numberSchema, numberSchema)], _setContainerSizeRatioDecs = [trace(['ratio']), validateParams(numberSchema)], _setBoardTransparentDecs = [trace(['isTransparent']), validateParams(booleanSchema)], _updateWindowSizeDecs = [trace(['size']), validateParams(fcrSizeSchema)], _setAutoCancelDrawDecs = [trace(['enable']), validateParams(booleanSchema)], _handleApplicationLaunchDecs = [bound, trace(['appId', 'app'])], _handleApplicationTerminalDecs = [bound, trace(['appId', 'app'])], _enableAutoCancelDecs = trace(['enable']), "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrBoardMainWindowImpl'
   }));
   _observable = new AgoraObservable();
@@ -62,18 +63,23 @@ export class FcrBoardMainWindowImpl {
   }
   async addPage() {
     this._whiteboard.addPage('next');
+    return FcrReturnCode.SUCCESS;
   }
   async removePage() {
     this._whiteboard.deletePage('current');
+    return FcrReturnCode.SUCCESS;
   }
   async undo() {
     this._whiteboard.undo();
+    return FcrReturnCode.SUCCESS;
   }
   async redo() {
     this._whiteboard.redo();
+    return FcrReturnCode.SUCCESS;
   }
   async clean() {
     this._whiteboard.clearPage();
+    return FcrReturnCode.SUCCESS;
   }
   async getSnapshotImage() {
     if (this._whiteboard) {
@@ -107,6 +113,7 @@ export class FcrBoardMainWindowImpl {
     this._background = color;
     this.logger.info(`set canvas background color: ${this._background}`);
     this._whiteboard.setCanvasBackgroundColor(color);
+    return FcrReturnCode.SUCCESS;
   }
   getPageInfo() {
     return {
@@ -116,9 +123,11 @@ export class FcrBoardMainWindowImpl {
   }
   async prevPage() {
     this._whiteboard.indexedNavigation.prevPage();
+    return FcrReturnCode.SUCCESS;
   }
   async nextPage() {
     this._whiteboard.indexedNavigation.nextPage();
+    return FcrReturnCode.SUCCESS;
   }
   async setToolType(type) {
     if (this._whiteboard) {
@@ -127,6 +136,7 @@ export class FcrBoardMainWindowImpl {
     } else {
       throw new Error('Whiteboard is not initialized');
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setStrokeWidth(strokeWidth) {
     if (this._whiteboard) {
@@ -134,6 +144,7 @@ export class FcrBoardMainWindowImpl {
     } else {
       throw new Error('Whiteboard is not initialized');
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setStrokeColor(color) {
     const c = typeof color === 'string' ? color : `rgb(${color.r},${color.g},${color.b})`;
@@ -142,6 +153,7 @@ export class FcrBoardMainWindowImpl {
     } else {
       throw new Error('Whiteboard is not initialized');
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setTextColor(color) {
     const c = typeof color === 'string' ? color : `rgb(${color.r},${color.g},${color.b})`;
@@ -150,6 +162,7 @@ export class FcrBoardMainWindowImpl {
     } else {
       throw new Error('Whiteboard is not initialized');
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setTextSize(textSize) {
     if (this._whiteboard) {
@@ -157,6 +170,7 @@ export class FcrBoardMainWindowImpl {
     } else {
       throw new Error('Whiteboard is not initialized');
     }
+    return FcrReturnCode.SUCCESS;
   }
   async insertImage(resourceUrl, x, y, width, height) {}
   getContentView() {
@@ -166,10 +180,12 @@ export class FcrBoardMainWindowImpl {
   async setBoardTransparent(isTransparent) {}
   updateWindowSize(size) {
     size && this._whiteboard.updateViewport(size.width, size.height);
+    return FcrReturnCode.SUCCESS;
   }
   setAutoCancelDraw(enable) {
     this._isAutoCancelEnabled = enable;
     this._enableAutoCancel(enable);
+    return FcrReturnCode.SUCCESS;
   }
   getWritable() {
     return this._whiteboard.permissions.getPermissionFlags().some(flag => {
@@ -220,6 +236,7 @@ export class FcrBoardMainWindowImpl {
     }
     this._boardView.setAttribute('data-app-id', appId);
     this._boardView.appendChild(app.view);
+    return FcrReturnCode.SUCCESS;
   }
   _handleApplicationTerminal(appId, app) {
     try {
@@ -232,6 +249,7 @@ export class FcrBoardMainWindowImpl {
     } catch (e) {
       this.logger.error(`failed to handle terminal: ${appId}`, e);
     }
+    return FcrReturnCode.SUCCESS;
   }
   _setBoardViewStyle(view) {
     view.style.height = `100%`;
@@ -243,8 +261,9 @@ export class FcrBoardMainWindowImpl {
     this._whiteboard.__setMainCanvasVisible(!enable);
     // @ts-ignore
     this._whiteboard.__delayTranslateOut = enable ? 4000 : -1;
+    return FcrReturnCode.SUCCESS;
   }
   _addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onWritable', 'onPageInfoUpdated', 'onUndoStateUpdated', 'onRedoStateUpdated']));
+    this.addObserver(generateLogObserver(this.logger, [['onWritable', ['isWritable']], ['onPageInfoUpdated', ['info']], ['onUndoStateUpdated', ['enable']], ['onRedoStateUpdated', ['enable']]]));
   }
 }

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

@@ -15,35 +15,38 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-var _ref;
-let _initProto, _setBackgroundColorDecs;
+var _ref, _ref2;
+let _initProto, _setBackgroundColorDecs, _initProto2;
 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; }
+import { ErrorModuleCode } from '../../../imports';
 import { bound, get, trace } from '../../../imports';
-import { convertRteUserToFcrUser } from '../../../utilities/user';
-import { FcrErrorModuleCode, handleRequestError } from '../../../utilities/error';
 import { stringSchema } from '../../../schema';
+import { FcrReturnCode } from '../../../type';
+import { handleRequestError } from '../../../utilities/error';
+import { createLogger, generateLogObserver } from '../../../utilities/logger';
 import { getDependenciesInfo } from '../../../utilities/package-info';
+import { convertRteUserToFcrUser } from '../../../utilities/user';
 import validateParams from '../../../utilities/validate-params';
+import { FcrSharePermissionState } from '../../sharing-control/type';
+import { FcrBoardPropertiesState } from '../../whiteboard-control/type';
 import { FcrBaseWhiteboardControlImpl } from '../base';
 import { WHITEBOARD_APP_ID } from '../constant';
-import { FcrBoardPropertiesState } from '../../whiteboard-control/type';
-import { FcrSharePermissionState } from '../../sharing-control/type';
-import { createLogger, generateLogObserver } from '../../../utilities/logger';
 import { WHITEBOARD_HEIGHT, WHITEBOARD_WIDTH } from '../utils';
 export class FcrWhiteboardControlImpl extends (_ref = FcrBaseWhiteboardControlImpl) {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "active"], [trace, 2, "inactive"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [trace, 2, "getBackgroundColor"], [trace, 2, "getActivity"], [trace, 2, "getOwnerId"], [bound, 2, "_onScenePropertiesUpdated"]], [], 0, void 0, _ref).e;
+    [_initProto] = _applyDecs(this, [[trace, 2, "open"], [trace, 2, "close"], [trace, 2, "active"], [trace, 2, "inactive"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [trace, 2, "getBackgroundColor"], [trace, 2, "getActivity"], [trace, 2, "getOwnerId"], [bound, 2, "_onScenePropertiesUpdated"]], [], 0, void 0, _ref).e;
   }
-  [(_setBackgroundColorDecs = [trace, validateParams(stringSchema)], "logger")] = (_initProto(this), createLogger({
+  [(_setBackgroundColorDecs = [trace(['backgroundColor']), validateParams(stringSchema)], "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrWhiteboardControlImpl'
   }));
   _backgroundColor = '#ffffff';
   _isActive = false;
   _ownerId = null;
+  _preloadLock = false;
   _notifyObservers = {
     onScenePropertiesUpdated: this._onScenePropertiesUpdated
   };
@@ -65,11 +68,41 @@ export class FcrWhiteboardControlImpl extends (_ref = FcrBaseWhiteboardControlIm
     }
     this.logger.info(`initialized, hasOperationPrivilege: ${hasOperationPrivilege}`);
   }
+  async open() {
+    const boardActiveInfo = this.getBoardActiveInfo();
+    if (!boardActiveInfo.isActive) {
+      await handleRequestError(() => this._api.toggleWhiteboardPreloadState(this.config.roomId, FcrSharePermissionState.ON), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'lock failed when open whiteboard');
+
+      // 标记白板锁状态, 关闭白板时判断是否需要解锁
+      this._preloadLock = true;
+      try {
+        this._isActive = true;
+        return await super.internalOpen(true);
+      } catch (error) {
+        // 开启失败, 释放锁
+        this._preloadLock = false;
+        this._isActive = false;
+        await handleRequestError(() => this._api.toggleWhiteboardPreloadState(this.config.roomId, FcrSharePermissionState.OFF), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'unlock failed when open whiteboard');
+        throw error;
+      }
+    } else {
+      return await super.internalOpen(false);
+    }
+  }
+  async close() {
+    const result = await super.close();
+    if (this._preloadLock) {
+      // 释放白板锁
+      await handleRequestError(() => this._api.toggleWhiteboardPreloadState(this.config.roomId, FcrSharePermissionState.OFF), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'unlock failed when close whiteboard');
+      this._preloadLock = false;
+    }
+    return result;
+  }
   async active() {
-    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this.config.roomId, FcrSharePermissionState.ON), FcrErrorModuleCode.ROOM_WHITEBOARD, 'active failed');
+    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this.config.roomId, FcrSharePermissionState.ON), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'active failed');
   }
   async inactive() {
-    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this.config.roomId, FcrSharePermissionState.OFF), FcrErrorModuleCode.ROOM_WHITEBOARD, 'inactive failed');
+    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this.config.roomId, FcrSharePermissionState.OFF), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'inactive failed');
   }
   getBoardActiveInfo() {
     const {
@@ -97,6 +130,7 @@ export class FcrWhiteboardControlImpl extends (_ref = FcrBaseWhiteboardControlIm
     if (this.boardView) {
       this.boardView.setBackgroundColor(backgroundColor);
     }
+    return FcrReturnCode.SUCCESS;
   }
   getBackgroundColor() {
     return this._backgroundColor;
@@ -107,6 +141,9 @@ export class FcrWhiteboardControlImpl extends (_ref = FcrBaseWhiteboardControlIm
   getOwnerId() {
     return this._ownerId;
   }
+  getApplicationId() {
+    return WHITEBOARD_APP_ID;
+  }
   _onScenePropertiesUpdated(sceneId, event) {
     const operatorUser = convertRteUserToFcrUser(event.operatorUser, this._roomCache);
     const getByKeyPath = value => this._scene.getScenePropertiesByKeyPath(value);
@@ -140,10 +177,20 @@ export class FcrWhiteboardControlImpl extends (_ref = FcrBaseWhiteboardControlIm
     };
   }
   addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onConnectionStateUpdated', 'onActive', 'onInactive', 'onBackgroundColorUpdated']));
+    this.addObserver(generateLogObserver(this.logger, [['onConnectionStateUpdated', ['state']], ['onActive', ['ownerId', 'operatorUser']], ['onInactive', ['reason', 'operatorUser']], ['onBackgroundColorUpdated', ['color', 'operatorUser']]]));
   }
 }
-export class FcrStandaloneWhiteboardControlImpl extends FcrBaseWhiteboardControlImpl {
+export class FcrStandaloneWhiteboardControlImpl extends (_ref2 = FcrBaseWhiteboardControlImpl) {
+  static {
+    [_initProto2] = _applyDecs(this, [[trace, 2, "open"]], [], 0, void 0, _ref2).e;
+  }
+  constructor(...args) {
+    super(...args);
+    _initProto2(this);
+  }
+  async open() {
+    return await super.internalOpen(false);
+  }
   getApplicationId() {
     return WHITEBOARD_APP_ID;
   }

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

@@ -15,30 +15,30 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto;
+let _initProto, _createForSubProcessDecs, _createForMainProcessDecs;
 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; }
-import { createLogger } from '../../../utilities/logger';
-import { FcrErrorCode, FcrErrorModuleCode, generateFcrCoreClientError, handleRequestError } from '../../../utilities/error';
 import { trace } from 'agora-foundation/lib/decorator/log';
-import { FcrBaseWhiteboardControlImpl } from '../base';
-import { FcrWhiteboardControlImpl } from './control';
+import { DetailErrorCode, ErrorModuleCode } from 'agora-foundation/lib/utilities/error/error-code';
+import { generateFcrCoreClientError, handleRequestError } from '../../../utilities/error';
+import { createLogger } from '../../../utilities/logger';
 import { getWhiteboardOptions } from '../../../utilities/shared-storage';
+import { FcrStandaloneWhiteboardControlImpl, FcrWhiteboardControlImpl } from './control';
 export class FcrWhiteboardControlFactoryImpl {
   static {
-    [_initProto] = _applyDecs(this, [[trace, 2, "createForSubProcess"], [trace, 2, "createForMainProcess"]], []).e;
+    [_initProto] = _applyDecs(this, [[_createForSubProcessDecs, 2, "createForSubProcess"], [_createForMainProcessDecs, 2, "createForMainProcess"]], []).e;
   }
-  logger = (_initProto(this), createLogger({
+  [(_createForSubProcessDecs = trace(['rtmClient', 'hasOperationPrivilege', 'boardConfig']), _createForMainProcessDecs = trace(['rtmClient', 'hasOperationPrivilege', 'boardConfig', 'scene', 'api', 'sharedCache']), "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrWhiteboardControlFactory'
   }));
   createForSubProcess(rtmClient, hasOperationPrivilege, boardConfig) {
-    return new FcrBaseWhiteboardControlImpl(rtmClient, boardConfig, hasOperationPrivilege, () => {
+    return new FcrStandaloneWhiteboardControlImpl(rtmClient, boardConfig, hasOperationPrivilege, () => {
       const forgeInitConfig = getWhiteboardOptions();
       if (!forgeInitConfig) {
-        throw generateFcrCoreClientError(FcrErrorModuleCode.ROOM_WHITEBOARD, FcrErrorCode.UNDEFINED_ERROR, `whiteboard init config is not exist`, new Error(`whiteboard init config is not exist`));
+        throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM_WHITEBOARD, DetailErrorCode.UNDEFINED_ERROR, `whiteboard init config is not exist`, new Error(`whiteboard init config is not exist`));
       }
       return Promise.resolve(forgeInitConfig);
     });
@@ -51,7 +51,7 @@ export class FcrWhiteboardControlFactoryImpl {
       return await handleRequestError(() => api.getWhiteboardToken({
         roomId,
         userId
-      }), FcrErrorModuleCode.ROOM_WHITEBOARD, 'get whiteboard token failed');
+      }), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'get whiteboard token failed');
     };
     return async () => {
       const response = await getObjectInitConfig(roomId, userId);