fcr-core 3.4.1 → 3.4.2

package/lib/room-control/privilege-control/index.js

@@ -24,11 +24,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrPrivilegeControlImpl = void 0;
-require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
@@ -87,14 +85,7 @@ class FcrPrivilegeControlImpl {
   } */
 
   getLocalUserPermissionInfo(action) {
-    const permissionStringArray = this._scene.getUserPropertiesByKeyPath("permission.list", this._scene.localUser.getLocalUserId());
-    const permissionString = permissionStringArray.find(permission => permission.startsWith(action));
-    if (!permissionString) {
-      return {
-        enable: false
-      };
-    }
-    return this._convertPermissionInfo(_helper.FcrPermission.fromString(permissionString), _type2.FcrOperatePermissionType.GET);
+    return (0, _helper.getLocalUserPermissionInfo)(this._scene, action);
   }
 
   // @trace
@@ -250,31 +241,14 @@ class FcrPrivilegeControlImpl {
             });
           });
         }
+      }
+    });
+    (0, _helper.addLocalUserPermissionObserver)(this._scene, {
+      onLocalUserPermissionInfoAdded: (sceneId, event) => {
+        this._observable.notifyObservers('onLocalUserPermissionInfoAdded', sceneId, event);
       },
-      onUserPropertiesUpdated: (sceneId, event) => {
-        var _event$cause;
-        if (((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.cmd) === 3200) {
-          if (event.modifiedUser.userId === this._scene.localUser.getLocalUserId()) {
-            var _data$addPermissions, _data$removePermissio;
-            const data = event.cause.data;
-            const addedPermissions = (_data$addPermissions = data.addPermissions) === null || _data$addPermissions === void 0 ? void 0 : _data$addPermissions.map(p => this._convertPermissionInfo(_helper.FcrPermission.fromString(p), _type2.FcrOperatePermissionType.ADD));
-            const removedPermissions = (_data$removePermissio = data.removePermissions) === null || _data$removePermissio === void 0 ? void 0 : _data$removePermissio.map(p => this._convertPermissionInfo(_helper.FcrPermission.fromString(p), _type2.FcrOperatePermissionType.DELETE));
-            if (removedPermissions && removedPermissions.length > 0) {
-              this._observable.notifyObservers('onLocalUserPermissionInfoDeleted', sceneId, {
-                permissionInfo: removedPermissions,
-                operatorUser: (0, _user.checkFcrUserRole)((0, _user.convertRteUserToFcrUser)(event.operatorUser)),
-                cause: event.cause
-              });
-            }
-            if (addedPermissions && addedPermissions.length > 0) {
-              this._observable.notifyObservers('onLocalUserPermissionInfoAdded', sceneId, {
-                permissionInfo: addedPermissions,
-                operatorUser: (0, _user.checkFcrUserRole)((0, _user.convertRteUserToFcrUser)(event.operatorUser)),
-                cause: event.cause
-              });
-            }
-          }
-        }
+      onLocalUserPermissionInfoDeleted: (sceneId, event) => {
+        this._observable.notifyObservers('onLocalUserPermissionInfoDeleted', sceneId, event);
       }
     });
   }

package/lib/room-control/stream-control/index.js

@@ -224,28 +224,28 @@ class FcrStreamControlImpl {
     }
   }
   addLocalStreams(streams) {
-    return this._scene.localUser.addLocalStreams(streams);
+    return (0, _error.handleRequestError)(() => this._scene.localUser.addLocalStreams(streams), _error.FcrErrorModuleCode.ROOM_STREAM, 'add local streams failed');
   }
   bindLocalStreams(streams) {
-    return this._scene.localUser.bindLocalStreams(streams);
+    return (0, _error.handleRequestError)(() => this._scene.localUser.bindLocalStreams(streams), _error.FcrErrorModuleCode.ROOM_STREAM, 'bind local streams failed');
   }
   updatePublishPrivilegeOfStreams() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
     if (args.length === 1) {
-      return this._scene.localUser.updatePublishPrivilegeOfStreams(args[0]);
+      return (0, _error.handleRequestError)(() => this._scene.localUser.updatePublishPrivilegeOfStreams(args[0]), _error.FcrErrorModuleCode.ROOM_STREAM, 'update publish privilege of streams failed');
     } else if (args.length === 2) {
       const [privilege, scope] = args;
       const targetRteRoles = scope.targetRoleType.map(role => _type.FcrUserRoleToStringMap[role]);
-      return this._scene.localUser.updatePublishPrivilegeOfStreams(privilege, {
+      return (0, _error.handleRequestError)(() => this._scene.localUser.updatePublishPrivilegeOfStreams(privilege, {
         targetRoleType: targetRteRoles,
         targetRoleTypeIsInclude: scope.targetRoleTypeIsInclude
-      });
+      }), _error.FcrErrorModuleCode.ROOM_STREAM, 'update publish privilege of streams failed');
     }
   }
   removeStreams(streams) {
-    return this._scene.localUser.removeStreams(streams);
+    return (0, _error.handleRequestError)(() => this._scene.localUser.removeStreams(streams), _error.FcrErrorModuleCode.ROOM_STREAM, 'remove streams failed');
   }
   setVideoEncoderConfig(streamId, config, streamType) {
     return this._scene.localUser.setVideoEncoderConfig(config, streamType, streamId);
@@ -273,39 +273,38 @@ class FcrStreamControlImpl {
     return this._scene.streamPlayer.takeSnapshot(streamId, filePath);
   }
   async addLocalScreenStream(config) {
-    try {
-      const res = await this._api.startShareScreen({
-        roomId: this._scene.sceneId,
-        userId: this._scene.getLocalUser().getLocalUserId(),
-        config: _objectSpread({
-          videoSourceUuid: 'default',
-          videoSourceType: _.FcrVideoSourceType.SCREEN,
-          audioSourceType: _.FcrAudioSourceType.LOOPBACK
-        }, (0, _imports.convertStreamTypeToPublishState)(config.streamType))
-      });
-      const {
-        data: {
-          rtcToken: token,
-          streamUuid: streamId
-        }
-      } = res;
-      this._screenStreamId = streamId;
-      this._scene.localUser.prepareToPublishScreenStream(streamId, token);
-      return streamId;
-    } catch (error) {
-      if (error instanceof _imports.AgoraRestfulClientError) {
-        var _error$serviceCode;
-        this.logger.error("[FcrStreamControl] addLocalScreenStream failed, error: ".concat(error.message));
-        throw (0, _error.generateFcrCoreServerError)((_error$serviceCode = error.serviceCode) !== null && _error$serviceCode !== void 0 ? _error$serviceCode : -1, error.message, error);
+    const res = await (0, _error.handleRequestError)(() => this._api.startShareScreen({
+      roomId: this._scene.sceneId,
+      userId: this._scene.getLocalUser().getLocalUserId(),
+      config: _objectSpread({
+        videoSourceUuid: 'default',
+        videoSourceType: _.FcrVideoSourceType.SCREEN,
+        audioSourceType: _.FcrAudioSourceType.LOOPBACK,
+        videoSourceState: _.FcrMediaSourceState.CLOSE,
+        audioSourceState: _.FcrMediaSourceState.CLOSE
+      }, (0, _imports.convertStreamTypeToPublishState)(config.streamType))
+    }), _error.FcrErrorModuleCode.ROOM_STREAM, 'add local screen stream failed');
+    const {
+      data: {
+        rtcToken: token,
+        streamUuid: streamId
       }
-      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.MEDIA_CONTROL_SCREEN, _error.FcrErrorCode.UNDEFINED_ERROR, 'addLocalScreenStream failed', error);
-    }
+    } = res;
+    this._screenStreamId = streamId;
+    this._scene.localUser.prepareToPublishScreenStream(streamId, token);
+    return streamId;
   }
   async removeScreenStream() {
-    const res = await (0, _error.handleRequestError)(() => this._api.stopShareScreen({
-      roomId: this._scene.sceneId,
-      userId: this._scene.getLocalUser().getLocalUserId()
-    }), _error.FcrErrorModuleCode.ROOM_STREAM, 'remove screen stream failed');
+    const res = await (0, _error.handleRequestError)(async () => {
+      for (const stream of this._streamList) {
+        if (stream.videoSourceType === _.FcrVideoSourceType.SCREEN) {
+          await this._api.stopShareScreen({
+            roomId: this._scene.sceneId,
+            userId: stream.owner.userId
+          });
+        }
+      }
+    }, _error.FcrErrorModuleCode.ROOM_STREAM, 'remove screen stream failed');
     if (this._screenStreamId) {
       this._scene.localUser.removePreparePublishScreenStream(this._screenStreamId);
     }
@@ -354,4 +353,4 @@ class FcrStreamControlImpl {
 }
 exports.FcrStreamControlImpl = FcrStreamControlImpl;
 _FcrStreamControlImpl = FcrStreamControlImpl;
-[_initProto] = _applyDecs(_FcrStreamControlImpl, [[_imports.bound, 2, "getStreams"], [_imports.bound, 2, "getStreamList"], [_imports.bound, 2, "getStreamsByUserId"], [_imports.bound, 2, "getStreamByStreamId"], [[_imports.bound, _logger.trace], 2, "addLocalStreams"], [[_imports.bound, _logger.trace], 2, "bindLocalStreams"], [[_imports.bound, _logger.trace], 2, "updatePublishPrivilegeOfStreams"], [[_imports.bound, _logger.trace], 2, "removeStreams"], [[_imports.bound, _logger.trace], 2, "setVideoEncoderConfig"], [[_imports.bound, _logger.trace], 2, "startRenderRemoteVideoStream"], [[_imports.bound, _logger.trace], 2, "stopRenderRemoteVideoStream"], [[_imports.bound, _logger.trace], 2, "startPlayRemoteAudioStream"], [[_imports.bound, _logger.trace], 2, "stopPlayRemoteAudioStream"], [[_imports.bound, _logger.trace], 2, "takeSnapshot"], [[_imports.bound, _logger.trace], 2, "addLocalScreenStream"], [[_imports.bound, _logger.trace], 2, "removeScreenStream"], [[_imports.bound, _logger.trace], 2, "adjustRemoteAudioStreamVolume"], [[_imports.bound, _logger.trace], 2, "mergeAudioStream"], [[_imports.bound, _logger.trace], 2, "splitAudioStream"], [[_imports.bound, _logger.trace], 2, "addObserver"], [[_imports.bound, _logger.trace], 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrStreamControlImpl, [[_imports.bound, 2, "getStreams"], [_imports.bound, 2, "getStreamList"], [_imports.bound, 2, "getStreamsByUserId"], [_imports.bound, 2, "getStreamByStreamId"], [[_imports.bound, _logger.trace], 2, "addLocalStreams"], [[_imports.bound, _logger.trace], 2, "bindLocalStreams"], [[_imports.bound, _logger.trace], 2, "updatePublishPrivilegeOfStreams"], [[_imports.bound, _logger.trace], 2, "removeStreams"], [[_imports.bound, _logger.trace], 2, "setVideoEncoderConfig"], [[_imports.bound, _logger.trace], 2, "startRenderRemoteVideoStream"], [[_imports.bound, _logger.trace], 2, "stopRenderRemoteVideoStream"], [[_imports.bound, _logger.trace], 2, "startPlayRemoteAudioStream"], [[_imports.bound, _logger.trace], 2, "stopPlayRemoteAudioStream"], [[_imports.bound, _logger.trace], 2, "takeSnapshot"], [[_imports.bound, _logger.trace], 2, "addLocalScreenStream"], [[_imports.bound, _logger.trace], 2, "removeScreenStream"], [[_imports.bound, _logger.trace], 2, "adjustRemoteAudioStreamVolume"], [[_imports.bound, _logger.trace], 2, "mergeAudioStream"], [[_imports.bound, _logger.trace], 2, "splitAudioStream"]], []).e;

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

@@ -189,10 +189,6 @@ export type FcrRoomJoinOptions = {
 export type FcrRoomConfig = {
     roomId: string;
 };
-export declare enum FcrUserKickOutType {
-    Once = 1,
-    Forever = 2
-}
 export type FcrRoomObserver = {
     /**
      * Callback when join room success.

package/lib/room-control/type.js

@@ -3,12 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUserKickOutType = exports.FcrRoomType = exports.FcrLiveStreamingStateUpdatedReason = void 0;
-let FcrUserKickOutType = exports.FcrUserKickOutType = /*#__PURE__*/function (FcrUserKickOutType) {
-  FcrUserKickOutType[FcrUserKickOutType["Once"] = 1] = "Once";
-  FcrUserKickOutType[FcrUserKickOutType["Forever"] = 2] = "Forever";
-  return FcrUserKickOutType;
-}({});
+exports.FcrRoomType = exports.FcrLiveStreamingStateUpdatedReason = void 0;
 let FcrRoomType = exports.FcrRoomType = /*#__PURE__*/function (FcrRoomType) {
   FcrRoomType[FcrRoomType["Mainroom"] = 11] = "Mainroom";
   FcrRoomType[FcrRoomType["Waitingroom"] = 102] = "Waitingroom";

package/lib/room-control/user-control/index.js

@@ -327,4 +327,4 @@ class FcrUserControlImpl {
 }
 exports.FcrUserControlImpl = FcrUserControlImpl;
 _FcrUserControlImpl = FcrUserControlImpl;
-[_initProto] = _applyDecs(_FcrUserControlImpl, [[_imports.bound, 2, "getLocalUser"], [_imports.bound, 2, "getUsers"], [_imports.bound, 2, "getUserList"], [_imports.bound, 2, "getUser"], [[_imports.bound, _logger.trace], 2, "getAllUserCount"], [_imports.bound, 2, "getWaterMarkContent"], [[_imports.bound, _logger.trace], 2, "fetchUserList"], [[_imports.bound, _logger.trace], 2, "updateUserName"], [[_imports.bound, _logger.trace], 2, "updateUserProperties"], [[_imports.bound, _logger.trace], 2, "updateIncrementUserProperties"], [[_imports.bound, _logger.trace], 2, "deleteUserProperties"], [[_imports.bound, _logger.trace], 2, "getUserProperties"], [[_imports.bound, _logger.trace], 2, "getUserPropertiesByUserId"], [[_imports.bound, _logger.trace], 2, "getUserPropertiesByKeyPath"], [[_imports.bound, _logger.trace], 2, "updateRemoteUserRole"], [[_imports.bound, _logger.trace], 2, "revokeHost"], [[_imports.bound, _logger.trace], 2, "kickOut"], [_logger.trace, 2, "kickOutByUserIds"], [_logger.trace, 2, "kickOutByUserRoles"], [_logger.trace, 2, "mergeAudioStream"], [[_imports.bound, _logger.trace], 2, "addObserver"], [[_imports.bound, _logger.trace], 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrUserControlImpl, [[_imports.bound, 2, "getLocalUser"], [_imports.bound, 2, "getUsers"], [_imports.bound, 2, "getUserList"], [_imports.bound, 2, "getUser"], [[_imports.bound, _logger.trace], 2, "getAllUserCount"], [_imports.bound, 2, "getWaterMarkContent"], [[_imports.bound, _logger.trace], 2, "fetchUserList"], [[_imports.bound, _logger.trace], 2, "updateUserName"], [[_imports.bound, _logger.trace], 2, "updateUserProperties"], [[_imports.bound, _logger.trace], 2, "updateIncrementUserProperties"], [[_imports.bound, _logger.trace], 2, "deleteUserProperties"], [[_imports.bound, _logger.trace], 2, "getUserProperties"], [[_imports.bound, _logger.trace], 2, "getUserPropertiesByUserId"], [[_imports.bound, _logger.trace], 2, "getUserPropertiesByKeyPath"], [[_imports.bound, _logger.trace], 2, "updateRemoteUserRole"], [[_imports.bound, _logger.trace], 2, "revokeHost"], [[_imports.bound, _logger.trace], 2, "kickOut"], [_logger.trace, 2, "kickOutByUserIds"], [_logger.trace, 2, "kickOutByUserRoles"], [_logger.trace, 2, "mergeAudioStream"]], []).e;

package/lib/room-control/waitingroom-control/index.js

@@ -87,4 +87,4 @@ class FcrWaitingRoomControlImpl extends _.FcrBaseRoomControlImpl {
 }
 exports.FcrWaitingRoomControlImpl = FcrWaitingRoomControlImpl;
 _FcrWaitingRoomControlImpl = FcrWaitingRoomControlImpl;
-[_initProto] = _applyDecs(_FcrWaitingRoomControlImpl, [[_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_logger.trace, 2, "moveToMainRoomByUserIds"], [_logger.trace, 2, "moveToMainRoomByUserRoles"]], [], 0, void 0, _.FcrBaseRoomControlImpl).e;
+[_initProto] = _applyDecs(_FcrWaitingRoomControlImpl, [[_logger.trace, 2, "moveToMainRoomByUserIds"], [_logger.trace, 2, "moveToMainRoomByUserRoles"]], [], 0, void 0, _.FcrBaseRoomControlImpl).e;

package/lib/room-control/whiteboard-control/board-subwindow.d.ts

@@ -0,0 +1,6 @@
+import { FcrBoardSubWindow } from './types';
+export declare class FcrBoardSubWindowImpl implements FcrBoardSubWindow {
+    private _appId;
+    constructor(_appId: string);
+    exportPdf(): Promise<ArrayBuffer>;
+}

package/lib/room-control/whiteboard-control/board-subwindow.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrBoardSubWindowImpl = void 0;
+class FcrBoardSubWindowImpl {
+  constructor(_appId) {
+    this._appId = _appId;
+  }
+  exportPdf() {
+    window.postMessage({
+      type: '@netless/_request_save_pdf_',
+      appId: this._appId /* windowManager.addApp 返回的值, 指定要保存哪个窗口的板书, */
+    });
+    return new Promise((resolve, reject) => {
+      window.addEventListener('message', event => {
+        if (event.data.type === '@netless/_result_save_pdf_') {
+          var _event$data$result;
+          event.data.progress === 100 && resolve((_event$data$result = event.data.result) === null || _event$data$result === void 0 ? void 0 : _event$data$result.pdf);
+        }
+      });
+    });
+  }
+}
+exports.FcrBoardSubWindowImpl = FcrBoardSubWindowImpl;

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

@@ -1,11 +1,9 @@
 import { FcrBoardActiveInfo, FcrBoardMainWindow, FcrWhiteboardControl, FcrWhiteboardObserver } from '../whiteboard-control/types';
 import { AgoraRteEngine, AgoraRteScene } from '../../imports';
 import { FcrCoreServiceApi } from '../../service/api';
-import { FcrPrivilegeControl } from '../privilege-control/type';
 import { FcrConnectionState } from '../..';
 export declare class FcrWhiteboardControlImpl implements FcrWhiteboardControl {
     private _scene;
-    private _privilegeControl;
     private _api;
     private _engine;
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -15,7 +13,7 @@ export declare class FcrWhiteboardControlImpl implements FcrWhiteboardControl {
     private _connectState;
     private _joined;
     private _FORGE_WHITEBOARD_APP_ID;
-    constructor(_scene: AgoraRteScene, _privilegeControl: FcrPrivilegeControl, _api: FcrCoreServiceApi, _engine: AgoraRteEngine);
+    constructor(_scene: AgoraRteScene, _api: FcrCoreServiceApi, _engine: AgoraRteEngine);
     open(): Promise<FcrBoardMainWindow>;
     close(): Promise<void>;
     active(): Promise<void>;

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

@@ -47,7 +47,7 @@ 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; }
 class FcrWhiteboardControlImpl {
-  constructor(_scene, _privilegeControl, _api, _engine) {
+  constructor(_scene, _api, _engine) {
     (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrWhiteboardControlImpl'
     })));
@@ -56,7 +56,6 @@ class FcrWhiteboardControlImpl {
     (0, _defineProperty2.default)(this, "_joined", false);
     (0, _defineProperty2.default)(this, "_FORGE_WHITEBOARD_APP_ID", 'MainWhiteboard');
     this._scene = _scene;
-    this._privilegeControl = _privilegeControl;
     this._api = _api;
     this._engine = _engine;
     this._addLogObserver();
@@ -116,10 +115,10 @@ class FcrWhiteboardControlImpl {
         whiteboard.enableCameraByMouse = false;
         whiteboard.enableCameraByTouch = false;
         whiteboard.setViewModeToMain();
-        wbRoom.applicationManager.on('terminal', () => {
-          this._updateConnnectionState(_2.FcrConnectionState.DISCONNECTED);
-        });
-        this._boardView = new _mainWindow.FcrBoardMainWindowImpl(whiteboard, this._privilegeControl);
+        // wbRoom.applicationManager.on('terminal', () => {
+        //   this._updateConnnectionState(FcrConnectionState.DISCONNECTED);
+        // });
+        this._boardView = new _mainWindow.FcrBoardMainWindowImpl(whiteboard, this._scene);
         this._updateConnnectionState(_2.FcrConnectionState.CONNECTED);
       }, [], {
         retriesMax
@@ -246,4 +245,4 @@ class FcrWhiteboardControlImpl {
 }
 exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
 _FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
-[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[_logger.trace, 2, "open"], [_logger.trace, 2, "close"], [_logger.trace, 2, "active"], [_logger.trace, 2, "inactive"], [[_decorator.bound, _logger.trace], 2, "getConnectionState"], [[_decorator.bound, _logger.trace], 2, "getMainWindow"], [_decorator.bound, 2, "getBoardActiveInfo"], [[_decorator.bound, _logger.trace], 2, "setBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getActivity"], [[_decorator.bound, _logger.trace], 2, "getOwnerId"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_decorator.bound, 2, "_notifyObservers"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_getToken"]], []).e;
+[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[_logger.trace, 2, "open"], [_logger.trace, 2, "close"], [_logger.trace, 2, "active"], [_logger.trace, 2, "inactive"], [[_decorator.bound, _logger.trace], 2, "getConnectionState"], [[_decorator.bound, _logger.trace], 2, "getMainWindow"], [_decorator.bound, 2, "getBoardActiveInfo"], [[_decorator.bound, _logger.trace], 2, "setBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getActivity"], [[_decorator.bound, _logger.trace], 2, "getOwnerId"], [_decorator.bound, 2, "_notifyObservers"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_getToken"]], []).e;

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

@@ -1,14 +1,14 @@
 import { FcrBoardToolType } from '../whiteboard-control/enums';
 import { Color, FcrBoardMainWindow, FcrBoardPageInfo, FcrBoardWindowObserver } from '../whiteboard-control/types';
 import { Whiteboard } from '@netless/forge-whiteboard';
-import { FcrPrivilegeControl } from '../privilege-control/type';
+import type { AgoraRteScene } from '../../imports';
 export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _whiteboard;
     private _observable;
     private _boardView;
     private _currentPage;
-    constructor(whiteboard: Whiteboard, privilegeControl: FcrPrivilegeControl);
+    constructor(whiteboard: Whiteboard, scene: AgoraRteScene);
     addPage(): Promise<void>;
     removePage(): Promise<void>;
     undo(): Promise<void>;

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

@@ -35,6 +35,7 @@ var _observable = require("agora-foundation/lib/utilities/observable");
 var _utils = require("./utils");
 var _type = require("../privilege-control/type");
 var _logger = require("../../utilities/logger");
+var _helper = require("../privilege-control/helper");
 var _FcrBoardMainWindowImpl;
 let _initProto;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
@@ -43,7 +44,7 @@ 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; }
 class FcrBoardMainWindowImpl {
-  constructor(whiteboard, privilegeControl) {
+  constructor(whiteboard, scene) {
     (0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.getLogger)()));
     (0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2.default)(this, "_currentPage", 0);
@@ -57,9 +58,9 @@ class FcrBoardMainWindowImpl {
     whiteboard.view.style.width = "100%";
     this._whiteboard = whiteboard;
     this._addWindowManagerEventListeners();
-    const hasOperationPrivilege = privilegeControl.getLocalUserPermissionInfo(_type.FcrPermissionAction.BoardWrite).enable;
+    const hasOperationPrivilege = (0, _helper.getLocalUserPermissionInfo)(scene, _type.FcrPermissionAction.BoardWrite).enable;
     whiteboard.permissions[hasOperationPrivilege ? 'addPermission' : 'removePermission'](_forgeWhiteboard.WhiteboardPermissionFlag.all);
-    privilegeControl.addObserver({
+    (0, _helper.addLocalUserPermissionObserver)(scene, {
       onLocalUserPermissionInfoAdded: (roomId, event) => {
         if (this._isBoardWritePermission(event)) {
           whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
@@ -215,4 +216,4 @@ class FcrBoardMainWindowImpl {
 }
 exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
 _FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[[_decorator.bound, _logger.trace], 2, "addPage"], [[_decorator.bound, _logger.trace], 2, "removePage"], [[_decorator.bound, _logger.trace], 2, "undo"], [[_decorator.bound, _logger.trace], 2, "redo"], [[_decorator.bound, _logger.trace], 2, "clean"], [[_decorator.bound, _logger.trace], 2, "getSnapshotImage"], [[_decorator.bound, _logger.trace], 2, "setBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getPageInfo"], [[_decorator.bound, _logger.trace], 2, "prevPage"], [[_decorator.bound, _logger.trace], 2, "nextPage"], [[_decorator.bound, _logger.trace], 2, "setToolType"], [[_decorator.bound, _logger.trace], 2, "setStrokeWidth"], [[_decorator.bound, _logger.trace], 2, "setStrokeColor"], [[_decorator.bound, _logger.trace], 2, "setTextColor"], [[_decorator.bound, _logger.trace], 2, "setTextSize"], [[_decorator.bound, _logger.trace], 2, "insertImage"], [[_decorator.bound, _logger.trace], 2, "getContentView"], [[_decorator.bound, _logger.trace], 2, "setContainerSizeRatio"], [[_decorator.bound, _logger.trace], 2, "addObserver"], [[_decorator.bound, _logger.trace], 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[[_decorator.bound, _logger.trace], 2, "addPage"], [[_decorator.bound, _logger.trace], 2, "removePage"], [[_decorator.bound, _logger.trace], 2, "undo"], [[_decorator.bound, _logger.trace], 2, "redo"], [[_decorator.bound, _logger.trace], 2, "clean"], [[_decorator.bound, _logger.trace], 2, "getSnapshotImage"], [[_decorator.bound, _logger.trace], 2, "setBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getPageInfo"], [[_decorator.bound, _logger.trace], 2, "prevPage"], [[_decorator.bound, _logger.trace], 2, "nextPage"], [[_decorator.bound, _logger.trace], 2, "setToolType"], [[_decorator.bound, _logger.trace], 2, "setStrokeWidth"], [[_decorator.bound, _logger.trace], 2, "setStrokeColor"], [[_decorator.bound, _logger.trace], 2, "setTextColor"], [[_decorator.bound, _logger.trace], 2, "setTextSize"], [[_decorator.bound, _logger.trace], 2, "insertImage"], [[_decorator.bound, _logger.trace], 2, "getContentView"], [[_decorator.bound, _logger.trace], 2, "setContainerSizeRatio"]], []).e;

package/lib/service/api.d.ts

@@ -358,6 +358,8 @@ export declare class FcrCoreServiceApi {
             audioSourceType: number;
             videoSourceUuid?: string;
             audioSourceUuid?: string;
+            videoSourceState?: number;
+            audioSourceState?: number;
         };
     }): Promise<{
         data: {

package/lib/service/api.js

@@ -350,7 +350,8 @@ class FcrCoreServiceApi {
         userProperties: params.userProperties,
         version: params.version
       },
-      retryFallbackDomainsWhenFail: true
+      retryFallbackDomainsWhenFail: true,
+      maxRetryTimes: 10
     });
     return {
       data,
@@ -375,7 +376,8 @@ class FcrCoreServiceApi {
         version: params.version,
         ticket: params.ticket
       },
-      retryFallbackDomainsWhenFail: true
+      retryFallbackDomainsWhenFail: true,
+      maxRetryTimes: 10
     });
     return {
       data,

package/lib/utilities/error.d.ts

@@ -38,6 +38,7 @@ export declare enum FcrErrorCode {
     LOCAL_HTTP_REQUEST_FAILED = 12,
     NOT_LOGGED_IN = 13,
     NOT_JOINED_ROOM = 14,
+    JOIN_CONFLICT = 15,
     EXPIRED = 15
 }
 export declare const generateFcrCoreClientError: (module: FcrErrorModuleCode, code: number, message: string, origin: Error) => FcrError;

package/lib/utilities/error.js

@@ -58,6 +58,7 @@ let FcrErrorCode = exports.FcrErrorCode = /*#__PURE__*/function (FcrErrorCode) {
   FcrErrorCode[FcrErrorCode["LOCAL_HTTP_REQUEST_FAILED"] = 12] = "LOCAL_HTTP_REQUEST_FAILED";
   FcrErrorCode[FcrErrorCode["NOT_LOGGED_IN"] = 13] = "NOT_LOGGED_IN";
   FcrErrorCode[FcrErrorCode["NOT_JOINED_ROOM"] = 14] = "NOT_JOINED_ROOM";
+  FcrErrorCode[FcrErrorCode["JOIN_CONFLICT"] = 15] = "JOIN_CONFLICT";
   FcrErrorCode[FcrErrorCode["EXPIRED"] = 15] = "EXPIRED";
   return FcrErrorCode;
 }({}); // helpers

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -26,7 +26,7 @@
     "build:split:i18n": "node ./build-doc/doc-localization.js",
     "build:en-docs": "typedoc --entryPoints ./build-doc/en-sdk.d.ts --readme ./build-doc/readme-en.md --hideGenerator --name 'Edu Store Typescript API Reference for Web' --tsconfig ./build-doc/en/tsconfig.json --out en-docs --excludeExternals --excludePrivate --excludeInternal --excludeProtected --disableSources --theme typedoc-theme",
     "build:cn-docs": "typedoc --entryPoints ./build-doc/cn-sdk.d.ts --readme ./build-doc/readme-cn.md --hideGenerator --name 'Edu Store Typescript API Reference for Web' --tsconfig ./build-doc/cn/tsconfig.json --out cn-docs --excludeExternals --excludePrivate --excludeInternal --excludeProtected --disableSources --theme typedoc-theme",
-    "test-browser": "agora-tc-test-karma-browser",
+    "test-browser": "agora-tc-test-karma-browser --file universal/room-control.test.ts",
     "test-electron": "agora-tc-test-karma-electron"
   },
   "devDependencies": {
@@ -40,7 +40,7 @@
     "@types/lodash": "^4.14.168",
     "@types/sinon": "^17.0.2",
     "@types/uuid": "^8.3.0",
-    "agora-toolchain": "^3.4.1",
+    "agora-toolchain": "^3.4.2",
     "core-js": "^3.33.3",
     "decomment": "^0.9.5",
     "husky": "^9.0.11",
@@ -55,13 +55,13 @@
     "@netless/app-slide": "^0.2.58",
     "@netless/app-talkative": "^0.1.1",
     "@netless/forge-room": "0.1.4",
-    "@netless/forge-rtm": "^0.1.6",
+    "@netless/forge-rtm": "0.1.7",
     "@netless/forge-whiteboard": "0.1.10",
     "@netless/video-js-plugin": "^0.3.8",
     "@netless/white-snapshot": "^0.4.2",
     "@netless/window-manager": "^0.4.72",
-    "agora-foundation": "^3.4.1",
-    "agora-rte-sdk": "^3.4.1",
+    "agora-foundation": "^3.4.2",
+    "agora-rte-sdk": "^3.4.2",
     "await-to-js": "^3.0.0",
     "dayjs": "^1.10.4",
     "easemob-websdk": "4.8.1",