fcr-core 3.8.2 → 3.9.0-alpha

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

@@ -15,7 +15,7 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto;
+let _initProto, _cleanDecs, _setToolTypeDecs, _setStrokeWidthDecs, _setStrokeColorDecs, _setTextColorDecs, _setTextSizeDecs, _setFillColorDecs, _setEraserSizeDecs, _setBackgroundColorDecs, _insertImageDecs, _insertMediaDecs, _mountDecs;
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.url-search-params.delete.js";
@@ -42,13 +42,14 @@ import { FcrBoardSubWindowImpl } from './board-subwindow';
 import fullWorkerString from '@netless/appliance-plugin/dist/fullWorker.js?raw';
 //@ts-ignore
 import subWorkerString from '@netless/appliance-plugin/dist/subWorker.js?raw';
+import { FcrReturnCode } from '../../type';
 import { isPlainObject } from 'lodash';
 import { jsonstring } from 'agora-rte-sdk/lib/imports';
 export class FcrBoardMainWindowImpl {
   static {
-    [_initProto] = _applyDecs(this, [[[bound, trace], 2, "getSnapshotImage"], [trace, 2, "addObserver"], [trace, 2, "removeObserver"], [trace, 2, "getContentView"], [bound, 2, "setScale"], [bound, 2, "openSubWindowWithTaskId"], [bound, 2, "openSubWindowWithPageList"], [trace, 2, "getPageInfo"], [[bound, trace], 2, "addPage"], [[bound, trace], 2, "removePage"], [trace, 2, "prevPage"], [trace, 2, "nextPage"], [[bound, trace], 2, "undo"], [[bound, trace], 2, "redo"], [[bound, trace], 2, "clean"], [[bound, trace], 2, "setToolType"], [[bound, trace], 2, "setStrokeWidth"], [[bound, trace], 2, "setStrokeColor"], [[bound, trace], 2, "setTextColor"], [[bound, trace], 2, "setTextSize"], [[bound, trace], 2, "setFillColor"], [[bound, trace], 2, "setEraserSize"], [[bound, trace], 2, "setBackgroundColor"], [[bound, trace], 2, "insertImage"], [[bound, trace], 2, "insertMedia"], [trace, 2, "destroy"], [trace, 2, "getWritable"], [trace, 2, "_mount"], [trace, 2, "_setRoom"]], []).e;
+    [_initProto] = _applyDecs(this, [[[bound, trace], 2, "getSnapshotImage"], [trace, 2, "addObserver"], [trace, 2, "removeObserver"], [trace, 2, "getContentView"], [bound, 2, "setScale"], [bound, 2, "openSubWindowWithTaskId"], [bound, 2, "openSubWindowWithPageList"], [trace, 2, "getPageInfo"], [[bound, trace], 2, "addPage"], [[bound, trace], 2, "removePage"], [trace, 2, "prevPage"], [trace, 2, "nextPage"], [[bound, trace], 2, "undo"], [[bound, 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"], [trace, 2, "destroy"], [trace, 2, "getWritable"], [_mountDecs, 2, "_mount"], [trace, 2, "_setRoom"]], []).e;
   }
-  logger = (_initProto(this), createLogger({
+  [(_cleanDecs = [bound, trace(['retainPpt'])], _setToolTypeDecs = [bound, trace(['type'])], _setStrokeWidthDecs = [bound, trace(['strokeWidth'])], _setStrokeColorDecs = [bound, trace(['color'])], _setTextColorDecs = [bound, trace(['color'])], _setTextSizeDecs = [bound, trace(['size'])], _setFillColorDecs = [bound, trace(['fillColor'])], _setEraserSizeDecs = [bound, trace(['size'])], _setBackgroundColorDecs = [bound, trace(['color'])], _insertImageDecs = [bound, trace(['resourceUrl', 'x', 'y', 'width', 'height'])], _insertMediaDecs = [bound, trace(['resourceUrl', 'title'])], _mountDecs = trace(['options', 'params']), "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrBoardMainWindowImpl'
   }));
   _memberState = {};
@@ -92,7 +93,7 @@ export class FcrBoardMainWindowImpl {
             return result;
           }
         } catch (e) {
-          this.logger.error('[FcrBoardMainWindow] failed to take snapshot', e);
+          this.logger.error('failed to take snapshot', e);
         }
       }
     }
@@ -100,9 +101,11 @@ export class FcrBoardMainWindowImpl {
   }
   addObserver(observer) {
     this._observable.addObserver(observer);
+    return FcrReturnCode.SUCCESS;
   }
   removeObserver(observer) {
     this._observable.removeObserver(observer);
+    return FcrReturnCode.SUCCESS;
   }
   getContentView() {
     return this._whiteView;
@@ -163,36 +166,40 @@ export class FcrBoardMainWindowImpl {
       await this._windowManager.addPage();
       await this._windowManager.nextPage();
     }
+    return FcrReturnCode.SUCCESS;
   }
   async removePage() {
     this._preCheck();
     if (this._windowManager?.removePage) {
       await this._windowManager.removePage();
     }
+    return FcrReturnCode.SUCCESS;
   }
   async prevPage() {
     this._preCheck();
     if (this._windowManager?.prevPage) {
       await this._windowManager.prevPage();
     }
+    return FcrReturnCode.SUCCESS;
   }
   async nextPage() {
     this._preCheck();
     if (this._windowManager?.nextPage) {
       await this._windowManager.nextPage();
     }
+    return 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({
@@ -200,6 +207,7 @@ export class FcrBoardMainWindowImpl {
     });
     // this._whiteBoardroom?.cleanScene?.(true); // new version methods
     this._whiteBoardroom.cleanCurrentScene(retainPpt);
+    return FcrReturnCode.SUCCESS;
   }
   async setToolType(type) {
     this._preCheck({
@@ -219,6 +227,7 @@ export class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._appliancePluginInstance?.setMemberState(change);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setStrokeWidth(strokeWidth) {
     this._preCheck();
@@ -232,6 +241,7 @@ export class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setStrokeColor(color) {
     this._preCheck();
@@ -246,6 +256,7 @@ export class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setTextColor(color) {
     this._preCheck();
@@ -260,6 +271,7 @@ export class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setTextSize(size) {
     this._preCheck();
@@ -273,6 +285,7 @@ export class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setFillColor(fillColor) {
     this._preCheck();
@@ -287,6 +300,7 @@ export class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setEraserSize(size) {
     this._preCheck();
@@ -300,11 +314,13 @@ export class FcrBoardMainWindowImpl {
     if (this._windowManager) {
       this._whiteBoardroom.setMemberState(change);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async setBackgroundColor(color) {
     this._preCheck();
     this._backgroundColor = color;
     this._whiteView.querySelector('.netless-whiteboard')?.style.setProperty('background-color', color);
+    return FcrReturnCode.SUCCESS;
   }
   async insertImage(resourceUrl, x, y, width, height) {
     const room = this._whiteBoardroom;
@@ -348,6 +364,7 @@ export class FcrBoardMainWindowImpl {
       room.insertImage(imageInfo);
       room.completeImageUpload(uuid, resourceUrl);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async insertMedia(resourceUrl, title) {
     const windowManager = this._windowManager;
@@ -364,6 +381,7 @@ export class FcrBoardMainWindowImpl {
         }
       });
     }
+    return FcrReturnCode.SUCCESS;
   }
   destroy() {
     if (this._windowManager) {
@@ -371,6 +389,7 @@ export class FcrBoardMainWindowImpl {
       this._windowManager = undefined;
     }
     this._destroyed = true;
+    return FcrReturnCode.SUCCESS;
   }
   getWritable() {
     return this._whiteBoardroom.isWritable;
@@ -524,7 +543,7 @@ export 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);
         BoardMountManager.setIsMounting(false);
@@ -549,6 +568,6 @@ export class FcrBoardMainWindowImpl {
     room.setMemberState(this._memberState);
   }
   _addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onWritable', 'onPageInfoUpdated', 'onUndoStateUpdated', 'onRedoStateUpdated']));
+    this.addObserver(generateLogObserver(this.logger, [['onWritable', ['isWritable']], ['onPageInfoUpdated', ['info']], ['onUndoStateUpdated', ['enable']], ['onRedoStateUpdated', ['enable']]]));
   }
 }

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

@@ -6,7 +6,7 @@ export 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-es/room-control/whiteboard-control-v1/index.js

@@ -15,7 +15,7 @@ import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
 import "core-js/modules/esnext.symbol.metadata.js";
-let _initProto;
+let _initProto, _openDecs, _setBackgroundColorDecs, _setOperationPrivilegeDecs, _setBoardWritableDecs;
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 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)]; } }; }
@@ -24,31 +24,33 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 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; }
 import SlideApp from '@netless/app-slide';
-import { DeviceType, LoggerReportMode, RoomPhase, ViewMode, WhiteWebSdk, createPlugins } from 'white-web-sdk';
+import { ApplianceMultiPlugin } from '@netless/appliance-plugin';
 import * as netlessVideoPlugin from '@netless/video-js-plugin';
 import { WindowManager } from '@netless/window-manager';
-import { ApplianceMultiPlugin } from '@netless/appliance-plugin';
-import { convertToFcrBoardToolShape, hexColorToWhiteboardColor, textColors } from './utils';
-import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
-import { FcrBoardMainWindowImpl } from './board-window';
-import { FcrBoardPropertiesState } from '../whiteboard-control/type';
 import { bound } from 'agora-foundation/lib/decorator';
-import { convertRteUserToFcrUser } from '../../utilities/user';
+import { ErrorModuleCode } from '../../imports';
+import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
+import { sleep } from 'agora-rte-sdk/lib/imports';
+import { DeviceType, LoggerReportMode, RoomPhase, ViewMode, WhiteWebSdk, createPlugins } from 'white-web-sdk';
 import { FcrConnectionState } from '../..';
-import { createLogger, generateLogObserver } from '../../utilities/logger';
 import { trace } from '../../imports';
-import { FcrErrorModuleCode, handleRequestError } from '../../utilities/error';
-import { sleep } from 'agora-rte-sdk/lib/imports';
+import { FcrReturnCode } from '../../type';
+import { handleRequestError } from '../../utilities/error';
+import { createLogger, generateLogObserver } from '../../utilities/logger';
+import { convertRteUserToFcrUser } from '../../utilities/user';
 import { FcrSharePermissionState } from '../sharing-control/type';
+import { FcrBoardPropertiesState } from '../whiteboard-control/type';
+import { FcrBoardMainWindowImpl } from './board-window';
+import { convertToFcrBoardToolShape, hexColorToWhiteboardColor, textColors } from './utils';
 
 /**
  * @internal
  */
 export class FcrWhiteboardControlImpl {
   static {
-    [_initProto] = _applyDecs(this, [[[bound, trace], 2, "active"], [[bound, trace], 2, "inactive"], [[bound, trace], 2, "open"], [[bound, trace], 2, "close"], [[bound, trace], 2, "setBackgroundColor"], [[bound, trace], 2, "getActivity"], [[bound, trace], 2, "getOwnerId"], [[bound, trace], 2, "getBackgroundColor"], [[bound, trace], 2, "getConnectionState"], [[bound, trace], 2, "getMainWindow"], [[bound, trace], 2, "addObserver"], [[bound, trace], 2, "removeObserver"], [[bound, trace], 2, "getBoardActiveInfo"], [[bound, trace], 2, "hasOperationPrivilege"], [[bound, trace], 2, "setOperationPrivilege"], [trace, 2, "_setBoardWritable"], [bound, 2, "_getToken"], [bound, 2, "_handleRoomStateUpdated"], [bound, 2, "_updateConnnectionState"], [bound, 2, "_handleConnectionStateUpdated"], [trace, 2, "_connect"], [trace, 2, "_clean"]], []).e;
+    [_initProto] = _applyDecs(this, [[[bound, trace], 2, "active"], [[bound, trace], 2, "inactive"], [_openDecs, 2, "open"], [[bound, trace], 2, "close"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[bound, trace], 2, "getActivity"], [[bound, trace], 2, "getOwnerId"], [[bound, trace], 2, "getBackgroundColor"], [[bound, trace], 2, "getConnectionState"], [[bound, trace], 2, "getMainWindow"], [[bound, trace], 2, "addObserver"], [[bound, trace], 2, "removeObserver"], [[bound, trace], 2, "getBoardActiveInfo"], [[bound, trace], 2, "hasOperationPrivilege"], [_setOperationPrivilegeDecs, 2, "setOperationPrivilege"], [_setBoardWritableDecs, 2, "_setBoardWritable"], [bound, 2, "_getToken"], [bound, 2, "_handleRoomStateUpdated"], [bound, 2, "_updateConnnectionState"], [bound, 2, "_handleConnectionStateUpdated"], [trace, 2, "_connect"], [trace, 2, "_clean"]], []).e;
   }
-  logger = (_initProto(this), createLogger({
+  [(_openDecs = [bound, trace(['params'])], _setBackgroundColorDecs = [bound, trace(['backgroundColor'])], _setOperationPrivilegeDecs = [bound, trace(['hasPrivilege'])], _setBoardWritableDecs = trace(['granted']), "logger")] = (_initProto(this), createLogger({
     prefix: 'FcrWhiteboardControlImpl'
   }));
   _client = {};
@@ -99,10 +101,10 @@ export class FcrWhiteboardControlImpl {
     });
   }
   async active() {
-    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, FcrSharePermissionState.ON), FcrErrorModuleCode.ROOM_WHITEBOARD, 'active failed');
+    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, FcrSharePermissionState.ON), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'active failed');
   }
   async inactive() {
-    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, FcrSharePermissionState.OFF), FcrErrorModuleCode.ROOM_WHITEBOARD, 'inactive failed');
+    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, FcrSharePermissionState.OFF), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'inactive failed');
   }
   async open(params = {}) {
     this._whiteboardPrivateParameters = params;
@@ -118,12 +120,14 @@ export class FcrWhiteboardControlImpl {
   async close() {
     this._joined = false;
     await this._clean();
+    return FcrReturnCode.SUCCESS;
   }
   async setBackgroundColor(backgroundColor) {
     await this._api.setBackgroundColor({
       roomId: this._scene.sceneId,
       backgroundColor
     });
+    return FcrReturnCode.SUCCESS;
   }
   getActivity() {
     return this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard').state === 1;
@@ -142,9 +146,11 @@ export class FcrWhiteboardControlImpl {
   }
   addObserver(observer) {
     this._observable.addObserver(observer);
+    return FcrReturnCode.SUCCESS;
   }
   removeObserver(observer) {
     this._observable.removeObserver(observer);
+    return FcrReturnCode.SUCCESS;
   }
   getBoardActiveInfo() {
     const {
@@ -174,6 +180,7 @@ export class FcrWhiteboardControlImpl {
       this._hasOperationPrivilege = hasPrivilege;
       this._setBoardWritable(hasPrivilege);
     }
+    return FcrReturnCode.SUCCESS;
   }
   async _setBoardWritable(granted) {
     if (this._room) {
@@ -202,6 +209,7 @@ export class FcrWhiteboardControlImpl {
         }
       }
     }
+    return FcrReturnCode.SUCCESS;
   }
   _createPlugins() {
     const plugins = createPlugins({
@@ -217,7 +225,7 @@ export class FcrWhiteboardControlImpl {
     return await handleRequestError(() => this._api.getWhiteboardToken({
       roomId,
       userId
-    }), FcrErrorModuleCode.ROOM_WHITEBOARD, 'get whiteboard token failed');
+    }), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'get whiteboard token failed');
   }
   _handleRoomStateUpdated(state) {
     const {
@@ -411,8 +419,9 @@ export class FcrWhiteboardControlImpl {
       }
       this._room = undefined;
     }
+    return FcrReturnCode.SUCCESS;
   }
   _addLogObserver() {
-    this.addObserver(generateLogObserver(this.logger, ['onActive', 'onInactive', 'onBackgroundColorUpdated', 'onConnectionStateUpdated']));
+    this.addObserver(generateLogObserver(this.logger, [['onActive', ['ownerId', 'operatorUser']], ['onInactive', ['reason', 'operatorUser']], ['onBackgroundColorUpdated', ['color', 'operatorUser']], ['onConnectionStateUpdated', ['state']]]));
   }
 }

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

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

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

@@ -1,23 +1,45 @@
+import { FcrErrorCode, FcrErrorModuleCode, generateFcrCoreClientError } from '../../../utilities/error';
 import { createLogger } from '../../../utilities/logger';
 import { FcrBaseWhiteboardControlImpl } from '../base';
 import { ANNOTATION_APP_ID } from '../constant';
+import { FcrBoardPropertiesState } from '../../whiteboard-control/type';
 export class FcrAnnotationControlImpl extends FcrBaseWhiteboardControlImpl {
   logger = createLogger({
     prefix: 'FcrAnnotationControlImpl'
   });
-  constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher) {
+  constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher, _sceneConfig, _api) {
     super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
     this.rtmClient = rtmClient;
     this.config = config;
+    this._sceneConfig = _sceneConfig;
+    this._api = _api;
     this.logger.info(`initialized, hasOperationPrivilege: ${hasOperationPrivilege}`);
   }
+  async syncScreenShareOwnerAnnotationOpenDone() {
+    try {
+      await this._api.syncScreenShareOwnerAnnotationOpenDone(this._sceneConfig.sceneId);
+      return 0;
+    } catch (e) {
+      const error = e;
+      const errorMessage = error.message;
+      throw generateFcrCoreClientError(FcrErrorModuleCode.FCR_ROOM_WHITEBOARD, FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `sync screen share owner annotation open done failed: ${errorMessage}`, error);
+    }
+  }
+  async open() {
+    const state = this._sceneConfig.getAnnotationState();
+    if (state === FcrBoardPropertiesState.INACTIVE) {
+      return await super.internalOpen(true);
+    } else {
+      return await super.internalOpen(false);
+    }
+  }
   getApplicationId() {
     return ANNOTATION_APP_ID;
   }
   getWhiteboardOption() {
     return {
-      width: 800,
-      height: 600,
+      width: this.config.size.width,
+      height: this.config.size.height,
       defaultToolbarStyle: {
         tool: 'laser'
       },
@@ -26,13 +48,25 @@ export class FcrAnnotationControlImpl extends FcrBaseWhiteboardControlImpl {
   }
 }
 export class FcrStandaloneAnnotationControlImpl extends FcrBaseWhiteboardControlImpl {
+  logger = createLogger({
+    prefix: 'FcrStandaloneAnnotationControlImpl'
+  });
+  constructor(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher) {
+    super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
+    this.rtmClient = rtmClient;
+    this.config = config;
+    this.logger.info(`initialized, hasOperationPrivilege: ${hasOperationPrivilege}`);
+  }
+  async open() {
+    return await super.internalOpen(true);
+  }
   getApplicationId() {
     return ANNOTATION_APP_ID;
   }
   getWhiteboardOption() {
     return {
-      width: 800,
-      height: 600,
+      width: this.config.size.width,
+      height: this.config.size.height,
       defaultToolbarStyle: {
         tool: 'laser'
       },

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

@@ -1,24 +1,25 @@
 import "core-js/modules/es.json.stringify.js";
 import { FcrAnnotationControlImpl, FcrStandaloneAnnotationControlImpl } from './control';
 import { createLogger } from '../../../utilities/logger';
-import { FcrErrorCode, FcrErrorModuleCode, generateFcrCoreClientError, handleRequestError } from '../../../utilities/error';
+import { generateFcrCoreClientError, handleRequestError } from '../../../utilities/error';
 import { getAnnotationBoardOptions } from '../../../utilities/shared-storage';
+import { DetailErrorCode, ErrorModuleCode } from '../../../imports';
 export class FcrAnnotationControlFactoryImpl {
   logger = createLogger({
     prefix: 'FcrAnnotationControlFactory'
   });
   createForSubProcess(rtmClient, hasOperationPrivilege, config) {
-    this.logger.info(`[annotation]: create for sub process with config: ${JSON.stringify(config)}`);
+    this.logger.info(`create for sub process with config: ${JSON.stringify(config)}`);
     return new FcrStandaloneAnnotationControlImpl(rtmClient, config, hasOperationPrivilege, () => {
       const forgeInitConfig = getAnnotationBoardOptions();
       if (!forgeInitConfig) {
-        throw generateFcrCoreClientError(FcrErrorModuleCode.ROOM_WHITEBOARD, FcrErrorCode.UNDEFINED_ERROR, `whiteboard init config is not exist`, new Error(`whiteboard init config is not exist`));
+        throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM_WHITEBOARD, DetailErrorCode.UNDEFINED_ERROR, `whiteboard init config is not exist`, new Error(`whiteboard init config is not exist`));
       }
       return Promise.resolve(forgeInitConfig);
     });
   }
-  createForMainProcess(rtmClient, hasOperationPrivilege, config, api) {
-    const control = new FcrAnnotationControlImpl(rtmClient, config, hasOperationPrivilege, this._createForgeInitConfigFetcher(api, config.roomId, config.userId));
+  createForMainProcess(rtmClient, hasOperationPrivilege, config, annotationSceneConfig, api) {
+    const control = new FcrAnnotationControlImpl(rtmClient, config, hasOperationPrivilege, this._createForgeInitConfigFetcher(api, config.roomId, config.userId), annotationSceneConfig, api);
     return control;
   }
   _createForgeInitConfigFetcher(api, roomId, userId) {
@@ -26,7 +27,7 @@ export class FcrAnnotationControlFactoryImpl {
       return await handleRequestError(() => api.getAnnotationToken({
         roomId,
         userId
-      }), FcrErrorModuleCode.ROOM_WHITEBOARD, 'get annotation token failed');
+      }), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'get annotation token failed');
     };
     return async () => {
       const response = await getObjectInitConfig(roomId, userId);