@lynker-desktop/electron-window-manager 0.0.7-alpha.8 → 0.0.7

package/esm/main/index.d.ts

@@ -13,16 +13,11 @@ export declare class WindowsManager {
     preloadedBW_FramelessNoButtons: BWItem | null;
     preloadedBV: BVItem | null;
     preloading: boolean;
-    constructor(preload?: string, loadingViewUrl?: string, errorViewUrl?: string, preloadUrl?: string);
+    constructor(preload?: string, loadingViewUrl?: string, errorViewUrl?: string, preloadWebContentsUrl?: string);
     setPreloadWebContentsUrl(preloadWebContentsUrl: string): void;
     private _preloadInstances;
     private _createPreloadBW;
     private _createPreloadBV;
-    /**
-     * 预加载webContents
-     * @param url
-     */
-    preloadWebContents(url: string): void;
     create(options: Omit<ElectronWindowsManagerOptions, 'type'> & {
         type?: 'BW';
     }): BWItem;
@@ -37,6 +32,7 @@ export declare class WindowsManager {
     getAll(): Map<number, BWItem | BVItem>;
     close(idOrName: string | number): boolean;
     closeAll(): void;
+    rename(idOrName: string | number, newName: string): BWItem | BVItem | undefined;
     getPreload(): string | undefined;
     private _applyBrowserWindowOptions;
     private _applyBrowserViewOptions;

package/esm/main/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/main/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,WAAW,EAAkE,MAAM,UAAU,CAAA;AAIvI,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE/E,eAAO,MAAM,gBAAgB,wBAQzB,CAAC;AAUL,eAAO,MAAM,MAAM,QAAS,WAAW,SAEtC,CAAA;AAED,qBAAa,cAAc;IACzB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,gCAAgC,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvD,8BAA8B,EAAE,MAAM,GAAG,IAAI,CAAQ;IACrD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,UAAU,EAAE,OAAO,CAAS;gBAChB,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAajG,wBAAwB,CAAC,qBAAqB,EAAE,MAAM;YAgBxC,iBAAiB;IAwB/B,OAAO,CAAC,gBAAgB;IAyCxB,OAAO,CAAC,gBAAgB;IAsCxB;;;OAGG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM;IAK9B,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,6BAA6B,EAAE,MAAM,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,IAAI,CAAA;KAAE,GAAG,MAAM;IACtF,MAAM,CAAC,OAAO,EAAE,6BAA6B,GAAG;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,GAAG,MAAM;IACvE,MAAM,CAAC,OAAO,EAAE,6BAA6B,GAAG,MAAM,GAAG,MAAM;IAkV/D,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,6BAA6B;IAmF5E,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS;IA6B3D,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IACvC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IACvC,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAyBtC,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAqC/B,QAAQ;IA0BR,UAAU;IAKV,OAAO,CAAC,0BAA0B;IAoBlC,OAAO,CAAC,wBAAwB;IAiB1B,wBAAwB,CAAC,GAAG,EAAE,MAAM;CAqB3C;AAID,eAAO,IAAI,aAAa,SAAQ,CAAC;AAEjC,eAAO,MAAM,UAAU,aAAc,MAAM,mBAAmB,MAAM,iBAAiB,MAAM,0BAA0B,MAAM,KAAG,cA8N7H,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/main/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,WAAW,EAAkE,MAAM,UAAU,CAAA;AAIvI,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE/E,eAAO,MAAM,gBAAgB,wBAQzB,CAAC;AAUL,eAAO,MAAM,MAAM,QAAS,WAAW,SAEtC,CAAA;AAmBD,qBAAa,cAAc;IACzB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,gCAAgC,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvD,8BAA8B,EAAE,MAAM,GAAG,IAAI,CAAQ;IACrD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,UAAU,EAAE,OAAO,CAAS;gBAChB,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM;IAc5G,wBAAwB,CAAC,qBAAqB,EAAE,MAAM;YAgBxC,iBAAiB;IAwB/B,OAAO,CAAC,gBAAgB;IA2CxB,OAAO,CAAC,gBAAgB;IAyCxB,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,6BAA6B,EAAE,MAAM,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,IAAI,CAAA;KAAE,GAAG,MAAM;IACtF,MAAM,CAAC,OAAO,EAAE,6BAA6B,GAAG;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,GAAG,MAAM;IACvE,MAAM,CAAC,OAAO,EAAE,6BAA6B,GAAG,MAAM,GAAG,MAAM;IA6T/D,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,6BAA6B;IAmF5E,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS;IA6B3D,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IACvC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IACvC,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAyBtC,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAqC/B,QAAQ;IA0BR,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM;IAqCjD,UAAU;IAKV,OAAO,CAAC,0BAA0B;IAoBlC,OAAO,CAAC,wBAAwB;IAiB1B,wBAAwB,CAAC,GAAG,EAAE,MAAM;CAqB3C;AAID,eAAO,IAAI,aAAa,SAAQ,CAAC;AAEjC,eAAO,MAAM,UAAU,aAAc,MAAM,mBAAmB,MAAM,iBAAiB,MAAM,0BAA0B,MAAM,KAAG,cAkP7H,CAAA"}

package/esm/main/index.js

@@ -22,8 +22,24 @@ if (!remote.isInitialized()) {
 const enable = (win) => {
     remote.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)}
+      };
+      Object.entries(data).forEach(([key, value]) => {
+        window[key] = value;
+      });
+    } catch (error) {}
+  `);
+};
 class WindowsManager {
-    constructor(preload, loadingViewUrl, errorViewUrl, preloadUrl) {
+    constructor(preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl) {
         this.preloadedBW = null;
         this.preloadedBW_FramelessWithButtons = null;
         this.preloadedBW_FramelessNoButtons = null;
@@ -33,7 +49,8 @@ class WindowsManager {
         this.windows = new Map();
         this.loadingViewUrl = `${loadingViewUrl ?? ''}`;
         this.errorViewUrl = `${errorViewUrl ?? ''}`;
-        this.preloadWebContentsUrl = `${preloadUrl ?? ''}`;
+        this.preloadWebContentsUrl = `${preloadWebContentsUrl ?? ''}`;
+        log('log', 'preloadWebContentsUrl: ', this.preloadWebContentsUrl);
         if (this.preloadWebContentsUrl) {
             app.on('ready', () => {
                 this._preloadInstances();
@@ -86,97 +103,94 @@ class WindowsManager {
         return new Promise((resolve) => {
             const preload = this.preload;
             const url = this.preloadWebContentsUrl;
-            const instance = new BrowserWindow({
-                show: false,
-                ...options,
-                webPreferences: {
-                    webviewTag: true,
-                    plugins: true,
-                    nodeIntegration: true,
-                    contextIsolation: false,
-                    backgroundThrottling: false,
-                    webSecurity: false,
-                    preload: preload,
-                    ...(options.webPreferences || {}),
+            if (this.preloadWebContentsUrl) {
+                const instance = new BrowserWindow({
+                    show: false,
+                    ...options,
+                    webPreferences: {
+                        webviewTag: true,
+                        plugins: true,
+                        nodeIntegration: true,
+                        contextIsolation: false,
+                        backgroundThrottling: false,
+                        webSecurity: false,
+                        preload: preload,
+                        ...(options.webPreferences || {}),
+                    }
+                });
+                try {
+                    remote.enable(instance.webContents);
+                }
+                catch (error) {
+                    log('error', '预加载 BW 设置 remote 失败', error);
+                }
+                try {
+                    // @ts-ignore
+                    instance._id = instance.webContents.id;
+                }
+                catch (error) {
+                    log('error', '预加载 BW 设置 _id 失败', error);
                 }
-            });
-            try {
-                remote.enable(instance.webContents);
-            }
-            catch (error) {
-                log('error', '预加载 BW 设置 remote 失败', error);
-            }
-            try {
                 // @ts-ignore
-                instance._id = instance.webContents.id;
-            }
-            catch (error) {
-                log('error', '预加载 BW 设置 _id 失败', error);
+                log('log', '创建预BW: ', instance._id, this.preloadWebContentsUrl);
+                instance.webContents.once('did-finish-load', () => {
+                    resolve(instance);
+                });
+                instance.webContents.once('did-fail-load', () => {
+                    resolve(instance);
+                });
+                instance.loadURL(url || 'about:blank');
             }
-            // @ts-ignore
-            log('log', '创建预BW: ', instance._id);
-            instance.webContents.once('did-finish-load', () => {
-                resolve(instance);
-            });
-            instance.webContents.once('did-fail-load', () => {
-                resolve(instance);
-            });
-            instance.loadURL(url || 'about:blank');
         });
     }
     _createPreloadBV() {
         return new Promise((resolve) => {
             const preload = this.preload;
             const url = this.preloadWebContentsUrl;
-            const instance = new BrowserView({
-                webPreferences: {
-                    webviewTag: true,
-                    plugins: true,
-                    nodeIntegration: true,
-                    contextIsolation: false,
-                    // backgroundThrottling: false,
-                    webSecurity: false,
-                    preload: preload,
+            if (this.preloadWebContentsUrl) {
+                const instance = new BrowserView({
+                    webPreferences: {
+                        webviewTag: true,
+                        plugins: true,
+                        nodeIntegration: true,
+                        contextIsolation: false,
+                        // backgroundThrottling: false,
+                        webSecurity: false,
+                        preload: preload,
+                    }
+                });
+                try {
+                    remote.enable(instance.webContents);
+                }
+                catch (error) {
+                    log('error', '预加载 BV 设置 remote 失败', error);
+                }
+                try {
+                    // @ts-ignore
+                    instance._id = instance.webContents.id;
+                }
+                catch (error) {
+                    log('error', '预加载 BV 设置 _id 失败', error);
                 }
-            });
-            try {
-                remote.enable(instance.webContents);
-            }
-            catch (error) {
-                log('error', '预加载 BV 设置 remote 失败', error);
-            }
-            try {
                 // @ts-ignore
-                instance._id = instance.webContents.id;
-            }
-            catch (error) {
-                log('error', '预加载 BV 设置 _id 失败', error);
+                log('log', '创建预BV: ', instance._id, this.preloadWebContentsUrl);
+                instance.webContents.once('did-finish-load', () => {
+                    resolve(instance);
+                });
+                instance.webContents.once('did-fail-load', () => {
+                    resolve(instance);
+                });
+                instance.webContents.loadURL(url || 'about:blank');
             }
-            // @ts-ignore
-            log('log', '创建预BV: ', instance._id);
-            instance.webContents.once('did-finish-load', () => {
-                resolve(instance);
-            });
-            instance.webContents.once('did-fail-load', () => {
-                resolve(instance);
-            });
-            instance.webContents.loadURL(url || 'about:blank');
         });
     }
-    /**
-     * 预加载webContents
-     * @param url
-     */
-    preloadWebContents(url) {
-        this.preloadWebContentsUrl = url;
-    }
     create(options) {
         let window;
         const { usePreload = true, type = 'BW', name = 'anonymous', url, loadingView = { url: undefined }, errorView = { url: undefined }, browserWindow: browserWindowOptions, openDevTools = false, preventOriginClose = false, } = options;
         options.type = type;
         // 优先复用预创建实例
         let preloadWin = null;
-        if (type === 'BW' && usePreload) {
+        if (type === 'BW' && usePreload && this.preloadWebContentsUrl) {
             const bwOptions = browserWindowOptions || {};
             if (bwOptions.frame === false && bwOptions.titleBarStyle === 'hidden') {
                 preloadWin = this.preloadedBW_FramelessWithButtons;
@@ -194,7 +208,7 @@ class WindowsManager {
                 setTimeout(() => this._createPreloadBW({}), 0);
             }
         }
-        if (type === 'BV' && usePreload) {
+        if (type === 'BV' && usePreload && this.preloadWebContentsUrl) {
             preloadWin = this.preloadedBV;
             this.preloadedBV = null;
             setTimeout(() => this._createPreloadBV(), 0);
@@ -374,30 +388,10 @@ class WindowsManager {
             window.focus ? window.focus() : window.webContents.focus();
             this.windows.set(window.id || window._id || window.webContents.id, window);
             log('log', 'create', this.windows.keys());
-            const initVal = () => {
-                window.webContents.executeJavaScript(`
-          try {
-            const data = {
-              __ELECTRON_WINDOW_MANAGER_WEB_CONTENTS_ID__: ${JSON.stringify(window.webContents.id)},
-              __ELECTRON_WINDOW_MANAGER_TYPE__: ${JSON.stringify(window._type)},
-              __ELECTRON_WINDOW_MANAGER_NAME__: ${JSON.stringify(window._name)},
-              __ELECTRON_WINDOW_MANAGER_EXTRA_DATA__: ${JSON.stringify(window._extraData || '')},
-              __ELECTRON_WINDOW_MANAGER_PRELOAD__: ${JSON.stringify(preload)}
-            };
-            Object.entries(data).forEach(([key, value]) => {
-              Object.defineProperty(window, key, {
-                value,
-                writable: false,
-                configurable: false,
-                enumerable: true
-              });
-            });
-          } catch (error) {}
-        `);
-            };
             // 初始化值
             window.webContents.on('did-finish-load', () => {
-                initVal();
+                console.error('did-finish-load', window.webContents.id);
+                initWebContentsVal(window, `${preload || ''}`);
             });
             if (type === 'BW') {
                 const handleBrowserViewFocus = (view) => {
@@ -472,10 +466,8 @@ class WindowsManager {
                         for (const view of views) {
                             handleBrowserViewBlur(view);
                         }
-                        setTimeout(() => {
-                            _setBrowserView.call(window, view);
-                            handleBrowserViewFocus(view);
-                        }, 0);
+                        _setBrowserView.call(window, view);
+                        handleBrowserViewFocus(view);
                     };
                 }
                 catch (error) {
@@ -675,6 +667,40 @@ class WindowsManager {
             }
         });
     }
+    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;
+                }
+            });
+        }
+        if (!win) {
+            // 没有找到目标窗口
+            return undefined;
+        }
+        // 检查新名字是否已存在
+        let nameExists = false;
+        this.windows.forEach(i => {
+            if (i !== win && i?._name === newName) {
+                nameExists = true;
+            }
+        });
+        if (nameExists) {
+            // 新名字已被占用
+            return undefined;
+        }
+        // 修改名字并同步 webContents
+        win._name = newName;
+        initWebContentsVal(win, `${this.preload || ''}`);
+        return win;
+    }
     getPreload() {
         log('log', 'getPreload');
         return this.preload;
@@ -811,6 +837,19 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
             const res = wm.closeAll();
             return res;
         }
+        if (data?.type === 'rename') {
+            const opt = data;
+            const res = wm.rename(opt.data.idOrName, opt.data.newName);
+            if (res) {
+                return {
+                    winId: Number(`${res?.id || res?._id || -1}`),
+                    winName: `${res?._name || ''}`,
+                    winType: `${res?._type || ''}`,
+                    winExtraData: `${res?._extraData || ''}`,
+                };
+            }
+            return undefined;
+        }
         if (data?.type === 'getWindowForWebContentId') {
             const opt = data;
             const targetWebContents = webContents.fromId(opt.data);