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

package/lib/creator/provider-initializer.browser.js

@@ -210,14 +210,14 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_APPLIST_DATA_SOURCE, sharedApplistDataSource);
       var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_APPLIST_PROVIDER, applistProvider);
+      var videoWindowDataSource = new _videoWindow.FcrUIVideoWindowDataSourceImpl(sharedSettingDataSource);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE, videoWindowDataSource);
       var screenShareProvider = new _provider5.FcrUIScreenShareProviderImpl(objectManager);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER, screenShareProvider);
       var sharedSpeakerSoptlightDataSource = new _speakerSpotlight.FcrUISharedSpeakerSpotlightDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE, sharedSpeakerSoptlightDataSource);
       var localVideoRenderProvider = new _rendererProvider.FcrUIMainLocalVideoRenderProviderImpl(deviceProvider, screenShareProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER, localVideoRenderProvider);
-      var videoWindowDataSource = new _videoWindow.FcrUIVideoWindowDataSourceImpl(sharedSettingDataSource);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE, videoWindowDataSource);
       var pinDataSource = new _pinData.FcrUISharedPinDataSourceImpl(messageProvider, videoWindowDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE, pinDataSource);
     }

package/lib/creator/provider-initializer.electron.js

@@ -240,10 +240,10 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_APPLIST_DATA_SOURCE, sharedApplistDataSource);
       var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_APPLIST_PROVIDER, applistProvider);
-      var screenShareProvider = new _provider6.FcrUIScreenShareProviderImpl(objectManager);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER, screenShareProvider);
       var sharedVideoWindowDataSource = new _videoWindow.FcrUIVideoWindowDataSourceImpl(sharedSettingDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE, sharedVideoWindowDataSource);
+      var screenShareProvider = new _provider6.FcrUIScreenShareProviderImpl(objectManager);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER, screenShareProvider);
       var localVideoRenderProvider = new _rendererProvider.FcrUIMainLocalVideoRenderProviderImpl(deviceProvider, screenShareProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER, localVideoRenderProvider);
       var multiDisplayProvider = new _multiDisplayProvider.FcrUIMultiDisplayProviderImpl({

package/lib/electron/bootstrap-sdk.js

@@ -13,6 +13,7 @@ require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.join.js");
+require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.keys.js");
@@ -22,6 +23,7 @@ require("core-js/modules/es.string.starts-with.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.json.parse.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.timers.js");
@@ -42,6 +44,7 @@ var _exitCodes = require("./exit-codes");
 var _struct = require("./struct");
 var _eventManager = require("./event-manager");
 var _until = require("./until");
+var _hangDetection = require("./hang-detection");
 var _process$argv$find; // TODO  需要将其改造成 processManager --- stateManager 和 eventManager 的逻辑，保持兼容
 // processManager --- stateManager 和 eventManager
 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; }
@@ -289,6 +292,9 @@ _electron.app.addListener('ready', function () {
   });
   mainWindow.addListener('hide', function () {
     (0, _logger.getLogger)().info("windows_release main window hidden, current launch state: ".concat(_struct.FcrUISceneLaunchState[_eventManager.eventManager.launchState]));
+    (0, _logger.getLogger)().info("windows_release the main window is hide, all window State: ".concat(_electron.BrowserWindow.getAllWindows().map(function (windowItem) {
+      return "the window id ".concat(windowItem.id, " ").concat(windowItem.getTitle(), " ").concat(windowItem.isVisible());
+    })));
     mainWindowDisplayState = _struct.DisplayState.HIDE;
     if (userMinimize) {
       (0, _logger.getLogger)().info('windows_release main window hidden, but user minimize, ignore this event');
@@ -330,6 +336,8 @@ _electron.app.addListener('ready', function () {
   });
   mainWindow.addListener('closed', function () {
     (0, _logger.getLogger)().info('windows_release main window closed');
+    // 清理主窗口的hang detection状态
+    hangDetectionManager.handleWindowClosed(mainWindow.id);
     _electron.app.exit(_exitCodes.AppExitCode.NORMAL_EXIT);
   });
   mainWindow.addListener('close', function (e) {
@@ -355,18 +363,12 @@ _electron.app.addListener('ready', function () {
       });
       (0, _logger.getLogger)().info('main window close event prevented');
       setTimeout(function () {
-        mainWindow.hide();
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          mainWindow.hide();
+        }
       }, 300);
     }
   });
-  mainWindow.addListener('unresponsive', function () {
-    (0, _logger.getLogger)().warn("main window unresponsive in bootstrap-sdk");
-    handleUnresponsive();
-  });
-  mainWindow.addListener('responsive', function () {
-    (0, _logger.getLogger)().warn("main window responsive in bootstrap-sdk");
-    handleResponsive();
-  });
   if (_env.isDev) {
     mainWindow.webContents.openDevTools({
       mode: 'detach'
@@ -379,6 +381,22 @@ _electron.app.addListener('ready', function () {
   return mainWindow;
 });
 _electron.app.addListener('browser-window-created', function (_, window) {
+  var windowId = window.id;
+  (0, _logger.getLogger)().warn("window created: ".concat(windowId, " ,window title: ").concat(window.getTitle()));
+  window.webContents.addListener('unresponsive', function () {
+    (0, _logger.getLogger)().warn("browser window ".concat(windowId, " unresponsive in bootstrap-sdk"));
+    handleUnresponsive(windowId);
+  });
+  window.webContents.addListener('responsive', function () {
+    (0, _logger.getLogger)().warn("browser window ".concat(windowId, " responsive in bootstrap-sdk"));
+    handleResponsive(windowId);
+  });
+
+  // 监听窗口关闭事件，清理hang detection状态
+  window.addListener('closed', function () {
+    (0, _logger.getLogger)().info("browser window ".concat(windowId, " closed, cleaning hang detection state"));
+    hangDetectionManager.handleWindowClosed(windowId);
+  });
   (0, _main.enable)(window.webContents);
 });
 
@@ -393,31 +411,50 @@ _electron.app.addListener('quit', function (event, exitCode) {
   (0, _logger.getLogger)().info("app quit event triggered with exit code: ".concat(exitCode));
   // 清理 EventManager 资源
   _eventManager.eventManager.dispose();
+
+  // 清理所有hang detection计时器
+  hangDetectionManager.dispose();
 });
-var HANG_DETECTION_TIMEOUT = 60 * 1000; // 1分钟（毫s秒）
-var hangDetectionTimer = null;
-function handleUnresponsive() {
-  (0, _logger.getLogger)().warn('Window became unresponsive, starting hang detection timer');
-  clearHangDetectionTimer();
-  hangDetectionTimer = setTimeout(function () {
-    (0, _logger.getLogger)().error('Window has been unresponsive for 1 minute, forcing application exit');
-    _eventManager.eventManager.onExitedMeeting(_eventManager.eventManager.roomId, _struct.FcrUISceneLaunchEndReason.HANG_DETECTION);
-    ipcClient.sendMessage({
-      cmd: _type.IPCMessageCMD.ExitedMeeting,
-      data: {
-        roomId: _eventManager.eventManager.roomId,
-        reason: _until.hangDetectionErrorCode
-      }
-    });
-  }, HANG_DETECTION_TIMEOUT);
-}
-function handleResponsive() {
-  (0, _logger.getLogger)().info('Window became responsive again, clearing hang detection timer');
-  clearHangDetectionTimer();
+var onHangTimeout = function onHangTimeout(windowId) {
+  (0, _logger.getLogger)().error("Window ".concat(windowId, " hang timeout, triggering application exit"));
+  _eventManager.eventManager.onExitedMeeting(_eventManager.eventManager.roomId, _struct.FcrUISceneLaunchEndReason.HANG_DETECTION);
+  ipcClient.sendMessage({
+    cmd: _type.IPCMessageCMD.ExitedMeeting,
+    data: {
+      roomId: _eventManager.eventManager.roomId,
+      reason: _until.hangDetectionErrorCode
+    }
+  });
+};
+var onStateChange = function onStateChange(windowId, isUnresponsive, duration) {
+  if (isUnresponsive) {
+    (0, _logger.getLogger)().warn("Window ".concat(windowId, " became unresponsive"));
+  } else {
+    (0, _logger.getLogger)().info("Window ".concat(windowId, " became responsive").concat(duration ? " after ".concat(duration, "ms") : ''));
+  }
+};
+var hangDetectionManager = new _hangDetection.MultiWindowHangDetectionManager({
+  onHangTimeout: onHangTimeout,
+  onStateChange: onStateChange
+}, {
+  timeout: _hangDetection.DEFAULT_HANG_DETECTION_TIMEOUT,
+  enableVerboseLogging: true
+});
+function handleUnresponsive(windowId) {
+  var _mainWindow;
+  var targetWindowId = windowId || ((_mainWindow = mainWindow) === null || _mainWindow === void 0 ? void 0 : _mainWindow.id);
+  if (!targetWindowId) {
+    (0, _logger.getLogger)().warn('Cannot handle unresponsive: no window ID available');
+    return;
+  }
+  hangDetectionManager.handleWindowUnresponsive(targetWindowId);
 }
-function clearHangDetectionTimer() {
-  if (hangDetectionTimer) {
-    clearTimeout(hangDetectionTimer);
-    hangDetectionTimer = null;
+function handleResponsive(windowId) {
+  var _mainWindow2;
+  var targetWindowId = windowId || ((_mainWindow2 = mainWindow) === null || _mainWindow2 === void 0 ? void 0 : _mainWindow2.id);
+  if (!targetWindowId) {
+    (0, _logger.getLogger)().warn('Cannot handle responsive: no window ID available');
+    return;
   }
+  hangDetectionManager.handleWindowResponsive(targetWindowId);
 }

package/lib/electron/hang-detection/index.d.ts

@@ -0,0 +1,3 @@
+export { MultiWindowHangDetectionManager } from './manager';
+export type { WindowHangState, HangDetectionConfig, HangDetectionCallbacks } from './types';
+export declare const DEFAULT_HANG_DETECTION_TIMEOUT: number;

package/lib/electron/hang-detection/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DEFAULT_HANG_DETECTION_TIMEOUT = void 0;
+Object.defineProperty(exports, "MultiWindowHangDetectionManager", {
+  enumerable: true,
+  get: function get() {
+    return _manager.MultiWindowHangDetectionManager;
+  }
+});
+var _manager = require("./manager");
+var DEFAULT_HANG_DETECTION_TIMEOUT = exports.DEFAULT_HANG_DETECTION_TIMEOUT = 15 * 1000; // 15秒

package/lib/electron/hang-detection/manager.d.ts

@@ -0,0 +1,28 @@
+import { WindowHangState, HangDetectionConfig, HangDetectionCallbacks } from './types';
+/**
+ * 多窗口 Hang Detection 管理器
+ */
+export declare class MultiWindowHangDetectionManager {
+    private windowStates;
+    private logger;
+    private config;
+    private callbacks;
+    constructor(callbacks: HangDetectionCallbacks, config?: HangDetectionConfig);
+    handleWindowUnresponsive(windowId: number): void;
+    /**
+     * 处理窗口变为responsive
+     */
+    handleWindowResponsive(windowId: number): void;
+    private clearWindowTimer;
+    clearAllTimers(): void;
+    getUnresponsiveWindowCount(): number;
+    getUnresponsiveWindowIds(): number[];
+    getWindowHangState(windowId: number): WindowHangState | undefined;
+    isWindowUnresponsive(windowId: number): boolean;
+    getWindowUnresponsiveDuration(windowId: number): number | null;
+    private logCurrentState;
+    handleWindowClosed(windowId: number): void;
+    updateConfig(config: Partial<HangDetectionConfig>): void;
+    getConfig(): Required<HangDetectionConfig>;
+    dispose(): void;
+}

package/lib/electron/hang-detection/manager.js

@@ -0,0 +1,231 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.iterator.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.date.to-string.js");
+require("core-js/modules/es.function.name.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.regexp.exec.js");
+require("core-js/modules/es.regexp.test.js");
+require("core-js/modules/es.regexp.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.MultiWindowHangDetectionManager = void 0;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.from.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.join.js");
+require("core-js/modules/es.date.now.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/web.dom-collections.iterator.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"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _2 = require(".");
+var _logger = require("../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; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+/**
+ * 多窗口 Hang Detection 管理器
+ */
+var MultiWindowHangDetectionManager = exports.MultiWindowHangDetectionManager = /*#__PURE__*/function () {
+  function MultiWindowHangDetectionManager(callbacks, config) {
+    var _config$timeout, _config$enableVerbose;
+    (0, _classCallCheck2["default"])(this, MultiWindowHangDetectionManager);
+    (0, _defineProperty2["default"])(this, "windowStates", new Map());
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
+    this.callbacks = callbacks;
+    this.config = {
+      timeout: (_config$timeout = config === null || config === void 0 ? void 0 : config.timeout) !== null && _config$timeout !== void 0 ? _config$timeout : _2.DEFAULT_HANG_DETECTION_TIMEOUT,
+      enableVerboseLogging: (_config$enableVerbose = config === null || config === void 0 ? void 0 : config.enableVerboseLogging) !== null && _config$enableVerbose !== void 0 ? _config$enableVerbose : true
+    };
+  }
+  return (0, _createClass2["default"])(MultiWindowHangDetectionManager, [{
+    key: "handleWindowUnresponsive",
+    value: function handleWindowUnresponsive(windowId) {
+      var _this = this;
+      this.logger.warn("Window ".concat(windowId, " became unresponsive, starting hang detection timer"));
+      this.clearWindowTimer(windowId);
+      var timer = setTimeout(function () {
+        _this.logger.error("Window ".concat(windowId, " has been unresponsive for ").concat(_this.config.timeout, "ms, triggering timeout callback"));
+        _this.callbacks.onHangTimeout(windowId);
+      }, this.config.timeout);
+      this.windowStates.set(windowId, {
+        windowId: windowId,
+        timer: timer,
+        isUnresponsive: true,
+        startTime: Date.now()
+      });
+      if (this.callbacks.onStateChange) {
+        this.callbacks.onStateChange(windowId, true);
+      }
+      if (this.config.enableVerboseLogging) {
+        this.logCurrentState();
+      }
+    }
+
+    /**
+     * 处理窗口变为responsive
+     */
+  }, {
+    key: "handleWindowResponsive",
+    value: function handleWindowResponsive(windowId) {
+      this.logger.info("Window ".concat(windowId, " became responsive again"));
+      var windowState = this.windowStates.get(windowId);
+      if (windowState) {
+        var duration = Date.now() - windowState.startTime;
+        this.logger.info("Window ".concat(windowId, " was unresponsive for ").concat(duration, "ms"));
+        this.clearWindowTimer(windowId);
+        if (this.callbacks.onStateChange) {
+          this.callbacks.onStateChange(windowId, false, duration);
+        }
+        this.windowStates["delete"](windowId);
+      }
+      if (this.config.enableVerboseLogging) {
+        this.logCurrentState();
+      }
+    }
+  }, {
+    key: "clearWindowTimer",
+    value: function clearWindowTimer(windowId) {
+      var windowState = this.windowStates.get(windowId);
+      if (windowState && windowState.timer) {
+        clearTimeout(windowState.timer);
+        windowState.timer = null;
+      }
+    }
+  }, {
+    key: "clearAllTimers",
+    value: function clearAllTimers() {
+      this.logger.info('Clearing all hang detection timers');
+      var _iterator = _createForOfIteratorHelper(this.windowStates),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _step$value = (0, _slicedToArray2["default"])(_step.value, 2),
+            _ = _step$value[0],
+            windowState = _step$value[1];
+          if (windowState.timer) {
+            clearTimeout(windowState.timer);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      this.windowStates.clear();
+    }
+  }, {
+    key: "getUnresponsiveWindowCount",
+    value: function getUnresponsiveWindowCount() {
+      return this.windowStates.size;
+    }
+  }, {
+    key: "getUnresponsiveWindowIds",
+    value: function getUnresponsiveWindowIds() {
+      return Array.from(this.windowStates.keys());
+    }
+  }, {
+    key: "getWindowHangState",
+    value: function getWindowHangState(windowId) {
+      return this.windowStates.get(windowId);
+    }
+  }, {
+    key: "isWindowUnresponsive",
+    value: function isWindowUnresponsive(windowId) {
+      return this.windowStates.has(windowId);
+    }
+  }, {
+    key: "getWindowUnresponsiveDuration",
+    value: function getWindowUnresponsiveDuration(windowId) {
+      var windowState = this.windowStates.get(windowId);
+      if (!windowState) {
+        return null;
+      }
+      return Date.now() - windowState.startTime;
+    }
+  }, {
+    key: "logCurrentState",
+    value: function logCurrentState() {
+      var unresponsiveCount = this.windowStates.size;
+      var windowIds = Array.from(this.windowStates.keys());
+      this.logger.info("Hang Detection State: ".concat(unresponsiveCount, " unresponsive windows [").concat(windowIds.join(', '), "]"));
+    }
+  }, {
+    key: "handleWindowClosed",
+    value: function handleWindowClosed(windowId) {
+      this.logger.info("Window ".concat(windowId, " closed, cleaning up hang detection state"));
+      var windowState = this.windowStates.get(windowId);
+      if (windowState) {
+        if (this.callbacks.onStateChange) {
+          var duration = Date.now() - windowState.startTime;
+          this.callbacks.onStateChange(windowId, false, duration);
+        }
+      }
+      this.clearWindowTimer(windowId);
+      this.windowStates["delete"](windowId);
+      if (this.config.enableVerboseLogging) {
+        this.logCurrentState();
+      }
+    }
+  }, {
+    key: "updateConfig",
+    value: function updateConfig(config) {
+      this.config = _objectSpread(_objectSpread({}, this.config), config);
+      this.logger.info("Hang detection config updated: ".concat(JSON.stringify(this.config)));
+    }
+  }, {
+    key: "getConfig",
+    value: function getConfig() {
+      return _objectSpread({}, this.config);
+    }
+  }, {
+    key: "dispose",
+    value: function dispose() {
+      this.logger.info('Disposing MultiWindowHangDetectionManager');
+      this.clearAllTimers();
+    }
+  }]);
+}();

package/lib/electron/hang-detection/types.d.ts

@@ -0,0 +1,14 @@
+export interface WindowHangState {
+    windowId: number;
+    timer: NodeJS.Timeout | null;
+    isUnresponsive: boolean;
+    startTime: number;
+}
+export interface HangDetectionConfig {
+    timeout?: number;
+    enableVerboseLogging?: boolean;
+}
+export interface HangDetectionCallbacks {
+    onHangTimeout: (windowId: number) => void;
+    onStateChange?: (windowId: number, isUnresponsive: boolean, duration?: number) => void;
+}

package/lib/electron/hang-detection/types.js

@@ -0,0 +1,6 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/electron/until.d.ts

@@ -2,8 +2,7 @@ declare enum ServiceErrorCode {
     FcrUIScene = 800
 }
 declare enum UISceneErrorCode {
-    Creator = 10,
-    ProcessManager = 11
+    Creator = 10
 }
 declare enum DetailErrorCode {
     unknown = 1,
@@ -20,7 +19,6 @@ declare enum DetailErrorCode {
     mainWindowHidden = 82,
     closeWindowBeforeLaunchSuccess = 83,
     meetingLaunchProcessing = 84,
-    mainWindowHiddenAfterLaunchSuccess = 85,
     crashed = 86,
     hangDetection = 87
 }
@@ -28,7 +26,6 @@ export declare const generaErrorCode: (serviceCode: ServiceErrorCode, uiSceneCod
 export declare const windowHideErrorCode: number;
 export declare const closeWindowBeforeLaunchSuccessErrorCode: number;
 export declare const meetingLaunchProcessingErrorCode: number;
-export declare const mainWindowHiddenOnLaunchSuccessErrorCode: number;
 export declare const crashedErrorCode: number;
 export declare const hangDetectionErrorCode: number;
 export {};

package/lib/electron/until.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = exports.hangDetectionErrorCode = exports.generaErrorCode = exports.crashedErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
+exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.hangDetectionErrorCode = exports.generaErrorCode = exports.crashedErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
 // 错误代码枚举定义
 var ServiceErrorCode = /*#__PURE__*/function (ServiceErrorCode) {
   ServiceErrorCode[ServiceErrorCode["FcrUIScene"] = 800] = "FcrUIScene";
@@ -12,7 +12,6 @@ var ServiceErrorCode = /*#__PURE__*/function (ServiceErrorCode) {
 }(ServiceErrorCode || {});
 var UISceneErrorCode = /*#__PURE__*/function (UISceneErrorCode) {
   UISceneErrorCode[UISceneErrorCode["Creator"] = 10] = "Creator";
-  UISceneErrorCode[UISceneErrorCode["ProcessManager"] = 11] = "ProcessManager";
   return UISceneErrorCode;
 }(UISceneErrorCode || {});
 var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
@@ -45,7 +44,7 @@ var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
   // 会议启动中
   DetailErrorCode[DetailErrorCode["meetingLaunchProcessing"] = 84] = "meetingLaunchProcessing";
   // 窗口在会议启动后隐藏
-  DetailErrorCode[DetailErrorCode["mainWindowHiddenAfterLaunchSuccess"] = 85] = "mainWindowHiddenAfterLaunchSuccess";
+  // mainWindowHiddenAfterLaunchSuccess = 85,
   // 窗口崩溃
   DetailErrorCode[DetailErrorCode["crashed"] = 86] = "crashed";
   // 窗口无响应
@@ -58,6 +57,12 @@ var generaErrorCode = exports.generaErrorCode = function generaErrorCode(service
 var windowHideErrorCode = exports.windowHideErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHidden);
 var closeWindowBeforeLaunchSuccessErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.closeWindowBeforeLaunchSuccess);
 var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
-var mainWindowHiddenOnLaunchSuccessErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHiddenAfterLaunchSuccess);
+
+// export const mainWindowHiddenOnLaunchSuccessErrorCode = generaErrorCode(
+//   ServiceErrorCode.FcrUIScene,
+//   UISceneErrorCode.Creator,
+//   DetailErrorCode.mainWindowHiddenAfterLaunchSuccess,
+// );
+
 var crashedErrorCode = exports.crashedErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.crashed);
 var hangDetectionErrorCode = exports.hangDetectionErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.hangDetection);

package/lib/modules/action-bar/components/screen-share/index.electron.js

@@ -24,7 +24,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
     startScreenShare = _useContext.startScreenShare,
     localUserRole = _useContext.localUserRole,
     hasStartScreenSharePermission = _useContext.hasStartScreenSharePermission;
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     visibleMenu = _useState2[0],
     setMenuVisible = _useState2[1];

package/lib/modules/components/control-bar/components/switch-theme/index.js

@@ -39,7 +39,9 @@ var WhiteboardSwitchTheme = function WhiteboardSwitchTheme(props) {
     },
     overlayOffset: 4,
     showArrow: false,
-    getTooltipContainer: function getTooltipContainer() {
+    getTooltipContainer: function getTooltipContainer(_target) {
+      // window.document 是主窗口内的, 为了在子窗口中获取主窗口的 DOM 节点, 所以使用 _target.ownerDocument
+      var document = _target.ownerDocument || window.document;
       var target = document.getElementById('fcr-whiteboard-controlbar');
       return target;
     },
@@ -57,7 +59,7 @@ var WhiteboardSwitchTheme = function WhiteboardSwitchTheme(props) {
               return item.theme === theme.theme;
             });
             setTheme(result);
-            setWhiteboardVisible(false);
+            setWhiteboardVisible(!whiteboardVisible);
           }
         }, theme.theme);
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/modules/components/control-bar/index.js

@@ -291,9 +291,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
             className: "fcr-whiteboard-controlbar-item",
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchTheme["default"], {
               whiteboardVisible: showSwitchTheme,
-              setWhiteboardVisible: function setWhiteboardVisible() {
-                return setShowSwitchTheme(!showSwitchTheme);
-              },
+              setWhiteboardVisible: setShowSwitchTheme,
               currentThemeType: currentTheme,
               setTheme: setTheme
             })

package/lib/modules/participant/store.base.js

@@ -682,7 +682,6 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
   }, {
     key: "setChatActiveTab",
     value: function setChatActiveTab(activeTab) {
-      console.log('cjtest setChatActiveTab', activeTab);
       this._sharedChatDataSource.activeTab = activeTab;
     }
   }, {

package/lib/modules/share-screen/store.electron.js

@@ -43,6 +43,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -193,6 +195,13 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       this._isSharing = true;
       this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
       var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+      try {
+        if (!videoWindow.isVisible()) {
+          videoWindow.show();
+        }
+      } catch (e) {
+        this.logger.warn('share_screen _showControlBar error', JSON.stringify(e));
+      }
       videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
       var isMultiDisplayActive = this._multiDisplayProvider.isActive;
       this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);