fcr-core 3.7.2 → 3.7.3

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

@@ -20,239 +20,54 @@ require("core-js/modules/esnext.symbol.metadata.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrAnnotationControlImpl = void 0;
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.for-each.js");
-require("core-js/modules/esnext.iterator.some.js");
-var _forgeRoom = require("@netless/forge-room");
-var _forgeWhiteboard = require("@netless/forge-whiteboard");
-var _imports = require("agora-rte-sdk/lib/imports");
-var _type = require("../../../type");
-var _mainWindow = require("../main-window");
+exports.FcrAnnotationControlFactoryImpl = void 0;
+var _control = require("./control");
+var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("../../../utilities/logger");
-var _forgeRtm = require("@netless/forge-rtm");
+var _privilegeControl2 = require("./privilege-control");
+var _utils = require("../utils");
+var _staticBlock;
 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; }
-const FCR_ANNOTATION_SCALE_BASE = 1920;
-class FcrAnnotationControlImpl {
-  static #_ = (() => [_initProto] = _applyDecs(this, [[[_imports.bound, _imports.trace], 2, "syncScreenShareOwnerAnnotationOpenDone"], [[_imports.bound, _imports.trace], 2, "open"], [[_imports.bound, _imports.trace], 2, "close"], [[_imports.bound, _imports.trace], 2, "getConnectionState"], [[_imports.bound, _imports.trace], 2, "getMainWindow"], [_imports.bound, 2, "_resizeToMax"], [_imports.bound, 2, "_updateConnnectionState"], [_imports.bound, 2, "_isLocalUserInScreenSharing"]], []).e)();
-  logger = (() => (_initProto(this), (0, _imports.createLogger)({
-    prefix: 'FcrAnnotationControlImpl'
+class FcrAnnotationControlFactoryImpl {
+  logger = (() => (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrAnnotationControlFactory'
   })))();
-  _FCR_ANNOTATION_APP_ID = 'Annotation';
-  _observable = (() => new _imports.AgoraObservable())();
-  _connectState = (() => _type.FcrConnectionState.DISCONNECTED)();
-  _needRetry = true;
-  _needRetrySyncOpenDone = true;
-  constructor(_scene, _api, _engine, _privilegeControl, _sharedCache, _streamControl, _userControl) {
+  constructor(_rtmClient, _scene, _streamControl, _userControl, _privilegeControl, _api) {
+    this._rtmClient = _rtmClient;
     this._scene = _scene;
-    this._api = _api;
-    this._engine = _engine;
-    this._privilegeControl = _privilegeControl;
-    this._sharedCache = _sharedCache;
     this._streamControl = _streamControl;
     this._userControl = _userControl;
-    this._addLogObserver();
-  }
-  async syncScreenShareOwnerAnnotationOpenDone() {
-    const retriesMax = 10;
-    try {
-      await (0, _imports.retryAttempt)(async () => {
-        await this._api.syncScreenShareOwnerAnnotationOpenDone(this._scene.sceneId);
-      }, [], {
-        retriesMax
-      }).fail(async _ref => {
-        let {
-          error,
-          timeFn,
-          currentRetry
-        } = _ref;
-        this.logger.info(`[annotation]: failed to sync screen share owner annotation open done event, error: ${error.message}, current retry: ${currentRetry}`);
-        this._needRetrySyncOpenDone && (await timeFn());
-        this.logger.info(`[annotation]: continue attemptting? need retry: ${this._needRetrySyncOpenDone}`);
-        return this._needRetrySyncOpenDone;
-      }).abort(() => {}).exec();
-    } catch (e) {}
-  }
-  async open() {
-    const {
-      size,
-      extra
-    } = this._getBoardConfigInfoWithScene();
-    const {
-      width,
-      height
-    } = size;
-    const {
-      boardAppId,
-      boardId,
-      boardToken,
-      region
-    } = extra;
-    const userId = this._scene.localUser.getLocalUserId();
-    const nickName = this._scene.getUser(userId)?.userName;
-    // @ts-ignore
-    const rtmClient = this._engine._rtmClient._client;
-    const rtmProvider = new _forgeRtm.RTMProvider_2_2(rtmClient);
-    const wbRoom = new _forgeRoom.Room(boardId, rtmProvider);
-    wbRoom.applicationManager.registerApplication(_forgeWhiteboard.WhiteboardApplication);
-    try {
-      this._updateConnnectionState(_type.FcrConnectionState.CONNECTING);
-      const retriesMax = 10;
-      await (0, _imports.retryAttempt)(async () => {
-        await wbRoom.joinRoom({
-          userId,
-          nickName,
-          roomToken: boardToken,
-          sdkConfig: {
-            // @ts-ignore
-            region,
-            appIdentifier: boardAppId,
-            enableIFramePlugin: false,
-            useMultiViews: true
-          }
-        });
-        this._boardRoom = wbRoom;
-        const currentTimestamp = Date.now();
-        // @ts-ignore
-        this._boardRoom['traceId'] = `${boardToken}-${boardAppId}-${userId}-${currentTimestamp}`;
-        this.logger.info(
-        // @ts-ignore
-        `[annotation]: receiver join board room success, traceId : ${this._boardRoom['traceId']}`);
-        const whiteboard = await wbRoom.applicationManager.launchApplication(_forgeWhiteboard.WhiteboardApplication, {
-          width,
-          height,
-          defaultToolbarStyle: {
-            tool: 'laser'
-          },
-          maxScaleRatio: 1
-        }, this._FCR_ANNOTATION_APP_ID);
-        whiteboard.enableCameraByMouse = false;
-        whiteboard.enableCameraByTouch = false;
-        whiteboard.setViewModeToMain();
-        this._boardView = new _mainWindow.FcrBoardMainWindowImpl(whiteboard, this._scene, this._sharedCache, wbRoom);
-        this._needRetry = false;
-        this.logger.info('[annotation][open]: set background color');
-        this._boardView.setBackgroundColor('rgba(0, 0, 0, 0)');
-        // this._boardView.setBoardTransparent(true);
-        const isLocalUserInScreenSharing = this._isLocalUserInScreenSharing();
-        if (isLocalUserInScreenSharing) {
-          const currentMainWindow = this.getMainWindow();
-          if (currentMainWindow) {
-            currentMainWindow.clean();
-            currentMainWindow.updateWindowSize({
-              width,
-              height
-            });
-            this.syncScreenShareOwnerAnnotationOpenDone();
-          }
-        }
-        this._updateConnnectionState(_type.FcrConnectionState.CONNECTED);
-      }, [], {
-        retriesMax
-      }).fail(async _ref2 => {
-        let {
-          error,
-          timeFn,
-          currentRetry
-        } = _ref2;
-        this.logger.info(`[annotation]: failed to join board room, error: ${error.message}, current retry: ${currentRetry}`);
-        this._needRetry && (await timeFn());
-        this.logger.info(`[annotation]: continue attemptting? need retry: ${this._needRetry}`);
-        return this._needRetry;
-      }).abort(() => {
-        this._updateConnnectionState(_type.FcrConnectionState.DISCONNECTED);
-      }).exec();
-    } catch (e) {
-      this._updateConnnectionState(_type.FcrConnectionState.DISCONNECTED);
-    }
-    return this._boardView;
-  }
-  async close() {
-    this._needRetry = false;
-    this._boardRoom?.applicationManager.removeAllListeners();
-    // this._boardRoom?.applicationManager.terminateApplication(this._FCR_ANNOTATION_APP_ID);
-    await this._boardRoom?.leaveRoom();
-    this.logger.info(
-    // @ts-ignore
-    `[annotation]: receiver leave board room success, traceId: ${this._boardRoom['traceId']}`);
-    this._boardRoom = undefined;
-    this._boardView = undefined;
-    this.logger.info('[annotation]: closed annotation control');
-  }
-  getConnectionState() {
-    return this._connectState;
-  }
-  getMainWindow() {
-    return this._boardView;
+    this._privilegeControl = _privilegeControl;
+    this._api = _api;
+    this.logger.info(`[annotation]: constructor initialized`);
   }
-  addObserver(observer) {
-    this._observable.addObserver(observer);
+  createForSubProcess(config) {
+    this.logger.info(`[annotation]: create for sub process with config: ${JSON.stringify(config)}`);
+    return new _control.FcrAnnotationControlImpl(this._rtmClient, config);
   }
-  removeObserver(observer) {
-    this._observable.removeObserver(observer);
+  createForMainProcess() {
+    this.logger.info(`[annotation]: start create for main process`);
+    const config = this._getBoardConfigInfoWithScene();
+    this.logger.info(`[annotation]: create for main process with config: ${JSON.stringify(config)}`);
+    const control = new _privilegeControl2.FcrPrivilegedAnnotationControlImpl(this._rtmClient, config, this._scene, this._streamControl, this._userControl, this._privilegeControl, this._api);
+    return control;
   }
   _getBoardConfigInfoWithScene() {
-    const boardAppId = this._scene.getScenePropertiesByKeyPath('widgets.annotation.extra.boardAppId');
-    const boardId = this._scene.getScenePropertiesByKeyPath('widgets.annotation.extra.boardId');
-    const boardToken = this._scene.getScenePropertiesByKeyPath('widgets.annotation.extra.boardToken');
-    const boardRegion = this._scene.getScenePropertiesByKeyPath('widgets.annotation.extra.boardRegion');
-    const boardWidthVal = Number(this._scene.getScenePropertiesByKeyPath('widgets.annotation.size.width'));
-    const boardHeightVal = Number(this._scene.getScenePropertiesByKeyPath('widgets.annotation.size.height'));
-    const {
-      width: boardWidth,
-      height: boardHeight
-    } = this._resizeToMax(boardWidthVal, boardHeightVal, FCR_ANNOTATION_SCALE_BASE);
-    return {
-      size: {
-        width: boardWidth,
-        height: boardHeight
-      },
-      extra: {
-        boardAppId,
-        boardId,
-        boardToken,
-        region: boardRegion
-      }
-    };
-  }
-  _resizeToMax(w, h) {
-    let scaleBase = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : FCR_ANNOTATION_SCALE_BASE;
-    const scale = scaleBase / Math.max(w, h);
+    const roomProperties = this._scene.getSceneProperties();
+    const localUser = this._userControl?.getLocalUser();
+    const annotationConfig = (0, _utils.getAnnotationConfigFromRoomProperties)(roomProperties, this.logger);
     return {
-      width: Math.round(w * scale),
-      height: Math.round(h * scale)
+      userId: localUser.userId,
+      nickName: localUser.userName,
+      ...annotationConfig
     };
   }
-  _updateConnnectionState(state) {
-    this._connectState = state;
-    if (state === _type.FcrConnectionState.CONNECTED) {
-      this._streamControl.getStreamList().forEach(stream => {
-        const ownerId = stream.owner.userId;
-        const isNotMeSharing = ownerId !== this._userControl.getLocalUser().userId;
-        const platform = this._userControl.getUser(ownerId)?.platform;
-        const isPcPlatform = platform && [_type.FcrPlatform.WEB_DESKTOP, _type.FcrPlatform.WINDOWS, _type.FcrPlatform.MACOS].includes(platform);
-        const isAndroidPlatform = platform && platform === _type.FcrPlatform.ANDROID;
-        if (isPcPlatform) {
-          this._boardView?.setAutoCancelDraw(false);
-        }
-        if (isAndroidPlatform) {
-          this._boardView?.setAutoCancelDraw(isNotMeSharing);
-        }
-      });
-    }
-    this._observable.notifyObservers('onConnectionStateUpdated', state);
-  }
-  _isLocalUserInScreenSharing() {
-    const localUserInfo = this._userControl.getLocalUser();
-    return this._streamControl.getStreamList().some(streamInfo => streamInfo.videoSourceType === _type.FcrVideoSourceType.SCREEN && streamInfo.owner.userId === localUserInfo.userId);
-  }
-  _addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onActive', 'onInactive', 'onBackgroundColorUpdated', 'onConnectionStateUpdated']));
-  }
+  static #_ = (() => _staticBlock = () => [_initProto] = _applyDecs(this, [[_decorator.bound, 2, "_getBoardConfigInfoWithScene"]], []).e)();
 }
-exports.FcrAnnotationControlImpl = FcrAnnotationControlImpl;
+exports.FcrAnnotationControlFactoryImpl = FcrAnnotationControlFactoryImpl;
+_staticBlock();

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

@@ -0,0 +1,36 @@
+import { FcrAnnotationConfig, FcrPrivilegedAnnotationControl } from './type';
+import { AgoraRteScene } from 'agora-rte-sdk';
+import { FcrConnectionState, FcrPrivilegeControl, FcrStreamControl, FcrUserControl, FcrWhiteboardObserver } from '../../../type';
+import { FcrAnnotationControlImpl } from './control';
+import { FcrCoreServiceApi } from '../../../service/api';
+import { AgoraRtmClient } from 'agora-rte-sdk/lib/core/rtm/client';
+import { FcrBoardMainWindow } from '../../whiteboard-control/types';
+export declare class FcrPrivilegedAnnotationControlImpl extends FcrAnnotationControlImpl implements FcrPrivilegedAnnotationControl {
+    private _scene;
+    private _streamControl;
+    private _userControl;
+    private _privilegeControl;
+    private _api;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _config;
+    private _isOpen;
+    private _waitPromise;
+    private _waitPromiseResolve;
+    private _waitPromiseReject;
+    private _privilegeObserver;
+    private _sceneObserver;
+    constructor(rtmClient: AgoraRtmClient, config: FcrAnnotationConfig, _scene: AgoraRteScene, _streamControl: FcrStreamControl, _userControl: FcrUserControl, _privilegeControl: FcrPrivilegeControl, _api: FcrCoreServiceApi);
+    addObserver(observer: FcrWhiteboardObserver): void;
+    removeObserver(observer: FcrWhiteboardObserver): void;
+    open(): Promise<FcrBoardMainWindow>;
+    close(): Promise<void>;
+    syncScreenShareOwnerAnnotationOpenDone(): Promise<void>;
+    protected updateConnnectionState(state: FcrConnectionState): void;
+    protected _connect(): Promise<FcrBoardMainWindow>;
+    private _hasBoardWritePermission;
+    private _checkForConnect;
+    private _clearWaitPromise;
+    private _getToken;
+    private _handleApplicationLaunch;
+    private _handleApplicationTerminal;
+}

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

@@ -0,0 +1,252 @@
+"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");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrPrivilegedAnnotationControlImpl = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.some.js");
+var _type = require("../../../type");
+var _control = require("./control");
+var _forgeWhiteboard = require("@netless/forge-whiteboard");
+var _helper = require("../../privilege-control/helper");
+var _imports = require("../../../imports");
+var _error = require("../../../utilities/error");
+var _logger = require("../../../utilities/logger");
+var _utils = require("../utils");
+var _staticBlock;
+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 FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlImpl {
+  logger = (() => (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrPrivilegedAnnotationControlImpl'
+  })))();
+  _isOpen = false;
+  _waitPromise = null;
+  _waitPromiseResolve = null;
+  _waitPromiseReject = null;
+  _privilegeObserver = {
+    onLocalUserPermissionInfoAdded: (roomId, event) => {
+      if (this._hasBoardWritePermission(event)) {
+        this.logger.info(`add board write permission`);
+        const whiteboard = this.annotation;
+        if (whiteboard) {
+          whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+        } else {
+          this.logger.warn('whiteboard is not initialized yet, should add permission when application launched');
+        }
+      }
+    },
+    onLocalUserPermissionInfoDeleted: (roomId, event) => {
+      if (this._hasBoardWritePermission(event)) {
+        this.logger.info(`remove board write permission`);
+        const whiteboard = this.annotation;
+        if (whiteboard) {
+          whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+        } else {
+          this.logger.warn('whiteboard is not initialized yet, should remove permission when application launched');
+        }
+      }
+    }
+  };
+  _sceneObserver = {
+    onScenePropertiesUpdated: async (sceneId, event) => {
+      const hasKey = Object.keys(event.changedProperties).some(changeKey => {
+        return changeKey === 'widgets.annotation.extra.boardAppId';
+      });
+      if (hasKey) {
+        this.logger.info('widgets.annotation.extra.boardAppId updated, re-initializing annotation info');
+        if (this._isOpen && (await this._checkForConnect())) {
+          this._connect();
+        }
+      }
+    }
+  };
+  constructor(rtmClient, config, _scene, _streamControl, _userControl, _privilegeControl, _api) {
+    super(rtmClient, config);
+    this._scene = _scene;
+    this._streamControl = _streamControl;
+    this._userControl = _userControl;
+    this._privilegeControl = _privilegeControl;
+    this._api = _api;
+    this._config = config;
+    this._privilegeControl.addObserver(this._privilegeObserver);
+    this._scene.addObserver(this._sceneObserver);
+    this.logger.info(`initialized, config: ${JSON.stringify(config)}`);
+  }
+  addObserver(observer) {
+    this.observable.addObserver(observer);
+  }
+  removeObserver(observer) {
+    this.observable.removeObserver(observer);
+  }
+  async open() {
+    this._isOpen = true;
+    this.logger.info(`open privileged annotation control with config: ${(0, _imports.jsonstring)(this._config)}`);
+    const isReadyToConnect = await 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 annotation config to be ready');
+      });
+    }
+    return this._waitPromise;
+  }
+  close() {
+    this._isOpen = false;
+    if (this._waitPromiseReject) {
+      this._waitPromiseReject(new Error('closed before connection established'));
+      this._clearWaitPromise();
+    }
+    return super.close();
+  }
+  async syncScreenShareOwnerAnnotationOpenDone() {
+    try {
+      await this._api.syncScreenShareOwnerAnnotationOpenDone(this._scene.sceneId);
+    } catch (e) {
+      const error = e;
+      const errorMessage = error.message;
+      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `sync screen share owner annotation open done failed: ${errorMessage}`, error);
+    }
+  }
+  updateConnnectionState(state) {
+    super.updateConnnectionState(state);
+    if (state === _type.FcrConnectionState.CONNECTED) {
+      const whiteboard = this.annotation;
+      const mainWindow = this.boardView;
+      if (!whiteboard) {
+        this.logger.error('whiteboard is expected to be initialized at this point');
+        return;
+      }
+      if (!mainWindow) {
+        this.logger.error('main window is expected to be initialized at this point');
+        return;
+      }
+      const isEnabled = action => (0, _helper.getLocalUserPermissionInfo)(this._scene, action).enable;
+      const hasOperationPrivilege = isEnabled(_type.FcrPermissionAction.BoardWrite) || isEnabled(_type.FcrPermissionAction.AnnotationWrite);
+      if (hasOperationPrivilege) {
+        this.logger.info('add whiteboard permission');
+        whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+      } else {
+        this.logger.info('remove whiteboard permission');
+        whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
+      }
+      const stream = this._streamControl.getStreamList().find(stream => stream.videoSourceType === _type.FcrVideoSourceType.SCREEN);
+      const localUserId = this._userControl.getLocalUser().userId;
+      if (stream) {
+        const ownerId = stream.owner.userId;
+        const isNotMeSharing = ownerId !== localUserId;
+        const platform = this._userControl.getUser(ownerId)?.platform;
+        const isPcPlatform = platform && [_type.FcrPlatform.WEB_DESKTOP, _type.FcrPlatform.WINDOWS, _type.FcrPlatform.MACOS].includes(platform);
+        const isAndroidPlatform = platform && platform === _type.FcrPlatform.ANDROID;
+        this.logger.debug(`isPcPlatform: ${isPcPlatform}, isAndroidPlatform: ${isAndroidPlatform}, isNotMeSharing: ${isNotMeSharing}, ownerId: ${ownerId}, localUserId: ${localUserId}, platform: ${platform}`);
+        if (isPcPlatform) {
+          mainWindow.setAutoCancelDraw(false);
+        }
+        if (isAndroidPlatform) {
+          mainWindow.setAutoCancelDraw(isNotMeSharing);
+        }
+        if (ownerId === localUserId) {
+          if (mainWindow) {
+            mainWindow.clean();
+            mainWindow.updateWindowSize({
+              width: this._config.size.width,
+              height: this._config.size.height
+            });
+            this.syncScreenShareOwnerAnnotationOpenDone();
+          }
+        }
+      }
+    }
+  }
+  async _connect() {
+    const promise = super._connect();
+    promise.then(boardView => {
+      this.boardRoom.applicationManager.on('launch', this._handleApplicationLaunch);
+      this.boardRoom.applicationManager.on('terminal', this._handleApplicationTerminal);
+      if (this._waitPromiseResolve) {
+        this._waitPromiseResolve(boardView);
+        this._clearWaitPromise();
+      }
+      return boardView;
+    }).catch(reason => {
+      if (this._waitPromiseReject) {
+        this._waitPromiseReject(reason);
+        this._clearWaitPromise();
+      }
+    });
+    return promise;
+  }
+  _hasBoardWritePermission(event) {
+    const hasPermissionNow = event.permissionInfo.some(perm => perm.info?.action === _type.FcrPermissionAction.BoardWrite);
+    return hasPermissionNow;
+  }
+  async _checkForConnect() {
+    const roomId = this._scene.sceneId;
+    const userId = this._scene.localUser.getLocalUserId();
+    const boardOptions = (await this._getToken(roomId, userId)).data;
+    if (boardOptions && boardOptions.boardAppId) {
+      this.logger.info(`board options found, ready to connect: ${(0, _imports.jsonstring)(boardOptions)}`);
+      if (this.annotationConfig) {
+        this.annotationConfig.extra = this.annotationConfig.extra || {};
+        this.annotationConfig.extra.boardAppId = boardOptions.boardAppId;
+        this.annotationConfig.extra.boardId = boardOptions.boardId;
+        this.annotationConfig.extra.boardToken = boardOptions.boardToken;
+        this.annotationConfig.extra.region = boardOptions.region;
+        const roomProperties = this._scene.getSceneProperties();
+        const annotationConfig = (0, _utils.getAnnotationConfigFromRoomProperties)(roomProperties, this.logger);
+        this.annotationConfig.size.width = annotationConfig.size.width;
+        this.annotationConfig.size.height = annotationConfig.size.height;
+        this.logger.info(`update annotation config, config: ${(0, _imports.jsonstring)(this.annotationConfig)}`);
+      }
+      return true;
+    }
+    return false;
+  }
+  _clearWaitPromise() {
+    this._waitPromiseResolve = null;
+    this._waitPromiseReject = null;
+    this._waitPromise = null;
+  }
+  async _getToken(roomId, userId) {
+    return await (0, _error.handleRequestError)(() => this._api.getAnnotationToken({
+      roomId,
+      userId
+    }), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'get whiteboard token failed');
+  }
+  async _handleApplicationLaunch(appId, app) {
+    this.annotation = app;
+  }
+  async _handleApplicationTerminal(appId, app) {
+    this.annotation = app;
+  }
+  static #_ = (() => _staticBlock = () => [_initProto] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "syncScreenShareOwnerAnnotationOpenDone"], [[_imports.bound, _imports.trace], 2, "_handleApplicationLaunch"], [[_imports.bound, _imports.trace], 2, "_handleApplicationTerminal"]], [], 0, void 0, _control.FcrAnnotationControlImpl).e)();
+}
+exports.FcrPrivilegedAnnotationControlImpl = FcrPrivilegedAnnotationControlImpl;
+_staticBlock();

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

@@ -1,6 +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 {
-    syncScreenShareOwnerAnnotationOpenDone: () => void;
+    addPermission(permission: FcrWhiteboardPermissionFlag): void;
+    removePermission(permission: FcrWhiteboardPermissionFlag): void;
+}
+export interface FcrPrivilegedAnnotationControl extends FcrAnnotationControl {
+    syncScreenShareOwnerAnnotationOpenDone(): void;
 }
 export interface FcrAnnotationBoardConfig {
     state: number;
@@ -19,7 +25,9 @@ export interface FcrAnnotationBoardConfig {
         region: string;
     };
 }
-export interface FcrAnnotationBoardSceneInfo {
+export type FcrAnnotationConfig = {
+    userId: string;
+    nickName: string;
     size: {
         width: number;
         height: number;
@@ -28,6 +36,10 @@ export interface FcrAnnotationBoardSceneInfo {
         boardAppId: string;
         boardId: string;
         boardToken: string;
-        region: string;
+        region: FcrJoinRoomOptions['sdkConfig']['region'];
     };
+};
+export interface FcrAnnotationControlFactory {
+    createForSubProcess(config: FcrAnnotationConfig): FcrAnnotationControl;
+    createForMainProcess(): FcrPrivilegedAnnotationControl;
 }

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

@@ -2,4 +2,6 @@
 
 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/index.d.ts

@@ -1,10 +1,10 @@
-import { FcrBoardActiveInfo, FcrBoardMainWindow } from '../whiteboard-control/types';
+import { FcrBaseWhiteboardControl, FcrBoardActiveInfo, FcrBoardMainWindow } from '../whiteboard-control/types';
 import { AgoraRteEngine, AgoraRteScene } from '../../imports';
 import { FcrCoreServiceApi } from '../../service/api';
 import { FcrConnectionState } from '../../type';
 import { FcrSharedCache } from '../shared-cache';
-import { FcrWhiteboardControl, FcrWhiteboardObserver } from './whiteboard-control/type';
-export declare class FcrWhiteboardControlImpl implements FcrWhiteboardControl {
+import { FcrWhiteboardObserver } from './whiteboard-control/type';
+export declare class FcrWhiteboardControlImpl implements FcrBaseWhiteboardControl {
     private _scene;
     private _api;
     private _engine;