@ywkrlerche/richardwho 1.0.24 → 1.0.25

package/app.js

@@ -63,6 +63,7 @@
   // games from the extra collection carry their own pinned cover URL
   function logoUrl(game) {
     if (game.cover) return game.cover;
+    if (typeof game.logo === "string") return `logos/${encodeURIComponent(game.logo)}`; // PNG/JPG/GIF logo
     return game.logo ? `logos/${encodeURIComponent(game.id)}.webp` : null;
   }
   function fmtMB(bytes) {
@@ -220,19 +221,37 @@
 
     try {
       const pieces = await Promise.all(urls.map(async (url, i) => {
-        const res = await fetch(url, { signal: controller.signal });
-        if (!res.ok) throw new Error(`HTTP ${res.status} for ${url.split("/").pop()}`);
-        if (!res.body) { const b = await res.arrayBuffer(); loaded[i] = b.byteLength; update(); return [b]; }
-        const reader = res.body.getReader();
-        const chunks = [];
-        for (;;) {
-          const { done, value } = await reader.read();
-          if (done) break;
-          chunks.push(value);
-          loaded[i] += value.byteLength;
-          update();
+        // Try the main link, then backups. jsDelivr sometimes fails the first fetch of a file it
+        // hasn't cached yet, and a download can drop mid-way, so a retry usually succeeds.
+        const sources = mirrorsFor(url);
+        let lastErr;
+        for (let attempt = 0; attempt < sources.length; attempt++) {
+          if (controller.signal.aborted) throw new DOMException("Aborted", "AbortError");
+          if (attempt) {
+            els.loaderStatus.textContent = `Connection hiccup, trying backup ${attempt} of ${sources.length - 1}…`;
+            await new Promise((r) => setTimeout(r, 600 * attempt));
+          }
+          loaded[i] = 0;
+          try {
+            const res = await fetch(sources[attempt], { signal: controller.signal });
+            if (!res.ok) throw new Error(`HTTP ${res.status} for ${url.split("/").pop()}`);
+            if (!res.body) { const b = await res.arrayBuffer(); loaded[i] = b.byteLength; update(); return [b]; }
+            const reader = res.body.getReader();
+            const chunks = [];
+            for (;;) {
+              const { done, value } = await reader.read();
+              if (done) break;
+              chunks.push(value);
+              loaded[i] += value.byteLength;
+              update();
+            }
+            return chunks;
+          } catch (err) {
+            if (err.name === "AbortError") throw err;
+            lastErr = err;
+          }
         }
-        return chunks;
+        throw lastErr;
       }));
       if (currentLoad?.id !== game.id) return;
       els.loaderStatus.textContent = "Starting…";
@@ -255,6 +274,22 @@
     }
   }
 
+  // Backup sources for a jsDelivr GitHub link, in the order to try them:
+  // the same link again, jsDelivr's second network, then GitHub's own file server.
+  // The extra collection's files are also published as gn-math/html at the same commit.
+  function mirrorsFor(url) {
+    const m = url.match(/^https:\/\/cdn\.jsdelivr\.net\/gh\/([^/]+)\/([^@/]+)@([^/]+)\/(.+)$/);
+    if (!m) return [url, url];
+    const [, user, repo, ref, path] = m;
+    const list = [url, url, `https://fastly.jsdelivr.net/gh/${user}/${repo}@${ref}/${path}`,
+      `https://raw.githubusercontent.com/${user}/${repo}/${ref}/${path}`];
+    if (user === "freebuisness" && repo === "html") {
+      list.push(`https://cdn.jsdelivr.net/gh/gn-math/html@${ref}/${path}`,
+        `https://raw.githubusercontent.com/gn-math/html/${ref}/${path}`);
+    }
+    return list;
+  }
+
   // The extra collection's launch files embed Google Analytics; remove it so players aren't tracked
   function stripTracking(html) {
     return html