fcr-core 3.6.0 → 3.6.2

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

@@ -0,0 +1,187 @@
+"use strict";
+
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.error.cause.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.FcrAnnotationControlImpl = void 0;
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _forgeRoom = require("@netless/forge-room");
+var _forgeWhiteboard = require("@netless/forge-whiteboard");
+var _imports = require("agora-rte-sdk/lib/imports");
+var _ = require("../../..");
+var _mainWindow = require("../main-window");
+var _logger = require("../../../utilities/logger");
+var _forgeRtm = require("@netless/forge-rtm");
+var _FcrAnnotationControlImpl;
+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 {
+  constructor(_scene, _api, _engine, _privilegeControl, _sharedCache) {
+    (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _imports.createLogger)({
+      prefix: 'FcrAnnotationControlImpl'
+    })));
+    (0, _defineProperty2.default)(this, "_FCR_ANNOTATION_APP_ID", 'Annotation');
+    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
+    (0, _defineProperty2.default)(this, "_connectState", _.FcrConnectionState.DISCONNECTED);
+    (0, _defineProperty2.default)(this, "_joined", false);
+    this._scene = _scene;
+    this._api = _api;
+    this._engine = _engine;
+    this._privilegeControl = _privilegeControl;
+    this._sharedCache = _sharedCache;
+    this._addLogObserver();
+  }
+  async open() {
+    var _this$_scene$getUser;
+    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 = this._scene.getUser(userId)) === null || _this$_scene$getUser === void 0 ? void 0 : _this$_scene$getUser.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(_.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 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._boardView.setBackgroundColor('rgba(0, 0, 0, 0)');
+        // this._boardView.setBoardTransparent(true);
+        this._updateConnnectionState(_.FcrConnectionState.CONNECTED);
+      }, [], {
+        retriesMax
+      }).fail(async _ref => {
+        let {
+          error,
+          timeFn,
+          currentRetry
+        } = _ref;
+        this.logger.info("failed to join board room, error: ".concat(error.message, ", current retry: ").concat(currentRetry));
+        this._joined && (await timeFn());
+        this.logger.info("continue attemptting? ".concat(this._joined));
+        return this._joined;
+      }).abort(() => {
+        this._updateConnnectionState(_.FcrConnectionState.DISCONNECTED);
+      }).exec();
+    } catch (e) {
+      this._updateConnnectionState(_.FcrConnectionState.DISCONNECTED);
+    }
+    return this._boardView;
+  }
+  async close() {
+    var _this$_boardRoom, _this$_boardRoom2;
+    this._joined = false;
+    (_this$_boardRoom = this._boardRoom) === null || _this$_boardRoom === void 0 || _this$_boardRoom.applicationManager.terminateApplication(this._FCR_ANNOTATION_APP_ID);
+    await ((_this$_boardRoom2 = this._boardRoom) === null || _this$_boardRoom2 === void 0 ? void 0 : _this$_boardRoom2.leaveRoom());
+    this._boardRoom = undefined;
+    this._boardView = undefined;
+  }
+  getConnectionState() {
+    return this._connectState;
+  }
+  getMainWindow() {
+    return this._boardView;
+  }
+  addObserver(observer) {
+    this._observable.addObserver(observer);
+  }
+  removeObserver(observer) {
+    this._observable.removeObserver(observer);
+  }
+  _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 boardWidth = Number.isNaN(boardWidthVal) ? 16 / 9 * 1000 : boardWidthVal;
+    const boardHeight = Number.isNaN(boardHeightVal) ? 1000 : boardHeightVal;
+    return {
+      size: {
+        width: boardWidth,
+        height: boardHeight
+      },
+      extra: {
+        boardAppId,
+        boardId,
+        boardToken,
+        region: boardRegion
+      }
+    };
+  }
+  _updateConnnectionState(state) {
+    this._connectState = state;
+    this._observable.notifyObservers('onConnectionStateUpdated', state);
+  }
+  _addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onActive', 'onInactive', 'onBackgroundColorUpdated', 'onConnectionStateUpdated']));
+  }
+}
+exports.FcrAnnotationControlImpl = FcrAnnotationControlImpl;
+_FcrAnnotationControlImpl = FcrAnnotationControlImpl;
+[_initProto] = _applyDecs(_FcrAnnotationControlImpl, [[_imports.bound, 2, "open"], [[_imports.bound, _imports.trace], 2, "close"], [[_imports.bound, _imports.trace], 2, "getConnectionState"], [[_imports.bound, _imports.trace], 2, "getMainWindow"], [_imports.bound, 2, "_updateConnnectionState"]], []).e;

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

@@ -0,0 +1,32 @@
+import { FcrBaseWhiteboardControl } from '../../whiteboard-control/types';
+export interface FcrAnnotationControl extends FcrBaseWhiteboardControl {
+}
+export interface FcrAnnotationBoardConfig {
+    state: number;
+    position: {
+        xAxis: number;
+        yAxis: number;
+    };
+    size: {
+        width: number;
+        height: number;
+    };
+    extra: {
+        boardAppId: string;
+        boardId: string;
+        boardToken: string;
+        region: string;
+    };
+}
+export interface FcrAnnotationBoardSceneInfo {
+    size: {
+        width: number;
+        height: number;
+    };
+    extra: {
+        boardAppId: string;
+        boardId: string;
+        boardToken: string;
+        region: string;
+    };
+}

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

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

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

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

@@ -41,6 +41,7 @@ var _logger = require("../../utilities/logger");
 var _error = require("../../utilities/error");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
 var _schema = require("../../schema");
+var _packageInfo = require("../../utilities/package-info");
 var _FcrWhiteboardControlImpl;
 let _initProto, _setBackgroundColorDecs, _ref;
 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)]; } }; }
@@ -65,6 +66,7 @@ class FcrWhiteboardControlImpl {
     this._roomCache = _sharedCache.getRoomCache(this._scene.sceneId);
     this._addLogObserver();
     _scene.addObserver(this._notifyObservers());
+    this.logger.info("Whitebaord Version: forge-whiteboard@".concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-whiteboard'), ", forge-room@").concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-room'), ", forge-rtm@").concat((0, _packageInfo.getDependenciesInfo)('@netless/forge-rtm')));
   }
   async open() {
     var _this$_scene$getUser;
@@ -88,6 +90,22 @@ class FcrWhiteboardControlImpl {
     const rtmClient = this._engine._rtmClient._client;
     const rtmProvider = new _forgeRtm.RTMProvider_2_2(rtmClient);
     const wbRoom = new _forgeRoom.Room(boardId, rtmProvider);
+    rtmProvider.addListener('connectionStatusChange', state => {
+      switch (state) {
+        case 'CONNECTED':
+          this._updateConnnectionState(_2.FcrConnectionState.CONNECTED);
+          break;
+        case 'RECONNECTING':
+          this._updateConnnectionState(_2.FcrConnectionState.RECONNECTING);
+          break;
+        case 'CONNECTING':
+          this._updateConnnectionState(_2.FcrConnectionState.CONNECTING);
+          break;
+        case 'DISCONNECTED':
+          this._updateConnnectionState(_2.FcrConnectionState.DISCONNECTED);
+          break;
+      }
+    });
     wbRoom.applicationManager.registerApplication(_forgeWhiteboard.WhiteboardApplication);
     try {
       this._updateConnnectionState(_2.FcrConnectionState.CONNECTING);
@@ -123,7 +141,7 @@ class FcrWhiteboardControlImpl {
         // wbRoom.applicationManager.on('terminal', () => {
         //   this._updateConnnectionState(FcrConnectionState.DISCONNECTED);
         // });
-        this._boardView = new _mainWindow.FcrBoardMainWindowImpl(whiteboard, this._scene, this._sharedCache);
+        this._boardView = new _mainWindow.FcrBoardMainWindowImpl(whiteboard, this._scene, this._sharedCache, wbRoom);
         this._updateConnnectionState(_2.FcrConnectionState.CONNECTED);
       }, [], {
         retriesMax

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

@@ -1,17 +1,19 @@
 import { FcrBoardToolType } from '../whiteboard-control/enums';
-import { Color, FcrBoardMainWindow, FcrBoardPageInfo, FcrBoardWindowObserver } from '../whiteboard-control/types';
+import { Color, FcrBoardMainWindow, FcrBoardMainWindowObserver, FcrBoardPageInfo } from '../whiteboard-control/types';
 import { Whiteboard } from '@netless/forge-whiteboard';
 import { type AgoraRteScene } from '../../imports';
 import { FcrSharedCache } from '../shared-cache';
+import { Room } from '@netless/forge-room';
 export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _whiteboard;
     private _observable;
     private _boardView;
     private _currentPage;
+    private _background;
     private _roomCache;
     private _scene;
-    constructor(whiteboard: Whiteboard, scene: AgoraRteScene, sharedCache: FcrSharedCache);
+    constructor(whiteboard: Whiteboard, scene: AgoraRteScene, sharedCache: FcrSharedCache, boardRoom: Room);
     addPage(): Promise<void>;
     removePage(): Promise<void>;
     undo(): Promise<void>;
@@ -30,8 +32,9 @@ export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     insertImage(resourceUrl: string, x: number, y: number, width: number, height: number): Promise<void>;
     getContentView(): HTMLElement;
     setContainerSizeRatio(ratio: number): Promise<void>;
-    addObserver(observer: FcrBoardWindowObserver): void;
-    removeObserver(observer: FcrBoardWindowObserver): void;
+    setBoardTransparent(isTransparent: boolean): Promise<void>;
+    addObserver(observer: FcrBoardMainWindowObserver): void;
+    removeObserver(observer: FcrBoardMainWindowObserver): void;
     private _addWindowManagerEventListeners;
     private _isBoardWritePermission;
     private _addLogObserver;

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

@@ -47,12 +47,13 @@ function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.descrip
 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; }
 _ref = (_setBackgroundColorDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _setToolTypeDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.fcrBoardToolTypeSchema)], _setStrokeWidthDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.numberSchema)], _setStrokeColorDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.colorSchema)], _setTextColorDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.colorSchema)], _setTextSizeDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.numberSchema)], _insertImageDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.numberSchema, _schema.numberSchema, _schema.numberSchema, _schema.numberSchema)], _setContainerSizeRatioDecs = [_imports.bound, _imports.trace, (0, _validateParams.default)(_schema.numberSchema)], "logger");
 class FcrBoardMainWindowImpl {
-  constructor(whiteboard, scene, sharedCache) {
+  constructor(whiteboard, scene, sharedCache, boardRoom) {
     (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrBoardMainWindowImpl'
     })));
     (0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2.default)(this, "_currentPage", 0);
+    (0, _defineProperty2.default)(this, "_background", 'rgba(0, 0, 0, 0)');
     this._roomCache = sharedCache.getRoomCache(scene.sceneId);
     this._addLogObserver();
     this._boardView = document.createElement('div');
@@ -65,7 +66,21 @@ class FcrBoardMainWindowImpl {
     this._whiteboard = whiteboard;
     this._scene = scene;
     this._addWindowManagerEventListeners();
-    const hasOperationPrivilege = (0, _helper.getLocalUserPermissionInfo)(scene, _type.FcrPermissionAction.BoardWrite).enable;
+    boardRoom.applicationManager.on('launch', (appId, app) => {
+      this.logger.info('launch event is triggered');
+      const newNode = app.view;
+      newNode.style.height = "100%";
+      newNode.style.width = "100%";
+      if (this._background) {
+        newNode.style.backgroundColor = 'rgba(0,0,0,0)';
+      }
+      this._boardView.appendChild(newNode);
+    });
+    boardRoom.applicationManager.on('terminal', (appId, app) => {
+      this.logger.info('terminal event is triggered');
+      this._boardView.removeChild(app.view);
+    });
+    const hasOperationPrivilege = (0, _helper.getLocalUserPermissionInfo)(scene, _type.FcrPermissionAction.BoardWrite).enable || (0, _helper.getLocalUserPermissionInfo)(scene, _type.FcrPermissionAction.AnnotationWrite).enable;
     whiteboard.permissions[hasOperationPrivilege ? 'addPermission' : 'removePermission'](_forgeWhiteboard.WhiteboardPermissionFlag.all);
     (0, _helper.addLocalUserPermissionObserver)(scene, {
       onLocalUserPermissionInfoAdded: (roomId, event) => {
@@ -124,6 +139,7 @@ class FcrBoardMainWindowImpl {
     }
   }
   async setBackgroundColor(color) {
+    this._background = color;
     this._whiteboard.setCanvasBackgroundColor(color);
   }
   getPageInfo() {
@@ -183,6 +199,7 @@ class FcrBoardMainWindowImpl {
     return this._boardView;
   }
   async setContainerSizeRatio(ratio) {}
+  async setBoardTransparent(isTransparent) {}
   addObserver(observer) {
     this._observable.addObserver(observer);
   }
@@ -225,4 +242,4 @@ class FcrBoardMainWindowImpl {
 }
 exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
 _FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[[_imports.bound, _imports.trace], 2, "addPage"], [[_imports.bound, _imports.trace], 2, "removePage"], [[_imports.bound, _imports.trace], 2, "undo"], [[_imports.bound, _imports.trace], 2, "redo"], [[_imports.bound, _imports.trace], 2, "clean"], [[_imports.bound, _imports.trace], 2, "getSnapshotImage"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_imports.bound, _imports.trace], 2, "getPageInfo"], [[_imports.bound, _imports.trace], 2, "prevPage"], [[_imports.bound, _imports.trace], 2, "nextPage"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_insertImageDecs, 2, "insertImage"], [[_imports.bound, _imports.trace], 2, "getContentView"], [_setContainerSizeRatioDecs, 2, "setContainerSizeRatio"]], []).e;
+[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[[_imports.bound, _imports.trace], 2, "addPage"], [[_imports.bound, _imports.trace], 2, "removePage"], [[_imports.bound, _imports.trace], 2, "undo"], [[_imports.bound, _imports.trace], 2, "redo"], [[_imports.bound, _imports.trace], 2, "clean"], [[_imports.bound, _imports.trace], 2, "getSnapshotImage"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_imports.bound, _imports.trace], 2, "getPageInfo"], [[_imports.bound, _imports.trace], 2, "prevPage"], [[_imports.bound, _imports.trace], 2, "nextPage"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_insertImageDecs, 2, "insertImage"], [[_imports.bound, _imports.trace], 2, "getContentView"], [_setContainerSizeRatioDecs, 2, "setContainerSizeRatio"], [[_imports.bound, _imports.trace], 2, "setBoardTransparent"]], []).e;

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

@@ -0,0 +1,38 @@
+import { FcrBoardActiveInfo, FcrBoardMainWindow } from '../../whiteboard-control/types';
+import { AgoraRteEngine, AgoraRteScene } from '../../../imports';
+import { FcrCoreServiceApi } from '../../../service/api';
+import { FcrConnectionState } from '../../../';
+import { FcrWhiteboardControl, FcrWhiteboardObserver } from '../whiteboard-control/type';
+import { FcrSharedCache } from '../../shared-cache';
+export declare class FcrWhiteboardControlImpl implements FcrWhiteboardControl {
+    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 _joined;
+    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;
+}