positron.js 1.0.3 → 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");
@@ -144,10 +157,19 @@ function performNativeBuild() {
       });
 
       try {
-        const iconPathEscaped = path.join(__dirname, "positronicon.png").replace(/"/g, '\\"');
+        let swiftScript = "";
+        if(fs.existsSync(path.join(appRoot, "icon.icns"))) {
+           const iconPathEscaped = path.join(appRoot, "icon.icns").replace(/"/g, '\\"');
         const binPathEscaped = path.join(outBinaryDir, binaryName).replace(/"/g, '\\"');
-        const swiftScript = `import Cocoa; NSWorkspace.shared.setIcon(NSImage(contentsOfFile: "${iconPathEscaped}"), forFile: "${binPathEscaped}", options: [])`;
+        swiftScript = `import Cocoa; NSWorkspace.shared.setIcon(NSImage(contentsOfFile: "${iconPathEscaped}"), forFile: "${binPathEscaped}", options: []); `;
         cp.execFileSync("swift", ["-e", swiftScript], { stdio: "ignore" });
+          return true;
+        } else if(fs.existsSync(path.join(__dirname, ['positronicon', 'png'].join('.')))) {
+        const iconPathEscaped = path.join(__dirname, ['positronicon', 'png'].join('.')).replace(/"/g, '\\"');
+        const binPathEscaped = path.join(outBinaryDir, binaryName).replace(/"/g, '\\"');
+        swiftScript = `import Cocoa; NSWorkspace.shared.setIcon(NSImage(contentsOfFile: "${iconPathEscaped}"), forFile: "${binPathEscaped}", options: []);`;
+        }
+         cp.execFileSync("swift", ["-e", swiftScript], { stdio: "ignore" });
       } catch (err) {
         error("Failed to set custom icon on native binary:", err);
       }

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) {
@@ -141,13 +167,9 @@ func getBuiltInHandlers() -> [String: (Int, [String]) -> Void] {
             return 
         }
         
-        let selector = Selector(("_showDeveloperTools:"))
-        if webView.responds(to: selector) {
-            webView.perform(selector, with: nil)
-        } else {
-            printError("openDevTools failed: _showDeveloperTools: selector not found on WKWebView (windowId \(windowId))")
+            let inspector = webView.value(forKey: "inspector") as? NSObject
+            inspector?.perform(NSSelectorFromString("show"))
         }
-        },
     ]
     
     return baseHandlers + getExtensionRegistry()
@@ -292,6 +314,13 @@ func handleCommand(windowId: Int, command: String, args: [String]) {
 
     window.performClose(nil) 
 
+case "isFullscreen":
+    guard let window = windows[windowId] else { return }
+    let isFullscreen = window.styleMask.contains(.fullScreen)
+    AppDelegate.shared?.ipcClient.send(
+        IPCResponse(windowId: windowId, event: args.last ?? "isFullscreen-reply-\(windowId)", data: ["isFullscreen": isFullscreen ? "true" : "false"])
+    )
+
 case "setSwipeNav":
         guard let window = windows[windowId],
               let webView = window.contentView as? WKWebView else {
@@ -302,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":
@@ -399,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":
@@ -458,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(
@@ -498,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":
@@ -521,6 +598,97 @@ UNUserNotificationCenter.current().requestAuthorization(
                 printError("executeAppleScript failed: \(errorMessage)")
             }
 
+case "isVisible":
+    guard let window = windows[windowId] else { return }
+    let isVisible = window.isVisible
+    AppDelegate.shared?.ipcClient.send(
+        IPCResponse(windowId: windowId, event: args.last ?? "isVisible-reply-\(windowId)", data: ["isVisible": isVisible ? "true" : "false"])
+    )
+
+case "addToContentBlocker":
+    guard let window = windows[windowId],
+          let webView = window.contentView as? WKWebView,
+          let input = args.first
+    else {
+        printError("addToContentBlocker — missing rules")
+        return
+    }
+
+    let jsonStr: String
+
+    if FileManager.default.fileExists(atPath: input) {
+        do {
+            jsonStr = try String(contentsOfFile: input, encoding: .utf8)
+        } catch {
+            printError("Failed to read rule file: \(error.localizedDescription)")
+            return
+        }
+    } else {
+        jsonStr = input
+    }
+
+    guard let data = jsonStr.data(using: .utf8),
+          (try? JSONSerialization.jsonObject(with: data)) != nil
+    else {
+        printError("addToContentBlocker — invalid JSON rules")
+        return
+    }
+
+    let reload = args.count > 1
+        ? args[1].lowercased() == "true"
+        : true
+
+    let clearAll = args.count > 2
+        ? args[2].lowercased() == "true"
+        : false
+
+    let identifier = "dynamicRules-\(windowId)-\(UUID().uuidString)"
+
+    WKContentRuleListStore.default().compileContentRuleList(
+        forIdentifier: identifier,
+        encodedContentRuleList: jsonStr
+    ) { [weak webView] ruleList, error in
+
+        guard let webView else { return }
+
+        if let error {
+            printError("Failed to compile content blocker rules: \(error.localizedDescription)")
+            return
+        }
+
+        guard let ruleList else {
+            printError("Failed to compile content blocker rules: no rule list returned")
+            return
+        }
+
+        let controller = webView.configuration.userContentController
+
+        if clearAll {
+            controller.removeAllContentRuleLists()
+        }
+
+        controller.add(ruleList)
+
+        if reload {
+            webView.reload()
+        }
+    }
+
+    GetIPCClient().send(
+        IPCResponse(windowId: windowId, event: args.last ?? "addToContentBlocker-reply-\(windowId)", data: ["status": "success"])
+    )
+
+        case "isSwipeNavEnabled":
+            guard let window = windows[windowId],
+                  let webView = window.contentView as? WKWebView else {
+                printError("isSwipeNavEnabled — webview not found for window \(windowId)")
+                return
+            }
+            let enabled = webView.allowsBackForwardNavigationGestures
+            AppDelegate.shared?.ipcClient.send(
+                IPCResponse(windowId: windowId, event: args.last ?? "isSwipeNavEnabled-reply-\(windowId)", data: ["enabled": enabled ? "true" : "false"])
+            )
+
        case "forward":
            guard let window = windows[windowId] else { return }
             (window.contentView as? WKWebView)?.goForward()
@@ -604,7 +772,7 @@ UNUserNotificationCenter.current().requestAuthorization(
                 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])
             )
         }
 
@@ -630,11 +798,11 @@ UNUserNotificationCenter.current().requestAuthorization(
             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": ""])
                 )
             }
         }
@@ -653,7 +821,7 @@ UNUserNotificationCenter.current().requestAuthorization(
         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"])
             )
         }
 
@@ -661,7 +829,7 @@ UNUserNotificationCenter.current().requestAuthorization(
         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":
@@ -749,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")])
         )
     }
 }
@@ -994,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
@@ -1067,6 +1236,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     editMenu.addItem(withTitle: "Paste", action: #selector(NSText.paste(_:)), keyEquivalent: "v")
     editMenu.addItem(withTitle: "Select All", action: #selector(NSText.selectAll(_:)), keyEquivalent: "a")
 
+    // Window menu
+    let windowMenuItem = NSMenuItem()
+    mainMenu.addItem(windowMenuItem)
+    let windowMenu = NSMenu(title: "Window")
+    windowMenuItem.submenu = windowMenu
+    windowMenu.addItem(withTitle: "Minimize", action: #selector(NSWindow.miniaturize(_:)), keyEquivalent: "m")
+    windowMenu.addItem(withTitle: "Zoom", action: #selector(NSWindow.zoom(_:)), keyEquivalent: "")
+    NSApp.windowsMenu = windowMenu
+
     NSApp.mainMenu = mainMenu
 }
 }
@@ -1145,6 +1323,12 @@ func buildMenu(from descriptor: [[String: Any]], windowId: Int) -> NSMenu {
         let sub = NSMenu(title: topItem.title)
         topItem.submenu = sub
 
+        if let role = topLevel["role"] as? String, role.lowercased() == "window" {
+            NSApp.windowsMenu = sub
+        } else if topItem.title.lowercased() == "window" {
+            NSApp.windowsMenu = sub
+        }
+
         if let items = topLevel["items"] as? [[String: Any]] {
             populateMenu(sub, with: items, windowId: windowId, isContextMenu: false)
         }
@@ -1202,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>