jsbeeb 1.1.1 → 1.3.2

package/package.json

@@ -7,13 +7,23 @@
   "name": "jsbeeb",
   "description": "Emulate a BBC Micro",
   "repository": "git@github.com:mattgodbolt/jsbeeb.git",
-  "version": "1.1.1",
+  "version": "1.3.2",
   "//": "If you change the version of Node, it must also be updated at the top of the Dockerfile.",
   "engines": {
     "node": "22"
   },
   "type": "module",
   "main": "./src/app/app.js",
+  "exports": {
+    ".": "./src/app/app.js",
+    "./machine-session": "./src/machine-session.js",
+    "./src/*": "./src/*",
+    "./tests/test-machine.js": "./tests/test-machine.js"
+  },
+  "files": [
+    "src/",
+    "tests/test-machine.js"
+  ],
   "dependencies": {
     "@popperjs/core": "^2.11.8",
     "argparse": "^2.0.1",
@@ -21,28 +31,31 @@
     "bootswatch": "^5.3.8",
     "event-emitter-es6": "^1.1.5",
     "fflate": "^0.8.2",
-    "jquery": "^3.7.1",
+    "jquery": "^4.0.0",
     "pako": "^2.1.0",
     "smoothie": "^1.36.1",
+    "sharp": "^0.34.5",
     "underscore": "^1.13.7"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^4.0.12",
-    "eslint": "^9.39.1",
+    "@eslint/js": "^10.0.1",
+    "@vitest/coverage-v8": "^4.0.18",
+    "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-prettier": "^5.5.5",
+    "globals": "^17.3.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all2": "^8.0.4",
     "pixelmatch": "^7.1.0",
-    "prettier": "^3.6.2",
-    "sharp": "^0.34.5",
-    "vite": "^7.2.4",
+    "prettier": "^3.8.1",
+    "vite": "^7.3.1",
     "vitest": "^4.0.10"
   },
   "optionalDependencies": {
-    "electron": "^39.0.0",
-    "electron-builder": "^26.0.12"
+    "electron": "^40.4.1",
+    "electron-builder": "^26.8.1",
+    "electron-store": "^11.0.2"
   },
   "license": "GPL-3.0-or-later",
   "build": {
@@ -87,7 +100,7 @@
     "test:cpu": "node tests/test-suite.js",
     "coverage:unit": "vitest run tests/unit --coverage",
     "coverage:all-tests": "vitest run --coverage",
-    "benchmark": "node app-bench.js",
+    "benchmark": "node src/app-bench.js",
     "electron": "npm run build && ELECTRON_DISABLE_SANDBOX=1 electron .",
     "electron:build": "electron-builder"
   },

package/src/6502.js

@@ -419,6 +419,7 @@ class Tube6502 extends Base6502 {
         this.romPaged = true;
         this.pc = this.readmem(0xfffc) | (this.readmem(0xfffd) << 8);
         this.p.i = true;
+        this.s = (this.s - 3) & 0xff; // Simulate 3 dummy pushes during reset
         this.tube.reset(hard);
     }
 
@@ -607,11 +608,7 @@ export class Cpu6502 extends Base6502 {
         this.peripheralCycles = 0;
         this.videoCycles = 0;
 
-        if (this.cpuMultiplier === 1 && this.videoCyclesBatch === 0) {
-            this.polltime = this.polltimeFast;
-        } else {
-            this.polltime = this.polltimeSlow;
-        }
+        this.polltime = this.buildPolltime();
 
         this._debugRead = this._debugWrite = this._debugInstruction = null;
         this.debugInstruction = new DebugHook(this, "_debugInstruction");
@@ -1185,6 +1182,7 @@ export class Cpu6502 extends Base6502 {
         }
         this.pc = this.readmem(0xfffc) | (this.readmem(0xfffd) << 8);
         this.p.i = true;
+        this.s = (this.s - 3) & 0xff; // Simulate 3 dummy pushes during reset
         this._nmiEdge = false;
         this._nmiLevel = false;
         this.halted = false;
@@ -1211,44 +1209,56 @@ export class Cpu6502 extends Base6502 {
         this.polltime(cycles);
     }
 
-    // Common between polltimeSlow and polltimeFast
-    polltimeCommon(cycles) {
-        this.scheduler.polltime(cycles);
-        this.tube.execute(cycles);
-        if (this.teletextAdaptor) this.teletextAdaptor.polltime(cycles);
-        if (this.music5000) this.music5000.polltime(cycles);
-        if (this.econet) {
-            const donmi = this.econet.polltime(cycles);
-            if (donmi && this.econet.econetNMIEnabled) {
-                this.NMI(true);
-            }
-            this.filestore.polltime(cycles);
-        }
-    }
+    // Builds commong code between polltimeSlow and polltimeFast
+    buildPolltime() {
+        const nop = (_cycles) => {};
+        const tubeStuff = (cycles) => (this.model.tube ? this.tube.execute(cycles) : nop);
+        const teletextStuff = this.teletextAdaptor ? (cycles) => this.teletextAdaptor.polltime(cycles) : nop;
+        const musicStuff = this.music5000 ? (cycles) => this.music5000.polltime(cycles) : nop;
+        const econetStuff = this.econet
+            ? (cycles) => {
+                  const donmi = this.econet.polltime(cycles);
+                  if (donmi && this.econet.econetNMIEnabled) {
+                      this.NMI(true);
+                  }
+                  this.filestore.polltime(cycles);
+              }
+            : nop;
+
+        const commonStuff = (cycles) => {
+            this.scheduler.polltime(cycles);
+            tubeStuff(cycles);
+            teletextStuff(cycles);
+            musicStuff(cycles);
+            econetStuff(cycles);
+        };
 
-    // Slow version allows video batching and cpu multipliers
-    polltimeSlow(cycles) {
-        cycles |= 0;
-        this.currentCycles += cycles;
-        this.peripheralCycles += cycles;
-        this.videoCycles += cycles;
-        cycles = (this.videoCycles / this.cpuMultiplier) | 0;
-        if (cycles > this.videoCyclesBatch) {
-            this.video.polltime(cycles);
-            this.videoCycles -= (cycles * this.cpuMultiplier) | 0;
+        if (this.cpuMultiplier === 1 && this.videoCyclesBatch === 0) {
+            // Simplest, common case where multiplier is 1 and batching is off.
+            return (cycles) => {
+                cycles |= 0;
+                this.currentCycles += cycles;
+                this.video.polltime(cycles);
+                commonStuff(cycles);
+            };
+        } else {
+            // Handle speedup case.
+            return (cycles) => {
+                cycles |= 0;
+                this.currentCycles += cycles;
+                this.peripheralCycles += cycles;
+                this.videoCycles += cycles;
+                cycles = (this.videoCycles / this.cpuMultiplier) | 0;
+                if (cycles > this.videoCyclesBatch) {
+                    this.video.polltime(cycles);
+                    this.videoCycles -= (cycles * this.cpuMultiplier) | 0;
+                }
+                cycles = (this.peripheralCycles / this.cpuMultiplier) | 0;
+                if (!cycles) return;
+                this.peripheralCycles -= (cycles * this.cpuMultiplier) | 0;
+                commonStuff(cycles);
+            };
         }
-        cycles = (this.peripheralCycles / this.cpuMultiplier) | 0;
-        if (!cycles) return;
-        this.peripheralCycles -= (cycles * this.cpuMultiplier) | 0;
-        this.polltimeCommon(cycles);
-    }
-
-    // Faster, but more limited version
-    polltimeFast(cycles) {
-        cycles |= 0;
-        this.currentCycles += cycles;
-        this.video.polltime(cycles);
-        this.polltimeCommon(cycles);
     }
 
     execute(numCyclesToRun) {

package/src/app/app.js

@@ -1,9 +1,23 @@
 "use strict";
-import { app, BrowserWindow, dialog, Menu, shell, nativeImage } from "electron";
+import { app, BrowserWindow, dialog, ipcMain, Menu, shell, nativeImage } from "electron";
+import Store from "electron-store";
 import * as fs from "fs";
 import * as path from "path";
 import { ArgumentParser } from "argparse";
 
+const store = new Store();
+
+ipcMain.on("set-title", (event, title) => {
+    const webContents = event.sender;
+    const win = BrowserWindow.fromWebContents(webContents);
+    if (win) win.setTitle(title);
+});
+
+ipcMain.on("save-settings", (event, settings) => {
+    const current = store.get("settings", {});
+    store.set("settings", { ...current, ...settings });
+});
+
 const isMac = process.platform === "darwin";
 
 function getArguments() {
@@ -62,7 +76,9 @@ async function createWindow() {
         },
     });
 
-    const query = {};
+    // Load saved settings, then override with command-line args
+    const savedSettings = store.get("settings", {});
+    const query = { ...savedSettings };
     if (args.disc1 && !args.noboot) query.autoboot = true;
     if (args.disc1) query.disc1 = getFileParam(args.disc1);
     if (args.disc2) query.disc2 = getFileParam(args.disc2);
@@ -95,14 +111,43 @@ function makeLoader(drive) {
             properties: ["openFile"],
         });
         if (!result.canceled) {
-            browserWindow.webContents.send("load", {
-                drive,
-                path: getFileParam(result.filePaths[0]),
-            });
+            const filePath = getFileParam(result.filePaths[0]);
+            store.set(`settings.disc${drive + 1}`, filePath);
+            browserWindow.webContents.send("load", { drive, path: filePath });
         }
     };
 }
 
+function makeTapeLoader() {
+    return async (_, browserWindow) => {
+        const result = await dialog.showOpenDialog(browserWindow, {
+            title: "Load a tape image",
+            filters: [
+                { name: "Tape images", extensions: ["uef"] },
+                { name: "ZIPped tape images", extensions: ["zip"] },
+            ],
+            properties: ["openFile"],
+        });
+        if (!result.canceled) {
+            const filePath = getFileParam(result.filePaths[0]);
+            store.set("settings.tape", filePath);
+            browserWindow.webContents.send("load-tape", { path: filePath });
+        }
+    };
+}
+
+function showModal(modalId, options = {}) {
+    return (_, browserWindow) => {
+        browserWindow.webContents.send("show-modal", { modalId, ...options });
+    };
+}
+
+function sendAction(actionId) {
+    return (_, browserWindow) => {
+        browserWindow.webContents.send("action", { actionId });
+    };
+}
+
 const template = [
     // { role: 'appMenu' }
     ...(isMac
@@ -128,13 +173,32 @@ const template = [
         label: "File",
         submenu: [
             {
-                label: "Load disc 0",
+                label: "Load disc 0...",
                 click: makeLoader(0),
             },
             {
-                label: "Load disc 1",
+                label: "Load disc 1...",
                 click: makeLoader(1),
             },
+            { type: "separator" },
+            {
+                label: "Browse STH Disc Archive...",
+                click: showModal("sth", { sthType: "discs" }),
+            },
+            {
+                label: "Browse Example Discs...",
+                click: showModal("discs"),
+            },
+            { type: "separator" },
+            {
+                label: "Load Tape from File...",
+                click: makeTapeLoader(),
+            },
+            {
+                label: "Browse STH Tape Archive...",
+                click: showModal("sth", { sthType: "tapes" }),
+            },
+            { type: "separator" },
             isMac ? { role: "close" } : { role: "quit" },
         ],
     },
@@ -158,9 +222,36 @@ const template = [
             { role: "togglefullscreen" },
         ],
     },
+    {
+        label: "Machine",
+        submenu: [
+            {
+                label: "Configuration...",
+                click: showModal("configuration"),
+            },
+            { type: "separator" },
+            {
+                label: "Soft Reset",
+                click: sendAction("soft-reset"),
+            },
+            {
+                label: "Hard Reset",
+                click: sendAction("hard-reset"),
+            },
+        ],
+    },
     {
         role: "help",
         submenu: [
+            {
+                label: "Help...",
+                click: showModal("help"),
+            },
+            {
+                label: "About jsbeeb...",
+                click: showModal("info"),
+            },
+            { type: "separator" },
             {
                 label: "Learn More",
                 click: async () => {

package/src/app/electron.js

@@ -1,20 +1,62 @@
 "use strict";
 
 // Electron integration for jsbeeb desktop application.
-// Handles IPC communication for loading disc images from Electron's main process.
+// Handles IPC communication for loading disc/tape images and showing modals from Electron's main process.
 
 export let initialise = function () {};
 
 function init(args) {
-    const { loadDiscImage, processor } = args;
-    const electron = window.nodeRequire("electron");
-    electron.ipcRenderer.on("load", async (event, message) => {
+    const { loadDiscImage, loadTapeImage, processor, modals, actions, config } = args;
+    const api = window.electronAPI;
+
+    api.onLoadDisc(async (message) => {
         const { drive, path } = message;
         const image = await loadDiscImage(path);
         processor.fdc.loadDisc(drive, image);
     });
+
+    api.onLoadTape(async (message) => {
+        const { path } = message;
+        const tape = await loadTapeImage(path);
+        processor.acia.setTape(tape);
+    });
+
+    api.onShowModal((message) => {
+        const { modalId, sthType } = message;
+        if (modals && modals.show) {
+            modals.show(modalId, sthType);
+        }
+    });
+
+    api.onAction((message) => {
+        if (actions && actions[message.actionId]) {
+            actions[message.actionId]();
+        }
+    });
+
+    // Observe model name changes and update window title
+    const modelElement = document.querySelector(".bbc-model");
+    if (modelElement) {
+        const updateTitle = () => api.setTitle(`jsbeeb - ${modelElement.textContent}`);
+        updateTitle();
+        new MutationObserver(updateTitle).observe(modelElement, {
+            childList: true,
+            characterData: true,
+            subtree: true,
+        });
+    }
+
+    // Save settings when they change
+    if (config) {
+        config.on("settings-changed", (settings) => {
+            api.saveSettings(settings);
+        });
+        config.on("media-changed", (media) => {
+            api.saveSettings(media);
+        });
+    }
 }
 
-if (typeof window.nodeRequire !== "undefined") {
+if (typeof window.electronAPI !== "undefined") {
     initialise = init;
 }

package/src/app/preload.js

@@ -1,5 +1,15 @@
 "use strict";
-window.nodeRequire = require;
+const { contextBridge, ipcRenderer } = require("electron");
+
+// Expose a secure API to the renderer
+contextBridge.exposeInMainWorld("electronAPI", {
+    onLoadDisc: (callback) => ipcRenderer.on("load", (event, message) => callback(message)),
+    onLoadTape: (callback) => ipcRenderer.on("load-tape", (event, message) => callback(message)),
+    onShowModal: (callback) => ipcRenderer.on("show-modal", (event, message) => callback(message)),
+    onAction: (callback) => ipcRenderer.on("action", (event, message) => callback(message)),
+    setTitle: (title) => ipcRenderer.send("set-title", title),
+    saveSettings: (settings) => ipcRenderer.send("save-settings", settings),
+});
 
 window.addEventListener("DOMContentLoaded", () => {
     for (const node of document.getElementsByClassName("not-electron")) {

package/src/config.js

@@ -1,10 +1,12 @@
 "use strict";
 import $ from "jquery";
+import EventEmitter from "event-emitter-es6";
 import { findModel } from "./models.js";
 import { getFilterForMode } from "./canvas.js";
 
-export class Config {
+export class Config extends EventEmitter {
     constructor(onChange, onClose) {
+        super();
         this.onChange = onChange;
         this.onClose = onClose;
         this.changed = {};
@@ -20,7 +22,12 @@ export class Config {
             this.setEconet(this.model.hasEconet);
         });
 
-        $configuration.addEventListener("hide.bs.modal", () => this.onClose(this.changed));
+        $configuration.addEventListener("hide.bs.modal", () => {
+            this.onClose(this.changed);
+            if (Object.keys(this.changed).length > 0) {
+                this.emit("settings-changed", this.changed);
+            }
+        });
 
         $(".model-menu a").on("click", (e) => {
             this.changed.model = $(e.target).attr("data-target");

package/src/disc.js

@@ -343,7 +343,7 @@ class Sector {
         let sectorSize = Sector.toSectorSize(sectorEndByte - sectorStartByte - 5);
 
         this.hasDataCrcError = true;
-        let seenIffyData = false;
+        let seenIffyData;
         do {
             const { crcOk, sectorData, iffyPulses } = this._tryLoadSectorData(dataMarker, sectorSize);
             seenIffyData = iffyPulses;
@@ -425,7 +425,7 @@ class Track {
         const top32of64b = 0xffffffff00000000n;
         const fmMarker = 0x8888888800000000n;
         const mfmMarker = 0xaaaa448944894489n;
-        let dataByte = 0;
+        let dataByte;
         let sector = null;
         for (let pulseIndex = 0; pulseIndex < bitLength; ++pulseIndex) {
             if ((pulseIndex & 31) === 0) pulses = this.pulses2Us[pulseIndex >>> 5];

package/src/filestore.js

@@ -330,10 +330,7 @@ export class Filestore {
             this.pollCount = 0;
 
             // Decode and execute next instruction
-            let op,
-                i,
-                i2,
-                j = 0;
+            let op, i, i2, j;
 
             this.XPC = this.PC;
             if (this.PC >= 0xf800)

package/src/gamepad-source.js

@@ -26,7 +26,7 @@ export class GamepadSource extends AnalogueSource {
         const pad = pads[0];
         const pad2 = pads[1];
 
-        let rawValue = 0;
+        let rawValue;
 
         switch (channel) {
             case 0: