fcr-ui-scene 3.7.4-rc.1 → 3.7.5

package/lib/electron/window-proxy/main-process-handler.d.ts

@@ -0,0 +1,45 @@
+import { BrowserWindow } from 'electron';
+/**
+ * 主进程中的 BrowserWindow IPC 处理器
+ */
+export declare class BrowserWindowIPCHandler {
+    protected logger: import("winston").Logger;
+    private _windows;
+    private _frameNameToId;
+    private _preventCloseWindows;
+    private _windowEventListeners;
+    private _mainWindow;
+    constructor();
+    /**
+     * 设置主窗口，所有事件通知都通过主窗口发送
+     */
+    setMainWindow(mainWindow: BrowserWindow): void;
+    /**
+     * 注册窗口
+     */
+    registerWindow(windowId: string, window: BrowserWindow, frameName: string): void;
+    clearAllWindows(): void;
+    /**
+     * 注销窗口
+     */
+    /**
+     * 获取窗口
+     */
+    getWindow(frameName: string): BrowserWindow | undefined;
+    private _unregisterWindow;
+    private _setupIpcHandlers;
+    private _handleWindowRequest;
+    private _executeWindowAction;
+    private _registerWindowEventListeners;
+    private _unregisterWindowEventListeners;
+    private _notifyWindowEvent;
+    /**
+     * 处理主窗口关闭事件
+     */
+    private _handleMainWindowClose;
+    /**
+     * 处理子窗口关闭事件
+     */
+    private _handleSubWindowClose;
+}
+export declare const browserWindowIPCHandler: BrowserWindowIPCHandler;

package/lib/electron/window-proxy/main-process-handler.js

@@ -0,0 +1,446 @@
+"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.BrowserWindowIPCHandler = 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");
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.function.bind.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.set.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.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/esnext.set.add-all.js");
+require("core-js/modules/esnext.set.delete-all.js");
+require("core-js/modules/esnext.set.difference.v2.js");
+require("core-js/modules/esnext.set.difference.js");
+require("core-js/modules/esnext.set.every.js");
+require("core-js/modules/esnext.set.filter.js");
+require("core-js/modules/esnext.set.find.js");
+require("core-js/modules/esnext.set.intersection.v2.js");
+require("core-js/modules/esnext.set.intersection.js");
+require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.v2.js");
+require("core-js/modules/esnext.set.is-subset-of.js");
+require("core-js/modules/esnext.set.is-superset-of.v2.js");
+require("core-js/modules/esnext.set.is-superset-of.js");
+require("core-js/modules/esnext.set.join.js");
+require("core-js/modules/esnext.set.map.js");
+require("core-js/modules/esnext.set.reduce.js");
+require("core-js/modules/esnext.set.some.js");
+require("core-js/modules/esnext.set.symmetric-difference.v2.js");
+require("core-js/modules/esnext.set.symmetric-difference.js");
+require("core-js/modules/esnext.set.union.v2.js");
+require("core-js/modules/esnext.set.union.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _electron = require("electron");
+var _ipcProtocol = require("../ipc-protocol");
+var _logger = require("../logger");
+/**
+ * 主进程中的 BrowserWindow IPC 处理器
+ */
+var BrowserWindowIPCHandler = exports.BrowserWindowIPCHandler = /*#__PURE__*/function () {
+  function BrowserWindowIPCHandler() {
+    (0, _classCallCheck2["default"])(this, BrowserWindowIPCHandler);
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
+    (0, _defineProperty2["default"])(this, "_windows", new Map());
+    (0, _defineProperty2["default"])(this, "_frameNameToId", new Map());
+    (0, _defineProperty2["default"])(this, "_preventCloseWindows", new Set());
+    (0, _defineProperty2["default"])(this, "_windowEventListeners", new Map());
+    (0, _defineProperty2["default"])(this, "_mainWindow", null);
+    this._setupIpcHandlers();
+  }
+
+  /**
+   * 设置主窗口，所有事件通知都通过主窗口发送
+   */
+  return (0, _createClass2["default"])(BrowserWindowIPCHandler, [{
+    key: "setMainWindow",
+    value: function setMainWindow(mainWindow) {
+      this.logger.info('Set main window for event broadcasting');
+      this._mainWindow = mainWindow;
+    }
+
+    /**
+     * 注册窗口
+     */
+  }, {
+    key: "registerWindow",
+    value: function registerWindow(windowId, window, frameName) {
+      var _this = this;
+      this.logger.info("Register window: ".concat(windowId, ", frameName: ").concat(frameName, ", remaining windows: ").concat(this._windows.size));
+      this._windows.set(windowId, window);
+      this._frameNameToId.set(frameName, windowId);
+      this._windowEventListeners.set(windowId, new Map());
+      var closeListener = function closeListener(e) {
+        var isMainWindow = frameName === 'main';
+        var shouldPreventClose = _this._preventCloseWindows.has(windowId);
+        if (isMainWindow) {
+          _this._handleMainWindowClose(e, windowId, shouldPreventClose);
+        } else {
+          _this._handleSubWindowClose(e, window, windowId, shouldPreventClose);
+        }
+      };
+      window.on('close', closeListener);
+      var _closedListener = function closedListener() {
+        _this.logger.info("Unregister window: ".concat(windowId, ", due to closed event, frameName: ").concat(frameName, ", remaining windows: ").concat(_this._windows.size));
+        window.off('close', closeListener);
+        window.off('closed', _closedListener);
+        _this._unregisterWindow(windowId);
+      };
+
+      // 监听窗口销毁事件
+      window.on('closed', _closedListener);
+    }
+  }, {
+    key: "clearAllWindows",
+    value: function clearAllWindows() {
+      var _this2 = this;
+      this.logger.info('Clear all registered windows');
+      this._windows.forEach(function (window, windowId) {
+        if (window === _this2._mainWindow) return;
+
+        // this._unregisterWindow(windowId);
+
+        if (!window.isDestroyed()) {
+          window.destroy();
+        }
+      });
+    }
+
+    /**
+     * 注销窗口
+     */
+    // unregisterWindow(windowId: string): void {
+    //   this.logger.info(`Unregister window: ${windowId}`);
+    //   this._unregisterWindow(windowId);
+    // }
+
+    /**
+     * 获取窗口
+     */
+  }, {
+    key: "getWindow",
+    value: function getWindow(frameName) {
+      var windowId = this._frameNameToId.get(frameName);
+      if (windowId) {
+        return this._windows.get(windowId);
+      }
+      this.logger.warn("cannot find window for frameName: ".concat(frameName));
+      return undefined;
+    }
+  }, {
+    key: "_unregisterWindow",
+    value: function _unregisterWindow(windowId) {
+      var _this3 = this;
+      var window = this._windows.get(windowId);
+      if (window) {
+        // 移除所有事件监听器
+        var listeners = this._windowEventListeners.get(windowId);
+        if (listeners) {
+          listeners.forEach(function (listener, event) {
+            window.removeListener(event, listener);
+          });
+        }
+        this._windows["delete"](windowId);
+        this._frameNameToId.forEach(function (id, name) {
+          if (id === windowId) {
+            _this3._frameNameToId["delete"](name);
+          }
+        });
+        this._preventCloseWindows["delete"](windowId);
+        this._windowEventListeners["delete"](windowId);
+      }
+    }
+  }, {
+    key: "_setupIpcHandlers",
+    value: function _setupIpcHandlers() {
+      _electron.ipcMain.handle('browser-window-request', this._handleWindowRequest.bind(this));
+    }
+  }, {
+    key: "_handleWindowRequest",
+    value: function () {
+      var _handleWindowRequest2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(_event, data) {
+        var windowId, action, payload, windowIdStr, window;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this.logger.info("Received window request: ".concat(JSON.stringify(data)));
+              windowId = data.windowId, action = data.action, payload = data.payload;
+              windowIdStr = "".concat(windowId);
+              window = this._windows.get(windowIdStr);
+              if (!(!window || window.isDestroyed())) {
+                _context.next = 1;
+                break;
+              }
+              throw new Error("Window ".concat(windowId, " not found or destroyed"));
+            case 1:
+              _context.next = 2;
+              return this._executeWindowAction(window, windowIdStr, action, payload);
+            case 2:
+              return _context.abrupt("return", _context.sent);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function _handleWindowRequest(_x, _x2) {
+        return _handleWindowRequest2.apply(this, arguments);
+      }
+      return _handleWindowRequest;
+    }()
+  }, {
+    key: "_executeWindowAction",
+    value: function () {
+      var _executeWindowAction2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(window, windowId, action, payload) {
+        var posParams, bounds, preventCloseParams, registerParams, unregisterParams, _t;
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              this.logger.info("Execute window action: ".concat(action, ", windowId: ").concat(windowId));
+              _t = action;
+              _context2.next = _t === _ipcProtocol.BrowserWindowIPCAction.MOVE_TOP ? 1 : _t === _ipcProtocol.BrowserWindowIPCAction.SET_POSITION ? 2 : _t === _ipcProtocol.BrowserWindowIPCAction.GET_POSITION ? 3 : _t === _ipcProtocol.BrowserWindowIPCAction.CLOSE ? 4 : _t === _ipcProtocol.BrowserWindowIPCAction.SHOW ? 5 : _t === _ipcProtocol.BrowserWindowIPCAction.HIDE ? 6 : _t === _ipcProtocol.BrowserWindowIPCAction.FOCUS ? 7 : _t === _ipcProtocol.BrowserWindowIPCAction.MAXIMIZE ? 8 : _t === _ipcProtocol.BrowserWindowIPCAction.UNMAXIMIZE ? 9 : _t === _ipcProtocol.BrowserWindowIPCAction.IS_VISIBLE ? 10 : _t === _ipcProtocol.BrowserWindowIPCAction.IS_MAXIMIZED ? 11 : _t === _ipcProtocol.BrowserWindowIPCAction.IS_FULLSCREEN ? 12 : _t === _ipcProtocol.BrowserWindowIPCAction.GET_TITLE ? 13 : _t === _ipcProtocol.BrowserWindowIPCAction.GET_BOUNDS ? 14 : _t === _ipcProtocol.BrowserWindowIPCAction.SET_PREVENT_CLOSE ? 15 : _t === _ipcProtocol.BrowserWindowIPCAction.REGISTER_EVENT_LISTENER ? 16 : _t === _ipcProtocol.BrowserWindowIPCAction.UNREGISTER_EVENT_LISTENER ? 17 : 18;
+              break;
+            case 1:
+              window.moveTop();
+              return _context2.abrupt("continue", 19);
+            case 2:
+              posParams = payload;
+              window.setPosition(posParams.x, posParams.y);
+              return _context2.abrupt("continue", 19);
+            case 3:
+              return _context2.abrupt("return", window.getPosition());
+            case 4:
+              window.close();
+              return _context2.abrupt("continue", 19);
+            case 5:
+              window.show();
+              return _context2.abrupt("continue", 19);
+            case 6:
+              window.hide();
+              return _context2.abrupt("continue", 19);
+            case 7:
+              window.focus();
+              return _context2.abrupt("continue", 19);
+            case 8:
+              window.maximize();
+              return _context2.abrupt("continue", 19);
+            case 9:
+              window.unmaximize();
+              return _context2.abrupt("continue", 19);
+            case 10:
+              return _context2.abrupt("return", window.isVisible());
+            case 11:
+              return _context2.abrupt("return", window.isMaximized());
+            case 12:
+              return _context2.abrupt("return", window.isFullScreen());
+            case 13:
+              return _context2.abrupt("return", window.getTitle());
+            case 14:
+              bounds = window.getBounds();
+              return _context2.abrupt("return", {
+                x: bounds.x,
+                y: bounds.y,
+                width: bounds.width,
+                height: bounds.height
+              });
+            case 15:
+              preventCloseParams = payload;
+              if (preventCloseParams.prevent) {
+                this.logger.info("Set prevent close for window: ".concat(windowId));
+                this._preventCloseWindows.add(windowId);
+              } else {
+                this.logger.info("Unset prevent close for window: ".concat(windowId));
+                this._preventCloseWindows["delete"](windowId);
+              }
+              return _context2.abrupt("continue", 19);
+            case 16:
+              registerParams = payload;
+              this._registerWindowEventListeners(window, windowId, registerParams.events);
+              return _context2.abrupt("continue", 19);
+            case 17:
+              unregisterParams = payload;
+              this._unregisterWindowEventListeners(window, windowId, unregisterParams.events);
+              return _context2.abrupt("continue", 19);
+            case 18:
+              throw new Error("Unknown action: ".concat(action));
+            case 19:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function _executeWindowAction(_x3, _x4, _x5, _x6) {
+        return _executeWindowAction2.apply(this, arguments);
+      }
+      return _executeWindowAction;
+    }()
+  }, {
+    key: "_registerWindowEventListeners",
+    value: function _registerWindowEventListeners(window, windowId, events) {
+      var _this4 = this;
+      this.logger.info("Register event listeners for window ".concat(windowId, ": ").concat(events));
+      var windowListeners = this._windowEventListeners.get(windowId);
+      if (!windowListeners) return;
+      events.forEach(function (eventName) {
+        if (windowListeners.has(eventName)) {
+          return; // 已经注册过了
+        }
+        var listener = function listener() {
+          for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+            args[_key] = arguments[_key];
+          }
+          _this4._notifyWindowEvent(window, windowId, eventName, args);
+        };
+        windowListeners.set(eventName, listener);
+        _this4.logger.info("Add listener for event ".concat(eventName, " on window ").concat(windowId));
+        window.on(eventName, listener);
+      });
+    }
+  }, {
+    key: "_unregisterWindowEventListeners",
+    value: function _unregisterWindowEventListeners(window, windowId, events) {
+      this.logger.info("Unregister event listeners for window ".concat(windowId, ": ").concat(events));
+      var windowListeners = this._windowEventListeners.get(windowId);
+      if (!windowListeners) return;
+      events.forEach(function (eventName) {
+        var listener = windowListeners.get(eventName);
+        if (listener) {
+          window.removeListener(eventName, listener);
+          windowListeners["delete"](eventName);
+        }
+      });
+    }
+  }, {
+    key: "_notifyWindowEvent",
+    value: function _notifyWindowEvent(window, windowId, eventName, args) {
+      // isDestroyed is true when 'closed' event is emitted
+      if (eventName !== 'closed' && window.isDestroyed()) {
+        this.logger.info("window is destroyed, skip notify event: ".concat(eventName, ", windowId: ").concat(windowId));
+        return;
+      }
+      var actionMap = {
+        show: _ipcProtocol.BrowserWindowIPCAction.EVENT_SHOW,
+        hide: _ipcProtocol.BrowserWindowIPCAction.EVENT_HIDE,
+        resized: _ipcProtocol.BrowserWindowIPCAction.EVENT_RESIZED,
+        moved: _ipcProtocol.BrowserWindowIPCAction.EVENT_MOVED,
+        close: _ipcProtocol.BrowserWindowIPCAction.EVENT_CLOSE,
+        closed: _ipcProtocol.BrowserWindowIPCAction.EVENT_CLOSED,
+        focus: _ipcProtocol.BrowserWindowIPCAction.EVENT_FOCUS,
+        blur: _ipcProtocol.BrowserWindowIPCAction.EVENT_BLUR
+      };
+      var action = actionMap[eventName];
+      if (!action) return;
+
+      // 根据事件类型转换数据，确保可序列化
+      var eventData = null;
+      switch (eventName) {
+        case 'resized':
+        case 'moved':
+          // 对于 resized 和 moved 事件，传递窗口的 bounds 信息
+          var bounds = window.getBounds();
+          eventData = {
+            x: bounds.x,
+            y: bounds.y,
+            width: bounds.width,
+            height: bounds.height
+          };
+          break;
+        case 'show':
+        case 'hide':
+        case 'focus':
+        case 'blur':
+        case 'close':
+        case 'closed':
+          // 这些事件不需要额外数据
+          eventData = null;
+          break;
+        default:
+          // 对于其他事件，尝试序列化 args，如果失败则设为 null
+          try {
+            eventData = args.length === 1 ? args[0] : args;
+            JSON.stringify(eventData); // 测试是否可序列化
+          } catch (_unused) {
+            eventData = null;
+          }
+      }
+      var notification = {
+        windowId: windowId,
+        event: action,
+        data: eventData
+      };
+      try {
+        this.logger.info("notify window event: ".concat(JSON.stringify(notification)));
+
+        // 通过主窗口发送事件，因为所有监听器都在主窗口的 preload 中
+        if (this._mainWindow && !this._mainWindow.isDestroyed()) {
+          this._mainWindow.webContents.send('browser-window-event', notification);
+        } else {
+          this.logger.warn('main window not available for event broadcasting');
+        }
+      } catch (error) {
+        this.logger.error("failed to send window event notification: ".concat(error));
+      }
+    }
+
+    /**
+     * 处理主窗口关闭事件
+     */
+  }, {
+    key: "_handleMainWindowClose",
+    value: function _handleMainWindowClose(event, windowId, shouldPreventClose) {
+      if (shouldPreventClose) {
+        this.logger.info("Prevent close main window: ".concat(windowId));
+        event.preventDefault();
+      }
+    }
+
+    /**
+     * 处理子窗口关闭事件
+     */
+  }, {
+    key: "_handleSubWindowClose",
+    value: function _handleSubWindowClose(event, window, windowId, shouldPreventClose) {
+      event.preventDefault();
+      if (shouldPreventClose) {
+        this.logger.info("Prevent close sub window: ".concat(windowId));
+      } else {
+        this.logger.info("Hide sub window instead of closing it: ".concat(windowId));
+        this._notifyWindowEvent(window, windowId, 'closed', []);
+      }
+    }
+  }]);
+}(); // 全局单例
+var browserWindowIPCHandler = exports.browserWindowIPCHandler = new BrowserWindowIPCHandler();

package/lib/electron/window.d.ts

@@ -5,8 +5,4 @@ export declare const open: (entryPath: string, dialogId?: string) => void;
 export declare const close: (entryPath: string, dialogId?: string) => void;
 export declare const getWindowKeyById: (windowId: number) => string;
 export declare const closeAllWindows: () => void;
-export declare const putRendererWindow: (entryPath: string, browserWindow: Electron.BrowserWindow) => void;
-export declare const deleteRendererWindow: (entryPath: string) => void;
-export declare const getRendererWindow: (entryPath: string) => Electron.BrowserWindow;
-export declare const clearAllRendererWindows: () => void;
 export declare const setFragmentBaseUrl: (_isDev: boolean, _baseUrl: string) => void;

package/lib/electron/window.js

@@ -9,6 +9,7 @@ require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
@@ -24,10 +25,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.windowOptionsMap = exports.webPreferencesMap = exports.setFragmentBaseUrl = exports.putRendererWindow = exports.open = exports.getWindowKeyById = exports.getRendererWindow = exports.deleteRendererWindow = exports.closeAllWindows = exports.close = exports.clearAllRendererWindows = void 0;
+exports.windowOptionsMap = exports.webPreferencesMap = exports.setFragmentBaseUrl = exports.open = exports.getWindowKeyById = exports.closeAllWindows = exports.close = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 require("core-js/modules/es.array.concat.js");
-require("core-js/modules/es.object.keys.js");
 var _electron = require("electron");
 var _defaultOptions = require("./default-options");
 var env = _interopRequireWildcard(require("./env"));
@@ -37,8 +37,9 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var windowOptionsMap = exports.windowOptionsMap = {};
 var webPreferencesMap = exports.webPreferencesMap = {};
+
+// fragments
 var windows = {};
-var rendererWindows = {};
 var windowKeyById = {};
 var isDev = env.isDev;
 var baseUrl = env.devPageUrl;
@@ -74,6 +75,7 @@ var open = exports.open = function open(entryPath, dialogId) {
   }
 };
 var close = exports.close = function close(entryPath, dialogId) {
+  logger.info("close window, entryPath: ".concat(entryPath, ", dialogId: ").concat(dialogId));
   var key = entryPath + (dialogId ? dialogId : '');
   if (key in windows) {
     var browserWindow = windows[key];
@@ -88,29 +90,16 @@ var getWindowKeyById = exports.getWindowKeyById = function getWindowKeyById(wind
   return windowKeyById[windowId];
 };
 var closeAllWindows = exports.closeAllWindows = function closeAllWindows() {
+  logger.info('close all windows');
   for (var key in windows) {
-    windows[key].destroy();
+    var window = windows[key];
+    if (!window.isDestroyed()) {
+      window.close();
+    }
   }
   windows = {};
   windowKeyById = {};
 };
-var putRendererWindow = exports.putRendererWindow = function putRendererWindow(entryPath, browserWindow) {
-  logger.info("[RendererWindow] putRendererWindow', ".concat(entryPath, ", '<-test'"));
-  rendererWindows[entryPath] = browserWindow;
-};
-var deleteRendererWindow = exports.deleteRendererWindow = function deleteRendererWindow(entryPath) {
-  logger.info("[RendererWindow] deleteRendererWindow', ".concat(entryPath));
-  delete rendererWindows[entryPath];
-};
-var getRendererWindow = exports.getRendererWindow = function getRendererWindow(entryPath) {
-  logger.info("[RendererWindow] getRendererWindow',\n    ".concat(entryPath, ",\n    ").concat(String(Object.keys(rendererWindows)), ",\n    ").concat(String(rendererWindows[entryPath])));
-  return rendererWindows[entryPath];
-};
-var clearAllRendererWindows = exports.clearAllRendererWindows = function clearAllRendererWindows() {
-  for (var key in rendererWindows) {
-    rendererWindows[key].emit('will-close');
-  }
-};
 var setFragmentBaseUrl = exports.setFragmentBaseUrl = function setFragmentBaseUrl(_isDev, _baseUrl) {
   isDev = _isDev;
   baseUrl = _baseUrl;

package/lib/fragments/annotation/index.d.ts

@@ -1,4 +1,5 @@
 import { BaseFragment } from '../base';
+import { RendererCustomEvent, Runtime } from '../../runtime';
 export declare class AnnotationFragment extends BaseFragment {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _fragmentStore;

package/lib/fragments/annotation/index.js

@@ -127,7 +127,9 @@ var title = exports.title = 'Annotation';
 var webPreferences = exports.webPreferences = {
   nodeIntegration: true
 };
-var $$fragment = new AnnotationFragment(window.runtime);
+var $$fragment = new AnnotationFragment(
+// @ts-ignore
+window.runtime);
 var App = function App() {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react["default"].Fragment, {
     children: $$fragment.component

package/lib/fragments/annotation/store.d.ts

@@ -1,3 +1,4 @@
+import { RendererCustomEvent } from '../../runtime';
 export declare class FragmentAnnotationStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _engine;