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

package/main/index.js

@@ -455,7 +455,7 @@ class WindowsManager {
                         win.loadURL = async (url, useNativeLoadURL = false) => {
                             return new Promise(async (resolve, reject) => {
                                 if (useNativeLoadURL) {
-                                    console.error('useNativeLoadURL win.loadURL');
+                                    log('log', 'useNativeLoadURL win.loadURL');
                                     try {
                                         await originLoadURL.call(win, url);
                                         resolve(undefined);
@@ -466,7 +466,7 @@ class WindowsManager {
                                     return;
                                 }
                                 try {
-                                    console.error('customLoadURL win.loadURL');
+                                    log('log', 'customLoadURL win.loadURL');
                                     // @ts-ignore
                                     await this.preloadWebContentsConfig.customLoadURL(url || 'about:blank', (url) => originLoadURL.call(win, url), win.webContents);
                                     try {
@@ -488,7 +488,7 @@ class WindowsManager {
                     win.webContents.loadURL = async (url, useNativeLoadURL = false) => {
                         return new Promise(async (resolve, reject) => {
                             if (useNativeLoadURL) {
-                                console.error('useNativeLoadURL win.webContents.loadURL');
+                                log('log', 'useNativeLoadURL win.webContents.loadURL');
                                 try {
                                     await originWebContentsLoadURL.call(win.webContents, url);
                                     resolve(undefined);
@@ -499,7 +499,7 @@ class WindowsManager {
                                 return;
                             }
                             try {
-                                console.error('customLoadURL win.webContents.loadURL');
+                                log('log', 'customLoadURL win.webContents.loadURL');
                                 // @ts-ignore
                                 await this.preloadWebContentsConfig.customLoadURL(url || 'about:blank', (url) => originWebContentsLoadURL.call(win.webContents, url), win.webContents);
                                 try {
@@ -517,7 +517,7 @@ class WindowsManager {
                     };
                 }
                 catch (error) {
-                    console.error('customLoadURL error', error);
+                    log('error', 'customLoadURL error', error);
                 }
             }
             window = win;
@@ -768,11 +768,11 @@ class WindowsManager {
             log('log', 'create', this.windows.keys());
             // 初始化值
             window.webContents.on('did-finish-load', () => {
-                console.error('did-finish-load', window.webContents.id);
+                log('log', 'did-finish-load', window.webContents.id);
                 initWebContentsVal(window, `${preload || ''}`);
             });
             window.webContents.on('did-start-loading', () => {
-                console.error('did-start-loading', window.webContents.id);
+                log('log', 'did-start-loading', window.webContents.id);
                 initWebContentsVal(window, `${preload || ''}`);
             });
             if (type === 'BW') {
@@ -783,7 +783,7 @@ class WindowsManager {
               try {
                 window.dispatchEvent(new Event('focus'));
               } catch (error) {
-                console.error('focus', error);
+                // 忽略错误，避免影响主流程
               }
             `);
                     }
@@ -797,7 +797,7 @@ class WindowsManager {
               try {
                 window.dispatchEvent(new Event('blur'));
               } catch (error) {
-                console.error('blur', error);
+                // 忽略错误，避免影响主流程
               }
             `);
                     }
@@ -1039,7 +1039,9 @@ class WindowsManager {
         // 窗口已销毁，触发清理
         if (win) {
             const winId = win.id || win._id;
-            this.windows.delete(winId);
+            if (winId !== undefined) {
+                this.windows.delete(winId);
+            }
             if (win._name) {
                 this.windowsByName.delete(win._name);
             }
@@ -1318,25 +1320,46 @@ class WindowsManager {
     }
     // 生成一个bv 做为预加载资源窗口，加载完成后销毁
     async createPreloadWebContents(url) {
-        return new Promise(async (resolve, reject) => {
-            let bv = await this.create({
+        let bv = null;
+        try {
+            bv = await this.create({
                 type: 'BV',
                 url,
                 name: `preload-web-contents-${md5(url)}`,
                 extraData: `${url}`
             });
-            bv.webContents.on('did-finish-load', () => {
-                this.close(bv.id || bv._id);
-                resolve(true);
-                bv = null;
-            });
-            bv.webContents.on('did-fail-load', () => {
-                this.close(bv.id || bv._id);
-                reject(false);
-                bv = null;
+            return new Promise((resolve, reject) => {
+                const winId = bv.id || bv._id;
+                if (!winId) {
+                    reject(new Error('Failed to get window ID'));
+                    return;
+                }
+                bv.webContents.on('did-finish-load', () => {
+                    if (winId) {
+                        this.close(winId);
+                    }
+                    resolve(true);
+                    bv = null;
+                });
+                bv.webContents.on('did-fail-load', () => {
+                    if (winId) {
+                        this.close(winId);
+                    }
+                    reject(new Error('Failed to load web contents'));
+                    bv = null;
+                });
+                bv.webContents.loadURL(url);
             });
-            bv.webContents.loadURL(url);
-        });
+        }
+        catch (error) {
+            if (bv) {
+                const winId = bv.id || bv._id;
+                if (winId) {
+                    this.close(winId);
+                }
+            }
+            throw error;
+        }
     }
     async getWindowForWebContentsId(wcId) {
         const wc = electron.webContents.fromId(wcId);
@@ -1518,15 +1541,17 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsCon
             const res = wm.getAll();
             const obj = {};
             res.forEach(i => {
-                // @ts-ignore
-                obj[i.id || i._id] = {
-                    winId: Number(`${i?.id || i?._id || -1}`),
-                    winName: `${i?._name || ''}`,
-                    winType: `${i?._type || ''}`,
-                    winExtraData: `${i?._extraData || ''}`,
-                    winInitUrl: `${i?._initUrl || ''}`,
-                    winZIndex: `${i?._zIndex || 0}`,
-                };
+                const winId = i.id || i._id;
+                if (winId !== undefined) {
+                    obj[winId] = {
+                        winId: Number(`${winId}`),
+                        winName: `${i?._name || ''}`,
+                        winType: `${i?._type || ''}`,
+                        winExtraData: `${i?._extraData || ''}`,
+                        winInitUrl: `${i?._initUrl || ''}`,
+                        winZIndex: `${i?._zIndex || 0}`,
+                    };
+                }
             });
             return obj;
         }