fcr-core 3.7.9-alpha → 3.8.0-alpha

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

@@ -1,32 +1,18 @@
-import { FcrBoardMainWindow } from '../../whiteboard-control/types';
-import { FcrAnnotationConfig, FcrAnnotationControl } from './type';
-import { Room } from '@netless/forge-room';
-import { Whiteboard } from '@netless/forge-whiteboard';
-import { FcrConnectionState } from '../../../type';
-import { FcrWhiteboardObserver } from '../whiteboard-control/type';
-import { FcrWhiteboardPermissionFlag } from '../../../imports';
-import { AgoraRtmClient } from 'agora-rte-sdk/lib/core/rtm/client';
-import { AgoraObservable } from '../../../imports';
-export declare class FcrAnnotationControlImpl implements FcrAnnotationControl {
-    protected rtmClient: AgoraRtmClient;
-    protected annotationConfig: FcrAnnotationConfig;
-    protected logger: import("agora-rte-sdk/lib/imports").Logger;
-    protected observable: AgoraObservable<FcrWhiteboardObserver>;
-    protected annotation: Whiteboard | undefined;
-    protected connectState: FcrConnectionState;
-    protected boardView: FcrBoardMainWindow | undefined;
-    protected boardRoom: Room | undefined;
-    private _openAbortController;
-    constructor(rtmClient: AgoraRtmClient, annotationConfig: FcrAnnotationConfig);
-    open(): Promise<FcrBoardMainWindow>;
-    close(): Promise<void>;
-    getConnectionState(): FcrConnectionState;
-    getMainWindow(): FcrBoardMainWindow | undefined;
-    addPermission(permission: FcrWhiteboardPermissionFlag): void;
-    removePermission(permission: FcrWhiteboardPermissionFlag): void;
-    addObserver(observer: FcrWhiteboardObserver): void;
-    removeObserver(observer: FcrWhiteboardObserver): void;
-    protected updateConnnectionState(state: FcrConnectionState): void;
-    protected _connect(): Promise<FcrBoardMainWindow>;
-    private _addLogObserver;
+import { FcrBaseWhiteboardObserver, FcrObjectForgeInitConfig } from '../type';
+import { FcrAnnotationControl, FcrStandaloneAnnotationControl } from './type';
+import { FcrBaseWhiteboardControlImpl } from '../base';
+import { WhiteboardOption } from '@netless/forge-whiteboard';
+import { FcrBoardConfig } from '../whiteboard-control/type';
+import type { RTMClient } from 'agora-rtm';
+export declare class FcrAnnotationControlImpl extends FcrBaseWhiteboardControlImpl<FcrBaseWhiteboardObserver> implements FcrAnnotationControl {
+    protected rtmClient: RTMClient;
+    protected config: FcrBoardConfig;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    constructor(rtmClient: RTMClient, config: FcrBoardConfig, hasOperationPrivilege: boolean, forgeInitConfigFetcher: () => Promise<FcrObjectForgeInitConfig>);
+    protected getApplicationId(): string;
+    protected getWhiteboardOption(): WhiteboardOption;
+}
+export declare class FcrStandaloneAnnotationControlImpl extends FcrBaseWhiteboardControlImpl<FcrBaseWhiteboardObserver> implements FcrStandaloneAnnotationControl {
+    protected getApplicationId(): string;
+    protected getWhiteboardOption(): WhiteboardOption;
 }

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

@@ -1,238 +1,52 @@
 "use strict";
 
-require("core-js/modules/es.array.push.js");
-require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-require("core-js/modules/esnext.map.reduce.js");
-require("core-js/modules/esnext.map.some.js");
-require("core-js/modules/esnext.map.update.js");
-require("core-js/modules/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrAnnotationControlImpl = void 0;
-var _type = require("./type");
-var _forgeRoom = require("@netless/forge-room");
-var _forgeWhiteboard = require("@netless/forge-whiteboard");
-var _imports = require("agora-rte-sdk/lib/imports");
-var _type2 = require("../../../type");
-var _mainWindow = require("../main-window");
-var _forgeRtm = require("@netless/forge-rtm");
-var _error = require("../../../utilities/error");
+exports.FcrStandaloneAnnotationControlImpl = exports.FcrAnnotationControlImpl = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _logger = require("../../../utilities/logger");
-var _imports2 = require("../../../imports");
-let _initProto;
-function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
-function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
-class FcrAnnotationControlImpl {
-  static {
-    [_initProto] = _applyDecs(this, [[_imports2.trace, 2, "open"], [_imports2.trace, 2, "close"], [_imports2.trace, 2, "getConnectionState"], [_imports2.trace, 2, "getMainWindow"], [_imports2.trace, 2, "addPermission"], [_imports2.trace, 2, "removePermission"]], []).e;
-  }
-  logger = (_initProto(this), (0, _logger.createLogger)({
-    prefix: 'FcrAnnotationControlImpl'
-  }));
-  observable = new _imports2.AgoraObservable();
-  connectState = _type2.FcrConnectionState.DISCONNECTED;
-  _openAbortController = null;
-  constructor(rtmClient, annotationConfig) {
+var _base = require("../base");
+var _constant = require("../constant");
+class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
+  constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher) {
+    super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
+    (0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrAnnotationControlImpl'
+    }));
     this.rtmClient = rtmClient;
-    this.annotationConfig = annotationConfig;
-    this._addLogObserver();
-  }
-  async open() {
-    const boardView = await this._connect();
-    return boardView;
-  }
-  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.ANNOTATION_APP_ID);
-        await boardRoom.leaveRoom();
-      }
-    } catch (e) {
-      this.logger.error('close board failed', e);
-    }
-  }
-  getConnectionState() {
-    return this.connectState;
-  }
-  getMainWindow() {
-    return this.boardView;
-  }
-  addPermission(permission) {
-    const annotation = this.annotation;
-    if (annotation) {
-      annotation.permissions.addPermission(permission);
-    } else {
-      this.logger.warn(`add permission failed, annotation is not initialized, permission: ${permission}`);
-    }
-  }
-  removePermission(permission) {
-    const annotation = this.annotation;
-    if (annotation) {
-      annotation.permissions.removePermission(permission);
-    } else {
-      this.logger.warn(`remove permission failed, annotation is not initialized, permission: ${permission}`);
-    }
+    this.config = config;
+    this.logger.info("initialized, hasOperationPrivilege: ".concat(hasOperationPrivilege));
+  }
+  getApplicationId() {
+    return _constant.ANNOTATION_APP_ID;
+  }
+  getWhiteboardOption() {
+    return {
+      width: 800,
+      height: 600,
+      defaultToolbarStyle: {
+        tool: 'laser'
+      },
+      maxScaleRatio: 1
+    };
   }
-  addObserver(observer) {
-    this.observable.addObserver(observer);
-  }
-  removeObserver(observer) {
-    this.observable.removeObserver(observer);
-  }
-  updateConnnectionState(state) {
-    this.connectState = state;
-    this.observable.notifyObservers('onConnectionStateUpdated', state);
-  }
-  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,
-        size,
-        extra
-      } = this.annotationConfig;
-      let {
-        width,
-        height
-      } = this.annotationConfig.size;
-      const {
-        boardAppId,
-        boardId,
-        boardToken,
-        region
-      } = this.annotationConfig.extra;
-      if (!size) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'annotation size is required', new Error('annotation size is required'));
-      }
-      if (!extra) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'annotation extra is required', new Error('annotation extra is required'));
-      }
-      if (!boardId) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'boardId is required', new Error('boardId is required'));
-      }
-      if (!boardToken) {
-        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.UNDEFINED_ERROR, 'boardToken is required', new Error('boardToken is required'));
-      }
-      if (!width) {
-        this.logger.warn(`annotation width is a invalid vlaue: ${width}, using default value 800`);
-        width = 800;
-      }
-      if (!height) {
-        this.logger.warn(`annotation height is a invalid value: ${height}, using default value 600`);
-        height = 600;
-      }
-      this.logger.info(`open annotation with boardId: ${boardId}, boardToken: ${boardToken}, region: ${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(_type2.FcrConnectionState.CONNECTING);
-        const retriesMax = 10;
-        let error = null;
-        let boardView = null;
-        let whiteboard = null;
-        let boardRoom = wbRoom;
-        [error] = await (0, _imports2.to)((0, _imports.retryAttempt)(async () => {
-          const joinRoomParams = {
-            userId,
-            nickName,
-            roomToken: boardToken,
-            sdkConfig: {
-              // @ts-ignore
-              region,
-              appIdentifier: boardAppId,
-              enableIFramePlugin: false,
-              useMultiViews: true
-            }
-          };
-          this.logger.info(`join params: ${(0, _imports2.jsonstring)(joinRoomParams)}`);
-          await wbRoom.joinRoom(joinRoomParams);
-          boardRoom = wbRoom;
-          whiteboard = await wbRoom.applicationManager.launchApplication(_forgeWhiteboard.WhiteboardApplication, {
-            width,
-            height,
-            defaultToolbarStyle: {
-              tool: 'laser'
-            },
-            maxScaleRatio: 1
-          }, _type.ANNOTATION_APP_ID);
-        }, [], {
-          retriesMax
-        }).fail(async ({
-          error,
-          timeFn,
-          currentRetry
-        }) => {
-          if (abortController.signal.aborted) {
-            throw new Error('join board aborted');
-          }
-          this.logger.info(`failed to join board, error: ${error.message}, current retry: ${currentRetry}`);
-          await timeFn();
-          return true;
-        }).exec());
-        if (abortController.signal.aborted) {
-          throw new Error('join board aborted');
-        }
-        if (error) {
-          this.logger.error(`join board failed, ${error.message}-${JSON.stringify(error)}`);
-          throw error;
-        }
-        whiteboard.enableCameraByMouse = false;
-        whiteboard.enableCameraByTouch = false;
-        whiteboard.setViewModeToMain();
-        boardView = new _mainWindow.FcrBoardMainWindowImpl(whiteboard, wbRoom);
-        boardView.setBackgroundColor('rgba(0, 0, 0, 0)');
-        this.annotation = whiteboard;
-        this.boardView = boardView;
-        this.boardRoom = boardRoom;
-        this.updateConnnectionState(_type2.FcrConnectionState.CONNECTED);
-        resolve(boardView);
-      } catch (e) {
-        this.logger.error(`join board failed`);
-        this.updateConnnectionState(_type2.FcrConnectionState.DISCONNECTED);
-        reject(e);
-      } finally {
-        this._openAbortController = null;
-      }
-    });
-  }
-  _addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onConnectionStateUpdated', 'onActive', 'onInactive', 'onBackgroundColorUpdated']));
+}
+exports.FcrAnnotationControlImpl = FcrAnnotationControlImpl;
+class FcrStandaloneAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
+  getApplicationId() {
+    return _constant.ANNOTATION_APP_ID;
+  }
+  getWhiteboardOption() {
+    return {
+      width: 800,
+      height: 600,
+      defaultToolbarStyle: {
+        tool: 'laser'
+      },
+      maxScaleRatio: 1
+    };
   }
 }
-exports.FcrAnnotationControlImpl = FcrAnnotationControlImpl;
+exports.FcrStandaloneAnnotationControlImpl = FcrStandaloneAnnotationControlImpl;

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

@@ -0,0 +1,10 @@
+import { FcrAnnotationConfig, FcrAnnotationControl, FcrAnnotationControlFactory } from './type';
+import { FcrAnnotationControlImpl } from './control';
+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;
+    private _createForgeInitConfigFetcher;
+}

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

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrAnnotationControlFactoryImpl = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.json.stringify.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _control = require("./control");
+var _logger = require("../../../utilities/logger");
+var _error = require("../../../utilities/error");
+var _sharedStorage = require("../../../utilities/shared-storage");
+class FcrAnnotationControlFactoryImpl {
+  constructor() {
+    (0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrAnnotationControlFactory'
+    }));
+  }
+  createForSubProcess(rtmClient, hasOperationPrivilege, config) {
+    this.logger.info("[annotation]: create for sub process with config: ".concat(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"));
+      }
+      return Promise.resolve(forgeInitConfig);
+    });
+  }
+  createForMainProcess(rtmClient, hasOperationPrivilege, config, api) {
+    const control = new _control.FcrAnnotationControlImpl(rtmClient, config, hasOperationPrivilege, this._createForgeInitConfigFetcher(api, config.roomId, config.userId));
+    return control;
+  }
+  _createForgeInitConfigFetcher(api, roomId, userId) {
+    const getObjectInitConfig = async (roomId, userId) => {
+      return await (0, _error.handleRequestError)(() => api.getAnnotationToken({
+        roomId,
+        userId
+      }), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'get annotation token failed');
+    };
+    return async () => {
+      const response = await getObjectInitConfig(roomId, userId);
+      return response.data;
+    };
+  }
+}
+exports.FcrAnnotationControlFactoryImpl = FcrAnnotationControlFactoryImpl;

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

@@ -1,12 +1,12 @@
-import { FcrBaseWhiteboardControl } from '../../whiteboard-control/types';
-import { FcrJoinRoomOptions, FcrWhiteboardPermissionFlag } from '../../../imports';
-export declare const ANNOTATION_APP_ID = "Annotation";
-export interface FcrAnnotationControl extends FcrBaseWhiteboardControl {
-    addPermission(permission: FcrWhiteboardPermissionFlag): void;
-    removePermission(permission: FcrWhiteboardPermissionFlag): void;
+import { FcrBaseWhiteboardControl, FcrBaseWhiteboardObserver } from '../type';
+import { FcrBoardConfig } from '../whiteboard-control/type';
+import { FcrCoreServiceApi } from '../../../service/api';
+import type { RTMClient } from 'agora-rtm';
+export interface FcrStandaloneAnnotationControl extends FcrBaseWhiteboardControl<FcrBaseWhiteboardObserver> {
 }
-export interface FcrPrivilegedAnnotationControl extends FcrAnnotationControl {
-    syncScreenShareOwnerAnnotationOpenDone(): void;
+export interface FcrAnnotationControl extends FcrBaseWhiteboardControl<FcrBaseWhiteboardObserver> {
+}
+export interface FcrAnnotationControObserver extends FcrBaseWhiteboardObserver {
 }
 export interface FcrAnnotationBoardConfig {
     state: number;
@@ -25,21 +25,13 @@ export interface FcrAnnotationBoardConfig {
         region: string;
     };
 }
-export type FcrAnnotationConfig = {
-    userId: string;
-    nickName: string;
+export type FcrAnnotationConfig = FcrBoardConfig & {
     size: {
         width: number;
         height: number;
     };
-    extra: {
-        boardAppId: string;
-        boardId: string;
-        boardToken: string;
-        region: FcrJoinRoomOptions['sdkConfig']['region'];
-    };
 };
 export interface FcrAnnotationControlFactory {
-    createForSubProcess(config: FcrAnnotationConfig): FcrAnnotationControl;
-    createForMainProcess(): FcrPrivilegedAnnotationControl;
+    createForSubProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig): FcrStandaloneAnnotationControl;
+    createForMainProcess(rtmClient: RTMClient, hasOperationPrivilege: boolean, config: FcrAnnotationConfig, api: FcrCoreServiceApi): FcrAnnotationControl;
 }

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

@@ -2,6 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-exports.ANNOTATION_APP_ID = void 0;
-const ANNOTATION_APP_ID = exports.ANNOTATION_APP_ID = 'Annotation';
+});

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

@@ -0,0 +1,42 @@
+import { FcrBaseWhiteboardControl, FcrBaseWhiteboardObserver, FcrBoardMainWindow, FcrObjectForgeInitConfig } from '../type';
+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';
+export declare class FcrBaseWhiteboardControlImpl<T extends FcrBaseWhiteboardObserver> implements FcrBaseWhiteboardControl<T> {
+    protected rtmClient: RTMClient;
+    protected config: FcrBoardConfig;
+    protected logger: import("agora-foundation/lib/logger/type").Logger;
+    protected forgeInitConfigTask: AgoraScheduler.Task;
+    protected observable: AgoraObservable<T>;
+    protected boardView: FcrBoardMainWindow | null;
+    protected boardRoom: Room | null;
+    protected whiteboard: Whiteboard | null;
+    protected connectState: FcrConnectionState;
+    protected forgeInitConfig: FcrObjectForgeInitConfig | null;
+    protected hasOperationPrivilege: boolean;
+    private _waitPromise;
+    private _waitPromiseResolve;
+    private _waitPromiseReject;
+    private _openAbortController;
+    private _isOpen;
+    constructor(rtmClient: RTMClient, config: FcrBoardConfig, hasOperationPrivilege: boolean, forgeInitConfigFetcher: () => Promise<FcrObjectForgeInitConfig>);
+    setOperationPrivilege(hasOperationPrivilege: boolean): void;
+    open(): Promise<FcrBoardMainWindow>;
+    close(): Promise<void>;
+    getConnectionState(): AgoraRteConnectionState;
+    getMainWindow(): FcrBoardMainWindow | null;
+    addObserver(observer: T): void;
+    removeObserver(observer: T): void;
+    protected updateConnectionState(state: FcrConnectionState): void;
+    protected connect(): Promise<FcrBoardMainWindow>;
+    protected getApplicationId(): string;
+    protected getWhiteboardOption(): WhiteboardOption;
+    protected getBackgroundColor(): string;
+    protected addLogObserver(): void;
+    private _checkForConnect;
+    private _clearWaitPromise;
+}