jsbeeb 1.17.0 → 1.18.0

package/src/teletext.js

@@ -11,6 +11,7 @@ export class Teletext {
         this.sep = false;
         this.dbl = this.oldDbl = this.secondHalfOfDouble = this.wasDbl = false;
         this.gfx = false;
+        this.conceal = false;
         this.flash = this.flashOn = false;
         this.flashTime = 0;
         this.heldChar = 0;
@@ -172,6 +173,7 @@ export class Teletext {
             secondHalfOfDouble: this.secondHalfOfDouble,
             wasDbl: this.wasDbl,
             gfx: this.gfx,
+            conceal: this.conceal,
             flash: this.flash,
             flashOn: this.flashOn,
             flashTime: this.flashTime,
@@ -198,6 +200,7 @@ export class Teletext {
         this.secondHalfOfDouble = state.secondHalfOfDouble;
         this.wasDbl = state.wasDbl;
         this.gfx = state.gfx;
+        this.conceal = state.conceal ?? false;
         this.flash = state.flash;
         this.flashOn = state.flashOn;
         this.flashTime = state.flashTime;
@@ -245,6 +248,7 @@ export class Teletext {
             case 7:
                 this.gfx = false;
                 this.col = data;
+                this.conceal = false;
                 this.setNextChars();
                 break;
             case 8:
@@ -267,10 +271,11 @@ export class Teletext {
             case 23:
                 this.gfx = true;
                 this.col = data & 7;
+                this.conceal = false;
                 this.setNextChars();
                 break;
             case 24:
-                this.col = this.prevCol = this.bg;
+                this.conceal = true;
                 break;
             case 25:
                 this.sep = false;
@@ -358,6 +363,7 @@ export class Teletext {
         this.flash = false;
         this.sep = false;
         this.gfx = false;
+        this.conceal = false;
         this.dbl = false;
 
         this.scanlineCounter++;
@@ -396,6 +402,7 @@ export class Teletext {
         this.curGlyphs = this.nextGlyphs;
 
         let flashThisCell = this.flash;
+        let concealThisCell = this.conceal;
         if (data < 0x20) {
             data = this.handleControlCode(data);
         } else if (this.gfx) {
@@ -419,7 +426,10 @@ export class Teletext {
         // Steady (code 9) is "Set At" — update so this cell stops flashing immediately.
         if (flashThisCell && !this.flash) flashThisCell = false;
 
-        if ((flashThisCell && this.flashOn) || (this.secondHalfOfDouble && !this.dbl)) {
+        // Conceal (code 24) is "Set At", and a colour code only reveals from the cell after itself.
+        if (this.conceal) concealThisCell = true;
+
+        if (concealThisCell || (flashThisCell && this.flashOn) || (this.secondHalfOfDouble && !this.dbl)) {
             const backgroundColour = this.colour[(this.bg & 7) << 5];
             for (let i = 0; i < 16; ++i) {
                 buf[offset++] = backgroundColour;

package/src/teletext_adaptor.js

@@ -94,6 +94,45 @@ export class TeletextAdaptor extends EventTarget {
         this.currentFrame = 0;
     }
 
+    updateIrq() {
+        if (this.teletextInts && this.teletextStatus & 0x80) {
+            this.cpu.interrupt |= 1 << TELETEXT_IRQ;
+        } else {
+            this.cpu.interrupt &= ~(1 << TELETEXT_IRQ);
+        }
+    }
+
+    snapshotState() {
+        return {
+            teletextStatus: this.teletextStatus,
+            teletextInts: this.teletextInts,
+            teletextEnable: this.teletextEnable,
+            channel: this.channel,
+            currentFrame: this.currentFrame,
+            rowPtr: this.rowPtr,
+            colPtr: this.colPtr,
+            pollCount: this.pollCount,
+            frameBuffer: this.frameBuffer.map((row) => row.slice()),
+        };
+    }
+
+    restoreState(state) {
+        this.teletextStatus = state.teletextStatus;
+        this.teletextInts = state.teletextInts;
+        this.teletextEnable = state.teletextEnable;
+        this.currentFrame = state.currentFrame;
+        this.rowPtr = state.rowPtr;
+        this.colPtr = state.colPtr;
+        this.pollCount = state.pollCount;
+        this.frameBuffer = state.frameBuffer.map((row) => row.slice());
+        this.updateIrq();
+        // Refetching the multi-megabyte stream on every restore would be ruinous for rewind.
+        if (this.channel !== state.channel) {
+            this.channel = state.channel;
+            this.loadChannelStream(this.channel);
+        }
+    }
+
     read(addr) {
         let data = 0x00;
 
@@ -120,11 +159,7 @@ export class TeletextAdaptor extends EventTarget {
             case 0x00:
                 // Status register
                 this.teletextInts = (value & 0x08) === 0x08;
-                if (this.teletextInts && this.teletextStatus & 0x80) {
-                    this.cpu.interrupt |= 1 << TELETEXT_IRQ; // Interrupt if INT and interrupts enabled
-                } else {
-                    this.cpu.interrupt &= ~(1 << TELETEXT_IRQ); // Clear interrupt
-                }
+                this.updateIrq();
                 this.teletextEnable = (value & 0x04) === 0x04;
                 if ((value & 0x03) !== this.channel && this.teletextEnable) {
                     this.channel = value & 0x03;

package/src/touchscreen.js

@@ -13,11 +13,32 @@ export class TouchScreen {
     constructor(scheduler, cyclesPerSecond) {
         this.scheduler = scheduler;
         this.pollCycles = cyclesPerSecond / PollHz;
-        this.mouse = { x: 0, y: 0, button: 0 };
         this.outBuffer = new utils.Fifo(16);
-        this.delay = 0;
-        this.mode = 0;
         this.pollTask = this.scheduler.newTask(() => this.poll());
+        this.reset();
+    }
+
+    reset() {
+        this.mouse = { x: 0, y: 0, button: 0 };
+        this.mode = 0;
+        this.outBuffer.clear();
+        this.pollTask.cancel();
+    }
+
+    snapshotState() {
+        return {
+            mode: this.mode,
+            outBuffer: this.outBuffer.toArray(),
+            pollTaskOffset: this.pollTask.scheduled() ? this.pollTask.expireEpoch - this.scheduler.epoch : null,
+        };
+    }
+
+    restoreState(state) {
+        this.mode = state.mode;
+        this.outBuffer.clear();
+        for (const byte of state.outBuffer) this.store(byte);
+        this.pollTask.cancel();
+        if (state.pollTaskOffset !== null) this.pollTask.schedule(state.pollTaskOffset);
     }
 
     tryReceive(rts) {

package/src/utils.js

@@ -1,7 +1,8 @@
 "use strict";
-// Minimal ZIP extractor using native DecompressionStream for deflate.
-// Supports methods 0 (stored) and 8 (deflate); other methods (bzip2,
-// lzma, etc.) will throw an error with the method number.
+// Minimal ZIP extractor. Supports methods 0 (stored) and 8 (deflate); other
+// methods (bzip2, lzma, etc.) will throw an error with the method number.
+
+import { inflate as pakoInflate, inflateRaw as pakoInflateRaw, ungzip as pakoUngzip } from "pako";
 
 const ZipLocalHeaderSig = 0x04034b50;
 const ZipCentralDirSig = 0x02014b50;
@@ -35,45 +36,17 @@ function findEocd(buf) {
     throw new Error("Not a ZIP file: EOCD not found");
 }
 
-// Pipe data through a DecompressionStream and return the result.
-// Starts the read loop before writing to avoid backpressure deadlock.
-// On error, Node's DecompressionStream rejects multiple internal promises
-// (write, close, and closed); we catch the write side to prevent unhandled
-// rejections and let the error surface through the read side.
-export async function decompress(data, format) {
-    const ds = new DecompressionStream(format);
-    const writer = ds.writable.getWriter();
-    const reader = ds.readable.getReader();
-    const chunks = [];
-    const readPromise = (async () => {
-        for (;;) {
-            const { done, value } = await reader.read();
-            if (done) break;
-            chunks.push(value);
-        }
-    })();
-    const writePromise = (async () => {
-        await writer.write(data);
-        await writer.close();
-    })().catch(() => {
-        // Intentionally empty.
-    });
-    // Intentionally empty: Node's DecompressionStream rejects multiple
-    // promises on error (write, close, closed). The read side surfaces
-    // the same error with proper context — catching these just prevents
-    // unhandled rejections from the write-side promises.
-    writer.closed.catch(() => {});
-    await readPromise;
-    await writePromise;
-    if (chunks.length === 1) return chunks[0];
-    const totalLen = chunks.reduce((s, c) => s + c.length, 0);
-    const out = new Uint8Array(totalLen);
-    let offset = 0;
-    for (const chunk of chunks) {
-        out.set(chunk, offset);
-        offset += chunk.length;
+function inflateWith(inflater, data, context) {
+    if (!(data instanceof Uint8Array)) data = new Uint8Array(data);
+    try {
+        return inflater(data);
+    } catch (cause) {
+        throw new Error(`${context}: ${cause.message || cause}`, { cause });
     }
-    return out;
+}
+
+export function inflate(data) {
+    return inflateWith(pakoInflate, data, "Unable to inflate");
 }
 
 // Extract all files from a ZIP archive.  Returns {filename: Uint8Array}.
@@ -92,6 +65,7 @@ export async function unzip(buf) {
         const flags = readU16(buf, pos + 8);
         if (flags & 0x0001) throw new Error("Encrypted ZIP entries are not supported");
         const method = readU16(buf, pos + 10);
+        const expectedCrc = readU32(buf, pos + 16);
         const compressedSize = readU32(buf, pos + 20);
         const nameLen = readU16(buf, pos + 28);
         const extraLen = readU16(buf, pos + 30);
@@ -112,25 +86,25 @@ export async function unzip(buf) {
         if (method === ZipMethodStored) {
             files[name] = raw.slice();
         } else if (method === ZipMethodDeflate) {
-            files[name] = await decompress(raw, "deflate-raw");
+            files[name] = inflateWith(pakoInflateRaw, raw, `Unable to inflate ZIP entry ${name}`);
         } else {
             throw new Error(`Unsupported ZIP compression method ${method} for ${name}`);
         }
+        if (crc32(files[name]) >>> 0 !== expectedCrc) throw new Error(`Corrupt ZIP entry ${name}: CRC32 mismatch`);
     }
     return files;
 }
 
 // Standard CRC-32/ISO-HDLC.
+const Crc32Table = new Uint32Array(256).map((_, index) => {
+    let crc = index;
+    for (let bit = 0; bit < 8; ++bit) crc = crc & 1 ? (crc >>> 1) ^ 0xedb88320 : crc >>> 1;
+    return crc;
+});
+
 export function crc32(data) {
     let crc = 0xffffffff;
-    for (let i = 0; i < data.length; ++i) {
-        crc ^= data[i];
-        for (let j = 0; j < 8; ++j) {
-            const doEor = crc & 1;
-            crc = crc >>> 1;
-            if (doEor) crc ^= 0xedb88320;
-        }
-    }
+    for (let i = 0; i < data.length; ++i) crc = (crc >>> 8) ^ Crc32Table[(crc ^ data[i]) & 0xff];
     return ~crc;
 }
 
@@ -1039,7 +1013,10 @@ function loadDataHttp(url) {
         request.open("GET", baseUrl + url, true);
         request.overrideMimeType("text/plain; charset=x-user-defined");
         request.onload = function () {
-            if (request.status !== 200) reject(new Error("Unable to load " + url + ", http code " + request.status));
+            if (request.status !== 200) {
+                reject(new Error("Unable to load " + url + ", http code " + request.status));
+                return;
+            }
             if (typeof request.response !== "string") {
                 resolve(request.response);
             } else {
@@ -1112,11 +1089,7 @@ export function readFloat32(data, offset) {
 }
 
 export async function ungzip(data) {
-    try {
-        return await decompress(data, "gzip");
-    } catch (cause) {
-        throw new Error("Unable to ungzip: " + (cause.message || cause), { cause });
-    }
+    return inflateWith(pakoUngzip, data, "Unable to ungzip");
 }
 
 export class DataStream {
@@ -1238,6 +1211,7 @@ async function unzipImage(data, knownExtensions) {
 
     let uncompressed = null;
     let loadedFile;
+    const ignored = [];
 
     for (const [filename, fileData] of Object.entries(files)) {
         const match = filename.match(/.*\.([a-z]+)/i);
@@ -1247,6 +1221,7 @@ async function unzipImage(data, knownExtensions) {
         }
         if (uncompressed) {
             console.log("Ignoring", filename, "as already found a file");
+            ignored.push(filename);
             continue;
         }
         loadedFile = filename;
@@ -1258,9 +1233,14 @@ async function unzipImage(data, knownExtensions) {
     }
 
     console.log("Unzipped '" + loadedFile + "'");
-    return { data: uncompressed, name: loadedFile };
+    return { data: uncompressed, name: loadedFile, ignored };
 }
 
+/**
+ * @param {Uint8Array|number[]} data a ZIP archive
+ * @returns {Promise<{data: Uint8Array, name: string, ignored: string[]}>} the one file loaded, and the
+ *     names of any other loadable files the archive held
+ */
 export async function unzipDiscImage(data) {
     return unzipImage(data, knownDiscExtensions);
 }
@@ -1320,4 +1300,11 @@ export class Fifo {
         this._size--;
         return res;
     }
+
+    /** @returns {number[]} pending bytes, oldest first */
+    toArray() {
+        const result = [];
+        for (let i = 0; i < this._size; ++i) result.push(this._buffer[(this._rPtr + i) % this._buffer.length]);
+        return result;
+    }
 }

package/src/via.js

@@ -24,6 +24,10 @@ const ORB = 0x0,
     INT_CB1 = 0x10,
     INT_CB2 = 0x08;
 
+// Pulse mode holds CA2/CB2 low for one 1MHz VIA cycle, here in the scheduler's 2MHz ticks.
+// Figures 3-4 and 3-6 of https://6502.org/documents/datasheets/wdc/wdc_w65c22s_mar_2004.pdf
+const PulseWidthCycles = 2;
+
 class Via {
     constructor(cpu, scheduler, irq) {
         this.cpu = cpu;
@@ -59,6 +63,8 @@ class Via {
         this.t1_pb7 = 0;
 
         this.task = this.scheduler.newTask(() => this._onTimeout());
+        this.ca2PulseTask = this.scheduler.newTask(() => this.setca2(true));
+        this.cb2PulseTask = this.scheduler.newTask(() => this.setcb2(true));
         this.lastPolltime = 0;
     }
 
@@ -72,6 +78,8 @@ class Via {
         this.t1hit = this.t2hit = true;
         this.acr = this.pcr = 0;
         this.t1_pb7 = 1;
+        this.ca2PulseTask.cancel();
+        this.cb2PulseTask.cancel();
         this.updateNextTime();
     }
 
@@ -154,6 +162,11 @@ class Via {
                 }
                 this.updateIFR();
 
+                // The strobe is "data ready": the port settles before CA2 falls.
+                // http://archive.6502.org/datasheets/wdc_w65c22s_mar_2004.pdf figures 3-6 and 3-7.
+                this.ora = val;
+                this.recalculatePortAPins();
+
                 mode = this.pcr & 0x0e;
                 if (mode === 8) {
                     // Handshake mode
@@ -161,9 +174,10 @@ class Via {
                 } else if (mode === 0x0a) {
                     // Pulse mode
                     this.setca2(false);
-                    this.setca2(true);
+                    this.ca2PulseTask.reschedule(PulseWidthCycles);
                 }
-            /* falls through */
+                break;
+
             case ORAnh:
                 this.ora = val;
                 this.recalculatePortAPins();
@@ -187,7 +201,7 @@ class Via {
                 } else if (mode === 0x0a) {
                     // Pulse mode
                     this.setcb2(false);
-                    this.setcb2(true);
+                    this.cb2PulseTask.reschedule(PulseWidthCycles);
                 }
                 break;
 
@@ -402,6 +416,15 @@ class Via {
         this.portBUpdated();
     }
 
+    _taskOffset(task) {
+        return task.scheduled() ? task.expireEpoch - this.scheduler.epoch : null;
+    }
+
+    _restoreTask(task, offset) {
+        if (offset === null || offset === undefined) task.cancel();
+        else task.reschedule(offset);
+    }
+
     snapshotState() {
         return {
             ora: this.ora,
@@ -430,7 +453,9 @@ class Via {
             justhit: this.justhit,
             t1_pb7: this.t1_pb7,
             lastPolltime: this.lastPolltime,
-            taskOffset: this.task.scheduled() ? this.task.expireEpoch - this.scheduler.epoch : null,
+            taskOffset: this._taskOffset(this.task),
+            ca2PulseTaskOffset: this._taskOffset(this.ca2PulseTask),
+            cb2PulseTaskOffset: this._taskOffset(this.cb2PulseTask),
         };
     }
 
@@ -462,11 +487,9 @@ class Via {
         this.t1_pb7 = state.t1_pb7;
         this.lastPolltime = state.lastPolltime;
         this.updateIFR();
-        if (state.taskOffset !== null) {
-            this.task.reschedule(state.taskOffset);
-        } else {
-            this.task.cancel();
-        }
+        this._restoreTask(this.task, state.taskOffset);
+        this._restoreTask(this.ca2PulseTask, state.ca2PulseTaskOffset);
+        this._restoreTask(this.cb2PulseTask, state.cb2PulseTaskOffset);
     }
 
     setca1(level) {

package/src/web/audio-handler.js

@@ -4,6 +4,7 @@ import { RelayNoise, FakeRelayNoise } from "../relaynoise.js";
 import { Music5000, FakeMusic5000 } from "../music5000.js";
 import { createAudioContext } from "../audio-utils.js";
 import { toggle, fadeIn, fadeOut } from "../dom-utils.js";
+import { toast } from "./toast.js";
 
 // Using this approach means when jsbeeb is embedded in other projects, vite doesn't have a fit.
 // See https://github.com/vitejs/vite/discussions/6459
@@ -15,7 +16,7 @@ export class AudioHandler {
         this.cpuSpeed = cpuSpeed;
         this.isAtom = isAtom;
         this.warningNode = warningNode;
-        this.noAudioWorklet = false;
+        this.noAudio = false;
         toggle(this.warningNode, false);
         this.stats = {};
         if (statsNode) {
@@ -38,11 +39,11 @@ export class AudioHandler {
             this.masterGain.connect(this.audioContext.destination);
             this.ddNoise = noSeek ? new FakeDdNoise() : new DdNoise(this.audioContext, this.masterGain);
             this.relayNoise = new RelayNoise(this.audioContext, this.masterGain);
-            this._setup(audioFilterFreq, audioFilterQ).then();
+            this._setup(audioFilterFreq, audioFilterQ).catch((error) => this._audioUnavailable(error));
         } else {
             if (this.audioContext && !this.audioContext.audioWorklet) {
                 this.audioContext = null;
-                this.noAudioWorklet = true;
+                this.noAudio = true;
                 console.log("Unable to initialise audio: no audio worklet API");
                 const localhost = new URL(window.location);
                 localhost.hostname = "localhost";
@@ -66,12 +67,21 @@ export class AudioHandler {
             this.audioContextM5000.onstatechange = () => this.checkStatus();
             this.music5000 = new Music5000((buffer) => this._onBufferMusic5000(buffer));
 
-            this.audioContextM5000.audioWorklet.addModule(music5000WorkletUrl).then(() => {
-                this._music5000workletnode = new AudioWorkletNode(this.audioContextM5000, "music5000", {
-                    outputChannelCount: [2],
+            this.audioContextM5000.audioWorklet
+                .addModule(music5000WorkletUrl)
+                .then(() => {
+                    this._music5000workletnode = new AudioWorkletNode(this.audioContextM5000, "music5000", {
+                        outputChannelCount: [2],
+                    });
+                    this._music5000workletnode.connect(this.audioContextM5000.destination);
+                })
+                .catch((error) => {
+                    console.error("Unable to initialise Music 5000 audio", error);
+                    toast(
+                        `The Music 5000 will be silent: its audio could not be started (${error?.message ?? error}). Reloading the page may help.`,
+                        { title: "Music 5000", quietKey: "quietMusic5000Audio" },
+                    );
                 });
-                this._music5000workletnode.connect(this.audioContextM5000.destination);
-            });
         } else {
             this.music5000 = new FakeMusic5000();
         }
@@ -116,6 +126,13 @@ export class AudioHandler {
         };
     }
 
+    _audioUnavailable(error) {
+        console.error("Unable to initialise audio", error);
+        this.noAudio = true;
+        this.warningNode.textContent = `There will be no sound: the audio system could not be started (${error?.message ?? error}). Reloading the page may help.`;
+        fadeIn(this.warningNode);
+    }
+
     _addStat(stat, info) {
         const timeSeries = new this._TimeSeries();
         this.stats[stat] = timeSeries;
@@ -146,7 +163,7 @@ export class AudioHandler {
     }
 
     checkStatus() {
-        if (this.noAudioWorklet) return;
+        if (this.noAudio) return;
         if (!this.audioContext && !this.audioContextM5000) return;
         const suspended =
             (this.audioContext && this.audioContext.state === "suspended") ||

package/src/web/toast.js

@@ -73,7 +73,11 @@ export function toast(message, { title = "", quietKey = "" } = {}) {
     quiet.querySelector("input").addEventListener("change", (event) => remember(quietKey, event.target.checked));
 
     toastContainer().appendChild(element);
-    element.addEventListener("hidden.bs.toast", () => element.remove());
+    // Bootstrap keys its instances by element, so one only removed stays held.
+    element.addEventListener("hidden.bs.toast", () => {
+        bootstrap.Toast.getInstance(element)?.dispose();
+        element.remove();
+    });
     bootstrap.Toast.getOrCreateInstance(element).show();
     return element;
 }

package/tests/test-machine.js

@@ -111,7 +111,9 @@ export class TestMachine {
                     stopped = !this.processor.execute(todo);
                     left -= todo;
                 }
-                if (left && !stopped) {
+                // Not truthiness: a negative or NaN request clamps todo to zero,
+                // so left would never move and the loop never end.
+                if (left > 0 && !stopped) {
                     setTimeout(runAnIter, 0);
                 } else {
                     resolve(stopped);