jsbeeb 1.19.0 → 1.19.1

package/README.md

@@ -51,15 +51,15 @@ KEY.<host key>=<BBC key>
 Add one for each key you want to change. For example, Superior Software's Space Invaders fires with `COPY`; this makes
 `Enter` fire instead:
 
-[`https://bbc.xania.org/?disc1=sth:Superior/SpaceInvaders-Superior.zip&autoboot&KEY.ENTER=COPY`](https://bbc.xania.org/?disc1=sth%3ASuperior%2FSpaceInvaders-Superior.zip&autoboot&KEY.ENTER=COPY)
+[`https://bbc.xania.org/?disc1=sth:Superior/SpaceInvaders-Superior.zip&autoboot&KEY.ENTER=COPY`](https://bbc.xania.org/?disc1=sth:Superior/SpaceInvaders-Superior.zip&autoboot&KEY.ENTER=COPY)
 
 Superior's Frogger uses `A`/`Z`/`DELETE`/`COPY` to move; this puts it on the arrow keys:
 
-[`https://bbc.xania.org/?disc1=sth:Superior/Frogger-Superior.zip&autoboot&KEY.UP=A&KEY.DOWN=Z&KEY.LEFT=DELETE&KEY.RIGHT=COPY`](https://bbc.xania.org/?disc1=sth%3ASuperior%2FFrogger-Superior.zip&autoboot&KEY.UP=A&KEY.DOWN=Z&KEY.LEFT=DELETE&KEY.RIGHT=COPY)
+[`https://bbc.xania.org/?disc1=sth:Superior/Frogger-Superior.zip&autoboot&KEY.UP=A&KEY.DOWN=Z&KEY.LEFT=DELETE&KEY.RIGHT=COPY`](https://bbc.xania.org/?disc1=sth:Superior/Frogger-Superior.zip&autoboot&KEY.UP=A&KEY.DOWN=Z&KEY.LEFT=DELETE&KEY.RIGHT=COPY)
 
 And Superior's Hunchback steers with `CAPS LOCK` and `CTRL`, which the arrow keys can stand in for:
 
-[`https://bbc.xania.org/?disc1=sth:Superior/Hunchback-Superior.zip&autoboot&KEY.LEFT=CAPSLOCK&KEY.RIGHT=CTRL`](https://bbc.xania.org/?disc1=sth%3ASuperior%2FHunchback-Superior.zip&autoboot&KEY.LEFT=CAPSLOCK&KEY.RIGHT=CTRL)
+[`https://bbc.xania.org/?disc1=sth:Superior/Hunchback-Superior.zip&autoboot&KEY.LEFT=CAPSLOCK&KEY.RIGHT=CTRL`](https://bbc.xania.org/?disc1=sth:Superior/Hunchback-Superior.zip&autoboot&KEY.LEFT=CAPSLOCK&KEY.RIGHT=CTRL)
 
 The **host key** names are jsbeeb's names for the keys on your own keyboard. Most are what you'd expect, but note:
 
@@ -141,7 +141,7 @@ GP.<gamepad control>=<BBC key>
 By default the D-pad presses the "Snapper" keys (`Z`, `X`, `:`, `/`), the `A` button presses `RETURN` and `Start`
 presses `SPACE`. To play Superior's Space Invaders on a pad, where `COPY` fires:
 
-[`https://bbc.xania.org/?disc1=sth:Superior/SpaceInvaders-Superior.zip&autoboot&GP.FIRE=COPY`](https://bbc.xania.org/?disc1=sth%3ASuperior%2FSpaceInvaders-Superior.zip&autoboot&GP.FIRE=COPY)
+[`https://bbc.xania.org/?disc1=sth:Superior/SpaceInvaders-Superior.zip&autoboot&GP.FIRE=COPY`](https://bbc.xania.org/?disc1=sth:Superior/SpaceInvaders-Superior.zip&autoboot&GP.FIRE=COPY)
 
 The gamepad control names are:
 

package/package.json

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

package/src/url-params.js

@@ -41,18 +41,15 @@ export const ParamTypes = {
 export function parseQueryString(queryString, paramTypes = {}) {
     if (!queryString) return {};
 
-    // workaround for shonky python web server
-    const cleanQueryString = queryString.endsWith("/") ? queryString.substring(0, queryString.length - 1) : queryString;
-
     const parsedQuery = {};
 
-    cleanQueryString.split("&").forEach(function (keyval) {
+    queryString.split("&").forEach(function (keyval) {
         if (!keyval) return;
 
         const keyAndVal = keyval.split("=");
         const key = decodeURIComponent(keyAndVal[0]);
         let val = null;
-        if (keyAndVal.length > 1) val = decodeURIComponent(keyAndVal[1]);
+        if (keyAndVal.length > 1) val = decodeURIComponent(keyAndVal.slice(1).join("="));
 
         const paramType = paramTypes[key] || ParamTypes.STRING;
 
@@ -90,12 +87,26 @@ export function parseQueryString(queryString, paramTypes = {}) {
 }
 
 /**
- * Build a URL string from base URL and query parameters
- * @param {string} baseUrl - The base URL (without query string)
- * @param {Object} parsedQuery - Object containing query parameters
- * @param {Object.<string, ParamType>} [paramTypes={}] - Object mapping parameter names to their types
- * @returns {string} The complete URL with query parameters
+ * Characters RFC 3986 allows literally in a query that `encodeURIComponent` escapes anyway. `&`,
+ * `=`, `+`, `#`, `%` and space are left escaped because they delimit something, and `?` because a
+ * URL with a second one in it reads as broken even though the grammar permits it.
  */
+const QueryLiterals = "$,/:;@";
+
+const EscapedQueryLiterals = new RegExp(
+    [...QueryLiterals].map((char) => `%${char.charCodeAt(0).toString(16).toUpperCase()}`).join("|"),
+    "g",
+);
+
+/**
+ * Percent-encode a key or value for a query string, escaping only what delimits something
+ * @param {string} component - The key or value to encode
+ * @returns {string} The encoded component
+ */
+function encodeQueryComponent(component) {
+    return encodeURIComponent(component).replace(EscapedQueryLiterals, decodeURIComponent);
+}
+
 /**
  * Append a parameter to the URL
  * @param {string} url - Current URL
@@ -105,13 +116,20 @@ export function parseQueryString(queryString, paramTypes = {}) {
  * @returns {Object} Updated URL and separator
  */
 function appendParam(url, sep, key, value = undefined) {
-    url += sep + encodeURIComponent(key);
+    url += sep + encodeQueryComponent(key);
     if (value !== undefined) {
-        url += "=" + encodeURIComponent(value);
+        url += "=" + encodeQueryComponent(value);
     }
     return { url, sep: "&" };
 }
 
+/**
+ * Build a URL string from base URL and query parameters
+ * @param {string} baseUrl - The base URL (without query string)
+ * @param {Object} parsedQuery - Object containing query parameters
+ * @param {Object.<string, ParamType>} [paramTypes={}] - Object mapping parameter names to their types
+ * @returns {string} The complete URL with query parameters
+ */
 export function buildUrlFromParams(baseUrl, parsedQuery, paramTypes = {}) {
     let url = baseUrl;
     let sep = "?";