fcr-ui-scene 3.7.6 → 3.7.7-rc.1

package/lib/providers/mouse-detect/provider.js

@@ -124,6 +124,38 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
       x: 0,
       y: 0
     });
+    (0, _defineProperty2["default"])(this, "_isDebug", false);
+    (0, _defineProperty2["default"])(this, "_displayId", null);
+    (0, _defineProperty2["default"])(this, "_debugWindowObserver", {
+      onReady: function onReady() {
+        var AreaDebugger = (0, _mobxReact.observer)(function () {
+          var content = Array.from(_this._detectAreas.keys()).map(function (areaId) {
+            var list = _this._detectAreas.get(areaId);
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+              "data-area-id": areaId,
+              children: list.map(function (item, index) {
+                return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+                  style: {
+                    width: item.width,
+                    height: item.height,
+                    position: 'absolute',
+                    top: item.y,
+                    left: item.x,
+                    backgroundColor: 'rgba(10,10,10,0.5)'
+                  }
+                }, index);
+              })
+            }, areaId);
+          });
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "fcr-ui-mouse-detect-debugger",
+            children: content
+          });
+        });
+        var window = _this._windowProvder.getWindowById(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG);
+        _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(AreaDebugger, {}), window.getRootNode());
+      }
+    });
     this.objectManager = objectManager;
     this._renderer = objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
     this._windowProvder = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
@@ -136,49 +168,7 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
     }
 
     // 调试时使用，用于查看检测区域
-    var debug = false;
-    if (debug) {
-      this._windowProvder.setWindowOptions(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG, {
-        frame: false,
-        transparent: true,
-        backgroundColor: '#00000000',
-        title: 'MouseDetectDebugger'
-      });
-      var window = this._windowProvder.getWindowById(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG);
-      window.show();
-      window.setIgnoreMouseEvents(true);
-      this.logger.info('windows_index setAlwaysOnTop in mouse-detect-provider');
-      window.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.MOUSE_DETECT_DEBUGGER_LEVEL);
-      window.addObserver({
-        onReady: function onReady() {
-          var AreaDebugger = (0, _mobxReact.observer)(function () {
-            var content = Array.from(_this._detectAreas.keys()).map(function (areaId) {
-              var list = _this._detectAreas.get(areaId);
-              return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                "data-area-id": areaId,
-                children: list.map(function (item, index) {
-                  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                    style: {
-                      width: item.width,
-                      height: item.height,
-                      position: 'absolute',
-                      top: item.y,
-                      left: item.x,
-                      backgroundColor: 'rgba(10,10,10,0.5)'
-                    }
-                  }, index);
-                })
-              }, areaId);
-            });
-            return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              className: "fcr-ui-mouse-detect-debugger",
-              children: content
-            });
-          });
-          _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(AreaDebugger, {}), window.getRootNode());
-        }
-      });
-    }
+    // this._debug(true);
   }
   return (0, _createClass2["default"])(FcrUIMouseDetectProviderImpl, [{
     key: "_detectAreas",
@@ -191,12 +181,9 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
   }, {
     key: "setDisplayId",
     value: function setDisplayId(displayId) {
-      var display = this._renderer.getAllDisplays().find(function (d) {
-        return d.id === displayId;
-      });
-      if (display) {
-        var window = this._windowProvder.getWindowById(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG);
-        window.setBounds(display.bounds);
+      this._displayId = displayId;
+      if (this._isDebug) {
+        this._setDebugWindowOffset();
       }
     }
   }, {
@@ -284,6 +271,44 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
         });
       }
     }
+
+    // debug purpose
+  }, {
+    key: "_debug",
+    value: function _debug(enable) {
+      if (enable) {
+        this._isDebug = true;
+        this._windowProvder.setWindowOptions(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG, {
+          frame: false,
+          transparent: true,
+          backgroundColor: '#00000000',
+          title: 'MouseDetectDebugger'
+        });
+        var window = this._windowProvder.getWindowById(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG);
+        this._setDebugWindowOffset();
+        window.show();
+        window.setIgnoreMouseEvents(true);
+        window.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.MOUSE_DETECT_DEBUGGER_LEVEL);
+        window.addObserver(this._debugWindowObserver);
+      } else {
+        this._isDebug = false;
+        var _window = this._windowProvder.getWindowById(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG);
+        _window.removeObserver(this._debugWindowObserver);
+        _window.close();
+      }
+    }
+  }, {
+    key: "_setDebugWindowOffset",
+    value: function _setDebugWindowOffset() {
+      var _this3 = this;
+      var display = this._renderer.getAllDisplays().find(function (d) {
+        return d.id === _this3._displayId;
+      });
+      if (display) {
+        var window = this._windowProvder.getWindowById(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG);
+        window.setBounds(display.bounds);
+      }
+    }
   }]);
 }();
 _FcrUIMouseDetectProviderImpl = FcrUIMouseDetectProviderImpl;

package/lib/providers/multi-display-provider.d.ts

@@ -1,5 +1,5 @@
 import { FcrSharingControl } from 'fcr-core/lib/type';
-import { FcrUIDisplayContentDistribution, FcrUIDisplayDistributionContentType, FcrUIDisplayState, FcrUIMainWindowRenderer, FcrUIMultiDisplayObserver } from '../modules/secondary-window/type';
+import { FcrUIDisplayContentDistribution, FcrUIDisplayDistributionContentType, FcrUIDisplayState, FcrUIMultiDisplayObserver } from '../modules/secondary-window/type';
 import { FcrUIManagedObject } from '../object-manager';
 import { FcrUISharedMemberDataSource } from '../shared-data/member-data';
 import { FcrUISharedSettingDataSource } from '../shared-data/setting';
@@ -28,7 +28,7 @@ export interface FcrUIMultiDisplayProvider {
     showMainWindowInIndexLeastDisplay(options?: {
         displayOfCurrentSharingBounds?: Electron.Display;
         /** 是否最大化应用窗口，不是 mac 下的应用全屏 */
-        maximize?: boolean;
+        isMaximized?: boolean;
     }): void;
     /** 如果屏幕共享和主窗口在同一个显示器，则将主窗口移动到排序最小的显示器中，共享屏幕（窗口）所在的显示器除外 */
     moveMainWindowToIndexLeastDisplay(): void;
@@ -48,7 +48,6 @@ export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayP
     private _screenShareProvider;
     private _mainWindow;
     private _renderer;
-    private _fcrUIMainWindowRenderer;
     private _contentDistribution;
     private _isLocalUserNotScreenSharing;
     private _screenShareObserver;
@@ -66,7 +65,7 @@ export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayP
     get mianWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
     get secondaryWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
     get isLocalCameraInSecondaryWindow(): boolean;
-    constructor({ sharedSettingDataSource, sharedMemberDataSource, sharedVideoWindowDataSource, windowProvider, renderer, sharingControl, whiteboardProvider, fcrUIMainWindowRenderer, screenShareProvider, }: {
+    constructor({ sharedSettingDataSource, sharedMemberDataSource, sharedVideoWindowDataSource, windowProvider, renderer, sharingControl, whiteboardProvider, screenShareProvider, }: {
         sharedSettingDataSource: FcrUISharedSettingDataSource;
         sharedMemberDataSource: FcrUISharedMemberDataSource;
         sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
@@ -74,7 +73,6 @@ export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayP
         renderer: FcrUIRendererWrapper;
         sharingControl: FcrSharingControl;
         whiteboardProvider: FcrUIBoardShareProvider;
-        fcrUIMainWindowRenderer: FcrUIMainWindowRenderer;
         screenShareProvider: FcrUIScreenShareProvider;
     });
     addObserver(observer: FcrUIMultiDisplayObserver): void;

package/lib/providers/multi-display-provider.js

@@ -100,7 +100,6 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
       renderer = _ref.renderer,
       sharingControl = _ref.sharingControl,
       whiteboardProvider = _ref.whiteboardProvider,
-      fcrUIMainWindowRenderer = _ref.fcrUIMainWindowRenderer,
       screenShareProvider = _ref.screenShareProvider;
     (0, _classCallCheck2["default"])(this, FcrUIMultiDisplayProviderImpl);
     (0, _defineProperty2["default"])(this, "_logger", (_initProto(this), (0, _logger.createLogger)({
@@ -148,7 +147,6 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
     this._sharingControl = sharingControl;
     this._mainWindow = windowProvider.getCurrentWindow();
     this._renderer = renderer;
-    this._fcrUIMainWindowRenderer = fcrUIMainWindowRenderer;
     this._screenShareProvider = screenShareProvider;
     this._renderer.addEventListener(this._handleDisplayCountUpdated);
     this._screenShareProvider.addObserver(this._screenShareObserver);
@@ -527,13 +525,11 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
       this._observers.notifyObservers('onContentDistributionUpdated', distribution);
       if (distribution.secondaryWindow.type === 'hidden' && !this._isHidden) {
         this._whiteboardProvider.setIsDualDisplayMode(false);
-        this._fcrUIMainWindowRenderer.removeAllObservers();
         this._isHidden = true;
         return;
       }
       if (distribution.secondaryWindow.type !== 'hidden' && this._isHidden) {
         this._whiteboardProvider.setIsDualDisplayMode(true);
-        this._fcrUIMainWindowRenderer.addObserver(this._whiteboardProvider.boardBarControl.toolbarStateObserver);
         this._isHidden = false;
         return;
       }
@@ -555,11 +551,6 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
       }
       this._setDisplayState(state);
       this._whiteboardProvider.setIsDualDisplayMode(state.isSecondaryWindowModeEnabled);
-      if (state.isSecondaryWindowModeEnabled) {
-        this._fcrUIMainWindowRenderer.addObserver(this._whiteboardProvider.boardBarControl.toolbarStateObserver);
-      } else {
-        this._fcrUIMainWindowRenderer.removeAllObservers();
-      }
     }
   }, {
     key: "_handleScreenSharingState",

package/lib/providers/room-provider/room-provider.d.ts

@@ -1,7 +1,7 @@
 import { FcrCoreEngine } from 'fcr-core';
 import { FcrBaseRoomControl, FcrMainRoomControl, FcrRoomType, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrLiveStreamingConfig, FcrLiveStreamingState, FcrRecordingState, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIConnectionObserver, FcrUIExitReason, FcrUIRoomObserver, FcrUISceneConfig } from '../../type';
+import { FcrUIExitReason, FcrUIRoomObserver, FcrUISceneConfig } from '../../type';
 import { FcrUIMessageProvider } from '../message/type';
 import { FcrUISharedInterpreterDataSource } from '../../shared-data/interpreter';
 import { FcrUIManagedObject } from '../../object-manager';
@@ -75,12 +75,7 @@ export interface FcrUIRoomProvider {
     addObserver(observer: FcrUIRoomObserver): void;
     removeObserver(observer: FcrUIRoomObserver): void;
 }
-export interface FcrUIConnectionProvider {
-    addObserver(observer: FcrUIConnectionObserver): void;
-    removeObserver(observer: FcrUIConnectionObserver): void;
-}
 export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
-    private _eventProvider;
     private _sceneConfig;
     private _engine;
     private _messageProvider;
@@ -99,7 +94,7 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     accessor liveStreamingState: FcrLiveStreamingState;
     accessor liveStreamingConfig: FcrLiveStreamingConfig | undefined;
     accessor cloudRecordingState: FcrRecordingState;
-    constructor(_eventProvider: FcrUIEventProvider, _sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _messageProvider: FcrUIMessageProvider);
+    constructor(_sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _messageProvider: FcrUIMessageProvider);
     get currentRoomControl(): FcrBaseRoomControl;
     get waitingRoomManager(): FcrUIWaitingRoomControlManager;
     setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
@@ -113,13 +108,6 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     private _getJoinRoomOption;
     private _initBaseRoomState;
 }
-export declare class FcrUIConnectionProviderImpl implements FcrUIConnectionProvider, FcrUIManagedObject {
-    private _engine;
-    constructor(_engine: FcrCoreEngine);
-    addObserver(observer: FcrUIConnectionObserver): void;
-    removeObserver(observer: FcrUIConnectionObserver): void;
-    release(): void;
-}
 export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomControlProvider, FcrUIManagedObject {
     private _mainRoomControl;
     private _sharedInterpreterDataSource;
@@ -159,6 +147,7 @@ export declare class FcrUIWaitingRoomControlProviderImpl implements FcrUIWaiting
 }
 export declare class FcrUICurrentRoomControlProviderImpl implements FcrUICurrentRoomControlProvider, FcrUIManagedObject {
     private _currentRoomControl;
+    private _roomType;
     constructor(_currentRoomControl: FcrBaseRoomControl);
     get currentRoomControl(): FcrBaseRoomControl;
     get currentRoomType(): FcrRoomType;

package/lib/providers/room-provider/room-provider.js

@@ -23,7 +23,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIWaitingRoomControlProviderImpl = exports.FcrUIRoomProviderImpl = exports.FcrUIMainRoomControlProviderImpl = exports.FcrUICurrentRoomControlProviderImpl = exports.FcrUIConnectionProviderImpl = void 0;
+exports.FcrUIWaitingRoomControlProviderImpl = exports.FcrUIRoomProviderImpl = exports.FcrUIMainRoomControlProviderImpl = exports.FcrUICurrentRoomControlProviderImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
@@ -99,7 +99,7 @@ var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 _ref = (_initBaseRoomStateDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/function () {
-  function FcrUIRoomProviderImpl(_eventProvider, _sceneConfig, _engine, _messageProvider) {
+  function FcrUIRoomProviderImpl(_sceneConfig, _engine, _messageProvider) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIRoomProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
@@ -166,12 +166,9 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     _classPrivateFieldInitSpec(this, _A, _init_liveStreamingState(this, _type3.FcrLiveStreamingState.STOPPED));
     _classPrivateFieldInitSpec(this, _B, _init_liveStreamingConfig(this, undefined));
     _classPrivateFieldInitSpec(this, _C, _init_cloudRecordingState(this, _type3.FcrRecordingState.Stopped));
-    this._eventProvider = _eventProvider;
     this._sceneConfig = _sceneConfig;
     this._engine = _engine;
     this._messageProvider = _messageProvider;
-    //@ts-ignore
-    window.roomStore = this;
     this._baseRoomControlObserver = {
       onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
         if (state === _type3.FcrRoomState.Closed) {
@@ -248,6 +245,7 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     key: "release",
     value: function release() {
       var _this$_currentRoomCon;
+      this._roomRouter.leaveRoom();
       (_this$_currentRoomCon = this._currentRoomControl) === null || _this$_currentRoomCon === void 0 || _this$_currentRoomCon.leave();
       this._currentRoomControl = undefined;
       this.setIsSelfEndMeeting(false);
@@ -349,26 +347,6 @@ _init_liveStreamingState = _applyDecs$e[0];
 _init_liveStreamingConfig = _applyDecs$e[1];
 _init_cloudRecordingState = _applyDecs$e[2];
 _initProto = _applyDecs$e[3];
-var FcrUIConnectionProviderImpl = exports.FcrUIConnectionProviderImpl = /*#__PURE__*/function () {
-  function FcrUIConnectionProviderImpl(_engine) {
-    (0, _classCallCheck2["default"])(this, FcrUIConnectionProviderImpl);
-    this._engine = _engine;
-  }
-  return (0, _createClass2["default"])(FcrUIConnectionProviderImpl, [{
-    key: "addObserver",
-    value: function addObserver(observer) {
-      this._engine.addObserver(observer);
-    }
-  }, {
-    key: "removeObserver",
-    value: function removeObserver(observer) {
-      this._engine.removeObserver(observer);
-    }
-  }, {
-    key: "release",
-    value: function release() {}
-  }]);
-}();
 var _A2 = /*#__PURE__*/new WeakMap();
 var _B2 = /*#__PURE__*/new WeakMap();
 _ref2 = (_initUserMapDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "_privilegeProvider");
@@ -740,6 +718,7 @@ var FcrUICurrentRoomControlProviderImpl = exports.FcrUICurrentRoomControlProvide
   function FcrUICurrentRoomControlProviderImpl(_currentRoomControl) {
     (0, _classCallCheck2["default"])(this, FcrUICurrentRoomControlProviderImpl);
     this._currentRoomControl = _currentRoomControl;
+    this._roomType = this._currentRoomControl.getRoomInfo().roomType;
   }
   return (0, _createClass2["default"])(FcrUICurrentRoomControlProviderImpl, [{
     key: "currentRoomControl",
@@ -749,7 +728,7 @@ var FcrUICurrentRoomControlProviderImpl = exports.FcrUICurrentRoomControlProvide
   }, {
     key: "currentRoomType",
     get: function get() {
-      return this._currentRoomControl.getRoomInfo().roomType;
+      return this._roomType;
     }
   }, {
     key: "release",

package/lib/providers/screen-share/stream-state-sync.js

@@ -115,7 +115,7 @@ var FcrUIScreenStreamSync = exports.FcrUIScreenStreamSync = /*#__PURE__*/functio
               return _context2.abrupt("return");
             case 1:
               if (!true) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
               if (!this._released) {
@@ -128,34 +128,41 @@ var FcrUIScreenStreamSync = exports.FcrUIScreenStreamSync = /*#__PURE__*/functio
               _context2.next = 3;
               return this._sharingControl.stop();
             case 3:
-              return _context2.abrupt("continue", 8);
+              return _context2.abrupt("continue", 9);
             case 4:
               _context2.prev = 4;
               _t2 = _context2["catch"](2);
+              if (!(_t2 instanceof _type.FcrError && _t2.code === 720404300)) {
+                _context2.next = 5;
+                break;
+              }
+              this.logger.error("the screen share stream does not exist,");
+              return _context2.abrupt("continue", 9);
+            case 5:
               this.logger.error("failed to stop screen share stream, error: ".concat(_t2, ", retry in 1000ms"), _t2);
-              _context2.next = 5;
+              _context2.next = 6;
               return new Promise(function (resolve) {
                 return setTimeout(resolve, 1000);
               });
-            case 5:
-              _context2.prev = 5;
+            case 6:
+              _context2.prev = 6;
               if (this._myCurrentScreenShareStreamId) {
-                _context2.next = 6;
+                _context2.next = 7;
                 break;
               }
-              return _context2.abrupt("continue", 8);
-            case 6:
-              return _context2.finish(5);
+              return _context2.abrupt("continue", 9);
             case 7:
+              return _context2.finish(6);
+            case 8:
               _context2.next = 1;
               break;
-            case 8:
-              this._myCurrentScreenShareStreamId = null;
             case 9:
+              this._myCurrentScreenShareStreamId = null;
+            case 10:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[2, 4, 5, 7]]);
+        }, _callee2, this, [[2, 4, 6, 8]]);
       }));
       function stopScreenStream() {
         return _stopScreenStream.apply(this, arguments);

package/lib/providers/window/main-window.d.ts

@@ -11,8 +11,6 @@ export declare class FcrUICurrentWindowImpl implements FcrUICurrentWindow, FcrUI
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _browserWindowProxy;
-    private _hangDetectionTimer;
-    private readonly _HANG_DETECTION_TIMEOUT;
     private _browserWindowListeners;
     private _preventClose;
     get browserWindow(): BrowserWindow;
@@ -45,7 +43,4 @@ export declare class FcrUICurrentWindowImpl implements FcrUICurrentWindow, FcrUI
     release(): void;
     private _setupEventListeners;
     private _addLogObserver;
-    private _handleUnresponsive;
-    private _handleResponsive;
-    private _clearHangDetectionTimer;
 }

package/lib/providers/window/main-window.js

@@ -41,7 +41,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.FcrUICurrentWindowImpl = void 0;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
-require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -68,9 +67,6 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
     })));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_browserWindowProxy", null);
-    (0, _defineProperty2["default"])(this, "_hangDetectionTimer", null);
-    (0, _defineProperty2["default"])(this, "_HANG_DETECTION_TIMEOUT", 60 * 1000);
-    // 1分钟（毫s秒）
     (0, _defineProperty2["default"])(this, "_browserWindowListeners", {
       onShow: function onShow() {
         _this._observable.notifyObservers('onVisibilityChanged', true);
@@ -86,12 +82,6 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
       },
       onClose: function onClose() {
         _this._observable.notifyObservers('onClose');
-      },
-      onUnresponsive: function onUnresponsive() {
-        _this._handleUnresponsive();
-      },
-      onResponsive: function onResponsive() {
-        _this._handleResponsive();
       }
     });
     (0, _defineProperty2["default"])(this, "_preventClose", false);
@@ -235,8 +225,6 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
   }, {
     key: "release",
     value: function release() {
-      // 清理hang检测计时器
-      this._clearHangDetectionTimer();
       if (this._browserWindowProxy && !this._browserWindowProxy.isDestroyed()) {
         this._browserWindowProxy.removeAllListeners();
       }
@@ -259,44 +247,12 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
       this._browserWindowProxy.addListener('resized', this._browserWindowListeners.onResized);
       this._browserWindowProxy.addListener('moved', this._browserWindowListeners.onMoved);
       this._browserWindowProxy.addListener('close', this._browserWindowListeners.onClose);
-      this._browserWindowProxy.addListener('unresponsive', this._browserWindowListeners.onUnresponsive);
-      this._browserWindowProxy.addListener('responsive', this._browserWindowListeners.onResponsive);
     }
   }, {
     key: "_addLogObserver",
     value: function _addLogObserver() {
       this._observable.addObserver((0, _logger.generateLogObserver)(this.logger, ['onFocused', 'onBlurred', 'onBoundsChanged', 'onVisibilityChanged', 'onReady', 'onClose']));
     }
-  }, {
-    key: "_handleUnresponsive",
-    value: function _handleUnresponsive() {
-      var _this2 = this;
-      this.logger.warn('Window became unresponsive, starting hang detection timer');
-      this._clearHangDetectionTimer();
-      this._hangDetectionTimer = setTimeout(function () {
-        _this2.logger.error('Window has been unresponsive for 1 minute, forcing application exit');
-        try {
-          // app.quit();
-        } catch (error) {
-          _this2.logger.error('Failed to exit application gracefully:', error);
-          // process.exit(1);
-        }
-      }, this._HANG_DETECTION_TIMEOUT);
-    }
-  }, {
-    key: "_handleResponsive",
-    value: function _handleResponsive() {
-      this.logger.info('Window became responsive again, clearing hang detection timer');
-      this._clearHangDetectionTimer();
-    }
-  }, {
-    key: "_clearHangDetectionTimer",
-    value: function _clearHangDetectionTimer() {
-      if (this._hangDetectionTimer) {
-        clearTimeout(this._hangDetectionTimer);
-        this._hangDetectionTimer = null;
-      }
-    }
   }]);
 }();
 _FcrUICurrentWindowImpl = FcrUICurrentWindowImpl;

package/lib/providers/window/renderer-window.d.ts

@@ -15,6 +15,7 @@ export declare class FcrUIWindowImpl implements FcrUIWindow, FcrUIManagedObject
     private _preventClose;
     private _visible;
     private _showInactive;
+    private _isClosed;
     private _isBrowserWindowReady;
     private _ignoreMouseEvents?;
     private _ignoreMouseEventsOptions?;

package/lib/providers/window/renderer-window.js

@@ -75,6 +75,7 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_preventClose", false);
     (0, _defineProperty2["default"])(this, "_visible", false);
     (0, _defineProperty2["default"])(this, "_showInactive", false);
+    (0, _defineProperty2["default"])(this, "_isClosed", false);
     // inner state
     (0, _defineProperty2["default"])(this, "_isBrowserWindowReady", false);
     (0, _defineProperty2["default"])(this, "_browserWindowListeners", {
@@ -254,7 +255,10 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
   }, {
     key: "close",
     value: function close() {
-      this.browserWindow.close();
+      this._isClosed = true;
+      if (this._isBrowserWindowReady) {
+        this.browserWindow.close();
+      }
     }
   }, {
     key: "isFullScreen",
@@ -442,6 +446,10 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
     key: "_synBrowserWindowStateToInnerState",
     value: function _synBrowserWindowStateToInnerState() {
       this.browserWindow.webContents.setBackgroundThrottling(false);
+      if (this._isClosed) {
+        this.browserWindow.close();
+        return;
+      }
       if (this._visible) {
         this.browserWindowProxy.setPreventClose(this._preventClose);
         if (this._showInactive) {

package/lib/scenes/main-scene.js

@@ -618,8 +618,6 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.REVOKE_HOST);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.MUTE_ALL);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONTROL_BAR_LEAVE_MEETING);
-      dialogProvider.closeDialog(_constant.FcrUIDialogKey.TOAST);
-      dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONFIRM);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.END_MEETING);
       dialogProvider.closeAllConfirms();
     }

package/lib/ui-scene.js

@@ -72,6 +72,7 @@ var _logger = require("fcr-core/lib/utilities/logger");
 var _logger2 = require("./utilities/logger");
 var _objectManager = require("./object-manager");
 var _env = require("agora-foundation/lib/utilities/env");
+var _platform = require("./utilities/platform");
 var _FcrUIDefaultScene;
 var _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 set(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 k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(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 s(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)]; } }; }
@@ -186,7 +187,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       var eventProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_EVENT_PROVIDER);
       var messageProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
       this._uiManager = new _uiManager.FcrUIManager(this._config, this._dom, this._creatorConfig.parameters);
-      var roomProvider = new _roomProvider.FcrUIRoomProviderImpl(eventProvider, this._config, engine, messageProvider);
+      var roomProvider = new _roomProvider.FcrUIRoomProviderImpl(this._config, engine, messageProvider);
       this._objectManager.setObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER, roomProvider);
       var uiManager = this._uiManager;
       this._addObservers(uiManager);
@@ -281,7 +282,8 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
               onConfirm: function onConfirm() {
                 dialogProvider.closeDialog(_constant.FcrUIDialogKey.END_MEETING);
                 observable.notifyObservers('onExited', sceneConfig.roomId, _type.FcrUIExitReason.CLOSE_ROOM);
-              }
+              },
+              alwaysOnTop: (0, _platform.isWindows)()
             });
           }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.7.6",
+  "version": "3.7.7-rc.1",
   "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.6",
-    "agora-ui-foundation": "~3.7.6",
+    "agora-foundation": "~3.7.7-rc.1",
+    "agora-ui-foundation": "~3.7.7-rc.1",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "~3.7.6",
+    "fcr-core": "~3.7.7-rc.1",
     "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.6",
+    "agora-toolchain": "~3.7.7-rc.1",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",