fcr-core 3.8.1 → 3.9.0-alpha

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

@@ -0,0 +1,92 @@
+import { FcrBoardToolType } from './enum';
+import { jsonstring, get } from '../../imports';
+export function convertToForgeBoardTool(type) {
+  switch (type) {
+    case FcrBoardToolType.ARROW:
+      return 'arrow';
+    case FcrBoardToolType.CURVE:
+      return 'curve';
+    case FcrBoardToolType.ELLIPSE:
+      return 'ellipse';
+    case FcrBoardToolType.ERASER:
+      return 'eraser';
+    case FcrBoardToolType.LASER_POINTER:
+      return 'laser';
+    case FcrBoardToolType.TEXT:
+      return 'text';
+    case FcrBoardToolType.RECTANGLE:
+      return 'rectangle';
+    case FcrBoardToolType.TRIANGLE:
+      return 'triangle';
+    case FcrBoardToolType.SELECTOR:
+      return 'selector';
+    case FcrBoardToolType.STRAIGHT:
+      return 'line';
+    // case FcrBoardToolType.PENTAGRAM:
+    //   return 'pentagram';
+    // case FcrBoardToolType.RHOMBUS:
+    //   return 'rhombus';
+    case FcrBoardToolType.HAND:
+      return 'grab';
+    default:
+      return 'curve';
+  }
+}
+export const getAnnotationConfigFromRoomProperties = (properties, logger) => {
+  const boardAppId = get(properties, 'widgets.annotation.extra.boardAppId');
+  const boardId = get(properties, 'widgets.annotation.extra.boardId');
+  const boardToken = get(properties, 'widgets.annotation.extra.boardToken');
+  const boardRegion = get(properties, 'widgets.annotation.extra.boardRegion');
+  let width = get(properties, 'widgets.annotation.size.width');
+  let height = get(properties, 'widgets.annotation.size.height');
+  if (typeof width !== 'number') {
+    logger.warn(`got invalid width for annotation board, width: ${width}`);
+    width = 0;
+  }
+  if (typeof height !== 'number') {
+    logger.warn(`got invalid height for annotation board, height: ${height}`);
+    height = 0;
+  }
+  const boardWidthVal = width;
+  const boardHeightVal = height;
+  let boardWidth = 0;
+  let boardHeight = 0;
+  if (boardWidthVal !== 0 && boardHeightVal !== 0) {
+    ({
+      width: boardWidth,
+      height: boardHeight
+    } = resizeToMax(boardWidthVal, boardHeightVal, FCR_ANNOTATION_SCALE_BASE));
+  } else {
+    logger.warn(`got invalid width or height for annotation board, skip resizing, width: ${boardWidthVal}, height: ${boardHeightVal}`);
+  }
+  logger.info(`got board config info, ${jsonstring({
+    boardAppId,
+    boardId,
+    boardToken,
+    boardRegion,
+    boardWidth,
+    boardHeight
+  })}`);
+  return {
+    size: {
+      width: boardWidth,
+      height: boardHeight
+    },
+    extra: {
+      boardAppId,
+      boardId,
+      boardToken,
+      region: boardRegion
+    }
+  };
+};
+export const resizeToMax = (w, h, scaleBase = FCR_ANNOTATION_SCALE_BASE) => {
+  const scale = scaleBase / Math.max(w, h);
+  return {
+    width: Math.round(w * scale),
+    height: Math.round(h * scale)
+  };
+};
+const FCR_ANNOTATION_SCALE_BASE = 1920;
+export const WHITEBOARD_WIDTH = 1920;
+export const WHITEBOARD_HEIGHT = 1080;

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

@@ -0,0 +1,204 @@
+import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.function.metadata.js";
+import "core-js/modules/esnext.map.delete-all.js";
+import "core-js/modules/esnext.map.emplace.js";
+import "core-js/modules/esnext.map.every.js";
+import "core-js/modules/esnext.map.filter.js";
+import "core-js/modules/esnext.map.find.js";
+import "core-js/modules/esnext.map.find-key.js";
+import "core-js/modules/esnext.map.includes.js";
+import "core-js/modules/esnext.map.key-of.js";
+import "core-js/modules/esnext.map.map-keys.js";
+import "core-js/modules/esnext.map.map-values.js";
+import "core-js/modules/esnext.map.merge.js";
+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";
+var _ref, _ref2;
+let _initProto, _setBackgroundColorDecs, _initProto2;
+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; }
+import { ErrorModuleCode } from '../../../imports';
+import { bound, get, trace } from '../../../imports';
+import { stringSchema } from '../../../schema';
+import { FcrReturnCode } from '../../../type';
+import { handleRequestError } from '../../../utilities/error';
+import { createLogger, generateLogObserver } from '../../../utilities/logger';
+import { getDependenciesInfo } from '../../../utilities/package-info';
+import { convertRteUserToFcrUser } from '../../../utilities/user';
+import validateParams from '../../../utilities/validate-params';
+import { FcrSharePermissionState } from '../../sharing-control/type';
+import { FcrBoardPropertiesState } from '../../whiteboard-control/type';
+import { FcrBaseWhiteboardControlImpl } from '../base';
+import { WHITEBOARD_APP_ID } from '../constant';
+import { WHITEBOARD_HEIGHT, WHITEBOARD_WIDTH } from '../utils';
+export class FcrWhiteboardControlImpl extends (_ref = FcrBaseWhiteboardControlImpl) {
+  static {
+    [_initProto] = _applyDecs(this, [[trace, 2, "open"], [trace, 2, "close"], [trace, 2, "active"], [trace, 2, "inactive"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [trace, 2, "getBackgroundColor"], [trace, 2, "getActivity"], [trace, 2, "getOwnerId"], [bound, 2, "_onScenePropertiesUpdated"]], [], 0, void 0, _ref).e;
+  }
+  [(_setBackgroundColorDecs = [trace(['backgroundColor']), validateParams(stringSchema)], "logger")] = (_initProto(this), createLogger({
+    prefix: 'FcrWhiteboardControlImpl'
+  }));
+  _backgroundColor = '#ffffff';
+  _isActive = false;
+  _ownerId = null;
+  _preloadLock = false;
+  _notifyObservers = {
+    onScenePropertiesUpdated: this._onScenePropertiesUpdated
+  };
+  constructor(rtmClient, config, hasOperationPrivilege, sharedCache, forgeInitConfigFetcher, _scene, _api) {
+    super(rtmClient, config, hasOperationPrivilege, forgeInitConfigFetcher);
+    this._scene = _scene;
+    this._api = _api;
+    this._roomCache = sharedCache.getRoomCache(config.roomId);
+    this._scene.addObserver(this._notifyObservers);
+    this.logger.info(`Whitebaord Version: forge-whiteboard@${getDependenciesInfo('@netless/forge-whiteboard')}, forge-room@${getDependenciesInfo('@netless/forge-room')}, forge-room@${getDependenciesInfo('@netless/forge-rtm')}`);
+    this._isActive = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard').state === 1;
+    const backgroundColor = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard.extra.backgroundColor');
+    if (backgroundColor) {
+      this._backgroundColor = backgroundColor;
+    }
+    const ownerId = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard.ownerUserUuid');
+    if (ownerId) {
+      this._ownerId = ownerId;
+    }
+    this.logger.info(`initialized, hasOperationPrivilege: ${hasOperationPrivilege}`);
+  }
+  async open() {
+    const boardActiveInfo = this.getBoardActiveInfo();
+    if (!boardActiveInfo.isActive) {
+      await handleRequestError(() => this._api.toggleWhiteboardPreloadState(this.config.roomId, FcrSharePermissionState.ON), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'lock failed when open whiteboard');
+
+      // 标记白板锁状态, 关闭白板时判断是否需要解锁
+      this._preloadLock = true;
+      try {
+        this._isActive = true;
+        return await super.internalOpen(true);
+      } catch (error) {
+        // 开启失败, 释放锁
+        this._preloadLock = false;
+        this._isActive = false;
+        await handleRequestError(() => this._api.toggleWhiteboardPreloadState(this.config.roomId, FcrSharePermissionState.OFF), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'unlock failed when open whiteboard');
+        throw error;
+      }
+    } else {
+      return await super.internalOpen(false);
+    }
+  }
+  async close() {
+    const result = await super.close();
+    if (this._preloadLock) {
+      // 释放白板锁
+      await handleRequestError(() => this._api.toggleWhiteboardPreloadState(this.config.roomId, FcrSharePermissionState.OFF), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'unlock failed when close whiteboard');
+      this._preloadLock = false;
+    }
+    return result;
+  }
+  async active() {
+    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this.config.roomId, FcrSharePermissionState.ON), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'active failed');
+  }
+  async inactive() {
+    return handleRequestError(() => this._api.toggleWhiteboardActivityState(this.config.roomId, FcrSharePermissionState.OFF), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'inactive failed');
+  }
+  getBoardActiveInfo() {
+    const {
+      state,
+      ownerUserUuid: ownerUserId
+    } = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard');
+    if (state === FcrBoardPropertiesState.ACTIVE) {
+      return {
+        isActive: true,
+        ownerUserId
+      };
+    } else {
+      return {
+        isActive: false,
+        ownerUserId: null
+      };
+    }
+  }
+  async setBackgroundColor(backgroundColor) {
+    await this._api.setBackgroundColor({
+      roomId: this.config.roomId,
+      backgroundColor
+    });
+    this._backgroundColor = backgroundColor;
+    if (this.boardView) {
+      this.boardView.setBackgroundColor(backgroundColor);
+    }
+    return FcrReturnCode.SUCCESS;
+  }
+  getBackgroundColor() {
+    return this._backgroundColor;
+  }
+  getActivity() {
+    return this._isActive;
+  }
+  getOwnerId() {
+    return this._ownerId;
+  }
+  getApplicationId() {
+    return WHITEBOARD_APP_ID;
+  }
+  _onScenePropertiesUpdated(sceneId, event) {
+    const operatorUser = convertRteUserToFcrUser(event.operatorUser, this._roomCache);
+    const getByKeyPath = value => this._scene.getScenePropertiesByKeyPath(value);
+    if (event.cause && event.cause.cmd === 10) {
+      const state = getByKeyPath('widgets.netlessBoard.state') ?? FcrBoardPropertiesState.INACTIVE;
+      const backgroundColor = getByKeyPath('widgets.netlessBoard.extra.backgroundColor');
+      const widgetCauseReason = get(event.cause.data, 'widgetCause.data.reason');
+      const widgetCauseCmd = get(event.cause.data, 'widgetCause.cmd');
+      if (state === FcrBoardPropertiesState.ACTIVE) {
+        const ownerUserId = getByKeyPath('widgets.netlessBoard.ownerUserUuid');
+        this._ownerId = ownerUserId;
+        this._isActive = true;
+        this.observable.notifyObservers('onActive', ownerUserId, operatorUser);
+      }
+      if (state === FcrBoardPropertiesState.INACTIVE) {
+        this._ownerId = null;
+        this._isActive = false;
+        this.observable.notifyObservers('onInactive', widgetCauseReason, operatorUser);
+      }
+      if (widgetCauseCmd === FcrBoardPropertiesState.BACKGROUND_COLOR_UPDATED) {
+        this._backgroundColor = backgroundColor;
+        this.observable.notifyObservers('onBackgroundColorUpdated', backgroundColor, operatorUser);
+      }
+    }
+  }
+  getWhiteboardOption() {
+    return {
+      ...super.getWhiteboardOption(),
+      width: WHITEBOARD_WIDTH,
+      height: WHITEBOARD_HEIGHT
+    };
+  }
+  addLogObserver() {
+    this.addObserver(generateLogObserver(this.logger, [['onConnectionStateUpdated', ['state']], ['onActive', ['ownerId', 'operatorUser']], ['onInactive', ['reason', 'operatorUser']], ['onBackgroundColorUpdated', ['color', 'operatorUser']]]));
+  }
+}
+export class FcrStandaloneWhiteboardControlImpl extends (_ref2 = FcrBaseWhiteboardControlImpl) {
+  static {
+    [_initProto2] = _applyDecs(this, [[trace, 2, "open"]], [], 0, void 0, _ref2).e;
+  }
+  constructor(...args) {
+    super(...args);
+    _initProto2(this);
+  }
+  async open() {
+    return await super.internalOpen(false);
+  }
+  getApplicationId() {
+    return WHITEBOARD_APP_ID;
+  }
+  getWhiteboardOption() {
+    return {
+      ...super.getWhiteboardOption(),
+      width: WHITEBOARD_WIDTH,
+      height: WHITEBOARD_HEIGHT
+    };
+  }
+}

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

@@ -0,0 +1,61 @@
+import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.function.metadata.js";
+import "core-js/modules/esnext.map.delete-all.js";
+import "core-js/modules/esnext.map.emplace.js";
+import "core-js/modules/esnext.map.every.js";
+import "core-js/modules/esnext.map.filter.js";
+import "core-js/modules/esnext.map.find.js";
+import "core-js/modules/esnext.map.find-key.js";
+import "core-js/modules/esnext.map.includes.js";
+import "core-js/modules/esnext.map.key-of.js";
+import "core-js/modules/esnext.map.map-keys.js";
+import "core-js/modules/esnext.map.map-values.js";
+import "core-js/modules/esnext.map.merge.js";
+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, _createForSubProcessDecs, _createForMainProcessDecs;
+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; }
+import { trace } from 'agora-foundation/lib/decorator/log';
+import { DetailErrorCode, ErrorModuleCode } from 'agora-foundation/lib/utilities/error/error-code';
+import { generateFcrCoreClientError, handleRequestError } from '../../../utilities/error';
+import { createLogger } from '../../../utilities/logger';
+import { getWhiteboardOptions } from '../../../utilities/shared-storage';
+import { FcrStandaloneWhiteboardControlImpl, FcrWhiteboardControlImpl } from './control';
+export class FcrWhiteboardControlFactoryImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_createForSubProcessDecs, 2, "createForSubProcess"], [_createForMainProcessDecs, 2, "createForMainProcess"]], []).e;
+  }
+  [(_createForSubProcessDecs = trace(['rtmClient', 'hasOperationPrivilege', 'boardConfig']), _createForMainProcessDecs = trace(['rtmClient', 'hasOperationPrivilege', 'boardConfig', 'scene', 'api', 'sharedCache']), "logger")] = (_initProto(this), createLogger({
+    prefix: 'FcrWhiteboardControlFactory'
+  }));
+  createForSubProcess(rtmClient, hasOperationPrivilege, boardConfig) {
+    return new FcrStandaloneWhiteboardControlImpl(rtmClient, boardConfig, hasOperationPrivilege, () => {
+      const forgeInitConfig = getWhiteboardOptions();
+      if (!forgeInitConfig) {
+        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, boardConfig, scene, api, sharedCache) {
+    return new FcrWhiteboardControlImpl(rtmClient, boardConfig, hasOperationPrivilege, sharedCache, this._createForgeInitConfigFetcher(api, boardConfig.roomId, boardConfig.userId), scene, api);
+  }
+  _createForgeInitConfigFetcher(api, roomId, userId) {
+    const getObjectInitConfig = async (roomId, userId) => {
+      return await handleRequestError(() => api.getWhiteboardToken({
+        roomId,
+        userId
+      }), ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'get whiteboard token failed');
+    };
+    return async () => {
+      const response = await getObjectInitConfig(roomId, userId);
+      return response.data;
+    };
+  }
+}

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

@@ -0,0 +1 @@
+export {};

package/lib-es/room-router/index.js

@@ -0,0 +1,263 @@
+import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.function.metadata.js";
+import "core-js/modules/esnext.map.delete-all.js";
+import "core-js/modules/esnext.map.emplace.js";
+import "core-js/modules/esnext.map.every.js";
+import "core-js/modules/esnext.map.filter.js";
+import "core-js/modules/esnext.map.find.js";
+import "core-js/modules/esnext.map.find-key.js";
+import "core-js/modules/esnext.map.includes.js";
+import "core-js/modules/esnext.map.key-of.js";
+import "core-js/modules/esnext.map.map-keys.js";
+import "core-js/modules/esnext.map.map-values.js";
+import "core-js/modules/esnext.map.merge.js";
+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, _initDecs, _joinRoomDecs;
+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; }
+import { AgoraObservable, retryAttempt, to, trace } from '../imports';
+import { RoomControlFactory } from '../room-control/room-control-factory';
+import { FcrRoomType } from '../room-control/type';
+import { fcrRoomJoinOptionsSchema, stringSchema } from '../schema';
+import { FcrReturnCode } from '../type';
+import { generateFcrCoreClientError, handleRequestError } from '../utilities/error';
+import { FcrJoinHelper, handleJoinRetryFailure } from '../utilities/join-helper';
+import { canRetryJoinError } from '../utilities/retry-helpers';
+import { createLogger, generateLogObserver } from '../utilities/logger';
+import validateParams from '../utilities/validate-params';
+import { ROOM_ROUTER_CONSTANTS } from './type';
+import { DetailErrorCode, ErrorModuleCode } from '../imports';
+
+/**
+ * @internal
+ */
+
+export class FcrRoomRouterImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [trace, 2, "leaveRoom"]], []).e;
+  }
+  [(_initDecs = [trace(['roomId']), validateParams(stringSchema)], _joinRoomDecs = [trace(['options']), validateParams(fcrRoomJoinOptionsSchema)], "logger")] = (_initProto(this), createLogger({
+    prefix: 'FcrRoomRouterImpl'
+  }));
+  _abortController = null;
+  _observable = new AgoraObservable();
+  _roomControlObservable = {
+    onRoomRouteSwitched: async event => {
+      this._nextRoomRoute = event.targetRouting;
+      this._observable.notifyObservers('onRoomRouteSwitched', this._nextRoomRoute);
+      this.roomControl.removeObserver(this._roomControlObservable);
+      this._roomControl = null;
+    }
+  };
+  _roomControl = null;
+  _nextRoomRoute = {
+    roomId: '',
+    roomType: FcrRoomType.Mainroom,
+    isJoined: false
+  };
+
+  // 接口中新增一个bypass字段，在第一次调用joinRoom的时候不传，在后续收到房间切换后的joinRoom时传true
+  _bypass = undefined;
+  constructor(_rteEngine, _apiService, _config, _chatConnection, _sharedCache, roomId) {
+    this._rteEngine = _rteEngine;
+    this._apiService = _apiService;
+    this._config = _config;
+    this._chatConnection = _chatConnection;
+    this._sharedCache = _sharedCache;
+    this._init(roomId);
+    this._addLogObserver();
+  }
+  get roomControl() {
+    if (!this._roomControl) {
+      throw new Error('roomControl is not initialized');
+    }
+    return this._roomControl;
+  }
+  _init(roomId) {
+    this._nextRoomRoute = {
+      roomId,
+      roomType: FcrRoomType.Mainroom,
+      isJoined: false
+    };
+    this._bypass = undefined;
+    return FcrReturnCode.SUCCESS;
+  }
+  async joinRoom(options) {
+    this._abortController = new AbortController();
+    this._validateRoomJoinState();
+    const [error] = await to(this._executeJoinRoomWithRetry(options));
+    this._abortController = null;
+    if (error) {
+      this._handleJoinRoomError(error);
+      return Promise.reject(error);
+    }
+    if (!this._roomControl) {
+      return Promise.reject(new Error('Room control is not initialized'));
+    }
+    return Promise.resolve(this._roomControl);
+  }
+  async leaveRoom() {
+    this._abortController?.abort();
+    this._abortController = null;
+    this._roomControl?.leave();
+    this._roomControl = null;
+    return FcrReturnCode.SUCCESS;
+  }
+
+  /**
+   * 验证房间加入状态
+   * @private
+   */
+  _validateRoomJoinState() {
+    if (this._nextRoomRoute.isJoined) {
+      throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM, DetailErrorCode.UNDEFINED_ERROR, 'Room join failed: The user has an active connection to the room.', new Error('Room join failed: The user has an active connection to the room.'));
+    }
+  }
+
+  /**
+   * 带重试机制的房间加入执行
+   * @private
+   */
+  async _executeJoinRoomWithRetry(options) {
+    const abortController = this._abortController;
+    return retryAttempt(() => this._performSingleJoinAttempt(options), [], {
+      retriesMax: ROOM_ROUTER_CONSTANTS.MAX_JOIN_ATTEMPTS
+    }).fail(async ({
+      error,
+      timeFn: waitBeforeRetry,
+      currentRetry: attemptCount
+    }) => {
+      return handleJoinRetryFailure(error, waitBeforeRetry, attemptCount, canRetryJoinError, () => {
+        this._throwIfAborted(abortController);
+      }, 'join room via router');
+    }).exec();
+  }
+
+  /**
+   * 执行单次房间加入尝试
+   * @private
+   */
+  async _performSingleJoinAttempt(options) {
+    const abortController = this._abortController;
+    const roomResponse = await this._performCheckIn(options);
+    this._throwIfAborted(abortController);
+    const roomControl = await this._joinRoomControl(options, roomResponse);
+    this._throwIfAborted(abortController);
+    this._updateRoomState(roomResponse, roomControl);
+  }
+
+  /**
+   * 执行CheckIn API调用
+   * @private
+   */
+  async _performCheckIn(options) {
+    const {
+      userId
+    } = this._rteEngine.getConfig();
+    const checkInParams = FcrJoinHelper.buildCheckInParams(options, userId, this._nextRoomRoute.roomId, {
+      bypass: this._bypass,
+      avatar: options.avatar
+    });
+    const {
+      data,
+      ts
+    } = await handleRequestError(() => this._apiService.checkIn(checkInParams), ErrorModuleCode.FCR_ENGINE);
+    return {
+      data,
+      ts
+    };
+  }
+
+  /**
+   * 加入房间控制
+   * @private
+   */
+  async _joinRoomControl(options, roomResponse) {
+    const {
+      data,
+      ts
+    } = roomResponse;
+    const abortController = this._abortController;
+    const roomControl = this._createRoomControl(data);
+    abortController?.signal.addEventListener('abort', () => {
+      roomControl.leave();
+    });
+    await roomControl.join({
+      ...options,
+      snapshot: data,
+      timestamp: ts,
+      createStreamConfigs: options.createStreamConfigs
+    });
+    return roomControl;
+  }
+
+  /**
+   * 更新房间状态
+   * @private
+   */
+  _updateRoomState(roomResponse, roomControl) {
+    const {
+      data
+    } = roomResponse;
+    this._nextRoomRoute = {
+      roomType: data.room.roomProperties.roomType,
+      roomId: data.room.roomInfo.roomUuid,
+      isJoined: true
+    };
+    this._bypass = 1;
+    this._observable.notifyObservers('onRoomJoined', roomControl);
+    this._roomControl = roomControl;
+    this._roomControl.addObserver(this._roomControlObservable);
+  }
+
+  /**
+   * 处理房间加入错误
+   * @private
+   */
+  _handleJoinRoomError(error) {
+    this.logger.error(`Failed to join the room: ${error.message}`);
+    const fcrError = generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM, DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, `join room failed: ${error.message}`);
+    this._observable.notifyObservers('onErrorOccurred', fcrError);
+  }
+
+  /**
+   * 创建房间控制实例
+   * @param roomResponse 房间响应数据
+   * @returns 房间控制实例
+   */
+  _createRoomControl(roomResponse) {
+    const room = roomResponse.room;
+    const scene = this._rteEngine.createScene({
+      sceneId: room.roomInfo.roomUuid
+    });
+    return RoomControlFactory.create({
+      engine: this._rteEngine,
+      scene,
+      apiService: this._apiService,
+      config: this._config,
+      chatConnection: this._chatConnection,
+      sharedCache: this._sharedCache,
+      roomResponse
+    });
+  }
+  _throwIfAborted(abortController) {
+    if (abortController?.signal.aborted) {
+      throw new Error('Join room attempt aborted');
+    }
+  }
+  _addLogObserver() {
+    this.addObserver(generateLogObserver(this.logger, [['onErrorOccurred', ['error']], ['onRoomJoined', ['roomControl']], ['onRoomRouteSwitched', ['nextRoomRoute']]]));
+  }
+  addObserver(observer) {
+    this._observable.addObserver(observer);
+  }
+  removeObserver(observer) {
+    this._observable.removeObserver(observer);
+  }
+}

package/lib-es/room-router/type.js

@@ -0,0 +1,5 @@
+// 导入共享常量
+import { COMMON_JOIN_CONSTANTS } from '../room-control/helpers/constants';
+export const ROOM_ROUTER_CONSTANTS = {
+  MAX_JOIN_ATTEMPTS: COMMON_JOIN_CONSTANTS.MAX_JOIN_ATTEMPTS
+};