@lynker-desktop/electron-window-manager 0.0.4-alpha.8 → 0.0.5-alpha.0

package/main/index.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+const lodash = require('lodash');
 const electron = require('electron');
 const remote = require('@electron/remote/main');
 const eIpc = require('@lynker-desktop/electron-ipc/main');
@@ -16,6 +16,18 @@ function _interopNamespaceDefault(e) {
 
 const remote__namespace = /*#__PURE__*/_interopNamespaceDefault(remote);
 
+const getCustomSession = (() => {
+    let customSession;
+    return () => {
+        if (!customSession) {
+            customSession = electron.session.fromPartition('persist:__global_main_session__');
+        }
+        return customSession;
+    };
+})();
+electron.app.on('ready', () => {
+    getCustomSession();
+});
 if (!remote__namespace.isInitialized()) {
     remote__namespace.initialize();
 }
@@ -23,50 +35,162 @@ const enable = (win) => {
     remote__namespace.enable(win);
 };
 class WindowsManager {
-    constructor(preload) {
+    constructor(preload, loadingViewUrl, errorViewUrl) {
         this.preload = preload;
         this.windows = new Map();
+        this.loadingViewUrl = `${loadingViewUrl ?? ''}`;
+        this.errorViewUrl = `${errorViewUrl ?? ''}`;
     }
     create(options) {
-        const { name = 'anonymous', loadingView, browserWindow: browserWindowOptions = {}, openDevTools = false, preventOriginClose = false, } = options;
-        const window = new electron.BrowserWindow(_.merge({
-            acceptFirstMouse: true,
-        }, browserWindowOptions, {
-            webPreferences: {
-                plugins: true,
-                nodeIntegration: true,
-                contextIsolation: false,
-                backgroundThrottling: false,
-                nativeWindowOpen: false,
-                webSecurity: false,
-                preload: browserWindowOptions?.webPreferences?.preload || this.preload,
+        let window;
+        try {
+            const { type = 'BW', name = 'anonymous', url, loadingView = { url: undefined }, errorView = { url: undefined }, browserWindow: browserWindowOptions, openDevTools = false, preventOriginClose = false, } = options;
+            options.type = type;
+            try {
+                loadingView.url = `${loadingView?.url ?? this.loadingViewUrl}`;
+                lodash.merge(options, {
+                    loadingView,
+                });
             }
-        }));
-        remote__namespace.enable(window.webContents);
-        window._name = name;
-        if (loadingView?.url) {
-            this._setLoadingView(window, options);
-        }
-        window.on('close', (event) => {
-            if (preventOriginClose) {
-                event.preventDefault();
-                return;
+            catch (error) {
+                log('error', 'loadingView error:', loadingView, this.loadingViewUrl);
             }
-            this.windows.delete(window.id);
-        });
-        window.webContents.on('dom-ready', () => {
-            if (openDevTools) {
-                window.webContents.openDevTools();
+            try {
+                errorView.url = `${errorView?.url ?? this.errorViewUrl}`;
+                lodash.merge(options, {
+                    errorView,
+                });
             }
-        });
-        this.windows.set(window.id, window);
-        if (/^file/gi.test(options.url)) {
-            window.loadFile(options.url);
+            catch (error) {
+                log('error', 'errorView error:', errorView, this.errorViewUrl);
+            }
+            let parentWin = undefined;
+            if (typeof browserWindowOptions?.parent === 'number') {
+                parentWin = electron.BrowserWindow.fromId(browserWindowOptions?.parent) || undefined;
+                if (parentWin) {
+                    browserWindowOptions.parent = parentWin;
+                }
+                else {
+                    browserWindowOptions.parent = undefined;
+                }
+            }
+            log('log', 'create 1: ', options);
+            log('log', 'create 2: ', `parentWin: ${parentWin?.id}`);
+            window = type === 'BV' ?
+                new electron.BrowserView(lodash.merge((browserWindowOptions || {}), {
+                    parent: undefined,
+                    webPreferences: {
+                        // session: getCustomSession(),
+                        plugins: true,
+                        nodeIntegration: true,
+                        contextIsolation: false,
+                        backgroundThrottling: false,
+                        nativeWindowOpen: false,
+                        webSecurity: false,
+                        preload: browserWindowOptions?.webPreferences?.preload || this.preload,
+                    }
+                }))
+                : new electron.BrowserWindow(lodash.merge({
+                    acceptFirstMouse: true,
+                }, (browserWindowOptions || {}), {
+                    parent: parentWin,
+                    webPreferences: {
+                        // session: getCustomSession(),
+                        plugins: true,
+                        nodeIntegration: true,
+                        contextIsolation: false,
+                        backgroundThrottling: false,
+                        nativeWindowOpen: false,
+                        webSecurity: false,
+                        preload: browserWindowOptions?.webPreferences?.preload || this.preload,
+                    }
+                }));
+            try {
+                remote__namespace.enable(window.webContents);
+            }
+            catch (error) {
+                log('error', 'enable: ', error);
+            }
+            // @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}`);
+            }
+            catch (error) {
+                // log('error', 'set id: ', error)
+            }
+            window._type = type;
+            window._name = name;
+            window._extraData = `${options?.extraData || ''}`;
+            log('log', 'create 5: ', window.id, window._id, window._name);
+            if (loadingView?.url) {
+                if (type === 'BW') {
+                    // @ts-ignore
+                    this._setLoadingView(window, options);
+                }
+            }
+            if (errorView?.url) {
+                const showErrorView = lodash.debounce(() => {
+                    const _url = window?.webContents?.getURL?.() || url;
+                    /**
+                     * 判断是否是错误视图
+                     */
+                    const isErrorView = `${_url}`.toUpperCase().startsWith(`${errorView?.url}`.toUpperCase());
+                    if (!isErrorView && _url) {
+                        // @ts-ignore
+                        window.loadURL ? window.loadURL(`${errorView?.url}`) : window.webContents.loadURL(`${errorView?.url}`);
+                        window.webContents.executeJavaScript(`
+              var key = '__ELECTRON_WINDOW_MANAGER_DID_FAIL_LOAD_URL__';
+              window[key] = "${_url}";
+              sessionStorage.setItem(key, "${_url}");
+            `);
+                    }
+                }, 300);
+                window.webContents.on('did-fail-load', () => {
+                    showErrorView();
+                });
+                window.webContents.on('did-start-loading', () => {
+                    showErrorView.cancel();
+                });
+            }
+            window.webContents.on('close', () => {
+                this.windows.delete(window.id || window._id);
+            });
+            window.webContents.on('destroyed', () => {
+                this.windows.delete(window.id || window._id);
+            });
+            window.webContents.on('dom-ready', () => {
+                if (openDevTools) {
+                    window.webContents.openDevTools();
+                }
+            });
+            if (type === 'BW') {
+                // @ts-ignore
+                window.on('closed', () => {
+                    log('log', 'closed', window.id, window._name);
+                    this.windows.delete(window.id || window._id);
+                });
+            }
+            if (type === 'BV') {
+                parentWin?.addBrowserView(window);
+                log('log', 'create - addBrowserView');
+            }
+            // @ts-ignore
+            window.loadURL ? window.loadURL(options.url) : window.webContents.loadURL(options.url);
+            // @ts-ignore
+            window.focus ? window.focus() : window.webContents.focus();
+            this.windows.set(window.id || window._id || window.webContents.id, window);
+            log('log', 'create', this.windows.keys());
         }
-        else {
-            window.loadURL(options.url);
+        catch (error) {
+            log('error', 'create', error);
         }
-        window.focus();
         return window;
     }
     _setLoadingView(window, createOptions) {
@@ -74,6 +198,7 @@ class WindowsManager {
             const { loadingView, preventOriginNavigate = false, } = createOptions;
             let _loadingView = new electron.BrowserView({
                 webPreferences: {
+                    // session: getCustomSession(),
                     contextIsolation: false,
                     nodeIntegration: true,
                     // 允许loadURL与文件路径在开发环境
@@ -92,9 +217,10 @@ class WindowsManager {
                     width: viewWidth || 10,
                     height: viewHeight || 10,
                 });
+                log('log', 'loadLoadingView', window._name);
                 _loadingView.webContents.loadURL(loadingView?.url || '');
             };
-            const onFailure = () => {
+            const onFailure = lodash.debounce(() => {
                 if (_loadingView.webContents && !_loadingView.webContents.isDestroyed()) {
                     _loadingView.webContents.close();
                 }
@@ -104,9 +230,9 @@ class WindowsManager {
                 if (window) {
                     window.removeBrowserView(_loadingView);
                 }
-            };
+            }, 300);
             loadLoadingView();
-            window.on('resize', _.debounce(() => {
+            window.on('resize', lodash.debounce(() => {
                 if (_loadingView.webContents && !_loadingView.webContents.isDestroyed()) {
                     if (window.isDestroyed()) {
                         return;
@@ -136,61 +262,134 @@ class WindowsManager {
             window.webContents.on('crashed', onFailure);
             window.webContents.on('unresponsive', onFailure);
             window.webContents.on('did-fail-load', onFailure);
+            window.webContents.on('did-finish-load', onFailure);
+            window.webContents.on('did-stop-loading', onFailure);
         }
     }
-    get(name) {
-        let win = undefined;
-        this.windows.forEach((i) => {
-            if (i._name === name) {
-                win = i;
+    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') {
+                if (i?.id === idOrName || i?._id === idOrName) {
+                    win = i;
+                }
+            }
+            else if (typeof idOrName === 'string') {
+                if (i?._name === idOrName) {
+                    win = i;
+                }
             }
         });
-        return win;
+        // @ts-ignore
+        if (win && win?.webContents?.isDestroyed && !win?.webContents?.isDestroyed?.()) {
+            return win;
+        }
+        return undefined;
     }
-    getById(id) {
-        let win = undefined;
-        this.windows.forEach((i) => {
-            if (i.id === id) {
-                win = i;
+    getAll(type) {
+        log('log', 'getAll');
+        const bwWindows = new Map();
+        const bvWindows = new Map();
+        this.windows.forEach((win, key) => {
+            log('log', 'getAll', key, win, win?.webContents?.isDestroyed, win?.webContents?.isDestroyed?.());
+            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);
             }
         });
-        return win;
-    }
-    getAll() {
+        if (type === 'BW') {
+            return bwWindows;
+        }
+        if (type === 'BV') {
+            return bvWindows;
+        }
         return this.windows;
     }
-    close(name) {
+    close(idOrName) {
+        log('log', 'close', idOrName);
         let win = undefined;
         this.windows.forEach((i) => {
-            if (i._name === name) {
-                win = 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
-        return win && win?.destroy();
+        if (win) {
+            // @ts-ignore
+            if (win._type === 'BV') {
+                this.windows.forEach(i => {
+                    if (i?._type === 'BW') {
+                        const _win = i;
+                        _win.removeBrowserView(win);
+                    }
+                });
+            }
+            // @ts-ignore
+            win?.webContent?.close?.();
+            // @ts-ignore
+            win?.close?.();
+            // @ts-ignore
+            win?.destroy?.();
+        }
+        return true;
     }
-    closeById(id) {
-        let win = undefined;
-        this.windows.forEach((i) => {
-            if (i.id === id) {
-                win = i;
+    closeAll() {
+        log('log', 'closeAll');
+        this.windows.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);
+                        }
+                    });
+                }
+                // @ts-ignore
+                win?.webContent?.close?.();
+                // @ts-ignore
+                win?.close?.();
+                // @ts-ignore
+                win?.destroy?.();
+            }
+            catch (error) {
             }
         });
-        // @ts-ignore
-        win && this.windows.delete(win?.id);
-        // @ts-ignore
-        return win && win?.destroy();
     }
     getPreload() {
+        log('log', 'getPreload');
         return this.preload;
     }
 }
 // @ts-ignore
 global['__ELECTRON_WINDOWS_MANAGER__'] = undefined;
 exports.isInitialized = false;
-const initialize = (preload) => {
+const initialize = (preload, loadingViewUrl, errorViewUrl) => {
     // @ts-ignore
     if (exports.isInitialized && global['__ELECTRON_WINDOWS_MANAGER__']) {
         // @ts-ignore
@@ -198,38 +397,45 @@ const initialize = (preload) => {
     }
     exports.isInitialized = true;
     // @ts-ignore
-    const wm = global['__ELECTRON_WINDOWS_MANAGER__'] = new WindowsManager(preload);
+    const wm = global['__ELECTRON_WINDOWS_MANAGER__'] = new WindowsManager(preload, loadingViewUrl, errorViewUrl);
     eIpc.mainIPC.handleRenderer('__ELECTRON_WINDOW_MANAGER_IPC_CHANNEL__', async (data) => {
         if (data?.type === 'create') {
             const opt = data;
             const findWin = wm.get(opt.data.name);
             if (findWin) {
-                findWin.focus();
+                // @ts-ignore
+                findWin?.focus?.();
+                findWin?.webContents.focus?.();
+                if (opt.data.url && findWin.webContents.getURL() !== opt.data.url) {
+                    findWin.webContents.loadURL(opt.data.url);
+                    /** fix: url hash 无法正常加载  */
+                    setTimeout(() => {
+                        findWin.webContents.reload();
+                    }, 100);
+                }
                 return {
-                    winId: findWin?.id,
-                    winName: findWin?._name,
+                    winId: Number(`${findWin?.id || findWin?._id || -1}`),
+                    winName: `${findWin?._name || ''}`,
+                    winType: `${findWin?._type || ''}`,
+                    winExtraData: `${findWin?._extraData || ''}`,
                 };
             }
             const res = wm.create(opt.data);
             return {
-                winId: Number(res.id),
-                winName: res._name,
+                winId: Number(`${res.id || res._id || -1}`),
+                winName: `${res?._name || ''}`,
+                winType: `${res?._type || ''}`,
+                winExtraData: `${res?._extraData || ''}`,
             };
         }
         if (data?.type === 'get') {
             const opt = data;
             const res = wm.get(opt?.data);
             return {
-                winId: res?.id ? Number(res?.id) : -1,
-                winName: res?._name ? res?._name : '',
-            };
-        }
-        if (data?.type === 'getById') {
-            const opt = data;
-            const res = wm.getById(opt?.data);
-            return {
-                winId: res?.id ? Number(res?.id) : -1,
-                winName: res?._name ? res?._name : '',
+                winId: Number(`${res?.id || res?._id || -1}`),
+                winName: `${res?._name || ''}`,
+                winType: `${res?._type || ''}`,
+                winExtraData: `${res?._extraData || ''}`,
             };
         }
         if (data?.type === 'getAll') {
@@ -237,9 +443,11 @@ const initialize = (preload) => {
             const obj = {};
             res.forEach(i => {
                 // @ts-ignore
-                obj[i.id] = {
-                    winId: i?.id ? Number(i?.id) : -1,
-                    winName: i?._name ? i?._name : '',
+                obj[i.id || i._id] = {
+                    winId: Number(`${i?.id || i?._id || -1}`),
+                    winName: `${i?._name || ''}`,
+                    winType: `${i?._type || ''}`,
+                    winExtraData: `${i?._extraData || ''}`,
                 };
             });
             return obj;
@@ -249,11 +457,37 @@ const initialize = (preload) => {
             const res = wm.close(opt?.data);
             return res;
         }
-        if (data?.type === 'closeById') {
-            const opt = data;
-            const res = wm.closeById(opt?.data);
+        if (data?.type === 'closeAll') {
+            const res = wm.closeAll();
             return res;
         }
+        if (data?.type === 'getWindowForWebContentId') {
+            const opt = data;
+            const targetWebContents = electron.webContents.fromId(opt.data);
+            if (targetWebContents) {
+                let win = electron.BrowserWindow.fromWebContents(targetWebContents);
+                if (!win) {
+                    // 获取所有的 BrowserWindows
+                    let allWindows = electron.BrowserWindow.getAllWindows();
+                    // 遍历所有窗口，检查每个窗口的 BrowserView
+                    for (let _win of allWindows) {
+                        let views = _win.getBrowserViews();
+                        // 遍历窗口的所有 BrowserView
+                        for (let view of views) {
+                            if (view.webContents === targetWebContents) {
+                                win = _win;
+                                break;
+                            }
+                        }
+                        if (win)
+                            break;
+                    }
+                }
+                // @ts-ignore
+                return win?.id || win?._id;
+            }
+            return undefined;
+        }
         if (data?.type === 'getPreload') {
             const res = wm.getPreload();
             return res;
@@ -262,8 +496,18 @@ const initialize = (preload) => {
     });
     return wm;
 };
+const log = (type, ...data) => {
+    const key = `[electron-window-manager]: `;
+    try {
+        console[type](key, ...data);
+    }
+    catch (error) {
+        console.error(key, error);
+    }
+};
 
 exports.WindowsManager = WindowsManager;
 exports.enable = enable;
+exports.getCustomSession = getCustomSession;
 exports.initialize = initialize;
 //# sourceMappingURL=index.js.map