fcr-core 3.8.2 → 3.9.0-alpha

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

@@ -4,26 +4,48 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrStandaloneAnnotationControlImpl = exports.FcrAnnotationControlImpl = void 0;
+var _error = require("../../../utilities/error");
 var _logger = require("../../../utilities/logger");
 var _base = require("../base");
 var _constant = require("../constant");
+var _type = require("../../whiteboard-control/type");
 class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
   logger = (0, _logger.createLogger)({
     prefix: 'FcrAnnotationControlImpl'
   });
-  constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher) {
+  constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher, _sceneConfig, _api) {
     super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
     this.rtmClient = rtmClient;
     this.config = config;
+    this._sceneConfig = _sceneConfig;
+    this._api = _api;
     this.logger.info(`initialized, hasOperationPrivilege: ${hasOperationPrivilege}`);
   }
+  async syncScreenShareOwnerAnnotationOpenDone() {
+    try {
+      await this._api.syncScreenShareOwnerAnnotationOpenDone(this._sceneConfig.sceneId);
+      return 0;
+    } catch (e) {
+      const error = e;
+      const errorMessage = error.message;
+      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `sync screen share owner annotation open done failed: ${errorMessage}`, error);
+    }
+  }
+  async open() {
+    const state = this._sceneConfig.getAnnotationState();
+    if (state === _type.FcrBoardPropertiesState.INACTIVE) {
+      return await super.internalOpen(true);
+    } else {
+      return await super.internalOpen(false);
+    }
+  }
   getApplicationId() {
     return _constant.ANNOTATION_APP_ID;
   }
   getWhiteboardOption() {
     return {
-      width: 800,
-      height: 600,
+      width: this.config.size.width,
+      height: this.config.size.height,
       defaultToolbarStyle: {
         tool: 'laser'
       },
@@ -33,13 +55,25 @@ class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
 }
 exports.FcrAnnotationControlImpl = FcrAnnotationControlImpl;
 class FcrStandaloneAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
+  logger = (0, _logger.createLogger)({
+    prefix: 'FcrStandaloneAnnotationControlImpl'
+  });
+  constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher) {
+    super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
+    this.rtmClient = rtmClient;
+    this.config = config;
+    this.logger.info(`initialized, hasOperationPrivilege: ${hasOperationPrivilege}`);
+  }
+  async open() {
+    return await super.internalOpen(true);
+  }
   getApplicationId() {
     return _constant.ANNOTATION_APP_ID;
   }
   getWhiteboardOption() {
     return {
-      width: 800,
-      height: 600,
+      width: this.config.size.width,
+      height: this.config.size.height,
       defaultToolbarStyle: {
         tool: 'laser'
       },

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

@@ -1,10 +1,9 @@
-import { FcrAnnotationConfig, FcrAnnotationControl, FcrAnnotationControlFactory } from './type';
-import { FcrAnnotationControlImpl } from './control';
+import { FcrAnnotationConfig, FcrAnnotationControl, FcrAnnotationControlFactory, FcrAnnotationSceneConfig, FcrStandaloneAnnotationControl } from './type';
 import { FcrCoreServiceApi } from '../../../service/api';
 import type { RTMClient } from 'agora-rtm';
 export declare class FcrAnnotationControlFactoryImpl implements FcrAnnotationControlFactory {
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    createForSubProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig): FcrAnnotationControl;
-    createForMainProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig, api: FcrCoreServiceApi): FcrAnnotationControlImpl;
+    protected logger: import("agora-foundation/lib/logger/type").Logger;
+    createForSubProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig): FcrStandaloneAnnotationControl;
+    createForMainProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig, annotationSceneConfig: FcrAnnotationSceneConfig, api: FcrCoreServiceApi): FcrAnnotationControl;
     private _createForgeInitConfigFetcher;
 }

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

@@ -9,22 +9,23 @@ var _control = require("./control");
 var _logger = require("../../../utilities/logger");
 var _error = require("../../../utilities/error");
 var _sharedStorage = require("../../../utilities/shared-storage");
+var _imports = require("../../../imports");
 class FcrAnnotationControlFactoryImpl {
   logger = (0, _logger.createLogger)({
     prefix: 'FcrAnnotationControlFactory'
   });
   createForSubProcess(rtmClient, hasOperationPrivilege, config) {
-    this.logger.info(`[annotation]: create for sub process with config: ${JSON.stringify(config)}`);
+    this.logger.info(`create for sub process with config: ${JSON.stringify(config)}`);
     return new _control.FcrStandaloneAnnotationControlImpl(rtmClient, config, hasOperationPrivilege, () => {
       const forgeInitConfig = (0, _sharedStorage.getAnnotationBoardOptions)();
       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`));
+        throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.UNDEFINED_ERROR, `whiteboard init config is not exist`, new Error(`whiteboard init config is not exist`));
       }
       return Promise.resolve(forgeInitConfig);
     });
   }
-  createForMainProcess(rtmClient, hasOperationPrivilege, config, api) {
-    const control = new _control.FcrAnnotationControlImpl(rtmClient, config, hasOperationPrivilege, this._createForgeInitConfigFetcher(api, config.roomId, config.userId));
+  createForMainProcess(rtmClient, hasOperationPrivilege, config, annotationSceneConfig, api) {
+    const control = new _control.FcrAnnotationControlImpl(rtmClient, config, hasOperationPrivilege, this._createForgeInitConfigFetcher(api, config.roomId, config.userId), annotationSceneConfig, api);
     return control;
   }
   _createForgeInitConfigFetcher(api, roomId, userId) {
@@ -32,7 +33,7 @@ class FcrAnnotationControlFactoryImpl {
       return await (0, _error.handleRequestError)(() => api.getAnnotationToken({
         roomId,
         userId
-      }), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'get annotation token failed');
+      }), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'get annotation token failed');
     };
     return async () => {
       const response = await getObjectInitConfig(roomId, userId);

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

@@ -2,9 +2,11 @@ import { FcrBaseWhiteboardControl, FcrBaseWhiteboardObserver } from '../type';
 import { FcrBoardConfig } from '../whiteboard-control/type';
 import { FcrCoreServiceApi } from '../../../service/api';
 import type { RTMClient } from 'agora-rtm';
+import { FcrBoardPropertiesState } from '../../whiteboard-control/type';
 export interface FcrStandaloneAnnotationControl extends FcrBaseWhiteboardControl<FcrBaseWhiteboardObserver> {
 }
 export interface FcrAnnotationControl extends FcrBaseWhiteboardControl<FcrBaseWhiteboardObserver> {
+    syncScreenShareOwnerAnnotationOpenDone(): Promise<number>;
 }
 export interface FcrAnnotationControObserver extends FcrBaseWhiteboardObserver {
 }
@@ -31,7 +33,11 @@ export type FcrAnnotationConfig = FcrBoardConfig & {
         height: number;
     };
 };
+export type FcrAnnotationSceneConfig = {
+    sceneId: string;
+    getAnnotationState: () => FcrBoardPropertiesState;
+};
 export interface FcrAnnotationControlFactory {
     createForSubProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig): FcrStandaloneAnnotationControl;
-    createForMainProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig, api: FcrCoreServiceApi): FcrAnnotationControl;
+    createForMainProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig, annotationSceneConfig: FcrAnnotationSceneConfig, api: FcrCoreServiceApi): FcrAnnotationControl;
 }

package/lib/room-control/whiteboard-control-v2/base/index.d.ts

@@ -1,11 +1,11 @@
-import { FcrBaseWhiteboardControl, FcrBaseWhiteboardObserver, FcrBoardMainWindow, FcrObjectForgeInitConfig } from '../type';
+import { Room } from '@netless/forge-room';
+import { Whiteboard, WhiteboardOption } from '@netless/forge-whiteboard';
 import { AgoraRteConnectionState } from 'agora-rte-sdk';
 import type { RTMClient } from 'agora-rtm';
 import { AgoraObservable, AgoraScheduler } from '../../../imports';
-import { FcrBoardConfig } from '../whiteboard-control/type';
-import { Room } from '@netless/forge-room';
-import { Whiteboard, WhiteboardOption } from '@netless/forge-whiteboard';
 import { FcrConnectionState } from '../../../type';
+import { FcrBaseWhiteboardControl, FcrBaseWhiteboardObserver, FcrBoardMainWindow, FcrObjectForgeInitConfig } from '../type';
+import { FcrBoardConfig } from '../whiteboard-control/type';
 export declare class FcrBaseWhiteboardControlImpl<T extends FcrBaseWhiteboardObserver> implements FcrBaseWhiteboardControl<T> {
     protected rtmClient: RTMClient;
     protected config: FcrBoardConfig;
@@ -22,17 +22,18 @@ export declare class FcrBaseWhiteboardControlImpl<T extends FcrBaseWhiteboardObs
     private _waitPromiseResolve;
     private _waitPromiseReject;
     private _openAbortController;
-    private _isOpen;
+    private _openState;
     constructor(rtmClient: RTMClient, config: FcrBoardConfig, hasOperationPrivilege: boolean, forgeInitConfigFetcher: () => Promise<FcrObjectForgeInitConfig>);
-    setOperationPrivilege(hasOperationPrivilege: boolean): void;
+    setOperationPrivilege(hasOperationPrivilege: boolean): number;
     open(): Promise<FcrBoardMainWindow>;
-    close(): Promise<void>;
+    close(): Promise<number>;
     getConnectionState(): AgoraRteConnectionState;
     getMainWindow(): FcrBoardMainWindow | null;
     addObserver(observer: T): void;
     removeObserver(observer: T): void;
+    protected internalOpen(isNeedLaunch: boolean): Promise<FcrBoardMainWindow>;
     protected updateConnectionState(state: FcrConnectionState): void;
-    protected connect(): Promise<FcrBoardMainWindow>;
+    protected connect(isNeedLaunch: boolean): Promise<FcrBoardMainWindow>;
     protected getApplicationId(): string;
     protected getWhiteboardOption(): WhiteboardOption;
     protected getBackgroundColor(): string;

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

@@ -22,26 +22,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrBaseWhiteboardControlImpl = void 0;
 require("core-js/modules/es.json.stringify.js");
-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 _forgeRtm = require("@netless/forge-rtm");
 var _forgeWhiteboard = require("@netless/forge-whiteboard");
+var _imports = require("../../../imports");
+var _type = require("../../../type");
 var _error = require("../../../utilities/error");
+var _logger = require("../../../utilities/logger");
+var _constant = require("../constant");
 var _mainWindow = require("./main-window");
-var _type = require("../../../type");
-let _initProto;
+let _initProto, _setOperationPrivilegeDecs;
 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; }
+/** @param isNeedLaunch 是否需要调用白板 luanch 函数 */
+
+const WHITEBOARD_ROOM_JOIN_TIMEOUT = 20000;
 class FcrBaseWhiteboardControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "setOperationPrivilege"], [_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "getConnectionState"], [_imports.trace, 2, "getMainWindow"]], []).e;
+    [_initProto] = _applyDecs(this, [[_setOperationPrivilegeDecs, 2, "setOperationPrivilege"], [_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "getConnectionState"], [_imports.trace, 2, "getMainWindow"]], []).e;
   }
-  logger = (_initProto(this), (0, _logger.createLogger)({
+  [(_setOperationPrivilegeDecs = (0, _imports.trace)(['hasOperationPrivilege']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
     prefix: 'FcrBaseWhiteboardControl'
   }));
   observable = new _imports.AgoraObservable();
@@ -55,7 +58,10 @@ 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;
@@ -65,8 +71,8 @@ class FcrBaseWhiteboardControlImpl {
       this.forgeInitConfig = forgeInitConfig;
       this.logger.info(`fetch forge init config success, config: ${(0, _imports.jsonstring)(forgeInitConfig)}`);
       this.forgeInitConfigTask.stop();
-      if (this._isOpen) {
-        this.connect();
+      if (this._openState.isOpen) {
+        this.connect(this._openState.isNeedLaunch);
       }
     }, _constant.INIT_CONFIG_FETCH_INTERVAL);
     this.addLogObserver();
@@ -74,17 +80,17 @@ 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(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+          boardRoom.setWritable(true);
           if (boardView) {
             // @ts-expect-error
             boardView._observable.notifyObservers('onWritable', true);
           }
         } else {
-          whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+          boardRoom.setWritable(false);
           if (boardView) {
             // @ts-expect-error
             boardView._observable.notifyObservers('onWritable', false);
@@ -92,24 +98,17 @@ class FcrBaseWhiteboardControlImpl {
         }
       }
     }
+    return _type.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 (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_WHITEBOARD, _error.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();
     }
@@ -128,7 +127,6 @@ class FcrBaseWhiteboardControlImpl {
       this.whiteboard = null;
       if (boardRoom) {
         boardRoom.applicationManager.removeAllListeners();
-        boardRoom.applicationManager.terminateApplication(this.getApplicationId());
         await boardRoom.leaveRoom();
       }
     } catch (e) {
@@ -136,6 +134,7 @@ class FcrBaseWhiteboardControlImpl {
     } finally {
       this.updateConnectionState(_type.FcrConnectionState.DISCONNECTED);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   getConnectionState() {
     return this.connectState;
@@ -149,6 +148,24 @@ 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;
@@ -158,7 +175,7 @@ class FcrBaseWhiteboardControlImpl {
     this.logger.info(`Connection state updated: ${_type.FcrConnectionState[oldState]} -> ${_type.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;
@@ -181,13 +198,13 @@ class FcrBaseWhiteboardControlImpl {
         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'));
+        throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.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'));
+        throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.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'));
+        throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.UNDEFINED_ERROR, 'boardToken is required', new Error('boardToken is required'));
       }
       const whiteboardOption = this.getWhiteboardOption();
       let width = whiteboardOption.width;
@@ -200,7 +217,7 @@ 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: ${(0, _imports.jsonstring)(whiteboardOption)}`);
+      this.logger.info(`open board with boardId: ${boardId}, boardToken: ${boardToken}, region: ${boardRegion}, appIdentifier: ${boardAppId} whiteboardOption: ${(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);
@@ -211,6 +228,23 @@ class FcrBaseWhiteboardControlImpl {
         let whiteboard = null;
         let boardRoom = wbRoom;
         const appId = this.getApplicationId();
+        let getWhiteboard;
+
+        // 第一个开启白板的人需要调用 launch 方法, 其他人监听 launch 事件获取白板实例
+        if (isNeedLaunch) {
+          getWhiteboard = () => {
+            return wbRoom.applicationManager.launchApplication(_forgeWhiteboard.WhiteboardApplication, whiteboardOption, appId);
+          };
+        } else {
+          const launchPromise = new Promise((launchPromseResolve, launchPromseReject) => {
+            wbRoom.applicationManager.once('launch', (appId, app) => {
+              launchPromseResolve(app);
+            });
+          });
+          getWhiteboard = () => {
+            return launchPromise;
+          };
+        }
         [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
           const joinRoomParams = {
             userId,
@@ -219,15 +253,23 @@ class FcrBaseWhiteboardControlImpl {
             sdkConfig: {
               region: boardRegion,
               appIdentifier: boardAppId
-            }
+            },
+            writable: true
             // verboseLog: true,
           };
           this.logger.info(`join params: ${(0, _imports.jsonstring)(joinRoomParams)}`);
-          await wbRoom.joinRoom(joinRoomParams);
+
+          // 20 秒超时
+          await wbRoom.joinRoom(joinRoomParams, WHITEBOARD_ROOM_JOIN_TIMEOUT);
           boardRoom = wbRoom;
-          whiteboard = await wbRoom.applicationManager.launchApplication(_forgeWhiteboard.WhiteboardApplication, whiteboardOption, appId);
+          whiteboard = await getWhiteboard();
+          if (isNeedLaunch) {
+            // 在同一个房间内只有第一次调用 launchApplication 时传入的宽高参数会生效, 后续的调用不会生效, 所以需要在这里更新宽高
+            // 只有 launch 的用户需要更新宽、高, 白板会自动同步给后加入的用户
+            whiteboard.updateViewport(width, height);
+          }
         }, [], {
-          retriesMax: _constant.BOARD_RETRY_MAX
+          retriesMax: 0
         }).fail(async ({
           error,
           timeFn,
@@ -256,9 +298,9 @@ class FcrBaseWhiteboardControlImpl {
         this.boardView = boardView;
         this.boardRoom = boardRoom;
         if (this.hasOperationPrivilege) {
-          whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+          this.boardRoom.setWritable(true);
         } else {
-          whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+          this.boardRoom.setWritable(false);
         }
         this.updateConnectionState(_type.FcrConnectionState.CONNECTED);
         resolve(boardView);
@@ -296,7 +338,7 @@ class FcrBaseWhiteboardControlImpl {
     return 'rgba(0, 0, 0, 0)';
   }
   addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onConnectionStateUpdated']));
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onConnectionStateUpdated', ['state']]]));
   }
   _checkForConnect() {
     return !!this.forgeInitConfig;

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

@@ -4,6 +4,7 @@ import { Whiteboard } from '@netless/forge-whiteboard';
 import { Room } from '@netless/forge-room';
 import { FcrSize } from '../../stream-control/type';
 import { FcrBoardPageInfo, FcrColor } from '../../whiteboard-control/type';
+import { FcrReturnCode } from '../../../type';
 export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _whiteboard;
@@ -13,27 +14,27 @@ export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     private _background;
     private _isAutoCancelEnabled;
     constructor(whiteboard: Whiteboard, boardRoom: Room, appId: string);
-    addPage(): Promise<void>;
-    removePage(): Promise<void>;
-    undo(): Promise<void>;
-    redo(): Promise<void>;
-    clean(): Promise<void>;
+    addPage(): Promise<FcrReturnCode>;
+    removePage(): Promise<FcrReturnCode>;
+    undo(): Promise<FcrReturnCode>;
+    redo(): Promise<FcrReturnCode>;
+    clean(): Promise<FcrReturnCode>;
     getSnapshotImage(): Promise<ImageData>;
-    setBackgroundColor(color: string): Promise<void>;
+    setBackgroundColor(color: string): Promise<FcrReturnCode>;
     getPageInfo(): FcrBoardPageInfo;
-    prevPage(): Promise<void>;
-    nextPage(): Promise<void>;
-    setToolType(type: FcrBoardToolType): Promise<void>;
-    setStrokeWidth(strokeWidth: number): Promise<void>;
-    setStrokeColor(color: FcrColor | string): Promise<void>;
-    setTextColor(color: FcrColor): Promise<void>;
-    setTextSize(textSize: number): Promise<void>;
+    prevPage(): Promise<FcrReturnCode>;
+    nextPage(): Promise<FcrReturnCode>;
+    setToolType(type: FcrBoardToolType): Promise<FcrReturnCode>;
+    setStrokeWidth(strokeWidth: number): Promise<FcrReturnCode>;
+    setStrokeColor(color: FcrColor | string): Promise<FcrReturnCode>;
+    setTextColor(color: FcrColor): Promise<FcrReturnCode>;
+    setTextSize(textSize: number): Promise<FcrReturnCode>;
     insertImage(resourceUrl: string, x: number, y: number, width: number, height: number): Promise<void>;
     getContentView(): HTMLElement;
     setContainerSizeRatio(ratio: number): Promise<void>;
     setBoardTransparent(isTransparent: boolean): Promise<void>;
-    updateWindowSize(size: FcrSize): void;
-    setAutoCancelDraw(enable: boolean): void;
+    updateWindowSize(size: FcrSize): FcrReturnCode;
+    setAutoCancelDraw(enable: boolean): FcrReturnCode;
     getWritable(): boolean;
     addObserver(observer: FcrBoardMainWindowObserver): void;
     removeObserver(observer: FcrBoardMainWindowObserver): void;