positron.js 1.0.4 → 1.0.5

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");

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,7 @@ 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 "emitToRenderer":
@@ -843,7 +917,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")])
         )
     }
 }
@@ -1088,8 +1162,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 +1386,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/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>

package/core/win/main.cs

@@ -10,13 +10,49 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 using Microsoft.Web.WebView2.Core;
 using Microsoft.Web.WebView2.Wpf;
 using System.Text.Json.Serialization;
 using System.Net;
 using System.Net.Sockets;
 using Microsoft.VisualBasic;
+using System.Runtime.InteropServices;
+using Microsoft.Win32;
+
+class PowerSaveBlocker
+{
+    // Import the Win32 API
+    [DllImport("kernel32.dll")]
+    private static extern uint SetThreadExecutionState(uint esFlags);
+
+    // Flags
+    private const uint ES_CONTINUOUS       = 0x80000000;
+    private const uint ES_SYSTEM_REQUIRED  = 0x00000001;
+    private const uint ES_DISPLAY_REQUIRED = 0x00000002;
+
+    private static uint currentState = 0;
+    
+    public static void BlockPowerSave(bool keepDisplayOn = false)
+    {
+        uint flags = ES_CONTINUOUS | ES_SYSTEM_REQUIRED;
+        if (keepDisplayOn)
+        {
+            flags |= ES_DISPLAY_REQUIRED;
+        }
+
+        currentState = SetThreadExecutionState(flags);
+        if (currentState == 0)
+        {
+            Console.WriteLine("Failed to set execution state!");
+        }
+    }
+
+    public static void UnblockPowerSave()
+    {
+        SetThreadExecutionState(ES_CONTINUOUS);
+        currentState = 0;
+    }
+}
 
 
 namespace PositronWindows
@@ -137,10 +173,18 @@ namespace PositronWindows
                 ? Path.Combine(basePath, "resources")
                 : basePath;
 
-            if (File.Exists(Path.Combine(targetDir, "positron-backend.exe")))
+            string backendExeName = "positron-backend.exe";
+            if (Directory.Exists(targetDir)) {
+                string[] files = Directory.GetFiles(targetDir, "*-backend.exe");
+                if (files.Length > 0) {
+                    backendExeName = Path.GetFileName(files[0]);
+                }
+            }
+
+            if (File.Exists(Path.Combine(targetDir, backendExeName)))
             {
                 // PACKAGED MODE — C# is the entry point; launch the Node backend
-                StartNodeProcess(targetDir);
+                StartNodeProcess(targetDir, backendExeName);
             }
             else
             {
@@ -153,7 +197,7 @@ namespace PositronWindows
                 }
                 else
                 {
-                    error("No positron-backend.exe found and POSITRON_IPC_PORT not set. Cannot start.");
+                    error($"No {backendExeName} found and POSITRON_IPC_PORT not set. Cannot start.");
                     Shutdown();
                     return;
                 }
@@ -189,13 +233,13 @@ namespace PositronWindows
 
 private static int _ipcPort = 9000;
 
-private void StartNodeProcess(string workingDirectory)
+private void StartNodeProcess(string workingDirectory, string backendExeName)
 {
     IsPackaged = true;
 
     _ipcPort = GetRandomOpenPort();
 
-      string backendExe = Path.Combine(workingDirectory, "positron-backend.exe");
+    string backendExe = Path.Combine(workingDirectory, backendExeName);
 
     _nodeProcess = new Process
     {
@@ -335,7 +379,8 @@ private void StartNodeProcess(string workingDirectory)
                         _ipcClient.Send(new IPCResponse
                         {
                             windowId = windowId,
-                            @event = eventName
+                            @event = eventName,
+                            data = new() { { "url", webView.Source?.ToString() ?? "" }, { "title", webView.CoreWebView2.DocumentTitle }, { "canGoBack", webView.CoreWebView2.CanGoBack.ToString().ToLower() }, { "canGoForward", webView.CoreWebView2.CanGoForward.ToString().ToLower() } }
                         });
                     };
 
@@ -359,6 +404,7 @@ private void StartNodeProcess(string workingDirectory)
                     break;
                 }
 
+
  case "setContextMenu":               
     if (!LayoutMap.TryGetValue(windowId, out var layout)) break;
     if (args.Count == 0)
@@ -394,12 +440,41 @@ private void StartNodeProcess(string workingDirectory)
     GetIPCClient().Send(new IPCResponse
     {
         windowId = windowId,
-        @event = "setSwipeNav-reply-" + windowId,
+        @event = args[^1] ?? "setSwipeNav-reply-" + windowId,
         data = new() { { "enabled", (wvSwipeNav?.CoreWebView2.Settings.IsSwipeNavigationEnabled ?? false).ToString().ToLower() } }
     });
 
     break;
 
+    case "blockPowerSave":
+    PowerSaveBlocker.BlockPowerSave();
+    break;
+
+    case "unblockPowerSave":
+    PowerSaveBlocker.UnblockPowerSave();
+    break;
+
+    case "isDarkMode":
+    bool isLightTheme = true;
+using (RegistryKey? key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize"))
+{
+    if (key != null)
+    {
+        object? value = key?.GetValue("AppsUseLightTheme");
+        if (value != null && (int)value == 0)
+        {
+            isLightTheme = false; // Dark Mode
+        }
+    }
+}
+GetIPCClient().Send(new IPCResponse
+{
+    windowId = windowId,
+    @event = args[^1] ?? "isDarkMode-reply-" + windowId,
+    data = new() { { "isDarkMode", (!isLightTheme).ToString().ToLower() } }
+});
+break;
+
     case "isSwipeNavEnabled":
     if (!WindowsMap.TryGetValue(windowId, out var winCheckSwipe)) break;
     var wvCheckSwipe = GetWebView(windowId);
@@ -408,19 +483,75 @@ private void StartNodeProcess(string workingDirectory)
         GetIPCClient().Send(new IPCResponse
         {
             windowId = windowId,
-            @event = "isSwipeNavEnabled-reply-" + windowId,
+            @event = args[^1] ?? "isSwipeNavEnabled-reply-" + windowId,
             data = new() { { "enabled", isEnabled.ToString().ToLower() } }
         }
         );
     }
     break;
 
+    case "showFileOpenDialog":
+    {
+        var dialog = new Microsoft.Win32.OpenFileDialog
+        {
+            Multiselect = args.Count > 0 && args[0].ToLower() == "true"
+        };
+        bool? result = dialog.ShowDialog();
+        if (result == true)
+        {
+            string[] files = dialog.FileNames;
+            GetIPCClient().Send(new IPCResponse
+            {
+                windowId = windowId,
+                @event = args[^1] ?? "showFileOpenDialog-reply-" + windowId,
+                data = new() { { "files", JsonSerializer.Serialize(files) } }
+            });
+        }
+    }
+    break;
+
+    case "readFromClipboard":
+    string clipboardText = "";
+    Current.Dispatcher.Invoke(() =>
+    {
+        try
+        {
+            clipboardText = Clipboard.GetText();
+        }
+        catch (Exception ex)
+        {
+            error($"readFromClipboard failed: {ex.Message}");
+        }
+    });
+    GetIPCClient().Send(new IPCResponse
+    {
+        windowId = windowId,
+        @event = args[^1] ?? "readFromClipboard-reply-" + windowId,
+        data = new() { { "text", clipboardText } }
+    });
+    break;
+
+    case "writeToClipboard":
+    if (args.Count == 0) break;
+    Current.Dispatcher.Invoke(() =>
+    {
+        try
+        {
+            Clipboard.SetText(args[0]);
+        }
+        catch (Exception ex)
+        {
+            error($"writeToClipboard failed: {ex.Message}");
+        }
+    });
+    break;
+
     case "isVisible":
     if (!WindowsMap.TryGetValue(windowId, out var winVisible)) break;
     bool isVisible = winVisible.IsVisible;
     GetIPCClient().Send(new IPCResponse
     {        windowId = windowId,
-        @event = "isVisible-reply-" + windowId,
+        @event = args[^1] ?? "isVisible-reply-" + windowId,
         data = new() { { "isVisible", isVisible.ToString().ToLower() } }
     });
     break;
@@ -430,14 +561,17 @@ private void StartNodeProcess(string workingDirectory)
     bool isFullscreen = winFullscreen.WindowState == WindowState.Maximized;
     GetIPCClient().Send(new IPCResponse
     {        windowId = windowId,
-        @event = "isFullscreen-reply-" + windowId,
+        @event = args[^1] ?? "isFullscreen-reply-" + windowId,
         data = new() { { "isFullscreen", isFullscreen.ToString().ToLower() } }
     });
     break;
 
                 case "closeWindow":
                     if (WindowsMap.TryGetValue(windowId, out var winToClose))
+                    {
+                        _forceClosing.Add(windowId);
                         winToClose.Close(); // Triggers Closed → cleanup above
+                    }
                     else
                         error($"closeWindow — no window found with ID {windowId}");
                     break;
@@ -500,6 +634,15 @@ case "forceCloseWindow":
                     }
                     break;
 
+                case "addToContentBlocker":
+                    _ipcClient.Send(new IPCResponse
+                    {
+                        windowId = windowId,
+                        @event = args[^1] ?? "addToContentBlocker-reply-" + windowId,
+                        data = new() { { "status", "success" }, { "warning", "Content blocker not supported on Windows." } }
+                    });
+                    break;
+
                 case "loadFile":
                     if (!WindowsMap.TryGetValue(windowId, out _)) break;
                     if (args.Count == 0)
@@ -550,7 +693,7 @@ case "forceCloseWindow":
                                 _ipcClient.Send(new IPCResponse
                                 {
                                     windowId = windowId,
-                                    @event = "evaluateJS-reply-" + windowId,
+                                    @event = args[^1] ?? "evaluateJS-reply-" + windowId,
                                     data = new() { { "result", result ?? "null" } }
                                 });
                             }
@@ -560,7 +703,7 @@ case "forceCloseWindow":
                                 _ipcClient.Send(new IPCResponse
                                 {
                                     windowId = windowId,
-                                    @event = "evaluateJS-reply-" + windowId,
+                                    @event = args[^1] ??  "evaluateJS-reply-" + windowId,
                                     data = new() { { "error", ex.Message } }
                                 });
                             }
@@ -574,7 +717,7 @@ case "forceCloseWindow":
                     _ipcClient.Send(new IPCResponse
                     {
                         windowId = windowId,
-                        @event = "isFocused-reply-" + windowId,
+                        @event = args[^1] ?? "isFocused-reply-" + windowId,
                         data = new() { { "isFocused", isFocused.ToString().ToLower() } }
                     });
                     break;
@@ -666,7 +809,7 @@ case "setBounds":
                         _ipcClient.Send(new IPCResponse
                         {
                             windowId = windowId,
-                            @event = "prompt-reply-" + windowId,
+                            @event = args[^1] ?? "prompt-reply-" + windowId,
                             data = new() { { "input", result } }
                         });
                     }
@@ -684,7 +827,7 @@ case "setBounds":
                         _ipcClient.Send(new IPCResponse
                         {
                             windowId = windowId,
-                            @event = "confirm-reply-" + windowId,
+                            @event = args[^1] ?? "confirm-reply-" + windowId,
                             data = new() { { "confirmed", result.ToString().ToLower() } }
                         });
                     }
@@ -810,7 +953,7 @@ case "setBounds":
                                 _ipcClient.Send(new IPCResponse
                                 {
                                     windowId = windowId,
-                                    @event = "capture-page-result-" + windowId,
+                                    @event = args[^1] ?? "capture-page-result-" + windowId,
                                     data = new() { { "imageData", base64 } }
                                 });
                             }
@@ -831,7 +974,7 @@ case "setBounds":
                             _ipcClient.Send(new IPCResponse
                             {
                                 windowId = windowId,
-                                @event = "canGoBack-reply-" + windowId,
+                                @event = args[^1] ?? "canGoBack-reply-" + windowId,
                                 data = new() { { "canGoBack", canGoBack.ToString().ToLower() } }
                             });
                         }
@@ -847,7 +990,7 @@ case "setBounds":
                             _ipcClient.Send(new IPCResponse
                             {
                                 windowId = windowId,
-                                @event = "canGoForward-reply-" + windowId,
+                                @event = args[^1] ?? "canGoForward-reply-" + windowId,
                                 data = new() { { "canGoForward", canGoForward.ToString().ToLower() } }
                             });
                         }
@@ -863,7 +1006,7 @@ case "setBounds":
                             _ipcClient.Send(new IPCResponse
                             {
                                 windowId = windowId,
-                                @event = "getURL-reply-" + windowId,
+                                @event = args[^1] ?? "getURL-reply-" + windowId,
                                 data = new() { { "url", url } }
                             });
                         }
@@ -879,7 +1022,7 @@ case "setBounds":
                             _ipcClient.Send(new IPCResponse
                             {
                                 windowId = windowId,
-                                @event = "getTitle-reply-" + windowId,
+                                @event = args[^1] ?? "getTitle-reply-" + windowId,
                                 data = new() { { "title", title } }
                             });
                         }

package/index.js

@@ -317,7 +317,7 @@ class Window extends Events.EventEmitter {
    * @param {string} path The path to the file to load.
    */
   async loadFile(path) {
-    const res = await this.request("loadFile", `loadFile-reply-${this.id}`, path);
+    const res = await this.request("loadFile", { replyChannel: `loadFile-reply-${this.id}` }, path);
     this.emit("file-loaded", path);
     this.emit("navigated", path);
     return res;
@@ -328,7 +328,7 @@ class Window extends Events.EventEmitter {
    * @param {string} url The URL to load.
    */
   async loadURL(url) {
-    const res = await this.request("loadURL", `loadURL-reply-${this.id}`, url);
+    const res = await this.request("loadURL", { replyChannel: `loadURL-reply-${this.id}` }, url);
     this.emit("url-loaded", url);
     this.emit("navigated", url);
     return res;
@@ -349,7 +349,7 @@ emitToRenderer(channel, args = []) {
     activeSocket.send(payload);
     this.emit("ipc-sent", { channel, args });
   } else {
-    warn(`Cannot send IPC message, socket not ready. Channel: ${channel}`);
+    warn(`Cannot send IPC message on ${channel}, socket not ready.`);
   }
 }
 
@@ -575,7 +575,7 @@ focus() {
  * @returns {Promise<boolean>} True if the window is visible, false otherwise.
  */
 async isVisible() {
-  const res = await this.request("isVisible", `isVisible-reply-${this.id}`);
+  const res = await this.request("isVisible");
   return res?.isVisible === "true";
 }
 
@@ -584,7 +584,7 @@ async isVisible() {
  * @returns {Promise<boolean>} True if the window is fullscreen, false otherwise.
  */
 async isFullscreen() {
-  const res = await this.request("isFullscreen", `isFullscreen-reply-${this.id}`);
+  const res = await this.request("isFullscreen");
   return res?.isFullscreen === "true";
 }
 
@@ -603,7 +603,7 @@ reload() {
  * @returns {Promise<Buffer|null>} The captured screenshot as a Buffer, or null if the capture failed.
  */
 async capturePage() {
- const response = await this.request("capturePage", `capture-page-result-${this.id}`);
+ const response = await this.request("capturePage", { replyChannel: `capture-page-result-${this.id}` });
  return response.image ? Buffer.from(response.image, "base64") : null;
 }
 
@@ -612,52 +612,94 @@ async capturePage() {
  * @returns {Promise<boolean>} True if the window can navigate back, false otherwise.
  */
 async canGoBack() {
- const response = await this.request("canGoBack", `canGoBack-reply-${this.id}`);
+ const response = await this.request("canGoBack");
  return response === "true";
 }
 
+// @ts-check
+
+/**
+ * @typedef {Object} RequestOptions
+ * @property {number} [timeout]
+ * @property {boolean} [noTimeout]
+ * @property {string} [replyChannel]
+ */
+
+/**
+ * @overload
+ * @param {string} command
+ * @param {...any} args
+ * @returns {Promise<any>}
+ */
+
 /**
- * Sends a request/response command to the native layer. The command will be sent, and the method will wait for a response on the specified reply channel. Once a response is received, the promise will resolve with the reply data.
- * @param {string} command The command to send.
- * @param {string} replyChannel The channel to listen for the reply on.
- * @returns {Promise<*>} A promise that resolves to the reply data.
+ * @overload
+ * @param {string} command
+ * @param {RequestOptions} options
+ * @param {...any} args
+ * @returns {Promise<any>}
  */
-async request(command, replyChannel, ...args) {
+
+/**
+ * Send an IPC request.
+ * @param {string} command
+ * @param {...any} args
+ */
+async request(command, ...args) {
   return new Promise((resolve, reject) => {
     let settled = false;
 
+    let options = {};
+
+    if(typeof args[0] === "object" && args[0].constructor === Object) {
+      options = args[0];
+      args = args.slice(1);
+    }
+
     if(!command) {
       reject(new Error("Command is required for request"));
       return;
     }
 
-    if(!replyChannel) {
-      replyChannel = `${command}-reply-${this.id}`;
-    }
+    const reqId = crypto.randomUUID();
+
+    let replyChannel = `${command}-reply-${reqId}`;
+
+  if (options.replyChannel) {
+  replyChannel = options.replyChannel;
+} else if(args[0] && (args[0].includes("-reply-") || args[0].includes("-result-"))) {
+  // TEMP TRANSITIONAL LOGIC TO SUPPORT LEGACY REQUESTS THAT PASS REPLY CHANNEL AS FIRST ARGUMENT. WILL BE REMOVED IN A FUTURE RELEASE.
+  replyChannel = args[0];
+}
 
     const unsubscribe = ipc.handle(replyChannel, (data) => {
       if (!settled) {
         settled = true;
         clearTimeout(timeout);
         unsubscribe();
+
+        for (const key in data) {
+          if (data[key] === "true") {
+            data[key] = true;
+          } else if (data[key] === "false") {
+            data[key] = false;
+          } else if (!isNaN(data[key])) {
+            data[key] = Number(data[key]);
+          }
+        } 
+
         resolve(data);
       }
     });
 
     let timeout;
 
-    if(!args.includes("NO_TIMEOUT")) {
+    if(!options.noTimeout) {
       let timeoutDuration = 7000;
-     
-      const timeoutArg = args.find(
-  arg => typeof arg === "string" && arg.startsWith("TIMEOUT=")
-);
-
-if (timeoutArg) {
-
-  args = args.filter(arg => arg !== timeoutArg);
+  
 
-  timeoutDuration = parseInt(timeoutArg.split("=")[1]);
+if (options.timeout) {
+  timeoutDuration = options.timeout;
 }
       
     timeout = setTimeout(() => {
@@ -680,7 +722,7 @@ if (timeoutArg) {
  * @returns {Promise<boolean>} True if the window can navigate forward, false otherwise.
  */
 async canGoForward() {
-  const response = await this.request("canGoForward", `canGoForward-reply-${this.id}`);
+  const response = await this.request("canGoForward");
   return response === "true";
 }
 
@@ -745,7 +787,7 @@ setBounds(x, y, width, height) {
  * @returns {Promise<string|null>} The user's input as a string, or null if the user cancelled the prompt.
  */
 async prompt(message, defaultValue = "") {
-  const res = await this.request("prompt", `prompt-reply-${this.id}`, message, defaultValue);
+  const res = await this.request("prompt", message, defaultValue);
   this.emit("prompt", { message, defaultValue });
   return res?.input;
 }
@@ -782,7 +824,7 @@ setContextMenu(menuTemplate) {
  * @returns {Promise<boolean>} True if the window is focused, false otherwise.
  */
 async isFocused() {
-  const res = await this.request("isFocused", `isFocused-reply-${this.id}`);
+  const res = await this.request("isFocused");
   return res?.isFocused === "true";
 }
 
@@ -791,7 +833,7 @@ async isFocused() {
  * @returns {Promise<{x: number, y: number, width: number, height: number}>} An object containing the window's bounds.
  */
 async getBounds() {
-  return await this.request("getBounds", `getBounds-reply-${this.id}`);
+  return await this.request("getBounds");
 }
 
 /**
@@ -799,7 +841,7 @@ async getBounds() {
  * @returns {Promise<string>} The current URL loaded in the window.
  */
 async getURL() {
-  return (await this.request("getURL", `getURL-reply-${this.id}`))?.url || "";
+  return (await this.request("getURL"))?.url || "";
 }
 
 /**
@@ -807,7 +849,7 @@ async getURL() {
  * @returns {Promise<string>} The current title of the window.
  */
 async getTitle() {
-  return (await this.request("getTitle", `getTitle-reply-${this.id}`)).title || "";
+  return (await this.request("getTitle"))?.title || "";
 }
 
 /**
@@ -834,7 +876,7 @@ setTitlebarTransparent(isTransparent) {
  * @returns {Promise<*>} A Promise that resolves to the result of the evaluation.
  */
 async evaluateJavaScript(script) {
-const res = await this.request("evaluateJS", `evaluateJS-reply-${this.id}`, script);
+const res = await this.request("evaluateJS", script);
 return res.result;
 }
 
@@ -984,7 +1026,7 @@ async removeOnClick(selector) {
  * @returns {Promise<boolean>} True if the user confirmed, false if the user cancelled.
  */
 async confirm(message) {
-  const res = await this.request("confirm", `confirm-reply-${this.id}`, message);
+  const res = await this.request("confirm", message);
   this.emit("confirm", message);
   return res?.confirmed === "true";
 }
@@ -995,7 +1037,7 @@ async confirm(message) {
  * @returns {Promise<void>} A Promise that resolves when the swipe navigation setting has been updated.
  */
 async setSwipeNavigation(enabled) {
-const res = await this.request("setSwipeNav", `setSwipeNav-reply-${this.id}`, String(enabled));
+const res = await this.request("setSwipeNav", String(enabled));
 this.emit("swipe-navigation-updated", enabled);
 }
 
@@ -1004,7 +1046,7 @@ this.emit("swipe-navigation-updated", enabled);
  * @returns {Promise<boolean>} True if swipe navigation is enabled, false otherwise.
  */
 async isSwipeNavigationEnabled() {
-  const res = await this.request("isSwipeNavEnabled", `isSwipeNavEnabled-reply-${this.id}`);
+  const res = await this.request("isSwipeNavEnabled");
   return res?.enabled === "true";
 }
 
@@ -1044,10 +1086,19 @@ async addToContentBlocker(config={ json:[], url:"", file:"", reload:true, clearE
 }
 
 
-  const res = await this.request("addToContentBlocker", `addToContentBlocker-reply-${this.id}`, json, config.reload, config.clearExisting);
+  const res = await this.request("addToContentBlocker", json, config.reload, config.clearExisting);
   this.emit("content-blocker-updated", json);
 }
 
+/**
+ * Displays a file open dialog and returns a Promise that resolves to an array of selected file paths, or null if the user cancelled the dialog.
+ * @param {*} options The options for the file open dialog.
+ * @returns 
+ */
+async showFileOpenDialog(options = {}) {
+  this.emit("show-file-open-dialog", options);
+  return this.request("showFileOpenDialog", options);
+}
 
 
 }
@@ -1194,11 +1245,71 @@ userData: {
   /**
    * Full access to the underlying event emitter for application-level events, allowing for advanced event handling patterns if needed.
    */
-  events: appEvents
+  events: appEvents,
+
+  /**
+   * Sends a command to the native layer. This is a low-level method that can be used to send arbitrary commands, but for most use cases you will want to use the higher-level methods provided by the Window class instead. Emits an "ipc-sent" event with the command and arguments as data when done.
+   * @param {string} command The command to send to the native layer.
+   * @param {any[]} args The arguments to send with the command.
+   */
+  sendToNative(command, args) {
+   const firstWin = activeWindows.values().next().value;
+    if (firstWin) {
+      firstWin.sendCommand(command, args);
+    } else {
+      error("No active windows to send command to native layer");
+    }
+  },
   
+  /**
+   * Sends a request to the native layer and returns a Promise that resolves to the response. This is a low-level method that can be used to send arbitrary requests, but for most use cases you will want to use the higher-level methods provided by the Window class instead. Emits an "ipc-request-sent" event with the command and arguments as data when done.
+   * @param {string} command The command to send to the native layer.
+   * @param {any[]} args The arguments to send with the command.
+   * @returns {Promise<any>} A Promise that resolves to the response from the native layer.
+   */
+  async requestFromNative(command, ...args) {
+    const firstWin = activeWindows.values().next().value;
+    if (firstWin) {
+      return await firstWin.request(command, ...args);
+    } else {
+      error("No active windows to send request to native layer");
+      return null;
+    }
+  },
+
+  async isDarkMode() {
+    const res = await this.requestFromNative("isDarkMode");
+    return res?.isDarkMode;
+  }
+
+}
+
+const clipboard = {
+
+  async writeText(text) {
+    app.sendToNative("writeToClipboard", [text]);
+  },
+
+  async readText() {
+    const res = await app.requestFromNative("readFromClipboard");
+    return res.text || "";
+  }
+
+}
+
+const blockPowerSave = {
+  
+  start() {
+    app.sendToNative("blockPowerSave");
+  },
+
+  stop() {
+    app.sendToNative("unblockPowerSave");
+  }
+
 }
 
-module.exports = { Window, ipc, isPackaged, app, PORT };
+module.exports = { Window, ipc, isPackaged, app, PORT, clipboard, blockPowerSave };
 
 const findNearestPackageJson = require("./findpackage");
 

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/systemsoftware/positron.js"
   },
   "homepage": "https://positronjs.gitbook.io",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "index.js",
   "scripts": {
     "test": "node --test"
@@ -13,7 +13,13 @@
   "keywords": [
     "app",
     "framework",
-    "desktop"
+    "desktop",
+    "cross-platform",
+    "native",
+    "javascript",
+    "node",
+    "macos",
+    "windows"
   ],
   "author": "Bryce",
   "license": "MIT",
@@ -21,6 +27,7 @@
   "dependencies": {
     "@yao-pkg/pkg": "^6.20.0",
     "esbuild": "^0.28.0",
+    "semver": "^7.8.1",
     "ws": "^8.20.1"
   },
   "bin": {

package/packager.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { execSync } = require("child_process");
+const { execSync, execFileSync } = require("child_process");
 const { info, error, success } = require("./logs");
 const https = require("https");
 const esbuild = require("esbuild");
@@ -70,9 +70,12 @@ async function packageMacOS(appRoot, distDir, appName) {
     error("Fatal: Native compiled binary missing from bin/. Run build first.");
     process.exit(1);
   }
-  fs.copyFileSync(compiledBinary, path.join(macosPath, appName));
-  fs.chmodSync(path.join(macosPath, appName), "755"); 
-  
+  const binaryPath = path.join(macosPath, appName);
+  fs.copyFileSync(compiledBinary, binaryPath);
+  fs.chmodSync(binaryPath, "755"); 
+
+
+
   const packageJsonPath = path.join(appRoot, "package.json");
   const package = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
 
@@ -105,14 +108,29 @@ async function packageMacOS(appRoot, distDir, appName) {
   handleJavaScriptPipeline(appRoot, resourcesPath);
 
   const bundledJs = path.join(resourcesPath, "index.js");
+  const backendName = appName.replace(/([a-z0-9])([A-Z])/g, '$1-$2').replace(/[\s_]+/g, '-').toLowerCase() + '-backend';
   if (fs.existsSync(bundledJs)) {
-    await compileWithPkg(bundledJs, "darwin", resourcesPath, "positron-backend");
+    await compileWithPkg(bundledJs, "darwin", resourcesPath, backendName);
+    const binPathEscaped = path.join(resourcesPath, backendName).replace(/"/g, '\\"');
+   
+          try {
+        let swiftScript = "";
+     if(fs.existsSync(path.join(__dirname, ['positronicon', 'png'].join('.')))) {
+        const iconPathEscaped = path.join(__dirname, ['positronicon', 'png'].join('.')).replace(/"/g, '\\"');
+        swiftScript = `import Cocoa; NSWorkspace.shared.setIcon(NSImage(contentsOfFile: "${iconPathEscaped}"), forFile: "${binPathEscaped}", options: []);`;
+        }
+         execFileSync("swift", ["-e", swiftScript], { stdio: "ignore" });
+      } catch (err) {
+        error("Failed to set custom icon on native binary:", err);
+      }
     
-  //  fs.renameSync(targetNodePath, path.join(resourcesPath, "positron-backend"));
   }
 
   fs.rmSync(path.join(resourcesPath, "icon.ico"), { force: true });
 
+  if(!process.argv.includes('--keep-package-json') || !process.argv.includes('--kpj')) {
+    fs.rmSync(path.join(resourcesPath, "package.json"), { force: true });
+  }
 
   success(`Successfully packaged macOS app at: ${appBundlePath}`);
 }
@@ -162,9 +180,10 @@ async function packageWindows(appRoot, distDir, appName) {
   }
 
   const bundledJs = path.join(resourcesPath, "index.js");
+  const backendName = appName.replace(/([a-z0-9])([A-Z])/g, '$1-$2').replace(/[\s_]+/g, '-').toLowerCase() + '-backend';
   
   if (fs.existsSync(bundledJs)) {
-        await compileWithPkg(bundledJs, "win32", resourcesPath, "positron-backend");
+        await compileWithPkg(bundledJs, "win32", resourcesPath, backendName);
   } else {
     error(`[Packager] Fatal: Bundled JavaScript entry point missing at ${bundledJs}`);
     process.exit(1);
@@ -173,6 +192,10 @@ async function packageWindows(appRoot, distDir, appName) {
   fs.rmSync(path.join(resourcesPath, "icon.icns"), { force: true });
   fs.rmSync(path.join(resourcesPath, "icon.ico"), { force: true });
 
+    if(!process.argv.includes('--keep-package-json') || !process.argv.includes('--kpj')) {
+    fs.rmSync(path.join(resourcesPath, "package.json"), { force: true });
+  }
+
   const macBinaryPath = path.join(outputFolder, "positron-runtime");
   if (fs.existsSync(macBinaryPath)) {
     fs.rmSync(macBinaryPath);