jsbeeb 1.16.0 → 1.17.0

package/src/models.js

@@ -263,6 +263,8 @@ export function findModel(name) {
     return null;
 }
 
+export const DefaultModel = findModel("B-DFS1.2");
+
 export const TEST_6502 = new Model({
     name: "TEST",
     synonyms: ["TEST"],

package/src/sth.js

@@ -50,12 +50,12 @@ export class StairwayToHell {
     }
 
     async fetch(file) {
-        const name = this._baseUrl + encodePath(file);
-        console.log("Loading ZIP from " + name);
-        const response = await fetch(name);
-        if (!response.ok) throw new Error("Network response was not ok");
+        const url = this._baseUrl + encodePath(file);
+        console.log("Loading ZIP from " + url);
+        const response = await fetch(url);
+        if (!response.ok) throw new Error(`Unable to load ${url}, http code ${response.status}`);
         try {
-            return (await utils.unzipDiscImage(new Uint8Array(await response.arrayBuffer()))).data;
+            return await utils.unzipDiscImage(new Uint8Array(await response.arrayBuffer()));
         } catch (error) {
             console.error("Failed to fetch file:", error);
             throw error;

package/src/teletext_adaptor.js

@@ -35,8 +35,8 @@ Status register:
 */
 
 /**
- * Emulates the Acorn teletext adaptor. Dispatches a `showError` CustomEvent, carrying
- * `context` and `error` in its detail, when a channel's stream cannot be loaded.
+ * Emulates the Acorn teletext adaptor. Dispatches a `notice` CustomEvent, carrying a
+ * `message` in its detail, when a channel's stream cannot be loaded.
  */
 export class TeletextAdaptor extends EventTarget {
     constructor(cpu) {
@@ -79,8 +79,10 @@ export class TeletextAdaptor extends EventTarget {
             if (request !== this.streamRequest) return;
             console.error(`Teletext adaptor: failed to load channel ${channel}`, error);
             this.dispatchEvent(
-                new CustomEvent("showError", {
-                    detail: { context: `loading teletext channel ${channel}`, error },
+                new CustomEvent("notice", {
+                    detail: {
+                        message: `Teletext channel ${channel} could not be loaded (${error?.message ?? error}). The adaptor carries on with nothing to show.`,
+                    },
                 }),
             );
             return;

package/src/url-params.js

@@ -236,6 +236,34 @@ export function processAutobootParams(parsedQuery) {
     return { needsAutoboot, autoType };
 }
 
+/** Where a drive's 40/80 switch is set, `auto` leaving it to whatever disc is loaded. */
+export const DriveTracks = Object.freeze({ auto: "auto", forty: "40", eighty: "80" });
+
+const NumDrives = 2;
+
+/**
+ * Process the per-drive 40/80 track settings
+ * @param {Object} parsedQuery - The parsed query parameters
+ * @returns {{settings: string[], warnings: string[]}} One DriveTracks per drive, and what was
+ *   unusable about anything asked for that is not in there
+ */
+export function processDriveTrackParams(parsedQuery) {
+    const warnings = [];
+    const settings = [];
+    for (let driveIndex = 0; driveIndex < NumDrives; ++driveIndex) {
+        const name = `drive${driveIndex}Tracks`;
+        const asked = parsedQuery[name];
+        const setting = isDefined(asked) ? `${asked}`.toLowerCase() : DriveTracks.auto;
+        if (Object.values(DriveTracks).includes(setting)) {
+            settings.push(setting);
+        } else {
+            warnings.push(`${name}=${asked}: a drive is set to 40, 80 or auto.`);
+            settings.push(DriveTracks.auto);
+        }
+    }
+    return { settings, warnings };
+}
+
 /**
  * Guess the appropriate model based on the hostname
  * @param {string} hostname - The hostname to check

package/src/utils.js

@@ -1216,7 +1216,10 @@ const knownDiscExtensions = {
     uef: true,
     ssd: true,
     dsd: true,
+    adf: true,
+    adm: true,
     adl: true,
+    hfe: true,
 };
 
 const knownRomExtensions = {

package/src/wd-fdc.js

@@ -1414,8 +1414,15 @@ export class WdFdc {
      * @param {Number} drive
      * @param {Disc} disc
      */
-    loadDisc(drive, disc) {
+    /**
+     * @param {Number} drive
+     * @param {Disc} disc
+     * @param {Number} [tracksPerStep] where to leave the drive's 40/80 switch, which by default
+     *   follows the disc, since no drive can tell what pitch the disc in it was written at
+     */
+    loadDisc(drive, disc, tracksPerStep = disc?.is40Track ? 2 : 1) {
         this._drives[drive].setDisc(disc);
+        this._drives[drive].tracksPerStep = tracksPerStep;
     }
 
     get motorOn() {

package/src/web/audio-handler.js

@@ -15,6 +15,7 @@ export class AudioHandler {
         this.cpuSpeed = cpuSpeed;
         this.isAtom = isAtom;
         this.warningNode = warningNode;
+        this.noAudioWorklet = false;
         toggle(this.warningNode, false);
         this.stats = {};
         if (statsNode) {
@@ -41,14 +42,15 @@ export class AudioHandler {
         } else {
             if (this.audioContext && !this.audioContext.audioWorklet) {
                 this.audioContext = null;
+                this.noAudioWorklet = true;
                 console.log("Unable to initialise audio: no audio worklet API");
-                toggle(this.warningNode, true);
                 const localhost = new URL(window.location);
                 localhost.hostname = "localhost";
                 this.warningNode.innerHTML = `No audio worklet API was found - there will be no audio.
                     If you are running a local jsbeeb, you must either use a host of
                     <a href="${localhost}">localhost</a>,
                     or serve the content over <em>https</em>.`;
+                toggle(this.warningNode, true);
             }
             this.soundChip = new FakeSoundChip();
             this.ddNoise = new FakeDdNoise();
@@ -56,7 +58,6 @@ export class AudioHandler {
         }
 
         this.warningNode.addEventListener("mousedown", () => this.tryResume());
-        toggle(this.warningNode, false);
 
         // Initialise Music 5000 audio context
         this.audioContextM5000 = createAudioContext({ sampleRate: 46875 });
@@ -145,6 +146,7 @@ export class AudioHandler {
     }
 
     checkStatus() {
+        if (this.noAudioWorklet) return;
         if (!this.audioContext && !this.audioContextM5000) return;
         const suspended =
             (this.audioContext && this.audioContext.state === "suspended") ||

package/src/web/toast.js

@@ -0,0 +1,79 @@
+import * as bootstrap from "bootstrap";
+
+/**
+ * Passing notices: something happened that is worth knowing and needs nothing doing about it.
+ * The error dialog is for the other kind.
+ */
+
+let nextQuietId = 0;
+
+function toastContainer() {
+    const existing = document.querySelector(".toast-container");
+    if (existing) return existing;
+    const container = document.createElement("div");
+    container.className = "toast-container position-fixed bottom-0 end-0 p-3";
+    document.body.appendChild(container);
+    return container;
+}
+
+// Storage can be unreachable or full, and a notice that nothing needs doing about is not worth
+// failing over: forget the answer and say the thing again.
+function remembered(key) {
+    try {
+        return !!window.localStorage.getItem(key);
+    } catch (e) {
+        console.log(`Unable to read ${key}: ${e}`);
+        return false;
+    }
+}
+
+function remember(key, wanted) {
+    try {
+        if (wanted) window.localStorage.setItem(key, "yes");
+        else window.localStorage.removeItem(key);
+    } catch (e) {
+        console.log(`Unable to remember ${key}: ${e}`);
+    }
+}
+
+/**
+ * @param {string} message
+ * @param {object} [options]
+ * @param {string} [options.title] a heading, for a notice whose message does not say where it came from
+ * @param {string} [options.quietKey] offer to stop showing this kind of notice, remembering the answer here
+ */
+export function toast(message, { title = "", quietKey = "" } = {}) {
+    if (quietKey && remembered(quietKey)) return;
+
+    const element = document.createElement("div");
+    element.className = "toast text-bg-dark";
+    element.setAttribute("role", "status");
+    element.setAttribute("aria-live", "polite");
+    element.setAttribute("aria-atomic", "true");
+    const quietId = `toast-quiet-${nextQuietId++}`;
+    element.innerHTML = `
+        <div class="toast-header text-bg-dark">
+            <strong class="me-auto"></strong>
+            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="toast" aria-label="Close"></button>
+        </div>
+        <div class="toast-body">
+            <div class="message"></div>
+            <div class="form-check mt-2">
+                <input class="form-check-input" type="checkbox" id="${quietId}" />
+                <label class="form-check-label small" for="${quietId}">Stop telling me this</label>
+            </div>
+        </div>`;
+    // Disc names and the like come from the outside world, so they are set as text, never as markup.
+    element.querySelector(".message").textContent = message;
+    element.querySelector(".toast-header strong").textContent = title;
+    element.querySelector(".toast-header").hidden = !title;
+
+    const quiet = element.querySelector(".form-check");
+    quiet.hidden = !quietKey;
+    quiet.querySelector("input").addEventListener("change", (event) => remember(quietKey, event.target.checked));
+
+    toastContainer().appendChild(element);
+    element.addEventListener("hidden.bs.toast", () => element.remove());
+    bootstrap.Toast.getOrCreateInstance(element).show();
+    return element;
+}

package/tests/test-machine.js

@@ -213,7 +213,7 @@ export class TestMachine {
 
     async loadDisc(image) {
         const data = await fdc.load(image);
-        this.processor.fdc.loadDisc(0, fdc.discFor(this.processor.fdc, "", data));
+        this.processor.fdc.loadDisc(0, fdc.discFor(this.processor.fdc, image, data));
     }
 
     /**