fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/electron/plugins/main-window-display.js

@@ -0,0 +1,23 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.listenMainWindowDisplaySupport = exports.canShowMainWindow = void 0;
+var _electron = require("electron");
+var _logger = require("../logger");
+var logger = (0, _logger.getLogger)();
+
+/**
+ * 主窗口显示支持状态
+ * true: 支持显示主窗口（未屏幕共享）
+ * false: 不支持显示主窗口（正在屏幕共享）
+ */
+var canShowMainWindow = exports.canShowMainWindow = true;
+var listenMainWindowDisplaySupport = exports.listenMainWindowDisplaySupport = function listenMainWindowDisplaySupport(window) {
+  _electron.ipcMain.addListener('set-main-window-display-support', function (_, isSupported) {
+    exports.canShowMainWindow = canShowMainWindow = isSupported;
+    logger.info("main window display support is ".concat(isSupported ? 'supported' : 'not supported'));
+  });
+};

package/lib/electron/preload.js

@@ -37,7 +37,8 @@ var runtime = {
   getSystemMemorySize: _injections.getSystemMemorySize,
   getCurrentBrowserWindow: _injections.getCurrentBrowserWindow,
   createBrowserWindowProxy: _injections.createBrowserWindowProxy,
-  getBrowserWindowById: _injections.getBrowserWindowById
+  getBrowserWindowById: _injections.getBrowserWindowById,
+  getWindowInfoList: _injections.getWindowInfoList
 };
 
 // @ts-ignore

package/lib/electron/process-manager/index.d.ts

@@ -80,6 +80,7 @@ export declare class ProcessManager extends EventEmitter {
      * 处理获取依赖版本消息
      */
     private _handleGetDependencyVersions;
+    private _handleShowMainWindow;
     /**
      * 转发消息到渲染进程
      */

package/lib/electron/process-manager/index.js

@@ -47,6 +47,7 @@ var _exitCodes = require("../exit-codes");
 var _struct = require("../struct");
 var _until = require("../until");
 var _constants = require("./constants");
+var _mainWindowDisplay = require("../plugins/main-window-display");
 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; }
 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)); }
@@ -206,6 +207,9 @@ var ProcessManager = exports.ProcessManager = /*#__PURE__*/function (_EventEmitt
         case _type.IPCMessageCMD.GetDependencyVersions:
           this._handleGetDependencyVersions(message.data);
           break;
+        case _type.IPCMessageCMD.ShowMainWindow:
+          this._handleShowMainWindow(message.data);
+          break;
         default:
           this.logger.info("CPP EVENT: Unknown command: ".concat(message.cmd));
           break;
@@ -265,6 +269,11 @@ var ProcessManager = exports.ProcessManager = /*#__PURE__*/function (_EventEmitt
           data: data,
           lastInitParams: this.stateManager.lastInitParams
         });
+        if (mainWindow.isMinimized()) {
+          this.stateManager.setRestoringFromMinimize(true);
+          mainWindow.restore();
+          return;
+        }
 
         // Windows 平台特殊处理
         var platform = _os["default"].platform();
@@ -367,6 +376,26 @@ var ProcessManager = exports.ProcessManager = /*#__PURE__*/function (_EventEmitt
       this.logger.info("CPP EVENT: GetDependencyVersions: ".concat(JSON.stringify(data)));
       this._forwardMessageToRenderer(_type.IPCMessageCMD.GetDependencyVersions, data);
     }
+  }, {
+    key: "_handleShowMainWindow",
+    value: function _handleShowMainWindow(data) {
+      this.logger.info("CPP EVENT: ShowMeetingWindow: ".concat(JSON.stringify(data)));
+      var mainWindow = this.stateManager.mainWindow;
+      if (!mainWindow) {
+        this.logger.error('main window not found,Or it has been destroyed and cannot handle the window closing event.');
+        return;
+      }
+      if (!_mainWindowDisplay.canShowMainWindow) {
+        this.logger.info('main window display support is not supported, ignore this event');
+        return;
+      }
+      var platform = _os["default"].platform();
+      if (platform === 'win32') {
+        this.stateManager.showAndFocusWithAlwaysOnTop();
+      } else {
+        this.stateManager.onlyShowMainWindow();
+      }
+    }
 
     /**
      * 转发消息到渲染进程
@@ -444,6 +473,14 @@ var ProcessManager = exports.ProcessManager = /*#__PURE__*/function (_EventEmitt
       this.logger.info('windows_release main window show');
       this.stateManager.setMainWindowDisplayState(_struct.DisplayState.SHOW);
       this.stateManager.setUserMinimize(false);
+
+      // 如果是从最小化恢复触发的show事件，不执行focus避免动画期间闪烁
+      if (this.stateManager.isRestoringFromMinimize) {
+        this.logger.info('windows_release main window show: skip focus during restore animation');
+        this.stateManager.setRestoringFromMinimize(false);
+        return;
+      }
+      this.stateManager.setRestoringFromMinimize(false);
       this.stateManager.focusMainWindow();
     }
 

package/lib/electron/process-manager/state-manager.d.ts

@@ -41,6 +41,7 @@ export declare class StateManager extends EventEmitter {
     private _userMinimize;
     private _ipcConnectionState;
     private _lastInitParams;
+    private _isRestoringFromMinimize;
     get currentMeetingState(): 0 | 1;
     constructor();
     /**
@@ -67,6 +68,10 @@ export declare class StateManager extends EventEmitter {
      * 获取最后一次初始化参数
      */
     get lastInitParams(): string;
+    /**
+     * 获取是否正在从最小化恢复
+     */
+    get isRestoringFromMinimize(): boolean;
     /**
      * 设置主窗口实例
      */
@@ -91,6 +96,10 @@ export declare class StateManager extends EventEmitter {
      * 设置最后一次初始化参数
      */
     setLastInitParams(params: string): void;
+    /**
+     * 设置是否正在从最小化恢复
+     */
+    setRestoringFromMinimize(restoring: boolean): void;
     /**
      * 显示并聚焦主窗口
      */
@@ -103,6 +112,7 @@ export declare class StateManager extends EventEmitter {
      * 最小化主窗口
      */
     minimizeMainWindow(): void;
+    onlyShowMainWindow(): void;
     /**
      * Windows 平台特殊处理：显示并置顶窗口
      * 用于 Windows 平台的会议启动逻辑

package/lib/electron/process-manager/state-manager.js

@@ -61,6 +61,8 @@ var StateManager = exports.StateManager = /*#__PURE__*/function (_EventEmitter)
     (0, _defineProperty2["default"])(_this, "_ipcConnectionState", IPCConnectionState.DISCONNECTED);
     // 初始化参数缓存
     (0, _defineProperty2["default"])(_this, "_lastInitParams", '');
+    // 标志位：是否正在执行restore操作
+    (0, _defineProperty2["default"])(_this, "_isRestoringFromMinimize", false);
     _this.logger.info('StateManager initialized');
     return _this;
   }
@@ -127,6 +129,15 @@ var StateManager = exports.StateManager = /*#__PURE__*/function (_EventEmitter)
       return this._lastInitParams;
     }
 
+    /**
+     * 获取是否正在从最小化恢复
+     */
+  }, {
+    key: "isRestoringFromMinimize",
+    get: function get() {
+      return this._isRestoringFromMinimize;
+    }
+
     // ==================== Setters ====================
 
     /**
@@ -206,6 +217,16 @@ var StateManager = exports.StateManager = /*#__PURE__*/function (_EventEmitter)
       this.logger.info('Last init params updated');
     }
 
+    /**
+     * 设置是否正在从最小化恢复
+     */
+  }, {
+    key: "setRestoringFromMinimize",
+    value: function setRestoringFromMinimize(restoring) {
+      this._isRestoringFromMinimize = restoring;
+      this.logger.info("Restoring from minimize state: ".concat(restoring));
+    }
+
     // ==================== 窗口操作方法 ====================
 
     /**
@@ -251,6 +272,22 @@ var StateManager = exports.StateManager = /*#__PURE__*/function (_EventEmitter)
       this._mainWindow.minimize();
       this.setMainWindowDisplayState(_struct.DisplayState.MINIMIZE);
     }
+  }, {
+    key: "onlyShowMainWindow",
+    value: function onlyShowMainWindow() {
+      if (!this._mainWindow || this._mainWindow.isDestroyed()) {
+        this.logger.warn('Cannot show main window: window not available');
+        return;
+      }
+      if (this._mainWindow.isMinimized()) {
+        // 设置标志位，表示正在从最小化恢复
+        this._isRestoringFromMinimize = true;
+        this._mainWindow.restore();
+        return;
+      }
+      this._mainWindow.show();
+      this.setMainWindowDisplayState(_struct.DisplayState.SHOW);
+    }
 
     /**
      * Windows 平台特殊处理：显示并置顶窗口
@@ -264,11 +301,15 @@ var StateManager = exports.StateManager = /*#__PURE__*/function (_EventEmitter)
         this.logger.warn('Cannot show main window: window not available');
         return;
       }
-      this._mainWindow.show();
-      this._mainWindow.focus();
-      this._mainWindow.moveTop();
+      if (this._mainWindow.isMinimized()) {
+        this._isRestoringFromMinimize = true;
+        this._mainWindow.restore();
+      } else {
+        this._mainWindow.show();
+        this._mainWindow.focus();
+        this._mainWindow.moveTop();
+      }
       this._mainWindow.setAlwaysOnTop(true, 'pop-up-menu');
-
       // 300ms 后再次确认窗口状态
       setTimeout(function () {
         if (!_this2._mainWindow || _this2._mainWindow.isDestroyed()) {
@@ -338,6 +379,7 @@ var StateManager = exports.StateManager = /*#__PURE__*/function (_EventEmitter)
       this._mainWindowReady = false;
       this._userMinimize = false;
       this._lastInitParams = '';
+      this._isRestoringFromMinimize = false;
       this.logger.info('StateManager reset');
       this.emit('reset', {
         timestamp: Date.now()

package/lib/electron/sdk-helper.js

@@ -59,6 +59,9 @@ var launch = function launch(options) {
 var setInMeetingState = function setInMeetingState(state) {
   _renderer.ipcRenderer.send('set-in-meeting-state', state);
 };
+var setMainWindowDisplaySupport = function setMainWindowDisplaySupport(isSupported) {
+  _renderer.ipcRenderer.send('set-main-window-display-support', isSupported);
+};
 var initSDK = function initSDK(options) {
   _renderer.ipcRenderer.invoke('initSDK', options);
 };
@@ -158,6 +161,7 @@ var cppSdkHelper = {
   getBundleType: getBundleType,
   launch: launch,
   setInMeetingState: setInMeetingState,
+  setMainWindowDisplaySupport: setMainWindowDisplaySupport,
   initSDK: initSDK,
   openSetting: openSetting,
   getIsSDKReady: getIsSDKReady,

package/lib/electron/window-proxy/browser-window-proxy-factory.d.ts

@@ -0,0 +1,7 @@
+import { BrowserWindowIPCHandler } from './implementations/main-process-handler';
+import { IBrowserWindowIPCFactory } from './interfaces';
+export declare class BrowserWindowIPCFactoryImpl implements IBrowserWindowIPCFactory {
+    private static instance;
+    createInstance(): BrowserWindowIPCHandler;
+}
+export declare const browserWindowIPCHandler: BrowserWindowIPCHandler;

package/lib/electron/window-proxy/browser-window-proxy-factory.js

@@ -0,0 +1,46 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.browserWindowIPCHandler = exports.BrowserWindowIPCFactoryImpl = void 0;
+require("core-js/modules/es.function.bind.js");
+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 _mainProcessHandler = require("./implementations/main-process-handler");
+var _electronIpcHandler = require("./implementations/electron-ipc-handler");
+var _electronEventBroadcaster = require("./implementations/electron-event-broadcaster");
+var _electronLogger = require("./implementations/electron-logger");
+var BrowserWindowIPCFactoryImpl = exports.BrowserWindowIPCFactoryImpl = /*#__PURE__*/function () {
+  function BrowserWindowIPCFactoryImpl() {
+    (0, _classCallCheck2["default"])(this, BrowserWindowIPCFactoryImpl);
+  }
+  return (0, _createClass2["default"])(BrowserWindowIPCFactoryImpl, [{
+    key: "createInstance",
+    value: function createInstance() {
+      if (!BrowserWindowIPCFactoryImpl.instance) {
+        var logger = new _electronLogger.ElectronLogger();
+        var ipcHandler = new _electronIpcHandler.ElectronIPCHandler();
+        var mainWindow = null;
+        var eventBroadcaster = new _electronEventBroadcaster.ElectronEventBroadcaster(logger, function () {
+          return mainWindow;
+        });
+        var handler = new _mainProcessHandler.BrowserWindowIPCHandler(ipcHandler, eventBroadcaster, logger);
+
+        // Override setMainWindow to capture the reference
+        var originalSetMainWindow = handler.setMainWindow.bind(handler);
+        handler.setMainWindow = function (window) {
+          mainWindow = window;
+          originalSetMainWindow(window);
+        };
+        BrowserWindowIPCFactoryImpl.instance = handler;
+      }
+      return BrowserWindowIPCFactoryImpl.instance;
+    }
+  }]);
+}();
+(0, _defineProperty2["default"])(BrowserWindowIPCFactoryImpl, "instance", null);
+var browserWindowIPCHandler = exports.browserWindowIPCHandler = new BrowserWindowIPCFactoryImpl().createInstance();

package/lib/electron/window-proxy/{browser-window-proxy.d.ts → implementations/browser-window-proxy.d.ts}

@@ -1,42 +1,21 @@
-import { BrowserWindowProxy } from '../../runtime';
+import { BrowserWindowProxy } from '../../../runtime';
 /**
  * BrowserWindow 代理类
  * 通过 IPC 通信与主进程中的 BrowserWindow 进行交互
  */
 export declare class BrowserWindowProxyImpl implements BrowserWindowProxy {
     private _windowId;
+    private _proxyId;
     private _eventListeners;
     private _isDestroyed;
     private _runtimeEventListener;
     constructor(windowId: string);
     get windowId(): string;
+    get proxyId(): string;
     /**
      * 检查窗口是否已销毁
      */
     isDestroyed(): boolean;
-    moveTop(): Promise<void>;
-    setPosition(x: number, y: number): Promise<void>;
-    getPosition(): Promise<[number, number]>;
-    close(): Promise<void>;
-    show(): Promise<void>;
-    hide(): Promise<void>;
-    focus(): Promise<void>;
-    maximize(): Promise<void>;
-    unmaximize(): Promise<void>;
-    isVisible(): Promise<boolean>;
-    isMaximized(): Promise<boolean>;
-    isFullScreen(): Promise<boolean>;
-    getTitle(): Promise<string>;
-    getBounds(): Promise<Electron.Rectangle>;
-    /**
-     * 窗口设置方法
-     */
-    setBounds(bounds: Electron.Rectangle): Promise<void>;
-    setFullScreen(fullscreen: boolean): Promise<void>;
-    setIgnoreMouseEvents(ignore: boolean, options?: {
-        forward: boolean;
-    }): Promise<void>;
-    setAlwaysOnTop(flag: boolean, level?: 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver', relativeLevel?: number): Promise<void>;
     setPreventClose(prevent: boolean): Promise<void>;
     /**
      * 事件监听方法