@lls/offline 24.24.0-58229fcf → 24.24.0-6900d800

package/lib/assets/fetch-worker.js

@@ -63,6 +63,13 @@ var makeSyncHandler = a(
 );
 var jsonToBuf = (json) => new TextEncoder().encode(JSON.stringify(json));
 var openCache = async (mode) => caches.open(`LLS_OFFLINE_${mode}`);
+var isStoryZip = (name) => /story-.*?\.zip/.test(name);
+var isValidZipName = (name) => {
+  return /lecture-cp\.zip/.test(name) || isStoryZip(name);
+};
+var isValidS3Zip = (response) => {
+  return Number(response?.headers.get("Content-Length")) >= 1e4 || isStoryZip(response.url);
+};
 
 // src/worker/swFetchScreenCall.ts
 var zipSlugName = (str) => str.replace(/[^a-zA-Z0-9-.]/g, "");
@@ -302,6 +309,9 @@ var putInCache = async (request, response) => {
 var onlineFirst = async (request, event) => {
   try {
     const responseFromNetwork = await fetch(request);
+    if (isValidZipName(request.url) && !isValidS3Zip(responseFromNetwork)) {
+      throw new Error(`zip is invalid: got ${responseFromNetwork.headers.get("Content-Length")} bytes`);
+    }
     const cached = putInCache(request, responseFromNetwork.clone());
     if (request.url.endsWith(".zip")) {
       await cached;

package/lib/assets/offline-worker.js

@@ -94,6 +94,13 @@ var concatArrayBuffers = (buffers) => {
   }
   return concatenated.buffer;
 };
+var isStoryZip = (name) => /story-.*?\.zip/.test(name);
+var isValidZipName = (name) => {
+  return /lecture-cp\.zip/.test(name) || isStoryZip(name);
+};
+var isValidS3Zip = (response) => {
+  return Number(response?.headers.get("Content-Length")) >= 1e4 || isStoryZip(response.url);
+};
 
 // src/worker/wwApi.ts
 var STATE = {
@@ -917,6 +924,11 @@ var fetchZipFile = async (zipUrl, { forceRefresh } = {}) => {
     }
     const response = await fetch(zipUrl);
     const contentLength = +response.headers.get("Content-Length");
+    if (!isValidS3Zip(response)) {
+      const error = `likely ${zipUrl} was not fetched ${contentLength}`;
+      console.debug(error);
+      throw new Error(error);
+    }
     const reader = response.body.getReader();
     let position = 0;
     const arrayBuffer = new Uint8Array(contentLength);
@@ -934,11 +946,6 @@ var fetchZipFile = async (zipUrl, { forceRefresh } = {}) => {
         self.postMessage({ methodName: "opfsProgress", arg: { total: contentLength, bytes: position } });
       }
     }
-    if (arrayBuffer.byteLength < 1e4) {
-      const error = `likely ${zipUrl} was not fetched ${arrayBuffer.byteLength}`;
-      console.debug(error);
-      throw new Error(error);
-    }
     if (STORAGE === "native") {
       await sender.nativeWriteFile({ fname: fileName, buffer: arrayBuffer });
     } else if (STORAGE === "opfs") {
@@ -1052,9 +1059,7 @@ var loadBooks = async ({ primaryOnly = false } = {}) => {
   } else {
     const cache = await openCache(CONF_ENV);
     const keys = await cache.keys();
-    const zips = keys.filter((key2) => {
-      return key2.url.match(/lecture-cp\.zip|story-.*?\.zip/);
-    });
+    const zips = keys.filter((key2) => isValidZipName(key2.url));
     entries = zips.map((zip) => ({ name: String(zip.url.split("/").pop()) }));
   }
   for await (const entry of entries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/offline",
-  "version": "24.24.0-58229fcf",
+  "version": "24.24.0-6900d800",
   "description": "offline",
   "main": "./lib/index.js",
   "module": "./lib/index.js",
@@ -52,7 +52,7 @@
     "vite": "7.0.0",
     "vite-tsconfig-paths": "5.1.4",
     "zod": "3.25.50",
-    "@lls/vitescripts": "24.24.0-58229fcf"
+    "@lls/vitescripts": "24.24.0-6900d800"
   },
   "dependencies": {
     "fflate": "0.8.2"