jsbeeb 1.13.0 → 1.13.1

package/package.json

@@ -7,7 +7,7 @@
   "name": "jsbeeb",
   "description": "Emulate a BBC Micro",
   "repository": "git@github.com:mattgodbolt/jsbeeb.git",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "//": "If you change the version of Node, it must also be updated at the top of the Dockerfile.",
   "engines": {
     "node": ">=22.12.0"

package/src/app/app.js

@@ -5,6 +5,8 @@ import * as fs from "fs";
 import * as path from "path";
 import { ArgumentParser } from "argparse";
 
+import { getArguments } from "./args.js";
+
 const store = new Store();
 
 ipcMain.on("set-title", (event, title) => {
@@ -20,21 +22,6 @@ ipcMain.on("save-settings", (event, settings) => {
 
 const isMac = process.platform === "darwin";
 
-function getArguments() {
-    // Heinous hack to get "built" versions working
-    let args;
-    if (path.basename(process.argv[0]) === "jsbeeb")
-        // Is this ia "built" version?
-        args = process.argv.slice(1);
-    else args = process.argv.slice(2);
-
-    // Filter out Chrome switches that appear in process.argv. The snap wrapper
-    // adds --no-sandbox for compatibility, and `--disable-gpu` might be useful.
-    // Note that we don't support snap any more, but these seemed useful to leave.
-    const ignoredChromeFlags = ["--no-sandbox", "--disable-gpu"];
-    return args.filter((arg) => !ignoredChromeFlags.includes(arg));
-}
-
 const parser = new ArgumentParser({
     prog: "jsbeeb",
     add_help: true,

package/src/app/args.js

@@ -0,0 +1,26 @@
+"use strict";
+
+/**
+ * Returns the command-line arguments the user actually passed to jsbeeb, with
+ * the Electron binary path(s) and known runtime-injected flags stripped.
+ *
+ * @param {string[]} [argv=process.argv] Full argv array.
+ * @param {boolean} [defaultApp=process.defaultApp]
+ *   True when running under `electron .` (dev). Electron only sets
+ *   process.defaultApp in that case, so we use it instead of comparing
+ *   basename(argv[0]) === "jsbeeb" (the previous check), which failed on
+ *   Windows where the binary is jsbeeb.exe, silently dropping the first
+ *   user argument. See issue #684.
+ * @returns {string[]}
+ */
+export function getArguments(argv = process.argv, defaultApp = process.defaultApp) {
+    // In a packaged Electron app argv is [appBinary, ...userArgs]; when running
+    // under `electron .` (dev) it is [electronBinary, appPath, ...userArgs].
+    const args = defaultApp ? argv.slice(2) : argv.slice(1);
+
+    // Filter out Chrome switches that appear in argv. The snap wrapper adds
+    // --no-sandbox for compatibility, and --disable-gpu might be useful. We
+    // don't support snap any more, but these seemed useful to leave.
+    const ignoredChromeFlags = ["--no-sandbox", "--disable-gpu"];
+    return args.filter((arg) => !ignoredChromeFlags.includes(arg));
+}