fcr-core 3.8.2 → 3.9.0-alpha

package/lib/room-control/whiteboard-control-v1/board-window.d.ts

@@ -3,6 +3,7 @@ import '@netless/appliance-plugin/dist/style.css';
 import '@netless/window-manager/dist/style.css';
 import { FcrBoardToolType } from './enum';
 import { FcrBoardSubWindowImpl } from './board-subwindow';
+import { FcrReturnCode } from '../../type';
 import { FcrBoardEraserSize, FcrBoardMainWindow_V1, FcrBoardPage, FcrBoardWindowObserver } from './type';
 import { FcrColor } from '../whiteboard-control/type';
 export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow_V1 {
@@ -18,8 +19,8 @@ export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow_V1 {
     private _destroyed;
     constructor(room: Room);
     getSnapshotImage(): Promise<ImageData>;
-    addObserver(observer: FcrBoardWindowObserver): void;
-    removeObserver(observer: FcrBoardWindowObserver): void;
+    addObserver(observer: FcrBoardWindowObserver): FcrReturnCode;
+    removeObserver(observer: FcrBoardWindowObserver): FcrReturnCode;
     getContentView(): HTMLElement;
     setScale(value: number): void;
     openSubWindowWithTaskId(title: string, taskId: string, urlPrefix?: string): Promise<FcrBoardSubWindowImpl | undefined>;
@@ -29,24 +30,24 @@ export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow_V1 {
         showIndex: number;
         count: number;
     };
-    addPage(): Promise<void>;
-    removePage(): Promise<void>;
-    prevPage(): Promise<void>;
-    nextPage(): Promise<void>;
-    undo(): Promise<void>;
-    redo(): Promise<void>;
-    clean(retainPpt?: boolean): Promise<void>;
-    setToolType(type: FcrBoardToolType): Promise<void>;
-    setStrokeWidth(strokeWidth: number): Promise<void>;
-    setStrokeColor(color: FcrColor): Promise<void>;
-    setTextColor(color: FcrColor): Promise<void>;
-    setTextSize(size: number): Promise<void>;
-    setFillColor(fillColor: FcrColor): Promise<void>;
-    setEraserSize(size: FcrBoardEraserSize): Promise<void>;
-    setBackgroundColor(color: string): Promise<void>;
-    insertImage(resourceUrl: string, x: number, y: number, width: number, height: number): Promise<void>;
-    insertMedia(resourceUrl: string, title?: string): Promise<void>;
-    destroy(): void;
+    addPage(): Promise<FcrReturnCode>;
+    removePage(): Promise<FcrReturnCode>;
+    prevPage(): Promise<FcrReturnCode>;
+    nextPage(): Promise<FcrReturnCode>;
+    undo(): Promise<number>;
+    redo(): Promise<number>;
+    clean(retainPpt?: boolean): Promise<FcrReturnCode>;
+    setToolType(type: FcrBoardToolType): Promise<FcrReturnCode>;
+    setStrokeWidth(strokeWidth: number): Promise<FcrReturnCode>;
+    setStrokeColor(color: FcrColor): Promise<FcrReturnCode>;
+    setTextColor(color: FcrColor): Promise<FcrReturnCode>;
+    setTextSize(size: number): Promise<FcrReturnCode>;
+    setFillColor(fillColor: FcrColor): Promise<FcrReturnCode>;
+    setEraserSize(size: FcrBoardEraserSize): Promise<FcrReturnCode>;
+    setBackgroundColor(color: string): Promise<FcrReturnCode>;
+    insertImage(resourceUrl: string, x: number, y: number, width: number, height: number): Promise<FcrReturnCode>;
+    insertMedia(resourceUrl: string, title?: string): Promise<FcrReturnCode>;
+    destroy(): FcrReturnCode;
     getWritable(): boolean;
     private _convertToScenes;
     private _preCheck;

package/lib/room-control/whiteboard-control-v1/board-window.js

@@ -40,9 +40,10 @@ var _imports = require("../../imports");
 var _boardSubwindow = require("./board-subwindow");
 var _fullWorker = _interopRequireDefault(require("@netless/appliance-plugin/dist/fullWorker.js?raw"));
 var _subWorker = _interopRequireDefault(require("@netless/appliance-plugin/dist/subWorker.js?raw"));
+var _type = require("../../type");
 var _lodash = require("lodash");
 var _imports2 = require("agora-rte-sdk/lib/imports");
-let _initProto; //@ts-ignore
+let _initProto, _cleanDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _setFillColorDecs, _setEraserSizeDecs, _setBackgroundColorDecs, _insertImageDecs, _insertMediaDecs, _mountDecs; //@ts-ignore
 //@ts-ignore
 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 + ""; }
@@ -51,9 +52,9 @@ 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; }
 class FcrBoardMainWindowImpl {
   static {
-    [_initProto] = _applyDecs(this, [[[_imports.bound, _imports.trace], 2, "getSnapshotImage"], [_imports.trace, 2, "addObserver"], [_imports.trace, 2, "removeObserver"], [_imports.trace, 2, "getContentView"], [_imports.bound, 2, "setScale"], [_imports.bound, 2, "openSubWindowWithTaskId"], [_imports.bound, 2, "openSubWindowWithPageList"], [_imports.trace, 2, "getPageInfo"], [[_imports.bound, _imports.trace], 2, "addPage"], [[_imports.bound, _imports.trace], 2, "removePage"], [_imports.trace, 2, "prevPage"], [_imports.trace, 2, "nextPage"], [[_imports.bound, _imports.trace], 2, "undo"], [[_imports.bound, _imports.trace], 2, "redo"], [[_imports.bound, _imports.trace], 2, "clean"], [[_imports.bound, _imports.trace], 2, "setToolType"], [[_imports.bound, _imports.trace], 2, "setStrokeWidth"], [[_imports.bound, _imports.trace], 2, "setStrokeColor"], [[_imports.bound, _imports.trace], 2, "setTextColor"], [[_imports.bound, _imports.trace], 2, "setTextSize"], [[_imports.bound, _imports.trace], 2, "setFillColor"], [[_imports.bound, _imports.trace], 2, "setEraserSize"], [[_imports.bound, _imports.trace], 2, "setBackgroundColor"], [[_imports.bound, _imports.trace], 2, "insertImage"], [[_imports.bound, _imports.trace], 2, "insertMedia"], [_imports.trace, 2, "destroy"], [_imports.trace, 2, "getWritable"], [_imports.trace, 2, "_mount"], [_imports.trace, 2, "_setRoom"]], []).e;
+    [_initProto] = _applyDecs(this, [[[_imports.bound, _imports.trace], 2, "getSnapshotImage"], [_imports.trace, 2, "addObserver"], [_imports.trace, 2, "removeObserver"], [_imports.trace, 2, "getContentView"], [_imports.bound, 2, "setScale"], [_imports.bound, 2, "openSubWindowWithTaskId"], [_imports.bound, 2, "openSubWindowWithPageList"], [_imports.trace, 2, "getPageInfo"], [[_imports.bound, _imports.trace], 2, "addPage"], [[_imports.bound, _imports.trace], 2, "removePage"], [_imports.trace, 2, "prevPage"], [_imports.trace, 2, "nextPage"], [[_imports.bound, _imports.trace], 2, "undo"], [[_imports.bound, _imports.trace], 2, "redo"], [_cleanDecs, 2, "clean"], [_setToolTypeDecs, 2, "setToolType"], [_setStrokeWidthDecs, 2, "setStrokeWidth"], [_setStrokeColorDecs, 2, "setStrokeColor"], [_setTextColorDecs, 2, "setTextColor"], [_setTextSizeDecs, 2, "setTextSize"], [_setFillColorDecs, 2, "setFillColor"], [_setEraserSizeDecs, 2, "setEraserSize"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [_insertImageDecs, 2, "insertImage"], [_insertMediaDecs, 2, "insertMedia"], [_imports.trace, 2, "destroy"], [_imports.trace, 2, "getWritable"], [_mountDecs, 2, "_mount"], [_imports.trace, 2, "_setRoom"]], []).e;
   }
-  logger = (_initProto(this), (0, _logger.createLogger)({
+  [(_cleanDecs = [_imports.bound, (0, _imports.trace)(['retainPpt'])], _setToolTypeDecs = [_imports.bound, (0, _imports.trace)(['type'])], _setStrokeWidthDecs = [_imports.bound, (0, _imports.trace)(['strokeWidth'])], _setStrokeColorDecs = [_imports.bound, (0, _imports.trace)(['color'])], _setTextColorDecs = [_imports.bound, (0, _imports.trace)(['color'])], _setTextSizeDecs = [_imports.bound, (0, _imports.trace)(['size'])], _setFillColorDecs = [_imports.bound, (0, _imports.trace)(['fillColor'])], _setEraserSizeDecs = [_imports.bound, (0, _imports.trace)(['size'])], _setBackgroundColorDecs = [_imports.bound, (0, _imports.trace)(['color'])], _insertImageDecs = [_imports.bound, (0, _imports.trace)(['resourceUrl', 'x', 'y', 'width', 'height'])], _insertMediaDecs = [_imports.bound, (0, _imports.trace)(['resourceUrl', 'title'])], _mountDecs = (0, _imports.trace)(['options', 'params']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
     prefix: 'FcrBoardMainWindowImpl'
   }));
   _memberState = {};
@@ -97,7 +98,7 @@ class FcrBoardMainWindowImpl {
             return result;
           }
         } catch (e) {
-          this.logger.error('[FcrBoardMainWindow] failed to take snapshot', e);
+          this.logger.error('failed to take snapshot', e);
         }
       }
     }
@@ -105,9 +106,11 @@ class FcrBoardMainWindowImpl {
   }
   addObserver(observer) {
     this._observable.addObserver(observer);
+    return _type.FcrReturnCode.SUCCESS;
   }
   removeObserver(observer) {
     this._observable.removeObserver(observer);
+    return _type.FcrReturnCode.SUCCESS;
   }
   getContentView() {
     return this._whiteView;
@@ -168,36 +171,40 @@ class FcrBoardMainWindowImpl {
       await this._windowManager.addPage();
       await this._windowManager.nextPage();
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async removePage() {
     this._preCheck();
     if (this._windowManager?.removePage) {
       await this._windowManager.removePage();
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async prevPage() {
     this._preCheck();
     if (this._windowManager?.prevPage) {
       await this._windowManager.prevPage();
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async nextPage() {
     this._preCheck();
     if (this._windowManager?.nextPage) {
       await this._windowManager.nextPage();
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async undo() {
     this._preCheck({
       wm: false
     });
-    this._whiteBoardroom.undo();
+    return this._whiteBoardroom.undo();
   }
   async redo() {
     this._preCheck({
       wm: false
     });
-    this._whiteBoardroom.redo();
+    return this._whiteBoardroom.redo();
   }
   async clean(retainPpt) {
     this._preCheck({
@@ -205,6 +212,7 @@ class FcrBoardMainWindowImpl {
     });
     // this._whiteBoardroom?.cleanScene?.(true); // new version methods
     this._whiteBoardroom.cleanCurrentScene(retainPpt);
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setToolType(type) {
     this._preCheck({
@@ -224,6 +232,7 @@ class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._appliancePluginInstance?.setMemberState(change);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setStrokeWidth(strokeWidth) {
     this._preCheck();
@@ -237,6 +246,7 @@ class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setStrokeColor(color) {
     this._preCheck();
@@ -251,6 +261,7 @@ class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setTextColor(color) {
     this._preCheck();
@@ -265,6 +276,7 @@ class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setTextSize(size) {
     this._preCheck();
@@ -278,6 +290,7 @@ class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setFillColor(fillColor) {
     this._preCheck();
@@ -292,6 +305,7 @@ class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setEraserSize(size) {
     this._preCheck();
@@ -305,11 +319,13 @@ class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setBackgroundColor(color) {
     this._preCheck();
     this._backgroundColor = color;
     this._whiteView.querySelector('.netless-whiteboard')?.style.setProperty('background-color', color);
+    return _type.FcrReturnCode.SUCCESS;
   }
   async insertImage(resourceUrl, x, y, width, height) {
     const room = this._whiteBoardroom;
@@ -353,6 +369,7 @@ class FcrBoardMainWindowImpl {
       room.insertImage(imageInfo);
       room.completeImageUpload(uuid, resourceUrl);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async insertMedia(resourceUrl, title) {
     const windowManager = this._windowManager;
@@ -369,6 +386,7 @@ class FcrBoardMainWindowImpl {
         }
       });
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   destroy() {
     if (this._windowManager) {
@@ -376,6 +394,7 @@ class FcrBoardMainWindowImpl {
       this._windowManager = undefined;
     }
     this._destroyed = true;
+    return _type.FcrReturnCode.SUCCESS;
   }
   getWritable() {
     return this._whiteBoardroom.isWritable;
@@ -529,7 +548,7 @@ class FcrBoardMainWindowImpl {
           });
         }
       }).catch(e => {
-        this.logger.error('[FcrBoardMainWindow] failed to mount', e);
+        this.logger.error('failed to mount', e);
       }).finally(() => {
         this.logger.info('[FcrBoardMainWindow] finish mount board window, white room id:', this._whiteBoardroom.uuid);
         _mountManager.BoardMountManager.setIsMounting(false);
@@ -554,7 +573,7 @@ class FcrBoardMainWindowImpl {
     room.setMemberState(this._memberState);
   }
   _addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onWritable', 'onPageInfoUpdated', 'onUndoStateUpdated', 'onRedoStateUpdated']));
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onWritable', ['isWritable']], ['onPageInfoUpdated', ['info']], ['onUndoStateUpdated', ['enable']], ['onRedoStateUpdated', ['enable']]]));
   }
 }
 exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;

package/lib/room-control/whiteboard-control-v1/factory.js

@@ -12,7 +12,7 @@ class FcrWhiteboardControlFactoryImpl {
   });
   constructor() {}
   createForMainProcess(hasOperationPrivilege, scene, api, sharedCache) {
-    this.logger.info('[whiteboard]: create for main process, use old whiteboard control');
+    this.logger.info('create for main process, use old whiteboard control');
     return new _.FcrWhiteboardControlImpl(scene, api, sharedCache, hasOperationPrivilege);
   }
 }

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

@@ -27,23 +27,24 @@ exports.FcrWhiteboardControlImpl = void 0;
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _appSlide = _interopRequireDefault(require("@netless/app-slide"));
-var _whiteWebSdk = require("white-web-sdk");
+var _appliancePlugin = require("@netless/appliance-plugin");
 var netlessVideoPlugin = _interopRequireWildcard(require("@netless/video-js-plugin"));
 var _windowManager = require("@netless/window-manager");
-var _appliancePlugin = require("@netless/appliance-plugin");
-var _utils = require("./utils");
-var _observable = require("agora-foundation/lib/utilities/observable");
-var _boardWindow = require("./board-window");
-var _type = require("../whiteboard-control/type");
 var _decorator = require("agora-foundation/lib/decorator");
-var _user = require("../../utilities/user");
-var _2 = require("../..");
-var _logger = require("../../utilities/logger");
 var _imports = require("../../imports");
-var _error = require("../../utilities/error");
+var _observable = require("agora-foundation/lib/utilities/observable");
 var _imports2 = require("agora-rte-sdk/lib/imports");
+var _whiteWebSdk = require("white-web-sdk");
+var _2 = require("../..");
+var _type = require("../../type");
+var _error = require("../../utilities/error");
+var _logger = require("../../utilities/logger");
+var _user = require("../../utilities/user");
 var _type2 = require("../sharing-control/type");
-let _initProto;
+var _type3 = require("../whiteboard-control/type");
+var _boardWindow = require("./board-window");
+var _utils = require("./utils");
+let _initProto, _openDecs, _setBackgroundColorDecs, _setOperationPrivilegeDecs, _setBoardWritableDecs;
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 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 + ""; }
@@ -55,9 +56,9 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
  */
 class FcrWhiteboardControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[[_decorator.bound, _imports.trace], 2, "active"], [[_decorator.bound, _imports.trace], 2, "inactive"], [[_decorator.bound, _imports.trace], 2, "open"], [[_decorator.bound, _imports.trace], 2, "close"], [[_decorator.bound, _imports.trace], 2, "setBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getActivity"], [[_decorator.bound, _imports.trace], 2, "getOwnerId"], [[_decorator.bound, _imports.trace], 2, "getBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getConnectionState"], [[_decorator.bound, _imports.trace], 2, "getMainWindow"], [[_decorator.bound, _imports.trace], 2, "addObserver"], [[_decorator.bound, _imports.trace], 2, "removeObserver"], [[_decorator.bound, _imports.trace], 2, "getBoardActiveInfo"], [[_decorator.bound, _imports.trace], 2, "hasOperationPrivilege"], [[_decorator.bound, _imports.trace], 2, "setOperationPrivilege"], [_imports.trace, 2, "_setBoardWritable"], [_decorator.bound, 2, "_getToken"], [_decorator.bound, 2, "_handleRoomStateUpdated"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_handleConnectionStateUpdated"], [_imports.trace, 2, "_connect"], [_imports.trace, 2, "_clean"]], []).e;
+    [_initProto] = _applyDecs(this, [[[_decorator.bound, _imports.trace], 2, "active"], [[_decorator.bound, _imports.trace], 2, "inactive"], [_openDecs, 2, "open"], [[_decorator.bound, _imports.trace], 2, "close"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getActivity"], [[_decorator.bound, _imports.trace], 2, "getOwnerId"], [[_decorator.bound, _imports.trace], 2, "getBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getConnectionState"], [[_decorator.bound, _imports.trace], 2, "getMainWindow"], [[_decorator.bound, _imports.trace], 2, "addObserver"], [[_decorator.bound, _imports.trace], 2, "removeObserver"], [[_decorator.bound, _imports.trace], 2, "getBoardActiveInfo"], [[_decorator.bound, _imports.trace], 2, "hasOperationPrivilege"], [_setOperationPrivilegeDecs, 2, "setOperationPrivilege"], [_setBoardWritableDecs, 2, "_setBoardWritable"], [_decorator.bound, 2, "_getToken"], [_decorator.bound, 2, "_handleRoomStateUpdated"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_handleConnectionStateUpdated"], [_imports.trace, 2, "_connect"], [_imports.trace, 2, "_clean"]], []).e;
   }
-  logger = (_initProto(this), (0, _logger.createLogger)({
+  [(_openDecs = [_decorator.bound, (0, _imports.trace)(['params'])], _setBackgroundColorDecs = [_decorator.bound, (0, _imports.trace)(['backgroundColor'])], _setOperationPrivilegeDecs = [_decorator.bound, (0, _imports.trace)(['hasPrivilege'])], _setBoardWritableDecs = (0, _imports.trace)(['granted']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
     prefix: 'FcrWhiteboardControlImpl'
   }));
   _client = {};
@@ -108,10 +109,10 @@ class FcrWhiteboardControlImpl {
     });
   }
   async active() {
-    return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _type2.FcrSharePermissionState.ON), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'active failed');
+    return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _type2.FcrSharePermissionState.ON), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'active failed');
   }
   async inactive() {
-    return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _type2.FcrSharePermissionState.OFF), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'inactive failed');
+    return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _type2.FcrSharePermissionState.OFF), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'inactive failed');
   }
   async open(params = {}) {
     this._whiteboardPrivateParameters = params;
@@ -127,12 +128,14 @@ class FcrWhiteboardControlImpl {
   async close() {
     this._joined = false;
     await this._clean();
+    return _type.FcrReturnCode.SUCCESS;
   }
   async setBackgroundColor(backgroundColor) {
     await this._api.setBackgroundColor({
       roomId: this._scene.sceneId,
       backgroundColor
     });
+    return _type.FcrReturnCode.SUCCESS;
   }
   getActivity() {
     return this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard').state === 1;
@@ -151,9 +154,11 @@ class FcrWhiteboardControlImpl {
   }
   addObserver(observer) {
     this._observable.addObserver(observer);
+    return _type.FcrReturnCode.SUCCESS;
   }
   removeObserver(observer) {
     this._observable.removeObserver(observer);
+    return _type.FcrReturnCode.SUCCESS;
   }
   getBoardActiveInfo() {
     const {
@@ -163,7 +168,7 @@ class FcrWhiteboardControlImpl {
       isActive: false,
       ownerUserUuid: null
     };
-    if (state === _type.FcrBoardPropertiesState.ACTIVE) {
+    if (state === _type3.FcrBoardPropertiesState.ACTIVE) {
       return {
         isActive: true,
         ownerUserId
@@ -183,6 +188,7 @@ class FcrWhiteboardControlImpl {
       this._hasOperationPrivilege = hasPrivilege;
       this._setBoardWritable(hasPrivilege);
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   async _setBoardWritable(granted) {
     if (this._room) {
@@ -211,6 +217,7 @@ class FcrWhiteboardControlImpl {
         }
       }
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   _createPlugins() {
     const plugins = (0, _whiteWebSdk.createPlugins)({
@@ -226,7 +233,7 @@ class FcrWhiteboardControlImpl {
     return await (0, _error.handleRequestError)(() => this._api.getWhiteboardToken({
       roomId,
       userId
-    }), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'get whiteboard token failed');
+    }), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'get whiteboard token failed');
   }
   _handleRoomStateUpdated(state) {
     const {
@@ -420,9 +427,10 @@ class FcrWhiteboardControlImpl {
       }
       this._room = undefined;
     }
+    return _type.FcrReturnCode.SUCCESS;
   }
   _addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onActive', 'onInactive', 'onBackgroundColorUpdated', 'onConnectionStateUpdated']));
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onActive', ['ownerId', 'operatorUser']], ['onInactive', ['reason', 'operatorUser']], ['onBackgroundColorUpdated', ['color', 'operatorUser']], ['onConnectionStateUpdated', ['state']]]));
   }
 }
 exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;

package/lib/room-control/whiteboard-control-v1/type.d.ts

@@ -54,7 +54,7 @@ export interface FcrWhiteboardControl {
      * Sets whether the user has the permission to draw on the whiteboard.
      * @param hasPrivilege
      */
-    setOperationPrivilege(hasPrivilege: boolean): void;
+    setOperationPrivilege(hasPrivilege: boolean): number;
     /**
      * Opens the whiteboard and creates a main window.
      */
@@ -62,7 +62,7 @@ export interface FcrWhiteboardControl {
     /**
      * Closes the whiteboard and releases the main window.
      */
-    close(): Promise<void>;
+    close(): Promise<number>;
     /**
      * Activates the whiteboard.
      */
@@ -87,7 +87,7 @@ export interface FcrWhiteboardControl {
      * Sets the background color of the whiteboard.
      * @param color
      */
-    setBackgroundColor(color: string): Promise<void>;
+    setBackgroundColor(color: string): Promise<number>;
     /**
      * Gets the background color of the whiteboard.
      */
@@ -104,12 +104,12 @@ export interface FcrWhiteboardControl {
      * Adds an observer to the whiteboard.
      * @param observer
      */
-    addObserver(observer: FcrWhiteboardObserver): void;
+    addObserver(observer: FcrWhiteboardObserver): number;
     /**
      * Removes the observer from the whiteboard.
      * @param observer
      */
-    removeObserver(observer: FcrWhiteboardObserver): void;
+    removeObserver(observer: FcrWhiteboardObserver): number;
 }
 export interface FcrBoardSubWindow {
     exportPdf(): Promise<ArrayBuffer>;
@@ -117,29 +117,30 @@ export interface FcrBoardSubWindow {
 export declare enum FcrBoardEraserSize {
     SMALL = 1,
     MEDIUM = 2,
-    LARGE = 3
+    LARGE = 3,
+    GIANT = 4
 }
 export interface FcrBoardMainWindow_V1 {
     /**
      * Adds a page.
      */
-    addPage(): Promise<void>;
+    addPage(): Promise<number>;
     /**
      * Removes a page.
      */
-    removePage(): Promise<void>;
+    removePage(): Promise<number>;
     /**
      * Undoes the operation.
      */
-    undo(): Promise<void>;
+    undo(): Promise<number>;
     /**
      * Redoes the operation.
      */
-    redo(): Promise<void>;
+    redo(): Promise<number>;
     /**
      * Cleans the whiteboard.
      */
-    clean(): Promise<void>;
+    clean(): Promise<number>;
     /**
      * Gets the snapshot image of the whiteboard.
      */
@@ -148,7 +149,7 @@ export interface FcrBoardMainWindow_V1 {
      * Sets the background color of the whiteboard.
      * @param color
      */
-    setBackgroundColor(color: string): Promise<void>;
+    setBackgroundColor(color: string): Promise<number>;
     /**
      * Gets page info.
      */
@@ -156,46 +157,46 @@ export interface FcrBoardMainWindow_V1 {
     /**
      * Navigates to the previous page.
      */
-    prevPage(): Promise<void>;
+    prevPage(): Promise<number>;
     /**
      * Navigate to the next page.
      */
-    nextPage(): Promise<void>;
+    nextPage(): Promise<number>;
     /**
      * Sets the tool type.
      * @param type
      */
-    setToolType(type: FcrBoardToolType): Promise<void>;
+    setToolType(type: FcrBoardToolType): Promise<number>;
     /**
      * Sets the stroke width.
      * @param strokeWidth
      */
-    setStrokeWidth(strokeWidth: number): Promise<void>;
+    setStrokeWidth(strokeWidth: number): Promise<number>;
     /**
      * Sets the stroke color.
      * @param color
      */
-    setStrokeColor(color: FcrColor): Promise<void>;
+    setStrokeColor(color: FcrColor): Promise<number>;
     /**
      * Sets the text color.
      * @param color
      */
-    setTextColor(color: FcrColor): Promise<void>;
+    setTextColor(color: FcrColor): Promise<number>;
     /**
      * Sets the text size.
      * @param textSize
      */
-    setTextSize(textSize: number): Promise<void>;
+    setTextSize(textSize: number): Promise<number>;
     /**
      * Sets the fill color.
      * @param color
      */
-    setFillColor(color: FcrColor): Promise<void>;
+    setFillColor(color: FcrColor): Promise<number>;
     /**
      * Set eraser size.
      * @param size  small: 1, medium: 2, large: 3
      */
-    setEraserSize(size: FcrBoardEraserSize): Promise<void>;
+    setEraserSize(size: FcrBoardEraserSize): Promise<number>;
     /**
      * Inserts an image.
      * @param resourceUrl
@@ -204,13 +205,13 @@ export interface FcrBoardMainWindow_V1 {
      * @param width
      * @param height
      */
-    insertImage(resourceUrl: string, x: number, y: number, width: number, height: number): Promise<void>;
+    insertImage(resourceUrl: string, x: number, y: number, width: number, height: number): Promise<number>;
     /**
      * Inserts a media.
      * @param resourceUrl
      * @param title
      */
-    insertMedia(resourceUrl: string, title?: string): Promise<void>;
+    insertMedia(resourceUrl: string, title?: string): Promise<number>;
     /**
      * Gets the content view.
      */
@@ -246,12 +247,12 @@ export interface FcrBoardMainWindow_V1 {
      * Adds an observer to the main window.
      * @param observer
      */
-    addObserver(observer: FcrBoardWindowObserver): void;
+    addObserver(observer: FcrBoardWindowObserver): number;
     /**
      * Removes the observer from the main window.
      * @param observer
      */
-    removeObserver(observer: FcrBoardWindowObserver): void;
+    removeObserver(observer: FcrBoardWindowObserver): number;
 }
 export type FcrBoardWindowObserver = {
     /**

package/lib/room-control/whiteboard-control-v1/type.js

@@ -9,5 +9,6 @@ let FcrBoardEraserSize = exports.FcrBoardEraserSize = /*#__PURE__*/function (Fcr
   FcrBoardEraserSize[FcrBoardEraserSize["SMALL"] = 1] = "SMALL";
   FcrBoardEraserSize[FcrBoardEraserSize["MEDIUM"] = 2] = "MEDIUM";
   FcrBoardEraserSize[FcrBoardEraserSize["LARGE"] = 3] = "LARGE";
+  FcrBoardEraserSize[FcrBoardEraserSize["GIANT"] = 4] = "GIANT";
   return FcrBoardEraserSize;
 }({});

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

@@ -1,18 +1,27 @@
-import { FcrBaseWhiteboardObserver, FcrObjectForgeInitConfig } from '../type';
-import { FcrAnnotationControl, FcrStandaloneAnnotationControl } from './type';
-import { FcrBaseWhiteboardControlImpl } from '../base';
 import { WhiteboardOption } from '@netless/forge-whiteboard';
-import { FcrBoardConfig } from '../whiteboard-control/type';
 import type { RTMClient } from 'agora-rtm';
+import { FcrCoreServiceApi } from '../../../service/api';
+import { FcrBaseWhiteboardControlImpl } from '../base';
+import { FcrBaseWhiteboardObserver, FcrBoardMainWindow, FcrObjectForgeInitConfig } from '../type';
+import { FcrAnnotationConfig, FcrAnnotationControl, FcrAnnotationSceneConfig, FcrStandaloneAnnotationControl } from './type';
 export declare class FcrAnnotationControlImpl extends FcrBaseWhiteboardControlImpl<FcrBaseWhiteboardObserver> implements FcrAnnotationControl {
     protected rtmClient: RTMClient;
-    protected config: FcrBoardConfig;
+    protected config: FcrAnnotationConfig;
+    private _sceneConfig;
+    private _api;
     protected logger: import("agora-foundation/lib/logger").Logger;
-    constructor(rtmClient: RTMClient, config: FcrBoardConfig, hasOperationPrivilege: boolean, forgeInitConfigFetcher: () => Promise<FcrObjectForgeInitConfig>);
+    constructor(rtmClient: RTMClient, config: FcrAnnotationConfig, hasOperationPrivilege: boolean, forgeInitConfigFetcher: () => Promise<FcrObjectForgeInitConfig>, _sceneConfig: FcrAnnotationSceneConfig, _api: FcrCoreServiceApi);
+    syncScreenShareOwnerAnnotationOpenDone(): Promise<number>;
+    open(): Promise<FcrBoardMainWindow>;
     protected getApplicationId(): string;
     protected getWhiteboardOption(): WhiteboardOption;
 }
 export declare class FcrStandaloneAnnotationControlImpl extends FcrBaseWhiteboardControlImpl<FcrBaseWhiteboardObserver> implements FcrStandaloneAnnotationControl {
+    protected rtmClient: RTMClient;
+    protected config: FcrAnnotationConfig;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    constructor(rtmClient: RTMClient, config: FcrAnnotationConfig, hasOperationPrivilege: boolean, forgeInitConfigFetcher: () => Promise<FcrObjectForgeInitConfig>);
+    open(): Promise<FcrBoardMainWindow>;
     protected getApplicationId(): string;
     protected getWhiteboardOption(): WhiteboardOption;
 }