fix: handle stale CDN mirrors

Author: DiscoverBox

scripts/refresh-cdn-cache.mjs

@@ -18,7 +18,7 @@ export async function refreshCdnCache({
   const cdnPath = `/gh/${repository}@${ref}/${filePath}`;
   const purgeUrl = `https://purge.jsdelivr.net${cdnPath}`;
   const jsDelivrUrl = `https://cdn.jsdelivr.net${cdnPath}`;
-  const mirrorUrl = `https://cdn.jsdmirror.cn${cdnPath}`;
+  const mirrorUrl = `https://cdn.jsdmirror.com${cdnPath}`;
   const expectedContent = await readFileImpl(filePath);
 
   const purgeResponse = await fetchImpl(purgeUrl);
@@ -60,15 +60,21 @@ export async function refreshCdnCache({
       contentMatches(mirrorUrl),
     ]);
 
-    if (jsDelivrReady && mirrorReady) {
-      log(`CDN cache refreshed: ${mirrorUrl}`);
+    if (jsDelivrReady) {
+      if (mirrorReady) {
+        log(`CDN cache refreshed: ${mirrorUrl}`);
+      } else {
+        log(
+          `::warning::JSDMirror cache is still stale; ` +
+            `jsDelivr has refreshed successfully: ${mirrorUrl}`,
+        );
+      }
       return;
     }
 
     if (attempt === maxAttempts) {
       throw new Error(
-        `CDN cache did not refresh after ${maxAttempts} checks ` +
-          `(jsDelivr: ${jsDelivrReady}, JSDMirror: ${mirrorReady})`,
+        `jsDelivr cache did not refresh after ${maxAttempts} checks`,
       );
     }
 

scripts/refresh-cdn-cache.test.mjs

@@ -7,9 +7,10 @@ const repository = "DiscoverBox/gitboost";
 const ref = "main";
 const cdnPath = `/gh/${repository}@${ref}/nodes.enc.json`;
 
-test("purges jsDelivr and waits for JSDMirror to match nodes.enc.json", async () => {
+test("purges jsDelivr and waits for its content to refresh", async () => {
   const expectedContent = '{"version":1}\n';
 
+  let jsDelivrChecks = 0;
   let mirrorChecks = 0;
   const requestedUrls = [];
   const fetchImpl = async (url) => {
@@ -20,11 +21,12 @@ test("purges jsDelivr and waits for JSDMirror to match nodes.enc.json", async ()
         paths: { [cdnPath]: { providers: { CF: true, FY: true } } },
       });
     }
-    if (url.startsWith("https://cdn.jsdmirror.cn/")) {
+    if (url.startsWith("https://cdn.jsdmirror.com/")) {
       mirrorChecks += 1;
       return new Response(mirrorChecks === 1 ? "stale" : expectedContent);
     }
-    return new Response(expectedContent);
+    jsDelivrChecks += 1;
+    return new Response(jsDelivrChecks === 1 ? "stale" : expectedContent);
   };
 
   await refreshCdnCache({
@@ -42,6 +44,61 @@ test("purges jsDelivr and waits for JSDMirror to match nodes.enc.json", async ()
   assert.equal(requestedUrls[0], `https://purge.jsdelivr.net${cdnPath}`);
 });
 
+test("warns without failing when only JSDMirror remains stale", async () => {
+  const expectedContent = '{"version":1}\n';
+  const logs = [];
+
+  await refreshCdnCache({
+    repository,
+    ref,
+    readFileImpl: async () => Buffer.from(expectedContent),
+    fetchImpl: async (url) => {
+      if (url.startsWith("https://purge.jsdelivr.net/")) {
+        return Response.json({
+          status: "finished",
+          paths: { [cdnPath]: { providers: { CF: true, FY: true } } },
+        });
+      }
+      if (url.startsWith("https://cdn.jsdmirror.com/")) {
+        return new Response("stale");
+      }
+      return new Response(expectedContent);
+    },
+    log: (message) => logs.push(message),
+  });
+
+  assert.ok(logs.some((message) => message.startsWith("::warning::")));
+});
+
+test("fails when jsDelivr content remains stale", async () => {
+  const expectedContent = '{"version":1}\n';
+
+  await assert.rejects(
+    refreshCdnCache({
+      repository,
+      ref,
+      readFileImpl: async () => Buffer.from(expectedContent),
+      fetchImpl: async (url) => {
+        if (url.startsWith("https://purge.jsdelivr.net/")) {
+          return Response.json({
+            status: "finished",
+            paths: { [cdnPath]: { providers: { CF: true, FY: true } } },
+          });
+        }
+        if (url.startsWith("https://cdn.jsdelivr.net/")) {
+          return new Response("stale");
+        }
+        return new Response(expectedContent);
+      },
+      wait: async () => {},
+      maxAttempts: 2,
+      pollIntervalMs: 0,
+      log: () => {},
+    }),
+    /jsDelivr cache did not refresh after 2 checks/,
+  );
+});
+
 test("fails when a jsDelivr provider does not purge the cache", async () => {
   await assert.rejects(
     refreshCdnCache({

src-tauri/src/core.rs

@@ -25,9 +25,8 @@ use std::{
 use tempfile::NamedTempFile;
 use uuid::Uuid;
 
-const SYSTEM_NODE_CATALOG_URLS: [&str; 4] = [
+const SYSTEM_NODE_CATALOG_URLS: [&str; 3] = [
     "https://cdn.jsdelivr.net/gh/DiscoverBox/gitboost@main/nodes.enc.json",
-    "https://cdn.jsdmirror.cn/gh/DiscoverBox/gitboost@main/nodes.enc.json",
     "https://cdn.bili33.top/gh/DiscoverBox/gitboost@main/nodes.enc.json",
     "https://cdn.jsdmirror.com/gh/DiscoverBox/gitboost@main/nodes.enc.json",
 ];