@lls/offline 24.28.0-c7eb356e → 24.28.0-cf52ac16

package/lib/assets/fetch-worker.js

@@ -17,10 +17,10 @@ var parseRange = (range, size) => {
 };
 
 // src/utils/worker.ts
-var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
+var makeSyncWorker = (offlineWorker, methodNames, dbg) => {
   const dic = {};
   const cbks = {};
-  const fn = ({ data: { eventId, methodName, results, error, arg } = {} } = {}) => {
+  const fn = ({ source, data: { eventId, methodName, results, error, arg } = {} }) => {
     if (eventId && eventId in dic) {
       if (error) {
         dic[eventId].reject(error);
@@ -28,11 +28,11 @@ var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
         dic[eventId].resolve(results);
       }
     } else {
-      if (methodName && !methodName.startsWith("async") && !(methodName in cbks)) {
+      if (methodName && !(methodName in cbks)) {
         console.error(`syncWorker: unknown methodName cbk ${dbg}`, eventId, methodName, error);
       }
     }
-    methodName && cbks[methodName]?.(arg);
+    methodName && cbks[methodName]?.({ source, ...arg });
   };
   const makeFn = (methodName) => {
     return ({ ports, ...arg } = {}) => {
@@ -40,7 +40,7 @@ var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
         const eventId = `${methodName}:${Date.now()}-${Math.random().toFixed(5)}`;
         let resolved = false;
         const timeout = setTimeout(() => {
-          console.warn("slow request for", methodName, arg);
+          console.warn("slow request for", methodName, arg, eventId);
         }, 3e3);
         const doResolve = (arg2) => {
           if (!resolved) {
@@ -50,11 +50,16 @@ var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
           }
         };
         dic[eventId] = { resolve: doResolve, reject };
-        offlineWorker2.postMessage({ eventId, methodName, arg }, ports);
+        if (ports) {
+          offlineWorker.postMessage({ eventId, methodName, arg }, ports);
+        } else {
+          offlineWorker.postMessage({ eventId, methodName, arg });
+        }
       });
     };
   };
-  const obj = Object.assign(Object.fromEntries(methodNames.map((name) => [name, makeFn(name)])), {
+  const fns = Object.fromEntries(methodNames.map((name) => [name, makeFn(name)]));
+  const obj = Object.assign(fns, {
     on: (key, fn2) => {
       cbks[key] = fn2;
     }
@@ -71,26 +76,38 @@ var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
 };
 var a = (a2) => a2;
 var makeSyncHandler = a(
-  (sender, services) => ({
+  (services) => ({
     canHandle: (methodName) => {
       return methodName in services;
     },
-    handle: async ({ data: { eventId, methodName, arg } = {}, ports }) => {
+    handle: async ({ data: { eventId, methodName, arg } = {}, source, ports, target }) => {
+      const emitter = source?.postMessage && source || target?.postMessage && target || self;
       try {
         if (typeof methodName === "string" && methodName in services && services[methodName]) {
           const results = await services[methodName](arg, { ports });
-          sender.postMessage({ eventId, methodName, results });
+          emitter.postMessage({ eventId, methodName, results });
           return;
         }
         throw new Error(`invalid methodName ${Object.keys(services)} |${String(methodName)}`);
       } catch (e) {
         console.debug("failed", e);
-        sender.postMessage({ eventId, methodName, error: e });
+        emitter.postMessage({ eventId, methodName, error: e });
       }
     }
   })
 );
 var jsonToBuf = (json) => new TextEncoder().encode(JSON.stringify(json));
+var combineHandlers = (...handlers) => {
+  return (message) => {
+    const methodName = String("methodName" in message.data ? message.data.methodName : "");
+    for (const h of handlers) {
+      if (h.canHandle(methodName)) {
+        return h.handle(message);
+      }
+    }
+    console.error("no handlers matched", methodName);
+  };
+};
 var openCache = async (mode) => caches.open(`LLS_OFFLINE_${mode}`);
 var isStoryZip = (name) => /story-.*?\.zip/.test(name);
 var isValidZipName = (name) => {
@@ -339,7 +356,7 @@ var fetchAsset = async (ev, { entryId, mimeType, offlineWorkerSync: offlineWorke
   try {
     const [buf, maybeRangeHeaders] = await offlineWorkerSync2.readZipEntry(entryId).then((buf2) => {
       const range = ev.request.headers.get("Range");
-      if (!ev.request.url.endsWith(".mp4") && !ev.request.url.endsWith(".webm")) {
+      if (!hasStreamingExtension(ev.request.url)) {
         return [buf2, {}];
       }
       if (!range) {
@@ -420,6 +437,7 @@ var ACCEPTED_EXTENSIONS = {
   ".riv": "application/octet-stream",
   ".pdf": "application/pdf"
 };
+var hasStreamingExtension = (str) => /\.(mp3|mp4|webm|m4a)$/.test(str);
 var putInCache = async (request, response) => {
   const cache = await openCache(CONF_ENV);
   await cache.put(request, response);
@@ -503,23 +521,23 @@ swSelf.addEventListener("install", (_event) => {
 swSelf.addEventListener("activate", (event) => {
   event.waitUntil(swSelf.clients.claim());
 });
-var offlineWorker;
+var setKnownLinks2 = (arg) => setKnownLinks(knownLinks, arg);
 var offlineWorkerSync;
 var initChannel = async (__, { ports }) => {
   console.info(`FETCH WORKER innitChannel v${/* @__PURE__ */ new Date()}`);
-  offlineWorker = ports[0];
-  const { handler, ...sender } = makeSyncWorker(
+  const offlineWorker = ports[0];
+  const { handler: syncHandler, ...sender } = makeSyncWorker(
     offlineWorker,
-    ["readZipEntry", "loadBook", "slugToFileMeta", "loadPageContent", "searchBooks"],
+    ["readZipEntry", "loadBook", "slugToFileMeta", "loadPageContent", "searchBooks", "ensureAppReady"],
     "fetchworker"
   );
+  const onHandler = makeSyncHandler({ setKnownLinks: setKnownLinks2 });
   offlineWorkerSync = sender;
-  offlineWorker.onmessage = handler.handle;
-  offlineWorkerSync.on("setKnownLinks", ({ entryNames, bookId, eventId }) => {
-    setKnownLinks(knownLinks, { entryNames, bookId });
-    offlineWorker.postMessage({ methodName: "setKnownLinks:back", eventId });
-  });
-  offlineWorker.postMessage({ methodName: "sendAppReady" });
+  offlineWorker.onmessage = combineHandlers(syncHandler, onHandler);
+  offlineWorker.onclose = () => {
+    console.error("socket to ow has been closed!");
+  };
+  await offlineWorkerSync.ensureAppReady();
 };
 var knownLinks = /* @__PURE__ */ new Map();
 var configure = ({
@@ -536,28 +554,4 @@ var configure = ({
   }
   console.info("sw::configure", { STORAGE, CONF_ENV });
 };
-swSelf.onmessage = async ({
-  data: { methodName, arg } = {},
-  ports
-}) => {
-  const services = {
-    initChannel,
-    configure
-  };
-  try {
-    if (methodName === "configure") {
-      await services[methodName](arg);
-      return;
-    }
-    if (methodName === "initChannel") {
-      if (!ports.length) {
-        throw new Error("fetchworker::missing port!");
-      }
-      await services[methodName](arg, { ports });
-      return;
-    }
-    throw new Error(`fetchworker:invalid methodName ${Object.keys(services)} ${methodName}`);
-  } catch (e) {
-    console.error("failed", methodName, arg, e);
-  }
-};
+swSelf.onmessage = combineHandlers(makeSyncHandler({ initChannel, configure }));

package/lib/assets/offline-worker.js

@@ -13,7 +13,7 @@ var tryCatch = (fn) => {
 var makeSyncWorker = (offlineWorker, methodNames, dbg) => {
   const dic = {};
   const cbks = {};
-  const fn = ({ data: { eventId, methodName, results, error, arg } = {} } = {}) => {
+  const fn = ({ source, data: { eventId, methodName, results, error, arg } = {} }) => {
     if (eventId && eventId in dic) {
       if (error) {
         dic[eventId].reject(error);
@@ -21,11 +21,11 @@ var makeSyncWorker = (offlineWorker, methodNames, dbg) => {
         dic[eventId].resolve(results);
       }
     } else {
-      if (methodName && !methodName.startsWith("async") && !(methodName in cbks)) {
+      if (methodName && !(methodName in cbks)) {
         console.error(`syncWorker: unknown methodName cbk ${dbg}`, eventId, methodName, error);
       }
     }
-    methodName && cbks[methodName]?.(arg);
+    methodName && cbks[methodName]?.({ source, ...arg });
   };
   const makeFn = (methodName) => {
     return ({ ports, ...arg } = {}) => {
@@ -33,7 +33,7 @@ var makeSyncWorker = (offlineWorker, methodNames, dbg) => {
         const eventId = `${methodName}:${Date.now()}-${Math.random().toFixed(5)}`;
         let resolved = false;
         const timeout = setTimeout(() => {
-          console.warn("slow request for", methodName, arg);
+          console.warn("slow request for", methodName, arg, eventId);
         }, 3e3);
         const doResolve = (arg2) => {
           if (!resolved) {
@@ -43,11 +43,16 @@ var makeSyncWorker = (offlineWorker, methodNames, dbg) => {
           }
         };
         dic[eventId] = { resolve: doResolve, reject };
-        offlineWorker.postMessage({ eventId, methodName, arg }, ports);
+        if (ports) {
+          offlineWorker.postMessage({ eventId, methodName, arg }, ports);
+        } else {
+          offlineWorker.postMessage({ eventId, methodName, arg });
+        }
       });
     };
   };
-  const obj = Object.assign(Object.fromEntries(methodNames.map((name) => [name, makeFn(name)])), {
+  const fns = Object.fromEntries(methodNames.map((name) => [name, makeFn(name)]));
+  const obj = Object.assign(fns, {
     on: (key2, fn2) => {
       cbks[key2] = fn2;
     }
@@ -64,31 +69,33 @@ var makeSyncWorker = (offlineWorker, methodNames, dbg) => {
 };
 var a = (a2) => a2;
 var makeSyncHandler = a(
-  (sender2, services) => ({
+  (services) => ({
     canHandle: (methodName) => {
       return methodName in services;
     },
-    handle: async ({ data: { eventId, methodName, arg } = {}, ports }) => {
+    handle: async ({ data: { eventId, methodName, arg } = {}, source, ports, target }) => {
+      const emitter = source?.postMessage && source || target?.postMessage && target || self;
       try {
         if (typeof methodName === "string" && methodName in services && services[methodName]) {
           const results = await services[methodName](arg, { ports });
-          sender2.postMessage({ eventId, methodName, results });
+          emitter.postMessage({ eventId, methodName, results });
           return;
         }
         throw new Error(`invalid methodName ${Object.keys(services)} |${String(methodName)}`);
       } catch (e) {
         console.debug("failed", e);
-        sender2.postMessage({ eventId, methodName, error: e });
+        emitter.postMessage({ eventId, methodName, error: e });
       }
     }
   })
 );
 var bufToJson = (buf) => JSON.parse(new TextDecoder("UTF-8").decode(new Uint8Array(buf)));
 var combineHandlers = (...handlers) => {
-  return ({ data: { methodName, ...data } = {}, ports }) => {
+  return (message) => {
+    const methodName = String("methodName" in message.data ? message.data.methodName : "");
     for (const h of handlers) {
-      if (h.canHandle(String(methodName))) {
-        return h.handle({ data: { methodName, ...data }, ports });
+      if (h.canHandle(methodName)) {
+        return h.handle(message);
       }
     }
     console.error("no handlers matched", methodName);
@@ -441,12 +448,7 @@ var loadBook2 = async ({ id: bookId, forceRefresh }) => {
         console.time("loadzip");
         const entryNames = await loadZip(new Uint8Array(buf), bookId);
         console.timeEnd("loadzip");
-        const eventId = `setKnownLinks:${Date.now()}-${Math.random().toFixed(5)}`;
-        const responseForEventId = new Promise((resolve, reject) => {
-          dicFetchWorkerCallback[eventId] = { resolve, reject };
-        });
-        fetchWorker.postMessage({ methodName: "setKnownLinks", arg: { entryNames, bookId, eventId } });
-        await responseForEventId;
+        await fetchWorkerSync.setKnownLinks({ entryNames, bookId });
         if (isOldZip(bookId)) {
           const json = await readZipEntry({
             entryName: `preload/${bookId}.json`,
@@ -489,43 +491,30 @@ var loadPageContent2 = async ({
   });
   return await loadPageContent({ chapterId, json });
 };
-var fetchWorker;
-var dicFetchWorkerCallback = {};
-var handleFetchWorkerCallback = ({ data: { eventId } }) => {
-  if (dicFetchWorkerCallback[eventId]) {
-    dicFetchWorkerCallback[eventId].resolve();
-  } else {
-    console.debug("unknown eventId", eventId);
-  }
+var ensureAppReady = () => {
 };
+var fetchWorker;
+var fetchWorkerSync;
 var initChannel = (__, { ports }) => {
   fetchWorker = ports[0];
-  const { canHandle, handle } = makeSyncHandler(fetchWorker, {
+  const onHandler = makeSyncHandler({
     readZipEntry,
     loadBook: loadBook2,
     slugToFileMeta: slugToFileMeta2,
     loadPageContent: loadPageContent2,
-    searchBooks
+    searchBooks,
+    ensureAppReady
   });
-  const fn = (dataObj) => {
-    if (dataObj.data?.methodName === "sendAppReady") {
-      self.postMessage({ methodName: "ready" });
-      return;
-    }
-    if (dataObj.data?.methodName === "setKnownLinks:back") {
-      if (typeof dataObj?.data?.eventId !== "string") {
-        console.debug("missing eventId to get response back for setKnownLinks:back");
-        return;
-      }
-      handleFetchWorkerCallback(dataObj);
-      return;
-    }
-    if (canHandle(dataObj.data?.methodName || "")) {
-      return handle(dataObj);
-    }
-    console.error("unknown methodName", dataObj.data?.methodName);
+  const { handler: syncHandler, ...sender2 } = makeSyncWorker(
+    fetchWorker,
+    ["setKnownLinks"],
+    "offline-worker"
+  );
+  fetchWorkerSync = sender2;
+  fetchWorker.onmessage = combineHandlers(syncHandler, onHandler);
+  fetchWorker.onclose = () => {
+    console.error("socket to sw has been closed!");
   };
-  fetchWorker.onmessage = fn;
 };
 var loadBooks = async ({ primaryOnly = false } = {}) => {
   let entries = [];
@@ -597,7 +586,7 @@ var reset = async () => {
   await (await navigator.storage.getDirectory()).remove({ recursive: true });
   console.info("opfs cleared");
 };
-var mainHandle = makeSyncHandler(self, {
+var mainHandle = makeSyncHandler({
   initChannel,
   loadPreload: loadPreload2,
   readZipEntry,

package/lib/index.js

@@ -13,7 +13,7 @@ var tryCatch = (fn) => {
 var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
   const dic = {};
   const cbks = {};
-  const fn = ({ data: { eventId, methodName, results, error, arg } = {} } = {}) => {
+  const fn = ({ source, data: { eventId, methodName, results, error, arg } = {} }) => {
     if (eventId && eventId in dic) {
       if (error) {
         dic[eventId].reject(error);
@@ -21,11 +21,11 @@ var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
         dic[eventId].resolve(results);
       }
     } else {
-      if (methodName && !methodName.startsWith("async") && !(methodName in cbks)) {
+      if (methodName && !(methodName in cbks)) {
         console.error(`syncWorker: unknown methodName cbk ${dbg}`, eventId, methodName, error);
       }
     }
-    methodName && cbks[methodName]?.(arg);
+    methodName && cbks[methodName]?.({ source, ...arg });
   };
   const makeFn = (methodName) => {
     return ({ ports, ...arg } = {}) => {
@@ -33,7 +33,7 @@ var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
         const eventId = `${methodName}:${Date.now()}-${Math.random().toFixed(5)}`;
         let resolved = false;
         const timeout = setTimeout(() => {
-          console.warn("slow request for", methodName, arg);
+          console.warn("slow request for", methodName, arg, eventId);
         }, 3e3);
         const doResolve = (arg2) => {
           if (!resolved) {
@@ -43,11 +43,16 @@ var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
           }
         };
         dic[eventId] = { resolve: doResolve, reject };
-        offlineWorker2.postMessage({ eventId, methodName, arg }, ports);
+        if (ports) {
+          offlineWorker2.postMessage({ eventId, methodName, arg }, ports);
+        } else {
+          offlineWorker2.postMessage({ eventId, methodName, arg });
+        }
       });
     };
   };
-  const obj = Object.assign(Object.fromEntries(methodNames.map((name) => [name, makeFn(name)])), {
+  const fns = Object.fromEntries(methodNames.map((name) => [name, makeFn(name)]));
+  const obj = Object.assign(fns, {
     on: (key, fn2) => {
       cbks[key] = fn2;
     }
@@ -64,30 +69,32 @@ var makeSyncWorker = (offlineWorker2, methodNames, dbg) => {
 };
 var a = (a2) => a2;
 var makeSyncHandler = a(
-  (sender, services) => ({
+  (services) => ({
     canHandle: (methodName) => {
       return methodName in services;
     },
-    handle: async ({ data: { eventId, methodName, arg } = {}, ports }) => {
+    handle: async ({ data: { eventId, methodName, arg } = {}, source, ports, target }) => {
+      const emitter = source?.postMessage && source || target?.postMessage && target || self;
       try {
         if (typeof methodName === "string" && methodName in services && services[methodName]) {
           const results = await services[methodName](arg, { ports });
-          sender.postMessage({ eventId, methodName, results });
+          emitter.postMessage({ eventId, methodName, results });
           return;
         }
         throw new Error(`invalid methodName ${Object.keys(services)} |${String(methodName)}`);
       } catch (e) {
         console.debug("failed", e);
-        sender.postMessage({ eventId, methodName, error: e });
+        emitter.postMessage({ eventId, methodName, error: e });
       }
     }
   })
 );
 var combineHandlers = (...handlers) => {
-  return ({ data: { methodName, ...data } = {}, ports }) => {
+  return (message) => {
+    const methodName = String("methodName" in message.data ? message.data.methodName : "");
     for (const h of handlers) {
-      if (h.canHandle(String(methodName))) {
-        return h.handle({ data: { methodName, ...data }, ports });
+      if (h.canHandle(methodName)) {
+        return h.handle(message);
       }
     }
     console.error("no handlers matched", methodName);
@@ -124,14 +131,6 @@ var fetchWorkerPromise = new Promise(
     return fetchWorker;
   })
 );
-var setWorkersReady;
-var workersReadyPromise = new Promise((resolve) => {
-  setWorkersReady = resolve;
-});
-var setBooksLoaded;
-var setBooksLoadedPromise = new Promise((resolve) => {
-  setBooksLoaded = resolve;
-});
 var installWorker = async ({
   skipLoadBooks = false,
   primaryOnly = false,
@@ -146,7 +145,7 @@ var installWorker = async ({
   const fetchWorker = await fetchWorkerPromise;
   const configureOptions = { storage, zipBaseUrl, checkUpdates, confEnv };
   if (nativeReadFile) {
-    const wwHandler = makeSyncHandler(offlineWorker, { nativeReadFile, nativeWriteFile, nativeListZips });
+    const wwHandler = makeSyncHandler({ nativeReadFile, nativeWriteFile, nativeListZips });
     offlineWorker.onmessage = combineHandlers(handler, wwHandler);
     if (storage !== "native") {
       console.warn("nativeReadFile given, ignoring storage", storage);
@@ -154,13 +153,17 @@ var installWorker = async ({
     offlineWorkerSync.configure({ ...configureOptions, storage: "native" });
   } else {
     offlineWorker.onmessage = handler.handle;
-    offlineWorkerSync.configure(configureOptions);
+    await offlineWorkerSync.configure(configureOptions);
   }
-  offlineWorkerSync.on("ready", setWorkersReady);
   const channel = new MessageChannel();
-  offlineWorkerSync.initChannel({ ports: [channel.port1] });
-  fetchWorker.postMessage({ methodName: "initChannel" }, [channel.port2]);
-  fetchWorker.postMessage({ methodName: "configure", arg: { storage, confEnv } });
+  await offlineWorkerSync.initChannel({ ports: [channel.port1] });
+  const { handler: fetchWorkerHandler, ...fetchWorkerSync } = makeSyncWorker(fetchWorker, [
+    "initChannel",
+    "configure"
+  ]);
+  navigator.serviceWorker.onmessage = combineHandlers(fetchWorkerHandler);
+  await fetchWorkerSync.initChannel({ ports: [channel.port2] });
+  await fetchWorkerSync.configure({ storage, confEnv });
   offlineWorkerSync.on("opfsProgress", () => {
   });
   if (!primaryOnly) {
@@ -169,7 +172,6 @@ var installWorker = async ({
   if (!skipLoadBooks) {
     await offlineWorkerSync.loadBooks({ primaryOnly });
   }
-  setBooksLoaded();
 };
 var useOfflineWorker_default = ({
   skipLoadBooks,
@@ -196,7 +198,6 @@ var useOfflineWorker_default = ({
         checkUpdates,
         confEnv
       });
-      await Promise.all([workersReadyPromise, setBooksLoadedPromise]);
       fetch(window.location.href.replace(window.location.search, ""));
       setReady(true);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/offline",
-  "version": "24.28.0-c7eb356e",
+  "version": "24.28.0-cf52ac16",
   "description": "offline",
   "main": "./lib/index.js",
   "module": "./lib/index.js",
@@ -53,7 +53,7 @@
     "vite": "7.0.7",
     "vite-tsconfig-paths": "5.1.4",
     "zod": "3.25.50",
-    "@lls/vitescripts": "24.28.0-c7eb356e"
+    "@lls/vitescripts": "24.28.0-cf52ac16"
   },
   "dependencies": {
     "redux-persist": "6.0.0"