positron.js 1.0.5 → 1.1.0

package/core/mac/main.swift

@@ -127,6 +127,22 @@ func printError(_ message: String) {
     let tag = isWarning ? "WARNING" : (isInfo ? "INFO" : "ERROR")
 
     print("\(red)[SWIFT \(tag)] \(msg)\(reset)")
+
+    if(tag == "INFO") {
+        return
+    }
+
+    if msg.contains("IPC response") || msg.contains("WebSocket error") || msg.contains("Reconnecting to") || msg.contains("IPC message") {
+        return
+    }
+
+    if let ipcClient = AppDelegate.shared?.ipcClient {
+        ipcClient.send(
+            IPCResponse(windowId: -1, event: "nativeError", data: ["message": message, "type": tag])
+        )
+    } else {
+        print("\(red)[SWIFT ERROR] No IPC client available to send error message over. \(reset)")
+    }
 }
 
 public protocol PositronExtension {
@@ -370,6 +386,10 @@ case "forceCloseWindow":
             printError("loadURL — invalid or missing URL")
             return
         }
+        if let scheme = url.scheme?.lowercased(), !["http", "https", "file"].contains(scheme) {
+            printError("loadURL — blocked unauthorized URL scheme: \(scheme)")
+            return
+        }
         (window.contentView as? WKWebView)?.load(URLRequest(url: url))
 
     case "hide":
@@ -585,19 +605,6 @@ UNUserNotificationCenter.current().requestAuthorization(
                 IPCResponse(windowId: windowId, event: args.last ?? "getTitle-reply-\(windowId)", data: ["title": title])
             )
 
-        case "executeAppleScript":
-            guard let scriptSource = args.first else {
-                printError("executeAppleScript — missing script argument")
-                return
-            }
-            let script = NSAppleScript(source: scriptSource)
-            var errorInfo: NSDictionary?
-            script?.executeAndReturnError(&errorInfo)
-            if let errorInfo {
-                let errorMessage = errorInfo[NSAppleScript.errorMessage] as? String ?? "Unknown error"
-                printError("executeAppleScript failed: \(errorMessage)")
-            }
-
 case "isVisible":
     guard let window = windows[windowId] else { return }
     let isVisible = window.isVisible
@@ -819,7 +826,7 @@ case "addToContentBlocker":
         alert.addButton(withTitle: "Cancel")
 
         alert.beginSheetModal(for: window) { response in
-            let confirmed = (response == .alertFirstButtonReturn)
+            let confirmed = (response == .alertSecondButtonReturn) ? false : true
             AppDelegate.shared?.ipcClient.send(
                 IPCResponse(windowId: windowId, event: args.last ?? "confirm-reply-\(windowId)", data: ["confirmed": confirmed ? "true" : "false"])
             )
@@ -832,6 +839,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 {
@@ -920,6 +933,14 @@ final class WebViewNavigationDelegate: NSObject, WKNavigationDelegate {
             IPCResponse(windowId: windowId, event: eventName, data: ["url": webView.url?.absoluteString ?? "", "title": webView.title ?? "", "canGoBack": (webView.canGoBack ? "true" : "false"), "canGoForward": (webView.canGoForward ? "true" : "false")])
         )
     }
+
+    func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+        printError("Navigation failed: \(error.localizedDescription)")
+    }
+
+    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+        printError("Provisional navigation failed: \(error.localizedDescription)")
+    }
 }
 
 // MARK: - WebView → Swift IPC Handler
@@ -1005,7 +1026,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); }
           });
         },
 
@@ -1029,9 +1050,9 @@ final class IPCClient {
     private let maxReconnectAttempts = 10
     private let reconnectDelay: TimeInterval = 2.0
 
-    init(serverURL: URL = URL(string: "ws://localhost:9000")!) {
+    init(serverURL: URL = URL(string: "ws://127.0.0.1:9000")!) {
         let POSITRON_IPC_PORT = port ?? 9000
-        self.serverURL = URL(string: "ws://localhost:\(POSITRON_IPC_PORT)")!
+        self.serverURL = URL(string: "ws://127.0.0.1:\(POSITRON_IPC_PORT)")!
         self.authToken = AUTH_TOKEN
     }
 
@@ -1046,7 +1067,6 @@ final class IPCClient {
         webSocketTask = session.webSocketTask(with: request)
         webSocketTask?.resume()
         printError("INFO: Connecting to IPC server (attempt \(reconnectAttempts + 1))…")
-        reconnectAttempts = 0 // reset on successful connect
         receiveMessage()
     }
 
@@ -1058,7 +1078,12 @@ final class IPCClient {
         }
         webSocketTask?.send(.string(text)) { error in
             if let error {
-                printError("Failed to send IPC response: \(error.localizedDescription)")
+                let errorMsg = error.localizedDescription
+                printError("Failed to send IPC response: \(errorMsg)")
+                if errorMsg.lowercased().contains("bad response from the server") {
+                    printError("Fatal connection error (Unauthorized or Port Hijacked). Exiting immediately.")
+                    exit(1)
+                }
             }
         }
     }
@@ -1068,9 +1093,15 @@ final class IPCClient {
             guard let self else { return }
             switch result {
             case .failure(let error):
-                printError("WebSocket error: \(error.localizedDescription).")
+                let errorMsg = error.localizedDescription
+                printError("WebSocket error: \(errorMsg).")
+                if errorMsg.contains("503") || errorMsg.contains("401") || errorMsg.contains("403") || errorMsg.lowercased().contains("bad response from the server") {
+                    printError("Fatal connection error (Unauthorized or Port Hijacked). Exiting immediately.")
+                    exit(1)
+                }
                 self.scheduleReconnect()
             case .success(let message):
+                self.reconnectAttempts = 0
                 switch message {
                 case .string(let text):
                     self.parseAndDispatch(text)
@@ -1102,7 +1133,7 @@ final class IPCClient {
         reconnectAttempts += 1
         guard reconnectAttempts < maxReconnectAttempts else {
             printError("Exceeded maximum reconnect attempts (\(maxReconnectAttempts)). Giving up.")
-            return
+            exit(1)
         }
         printError("Reconnecting to \(serverURL) in \(reconnectDelay)s… (attempt \(reconnectAttempts)/\(maxReconnectAttempts))")
         DispatchQueue.global().asyncAfter(deadline: .now() + reconnectDelay) { [weak self] in

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
 {
@@ -130,6 +131,20 @@ namespace PositronWindows
 
     string reset = "\u001b[0m";
     Console.WriteLine($"{red}[C# {tag}] {message}{reset}");
+
+    if (_ipcClient != null)    {
+        if (tag != "INFO") {
+            _ipcClient.Send(new IPCResponse
+            {
+                windowId = -1,
+                @event = "nativeError",
+                data = new() { { "message", message }, { "type", tag } }
+            });
+        }
+    } else
+            {
+                Console.WriteLine($"{red}[C# ERROR] No IPC client available to send error message over. {reset}");
+            }
 }
 
         private static readonly string AuthToken = 
@@ -221,7 +236,7 @@ namespace PositronWindows
             };
 
             await Task.Delay(500);
-            _ipcClient = new IPCClient(new Uri($"ws://localhost:{_ipcPort}"));
+            _ipcClient = new IPCClient(new Uri($"ws://127.0.0.1:{_ipcPort}"));
             _ = _ipcClient.ConnectAsync(AuthToken);
         }
 
@@ -376,12 +391,16 @@ private void StartNodeProcess(string workingDirectory, string backendExeName)
                     {
                         bool isFile = webView.Source != null && webView.Source.IsFile;
                         string eventName = isFile ? $"loadFile-reply-{windowId}" : $"loadURL-reply-{windowId}";
-                        _ipcClient.Send(new IPCResponse
-                        {
-                            windowId = windowId,
-                            @event = eventName,
-                            data = new() { { "url", webView.Source?.ToString() ?? "" }, { "title", webView.CoreWebView2.DocumentTitle }, { "canGoBack", webView.CoreWebView2.CanGoBack.ToString().ToLower() }, { "canGoForward", webView.CoreWebView2.CanGoForward.ToString().ToLower() } }
-                        });
+                        if (e.IsSuccess) {
+                            _ipcClient.Send(new IPCResponse
+                            {
+                                windowId = windowId,
+                                @event = eventName,
+                                data = new() { { "url", webView.Source?.ToString() ?? "" }, { "title", webView.CoreWebView2.DocumentTitle }, { "canGoBack", webView.CoreWebView2.CanGoBack.ToString().ToLower() }, { "canGoForward", webView.CoreWebView2.CanGoForward.ToString().ToLower() } }
+                            });
+                        } else {
+                            error($"Navigation failed: {e.WebErrorStatus}");
+                        }
                     };
 
             webView.CoreWebView2.ContextMenuRequested += (s, e) =>
@@ -623,14 +642,19 @@ case "forceCloseWindow":
 
                 case "loadURL":
                     if (!WindowsMap.TryGetValue(windowId, out _)) break;
-                    if (args.Count == 0)
+                    if (args.Count == 0 || !Uri.TryCreate(args[0], UriKind.Absolute, out var loadUrlUri))
                     {
                         error("loadURL — invalid or missing URL");
                         break;
                     }
+                    if (loadUrlUri.Scheme != Uri.UriSchemeHttp && loadUrlUri.Scheme != Uri.UriSchemeHttps && loadUrlUri.Scheme != Uri.UriSchemeFile)
+                    {
+                        error($"loadURL — blocked unauthorized URL scheme: {loadUrlUri.Scheme}");
+                        break;
+                    }
                     {
                         var wv = GetWebView(windowId);
-                        if (wv != null) wv.Source = new Uri(args[0]);
+                        if (wv != null) wv.Source = loadUrlUri;
                     }
                     break;
 
@@ -722,6 +746,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 +1128,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)
     {
@@ -1258,11 +1292,12 @@ case "setBounds":
                 if (_reconnectAttempts >= MaxReconnectAttempts)
                 {
                     error($"Exceeded maximum reconnect attempts ({MaxReconnectAttempts}). Giving up.");
-                    return;
+                    Environment.Exit(1);
                 }
 
                 try
                 {
+                    if (_ws != null) _ws.Dispose();
                     _ws = new ClientWebSocket();
                     _ws.Options.SetRequestHeader("x-positron-auth-token", authToken);
                     error($"INFO: Connecting to IPC server (attempt {_reconnectAttempts + 1})…");
@@ -1274,8 +1309,18 @@ case "setBounds":
                 catch (Exception ex)
                 { 
                     _reconnectAttempts++;
-                    error($"WebSocket error: {ex.Message}. Reconnecting in {ReconnectDelayMs / 1000}s… (attempt {_reconnectAttempts}/{MaxReconnectAttempts})");
-                    await Task.Delay(ReconnectDelayMs);
+                    string errorMsg = ex.Message;
+                    if (ex.InnerException != null) errorMsg += " | " + ex.InnerException.Message;
+
+                    error($"WebSocket error: {errorMsg}. Reconnecting in {ReconnectDelayMs / 1000}s… (attempt {_reconnectAttempts}/{MaxReconnectAttempts})");
+                    
+                    if (errorMsg.Contains("503") || errorMsg.Contains("401") || errorMsg.Contains("403"))
+                    {
+                        error("Fatal connection error (Unauthorized or Port Hijacked). Exiting immediately.");
+                        Environment.Exit(1);
+                    }
+
+                    await Task.Delay(ReconnectDelayMs, _cts.Token);
                 }
             }
         }

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);
+            });
+        }
+    }
+}