nexfep 0.4.4 → 0.5.0

package/src/Logger.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from "fs";
 class Logger {
     logFilePath;
     constructor(logFilePath) {
@@ -6,56 +6,56 @@ class Logger {
     }
     __formatConsoleArgs(args) {
         if (!Array.isArray(args) || args.length === 0)
-            return '';
+            return "";
         const template = args[0];
-        if (typeof template !== 'string' || !template.includes('%c')) {
-            return args.map(String).join(' ');
+        if (typeof template !== "string" || !template.includes("%c")) {
+            return args.map(String).join(" ");
         }
-        const RESET = '\x1b[0m';
+        const RESET = "\x1b[0m";
         const parts = template.split(/(%c)/);
         let styleArgIndex = 1;
-        let result = '';
-        let currentAnsiStyle = '';
+        let result = "";
+        let currentAnsiStyle = "";
         // 命名前景色映射
         const fgColors = {
-            black: '\x1b[30m',
-            red: '\x1b[31m',
-            green: '\x1b[32m',
-            yellow: '\x1b[33m',
-            blue: '\x1b[34m',
-            magenta: '\x1b[35m',
-            cyan: '\x1b[36m',
-            white: '\x1b[37m',
-            gray: '\x1b[90m',
-            grey: '\x1b[90m',
-            lightred: '\x1b[91m',
-            lightgreen: '\x1b[92m',
-            lightyellow: '\x1b[93m',
-            lightblue: '\x1b[94m',
-            lightmagenta: '\x1b[95m',
-            lightcyan: '\x1b[96m',
-            lightwhite: '\x1b[97m',
+            black: "\x1b[30m",
+            red: "\x1b[31m",
+            green: "\x1b[32m",
+            yellow: "\x1b[33m",
+            blue: "\x1b[34m",
+            magenta: "\x1b[35m",
+            cyan: "\x1b[36m",
+            white: "\x1b[37m",
+            gray: "\x1b[90m",
+            grey: "\x1b[90m",
+            lightred: "\x1b[91m",
+            lightgreen: "\x1b[92m",
+            lightyellow: "\x1b[93m",
+            lightblue: "\x1b[94m",
+            lightmagenta: "\x1b[95m",
+            lightcyan: "\x1b[96m",
+            lightwhite: "\x1b[97m",
         };
         // 命名背景色映射
         const bgColors = {
-            black: '\x1b[40m',
-            red: '\x1b[41m',
-            green: '\x1b[42m',
-            yellow: '\x1b[43m',
-            blue: '\x1b[44m',
-            magenta: '\x1b[45m',
-            cyan: '\x1b[46m',
-            white: '\x1b[47m',
+            black: "\x1b[40m",
+            red: "\x1b[41m",
+            green: "\x1b[42m",
+            yellow: "\x1b[43m",
+            blue: "\x1b[44m",
+            magenta: "\x1b[45m",
+            cyan: "\x1b[46m",
+            white: "\x1b[47m",
         };
         // 文字样式：加粗、斜体、下划线
         const textStyles = {
-            'bold': '\x1b[1m',
-            'font-weight:bold': '\x1b[1m',
-            'italic': '\x1b[3m',
-            'font-style:italic': '\x1b[3m',
-            'underline': '\x1b[4m',
-            'text-decoration:underline': '\x1b[4m',
-            'none': RESET,
+            bold: "\x1b[1m",
+            "font-weight:bold": "\x1b[1m",
+            italic: "\x1b[3m",
+            "font-style:italic": "\x1b[3m",
+            underline: "\x1b[4m",
+            "text-decoration:underline": "\x1b[4m",
+            none: RESET,
         };
         /** hex/rgb 转 ANSI 24位真彩色 */
         function colorToAnsi(colorVal, isBg = false) {
@@ -67,9 +67,12 @@ class Logger {
             // hex #fff #ffffff
             const hexReg = /^#([0-9a-f]{3}|[0-9a-f]{6})$/;
             if (hexReg.test(val)) {
-                let hex = val.replace('#', '');
+                let hex = val.replace("#", "");
                 if (hex.length === 3)
-                    hex = hex.split('').map(c => c + c).join('');
+                    hex = hex
+                        .split("")
+                        .map((c) => c + c)
+                        .join("");
                 const r = parseInt(hex.slice(0, 2), 16);
                 const g = parseInt(hex.slice(2, 4), 16);
                 const b = parseInt(hex.slice(4, 6), 16);
@@ -82,30 +85,33 @@ class Logger {
                 const [, r, g, b] = rgbMatch;
                 return isBg ? `\x1b[48;2;${r};${g};${b}m` : `\x1b[38;2;${r};${g};${b}m`;
             }
-            return '';
+            return "";
         }
         /** 解析CSS样式字符串为ANSI序列 */
         function parseColorStyle(styleStr) {
             if (!styleStr)
                 return RESET;
-            let ansi = '';
-            const rules = styleStr.split(';').map(s => s.trim()).filter(Boolean);
+            let ansi = "";
+            const rules = styleStr
+                .split(";")
+                .map((s) => s.trim())
+                .filter(Boolean);
             for (const rule of rules) {
-                const [prop, ...rest] = rule.split(':');
+                const [prop, ...rest] = rule.split(":");
                 const propKey = prop.trim().toLowerCase();
-                const value = rest.join(':').trim().toLowerCase();
+                const value = rest.join(":").trim().toLowerCase();
                 // 文字样式
                 if (textStyles[`${propKey}:${value}`] || textStyles[value]) {
                     ansi += textStyles[`${propKey}:${value}`] ?? textStyles[value];
                     continue;
                 }
                 // 前景色
-                if (propKey === 'color') {
+                if (propKey === "color") {
                     ansi += colorToAnsi(value, false);
                     continue;
                 }
                 // 背景色
-                if (propKey === 'background' || propKey === 'background-color') {
+                if (propKey === "background" || propKey === "background-color") {
                     ansi += colorToAnsi(value, true);
                     continue;
                 }
@@ -113,14 +119,14 @@ class Logger {
             return ansi;
         }
         for (const segment of parts) {
-            if (segment === '%c') {
+            if (segment === "%c") {
                 // 取出下一个样式参数，参数不足则重置样式
                 const styleStr = args[styleArgIndex];
                 styleArgIndex++;
-                currentAnsiStyle = parseColorStyle(String(styleStr ?? ''));
+                currentAnsiStyle = parseColorStyle(String(styleStr ?? ""));
             }
             else {
-                if (segment === '')
+                if (segment === "")
                     continue;
                 if (currentAnsiStyle) {
                     result += currentAnsiStyle + segment;
@@ -136,54 +142,54 @@ class Logger {
         // 剩余非样式参数直接拼接
         const extraArgs = args.slice(styleArgIndex);
         if (extraArgs.length) {
-            result += ' ' + extraArgs.map(String).join(' ');
+            result += " " + extraArgs.map(String).join(" ");
         }
         return result;
     }
     __printLog(winid, type, args, colorANSI, colorRESET) {
         if (this.logFilePath) {
-            fs.appendFileSync(this.logFilePath, `${new Date().toISOString()} [${winid}] ${type}: ${args.join(' ')}\n`);
+            fs.appendFileSync(this.logFilePath, `${new Date().toISOString()} [${winid}] ${type}: ${args.join(" ")}\n`);
         }
-        console.log(`${colorANSI || ''}[${winid}] ${type}:${colorRESET || ''}`, this.__formatConsoleArgs(args));
+        console.log(`${colorANSI || ""}[${winid}] ${type}:${colorRESET || ""}`, this.__formatConsoleArgs(args));
     }
     log(args) {
         if (Array.isArray(args)) {
-            this.__printLog(0, 'Log', args);
+            this.__printLog(0, "Log", args);
         }
         else {
-            this.__printLog(0, 'Log', [args]);
+            this.__printLog(0, "Log", [args]);
         }
     }
     error(args) {
         if (Array.isArray(args)) {
-            this.__printLog(0, 'Error', args, '\x1b[31m', '\x1b[0m');
+            this.__printLog(0, "Error", args, "\x1b[31m", "\x1b[0m");
         }
         else {
-            this.__printLog(0, 'Error', [args], '\x1b[31m', '\x1b[0m');
+            this.__printLog(0, "Error", [args], "\x1b[31m", "\x1b[0m");
         }
     }
     warn(args) {
         if (Array.isArray(args)) {
-            this.__printLog(0, 'Warn', args, '\x1b[33m', '\x1b[0m');
+            this.__printLog(0, "Warn", args, "\x1b[33m", "\x1b[0m");
         }
         else {
-            this.__printLog(0, 'Warn', [args], '\x1b[33m', '\x1b[0m');
+            this.__printLog(0, "Warn", [args], "\x1b[33m", "\x1b[0m");
         }
     }
     info(args) {
         if (Array.isArray(args)) {
-            this.__printLog(0, 'Info', args, '\x1b[34m', '\x1b[0m');
+            this.__printLog(0, "Info", args, "\x1b[34m", "\x1b[0m");
         }
         else {
-            this.__printLog(0, 'Info', [args], '\x1b[34m', '\x1b[0m');
+            this.__printLog(0, "Info", [args], "\x1b[34m", "\x1b[0m");
         }
     }
     debug(args) {
         if (Array.isArray(args)) {
-            this.__printLog(0, 'Debug', args, '\x1b[90m', '\x1b[0m');
+            this.__printLog(0, "Debug", args, "\x1b[90m", "\x1b[0m");
         }
         else {
-            this.__printLog(0, 'Debug', [args], '\x1b[90m', '\x1b[0m');
+            this.__printLog(0, "Debug", [args], "\x1b[90m", "\x1b[0m");
         }
     }
 }

package/src/SingleInstance.d.ts

@@ -0,0 +1,9 @@
+import { SingleInstance } from "@nexfteam/single-instance";
+declare class Locker {
+    locker: SingleInstance;
+    constructor(appName: string);
+    lock(): Promise<void>;
+    unlock(): Promise<void>;
+    whenLost(callback: () => void): void;
+}
+export { Locker };

package/src/SingleInstance.js

@@ -0,0 +1,17 @@
+import { SingleInstance } from "@nexfteam/single-instance";
+class Locker {
+    locker;
+    constructor(appName) {
+        this.locker = new SingleInstance(appName);
+    }
+    lock() {
+        return this.locker.lock();
+    }
+    unlock() {
+        return this.locker.unlock();
+    }
+    whenLost(callback) {
+        this.locker.on("connection-attempt", callback);
+    }
+}
+export { Locker };

package/src/Tray.d.ts

@@ -1,4 +1,4 @@
-import { Application, TrayIcon, TrayIconImage } from '@webviewjs/webview';
+import { Application, TrayIcon, TrayIconImage } from "@webviewjs/webview";
 declare class Tray {
     app: Application;
     tray: TrayIcon;

package/src/Tray.js

@@ -12,13 +12,13 @@ class Tray {
             tooltip: options.tooltip,
             icon: options.icon,
             menu: {
-                items: this.menuItems
-            }
+                items: this.menuItems,
+            },
         });
     }
     __ErrorWhenDestroyed() {
         if (this.destroyed) {
-            throw new Error('Tray has been destroyed');
+            throw new Error("Tray has been destroyed");
         }
     }
     addMenuItem(item) {
@@ -28,7 +28,7 @@ class Tray {
     }
     removeMenuItem(id) {
         this.__ErrorWhenDestroyed();
-        this.menuItems = this.menuItems.filter(item => item.id !== id);
+        this.menuItems = this.menuItems.filter((item) => item.id !== id);
         this.tray.setMenu({ items: this.menuItems });
     }
     setMenuItems(items) {

package/src/WindowManager.d.ts

@@ -16,9 +16,18 @@ declare class Window {
     minimize(): void;
     unMaximize(): void;
     unMinimize(): void;
+    isMaximized(): boolean;
+    isMinimized(): boolean;
+    toggleMaximize(): void;
+    toggleMinimize(): void;
     openDevTools(): void;
     closeDevTools(): void;
     setSize(width: number, height: number): void;
+    getSize(): import("@webviewjs/webview").Dimensions;
+    setPosition(x: number, y: number): void;
+    getPosition(): import("@webviewjs/webview").Position;
+    isFocused(): boolean;
+    focus(): void;
     hide(): void;
     show(): void;
     close(): void;

package/src/WindowManager.js

@@ -1,7 +1,7 @@
 import { Logger } from "./Logger.js";
-import os from 'os';
-import path from 'path';
-import fs from 'fs';
+import os from "os";
+import path from "path";
+import fs from "fs";
 class Window {
     window;
     webview;
@@ -41,6 +41,28 @@ class Window {
     unMinimize() {
         this.window.setMinimized(false);
     }
+    isMaximized() {
+        return this.window.isMaximized();
+    }
+    isMinimized() {
+        return this.window.isMinimized();
+    }
+    toggleMaximize() {
+        if (this.isMaximized()) {
+            this.unMaximize();
+        }
+        else {
+            this.maximize();
+        }
+    }
+    toggleMinimize() {
+        if (this.isMinimized()) {
+            this.unMinimize();
+        }
+        else {
+            this.minimize();
+        }
+    }
     openDevTools() {
         this.webview.openDevtools();
     }
@@ -50,6 +72,22 @@ class Window {
     setSize(width, height) {
         this.window.setSize(width, height);
     }
+    getSize() {
+        return this.window.getInnerSize();
+    }
+    setPosition(x, y) {
+        this.window.setPosition(x, y);
+    }
+    getPosition() {
+        return this.window.getPosition();
+    }
+    isFocused() {
+        return this.window.isFocused();
+    }
+    focus() {
+        this.window.setMinimized(false);
+        this.window.focus();
+    }
     hide() {
         this.window.hide();
         this.isShow = false;
@@ -81,16 +119,16 @@ class WindowPool {
     freeWindowCount;
     global;
     constructor(app, options) {
-        if (os.platform() === 'win32') {
-            // 设置 WebView2 用户数据目录（仅 Windows 需要此配置）
-            const userDataDir = options.WindowsWebview2UserDataFolder || path.join(process.env.LOCALAPPDATA || os.homedir(), 'NexfepDevelopment.webview2-data');
+        if (os.platform() === "win32") {
+            const userDataDir = options.WindowsWebview2UserDataFolder ||
+                path.join(process.env.LOCALAPPDATA || os.homedir(), "NexfepDevelopment.webview2-data");
             if (!fs.existsSync(userDataDir)) {
                 fs.mkdirSync(userDataDir, { recursive: true });
             }
             process.env.WEBVIEW2_USER_DATA_FOLDER = userDataDir;
         }
         this.onCustomMessage = (window, data) => {
-            console.log('Get Custom Message:', data, "from window", window.id);
+            console.log("Get Custom Message:", data, "from window", window.id);
         };
         this.handlers = new Map();
         this.app = app;
@@ -139,13 +177,11 @@ class WindowPool {
         }
         `;
         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));
@@ -270,24 +306,24 @@ class WindowPool {
             window.__originConsoleDebug(...args);
         }
         
-        // 注入 CSS 样式
         const style = document.createElement('style');
         style.textContent = \`${INJECT_CSS}\`;
         document.head.appendChild(style);
         
-        // 标记加载完成
         window.isNexfepLoadDone = true;
 
-        // 触发加载完成事件
         window.dispatchEvent(new CustomEvent('nexfep-load-done'));
         `;
         await this.__injectCode(windowObj, INJECT_CODE);
     }
     async __createNewWindowObj() {
-        return await new Promise((resolve, reject) => {
+        return await new Promise((resolve) => {
             setImmediate(() => {
-                const window = this.app.createBrowserWindow({ title: "Nexfep" });
-                window.hide();
+                const window = this.app.createBrowserWindow({
+                    title: "Nexfep",
+                    visible: false,
+                    focused: false,
+                });
                 this.freeWindowCount++;
                 const webview = window.createWebview();
                 const windowObj = new Window(window, webview, ++this.windowCount, this);
@@ -295,7 +331,7 @@ class WindowPool {
                 webview.onIpcMessage((data) => {
                     const dataText = data.body.toString();
                     const dataObj = JSON.parse(dataText);
-                    if (dataObj.type == 'NexfepBeforeUnload') {
+                    if (dataObj.type == "NexfepBeforeUnload") {
                         webview.evaluateScript(`if(window?.isNexfepLoadDone){
                             const MessageBody = { type: 'NexfepBeforeUnload' }
                             window.ipc.postMessage(JSON.stringify(MessageBody));
@@ -304,37 +340,37 @@ class WindowPool {
                             window.ipc.postMessage(JSON.stringify(MessageBody));
                         }`);
                     }
-                    else if (dataObj.type == 'NexfepLoadFalse') {
+                    else if (dataObj.type == "NexfepLoadFalse") {
                         this.__injectControlFunctions(windowObj);
                     }
-                    else if (dataObj.type == 'NexfepCloseWindow') {
+                    else if (dataObj.type == "NexfepCloseWindow") {
                         this.closeWindow(windowObj);
                     }
-                    else if (dataObj.type == 'NexfepMinimizeWindow') {
+                    else if (dataObj.type == "NexfepMinimizeWindow") {
                         window.setMinimized(true);
                     }
-                    else if (dataObj.type == 'NexfepUnMinimizeWindow') {
+                    else if (dataObj.type == "NexfepUnMinimizeWindow") {
                         window.setMinimized(false);
                     }
-                    else if (dataObj.type == 'NexfepMaximizeWindow') {
+                    else if (dataObj.type == "NexfepMaximizeWindow") {
                         window.setMaximized(true);
                     }
-                    else if (dataObj.type == 'NexfepUnMaximizeWindow') {
+                    else if (dataObj.type == "NexfepUnMaximizeWindow") {
                         window.setMaximized(false);
                     }
-                    else if (dataObj.type == 'NexfepSetTitle') {
+                    else if (dataObj.type == "NexfepSetTitle") {
                         window.setTitle(dataObj.title);
                     }
-                    else if (dataObj.type == 'NexfepOpenDevTools') {
+                    else if (dataObj.type == "NexfepOpenDevTools") {
                         webview.openDevtools();
                     }
-                    else if (dataObj.type == 'NexfepCloseDevTools') {
+                    else if (dataObj.type == "NexfepCloseDevTools") {
                         webview.closeDevtools();
                     }
-                    else if (dataObj.type == 'CustomMessage') {
+                    else if (dataObj.type == "CustomMessage") {
                         this.onCustomMessage(windowObj, dataObj.data);
                     }
-                    else if (dataObj.type == 'NexfepInvoke') {
+                    else if (dataObj.type == "NexfepInvoke") {
                         const handlers = this.handlers.get(dataObj.event) || [];
                         handlers.forEach(async (handler) => {
                             const result = await handler(dataObj.data);
@@ -350,16 +386,16 @@ class WindowPool {
                             }
                         });
                     }
-                    else if (dataObj.type == 'NexfepSetGlobal') {
+                    else if (dataObj.type == "NexfepSetGlobal") {
                         this.global.set(dataObj.name, dataObj.value);
                     }
-                    else if (dataObj.type == 'NexfepGetGlobal') {
+                    else if (dataObj.type == "NexfepGetGlobal") {
                         const value = this.global.get(dataObj.name);
                         webview.evaluateScript(`
                             window.dispatchEvent(new CustomEvent('nexfep-get-global-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: ${JSON.stringify(value)} }));
                         `);
                     }
-                    else if (dataObj.type == 'NexfepBroadcast') {
+                    else if (dataObj.type == "NexfepBroadcast") {
                         this.windows.forEach(async (w) => {
                             if (w != windowObj && w.isOpen) {
                                 w.webview.evaluateScript(`
@@ -368,7 +404,7 @@ class WindowPool {
                             }
                         });
                     }
-                    else if (dataObj.type == 'NexfepTell') {
+                    else if (dataObj.type == "NexfepTell") {
                         this.windows.forEach(async (w) => {
                             if (w.id == dataObj.to) {
                                 w.webview.evaluateScript(`
@@ -377,20 +413,20 @@ class WindowPool {
                             }
                         });
                     }
-                    else if (dataObj.type == 'NexfepConsoleLog') {
-                        this.logger.__printLog(windowObj.id, 'Log', dataObj.message);
+                    else if (dataObj.type == "NexfepConsoleLog") {
+                        this.logger.__printLog(windowObj.id, "Log", dataObj.message);
                     }
-                    else if (dataObj.type == 'NexfepConsoleError') {
-                        this.logger.__printLog(windowObj.id, 'Error', dataObj.message, '\x1b[31m', '\x1b[0m');
+                    else if (dataObj.type == "NexfepConsoleError") {
+                        this.logger.__printLog(windowObj.id, "Error", dataObj.message, "\x1b[31m", "\x1b[0m");
                     }
-                    else if (dataObj.type == 'NexfepConsoleInfo') {
-                        this.logger.__printLog(windowObj.id, 'Info', dataObj.message, '\x1b[34m', '\x1b[0m');
+                    else if (dataObj.type == "NexfepConsoleInfo") {
+                        this.logger.__printLog(windowObj.id, "Info", dataObj.message, "\x1b[34m", "\x1b[0m");
                     }
-                    else if (dataObj.type == 'NexfepConsoleWarn') {
-                        this.logger.__printLog(windowObj.id, 'Warn', dataObj.message, '\x1b[33m', '\x1b[0m');
+                    else if (dataObj.type == "NexfepConsoleWarn") {
+                        this.logger.__printLog(windowObj.id, "Warn", dataObj.message, "\x1b[33m", "\x1b[0m");
                     }
-                    else if (dataObj.type == 'NexfepConsoleDebug') {
-                        this.logger.__printLog(windowObj.id, 'Debug', dataObj.message, '\x1b[90m', '\x1b[0m');
+                    else if (dataObj.type == "NexfepConsoleDebug") {
+                        this.logger.__printLog(windowObj.id, "Debug", dataObj.message, "\x1b[90m", "\x1b[0m");
                     }
                 });
                 resolve(windowObj);
@@ -398,7 +434,7 @@ class WindowPool {
         });
     }
     async createWindow(isShow = true, isDecorated = true) {
-        const window = this.windows.find(w => w.isOpen === false) || await this.__createNewWindowObj();
+        const window = this.windows.find((w) => w.isOpen === false) || (await this.__createNewWindowObj());
         this.freeWindowCount--;
         if (window) {
             window.isOpen = true;
@@ -427,10 +463,10 @@ class WindowPool {
         }
     }
     async handle(event, callback) {
-        this.handlers.set(event, [...this.handlers.get(event) || [], callback]);
+        this.handlers.set(event, [...(this.handlers.get(event) || []), callback]);
     }
     async unhandle(event, callback) {
-        this.handlers.set(event, (this.handlers.get(event) || []).filter(c => c !== callback));
+        this.handlers.set(event, (this.handlers.get(event) || []).filter((c) => c !== callback));
     }
 }
 export { WindowPool, Window };