@lynker-desktop/electron-window-manager 0.0.9-alpha.50 → 0.0.9-alpha.51

package/main/index.js

@@ -6,14 +6,14 @@ const md5 = require('md5');
 const PQueue = require('p-queue');
 
 function _interopNamespaceDefault(e) {
-  const n = Object.create(null);
-  if (e) {
-    for (const k in e) {
-      n[k] = e[k];
+    const n = Object.create(null);
+    if (e) {
+        for (const k in e) {
+            n[k] = e[k];
+        }
     }
-  }
-  n.default = e;
-  return n;
+    n.default = e;
+    return n;
 }
 
 const remote__namespace = /*#__PURE__*/_interopNamespaceDefault(remote);
@@ -47,21 +47,30 @@ const enable = (win) => {
     remote__namespace.enable(win);
 };
 const initWebContentsVal = (win, preload) => {
-    win.webContents.executeJavaScript(`
     try {
-      const data = {
-        __ELECTRON_WINDOW_MANAGER_WEB_CONTENTS_ID__: ${JSON.stringify(win.webContents.id)},
-        __ELECTRON_WINDOW_MANAGER_TYPE__: ${JSON.stringify(win._type)},
-        __ELECTRON_WINDOW_MANAGER_NAME__: ${JSON.stringify(win._name)},
-        __ELECTRON_WINDOW_MANAGER_EXTRA_DATA__: ${JSON.stringify(win._extraData || '')},
-        __ELECTRON_WINDOW_MANAGER_PRELOAD__: ${JSON.stringify(preload)},
-        __ELECTRON_WINDOW_MANAGER_INIT_URL__: ${JSON.stringify(win._initUrl || '')}
-      };
-      Object.entries(data).forEach(([key, value]) => {
-        window[key] = value;
-      });
-    } catch (error) {}
-  `);
+        if (!win?.webContents || win.webContents.isDestroyed()) {
+            return;
+        }
+        const webContentsId = win.webContents.id;
+        win.webContents.executeJavaScript(`
+      try {
+        const data = {
+          __ELECTRON_WINDOW_MANAGER_WEB_CONTENTS_ID__: ${JSON.stringify(webContentsId)},
+          __ELECTRON_WINDOW_MANAGER_TYPE__: ${JSON.stringify(win._type)},
+          __ELECTRON_WINDOW_MANAGER_NAME__: ${JSON.stringify(win._name)},
+          __ELECTRON_WINDOW_MANAGER_EXTRA_DATA__: ${JSON.stringify(win._extraData || '')},
+          __ELECTRON_WINDOW_MANAGER_PRELOAD__: ${JSON.stringify(preload)},
+          __ELECTRON_WINDOW_MANAGER_INIT_URL__: ${JSON.stringify(win._initUrl || '')}
+        };
+        Object.entries(data).forEach(([key, value]) => {
+          window[key] = value;
+        });
+      } catch (error) {}
+    `);
+    }
+    catch (error) {
+        // 忽略错误，webContents 可能已销毁
+    }
 };
 class WindowsManager {
     /**
@@ -272,14 +281,18 @@ class WindowsManager {
                     log('error', '预加载 BW 设置 remote 失败', error);
                 }
                 try {
-                    // @ts-ignore
-                    instance._id = instance.webContents.id;
+                    const webContentsId = instance.webContents?.id;
+                    if (webContentsId !== undefined) {
+                        // @ts-ignore
+                        instance._id = webContentsId;
+                    }
                 }
                 catch (error) {
                     log('error', '预加载 BW 设置 _id 失败', error);
                 }
                 // @ts-ignore
-                log('log', '创建预BW: ', instance._id, this.preloadWebContentsConfig?.url);
+                const webContentsId = instance.webContents?.id;
+                log('log', '创建预BW: ', webContentsId, this.preloadWebContentsConfig?.url);
                 // instance.webContents.once('did-finish-load', () => {
                 //   resolve(instance as BWItem);
                 // });
@@ -326,8 +339,11 @@ class WindowsManager {
                     log('error', '预加载 BV 设置 remote 失败', error);
                 }
                 try {
-                    // @ts-ignore
-                    instance._id = instance.webContents.id;
+                    const webContentsId = instance.webContents?.id;
+                    if (webContentsId !== undefined) {
+                        // @ts-ignore
+                        instance._id = webContentsId;
+                    }
                     // 设置默认zIndex层级
                     instance._zIndex = 0;
                 }
@@ -335,7 +351,8 @@ class WindowsManager {
                     log('error', '预加载 BV 设置 _id 失败', error);
                 }
                 // @ts-ignore
-                log('log', '创建预BV: ', instance._id, this.preloadWebContentsConfig?.url);
+                const webContentsId = instance.webContents?.id;
+                log('log', '创建预BV: ', webContentsId, this.preloadWebContentsConfig?.url);
                 // instance.webContents.once('did-finish-load', () => {
                 //   resolve(instance as BVItem);
                 // });
@@ -431,7 +448,7 @@ class WindowsManager {
         }
         if (preloadWin) {
             const win = preloadWin;
-            log('log', `${name} 使用预加载窗口(${type})`, win._id);
+            log('log', `${name} 使用预加载窗口(${type})`, this._getWebContentsId(win));
             win._type = type;
             win._name = options.name || 'anonymous';
             win._extraData = `${options?.extraData || ''}`;
@@ -601,15 +618,12 @@ class WindowsManager {
             // 停止加载
             // window.webContents?.stop?.();
             // @ts-ignore
-            try {
-                window.id = Number(`${window.id || window.webContents.id}`);
-            }
-            catch (error) {
-                // log('error', 'set id: ', error)
-            }
             // @ts-ignore
             try {
-                window._id = Number(`${window.id || window.webContents.id}`);
+                const webContentsId = this._getWebContentsId(window);
+                if (webContentsId !== undefined) {
+                    window._id = Number(`${webContentsId}`);
+                }
             }
             catch (error) {
                 // log('error', 'set id: ', error)
@@ -620,7 +634,7 @@ class WindowsManager {
             window._initUrl = `${options?.url || ''}`;
             // 设置zIndex层级
             window._zIndex = options.zIndex ?? 0;
-            log('log', 'create 5: ', window.id, window._id, window._name);
+            log('log', 'create 5: ', this._getWebContentsId(window), window._name);
             if (loadingView?.url && loadingView?.url !== 'about:blank') {
                 if (type === 'BW') {
                     // @ts-ignore
@@ -733,8 +747,10 @@ class WindowsManager {
             //   this.windows.delete(window.id || window._id)
             // })
             window.webContents.on('destroyed', () => {
-                const winId = window.id || window._id;
-                this.windows.delete(winId);
+                const winId = this._getWebContentsId(window);
+                if (winId !== undefined) {
+                    this.windows.delete(winId);
+                }
                 // 同步清理名称索引
                 this.windowsByName.delete(window._name);
             });
@@ -750,9 +766,11 @@ class WindowsManager {
                 }
                 // @ts-ignore
                 window.on('closed', () => {
-                    log('log', 'closed', window.id, window._name);
-                    const winId = window.id || window._id;
-                    this.windows.delete(winId);
+                    const winId = this._getWebContentsId(window);
+                    log('log', 'closed', winId, window._name);
+                    if (winId !== undefined) {
+                        this.windows.delete(winId);
+                    }
                     // 同步清理名称索引
                     this.windowsByName.delete(window._name);
                 });
@@ -761,18 +779,20 @@ class WindowsManager {
                 parentWin?.addBrowserView(window);
                 log('log', 'create - addBrowserView');
             }
-            const winId = window.id || window._id || window.webContents.id;
-            this.windows.set(winId, window);
-            // 同步更新名称索引
-            this.windowsByName.set(window._name, winId);
+            const winId = this._getWebContentsId(window);
+            if (winId !== undefined) {
+                this.windows.set(winId, window);
+                // 同步更新名称索引
+                this.windowsByName.set(window._name, winId);
+            }
             log('log', 'create', this.windows.keys());
             // 初始化值
             window.webContents.on('did-finish-load', () => {
-                log('log', 'did-finish-load', window.webContents.id);
+                log('log', 'did-finish-load', this._getWebContentsId(window));
                 initWebContentsVal(window, `${preload || ''}`);
             });
             window.webContents.on('did-start-loading', () => {
-                log('log', 'did-start-loading', window.webContents.id);
+                log('log', 'did-start-loading', this._getWebContentsId(window));
                 initWebContentsVal(window, `${preload || ''}`);
             });
             if (type === 'BW') {
@@ -973,6 +993,24 @@ class WindowsManager {
             return true;
         }
     }
+    /**
+     * 安全地获取窗口的 webContents.id
+     * 如果 webContents 已销毁，返回 undefined
+     */
+    _getWebContentsId(win) {
+        try {
+            if (!win || !win.webContents) {
+                return undefined;
+            }
+            if (win.webContents.isDestroyed()) {
+                return undefined;
+            }
+            return win.webContents.id;
+        }
+        catch {
+            return undefined;
+        }
+    }
     /**
      * 判断是否本地/内网IP
      */
@@ -1004,16 +1042,8 @@ class WindowsManager {
         log('log', 'get', idOrName);
         let win;
         if (typeof idOrName === 'number') {
-            // 按 ID 查找（O(1)）
+            // 按 ID 查找（O(1)），使用 webContents.id
             win = this.windows.get(idOrName);
-            // 如果找不到，尝试按 _id 查找
-            if (!win) {
-                this.windows.forEach(w => {
-                    if (w._id === idOrName) {
-                        win = w;
-                    }
-                });
-            }
         }
         else if (typeof idOrName === 'string') {
             // 按名称查找（O(1)，使用索引）
@@ -1026,8 +1056,11 @@ class WindowsManager {
                 this.windows.forEach(w => {
                     if (w._name === idOrName) {
                         win = w;
-                        // 更新索引
-                        this.windowsByName.set(idOrName, w.id || w._id);
+                        // 更新索引，使用 webContents.id
+                        const webContentsId = this._getWebContentsId(w);
+                        if (webContentsId !== undefined) {
+                            this.windowsByName.set(idOrName, webContentsId);
+                        }
                     }
                 });
             }
@@ -1038,7 +1071,7 @@ class WindowsManager {
         }
         // 窗口已销毁，触发清理
         if (win) {
-            const winId = win.id || win._id;
+            const winId = this._getWebContentsId(win);
             if (winId !== undefined) {
                 this.windows.delete(winId);
             }
@@ -1081,8 +1114,10 @@ class WindowsManager {
         if (!win) {
             return false;
         }
-        const winId = win.id || win._id;
-        this.windows.delete(winId);
+        const winId = this._getWebContentsId(win);
+        if (winId !== undefined) {
+            this.windows.delete(winId);
+        }
         if (win._name) {
             this.windowsByName.delete(win._name);
         }
@@ -1168,9 +1203,11 @@ class WindowsManager {
         }
         // 更新名称索引
         const oldName = win._name;
-        const winId = win.id || win._id;
-        this.windowsByName.delete(oldName);
-        this.windowsByName.set(newName, winId);
+        const winId = this._getWebContentsId(win);
+        if (winId !== undefined) {
+            this.windowsByName.delete(oldName);
+            this.windowsByName.set(newName, winId);
+        }
         // 修改名字并同步 webContents
         win._name = newName;
         initWebContentsVal(win, `${this.preload || ''}`);
@@ -1329,7 +1366,7 @@ class WindowsManager {
                 extraData: `${url}`
             });
             return new Promise((resolve, reject) => {
-                const winId = bv.id || bv._id;
+                const winId = this._getWebContentsId(bv);
                 if (!winId) {
                     reject(new Error('Failed to get window ID'));
                     return;
@@ -1353,7 +1390,7 @@ class WindowsManager {
         }
         catch (error) {
             if (bv) {
-                const winId = bv.id || bv._id;
+                const winId = this._getWebContentsId(bv);
                 if (winId) {
                     this.close(winId);
                 }
@@ -1406,7 +1443,7 @@ class WindowsManager {
             const views = window.getBrowserViews() || [];
             if (views.length <= 1)
                 return;
-            log('log', 'sortBrowserViews', views?.map(i => i.webContents.id));
+            log('log', 'sortBrowserViews', views?.map(i => this._getWebContentsId(i)));
             // 创建排序后的视图数组（不修改原数组）
             const sortedViews = [...views].sort((a, b) => {
                 const zIndexA = a._zIndex ?? 0;
@@ -1418,18 +1455,22 @@ class WindowsManager {
             for (let i = 0; i < views.length; i++) {
                 const view = views[i];
                 const sortedView = sortedViews[i];
-                if (!view || !sortedView || view.webContents.id !== sortedView.webContents.id) {
+                const viewId = this._getWebContentsId(view);
+                const sortedViewId = this._getWebContentsId(sortedView);
+                if (!view || !sortedView || viewId !== sortedViewId) {
                     needsReorder = true;
                     break;
                 }
             }
-            log('log', 'sortBrowserViews needsReorder', needsReorder, sortedViews?.map(i => i.webContents.id));
+            log('log', 'sortBrowserViews needsReorder', needsReorder, sortedViews?.map(i => this._getWebContentsId(i)));
             // 如果已经按正确顺序排列，则不需要重新排序
             if (!needsReorder)
                 return;
             // 移除所有BrowserView（排除刚添加的视图，避免不必要的操作）
+            const addViewId = this._getWebContentsId(addView);
             views.forEach(view => {
-                if (addView?.webContents?.id !== view.webContents.id) {
+                const viewId = this._getWebContentsId(view);
+                if (addViewId !== viewId) {
                     try {
                         // @ts-ignore
                         window.removeBrowserView(view, false);
@@ -1506,8 +1547,9 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsCon
                 if (findWin?._type === 'BV' && opt.data.zIndex) {
                     findWin._zIndex = opt.data.zIndex;
                 }
+                const winId = wm._getWebContentsId(findWin);
                 return {
-                    winId: Number(`${findWin?.id || findWin?._id || -1}`),
+                    winId: Number(`${winId || -1}`),
                     winName: `${findWin?._name || ''}`,
                     winType: `${findWin?._type || ''}`,
                     winExtraData: `${findWin?._extraData || ''}`,
@@ -1516,8 +1558,9 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsCon
                 };
             }
             const res = await wm.create(opt.data);
+            const winId = wm._getWebContentsId(res);
             return {
-                winId: Number(`${res.id || res._id || -1}`),
+                winId: Number(`${winId || -1}`),
                 winName: `${res?._name || ''}`,
                 winType: `${res?._type || ''}`,
                 winExtraData: `${res?._extraData || ''}`,
@@ -1528,8 +1571,9 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsCon
         if (data?.type === 'get') {
             const opt = data;
             const res = wm.get(opt?.data);
+            const winId = wm._getWebContentsId(res);
             return {
-                winId: Number(`${res?.id || res?._id || -1}`),
+                winId: Number(`${winId || -1}`),
                 winName: `${res?._name || ''}`,
                 winType: `${res?._type || ''}`,
                 winExtraData: `${res?._extraData || ''}`,
@@ -1541,7 +1585,7 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsCon
             const res = wm.getAll();
             const obj = {};
             res.forEach(i => {
-                const winId = i.id || i._id;
+                const winId = wm._getWebContentsId(i);
                 if (winId !== undefined) {
                     obj[winId] = {
                         winId: Number(`${winId}`),
@@ -1568,8 +1612,9 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsCon
             const opt = data;
             const res = wm.rename(opt.data.idOrName, opt.data.newName);
             if (res) {
+                const winId = wm._getWebContentsId(res);
                 return {
-                    winId: Number(`${res?.id || res?._id || -1}`),
+                    winId: Number(`${winId || -1}`),
                     winName: `${res?._name || ''}`,
                     winType: `${res?._type || ''}`,
                     winExtraData: `${res?._extraData || ''}`,
@@ -1583,8 +1628,9 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsCon
             const opt = data;
             const res = wm.reInitUrl(opt.data.idOrName, opt.data.url);
             if (res) {
+                const winId = wm._getWebContentsId(res);
                 return {
-                    winId: Number(`${res?.id || res?._id || -1}`),
+                    winId: Number(`${winId || -1}`),
                     winName: `${res?._name || ''}`,
                     winType: `${res?._type || ''}`,
                     winExtraData: `${res?._extraData || ''}`,
@@ -1598,7 +1644,7 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsCon
             const opt = data;
             const res = await wm.getWindowForWebContentsId(opt.data);
             if (res) {
-                return res?.id;
+                return wm._getWebContentsId(res);
             }
             return undefined;
         }