fcr-ui-scene 3.7.8 → 3.7.9-alpha

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

@@ -145,9 +145,6 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
   }, {
     key: "setAlwaysOnTop",
     value: function setAlwaysOnTop(flag) {
-      //  这里目前没有地方调用，因为annotation调用了setAlwaysOnTop,并且设置了pop-up-menu
-      // 窗口在windows上设置的是pop-up-menu,看看是不是要成对出现
-      this.logger.info('windows_index setAlwaysOnTop in main-window');
       this.browserWindow.setAlwaysOnTop(flag);
     }
   }, {

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

@@ -22,6 +22,8 @@ export declare class FcrUIWindowImpl implements FcrUIWindow, FcrUIManagedObject
     private _alwaysOnTop?;
     private _alwaysOnTopLevel?;
     private _relativeLevel?;
+    private _visibleOnAllWorkspaces?;
+    private _visibleOnAllWorkspacesOptions?;
     private _resizable?;
     private _aspectRatio?;
     private _minimumSize?;
@@ -56,6 +58,7 @@ export declare class FcrUIWindowImpl implements FcrUIWindow, FcrUIManagedObject
         forward: boolean;
     }): void;
     setAlwaysOnTop(flag: boolean, level?: 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver', relativeLevel?: number): void;
+    setVisibleOnAllWorkspaces(visible: boolean, options?: Electron.VisibleOnAllWorkspacesOptions): void;
     setTitle(title: string): void;
     getTitle(): string;
     maximize(): void;

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

@@ -116,7 +116,8 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
       dom.append(_this.rootNode);
       _this._rendererWindow = rendererWindow;
       _this._windowId = windowId;
-      _this.logger.info("initialized, windowId: ".concat(windowId, ", windowName: ").concat(windowName));
+      _this.logger.info("renderer window is opened, windowId: ".concat(windowId, ", windowName: ").concat(windowName));
+
       // 创建代理对象，使用从 window 对象获取的 ID
       _this._browserWindowProxy = renderer.createWindowProxy(windowId);
       _this._setupEventListeners();
@@ -141,6 +142,7 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
     }, options);
     this._addLogObserver();
     this._rootNode = document.createElement('div');
+    this.logger.info("initialized, windowName: ".concat(windowName));
   }
   return (0, _createClass2["default"])(FcrUIWindowImpl, [{
     key: "setResizable",
@@ -289,10 +291,18 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
       this._alwaysOnTopLevel = level;
       this._relativeLevel = relativeLevel;
       if (this._isBrowserWindowReady) {
-        this.logger.info('windows_index setAlwaysOnTop in renderer-window');
         this.browserWindow.setAlwaysOnTop(flag, level, relativeLevel);
       }
     }
+  }, {
+    key: "setVisibleOnAllWorkspaces",
+    value: function setVisibleOnAllWorkspaces(visible, options) {
+      this._visibleOnAllWorkspaces = visible;
+      this._visibleOnAllWorkspacesOptions = options;
+      if (this._isBrowserWindowReady) {
+        this.browserWindow.setVisibleOnAllWorkspaces(visible, options);
+      }
+    }
   }, {
     key: "setTitle",
     value: function setTitle(title) {
@@ -330,7 +340,10 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
   }, {
     key: "isVisible",
     value: function isVisible() {
-      return this.browserWindow.isVisible();
+      if (this._isBrowserWindowReady) {
+        return this.browserWindow.isVisible();
+      }
+      return this._visible;
     }
   }, {
     key: "show",
@@ -447,62 +460,92 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
     value: function _synBrowserWindowStateToInnerState() {
       this.browserWindow.webContents.setBackgroundThrottling(false);
       if (this._isClosed) {
+        this.logger.info('window is marked as closed, closing the browser window.');
         this.browserWindow.close();
         return;
       }
+
+      // 重置 visibleOnAllWorkspaces
+      this.browserWindow.setVisibleOnAllWorkspaces(false, {
+        skipTransformProcessType: true
+      });
+      if ((0, _isBoolean["default"])(this._visibleOnAllWorkspaces)) {
+        var _this$_visibleOnAllWo;
+        this.logger.info('setting the browser window visible on all workspaces.');
+        this.browserWindow.setVisibleOnAllWorkspaces(this._visibleOnAllWorkspaces, {
+          visibleOnFullScreen: (_this$_visibleOnAllWo = this._visibleOnAllWorkspacesOptions) === null || _this$_visibleOnAllWo === void 0 ? void 0 : _this$_visibleOnAllWo.visibleOnFullScreen,
+          skipTransformProcessType: true
+        });
+      }
       if (this._visible) {
+        this.logger.info('window is marked as visible, showing the browser window.');
         this.browserWindowProxy.setPreventClose(this._preventClose);
         if (this._showInactive) {
+          this.logger.info('showing the browser window as inactive.');
           this.browserWindow.showInactive();
         } else {
+          this.logger.info('showing and focusing the browser window.');
           this.browserWindow.show();
           this.browserWindow.focus();
           this.browserWindow.moveTop();
         }
       } else {
+        this.logger.info('window is marked as hidden, hiding the browser window.');
         this.browserWindow.hide();
       }
       if (this._backgroundColor) {
+        this.logger.info('setting the browser window background color.');
         this.browserWindow.setBackgroundColor(this._backgroundColor);
       }
       if (this._bounds) {
+        this.logger.info('setting the browser window bounds.');
         this.browserWindow.setBounds(this._bounds);
       }
       if (this._title) {
+        this.logger.info('setting the browser window title.');
         this.browserWindow.setTitle(this._title);
       }
       if ((0, _isBoolean["default"])(this._ignoreMouseEvents)) {
+        this.logger.info('setting the browser window ignore mouse events.');
         this.browserWindow.setIgnoreMouseEvents(this._ignoreMouseEvents, this._ignoreMouseEventsOptions);
       }
       if ((0, _isBoolean["default"])(this._alwaysOnTop)) {
+        this.logger.info('setting the browser window always on top.');
         this.browserWindow.setAlwaysOnTop(this._alwaysOnTop, this._alwaysOnTopLevel, this._relativeLevel);
       }
       if ((0, _isBoolean["default"])(this._resizable)) {
+        this.logger.info('setting the browser window resizable.');
         this.browserWindow.setResizable(this._resizable);
       }
       if ((0, _isBoolean["default"])(this._aspectRatio)) {
+        this.logger.info('setting the browser window aspect ratio.');
         this.browserWindow.setAspectRatio(this._aspectRatio);
       }
       if (this._minimumSize) {
         var _this$_minimumSize = this._minimumSize,
           width = _this$_minimumSize.width,
           height = _this$_minimumSize.height;
+        this.logger.info('setting the browser window minimum size.');
         this.browserWindow.setMinimumSize(width, height);
       }
       if (this._maximumSize) {
         var _this$_maximumSize = this._maximumSize,
           _width = _this$_maximumSize.width,
           _height = _this$_maximumSize.height;
+        this.logger.info('setting the browser window maximum size.');
         this.browserWindow.setMaximumSize(_width, _height);
       }
       if ((0, _isBoolean["default"])(this._isMaximized)) {
         if (this._isMaximized) {
+          this.logger.info('maximizing the browser window.');
           this.browserWindow.maximize();
         } else {
+          this.logger.info('unmaximizing the browser window.');
           this.browserWindow.unmaximize();
         }
       }
       if ((0, _isBoolean["default"])(this._fullscreen)) {
+        this.logger.info('setting the browser window fullscreen state.');
         this.browserWindow.setFullScreen(this._fullscreen);
       }
     }
@@ -514,7 +557,7 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
   }]);
 }();
 _FcrUIWindowImpl = FcrUIWindowImpl;
-var _applyDecs$e = _applyDecs(_FcrUIWindowImpl, [[_log.trace, 2, "moveTop"], [_log.trace, 2, "setPosition"], [_log.trace, 2, "getPosition"], [_log.trace, 2, "getRootNode"], [_log.trace, 2, "close"], [_log.trace, 2, "isFullScreen"], [_log.trace, 2, "setFullScreen"], [_log.trace, 2, "setIgnoreMouseEvents"], [_log.trace, 2, "setAlwaysOnTop"], [_log.trace, 2, "setTitle"], [_log.trace, 2, "getTitle"], [_log.trace, 2, "maximize"], [_log.trace, 2, "unmaximize"], [_log.trace, 2, "isMaximized"], [_log.trace, 2, "isVisible"], [_log.trace, 2, "show"], [_log.trace, 2, "hide"], [_log.trace, 2, "focus"], [_log.trace, 2, "setBounds"], [_log.trace, 2, "getBounds"], [_log.trace, 2, "setPreventClose"], [_log.trace, 2, "isPreventClose"], [_log.trace, 2, "addObserver"], [_log.trace, 2, "removeObserver"], [_log.trace, 2, "release"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIWindowImpl, [[_log.trace, 2, "moveTop"], [_log.trace, 2, "setPosition"], [_log.trace, 2, "getPosition"], [_log.trace, 2, "getRootNode"], [_log.trace, 2, "close"], [_log.trace, 2, "isFullScreen"], [_log.trace, 2, "setFullScreen"], [_log.trace, 2, "setIgnoreMouseEvents"], [_log.trace, 2, "setAlwaysOnTop"], [_log.trace, 2, "setVisibleOnAllWorkspaces"], [_log.trace, 2, "setTitle"], [_log.trace, 2, "getTitle"], [_log.trace, 2, "maximize"], [_log.trace, 2, "unmaximize"], [_log.trace, 2, "isMaximized"], [_log.trace, 2, "isVisible"], [_log.trace, 2, "show"], [_log.trace, 2, "hide"], [_log.trace, 2, "focus"], [_log.trace, 2, "setBounds"], [_log.trace, 2, "getBounds"], [_log.trace, 2, "setPreventClose"], [_log.trace, 2, "isPreventClose"], [_log.trace, 2, "addObserver"], [_log.trace, 2, "removeObserver"], [_log.trace, 2, "release"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/window/type.d.ts

@@ -61,6 +61,7 @@ export interface FcrUIWindow {
         forward: boolean;
     }): void;
     setAlwaysOnTop(flag: boolean, level?: 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver', relativeLevel?: number): void;
+    setVisibleOnAllWorkspaces(visible: boolean, options?: Electron.VisibleOnAllWorkspacesOptions): void;
     setPreventClose(prevent: boolean): void;
     setResizable(resizable: boolean): void;
     setAspectRatio(aspectRatio: number): void;

package/lib/scenes/main-scene.d.ts

@@ -4,6 +4,7 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _isWaitingRoomNotify;
     private _roomObserver;
+    private _windowObserver;
     constructor(args: FcrMainUISceneArgs);
     mount(dom: HTMLElement): void;
     unmount(dom: HTMLElement): void;

package/lib/scenes/main-scene.js

@@ -75,6 +75,8 @@ var _shareScreenSelection = require("../modules/dialog/dialogs/share-screen-sele
 var _mainScene3 = require("../modules/state-bar/main-scene");
 var _muteAll = require("../modules/dialog/dialogs/mute-all");
 var _controlBarLeaveMeeting = require("../modules/dialog/dialogs/control-bar-leave-meeting");
+var _platform = require("../utilities/platform");
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -140,6 +142,26 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
         waitingRoomUserControl.addObserver(waitingRoomUserObserver);
       }
     };
+    _this._windowObserver = {
+      onWindowCreated: function onWindowCreated(dialogKey, _, window) {
+        if (dialogKey === _constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION) {
+          window.setAlwaysOnTop(true, (0, _platform.isMac)() ? 'floating' : 'normal');
+          if ((0, _platform.isMac)()) {
+            window.setVisibleOnAllWorkspaces(true, {
+              visibleOnFullScreen: true
+            });
+          }
+        }
+        if (dialogKey === _constant.FcrUIDialogKey.LEAVE_MEETING) {
+          window.setAlwaysOnTop(true, (0, _platform.isMac)() ? 'floating' : 'normal');
+          if ((0, _platform.isMac)()) {
+            window.setVisibleOnAllWorkspaces(true, {
+              visibleOnFullScreen: true
+            });
+          }
+        }
+      }
+    };
     return _this;
   }
   (0, _inherits2["default"])(FcrMainUIScene, _FcrBaseUIScene);
@@ -505,14 +527,23 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var objectManager = this.objectManager;
       var roomProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
       roomProvider.addObserver(this._roomObserver);
+      if ((0, _env.isElectron)()) {
+        var windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
+        windowProvider.addObserver(this._windowObserver);
+      }
       this._runSettingConfig();
     }
   }, {
     key: "onNodeWillInactive",
     value: function onNodeWillInactive() {
       this._closeDialogs();
-      var roomProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
+      var objectManager = this.objectManager;
+      var roomProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
       roomProvider.removeObserver(this._roomObserver);
+      if ((0, _env.isElectron)()) {
+        var windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
+        windowProvider.removeObserver(this._windowObserver);
+      }
     }
   }, {
     key: "_runSettingConfig",

package/lib/shared-data/setting.js

@@ -98,7 +98,7 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
         displayedMaxAttendees: 16,
         autoAdjustmentSpeakerVolume: true,
         autoAdjustmentMicrophoneVolume: (0, _env.isElectron)(),
-        noiseReduce: _type.FcrUIAiDenoiseLevel.LOW,
+        noiseReduce: _type.FcrUIAiDenoiseLevel.HIGH,
         recordingPath: '',
         videoHD: false,
         videoLowLight: false,

package/lib/utilities/default-config.js

@@ -51,7 +51,7 @@ var screenCaptureClearityConfig = exports.screenCaptureClearityConfig = {
     height: 1080
   },
   frameRate: 15,
-  bitrate: 1800,
+  bitrate: 1500,
   isMirror: false
 };
 var screenCaptureSmoothConfig = exports.screenCaptureSmoothConfig = {

package/lib/utilities/logger.js

@@ -48,7 +48,7 @@ var generateLogObserver = exports.generateLogObserver = function generateLogObse
   return observer;
 };
 window.addEventListener('error', function (e) {
-  getLogger().error('window error event:', JSON.stringify(e));
+  getLogger().error('window error event:', JSON.stringify(e), e.error, e.message, e.lineno, e.colno, e.filename);
 });
 window.addEventListener('unhandledrejection', function (e) {
   getLogger().error('window unhandledrejection event:', e.reason);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.7.8",
+  "version": "3.7.9-alpha",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -21,14 +21,14 @@
     "@electron/remote": "2.0.1",
     "@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.8",
-    "agora-ui-foundation": "3.7.8",
+    "agora-electron-sdk": "4.3.2-build.201-rc.1",
+    "agora-foundation": "3.7.9-alpha",
+    "agora-ui-foundation": "3.7.9-alpha",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "3.7.8",
+    "fcr-core": "3.7.9-alpha",
     "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.8",
+    "agora-toolchain": "3.7.9-alpha",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",

package/public/index.html

@@ -157,6 +157,7 @@
         }
       }
     };
+
     const setFullScreenFailureComp = (visible, errorMsg) => {
       setLoading(false);
       const dom = document.querySelector('#fcr-launch-failure-comp');
@@ -176,154 +177,6 @@
         }
       }
     };
-
-    (async () => {
-      let creator;
-      let uiScene;
-      let sendExitedEventFlag = true;
-      window.cppSdkHelper.onCreatorInit = (config) => {
-        if (creator) {
-          creator.release();
-          creator = undefined;
-        }
-
-        creator = new FcrUIScene.FcrUISceneCreator(config);
-      };
-
-      window.cppSdkHelper.onSettingOpen = () => {
-        creator.openSetting();
-      };
-
-      window.cppSdkHelper.onSettingClose = () => {
-        creator.closeSetting();
-      };
-
-      window.cppSdkHelper.onSetParameters = (parameters) => {
-        creator.setParameters(parameters);
-      };
-
-      window.cppSdkHelper.onRenewUserToken = (token) => {
-        creator.renewUserToken(token);
-      };
-
-      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);
-
-        // 定义事件处理函数，以便可以正确移除
-        const handleConfirmClick = () => {
-          setFullScreenFailureComp(false);
-          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) {
-          widgets.forEach((w) => {
-            creator.registerWidget(w);
-          });
-        }
-        uiScene = creator.launch(
-          others,
-          () => {
-            console.log('windows_release ui scene closed callback');
-            window.runtime.getCurrentBrowserWindow().hide();
-          },
-          () => {},
-          () => {},
-          document.getElementById('root'),
-        );
-
-        window.cppSdkHelper.exitUiScene = () => {
-          try {
-            uiScene.exit();
-          } catch (error) {
-            window.cppSdkHelper.exitedMeeting(roomId, FcrUIExitReason.USER_QUIT);
-          }
-        };
-
-        uiScene.addObserver({
-          onLaunchSuccess: () => {
-            setLoading(false);
-            sendExitedEventFlag = true;
-            const roomProvider = uiScene._objectManager.getObject('roomProvider');
-            if (!roomProvider) {
-              throw new Error('roomProvider not found in uiScene');
-            }
-            const currentRoomControl = roomProvider.currentRoomControl;
-            if (!currentRoomControl) {
-              throw new Error('currentRoomControl not found in uiScene');
-            }
-            const roomInfo = currentRoomControl.getRoomInfo();
-
-            if (!roomInfo) {
-              throw new Error('roomInfo not found in uiScene');
-            }
-            const { roomName, roomId } = roomInfo;
-            document.querySelector('title').innerText = roomName;
-            window.cppSdkHelper.launchSuccess(roomId);
-          },
-          onLaunchFailure: (roomId, error) => {
-            const errorCode = Number(error.code);
-            let errorMessage = error.message;
-
-            if (errorCode === 732403100 || errorCode === 631735290) {
-              errorMessage = window._transI18n('fmt_lock_error');
-            } else if (errorCode === 732403101) {
-              errorMessage = window._transI18n('fmt_pc_room_not_exist_error');
-            } else if (errorCode === 732403103) {
-              errorMessage = window._transI18n('fmt_host_leave_error');
-            } else if (errorCode === 720410100) {
-              errorMessage = window._transI18n('fmt_end_error');
-            } else {
-              errorMessage = `Error: code=${errorCode}, message=${errorMessage}`;
-            }
-
-            setFullScreenFailureComp(true, errorMessage);
-            window.cppSdkHelper.launchFailure(roomId, errorCode);
-          },
-
-          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();
-            });
-          },
-          onWidgetClicked: (widgetId) => {
-            window.cppSdkHelper.onWidgetClicked(widgetId);
-          },
-          onUserTokenWillExpire: () => {
-            window.cppSdkHelper.onUserTokenWillExpire();
-          },
-        });
-      };
-    })();
   </script>
+  <script src="meeting-manager.js"></script>
 </html>