@lynker-desktop/electron-window-manager 0.0.9-alpha.45 → 0.0.9-alpha.47

package/main/index.js

@@ -3,6 +3,7 @@ const electron = require('electron');
 const remote = require('@electron/remote/main');
 const eIpc = require('@lynker-desktop/electron-ipc/main');
 const md5 = require('md5');
+const PQueue = require('p-queue');
 
 function _interopNamespaceDefault(e) {
   const n = Object.create(null);
@@ -21,7 +22,7 @@ const getQueue = (() => {
     let queue;
     return async () => {
         if (!queue) {
-            const { default: PQueue } = await import('p-queue');
+            // const { default: PQueue } = await import('p-queue')
             queue = new PQueue({ concurrency: 1 });
         }
         return queue;
@@ -80,6 +81,8 @@ class WindowsManager {
      *   - 'localhost'、'127.0.0.1'、'::1' 以及局域网 IP（如 192.168.x.x、10.x.x.x、172.16.x.x~172.31.x.x）都视为本地白名单。
      */
     constructor(preload, loadingViewUrl, errorViewUrl, preloadWebContentsConfig, webviewDomainWhiteList) {
+        // 按名称索引的 Map，用于加速查找
+        this.windowsByName = new Map();
         // 预加载的窗口
         this.preloadedBW = null;
         // 预加载的窗口（无边框，有按钮）
@@ -90,9 +93,10 @@ class WindowsManager {
         this.preloadedBV = null;
         this.preloading = false;
         this.webviewDomainWhiteList = [];
-        // 创建队列相关属性
-        this.createQueue = [];
-        this.isCreating = false;
+        // 窗口销毁检查的防抖函数，避免频繁检查
+        this.cleanupDestroyedWindowsDebounced = lodash.debounce(() => {
+            this._cleanupDestroyedWindows();
+        }, 500);
         /**
          * 防抖的排序方法
          * @param window 目标窗口
@@ -145,6 +149,20 @@ class WindowsManager {
             log('error', 'setPreloadWebContentsConfig error:', error);
         }
     }
+    /**
+     * Promise 超时包装函数
+     * @param promise 要包装的 Promise
+     * @param timeout 超时时间（毫秒）
+     * @param errorMessage 超时错误信息
+     */
+    async _withTimeout(promise, timeout, errorMessage) {
+        const timeoutPromise = new Promise((_, reject) => {
+            setTimeout(() => {
+                reject(new Error(errorMessage));
+            }, timeout);
+        });
+        return Promise.race([promise, timeoutPromise]);
+    }
     /**
      * 预加载实例
      */
@@ -155,54 +173,63 @@ class WindowsManager {
         try {
             if (this.preloadWebContentsConfig) {
                 log('log', 'preloadWebContentsConfig: ', this.preloadWebContentsConfig);
+                const preloadPromises = [];
                 // 根据配置决定是否预加载普通窗口
-                if (this.preloadWebContentsConfig.enableBW !== false) {
-                    if (!this.preloadedBW) {
-                        this._createPreloadBW({}).then(i => {
-                            this.preloadedBW = i;
-                            log('log', 'init preloadedBW: ', !!this.preloadedBW);
-                        });
-                    }
+                if (this.preloadWebContentsConfig.enableBW !== false && !this.preloadedBW) {
+                    preloadPromises.push(this._createPreloadBW({}).then(i => {
+                        this.preloadedBW = i;
+                        log('log', 'init preloadedBW: ', !!this.preloadedBW);
+                    }).catch(error => {
+                        log('error', '预加载 BW 失败:', error);
+                    }));
                 }
                 // 根据配置决定是否预加载无边框有按钮的窗口
-                if (this.preloadWebContentsConfig.enableBW_FramelessWithButtons !== false) {
-                    if (!this.preloadedBW_FramelessWithButtons) {
-                        this._createPreloadBW({
-                            frame: false,
-                            // transparent: true,
-                            autoHideMenuBar: true,
-                            titleBarStyle: 'hidden',
-                        }).then(i => {
-                            this.preloadedBW_FramelessWithButtons = i;
-                            log('log', 'init preloadedBW_FramelessWithButtons: ', !!this.preloadedBW_FramelessWithButtons);
-                        });
-                    }
+                if (this.preloadWebContentsConfig.enableBW_FramelessWithButtons !== false && !this.preloadedBW_FramelessWithButtons) {
+                    preloadPromises.push(this._createPreloadBW({
+                        frame: false,
+                        autoHideMenuBar: true,
+                        titleBarStyle: 'hidden',
+                    }).then(i => {
+                        this.preloadedBW_FramelessWithButtons = i;
+                        log('log', 'init preloadedBW_FramelessWithButtons: ', !!this.preloadedBW_FramelessWithButtons);
+                    }).catch(error => {
+                        log('error', '预加载 BW_FramelessWithButtons 失败:', error);
+                    }));
                 }
                 // 根据配置决定是否预加载无边框无按钮的窗口
-                if (this.preloadWebContentsConfig.enableBW_FramelessNoButtons !== false) {
-                    if (!this.preloadedBW_FramelessNoButtons) {
-                        this._createPreloadBW({
-                            frame: false,
-                            // transparent: true,
-                            autoHideMenuBar: true,
-                            titleBarStyle: 'default',
-                        }).then(i => {
-                            this.preloadedBW_FramelessNoButtons = i;
-                            log('log', 'init preloadedBW_FramelessNoButtons: ', !!this.preloadedBW_FramelessNoButtons);
-                        });
-                    }
+                if (this.preloadWebContentsConfig.enableBW_FramelessNoButtons !== false && !this.preloadedBW_FramelessNoButtons) {
+                    preloadPromises.push(this._createPreloadBW({
+                        frame: false,
+                        autoHideMenuBar: true,
+                        titleBarStyle: 'default',
+                    }).then(i => {
+                        this.preloadedBW_FramelessNoButtons = i;
+                        log('log', 'init preloadedBW_FramelessNoButtons: ', !!this.preloadedBW_FramelessNoButtons);
+                    }).catch(error => {
+                        log('error', '预加载 BW_FramelessNoButtons 失败:', error);
+                    }));
                 }
                 // 根据配置决定是否预加载浏览器视图
-                if (this.preloadWebContentsConfig.enableBV !== false) {
-                    if (!this.preloadedBV) {
-                        this._createPreloadBV().then(i => {
-                            this.preloadedBV = i;
-                            log('log', 'init preloadedBV: ', !!this.preloadedBV);
-                        });
+                if (this.preloadWebContentsConfig.enableBV !== false && !this.preloadedBV) {
+                    preloadPromises.push(this._createPreloadBV().then(i => {
+                        this.preloadedBV = i;
+                        log('log', 'init preloadedBV: ', !!this.preloadedBV);
+                    }).catch(error => {
+                        log('error', '预加载 BV 失败:', error);
+                    }));
+                }
+                if (preloadPromises.length > 0) {
+                    // 添加超时机制，默认 10 秒超时
+                    const timeout = 10000; // 10 秒
+                    try {
+                        await this._withTimeout(Promise.allSettled(preloadPromises), timeout, `预加载超时（${timeout}ms）`);
+                    }
+                    catch (error) {
+                        log('error', '预加载超时:', error);
+                        // 超时后继续执行，不阻塞后续流程
                     }
                 }
             }
-            await new Promise(resolve => setTimeout(resolve, 1000));
         }
         catch (e) {
             log('error', '预创建实例失败', e);
@@ -629,46 +656,45 @@ class WindowsManager {
             }
             window.webContents.on('did-attach-webview', (_event, webContents) => {
                 const tryEnable = () => {
-                    const url = webContents.getURL();
-                    // 判断是否本地/内网IP
-                    const isLocalhost = (hostname) => {
-                        return (hostname === 'localhost' ||
-                            hostname === '127.0.0.1' ||
-                            hostname === '::1' ||
-                            /^192\.168\./.test(hostname) ||
-                            /^10\./.test(hostname) ||
-                            /^172\.(1[6-9]|2[0-9]|3[0-1])\./.test(hostname));
-                    };
-                    if (this.webviewDomainWhiteList && this.webviewDomainWhiteList.length > 0) {
-                        try {
-                            const { hostname } = new URL(url);
-                            // 优化白名单判断，支持 .example.com 形式的子域名通配和本地/内网IP
-                            const isWhiteListed = this.webviewDomainWhiteList.some(domain => {
-                                if (domain === 'localhost' || domain === '127.0.0.1' || domain === '::1') {
-                                    return isLocalhost(hostname);
-                                }
-                                if (domain.startsWith('.')) {
-                                    // .example.com 允许所有 *.example.com
-                                    return hostname === domain.slice(1) || hostname.endsWith(domain);
+                    try {
+                        const url = webContents.getURL();
+                        if (!url || url === 'about:blank') {
+                            return;
+                        }
+                        if (this.webviewDomainWhiteList && this.webviewDomainWhiteList.length > 0) {
+                            try {
+                                const { hostname } = new URL(url);
+                                // 优化白名单判断，支持 .example.com 形式的子域名通配和本地/内网IP
+                                const isWhiteListed = this.webviewDomainWhiteList.some(domain => {
+                                    if (domain === 'localhost' || domain === '127.0.0.1' || domain === '::1') {
+                                        return this._isLocalhost(hostname);
+                                    }
+                                    if (domain.startsWith('.')) {
+                                        // .example.com 允许所有 *.example.com
+                                        return hostname === domain.slice(1) || hostname.endsWith(domain);
+                                    }
+                                    else {
+                                        // 精确匹配
+                                        return hostname === domain;
+                                    }
+                                }) || this._isLocalhost(hostname); // 允许本地回环和内网地址
+                                if (isWhiteListed) {
+                                    enable(webContents);
                                 }
                                 else {
-                                    // 精确匹配
-                                    return hostname === domain;
+                                    log('log', 'webview 域名未在白名单，未启用 remote', url);
                                 }
-                            }) || isLocalhost(hostname); // 允许本地回环和内网地址
-                            if (isWhiteListed) {
-                                enable(webContents);
                             }
-                            else {
-                                log('log', 'webview 域名未在白名单，未启用 remote', url);
+                            catch {
+                                log('log', 'webview url 解析失败，未启用 remote', url);
                             }
                         }
-                        catch {
-                            log('log', 'webview url 解析失败，未启用 remote', url);
+                        else {
+                            enable(webContents); // 没有配置白名单则全部允许
                         }
                     }
-                    else {
-                        enable(webContents); // 没有配置白名单则全部允许
+                    catch (error) {
+                        log('error', 'tryEnable webview error:', error);
                     }
                 };
                 // 只监听一次，防止多次触发
@@ -680,11 +706,14 @@ class WindowsManager {
                 webContents.on('did-navigate', onDidNavigate);
                 webContents.on('did-finish-load', onDidNavigate);
             });
-            window.webContents.on('close', () => {
-                this.windows.delete(window.id || window._id);
-            });
+            // window.webContents.on('close', () => {
+            //   this.windows.delete(window.id || window._id)
+            // })
             window.webContents.on('destroyed', () => {
-                this.windows.delete(window.id || window._id);
+                const winId = window.id || window._id;
+                this.windows.delete(winId);
+                // 同步清理名称索引
+                this.windowsByName.delete(window._name);
             });
             window.webContents.on('dom-ready', () => {
                 if (openDevTools) {
@@ -699,14 +728,20 @@ class WindowsManager {
                 // @ts-ignore
                 window.on('closed', () => {
                     log('log', 'closed', window.id, window._name);
-                    this.windows.delete(window.id || window._id);
+                    const winId = window.id || window._id;
+                    this.windows.delete(winId);
+                    // 同步清理名称索引
+                    this.windowsByName.delete(window._name);
                 });
             }
             if (type === 'BV') {
                 parentWin?.addBrowserView(window);
                 log('log', 'create - addBrowserView');
             }
-            this.windows.set(window.id || window._id || window.webContents.id, window);
+            const winId = window.id || window._id || window.webContents.id;
+            this.windows.set(winId, window);
+            // 同步更新名称索引
+            this.windowsByName.set(window._name, winId);
             log('log', 'create', this.windows.keys());
             // 初始化值
             window.webContents.on('did-finish-load', () => {
@@ -900,149 +935,213 @@ class WindowsManager {
             window.webContents.on('did-stop-loading', onFailure);
         }
     }
+    /**
+     * 检查窗口是否已销毁
+     */
+    _isWindowDestroyed(win) {
+        try {
+            return !win || !win.webContents || win.webContents.isDestroyed();
+        }
+        catch {
+            return true;
+        }
+    }
+    /**
+     * 判断是否本地/内网IP
+     */
+    _isLocalhost(hostname) {
+        return (hostname === 'localhost' ||
+            hostname === '127.0.0.1' ||
+            hostname === '::1' ||
+            /^192\.168\./.test(hostname) ||
+            /^10\./.test(hostname) ||
+            /^172\.(1[6-9]|2[0-9]|3[0-1])\./.test(hostname));
+    }
+    /**
+     * 清理已销毁的窗口（延迟执行，避免频繁检查）
+     */
+    _cleanupDestroyedWindows() {
+        const toDelete = [];
+        this.windows.forEach((win, key) => {
+            if (this._isWindowDestroyed(win)) {
+                toDelete.push(key);
+                // 同步清理名称索引
+                if (win?._name) {
+                    this.windowsByName.delete(win._name);
+                }
+            }
+        });
+        toDelete.forEach(key => this.windows.delete(key));
+    }
     get(idOrName) {
         log('log', 'get', idOrName);
         let win;
-        this.windows.forEach((i, key) => {
-            try {
-                if (!(i && i?.webContents?.isDestroyed && !i?.webContents?.isDestroyed?.())) {
-                    this.windows.delete(key);
-                }
-            }
-            catch (error) {
-                log('error', 'get');
+        if (typeof idOrName === 'number') {
+            // 按 ID 查找（O(1)）
+            win = this.windows.get(idOrName);
+            // 如果找不到，尝试按 _id 查找
+            if (!win) {
+                this.windows.forEach(w => {
+                    if (w._id === idOrName) {
+                        win = w;
+                    }
+                });
             }
-            if (typeof idOrName === 'number') {
-                if (i?.id === idOrName || i?._id === idOrName) {
-                    win = i;
-                }
+        }
+        else if (typeof idOrName === 'string') {
+            // 按名称查找（O(1)，使用索引）
+            const winId = this.windowsByName.get(idOrName);
+            if (winId !== undefined) {
+                win = this.windows.get(winId);
             }
-            else if (typeof idOrName === 'string') {
-                if (i?._name === idOrName) {
-                    win = i;
-                }
+            // 如果索引中找不到，回退到遍历查找（兼容旧数据）
+            if (!win) {
+                this.windows.forEach(w => {
+                    if (w._name === idOrName) {
+                        win = w;
+                        // 更新索引
+                        this.windowsByName.set(idOrName, w.id || w._id);
+                    }
+                });
             }
-        });
-        // @ts-ignore
-        if (win && win?.webContents?.isDestroyed && !win?.webContents?.isDestroyed?.()) {
+        }
+        // 检查找到的窗口是否已销毁
+        if (win && !this._isWindowDestroyed(win)) {
             return win;
         }
+        // 窗口已销毁，触发清理
+        if (win) {
+            const winId = win.id || win._id;
+            this.windows.delete(winId);
+            if (win._name) {
+                this.windowsByName.delete(win._name);
+            }
+        }
+        // 延迟清理其他已销毁的窗口
+        this.cleanupDestroyedWindowsDebounced();
         return undefined;
     }
     getAll(type) {
         log('log', 'getAll');
-        const bwWindows = new Map();
-        const bvWindows = new Map();
+        // 先清理已销毁的窗口
+        const toDelete = [];
         this.windows.forEach((win, key) => {
-            if (!(win && win?.webContents?.isDestroyed && !win?.webContents?.isDestroyed?.())) {
-                this.windows.delete(key);
-            }
-            if (win?._type === 'BW') {
-                bwWindows.set(key, win);
-            }
-            if (win?._type === 'BV') {
-                bvWindows.set(key, win);
+            if (this._isWindowDestroyed(win)) {
+                toDelete.push(key);
+                if (win?._name) {
+                    this.windowsByName.delete(win._name);
+                }
             }
         });
-        if (type === 'BW') {
-            return bwWindows;
+        toDelete.forEach(key => this.windows.delete(key));
+        if (!type) {
+            return this.windows;
         }
-        if (type === 'BV') {
-            return bvWindows;
-        }
-        return this.windows;
+        const result = new Map();
+        this.windows.forEach((win, key) => {
+            if (!this._isWindowDestroyed(win) && win._type === type) {
+                result.set(key, win);
+            }
+        });
+        // 使用类型断言，TypeScript 会通过方法重载确保类型正确
+        return result;
     }
     close(idOrName) {
         log('log', 'close', idOrName);
-        let win = undefined;
-        this.windows.forEach((i) => {
-            if (typeof idOrName === 'number') {
-                if (i?.id === idOrName || i?._id === idOrName) {
-                    win = i;
-                }
-            }
-            else if (typeof idOrName === 'string') {
-                if (i?._name === idOrName) {
-                    win = i;
-                }
-            }
-        });
-        // @ts-ignore
-        win && this.windows.delete(win?.id);
-        // @ts-ignore
-        if (win) {
-            // @ts-ignore
+        const win = this.get(idOrName);
+        if (!win) {
+            return false;
+        }
+        const winId = win.id || win._id;
+        this.windows.delete(winId);
+        if (win._name) {
+            this.windowsByName.delete(win._name);
+        }
+        try {
             if (win._type === 'BV') {
+                // 从所有 BW 窗口中移除该 BV
                 this.windows.forEach(i => {
-                    if (i?._type === 'BW') {
+                    if (i?._type === 'BW' && !this._isWindowDestroyed(i)) {
                         const _win = i;
-                        _win.removeBrowserView(win);
+                        try {
+                            _win.removeBrowserView(win);
+                        }
+                        catch (error) {
+                            // 忽略错误，可能已经移除
+                        }
                     }
                 });
             }
             // @ts-ignore
-            win?.webContents?.destroy?.();
+            win.webContents?.destroy?.();
             // @ts-ignore
-            win?.close?.();
+            win.close?.();
             // @ts-ignore
-            win?.destroy?.();
+            win.destroy?.();
+        }
+        catch (error) {
+            log('error', 'close window error:', error);
         }
         return true;
     }
     closeAll() {
         log('log', 'closeAll');
-        this.windows.forEach((win) => {
+        const windowsToClose = Array.from(this.windows.values());
+        // 先清空 Map，避免在遍历过程中修改
+        this.windows.clear();
+        this.windowsByName.clear();
+        // 收集所有 BW 窗口，用于批量移除 BV
+        const bwWindows = windowsToClose.filter(w => w._type === 'BW' && !this._isWindowDestroyed(w));
+        const bvWindows = windowsToClose.filter(w => w._type === 'BV');
+        // 先从所有 BW 窗口中移除 BV
+        bvWindows.forEach(bv => {
+            bwWindows.forEach(bw => {
+                try {
+                    bw.removeBrowserView(bv);
+                }
+                catch (error) {
+                    // 忽略错误，可能已经移除
+                }
+            });
+        });
+        // 然后销毁所有窗口
+        windowsToClose.forEach((win) => {
             try {
-                win && this.windows.delete(win?.id);
-                // @ts-ignore
-                if (win._type === 'BV') {
-                    this.windows.forEach(i => {
-                        if (i?._type === 'BW') {
-                            const _win = i;
-                            _win.removeBrowserView(win);
-                        }
-                    });
+                if (this._isWindowDestroyed(win)) {
+                    return;
                 }
                 // @ts-ignore
-                win?.webContents?.destroy?.();
+                win.webContents?.destroy?.();
                 // @ts-ignore
-                win?.close?.();
+                win.close?.();
                 // @ts-ignore
-                win?.destroy?.();
+                win.destroy?.();
             }
             catch (error) {
+                log('error', 'closeAll error:', error);
             }
         });
     }
     rename(idOrName, newName) {
         log('log', 'rename', idOrName, newName);
-        let win = undefined;
-        // 先查找目标窗口
-        if (typeof idOrName === 'number') {
-            win = this.get(idOrName);
-        }
-        else if (typeof idOrName === 'string') {
-            this.windows.forEach(i => {
-                if (i?._name === idOrName) {
-                    win = i;
-                }
-            });
-        }
+        const win = this.get(idOrName);
         if (!win) {
-            // 没有找到目标窗口
             return undefined;
         }
-        // 检查新名字是否已存在
-        let nameExists = false;
-        this.windows.forEach(i => {
-            if (i !== win && i?._name === newName) {
-                nameExists = true;
+        // 检查新名字是否已存在（使用索引加速）
+        const existingWinId = this.windowsByName.get(newName);
+        if (existingWinId !== undefined) {
+            const existingWin = this.windows.get(existingWinId);
+            if (existingWin && existingWin !== win && !this._isWindowDestroyed(existingWin)) {
+                // 新名字已被占用
+                return undefined;
             }
-        });
-        if (nameExists) {
-            // 新名字已被占用
-            return undefined;
         }
+        // 更新名称索引
+        const oldName = win._name;
+        const winId = win.id || win._id;
+        this.windowsByName.delete(oldName);
+        this.windowsByName.set(newName, winId);
         // 修改名字并同步 webContents
         win._name = newName;
         initWebContentsVal(win, `${this.preload || ''}`);
@@ -1050,12 +1149,7 @@ class WindowsManager {
     }
     reInitUrl(idOrName, url) {
         log('log', 'reInitUrl', idOrName, url);
-        let win = undefined;
-        this.windows.forEach(i => {
-            if (i?._name === idOrName) {
-                win = i;
-            }
-        });
+        const win = this.get(idOrName);
         if (!win) {
             return undefined;
         }
@@ -1256,21 +1350,25 @@ class WindowsManager {
      */
     _sortBrowserViews(window, addView) {
         try {
+            if (window.isDestroyed()) {
+                return;
+            }
             const views = window.getBrowserViews() || [];
             if (views.length <= 1)
                 return;
             log('log', 'sortBrowserViews', views?.map(i => i.webContents.id));
-            // 按zIndex层级排序，数值小的在前
-            const sortedViews = views.sort((a, b) => {
+            // 创建排序后的视图数组（不修改原数组）
+            const sortedViews = [...views].sort((a, b) => {
                 const zIndexA = a._zIndex ?? 0;
                 const zIndexB = b._zIndex ?? 0;
                 return zIndexA - zIndexB;
             });
-            // 检查是否已经按正确顺序排列
+            // 检查是否已经按正确顺序排列（优化：提前退出）
             let needsReorder = false;
             for (let i = 0; i < views.length; i++) {
-                // @ts-ignore
-                if (views[i].webContents.id !== sortedViews[i].webContents.id) {
+                const view = views[i];
+                const sortedView = sortedViews[i];
+                if (!view || !sortedView || view.webContents.id !== sortedView.webContents.id) {
                     needsReorder = true;
                     break;
                 }
@@ -1279,36 +1377,36 @@ class WindowsManager {
             // 如果已经按正确顺序排列，则不需要重新排序
             if (!needsReorder)
                 return;
-            // 使用批量操作来减少闪烁
-            // 临时隐藏窗口内容
-            const wasVisible = window.isVisible();
-            if (wasVisible) {
-                // window.hide();
-            }
-            // 移除所有BrowserView
+            // 移除所有BrowserView（排除刚添加的视图，避免不必要的操作）
             views.forEach(view => {
                 if (addView?.webContents?.id !== view.webContents.id) {
-                    // @ts-ignore
-                    window.removeBrowserView(view, false);
+                    try {
+                        // @ts-ignore
+                        window.removeBrowserView(view, false);
+                    }
+                    catch (error) {
+                        // 忽略错误，视图可能已经被移除
+                    }
                 }
             });
             // 按正确顺序重新添加
             sortedViews.forEach((view, index) => {
-                if (index === 0) {
-                    // 第一个设置为当前视图
-                    // @ts-ignore
-                    window.setBrowserView(view, false);
+                try {
+                    if (index === 0) {
+                        // 第一个设置为当前视图
+                        // @ts-ignore
+                        window.setBrowserView(view, false);
+                    }
+                    else {
+                        // 其他视图添加到后面
+                        // @ts-ignore
+                        window.addBrowserView(view, false);
+                    }
                 }
-                else {
-                    // 其他视图添加到后面
-                    // @ts-ignore
-                    window.addBrowserView(view, false);
+                catch (error) {
+                    log('error', 'addBrowserView in sortBrowserViews error:', error);
                 }
             });
-            // 恢复窗口显示
-            if (wasVisible) {
-                // window.show();
-            }
         }
         catch (error) {
             log('error', 'sortBrowserViews error:', error);