positron.js 1.0.2 → 1.0.3

package/bin/positron.js

@@ -35,6 +35,6 @@ switch (command) {
     break;
 
   default:
-    console.log("Usage: npx positron [build | dev | run]");
+    console.log("Usage: npx positron [build | dev | run | package]");
     process.exit(0);
 }

package/builder.js

@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 const cp = require("child_process");
-const { success, error, info } = require("./logs");
+const { success, error, info, warn } = require("./logs");
 
 const arch = process.argv.includes("--x64") ? "x64" : process.argv.includes("--arm64") ? "arm64" : process.arch;
 

package/core/mac/main.swift

@@ -169,6 +169,26 @@ struct IPCResponse: Codable {
     let data: [String: String]
 }
 
+ func GetIPCClient() -> IPCClient {
+    return AppDelegate.shared?.ipcClient ?? IPCClient()
+}
+
+func GetWebView(windowId: Int) -> WKWebView? {
+    guard let window = windows[windowId],
+          let webView = window.contentView as? WKWebView else {
+        printError("GetWebView failed: no webview found for window \(windowId)")
+        return nil
+    }
+    return webView
+}
+
+func GetWindow(windowId: Int) -> NSWindow? {
+    guard let window = windows[windowId] else {
+        printError("GetWindow failed: no window found with ID \(windowId)")
+        return nil
+    }
+    return window
+}
 
 // MARK: - Command Handler
 
@@ -272,6 +292,19 @@ func handleCommand(windowId: Int, command: String, args: [String]) {
 
     window.performClose(nil) 
 
+case "setSwipeNav":
+        guard let window = windows[windowId],
+              let webView = window.contentView as? WKWebView else {
+            return
+        }
+        
+        let enable = args.first?.lowercased() != "false"
+        webView.allowsBackForwardNavigationGestures = enable
+
+        GetIPCClient().send(
+            IPCResponse(windowId: windowId, event: "setSwipeNav-reply-\(windowId)", data: ["enabled": enable ? "true" : "false"])
+        )
+
 case "forceCloseWindow":
     guard let window = windows[windowId] else { return }
 
@@ -606,6 +639,24 @@ UNUserNotificationCenter.current().requestAuthorization(
             }
         }
 
+    case "confirm":
+        guard let window = windows[windowId] else { return }
+        guard let message = args.first else {
+            printError("confirm — missing message argument")
+            return
+        }
+        let alert = NSAlert()
+        alert.messageText = message
+        alert.addButton(withTitle: "OK")
+        alert.addButton(withTitle: "Cancel")
+
+        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"])
+            )
+        }
+
     case "isFocused":
         guard let window = windows[windowId] else { return }
         let isFocused = window.isKeyWindow

package/core/win/main.cs

@@ -382,6 +382,23 @@ private void StartNodeProcess(string workingDirectory)
     
     // 3. Attach it to the layout
     layout.ContextMenu = contextMenu;
+    break;
+
+    case "setSwipeNav":
+    if (!WindowsMap.TryGetValue(windowId, out var winSwipeNav)) break;
+    var wvSwipeNav = GetWebView(windowId);
+    if (wvSwipeNav != null)    {
+        bool enable = args.Count == 0 || args[0].ToLower() != "false";
+        wvSwipeNav.CoreWebView2.Settings.IsSwipeNavigationEnabled = enable;
+    }
+    
+    GetIPCClient().Send(new IPCResponse
+    {
+        windowId = windowId,
+        @event = "setSwipeNav-reply-" + windowId,
+        data = new() { { "enabled", (wvSwipeNav?.CoreWebView2.Settings.IsSwipeNavigationEnabled ?? false).ToString().ToLower() } }
+    });
+
     break;
 
                 case "closeWindow":
@@ -621,6 +638,24 @@ case "setBounds":
                     }
                     break;
 
+                case "confirm":
+                    if (args.Count < 1)
+                    {
+                        error("confirm — expected message argument");
+                        break;
+                    }
+                    {
+                        var message = args[0];
+                        var result = MessageBox.Show(message, "Confirm", MessageBoxButton.YesNo) == MessageBoxResult.Yes;
+                        _ipcClient.Send(new IPCResponse
+                        {
+                            windowId = windowId,
+                            @event = "confirm-reply-" + windowId,
+                            data = new() { { "confirmed", result.ToString().ToLower() } }
+                        });
+                    }
+                    break;
+
                 case "emitToRenderer":
                     if (args.Count < 2)
                     {
@@ -841,6 +876,15 @@ case "setBounds":
             return null;
         }
 
+        public static Window? GetWindow(int windowId)
+        {
+            if (WindowsMap.TryGetValue(windowId, out var window))
+                return window;
+            return null;
+        }
+
+        public static IPCClient GetIPCClient() => _ipcClient;
+
         // MARK: - Menu Management
 
         private static void BuildAndAttachMenu(int windowId, string jsonStr)

package/index.js

@@ -627,7 +627,7 @@ if (timeoutArg) {
 
   args = args.filter(arg => arg !== timeoutArg);
 
-  timeoutDuration = parseInt(timeoutArg.split("=")[1], 10);
+  timeoutDuration = parseInt(timeoutArg.split("=")[1]);
 }
       
     timeout = setTimeout(() => {
@@ -765,7 +765,7 @@ async getBounds() {
  * @returns {Promise<string>} The current URL loaded in the window.
  */
 async getURL() {
-  return await this.request("getURL", `getURL-reply-${this.id}`);
+  return (await this.request("getURL", `getURL-reply-${this.id}`))?.url || "";
 }
 
 /**
@@ -773,7 +773,7 @@ async getURL() {
  * @returns {Promise<string>} The current title of the window.
  */
 async getTitle() {
-  return await this.request("getTitle", `getTitle-reply-${this.id}`);
+  return (await this.request("getTitle", `getTitle-reply-${this.id}`)).title || "";
 }
 
 /**
@@ -801,7 +801,7 @@ setTitlebarTransparent(isTransparent) {
  */
 async evaluateJavaScript(script) {
 const res = await this.request("evaluateJS", `evaluateJS-reply-${this.id}`, script);
-return res;
+return res.result;
 }
 
 /**
@@ -809,8 +809,7 @@ return res;
  * @returns {Promise<string>} The user agent string of the window.
  */
 async getUserAgent() {
-  const res = await this.evaluateJavaScript("navigator.userAgent");
-  return res;
+  return await this.evaluateJavaScript("navigator.userAgent");
 }
 
 /**
@@ -822,10 +821,14 @@ async getUserAgent() {
 async setStyleOf(selector, style) {
   const styleString = Object.entries(style).map(([key, value]) => `${key}: ${value};`).join(" ");
   const script = `
+  (function() { 
     const elements = document.querySelectorAll(${JSON.stringify(selector)});
     elements.forEach(el => {
-      el.style.cssText += ${JSON.stringify(styleString)};
+      Object.entries(${JSON.stringify(style)}).forEach(([key, value]) => {
+        el.style[key] = value;
+      });
     });
+  })();
   `;
   await this.evaluateJavaScript(script);
   this.emit("style-updated", { selector, style });
@@ -840,10 +843,12 @@ async setStyleOf(selector, style) {
  */
 async setAttributeOf(selector, attribute, value) {
   const script = `
+  (function() {
     const elements = document.querySelectorAll(${JSON.stringify(selector)});
     elements.forEach(el => {
       el.setAttribute(${JSON.stringify(attribute)}, ${JSON.stringify(value)});
     });
+  })();
   `;
   await this.evaluateJavaScript(script);
   this.emit("attribute-updated", { selector, attribute, value });
@@ -857,10 +862,12 @@ async setAttributeOf(selector, attribute, value) {
  */
 async removeAttributeOf(selector, attribute) {
   const script = `
-    const elements = document.querySelectorAll(${JSON.stringify(selector)});
-    elements.forEach(el => {
-      el.removeAttribute(${JSON.stringify(attribute)});
-    });
+    (function() {
+      const elements = document.querySelectorAll(${JSON.stringify(selector)});
+      elements.forEach(el => {
+        el.removeAttribute(${JSON.stringify(attribute)});
+      });
+    })();
   `;
   await this.evaluateJavaScript(script);
   this.emit("attribute-removed", { selector, attribute });
@@ -875,12 +882,14 @@ async removeAttributeOf(selector, attribute) {
 async removeStyleOf(selector, styleProperties) {
   const propertiesString = styleProperties.map(prop => `${prop}:`).join("|");
   const script = `
-    const elements = document.querySelectorAll(${JSON.stringify(selector)});
-    elements.forEach(el => {
-      el.style.cssText = el.style.cssText.split(";").filter(rule => {
-        return !${JSON.stringify(propertiesString)}.includes(rule.trim().split(":")[0] + ":");
-      }).join(";");
-    });
+    (function() {
+      const elements = document.querySelectorAll(${JSON.stringify(selector)});
+      elements.forEach(el => {
+        el.style.cssText = el.style.cssText.split(";").filter(rule => {
+          return !${JSON.stringify(propertiesString)}.includes(rule.trim().split(":")[0] + ":");
+        }).join(";");
+      });
+    })();
   `;
   await this.evaluateJavaScript(script);
   this.emit("style-removed", { selector, styleProperties });
@@ -896,6 +905,7 @@ async removeStyleOf(selector, styleProperties) {
  */
 async onClick(selector, channel, { replace = true } = {}) {
   const script = `
+  (function() {
       const selector = ${JSON.stringify(selector)};
       const channel = ${JSON.stringify(channel)};
       const replace = ${replace};
@@ -913,6 +923,7 @@ async onClick(selector, channel, { replace = true } = {}) {
         });  
         }
             })
+  })();
   `;
 
   await this.evaluateJavaScript(script);
@@ -933,6 +944,27 @@ async removeOnClick(selector) {
   await this.evaluateJavaScript(script);
 }
 
+/**
+ * Displays a confirmation dialog with the given message. Returns a Promise that resolves to true if the user confirmed, or false if the user cancelled. Emits a "confirm" event with the message as data when done.
+ * @param {string} message The message to display in the confirmation dialog.
+ * @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);
+  this.emit("confirm", message);
+  return res?.confirmed === "true";
+}
+
+/**
+ * Enables or disables swipe navigation for the window. When enabled, users can navigate back and forward through their history by swiping left or right on a trackpad or touchscreen. Emits a "swipe-navigation-updated" event with the new value when done.
+ * @param {boolean} enabled Whether swipe navigation should be enabled.
+ * @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));
+this.emit("swipe-navigation-updated", enabled);
+}
+
 }
 
 const app = {
@@ -963,7 +995,7 @@ const app = {
   },
 
   /**
-   * Adds an event listener for application-level events. Supported events include "before-quit" and "quit".
+   * Adds an event listener for application-level events.
    * @param {string} event The name of the event to listen for.
    * @param {Function} listener The callback function to invoke when the event is emitted.
    */
@@ -989,11 +1021,19 @@ const app = {
     this.events.once(event, listener);
   },
 
+  /**
+   * Gets the currently focused window. Returns a Promise that resolves to the focused Window instance, or null if no windows are currently focused. Emits a "focused-window-retrieved" event with the focused window as data when done.
+   * @returns {Promise<Window|null>} The currently focused window, or null if no windows are focused.
+   */
   async getFocusedWindow() {
    const results = await Promise.all([...activeWindows].map(win => win.isFocused().then(isFocused => ({ win, isFocused }))));
    return results.find(({ isFocused }) => isFocused)?.win || null;
   },
 
+  /**
+   * Sets the application name, which is used for things like the user data directory and may be used by the native layer for other purposes.
+   * @param {*} name The new name for the application. This will be converted to a string before being used.
+   */
   setName(name) {
     process.env.POSITRON_APP_NAME = name;
     this.events.emit("name-updated", name);
@@ -1005,6 +1045,10 @@ const app = {
   },
 
 userData: {
+  /**
+   * Gets the path to the user data directory for the application. The path is determined based on the operating system and the application name. If the directory does not exist, it will be created. Emits a "user-data-path-retrieved" event with the path as data when done.
+   * @returns {string} The path to the user data directory.
+   */
   getPath() {
     let userPath = null;
 
@@ -1033,6 +1077,9 @@ userData: {
     return userPath;
   },
 
+  /**
+   * Creates the user data directory if it does not already exist. Emits a "user-data-created" event when the directory is created successfully.
+   */
   create() {
     const userPath = this.getPath();
 
@@ -1042,6 +1089,10 @@ userData: {
     }
   },
 
+  /**
+   * Deletes the user data directory and all of its contents. Use with caution, as this will permanently remove all user data for the application. Emits a "user-data-deleted" event when the directory is deleted successfully.
+   */
+
   delete() {
     const userPath = this.getPath();
 

package/package.json

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