nexfep 0.5.5 → 0.6.1

package/src/Logger.js

@@ -16,7 +16,6 @@ class Logger {
         let styleArgIndex = 1;
         let result = "";
         let currentAnsiStyle = "";
-        // 命名前景色映射
         const fgColors = {
             black: "\x1b[30m",
             red: "\x1b[31m",
@@ -36,7 +35,6 @@ class Logger {
             lightcyan: "\x1b[96m",
             lightwhite: "\x1b[97m",
         };
-        // 命名背景色映射
         const bgColors = {
             black: "\x1b[40m",
             red: "\x1b[41m",
@@ -47,7 +45,6 @@ class Logger {
             cyan: "\x1b[46m",
             white: "\x1b[47m",
         };
-        // 文字样式：加粗、斜体、下划线
         const textStyles = {
             bold: "\x1b[1m",
             "font-weight:bold": "\x1b[1m",
@@ -57,14 +54,11 @@ class Logger {
             "text-decoration:underline": "\x1b[4m",
             none: RESET,
         };
-        /** hex/rgb 转 ANSI 24位真彩色 */
         function colorToAnsi(colorVal, isBg = false) {
             let val = colorVal.trim().toLowerCase();
-            // 命名色
             const colorMap = isBg ? bgColors : fgColors;
             if (colorMap[val])
                 return colorMap[val];
-            // hex #fff #ffffff
             const hexReg = /^#([0-9a-f]{3}|[0-9a-f]{6})$/;
             if (hexReg.test(val)) {
                 let hex = val.replace("#", "");
@@ -78,7 +72,6 @@ class Logger {
                 const b = parseInt(hex.slice(4, 6), 16);
                 return isBg ? `\x1b[48;2;${r};${g};${b}m` : `\x1b[38;2;${r};${g};${b}m`;
             }
-            // rgb(r,g,b)
             const rgbReg = /rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/;
             const rgbMatch = val.match(rgbReg);
             if (rgbMatch) {
@@ -87,7 +80,6 @@ class Logger {
             }
             return "";
         }
-        /** 解析CSS样式字符串为ANSI序列 */
         function parseColorStyle(styleStr) {
             if (!styleStr)
                 return RESET;
@@ -100,17 +92,14 @@ class Logger {
                 const [prop, ...rest] = rule.split(":");
                 const propKey = prop.trim().toLowerCase();
                 const value = rest.join(":").trim().toLowerCase();
-                // 文字样式
                 if (textStyles[`${propKey}:${value}`] || textStyles[value]) {
                     ansi += textStyles[`${propKey}:${value}`] ?? textStyles[value];
                     continue;
                 }
-                // 前景色
                 if (propKey === "color") {
                     ansi += colorToAnsi(value, false);
                     continue;
                 }
-                // 背景色
                 if (propKey === "background" || propKey === "background-color") {
                     ansi += colorToAnsi(value, true);
                     continue;
@@ -120,7 +109,6 @@ class Logger {
         }
         for (const segment of parts) {
             if (segment === "%c") {
-                // 取出下一个样式参数，参数不足则重置样式
                 const styleStr = args[styleArgIndex];
                 styleArgIndex++;
                 currentAnsiStyle = parseColorStyle(String(styleStr ?? ""));
@@ -136,10 +124,8 @@ class Logger {
                 }
             }
         }
-        // 全局末尾统一重置，防止后续日志被染色
         if (currentAnsiStyle)
             result += RESET;
-        // 剩余非样式参数直接拼接
         const extraArgs = args.slice(styleArgIndex);
         if (extraArgs.length) {
             result += " " + extraArgs.map(String).join(" ");
@@ -192,5 +178,10 @@ class Logger {
             this.__printLog(0, "Debug", [args], "\x1b[90m", "\x1b[0m");
         }
     }
+    clear() {
+        if (this.logFilePath) {
+            fs.writeFileSync(this.logFilePath, "");
+        }
+    }
 }
 export { Logger };

package/src/SingleInstance.d.ts

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

package/src/SingleInstance.js

@@ -4,8 +4,8 @@ class Locker {
     constructor(appName) {
         this.locker = new SingleInstance(appName);
     }
-    lock() {
-        return this.locker.lock();
+    lock(data) {
+        return this.locker.lock(data);
     }
     unlock() {
         return this.locker.unlock();

package/src/Tray.d.ts

@@ -1,4 +1,5 @@
-import { Application, TrayIcon, TrayIconImage } from "@webviewjs/webview";
+import { Application, TrayIcon } from "@webviewjs/webview";
+import { Icon } from "./Icon.js";
 declare class Tray {
     app: Application;
     tray: TrayIcon;
@@ -10,7 +11,7 @@ declare class Tray {
     constructor(app: Application, options: {
         id: string;
         tooltip: string;
-        icon: TrayIconImage | undefined;
+        icon?: Icon;
         menuItems: Array<{
             id: string;
             label: string;
@@ -26,7 +27,7 @@ declare class Tray {
         id: string;
         label: string;
     }>): void;
-    setIcon(icon: Uint8Array<ArrayBuffer | SharedArrayBuffer> | number[], width?: number | null | undefined, height?: number | null | undefined): void;
+    setIcon(icon: Icon): void;
     on(event: string, callback: (event: any) => void): void;
     setTooltip(tooltip: string): void;
     hide(): void;

package/src/Tray.js

@@ -10,7 +10,7 @@ class Tray {
         this.tray = app.createTrayIcon({
             id: options.id,
             tooltip: options.tooltip,
-            icon: options.icon,
+            icon: options.icon?.toTrayIconImage(),
             menu: {
                 items: this.menuItems,
             },
@@ -36,9 +36,9 @@ class Tray {
         this.menuItems = items;
         this.tray.setMenu({ items: this.menuItems });
     }
-    setIcon(icon, width, height) {
+    setIcon(icon) {
         this.__ErrorWhenDestroyed();
-        this.tray.setIcon(icon, width, height);
+        this.tray.setIcon(icon.data, icon.width, icon.height);
     }
     on(event, callback) {
         this.__ErrorWhenDestroyed();

package/src/WindowManager.d.ts

@@ -1,5 +1,6 @@
 import { Application, BrowserWindow, Webview } from "@webviewjs/webview";
 import { Logger } from "./Logger.js";
+import { Icon } from "./Icon.js";
 declare class Window {
     window: BrowserWindow;
     webview: Webview;
@@ -9,9 +10,13 @@ declare class Window {
     id: number;
     private myPool;
     constructor(window: BrowserWindow, webview: Webview, id: number, myPool: WindowPool);
+    setLevel(level: -1 | 0 | 1): void;
+    setFullScreen(isFullScreen: boolean, options?: {
+        borderless?: boolean;
+    }): void;
     setDecorated(isDecorated: boolean): void;
     setTitle(title: string): void;
-    resizable(resizable: boolean): void;
+    setResizable(resizable: boolean): void;
     maximize(): void;
     minimize(): void;
     unMaximize(): void;
@@ -22,12 +27,14 @@ declare class Window {
     toggleMinimize(): void;
     openDevTools(): void;
     closeDevTools(): void;
+    setIcon(icon: Icon): 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;
+    tell(message: string, data: any): void;
     hide(): void;
     show(): void;
     close(): void;
@@ -51,9 +58,18 @@ declare class WindowPool {
     __injectCode(window: Window, code: string): Promise<void>;
     __injectControlFunctions(windowObj: Window): Promise<void>;
     __createNewWindowObj(): Promise<Window>;
-    createWindow(isShow?: boolean, isDecorated?: boolean): Promise<Window>;
+    createWindow(options?: {
+        visible?: boolean;
+        decoration?: boolean;
+        title?: string;
+        icon?: Icon;
+        resizable?: boolean;
+        width?: number;
+        height?: number;
+    }): Promise<Window>;
     closeWindow(window: Window): Promise<void>;
     handle(event: string, callback: (data: any) => any): Promise<void>;
     unhandle(event: string, callback: (data: any) => any): Promise<void>;
+    broadcast(event: string, data: any): Promise<void>;
 }
 export { WindowPool, Window };

package/src/WindowManager.js

@@ -19,6 +19,36 @@ class Window {
         this.isDecorated = false;
         this.id = id;
     }
+    setLevel(level) {
+        if (level == -1) {
+            this.window.setAlwaysOnTop(false);
+            this.window.setAlwaysOnBottom(true);
+            return;
+        }
+        else if (level == 0) {
+            this.window.setAlwaysOnTop(false);
+            this.window.setAlwaysOnBottom(false);
+            return;
+        }
+        else if (level == 1) {
+            this.window.setAlwaysOnTop(true);
+            this.window.setAlwaysOnBottom(false);
+            return;
+        }
+    }
+    setFullScreen(isFullScreen, options) {
+        if (isFullScreen) {
+            if (options?.borderless) {
+                this.window.setFullscreen(1);
+            }
+            else {
+                this.window.setFullscreen(0);
+            }
+        }
+        else {
+            this.window.setFullscreen(null);
+        }
+    }
     setDecorated(isDecorated) {
         this.window.setDecorations(isDecorated);
         this.isDecorated = isDecorated;
@@ -26,7 +56,7 @@ class Window {
     setTitle(title) {
         this.window.setTitle(title);
     }
-    resizable(resizable) {
+    setResizable(resizable) {
         this.window.setResizable(resizable);
     }
     maximize() {
@@ -69,6 +99,9 @@ class Window {
     closeDevTools() {
         this.webview.closeDevtools();
     }
+    setIcon(icon) {
+        this.window.setWindowIcon(icon.data, icon.width, icon.height);
+    }
     setSize(width, height) {
         this.window.setSize(width, height);
     }
@@ -88,6 +121,9 @@ class Window {
         this.unMinimize();
         this.window.focus();
     }
+    tell(message, data) {
+        this.webview.evaluateScript(`window.dispatchEvent(new CustomEvent('${message}', { detail: ${JSON.stringify(data)} }));`);
+    }
     hide() {
         this.window.hide();
         this.isShow = false;
@@ -325,7 +361,7 @@ class WindowPool {
         return await new Promise((resolve) => {
             setImmediate(() => {
                 const window = this.app.createBrowserWindow({
-                    title: "Nexfep",
+                    title: "Nexfep Window",
                     visible: false,
                     focused: false,
                 });
@@ -337,13 +373,14 @@ 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") {
                         this.__injectControlFunctions(windowObj);
@@ -383,14 +420,10 @@ class WindowPool {
                         handlers.forEach(async (handler) => {
                             const result = await handler(dataObj.data);
                             if (result) {
-                                webview.evaluateScript(`
-                                    window.dispatchEvent(new CustomEvent('nexfep-invoke-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: ${JSON.stringify(result)} }));
-                                `);
+                                webview.evaluateScript(`window.dispatchEvent(new CustomEvent('nexfep-invoke-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: ${JSON.stringify(result)} }));`);
                             }
                             else {
-                                webview.evaluateScript(`
-                                    window.dispatchEvent(new CustomEvent('nexfep-invoke-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: undefined }));
-                                `);
+                                webview.evaluateScript(`window.dispatchEvent(new CustomEvent('nexfep-invoke-result-${dataObj.eventId[0]}-${dataObj.eventId[1]}', { detail: undefined }));`);
                             }
                         });
                     }
@@ -399,16 +432,12 @@ class WindowPool {
                     }
                     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)} }));
-                        `);
+                        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") {
                         this.windows.forEach(async (w) => {
                             if (w != windowObj && w.isOpen) {
-                                w.webview.evaluateScript(`
-                                    window.dispatchEvent(new CustomEvent('${dataObj.name}', { detail: ${JSON.stringify(dataObj.data)} }));
-                                `);
+                                w.webview.evaluateScript(`window.dispatchEvent(new CustomEvent('${dataObj.name}', { detail: ${JSON.stringify(dataObj.data)} }));`);
                             }
                         });
                     }
@@ -418,9 +447,7 @@ class WindowPool {
                         }
                         this.windows.forEach(async (w) => {
                             if (w.id == dataObj.to) {
-                                w.webview.evaluateScript(`
-                                    window.dispatchEvent(new CustomEvent('${dataObj.message}', { detail: ${JSON.stringify(dataObj.data)} }));
-                                `);
+                                w.webview.evaluateScript(`window.dispatchEvent(new CustomEvent('${dataObj.message}', { detail: ${JSON.stringify(dataObj.data)} }));`);
                             }
                         });
                     }
@@ -444,16 +471,22 @@ class WindowPool {
             });
         });
     }
-    async createWindow(isShow = true, isDecorated = true) {
+    async createWindow(options) {
         const window = this.windows.find((w) => w.isOpen === false) || (await this.__createNewWindowObj());
         this.freeWindowCount--;
         if (window) {
             window.isOpen = true;
-            window.isShow = isShow;
-            window.setDecorated(isDecorated);
-            if (isShow) {
+            window.isShow = options?.visible ?? true;
+            window.setDecorated(options?.decoration ?? true);
+            if (options?.visible ?? true) {
                 window.show();
             }
+            window.setTitle(options?.title ?? "Nexfep Window");
+            if (options?.icon) {
+                window.setIcon(options?.icon);
+            }
+            window.setResizable(options?.resizable ?? true);
+            window.setSize(options?.width ?? 800, options?.height ?? 600);
         }
         if (this.freeWindowCount == 0) {
             this.__createNewWindowObj();
@@ -479,5 +512,12 @@ class WindowPool {
     async unhandle(event, callback) {
         this.handlers.set(event, (this.handlers.get(event) || []).filter((c) => c !== callback));
     }
+    async broadcast(event, data) {
+        this.windows.forEach(async (w) => {
+            if (w.isOpen) {
+                w.webview.evaluateScript(`window.dispatchEvent(new CustomEvent('${event}', { detail: ${JSON.stringify(data)} }));`);
+            }
+        });
+    }
 }
 export { WindowPool, Window };