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

package/main/index.js

@@ -365,6 +365,15 @@ class WindowsManager {
     async _createWindow(options) {
         let window;
         const { usePreload = true, type = 'BW', name = 'anonymous', url, loadingView = { url: undefined }, errorView = { url: undefined }, browserWindow: browserWindowOptions, openDevTools = false, preventOriginClose = false, zIndex = 0, } = options;
+        const existingWinId = this.windowsByName.get(options.name);
+        if (existingWinId) {
+            window = this.windows.get(existingWinId);
+            if (window) {
+                return window;
+            }
+            // 清理无效的引用
+            this.windowsByName.delete(options.name);
+        }
         options.type = type;
         // 优先复用预创建实例
         let preloadWin = null;
@@ -423,7 +432,7 @@ class WindowsManager {
         if (preloadWin) {
             const win = preloadWin;
             log('log', `${name} 使用预加载窗口(${type})`, win._id);
-            win._type = 'BW';
+            win._type = type;
             win._name = options.name || 'anonymous';
             win._extraData = `${options?.extraData || ''}`;
             win._initUrl = `${options?.url || ''}`;
@@ -447,7 +456,14 @@ class WindowsManager {
                             return new Promise(async (resolve, reject) => {
                                 if (useNativeLoadURL) {
                                     console.error('useNativeLoadURL win.loadURL');
-                                    return originLoadURL.call(win, url);
+                                    try {
+                                        await originLoadURL.call(win, url);
+                                        resolve(undefined);
+                                    }
+                                    catch (error) {
+                                        reject(error);
+                                    }
+                                    return;
                                 }
                                 try {
                                     console.error('customLoadURL win.loadURL');
@@ -473,7 +489,14 @@ class WindowsManager {
                         return new Promise(async (resolve, reject) => {
                             if (useNativeLoadURL) {
                                 console.error('useNativeLoadURL win.webContents.loadURL');
-                                return originWebContentsLoadURL.call(win.webContents, url);
+                                try {
+                                    await originWebContentsLoadURL.call(win.webContents, url);
+                                    resolve(undefined);
+                                }
+                                catch (error) {
+                                    reject(error);
+                                }
+                                return;
                             }
                             try {
                                 console.error('customLoadURL win.webContents.loadURL');
@@ -832,8 +855,8 @@ class WindowsManager {
                     const _setBrowserView = window.setBrowserView;
                     window.setBrowserView = (view, isSort = false) => {
                         const views = window.getBrowserViews() || [];
-                        for (const view of views) {
-                            handleBrowserViewBlur(view);
+                        for (const existingView of views) {
+                            handleBrowserViewBlur(existingView);
                         }
                         _setBrowserView.call(window, view);
                         handleBrowserViewFocus(view);
@@ -858,6 +881,10 @@ class WindowsManager {
         }
         catch (error) {
             log('error', 'create', error);
+            throw error;
+        }
+        if (!window) {
+            throw new Error(`Failed to create window: ${name}`);
         }
         return window;
     }