positron.js 1.0.5 → 1.0.6

package/builder.js

@@ -91,7 +91,17 @@ function performNativeBuild() {
   }
 
   if (buildingForMac) {
-    info(`[Builder] Stitching ${nativeExtensionsMac.length} native extensions...`);
+
+        const coreMacDir = path.join(__dirname, "core", "mac");
+
+        nativeExtensionsMac.push({
+          command:"createTray",
+          className:"TrayExtension",
+          sourceFile:path.join(coreMacDir, "tray.swift")
+        }); 
+
+        // -1 to account for the built-in tray extension
+    info(`[Builder] Stitching ${nativeExtensionsMac.length-1} native extensions...`);
   
         let registryContent = `// Auto-generated by Positron. Do not edit.\n`;
     registryContent += `func getExtensionRegistry() -> [String: (Int, [String]) -> Void] {\n`;
@@ -112,7 +122,6 @@ function performNativeBuild() {
     
     registryContent += `}\n`;
     
-    const coreMacDir = path.join(__dirname, "core", "mac");
     fs.writeFileSync(path.join(coreMacDir, "Registry.swift"), registryContent);
 
     info("[Builder] Compiling native binary...");
@@ -189,6 +198,7 @@ function performNativeBuild() {
     const coreWinDir = path.join(__dirname, "core", "win");
     const extensionsDir = path.join(coreWinDir, "extensions");
 
+
     // 1. Clean and prepare a staging folder for all native extensions
     if (fs.existsSync(extensionsDir)) fs.rmSync(extensionsDir, { recursive: true, force: true });
     fs.mkdirSync(extensionsDir, { recursive: true });

package/core/mac/main.swift

@@ -832,6 +832,12 @@ case "addToContentBlocker":
             IPCResponse(windowId: windowId, event: args.last ??  "isFocused-reply-\(windowId)", data: ["isFocused": isFocused ? "true" : "false"])
         )
 
+    case "getFocusedWindowId":
+        let focusedWindowId = windows.first(where: { $0.value.isKeyWindow })?.key ?? -1
+        AppDelegate.shared?.ipcClient.send(
+            IPCResponse(windowId: windowId, event: args.last ?? "getFocusedWindowId-reply-\(windowId)", data: ["focusedWindowId": "\(focusedWindowId)"])
+        )
+
     case "emitToRenderer":
         guard let window = windows[windowId] else { return }
         guard args.count >= 2 else {
@@ -1005,7 +1011,7 @@ func makePreloadScript(windowId: Int) -> String {
         /** Called internally by Swift's evaluateJS to deliver a push message. */
         _emit(channel, payload) {
           (_listeners[channel] || []).forEach(fn => {
-            try { fn(payload); } catch(e) { console.printError('[ipc] listener error:', e); }
+            try { fn(payload); } catch(e) { console.error('[ipc] listener error:', e); }
           });
         },
 

package/core/mac/tray.swift

@@ -0,0 +1,95 @@
+import Cocoa
+
+class TrayManager {
+    static let shared = TrayManager()
+    var statusItem: NSStatusItem?
+
+    func setupTray() {
+        if statusItem == nil {
+            statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+            if let button = statusItem?.button {
+                button.title = "App"
+            }
+        }
+    }
+
+    func setMenu(_ menu: NSMenu) {
+        statusItem?.menu = menu
+    }
+
+    func setTitle(_ title: String) {
+        statusItem?.button?.title = title
+    }
+
+    func setIcon(_ iconPath: String) {
+        guard let button = statusItem?.button else { return printError("Tray button not initialized") }
+
+        if iconPath.isEmpty {
+            DispatchQueue.main.async {
+                button.image = nil
+                button.imagePosition = .imageLeft
+            }
+            return
+        }
+
+        guard FileManager.default.fileExists(atPath: iconPath) else {
+            printError("Icon path does not exist: \(iconPath)")
+            return
+        }
+
+        DispatchQueue.main.async {
+            if let img = NSImage(contentsOfFile: iconPath) {
+                img.size = NSSize(width: 18, height: 18)
+                img.isTemplate = true
+                button.image = img
+                button.imagePosition = .imageLeft
+            } else {
+                button.image = nil
+                button.imagePosition = .imageLeft
+            }
+        }
+    }
+}
+
+public struct TrayExtension {    
+    public static func handle(windowId: Int, args: [String]) {
+
+        if(args.last == "setTitle") {
+            TrayManager.shared.setTitle(args[0])
+            return
+        }
+
+        if(args.last == "setIcon") {
+            TrayManager.shared.setIcon(args[0])
+            return
+        }
+
+        guard let descString = args.first,
+              let data = descString.data(using: .utf8),
+              let desc = try? JSONSerialization.jsonObject(with: data) as? [[String: Any]] else {
+            printError("tray setMenu — invalid JSON descriptor")
+            return
+        }
+
+        if args.last == "setMenu" {
+             TrayManager.shared.setMenu(buildContextMenu(from: desc, windowId: windowId))
+             return
+        }
+
+        DispatchQueue.main.async {
+
+            TrayManager.shared.setupTray()
+
+            let title = args.count > 1 ? args[1] : ""
+            TrayManager.shared.setTitle(title)
+
+            let imagePath = args.count > 2 ? args[2] : nil
+            if let imagePath = imagePath {
+                TrayManager.shared.setIcon(imagePath)
+            }
+
+            let menu = buildContextMenu(from: desc, windowId: windowId)
+            TrayManager.shared.setMenu(menu)
+        }
+    }
+}

package/core/win/main.cs

@@ -18,6 +18,7 @@ using System.Net.Sockets;
 using Microsoft.VisualBasic;
 using System.Runtime.InteropServices;
 using Microsoft.Win32;
+using System.Linq;
 
 class PowerSaveBlocker
 {
@@ -722,6 +723,16 @@ case "forceCloseWindow":
                     });
                     break;
 
+                case "getFocusedWindowId":
+                    int focusedWindowId = WindowsMap.FirstOrDefault(kv => kv.Value.IsActive).Key;
+                    _ipcClient.Send(new IPCResponse
+                    {
+                        windowId = windowId,
+                        @event = args[^1] ?? "getFocusedWindowId-reply-" + windowId,
+                        data = new() { { "focusedWindowId", focusedWindowId.ToString() } }
+                    });
+                    break;
+
                 case "showNotification":
                     if (args.Count < 2)
                     {
@@ -1094,7 +1105,7 @@ case "setBounds":
             MenuMap[windowId] = menu;
         }
 
-  private static void PopulateMenu(ItemCollection parentItems, JsonArray items, int windowId, string eventType = "menu-action")
+  internal static void PopulateMenu(ItemCollection parentItems, JsonArray items, int windowId, string eventType = "menu-action")
 {
     foreach (var item in items)
     {

package/core/win/tray.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Controls;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Windows;
+using System.Drawing;
+
+namespace PositronWindows
+{
+    public class TrayManager
+    {
+        private static TrayManager? _shared;
+        public static TrayManager Shared => _shared ??= new TrayManager();
+
+        public System.Windows.Forms.NotifyIcon? NotifyIcon { get; private set; }
+        private ContextMenu? _wpfContextMenu;
+
+        public void SetupTray()
+        {
+            if (NotifyIcon == null)
+            {
+                NotifyIcon = new System.Windows.Forms.NotifyIcon();
+                NotifyIcon.Visible = true;
+                NotifyIcon.Text = "App";
+                NotifyIcon.Icon = SystemIcons.Application;
+                
+                NotifyIcon.MouseUp += (s, e) =>
+                {
+                    if (e.Button == System.Windows.Forms.MouseButtons.Right || e.Button == System.Windows.Forms.MouseButtons.Left)
+                    {
+                        if (_wpfContextMenu != null)
+                        {
+                            _wpfContextMenu.IsOpen = true;
+                            if (Application.Current.MainWindow != null)
+                            {
+                                Application.Current.MainWindow.Activate();
+                            }
+                        }
+                    }
+                };
+            }
+        }
+
+        public void SetMenu(ContextMenu menu)
+        {
+            _wpfContextMenu = menu;
+        }
+
+        public void SetTitle(string title)
+        {
+            if (NotifyIcon != null && !string.IsNullOrEmpty(title))
+            {
+                NotifyIcon.Text = title.Length > 63 ? title.Substring(0, 63) : title;
+            }
+        }
+
+        public void SetIcon(string iconPath)
+        {
+            if (NotifyIcon != null && !string.IsNullOrEmpty(iconPath))
+            {
+                try
+                {
+                    NotifyIcon.Icon = new Icon(iconPath);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Failed to set tray icon: {ex.Message}");
+                }
+            }
+        }
+    }
+
+    public static class TrayExtension
+    {
+        public static void Handle(int windowId, List<string> args)
+        {
+            if (args.Count == 0)
+            {
+                Console.WriteLine("tray:setMenu — missing JSON descriptor");
+                return;
+            }
+
+            if (args[^1] == "setTitle")
+            {
+                string title = args[0];
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    TrayManager.Shared.SetTitle(title);
+                });
+                return;
+            }
+
+            if (args[^1] == "setIcon")
+            {
+                string iconPath = args[0];
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    TrayManager.Shared.SetIcon(iconPath);
+                });
+                return;
+            }
+
+            var descString = args[0];
+            var ctxDescriptor = JsonSerializer.Deserialize<JsonArray>(descString);
+            if (ctxDescriptor == null)
+            {
+                Console.WriteLine("tray:setMenu — invalid JSON descriptor");
+                return;
+            }
+
+            if(args[^1] == "setMenu")
+            {
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    var contextMenu = new ContextMenu();
+                    App.PopulateMenu(contextMenu.Items, ctxDescriptor, windowId, "context-menu-action");
+                    TrayManager.Shared.SetMenu(contextMenu);
+                });
+                return;
+            }
+
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                TrayManager.Shared.SetupTray();
+
+                string? title = args.Count > 1 ? args[1] : "";
+                TrayManager.Shared.SetTitle(title);
+
+                string? imagePath = args.Count > 2 ? args[2] : null;
+                if (imagePath != null)
+                {
+                    TrayManager.Shared.SetIcon(imagePath);
+                }
+
+                var contextMenu = new ContextMenu();
+                App.PopulateMenu(contextMenu.Items, ctxDescriptor, windowId, "context-menu-action");
+                TrayManager.Shared.SetMenu(contextMenu);
+            });
+        }
+    }
+}

package/index.js

@@ -13,6 +13,7 @@ const { info, error, warn, success } = require("./logs");
 
 let currMenu = []
 let contextMenu = [];
+let trayMenu = [];
 
 const randomPort = () => {
   const min = 1024;
@@ -180,7 +181,7 @@ ws.on("message", raw => {
           win.destroy();
         }
       }
-      } else if(msg.event == "menu-action" || msg.event == "context-menu-action") {
+      } else if(msg.event == "menu-action" || msg.event == "context-menu-action" || msg.event == "tray-menu-action") {
        
             const findMenuAction = (items, label, channel) => {
       if (!items || items.length === 0) return null;
@@ -199,7 +200,12 @@ ws.on("message", raw => {
       return null; 
     }
         
-        const menuAction = findMenuAction((msg.event === "menu-action" ? currMenu : contextMenu), msg.data.label, msg.data.channel);
+        let searchMenu = msg.event === "menu-action" ? currMenu : (msg.event === "context-menu-action" ? contextMenu : trayMenu);
+        let menuAction = findMenuAction(searchMenu, msg.data.label, msg.data.channel);
+        
+        if (!menuAction && msg.event === "context-menu-action") {
+          menuAction = findMenuAction(trayMenu, msg.data.label, msg.data.channel);
+        }
         
         if (menuAction) {
           menuAction.click();
@@ -1106,6 +1112,10 @@ async showFileOpenDialog(options = {}) {
 const app = {
 
   name:"PositronApp",
+  
+  setTrayMenu(menuTemplate) {
+    trayMenu = menuTemplate;
+  },
 
   /**
    * Quits the application by sending a terminate command to the native layer and then exiting the process. Emits a "before-quit" event before sending the command, and a "quit" event after initiating the quit sequence.
@@ -1162,8 +1172,10 @@ const app = {
    * @returns {Promise<Window|null>} The currently focused window, or null if no windows are focused.
    */
   async getFocusedWindow() {
-   const results = await Promise.all([...activeWindows].map(win => win.isFocused().then(isFocused => ({ win, isFocused }))));
-   return results.find(({ isFocused }) => isFocused)?.win || null;
+   const getFocused = await this.requestFromNative("getFocusedWindowId");
+   const winId = getFocused?.focusedWindowId ? parseInt(getFocused.focusedWindowId, 10) : -1;
+   const focusedWin = [...activeWindows].find(w => w.id === winId);
+   return focusedWin || { error: "No focused window found" };
   },
 
   /**

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/systemsoftware/positron.js"
   },
   "homepage": "https://positronjs.gitbook.io",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "index.js",
   "scripts": {
     "test": "node --test"

package/packager.js

@@ -33,24 +33,27 @@ function performPackager() {
 
 function handleJavaScriptPipeline(appRoot, resourcesPath) {
   const targetOutputFile = path.join(resourcesPath, "index.js");
+  let bundledFiles = [];
 
     info(`[Packager] Bundling JavaScript code with esbuild...`);
     try {
-      esbuild.buildSync({
+      const result = esbuild.buildSync({
         entryPoints: [path.join(appRoot, "index.js")],
         bundle: true,
         platform: "node",
         target: `node${MAJOR_NODE_V}`,
         outfile: targetOutputFile,
-        minify: ob,
+        minify: true,
         sourcemap: false,
+        metafile: true,
       });
+      bundledFiles = Object.keys(result.metafile.inputs).map(f => path.resolve(appRoot, f));
     } catch (err) {
       error("Fatal: esbuild bundling failed.");
       process.exit(1);
     }
 
-    copyAppAssets(appRoot, resourcesPath);
+    copyAppAssets(appRoot, resourcesPath, bundledFiles);
 
 }
 
@@ -212,7 +215,7 @@ async function packageWindows(appRoot, distDir, appName) {
   success(`Successfully packaged Windows app directory at: ${outputFolder}`);
 }
 
-function copyAppAssets(src, dest) {
+function copyAppAssets(src, dest, ignoredFiles = []) {
   const ignoreList = ["node_modules", "dist", "bin", ".git"];
   
   function copyRecursive(currentSrc, currentDest) {
@@ -221,6 +224,8 @@ function copyAppAssets(src, dest) {
       if (ignoreList.includes(item)) continue;
 
       const srcPath = path.join(currentSrc, item);
+      if (ignoredFiles.includes(srcPath)) continue;
+
       const destPath = path.join(currentDest, item);
       const stat = fs.statSync(srcPath);
 
@@ -232,7 +237,6 @@ function copyAppAssets(src, dest) {
         fs.mkdirSync(destPath, { recursive: true });
         copyRecursive(srcPath, destPath);
       } else {
-        if (item.endsWith(".js")) continue;
         fs.copyFileSync(srcPath, destPath);
       }
     }
@@ -244,6 +248,14 @@ function copyAppAssets(src, dest) {
 const { exec } = require("@yao-pkg/pkg");
 
 async function compileWithPkg(bundledJsPath, targetPlatform, outputFolder, appName) {
+
+  if(process.argv.includes("--no-pkg")) {
+    const finalPath = path.join(outputFolder, "index.js");
+    fs.copyFileSync(bundledJsPath, finalPath);
+    success(`[Packager] Skipped pkg compilation. Copied bundled JavaScript to: ${finalPath}`);
+    return;
+  }
+
   info(`[Packager] Packaging application into a standalone binary...`);
 
   let pkgTarget = "";

package/tray.js

@@ -0,0 +1,64 @@
+const { app } = require("./index");
+const { Menu } = require("./menu");
+
+let createdTray = false;
+ 
+module.exports = {
+
+create(menu, title = "", icon = "") {
+
+    if(createdTray) {
+        console.warn("Tray already created. Use setMenu, setTitle, or setIcon to update the existing tray.");
+        return;
+    }
+    
+    createdTray = true;
+   
+    if(menu instanceof Menu) {
+        menu = menu.template
+    }
+
+      const stripClick = (items) => {
+    if (!items) return null;
+    return items.map(i => {
+      const newItem = { ...i, click: undefined };
+      if (newItem.items) {
+        newItem.items = stripClick(newItem.items);
+      }
+      return newItem;
+    });
+  };
+
+    app.setTrayMenu(menu);
+    app.sendToNative("createTray", [JSON.stringify(stripClick(menu)), title, icon]);
+  },
+
+  setMenu(menu) {
+    if(menu instanceof Menu) {
+        menu = menu.template
+    }
+
+      const stripClick = (items) => {
+    if (!items) return null;
+    return items.map(i => {
+      const newItem = { ...i, click: undefined };
+      if (newItem.items) {
+        newItem.items = stripClick(newItem.items);
+      }
+      return newItem;
+    });
+  };
+
+    app.setTrayMenu(menu);
+    app.sendToNative("createTray", [JSON.stringify(stripClick(menu)), "setMenu"]);
+  },
+
+  setTitle(title) {
+    app.sendToNative("createTray", [title, "setTitle"]);
+  },
+
+  setIcon(iconPath) {
+    app.sendToNative("createTray", [iconPath, "setIcon"]);
+  }
+
+}