fcr-ui-scene 3.7.5 → 3.7.7

package/lib/waiting-room-control-manager.d.ts

@@ -0,0 +1,28 @@
+import { FcrMainRoomControl, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrUISceneConfig } from './type';
+import { FcrCoreEngine } from 'fcr-core/lib/imports';
+export interface FcrUIWaitingRoomControlManagerObserver {
+    onWaitingRoomControlCreated?: (roomControl: FcrWaitingRoomControl) => void;
+    onWaitingRoomControlLeft?: () => void;
+}
+export default class FcrUIWaitingRoomControlManager {
+    private _sceneConfig;
+    private _engine;
+    private _mainRoomControl;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _observable;
+    private _waitingRoomControl;
+    private _isJoining;
+    private _mainRoomUserObserver;
+    constructor(_sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _mainRoomControl: FcrMainRoomControl);
+    private _isWaitingRoomManager;
+    private _createAndJoinWaitingRoom;
+    private _leaveWaitingRoom;
+    private _getMainRoomControlInfo;
+    private _getJoinRoomOption;
+    getWaitingRoomControl(): FcrWaitingRoomControl | null;
+    addObserver(observer: FcrUIWaitingRoomControlManagerObserver): void;
+    removeObserver(observer: FcrUIWaitingRoomControlManagerObserver): void;
+    setMainRoomControl(mainRoomControl: FcrMainRoomControl): void;
+    release(): void;
+}

package/lib/waiting-room-control-manager.js

@@ -0,0 +1,230 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.join.js");
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _fcrCore = require("fcr-core");
+var _type = require("fcr-core/lib/room-control/user-control/type");
+var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
+var _imports = require("fcr-core/lib/imports");
+var _type3 = require("fcr-core/lib/type");
+var _logger = require("./utilities/logger");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function () {
+  function FcrUIWaitingRoomControlManager(_sceneConfig, _engine, _mainRoomControl) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrUIWaitingRoomControlManager);
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrUIWaitingRoomControlManagerObserver'
+    }));
+    (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "_waitingRoomControl", null);
+    (0, _defineProperty2["default"])(this, "_isJoining", false);
+    (0, _defineProperty2["default"])(this, "_mainRoomUserObserver", {
+      onUserInfoUpdated: function onUserInfoUpdated(_roomId, event) {
+        var isLocalUserInfoUpdated = event.modifiedUser.userId === _this._mainRoomControl.getUserControl().getLocalUser().userId;
+
+        // 权限变更的时候
+        if (isLocalUserInfoUpdated) {
+          _this._sceneConfig.userRole = event.modifiedUser.userRole;
+          var isWaitingRoomManager = _this._isWaitingRoomManager();
+          if (isWaitingRoomManager) {
+            _this._createAndJoinWaitingRoom();
+          } else {
+            _this._leaveWaitingRoom();
+          }
+        }
+      }
+    });
+    this._sceneConfig = _sceneConfig;
+    this._engine = _engine;
+    this._mainRoomControl = _mainRoomControl;
+    this._mainRoomControl.getUserControl().addObserver(this._mainRoomUserObserver);
+    var _isWaitingRoomManager = this._isWaitingRoomManager();
+    if (_isWaitingRoomManager) {
+      this._createAndJoinWaitingRoom();
+    }
+  }
+  return (0, _createClass2["default"])(FcrUIWaitingRoomControlManager, [{
+    key: "_isWaitingRoomManager",
+    value: function _isWaitingRoomManager() {
+      var isWaitingRoomManager = this._mainRoomControl.getPrivilegeControl().getLocalUserPermissionInfo(_type2.FcrPermissionAction.WaitingRoomOpen).enable;
+      return isWaitingRoomManager;
+    }
+  }, {
+    key: "_createAndJoinWaitingRoom",
+    value: function () {
+      var _createAndJoinWaitingRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var info, waitingRoomId, room, _t;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (this._isJoining) {
+                _context.next = 9;
+                break;
+              }
+              info = this._getMainRoomControlInfo();
+              if (this._waitingRoomControl) {
+                _context.next = 7;
+                break;
+              }
+              this._isJoining = true;
+              if (!info) {
+                _context.next = 5;
+                break;
+              }
+              waitingRoomId = info.payload.roomUuid;
+              room = this._engine.createWaitingRoomControl(waitingRoomId);
+              this._waitingRoomControl = room;
+              this.logger.info("before waitingRoomManager join waiting room, waitingRoomId:", waitingRoomId);
+              _context.prev = 1;
+              _context.next = 2;
+              return room.join(_objectSpread(_objectSpread({}, this._getJoinRoomOption()), {}, {
+                createStreamConfigs: []
+              }));
+            case 2:
+              this._observable.notifyObservers('onWaitingRoomControlCreated', room);
+              this.logger.info("after waitingRoomManager join waiting room");
+              _context.next = 4;
+              break;
+            case 3:
+              _context.prev = 3;
+              _t = _context["catch"](1);
+              this.logger.error("waiting room join error: ".concat(_t));
+            case 4:
+              _context.next = 6;
+              break;
+            case 5:
+              this.logger.info('mainroomControl info is null, cannot create waiting room');
+            case 6:
+              this._isJoining = false;
+              _context.next = 8;
+              break;
+            case 7:
+              this.logger.info('waiting room is already created, cannot create waiting room');
+            case 8:
+              _context.next = 10;
+              break;
+            case 9:
+              this.logger.info('waiting room is joining, cannot create waiting room');
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[1, 3]]);
+      }));
+      function _createAndJoinWaitingRoom() {
+        return _createAndJoinWaitingRoom2.apply(this, arguments);
+      }
+      return _createAndJoinWaitingRoom;
+    }()
+  }, {
+    key: "_leaveWaitingRoom",
+    value: function () {
+      var _leaveWaitingRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+        var _this$_waitingRoomCon;
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              this._isJoining = false;
+              this.logger.info('mainRoomControl is not waiting room manager, leave waiting room');
+              (_this$_waitingRoomCon = this._waitingRoomControl) === null || _this$_waitingRoomCon === void 0 || _this$_waitingRoomCon.leave();
+              this._waitingRoomControl = null;
+              this._observable.notifyObservers('onWaitingRoomControlLeft');
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function _leaveWaitingRoom() {
+        return _leaveWaitingRoom2.apply(this, arguments);
+      }
+      return _leaveWaitingRoom;
+    }()
+  }, {
+    key: "_getMainRoomControlInfo",
+    value: function _getMainRoomControlInfo() {
+      var _getPrivilegeControl$ = this._mainRoomControl.getPrivilegeControl().getSecurityInfo(_type2.FcrSecurityAction.WaitingRoom),
+        info = _getPrivilegeControl$.info;
+      return info;
+    }
+  }, {
+    key: "_getJoinRoomOption",
+    value: function _getJoinRoomOption() {
+      var config = this._sceneConfig;
+      var streams = [{
+        streamName: 'default',
+        streamType: _type3.FcrStreamType.BOTH,
+        videoSourceType: _type3.FcrVideoSourceType.CAMERA,
+        audioSourceType: _fcrCore.FcrAudioSourceType.MICROPHONE,
+        videoSourceState: _type3.FcrMediaSourceState.CLOSE,
+        audioSourceState: _type3.FcrMediaSourceState.CLOSE
+      }];
+      if (config.userRole === _type.FcrUserRole.ROBOT) {
+        streams = [];
+      }
+      return {
+        userName: config.userName,
+        userRole: config.userRole,
+        userProperties: config.userProperties,
+        streamLatency: _fcrCore.FcrStreamLatencyLevel.ULTRA_LOW,
+        createStreamConfigs: streams,
+        roomToken: config.roomToken,
+        password: config.password
+      };
+    }
+  }, {
+    key: "getWaitingRoomControl",
+    value: function getWaitingRoomControl() {
+      return this._waitingRoomControl;
+    }
+  }, {
+    key: "addObserver",
+    value: function addObserver(observer) {
+      this._observable.addObserver(observer);
+    }
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(observer) {
+      this._observable.removeObserver(observer);
+    }
+  }, {
+    key: "setMainRoomControl",
+    value: function setMainRoomControl(mainRoomControl) {
+      this._mainRoomControl = mainRoomControl;
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      if (this._waitingRoomControl) {
+        this._leaveWaitingRoom();
+        this._mainRoomControl.getUserControl().removeObserver(this._mainRoomUserObserver);
+        this._waitingRoomControl = null;
+      }
+    }
+  }]);
+}();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.7.5",
+  "version": "3.7.7",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -22,13 +22,13 @@
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
     "agora-electron-sdk": "4.3.2-build.156-rc.1",
-    "agora-foundation": "~3.7.5",
-    "agora-ui-foundation": "~3.7.5",
+    "agora-foundation": "~3.7.7",
+    "agora-ui-foundation": "~3.7.7",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "~3.7.5",
+    "fcr-core": "~3.7.7",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -59,7 +59,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "~3.7.5",
+    "agora-toolchain": "~3.7.7",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",

package/public/index.html

@@ -179,6 +179,8 @@
 
     (async () => {
       let creator;
+      let uiScene;
+      let sendExitedEventFlag = true;
       window.cppSdkHelper.onCreatorInit = (config) => {
         if (creator) {
           creator.release();
@@ -205,13 +207,36 @@
       };
 
       window.cppSdkHelper.onLaunchMeeting = (launchOptions) => {
+        try {
+          if (uiScene) {
+            console.log('the previous sequence ui scene exists, exit it');
+            uiScene.exit();
+            sendExitedEventFlag = false;
+          }
+        } catch (error) {
+          // 这里可能会有报错，但是不影响后续的流程
+          console.error(
+            ' the previous sequence ui scene exists, exit it,but exit  has error',
+            JSON.stringify(error),
+          );
+        }
         setFullScreenFailureComp(false);
         setLoading(true);
-        document.querySelector('#fcr-launch-failure-confirm-btn').addEventListener('click', () => {
+
+        // 定义事件处理函数，以便可以正确移除
+        const handleConfirmClick = () => {
           setFullScreenFailureComp(false);
-          console.log('windows_release ui scene closed callback');
+          console.log('windows_release error button clicked');
           window.runtime.getCurrentBrowserWindow().hide();
-        });
+        };
+
+        document
+          .querySelector('#fcr-launch-failure-confirm-btn')
+          .removeEventListener('click', handleConfirmClick);
+        document
+          .querySelector('#fcr-launch-failure-confirm-btn')
+          .addEventListener('click', handleConfirmClick);
+
         const { widgets, ...others } = launchOptions;
 
         if (widgets && widgets instanceof Array) {
@@ -219,7 +244,7 @@
             creator.registerWidget(w);
           });
         }
-        const uiScene = creator.launch(
+        uiScene = creator.launch(
           others,
           () => {
             console.log('windows_release ui scene closed callback');
@@ -241,6 +266,7 @@
         uiScene.addObserver({
           onLaunchSuccess: () => {
             setLoading(false);
+            sendExitedEventFlag = true;
             const roomProvider = uiScene._objectManager.getObject('roomProvider');
             if (!roomProvider) {
               throw new Error('roomProvider not found in uiScene');
@@ -279,7 +305,12 @@
           },
 
           onExited: (roomId, reason) => {
+            if (!sendExitedEventFlag) {
+              return;
+            }
+            console.log('the previous sequence ui scene : ui scene exited');
             window.cppSdkHelper.exitedMeeting(roomId, reason);
+            uiScene = null;
             setTimeout(() => {
               console.log('windows_release ui scene exited callback');
               window.runtime.getCurrentBrowserWindow().hide();

package/lib/modules/action-bar/store.base.d.ts

@@ -1,15 +0,0 @@
-import { FcrUIManagedObject } from '../../object-manager';
-import { FcrUISharedLayoutDataSource } from '../../shared-data/layout-data';
-import { ActionBarStoreArgs } from './type';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-export default abstract class ActionBarStoreBase implements FcrUIManagedObject {
-    protected _sharedLayoutDataSource: FcrUISharedLayoutDataSource;
-    protected _eventProvider: FcrUIEventProvider;
-    accessor stateBarLeaveMeeting: boolean;
-    private _mainWindowObserver;
-    constructor({ objectManager }: ActionBarStoreArgs);
-    get endMeetingPopoverOpened(): boolean;
-    setStateBarLeaveMeeting(isShow: boolean): void;
-    setPopoverOpened(isShow: boolean): void;
-    abstract release(): void;
-}

package/lib/modules/action-bar/waiting-scene/store.d.ts

@@ -1,6 +0,0 @@
-import ActionBarStoreBase from '../store.base';
-export declare class ActionBarWaitingSceneStoreBase extends ActionBarStoreBase {
-    toggleLayoutBarLock(payload: boolean): void;
-    release(): void;
-}
-export declare const ActionBarContext: import("react").Context<ActionBarWaitingSceneStoreBase>;

package/lib/providers/board-share/bar-control.d.ts

@@ -1,51 +0,0 @@
-import { FcrBoardToolType, FcrBoardShape } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrToolbarState } from '../../modules/components/toolbar/types';
-import { FcrUIMainWindowRenderer, FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../../modules/secondary-window/type';
-import { WhiteboardThemeType } from '../../modules/whiteboard/type';
-import { FcrUIPrivilegeProvider } from '../privilege-provider';
-import { FcrUIBoardBarControl } from './type';
-import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
-export declare class FcrUIBoardControlShareProviderImpl implements FcrUIBoardBarControl {
-    private readonly _privilegeProvider;
-    private readonly _boardControl;
-    private readonly _fcrUIMainWindowRenderer;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    private _showLoading;
-    private _roomName;
-    private _disposers;
-    private _mainWindowRenderer;
-    private _toolbarStateObserver;
-    private get _boardMainRoom();
-    accessor currentTheme: Required<WhiteboardThemeType>;
-    accessor sharingUserInfo: FcrUserInfo | undefined;
-    accessor backgroundColor: string;
-    accessor hasWriteBoardPermission: boolean;
-    accessor connectionState: FcrConnectionState;
-    accessor joinSuccess: boolean;
-    accessor toolbarState: FcrToolbarState;
-    get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
-    get showLoading(): boolean;
-    get canWriteBoard(): boolean;
-    constructor(_privilegeProvider: FcrUIPrivilegeProvider, _boardControl: FcrPrivilegedWhiteboardControl, _fcrUIMainWindowRenderer: FcrUIMainWindowRenderer);
-    setControlEnable(enable: boolean): void;
-    setSharingUser(userInfo: FcrUserInfo): void;
-    setBackgroundColor(color: string): void;
-    setWhiteboardTool(tool: {
-        action: WhiteboardToolAction;
-        tool: FcrBoardToolType | FcrBoardShape | string | number;
-    }): void;
-    setTheme(theme: WhiteboardThemeType): void;
-    setShowLoading(show: boolean): void;
-    setCommonColors(colors: string[]): void;
-    saveDraft(): void;
-    setProgress(progress: number): void;
-    setJoinSuccess(success: boolean): void;
-    inActive(): void;
-    release(): void;
-    setIsDualDisplayMode(isDualDisplayMode: boolean): void;
-    resetWhiteboardTool(): void;
-    setRoomName(roomName: string): void;
-    private _handleSubProcessStateUpdated;
-    private _handleDraftSaved;
-}