positron.js 1.0.4 → 1.0.6

package/bin/positron.js

@@ -5,6 +5,7 @@ const performPackager = require("../packager");
 const { spawn } = require("child_process");
 const [, , command] = process.argv;
 const { info, success, error } = require("../logs");
+const fs = require("fs");
 
 switch (command) {
   case "build":
@@ -15,7 +16,11 @@ switch (command) {
 
   case "dev":
     info("Starting Positron in development mode...");
-    performNativeBuild();
+    const buildSuccess = performNativeBuild();
+    if (!buildSuccess) {
+      error("Development build failed. Please fix the errors and try again.");
+      process.exit(1);
+    }
     spawn("node", ["."], { stdio: "inherit" });
     break;
 

package/builder.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const cp = require("child_process");
 const { success, error, info, warn } = require("./logs");
+const semver = require("semver");
 
 const arch = process.argv.includes("--x64") ? "x64" : process.argv.includes("--arm64") ? "arm64" : process.arch;
 
@@ -30,6 +31,18 @@ function performNativeBuild() {
       if (depPackage.positron) {
         const depDir = path.dirname(depPackagePath);
 
+        if(depPackage.positron.requiredVersion) {
+          const requiredVersion = depPackage.positron.requiredVersion;
+          const rootVersion = rootPackage.dependencies["positron.js"];
+          if(rootVersion.startsWith("file:")) {
+            warn(`[Builder] Dependency "${dep}" specifies a required positron.js version of ${requiredVersion}, but the project is using a local file reference. Skipping version compatibility check for this dependency.`);
+          } else {
+          if(!semver.satisfies(rootVersion, requiredVersion)) {
+            warn(`[Builder] Dependency "${dep}" requires positron.js version ${requiredVersion}, but the project has version ${rootVersion}. This may lead to compatibility issues.`);
+          }
+        }
+        } 
+
           let missing = [];
           if(!depPackage.positron.className) missing.push("className");
           if(!depPackage.positron.command) missing.push("command");
@@ -78,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`;
@@ -99,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...");
@@ -176,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

@@ -3,6 +3,9 @@ import WebKit
 import Network
 import Darwin
 import UserNotifications
+import Foundation
+import IOKit.pwr_mgt
+
 
 // MARK: - Globals
 
@@ -20,8 +23,31 @@ let AUTH_TOKEN: String = {
 var windowObservations: [Int: NSKeyValueObservation] = [:]
 var navigationDelegates: [Int: WebViewNavigationDelegate] = [:]
 
+private var assertionID: IOPMAssertionID?
 
-import Foundation
+func blockPowerSave() {
+    guard assertionID == nil else { return }
+
+    var id: IOPMAssertionID = 0
+
+    let result = IOPMAssertionCreateWithName(
+        kIOPMAssertionTypePreventUserIdleSystemSleep as CFString,
+        IOPMAssertionLevel(kIOPMAssertionLevelOn),
+        "Power Save Blocked" as CFString,
+        &id
+    )
+
+    if result == kIOReturnSuccess {
+        assertionID = id
+    } 
+}
+
+func unblockPowerSave() {
+    guard let id = assertionID else { return }
+
+    IOPMAssertionRelease(id)
+    assertionID = nil
+}
 
 final class PositronWebView: WKWebView {
     override func rightMouseDown(with event: NSEvent) {
@@ -292,7 +318,7 @@ case "isFullscreen":
     guard let window = windows[windowId] else { return }
     let isFullscreen = window.styleMask.contains(.fullScreen)
     AppDelegate.shared?.ipcClient.send(
-        IPCResponse(windowId: windowId, event: "isFullscreen-reply-\(windowId)", data: ["isFullscreen": isFullscreen ? "true" : "false"])
+        IPCResponse(windowId: windowId, event: args.last ?? "isFullscreen-reply-\(windowId)", data: ["isFullscreen": isFullscreen ? "true" : "false"])
     )
 
 case "setSwipeNav":
@@ -305,7 +331,7 @@ case "setSwipeNav":
         webView.allowsBackForwardNavigationGestures = enable
 
         GetIPCClient().send(
-            IPCResponse(windowId: windowId, event: "setSwipeNav-reply-\(windowId)", data: ["enabled": enable ? "true" : "false"])
+            IPCResponse(windowId: windowId, event: args.last ?? "setSwipeNav-reply-\(windowId)", data: ["enabled": enable ? "true" : "false"])
         )
 
 case "forceCloseWindow":
@@ -402,7 +428,7 @@ case "forceCloseWindow":
             let frame = window.frame
             let bounds = ["x": "\(Int(frame.origin.x))", "y": "\(Int(frame.origin.y))", "width": "\(Int(frame.size.width))", "height": "\(Int(frame.size.height))"]
             AppDelegate.shared?.ipcClient.send(
-                IPCResponse(windowId: windowId, event: "getBounds-reply-\(windowId)", data: bounds)
+                IPCResponse(windowId: windowId, event: args.last ?? "getBounds-reply-\(windowId)", data: bounds)
             )
 
         case "setResizable":
@@ -461,16 +487,64 @@ case "forceCloseWindow":
                 guard let window = windows[windowId] else { return }
                 let canGoBack = (window.contentView as? WKWebView)?.canGoBack ?? false
                 AppDelegate.shared?.ipcClient.send(
-                    IPCResponse(windowId: windowId, event: "canGoBack-reply-\(windowId)", data: ["canGoBack": canGoBack ? "true" : "false"])
+                    IPCResponse(windowId: windowId, event: args.last ?? "canGoBack-reply-\(windowId)", data: ["canGoBack": canGoBack ? "true" : "false"])
                 )
 
             case "canGoForward":
                 guard let window = windows[windowId] else { return }
                 let canGoForward = (window.contentView as? WKWebView)?.canGoForward ?? false
                 AppDelegate.shared?.ipcClient.send(
-                    IPCResponse(windowId: windowId, event: "canGoForward-reply-\(windowId)", data: ["canGoForward": canGoForward ? "true" : "false"])
+                    IPCResponse(windowId: windowId, event: args.last ?? "canGoForward-reply-\(windowId)", data: ["canGoForward": canGoForward ? "true" : "false"])
+                )
+
+            case "showFileOpenDialog":
+                guard let window = windows[windowId] else { return }
+                let panel = NSOpenPanel()
+                panel.allowsMultipleSelection = false
+                panel.canChooseDirectories = false
+                panel.canChooseFiles = true
+                panel.beginSheetModal(for: window) { response in
+                    if response == .OK, let url = panel.url {
+                        AppDelegate.shared?.ipcClient.send(
+                            IPCResponse(windowId: windowId, event: args.last ?? "showFileOpenDialog-reply-\(windowId)", data: ["filePath": url.path])
+                        )
+                    } else {
+                        AppDelegate.shared?.ipcClient.send(
+                            IPCResponse(windowId: windowId, event: args.last ?? "showFileOpenDialog-reply-\(windowId)", data: ["filePath": ""])
+                        )
+                    }
+                }
+
+            case "readFromClipboard":
+                let pasteboard = NSPasteboard.general
+                let clipboardText = pasteboard.string(forType: .string) ?? "notext"
+                AppDelegate.shared?.ipcClient.send(
+                    IPCResponse(windowId: windowId, event: args.last ?? "readFromClipboard-reply-\(windowId)", data: ["text": clipboardText])
                 )
 
+            case "blockPowerSave":
+                blockPowerSave()
+
+            case "unblockPowerSave":
+                unblockPowerSave()
+
+     case "isDarkMode":
+    guard let window = windows[windowId] else { return }
+    let isDarkMode = window.effectiveAppearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua
+    AppDelegate.shared?.ipcClient.send(
+        IPCResponse(windowId: windowId, event: args.last ?? "isDarkMode-reply-\(windowId)", data: ["isDarkMode": isDarkMode ? "true" : "false"])
+    )
+
+
+            case "writeToClipboard":
+                guard let text = args.first else {
+                    printError("writeToClipboard — missing text argument")
+                    return
+                }
+                let pasteboard = NSPasteboard.general
+                pasteboard.clearContents()
+                pasteboard.setString(text, forType: .string)
+
             case "showNotification":
 
 UNUserNotificationCenter.current().requestAuthorization(
@@ -501,14 +575,14 @@ UNUserNotificationCenter.current().requestAuthorization(
             guard let window = windows[windowId] else { return }
             let url = (window.contentView as? WKWebView)?.url?.absoluteString ?? ""
             AppDelegate.shared?.ipcClient.send(
-                IPCResponse(windowId: windowId, event: "getURL-reply-\(windowId)", data: ["url": url])
+                IPCResponse(windowId: windowId, event: args.last ?? "getURL-reply-\(windowId)", data: ["url": url])
             )
 
         case "getTitle":
             guard let window = windows[windowId] else { return }
             let title = window.title
             AppDelegate.shared?.ipcClient.send(
-                IPCResponse(windowId: windowId, event: "getTitle-reply-\(windowId)", data: ["title": title])
+                IPCResponse(windowId: windowId, event: args.last ?? "getTitle-reply-\(windowId)", data: ["title": title])
             )
 
         case "executeAppleScript":
@@ -528,7 +602,7 @@ case "isVisible":
     guard let window = windows[windowId] else { return }
     let isVisible = window.isVisible
     AppDelegate.shared?.ipcClient.send(
-        IPCResponse(windowId: windowId, event: "isVisible-reply-\(windowId)", data: ["isVisible": isVisible ? "true" : "false"])
+        IPCResponse(windowId: windowId, event: args.last ?? "isVisible-reply-\(windowId)", data: ["isVisible": isVisible ? "true" : "false"])
     )
 
 case "addToContentBlocker":
@@ -601,7 +675,7 @@ case "addToContentBlocker":
     }
 
     GetIPCClient().send(
-        IPCResponse(windowId: windowId, event: "addToContentBlocker-reply-\(windowId)", data: ["status": "success"])
+        IPCResponse(windowId: windowId, event: args.last ?? "addToContentBlocker-reply-\(windowId)", data: ["status": "success"])
     )
 
         case "isSwipeNavEnabled":
@@ -612,7 +686,7 @@ case "addToContentBlocker":
             }
             let enabled = webView.allowsBackForwardNavigationGestures
             AppDelegate.shared?.ipcClient.send(
-                IPCResponse(windowId: windowId, event: "isSwipeNavEnabled-reply-\(windowId)", data: ["enabled": enabled ? "true" : "false"])
+                IPCResponse(windowId: windowId, event: args.last ?? "isSwipeNavEnabled-reply-\(windowId)", data: ["enabled": enabled ? "true" : "false"])
             )
 
        case "forward":
@@ -698,7 +772,7 @@ case "addToContentBlocker":
                 resultStr = "null"
             }
             AppDelegate.shared?.ipcClient.send(
-                IPCResponse(windowId: windowId, event: "evaluateJS-reply-\(windowId)", data: ["result": resultStr])
+                IPCResponse(windowId: windowId, event: args.last ?? "evaluateJS-reply-\(windowId)", data: ["result": resultStr])
             )
         }
 
@@ -724,11 +798,11 @@ case "addToContentBlocker":
             if response == .alertFirstButtonReturn {
                 let userInput = inputField.stringValue
                 AppDelegate.shared?.ipcClient.send(
-                    IPCResponse(windowId: windowId, event: "prompt-reply-\(windowId)", data: ["input": userInput])
+                    IPCResponse(windowId: windowId, event: args.last ?? "prompt-reply-\(windowId)", data: ["input": userInput])
                 )
             } else {
                 AppDelegate.shared?.ipcClient.send(
-                    IPCResponse(windowId: windowId, event: "prompt-reply-\(windowId)", data: ["input": ""])
+                    IPCResponse(windowId: windowId, event: args.last ?? "prompt-reply-\(windowId)", data: ["input": ""])
                 )
             }
         }
@@ -747,7 +821,7 @@ case "addToContentBlocker":
         alert.beginSheetModal(for: window) { response in
             let confirmed = (response == .alertFirstButtonReturn)
             AppDelegate.shared?.ipcClient.send(
-                IPCResponse(windowId: windowId, event: "confirm-reply-\(windowId)", data: ["confirmed": confirmed ? "true" : "false"])
+                IPCResponse(windowId: windowId, event: args.last ?? "confirm-reply-\(windowId)", data: ["confirmed": confirmed ? "true" : "false"])
             )
         }
 
@@ -755,7 +829,13 @@ case "addToContentBlocker":
         guard let window = windows[windowId] else { return }
         let isFocused = window.isKeyWindow
         AppDelegate.shared?.ipcClient.send(
-            IPCResponse(windowId: windowId, event: "isFocused-reply-\(windowId)", data: ["isFocused": isFocused ? "true" : "false"])
+            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":
@@ -843,7 +923,7 @@ final class WebViewNavigationDelegate: NSObject, WKNavigationDelegate {
         let isFile = webView.url?.isFileURL ?? false
         let eventName = isFile ? "loadFile-reply-\(windowId)" : "loadURL-reply-\(windowId)"
         AppDelegate.shared?.ipcClient.send(
-            IPCResponse(windowId: windowId, event: eventName, data: [:])
+            IPCResponse(windowId: windowId, event: eventName, data: ["url": webView.url?.absoluteString ?? "", "title": webView.title ?? "", "canGoBack": (webView.canGoBack ? "true" : "false"), "canGoForward": (webView.canGoForward ? "true" : "false")])
         )
     }
 }
@@ -931,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); }
           });
         },
 
@@ -1088,8 +1168,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         
         cd "\(resourcePath)"
         
-        if [ -f "positron-backend" ]; then
-            exec "./positron-backend"
+        BACKEND_BIN=$(find . -maxdepth 1 -name "*-backend" | head -n 1)
+        if [ -n "$BACKEND_BIN" ] && [ -f "$BACKEND_BIN" ]; then
+            exec "$BACKEND_BIN"
         else
             exec "node" "."
         fi
@@ -1311,20 +1392,22 @@ setbuf(__stdoutp, nil)
 setbuf(__stderrp, nil)
 
 signal(SIGINT) { _ in
-    printError("INFO: Received SIGINT, shutting down…")
     AppDelegate.shared?.nodeProcess?.terminate()
+    unblockPowerSave()
     exit(0)
 }
 
 signal(SIGTERM) { _ in
     printError("INFO: Received SIGTERM, shutting down…")
     AppDelegate.shared?.nodeProcess?.terminate()
+    unblockPowerSave()
     exit(0)
 } 
 
 signal(SIGSEGV) { _ in
     printError("ERROR: Caught SIGSEGV (segmentation fault). This likely indicates a bug in the native code. Attempting to shut down gracefully…")
     AppDelegate.shared?.nodeProcess?.terminate()
+    unblockPowerSave()
     signal(SIGSEGV, SIG_DFL)
     raise(SIGSEGV)
 }

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/PositronRuntime.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>