fcr-core 3.7.8 → 3.8.0-alpha

package/lib/type.d.ts

@@ -1,5 +1,5 @@
-import { AgoraRtcNetworkStats, AgoraRteNetworkQualityEvent, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteConnectionState, AgoraRteScenePropertiesUpdatedEvent, AgoraRteOperatCause, AgoraRteRenderView, AgoraRteUploadEvent, AgoraRteVideoEncoderConfig } from './imports';
-import { FcrSharePermissionState } from './room-control/whiteboard-control/enums';
+import { AgoraRtcNetworkStats, AgoraRteNetworkQualityEvent, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteConnectionState, AgoraRteScenePropertiesUpdatedEvent, AgoraRteOperatCause, AgoraRteRenderView, AgoraRteUploadEvent, AgoraRteVideoEncoderConfig, FcrWhiteboardView } from './imports';
+import { FcrSharePermissionState } from './room-control/sharing-control/type';
 import { FcrUserRole } from './room-control/user-control/type';
 import type { FcrAudioSourceType, FcrMediaSourceState, FcrRegion, FcrRoomConnectorType, FcrStreamType, FcrVideoSourceType } from '.';
 import { FcrLineType, FcrRoomJoinOptions, FcrRoomType } from './room-control/type';
@@ -285,3 +285,16 @@ export declare enum FcrStreamState {
     PUBLISH = 1
 }
 export { FcrError } from './utilities/error';
+export type FcrWhiteboardParameters = {
+    cursor?: boolean;
+    syncMode?: boolean;
+    extras?: unknown;
+    extendClass?: unknown;
+    windowManagerParams?: unknown;
+    floatBar?: unknown;
+    containerElement?: FcrWhiteboardView;
+};
+export { FcrBoardToolType, FcrBoardShape } from './room-control/whiteboard-control-v2/enum';
+export type { FcrBoardMainWindow, FcrBoardMainWindowObserver, } from './room-control/whiteboard-control-v2/type';
+export type { FcrColor } from './room-control/whiteboard-control/type';
+export type { FcrLanguageConfig } from './room-control/stt-control/type';

package/lib/type.js

@@ -21,6 +21,18 @@ Object.defineProperty(exports, "FcrAudioSourceType", {
     return _imports.AgoraRtcAudioSourceType;
   }
 });
+Object.defineProperty(exports, "FcrBoardShape", {
+  enumerable: true,
+  get: function () {
+    return _enum.FcrBoardShape;
+  }
+});
+Object.defineProperty(exports, "FcrBoardToolType", {
+  enumerable: true,
+  get: function () {
+    return _enum.FcrBoardToolType;
+  }
+});
 Object.defineProperty(exports, "FcrCapability", {
   enumerable: true,
   get: function () {
@@ -292,6 +304,7 @@ var _type6 = require("./room-control/sharing-control/type");
 var _type7 = require("./room-control/type");
 var _type8 = require("./media-control/type");
 var _error = require("./utilities/error");
+var _enum = require("./room-control/whiteboard-control-v2/enum");
 // 基础导入类型（集中管理第三方依赖类型别名）
 // 内部枚举与基础类型导入
 // 模块类型导出（按功能模块分组）

package/lib/utilities/error-helpers.d.ts

@@ -18,7 +18,8 @@ export declare enum ControllerType {
     SHARING = "sharing",
     WHITEBOARD = "whiteboard",
     MONITOR = "monitor",
-    MEDIA = "media"
+    MEDIA = "media",
+    STT = "stt"
 }
 /**
  * 错误处理配置接口

package/lib/utilities/error-helpers.js

@@ -32,6 +32,7 @@ let ControllerType = exports.ControllerType = /*#__PURE__*/function (ControllerT
   ControllerType["WHITEBOARD"] = "whiteboard";
   ControllerType["MONITOR"] = "monitor";
   ControllerType["MEDIA"] = "media";
+  ControllerType["STT"] = "stt";
   return ControllerType;
 }({});
 /**

package/lib/utilities/error.d.ts

@@ -22,6 +22,7 @@ export declare enum FcrErrorModuleCode {
     MEDIA_CONTROL_MICROPHONE = 32,
     MEDIA_CONTROL_LOOPBACK = 33,
     MEDIA_CONTROL_SCREEN = 34,
+    ROOM_STT = 35,
     MONITOR = 40,
     ROOM_LIVE_STREAMING = 41
 }

package/lib/utilities/error.js

@@ -35,6 +35,7 @@ let FcrErrorModuleCode = exports.FcrErrorModuleCode = /*#__PURE__*/function (Fcr
   FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_MICROPHONE"] = 32] = "MEDIA_CONTROL_MICROPHONE";
   FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_LOOPBACK"] = 33] = "MEDIA_CONTROL_LOOPBACK";
   FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_SCREEN"] = 34] = "MEDIA_CONTROL_SCREEN";
+  FcrErrorModuleCode[FcrErrorModuleCode["ROOM_STT"] = 35] = "ROOM_STT";
   FcrErrorModuleCode[FcrErrorModuleCode["MONITOR"] = 40] = "MONITOR";
   FcrErrorModuleCode[FcrErrorModuleCode["ROOM_LIVE_STREAMING"] = 41] = "ROOM_LIVE_STREAMING";
   return FcrErrorModuleCode;

package/lib/utilities/logger.d.ts

@@ -1,6 +1,6 @@
 import { getLogger as _getLogger } from '../imports';
-export declare const getLogger: () => import("agora-foundation/lib/logger").Logger;
+export declare const getLogger: () => import("agora-foundation/lib/logger/type").Logger;
 export declare const createLogger: (opts: {
     prefix: string;
-}) => import("agora-foundation/lib/logger").Logger;
+}) => import("agora-foundation/lib/logger/type").Logger;
 export declare const generateLogObserver: <T>(logger: ReturnType<typeof _getLogger>, callbackMethods: (keyof T)[]) => T;

package/lib/utilities/shared-storage.d.ts

@@ -1,5 +1,7 @@
+import { FcrObjectForgeInitConfig } from '../room-control/whiteboard-control-v2/type';
 export declare const setAnnotationBoardOptions: (options: Record<string, unknown>) => void;
-export declare const getAnnotationBoardOptions: () => any;
+export declare const getAnnotationBoardOptions: () => FcrObjectForgeInitConfig | null;
 export declare const clearAnnotationBoardOptions: () => void;
 export declare const setWhiteboardOptions: (options: Record<string, unknown>) => void;
+export declare const getWhiteboardOptions: () => FcrObjectForgeInitConfig | null;
 export declare const clearWhiteboardOptions: () => void;

package/lib/utilities/shared-storage.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setWhiteboardOptions = exports.setAnnotationBoardOptions = exports.getAnnotationBoardOptions = exports.clearWhiteboardOptions = exports.clearAnnotationBoardOptions = void 0;
+exports.setWhiteboardOptions = exports.setAnnotationBoardOptions = exports.getWhiteboardOptions = exports.getAnnotationBoardOptions = exports.clearWhiteboardOptions = exports.clearAnnotationBoardOptions = void 0;
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.json.parse.js");
 var _imports = require("../imports");
@@ -29,6 +29,14 @@ const setWhiteboardOptions = options => {
   _imports.localStorage.setItem(STORAGE_KEY_WHITEBOARD_OPTIONS, JSON.stringify(options));
 };
 exports.setWhiteboardOptions = setWhiteboardOptions;
+const getWhiteboardOptions = () => {
+  const boardOptions = _imports.localStorage.getItem(STORAGE_KEY_WHITEBOARD_OPTIONS);
+  if (boardOptions) {
+    return JSON.parse(boardOptions);
+  }
+  return null;
+};
+exports.getWhiteboardOptions = getWhiteboardOptions;
 const clearWhiteboardOptions = () => {
   _imports.localStorage.removeItem(STORAGE_KEY_WHITEBOARD_OPTIONS);
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.7.8",
+  "version": "3.8.0-alpha",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -26,7 +26,7 @@
     "build:split:i18n": "node ./build-doc/doc-localization.js",
     "build:en-docs": "typedoc --entryPoints ./build-doc/en-sdk.d.ts --readme ./build-doc/readme-en.md --hideGenerator --name 'Edu Store Typescript API Reference for Web' --tsconfig ./build-doc/en/tsconfig.json --out en-docs --excludeExternals --excludePrivate --excludeInternal --excludeProtected --disableSources --theme typedoc-theme",
     "build:cn-docs": "typedoc --entryPoints ./build-doc/cn-sdk.d.ts --readme ./build-doc/readme-cn.md --hideGenerator --name 'Edu Store Typescript API Reference for Web' --tsconfig ./build-doc/cn/tsconfig.json --out cn-docs --excludeExternals --excludePrivate --excludeInternal --excludeProtected --disableSources --theme typedoc-theme",
-    "test-browser": "agora-tc-test-karma-browser --file universal/room-control.test.ts",
+    "test-browser": "agora-tc-test-karma-browser",
     "test-electron": "agora-tc-test-karma-electron"
   },
   "devDependencies": {
@@ -40,7 +40,7 @@
     "@types/lodash": "^4.14.168",
     "@types/sinon": "^17.0.2",
     "@types/uuid": "^8.3.0",
-    "agora-toolchain": "3.7.8",
+    "agora-toolchain": "3.8.0-alpha",
     "core-js": "^3.33.3",
     "decomment": "^0.9.5",
     "husky": "^9.0.11",
@@ -52,11 +52,16 @@
     "typescript": "^5.3.2"
   },
   "dependencies": {
+    "@netless/app-slide": "^0.2.81",
+    "@netless/appliance-plugin": "^1.1.21",
     "@netless/forge-room": "1.0.6",
     "@netless/forge-rtm": "1.0.6",
     "@netless/forge-whiteboard": "1.0.6",
-    "agora-foundation": "3.7.8",
-    "agora-rte-sdk": "3.7.8",
+    "@netless/video-js-plugin": "^0.3.8",
+    "@netless/white-snapshot": "^0.4.2",
+    "@netless/window-manager": "^1.0.7-beta.6",
+    "agora-foundation": "3.8.0-alpha",
+    "agora-rte-sdk": "3.8.0-alpha",
     "await-to-js": "^3.0.0",
     "dayjs": "^1.10.4",
     "easemob-websdk": "4.13.0",
@@ -68,6 +73,7 @@
     "lodash": "^4.17.21",
     "protobufjs": "^6.11.2",
     "uuid": "^9.0.1",
+    "white-web-sdk": "^2.16.53",
     "yjs": "^13.6.18"
   },
   "browserslist": {

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

@@ -1,19 +0,0 @@
-import { AgoraRteScene } from 'agora-rte-sdk';
-import { FcrAnnotationConfig, FcrAnnotationControl, FcrAnnotationControlFactory } from './type';
-import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from '../../..';
-import { FcrPrivilegedAnnotationControlImpl } from './privilege-control';
-import { FcrCoreServiceApi } from '../../../service/api';
-import { AgoraRtmClient } from 'agora-rte-sdk/lib/core/rtm/client';
-export declare class FcrAnnotationControlFactoryImpl implements FcrAnnotationControlFactory {
-    private _rtmClient;
-    private _scene?;
-    private _streamControl?;
-    private _userControl?;
-    private _privilegeControl?;
-    private _api?;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    constructor(_rtmClient: AgoraRtmClient, _scene?: AgoraRteScene | undefined, _streamControl?: FcrStreamControl | undefined, _userControl?: FcrUserControl | undefined, _privilegeControl?: FcrPrivilegeControl | undefined, _api?: FcrCoreServiceApi | undefined);
-    createForSubProcess(config: FcrAnnotationConfig): FcrAnnotationControl;
-    createForMainProcess(): FcrPrivilegedAnnotationControlImpl;
-    private _getBoardConfigInfoWithScene;
-}

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

@@ -1,36 +0,0 @@
-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

@@ -1,262 +0,0 @@
-"use strict";
-
-require("core-js/modules/es.symbol.description.js");
-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.FcrPrivilegedAnnotationControlImpl = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.js");
-require("core-js/modules/esnext.iterator.some.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-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 _FcrPrivilegedAnnotationControlImpl;
-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 {
-  constructor(rtmClient, config, _scene, _streamControl, _userControl, _privilegeControl, _api) {
-    super(rtmClient, config);
-    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrPrivilegedAnnotationControlImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_isOpen", false);
-    (0, _defineProperty2.default)(this, "_waitPromise", null);
-    (0, _defineProperty2.default)(this, "_waitPromiseResolve", null);
-    (0, _defineProperty2.default)(this, "_waitPromiseReject", null);
-    (0, _defineProperty2.default)(this, "_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');
-          }
-        }
-      }
-    });
-    (0, _defineProperty2.default)(this, "_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();
-          }
-        }
-      }
-    });
-    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: ".concat(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: ".concat((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: ".concat(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) {
-        var _this$_userControl$ge;
-        const ownerId = stream.owner.userId;
-        const isNotMeSharing = ownerId !== localUserId;
-        const platform = (_this$_userControl$ge = this._userControl.getUser(ownerId)) === null || _this$_userControl$ge === void 0 ? void 0 : _this$_userControl$ge.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: ".concat(isPcPlatform, ", isAndroidPlatform: ").concat(isAndroidPlatform, ", isNotMeSharing: ").concat(isNotMeSharing, ", ownerId: ").concat(ownerId, ", localUserId: ").concat(localUserId, ", platform: ").concat(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 => {
-      var _perm$info;
-      return ((_perm$info = perm.info) === null || _perm$info === void 0 ? void 0 : _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: ".concat((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: ".concat((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;
-  }
-}
-exports.FcrPrivilegedAnnotationControlImpl = FcrPrivilegedAnnotationControlImpl;
-_FcrPrivilegedAnnotationControlImpl = FcrPrivilegedAnnotationControlImpl;
-[_initProto] = _applyDecs(_FcrPrivilegedAnnotationControlImpl, [[_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;

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

@@ -1,38 +0,0 @@
-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 { FcrWhiteboardObserver } from './whiteboard-control/type';
-export declare class FcrWhiteboardControlImpl implements FcrBaseWhiteboardControl {
-    private _scene;
-    private _api;
-    private _engine;
-    private _sharedCache;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    private _boardView;
-    private _boardRoom;
-    private _observable;
-    private _connectState;
-    private _needRetry;
-    private _FORGE_WHITEBOARD_APP_ID;
-    private _roomCache;
-    constructor(_scene: AgoraRteScene, _api: FcrCoreServiceApi, _engine: AgoraRteEngine, _sharedCache: FcrSharedCache);
-    open(): Promise<FcrBoardMainWindow>;
-    close(): Promise<void>;
-    active(): Promise<void>;
-    inactive(): Promise<void>;
-    getConnectionState(): FcrConnectionState;
-    getMainWindow(): FcrBoardMainWindow | undefined;
-    getBoardActiveInfo(): FcrBoardActiveInfo;
-    setBackgroundColor(backgroundColor: string): Promise<void>;
-    getBackgroundColor(): string | undefined;
-    getActivity(): boolean;
-    getOwnerId(): string;
-    addObserver(observer: FcrWhiteboardObserver): void;
-    removeObserver(observer: FcrWhiteboardObserver): void;
-    private _notifyObservers;
-    private _updateConnnectionState;
-    private _getToken;
-    private _addLogObserver;
-}