nexfep 0.1.1 → 0.1.3

package/index.d.ts

@@ -1,45 +1,46 @@
-import { BrowserWindow, Webview } from "@webviewjs/webview";
-declare class Window {
-    window: BrowserWindow;
-    webview: Webview;
-    isOpen: boolean;
-    isShow: boolean;
-    isDecorated: boolean;
-    id: number;
-    private myPool;
-    constructor(window: BrowserWindow, webview: Webview, id: number, myPool: WindowPool);
-    setDecorated(isDecorated: boolean): void;
-    setTitle(title: string): void;
-    resizable(resizable: boolean): void;
-    maximize(): void;
-    minimize(): void;
-    unMaximize(): void;
-    unMinimize(): void;
-    openDevTools(): void;
-    closeDevTools(): void;
-    hide(): void;
-    show(): void;
-    close(): void;
-    loadURL(url: string): Promise<void>;
-    loadHTML(html: string): Promise<void>;
-}
-declare class WindowPool {
-    onCustomMessage: (window: Window, data: string) => void;
-    private app;
-    private windows;
-    private handlers;
-    private injectCount;
-    private windowCount;
-    private freeWindowCount;
-    constructor(WindowsWebview2UserDataFolder?: string);
-    __injectCode(window: Window, code: string): Promise<void>;
-    __injectControlFunctions(windowObj: Window): Promise<void>;
-    __createNewWindowObj(): Promise<Window>;
-    createWindow(isShow?: boolean, isDecorated?: boolean): Promise<Window>;
-    closeWindow(window: Window): Promise<void>;
-    closePool(): Promise<void>;
-    handle(event: string, callback: (data: any) => any): Promise<void>;
-    unhandle(event: string, callback: (data: any) => any): Promise<void>;
-    mainloop(): void;
-}
-export { WindowPool, Window };
+import { BrowserWindow, Webview } from "@webviewjs/webview";
+declare class Window {
+    window: BrowserWindow;
+    webview: Webview;
+    isOpen: boolean;
+    isShow: boolean;
+    isDecorated: boolean;
+    id: number;
+    private myPool;
+    constructor(window: BrowserWindow, webview: Webview, id: number, myPool: WindowPool);
+    setDecorated(isDecorated: boolean): void;
+    setTitle(title: string): void;
+    resizable(resizable: boolean): void;
+    maximize(): void;
+    minimize(): void;
+    unMaximize(): void;
+    unMinimize(): void;
+    openDevTools(): void;
+    closeDevTools(): void;
+    hide(): void;
+    show(): void;
+    close(): void;
+    loadURL(url: string): Promise<void>;
+    loadHTML(html: string): Promise<void>;
+}
+declare class WindowPool {
+    onCustomMessage: (window: Window, data: string) => void;
+    private app;
+    private windows;
+    private handlers;
+    private injectCount;
+    private windowCount;
+    private freeWindowCount;
+    global: Map<string, any>;
+    constructor(WindowsWebview2UserDataFolder?: string);
+    __injectCode(window: Window, code: string): Promise<void>;
+    __injectControlFunctions(windowObj: Window): Promise<void>;
+    __createNewWindowObj(): Promise<Window>;
+    createWindow(isShow?: boolean, isDecorated?: boolean): Promise<Window>;
+    closeWindow(window: Window): Promise<void>;
+    closePool(): Promise<void>;
+    handle(event: string, callback: (data: any) => any): Promise<void>;
+    unhandle(event: string, callback: (data: any) => any): Promise<void>;
+    mainloop(): void;
+}
+export { WindowPool, Window };

package/index.js

@@ -63,10 +63,8 @@ class Window {
         await this.myPool.__injectControlFunctions(this);
     }
     async loadHTML(html) {
-        console.log("Before loadHTML");
         await this.webview.loadHtml(html);
         await this.myPool.__injectControlFunctions(this);
-        console.log("After loadHTML");
     }
 }
 class WindowPool {
@@ -77,6 +75,7 @@ class WindowPool {
     injectCount;
     windowCount;
     freeWindowCount;
+    global;
     constructor(WindowsWebview2UserDataFolder = path.join(process.env.LOCALAPPDATA || os.homedir(), 'NexfepDevelopment.webview2-data')) {
         if (os.platform() === 'win32') {
             // 设置 WebView2 用户数据目录（仅 Windows 需要此配置）
@@ -85,7 +84,6 @@ class WindowPool {
                 fs.mkdirSync(userDataDir, { recursive: true });
             }
             process.env.WEBVIEW2_USER_DATA_FOLDER = userDataDir;
-            console.log('WebView2 user data folder:', userDataDir);
         }
         this.onCustomMessage = (window, data) => {
             console.log('Get Custom Message:', data, "from window", window.id);
@@ -96,128 +94,146 @@ class WindowPool {
         this.windows = [];
         this.windowCount = 0;
         this.freeWindowCount = 0;
+        this.global = new Map();
     }
     async __injectCode(window, code) {
         await window.webview.evaluateScript(code);
     }
     async __injectControlFunctions(windowObj) {
-        console.log("Create INJECT_CODE");
-        const INJECT_CSS = `
-        [nexfep-area-drag],
-        [nexfep-area-drag] * {
-            -webkit-app-region: drag;
-            app-region: drag;
-        }
-        
-        [nexfep-element-drag] {
-            -webkit-app-region: drag;
-            app-region: drag;
-        }
-        
-        [nexfep-no-drag],
-        [nexfep-no-drag] * {
-            -webkit-app-region: no-drag !important;
-            app-region: no-drag !important;
-        }
-        
-        [nexfep-auto-drag],
-        [nexfep-auto-drag] * {
-            -webkit-app-region: drag;
-            app-region: drag;
-        }
-        
-        [nexfep-auto-drag] button,
-        [nexfep-auto-drag] input,
-        [nexfep-auto-drag] select,
-        [nexfep-auto-drag] textarea,
-        [nexfep-auto-drag] a {
-            -webkit-app-region: no-drag;
-            app-region: no-drag;
-        }
+        const INJECT_CSS = `
+        [nexfep-area-drag],
+        [nexfep-area-drag] * {
+            -webkit-app-region: drag;
+            app-region: drag;
+        }
+        
+        [nexfep-element-drag] {
+            -webkit-app-region: drag;
+            app-region: drag;
+        }
+        
+        [nexfep-no-drag],
+        [nexfep-no-drag] * {
+            -webkit-app-region: no-drag !important;
+            app-region: no-drag !important;
+        }
+        
+        [nexfep-auto-drag],
+        [nexfep-auto-drag] * {
+            -webkit-app-region: drag;
+            app-region: drag;
+        }
+        
+        [nexfep-auto-drag] button,
+        [nexfep-auto-drag] input,
+        [nexfep-auto-drag] select,
+        [nexfep-auto-drag] textarea,
+        [nexfep-auto-drag] a {
+            -webkit-app-region: no-drag;
+            app-region: no-drag;
+        }
         `;
-        const INJECT_CODE = `
-        // 事件监听
-        window.addEventListener("beforeunload", () => {
-            const MessageBody = { type: 'NexfepBeforeUnload' }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        });
-        
-        // 窗口控制函数
-        window.close = () => {
-            const MessageBody = { type: 'NexfepCloseWindow' }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-        
-        window.minimize = () => {
-            const MessageBody = { type: 'NexfepMinimizeWindow' }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-        
-        window.unminimize = () => {
-            const MessageBody = { type: 'NexfepUnMinimizeWindow' }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-        
-        window.maximize = () => {
-            const MessageBody = { type: 'NexfepMaximizeWindow' }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-        
-        window.unmaximize = () => {
-            const MessageBody = { type: 'NexfepUnMaximizeWindow' }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-        window.setTitle = (title) => {
-            const MessageBody = { type: 'NexfepSetTitle', title: title }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-        
-        window.openDevTools = () => {
-            const MessageBody = { type: 'NexfepOpenDevTools' }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-        
-        window.closeDevTools = () => {
-            const MessageBody = { type: 'NexfepCloseDevTools' }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-
-        window.postMessage = (data) => {
-            const MessageBody = { type: 'CustomMessage', data: data }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-        };
-
-        window.eventCount = 0;
-
-        window.invoke = async (event, data) => {
-            const MessageBody = { type: 'NexfepInvoke', eventId: [${this.injectCount}, ++window.eventCount], event: event, data: data }
-            window.ipc.postMessage(JSON.stringify(MessageBody));
-            return new Promise((resolve, reject) => {
-                window.addEventListener("nexfep-invoke-result-"+${this.injectCount}+"-"+window.eventCount, (event) => {
-                    window.removeEventListener("nexfep-invoke-result-"+${this.injectCount}+"-"+window.eventCount, event);
-                    if(event.detail){
-                        resolve(event.detail);
-                    }else{
-                        resolve();
-                    }
-                });
-            });
-        }
-        
-        // 注入 CSS 样式
-        const style = document.createElement('style');
-        style.textContent = \`${INJECT_CSS}\`;
-        document.head.appendChild(style);
-        
-        // 标记加载完成
-        window.isNexfepLoadDone = true;
-
-        // 触发加载完成事件
-        window.dispatchEvent(new Event('nexfep-load-done'));
+        const INJECT_CODE = `
+        // 事件监听
+        window.addEventListener("beforeunload", () => {
+            const MessageBody = { type: 'NexfepBeforeUnload' }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        });
+        
+        // 窗口控制函数
+        window.close = () => {
+            const MessageBody = { type: 'NexfepCloseWindow' }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+        
+        window.minimize = () => {
+            const MessageBody = { type: 'NexfepMinimizeWindow' }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+        
+        window.unminimize = () => {
+            const MessageBody = { type: 'NexfepUnMinimizeWindow' }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+        
+        window.maximize = () => {
+            const MessageBody = { type: 'NexfepMaximizeWindow' }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+        
+        window.unmaximize = () => {
+            const MessageBody = { type: 'NexfepUnMaximizeWindow' }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+        window.setTitle = (title) => {
+            const MessageBody = { type: 'NexfepSetTitle', title: title }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+        
+        window.openDevTools = () => {
+            const MessageBody = { type: 'NexfepOpenDevTools' }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+        
+        window.closeDevTools = () => {
+            const MessageBody = { type: 'NexfepCloseDevTools' }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+
+        window.postMessage = (data) => {
+            const MessageBody = { type: 'CustomMessage', data: data }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        };
+
+        window.eventCount = 0;
+
+        window.invoke = async (event, data) => {
+            const MessageBody = { type: 'NexfepInvoke', eventId: [${this.injectCount}, ++window.eventCount], event: event, data: data }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+            return new Promise((resolve, reject) => {
+                window.addEventListener("nexfep-invoke-result-"+${this.injectCount}+"-"+window.eventCount, (event) => {
+                    window.removeEventListener("nexfep-invoke-result-"+${this.injectCount}+"-"+window.eventCount, event);
+                    if(event.detail){
+                        resolve(event.detail);
+                    }else{
+                        resolve();
+                    }
+                });
+            });
+        }
+        
+        window.setGlobal = (name, value) => {
+            const MessageBody = { type: 'NexfepSetGlobal', name: name, value: value }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+        }
+
+        window.getGlobal = (name) => {
+            const MessageBody = { type: 'NexfepGetGlobal', eventId: [${this.injectCount}, ++window.eventCount], name: name }
+            window.ipc.postMessage(JSON.stringify(MessageBody));
+            return new Promise((resolve, reject) => {
+                window.addEventListener("nexfep-get-global-result-"+${this.injectCount}+"-"+window.eventCount, (event) => {
+                    window.removeEventListener("nexfep-get-global-result-"+${this.injectCount}+"-"+window.eventCount, event);
+                    if(event.detail){
+                        resolve(event.detail);
+                    }else{
+                        resolve();
+                    }
+                });
+            });
+        }
+        
+        // 注入 CSS 样式
+        const style = document.createElement('style');
+        style.textContent = \`${INJECT_CSS}\`;
+        document.head.appendChild(style);
+        
+        // 标记加载完成
+        window.isNexfepLoadDone = true;
+
+        // 触发加载完成事件
+        window.dispatchEvent(new Event('nexfep-load-done'));
         `;
-        console.log("Before inject code INJECT_CODE");
         await this.__injectCode(windowObj, INJECT_CODE);
-        console.log("After inject control functions");
     }
     async __createNewWindowObj() {
         const window = this.app.createBrowserWindow({ title: "Nexfep" });
@@ -230,12 +246,12 @@ class WindowPool {
             const dataText = data.body.toString();
             const dataObj = JSON.parse(dataText);
             if (dataObj.type == 'NexfepBeforeUnload') {
-                webview.evaluateScript(`if(window?.isNexfepLoadDone){
-                    const MessageBody = { type: 'NexfepBeforeUnload' }
-                    window.ipc.postMessage(JSON.stringify(MessageBody));
-                }else{
-                    const MessageBody = { type: 'NexfepLoadFalse' }
-                    window.ipc.postMessage(JSON.stringify(MessageBody));
+                webview.evaluateScript(`if(window?.isNexfepLoadDone){
+                    const MessageBody = { type: 'NexfepBeforeUnload' }
+                    window.ipc.postMessage(JSON.stringify(MessageBody));
+                }else{
+                    const MessageBody = { type: 'NexfepLoadFalse' }
+                    window.ipc.postMessage(JSON.stringify(MessageBody));
                 }`);
             }
             else if (dataObj.type == 'NexfepLoadFalse') {
@@ -273,17 +289,26 @@ class WindowPool {
                 handlers.forEach(async (handler) => {
                     const result = await handler(dataObj.data);
                     if (result) {
-                        webview.evaluateScript(`
-                            window.dispatchEvent(new Event('nexfep-invoke-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: ${JSON.stringify(result)} }));
+                        webview.evaluateScript(`
+                            window.dispatchEvent(new Event('nexfep-invoke-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: ${JSON.stringify(result)} }));
                         `);
                     }
                     else {
-                        webview.evaluateScript(`
-                            window.dispatchEvent(new Event('nexfep-invoke-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: undefined }));
+                        webview.evaluateScript(`
+                            window.dispatchEvent(new Event('nexfep-invoke-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: undefined }));
                         `);
                     }
                 });
             }
+            else if (dataObj.type == 'NexfepSetGlobal') {
+                this.global.set(dataObj.name, dataObj.value);
+            }
+            else if (dataObj.type == 'NexfepGetGlobal') {
+                const value = this.global.get(dataObj.name);
+                webview.evaluateScript(`
+                    window.dispatchEvent(new Event('nexfep-get-global-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: ${JSON.stringify(value)} }));
+                `);
+            }
         });
         return windowObj;
     }

package/package.json

@@ -1,37 +1,36 @@
-{
-  "name": "nexfep",
-  "description": "A desktop application framework based on @webviewjs/webview",
-  "repository": "https://github.com/nexfteam/Nexfep",
-  "homepage": "https://github.com/nexfteam/Nexfep#readme",
-  "bugs": {
-    "url": "https://github.com/nexfteam/Nexfep/issues"
-  },
-  "keywords": [
-    "desktop",
-    "application",
-    "framework",
-    "@webviewjs/webview",
-    "webview",
-    "typescript"
-  ],
-  "version": "0.1.1",
-  "type": "module",
-  "packageManager": "pnpm@9.15.9",
-  "main": "./index.js",
-  "scripts": {
-    "compile": "tsc"
-  },
-  "author": "nexfteam",
-  "license": "MIT",
-  "engines": {
-    "node": ">=20.11.0"
-  },
-  "dependencies": {
-    "@webviewjs/webview": "^0.1.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "tsx": "^4.0.0",
-    "typescript": "^5.0.0"
-  }
+{
+  "name": "nexfep",
+  "description": "A desktop application framework based on @webviewjs/webview",
+  "repository": "https://github.com/nexfteam/Nexfep",
+  "homepage": "https://github.com/nexfteam/Nexfep#readme",
+  "bugs": {
+    "url": "https://github.com/nexfteam/Nexfep/issues"
+  },
+  "keywords": [
+    "desktop",
+    "application",
+    "framework",
+    "@webviewjs/webview",
+    "webview",
+    "typescript"
+  ],
+  "version": "0.1.3",
+  "type": "module",
+  "main": "./index.js",
+  "scripts": {
+    "compile": "tsc"
+  },
+  "author": "nexfteam",
+  "license": "MIT",
+  "engines": {
+    "node": ">=20.11.0"
+  },
+  "dependencies": {
+    "@webviewjs/webview": "^0.1.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.0.0",
+    "tsx": "^4.0.0",
+    "typescript": "^5.0.0"
+  }
 }