@prose-reader/streamer 1.83.0 → 1.85.0

package/dist/ServiceWorkerStreamer.d.ts

@@ -1,4 +1,3 @@
-import { createArchiveLoader } from './archives/archiveLoader';
 import { Streamer } from './Streamer';
 type ConflictFreeWebWorkerFetchEvent = {
     readonly request: Request;
@@ -9,7 +8,7 @@ export declare class ServiceWorkerStreamer extends Streamer {
     protected getUriInfo: (event: ConflictFreeWebWorkerFetchEvent) => {
         baseUrl: string;
     } | undefined;
-    constructor({ getUriInfo, ...rest }: Parameters<typeof createArchiveLoader>[0] & {
+    constructor({ getUriInfo, ...rest }: ConstructorParameters<typeof Streamer>[0] & {
         getUriInfo: (event: ConflictFreeWebWorkerFetchEvent) => {
             baseUrl: string;
         } | undefined;

package/dist/Streamer.d.ts

@@ -1,7 +1,10 @@
 import { createArchiveLoader } from './archives/archiveLoader';
 export declare class Streamer {
     epubLoader: ReturnType<typeof createArchiveLoader>;
-    constructor(params: Parameters<typeof createArchiveLoader>[0]);
+    onError: (error: unknown) => Response;
+    constructor({ onError, ...rest }: Parameters<typeof createArchiveLoader>[0] & {
+        onError?: (error: unknown) => Response;
+    });
     fetchManifest({ key, baseUrl }: {
         key: string;
         baseUrl?: string;

package/dist/index.js

@@ -1,6 +1,6 @@
 import { urlJoin as N, PROSE_READER_RESOURCE_ERROR_INJECTED_META_NAME as ie, isXmlBasedMimeType as oe, detectMimeTypeFromName as M } from "@prose-reader/shared";
 import y, { XmlDocument as ce } from "xmldoc";
-import { Subject as V, mergeMap as L, EMPTY as de, from as A, map as v, catchError as F, NEVER as U, shareReplay as le, switchMap as X, timer as me, tap as B, merge as _, takeUntil as pe, BehaviorSubject as fe, filter as ue, ignoreElements as he, first as ge, finalize as H, of as G, lastValueFrom as J } from "rxjs";
+import { Subject as U, mergeMap as I, EMPTY as de, from as L, map as v, catchError as F, NEVER as V, shareReplay as le, switchMap as X, timer as me, tap as B, merge as _, takeUntil as pe, BehaviorSubject as fe, filter as ue, ignoreElements as he, first as ge, finalize as H, of as E, lastValueFrom as G } from "rxjs";
 let x = !1;
 const g = {
   enable: (e) => {
@@ -90,7 +90,7 @@ const g = {
     data: s,
     basePath: (s == null ? void 0 : s.uri.substring(0, s.uri.lastIndexOf("/"))) || ""
   };
-}, Y = (e, { opfBasePath: n, baseUrl: s }) => {
+}, q = (e, { opfBasePath: n, baseUrl: s }) => {
   const r = {
     contents: [],
     path: "",
@@ -105,7 +105,7 @@ const g = {
   if (i) {
     const o = i.childrenNamed("li");
     o && o.length > 0 && (r.contents = o.map(
-      (c) => Y(c, { opfBasePath: n, baseUrl: s })
+      (c) => q(c, { opfBasePath: n, baseUrl: s })
     ));
   }
   return r;
@@ -114,7 +114,7 @@ const g = {
   const r = [];
   let t;
   return e.descendantWithPath("body.nav.ol") ? t = (a = e.descendantWithPath("body.nav.ol")) == null ? void 0 : a.children : e.descendantWithPath("body.section.nav.ol") && (t = (i = e.descendantWithPath("body.section.nav.ol")) == null ? void 0 : i.children), t && t.length > 0 && t.filter((o) => o.name === "li").forEach(
-    (o) => r.push(Y(o, { opfBasePath: n, baseUrl: s }))
+    (o) => r.push(q(o, { opfBasePath: n, baseUrl: s }))
   ), r;
 }, Fe = async (e, n, { opfBasePath: s, baseUrl: r }) => {
   var a;
@@ -128,7 +128,7 @@ const g = {
       return xe(o, { opfBasePath: s, baseUrl: r });
     }
   }
-}, K = (e, {
+}, Y = (e, {
   opfBasePath: n,
   baseUrl: s,
   prefix: r
@@ -141,14 +141,14 @@ const g = {
     contents: []
   }, i = e.childrenNamed(`${r}navPoint`);
   return i && i.length > 0 && (a.contents = i.map(
-    (l) => K(l, { opfBasePath: n, baseUrl: s, prefix: r })
+    (l) => Y(l, { opfBasePath: n, baseUrl: s, prefix: r })
   )), a;
 }, Ne = (e, { opfBasePath: n, baseUrl: s }) => {
   var i;
   const r = [], t = e.name;
   let a = "";
   return t.indexOf(":") !== -1 && (a = t.split(":")[0] + ":"), (i = e.childNamed(`${a}navMap`)) == null || i.childrenNamed(`${a}navPoint`).forEach(
-    (o) => r.push(K(o, { opfBasePath: n, baseUrl: s, prefix: a }))
+    (o) => r.push(Y(o, { opfBasePath: n, baseUrl: s, prefix: a }))
   ), r;
 }, Te = async ({
   opfData: e,
@@ -191,7 +191,7 @@ const g = {
       }
     })
   ), n;
-}, E = async ({
+}, K = async ({
   archive: e
 }) => {
   const { data: n, basePath: s } = T(e) || {}, r = await (n == null ? void 0 : n.string());
@@ -219,7 +219,7 @@ const g = {
     (p) => p.attr.property === "rendition:flow"
   ), R = h.find(
     (p) => p.attr.property === "rendition:spread"
-  ), C = S == null ? void 0 : S.val, Z = k == null ? void 0 : k.val, ee = R == null ? void 0 : R.val, te = (w == null ? void 0 : w.val) || ((P = e.files.find(({ dir: p }) => p)) == null ? void 0 : P.basename) || "", ne = u == null ? void 0 : u.attr["page-progression-direction"], re = (await E({ archive: e })).reduce(
+  ), C = S == null ? void 0 : S.val, Z = k == null ? void 0 : k.val, ee = R == null ? void 0 : R.val, te = (w == null ? void 0 : w.val) || ((P = e.files.find(({ dir: p }) => p)) == null ? void 0 : P.basename) || "", ne = u == null ? void 0 : u.attr["page-progression-direction"], re = (await K({ archive: e })).reduce(
     (p, m) => m.size + p,
     0
   );
@@ -269,9 +269,9 @@ const g = {
     };
   }
   return {
-    mediaType: Le(n)
+    mediaType: Ie(n)
   };
-}, Le = (e) => {
+}, Ie = (e) => {
   if (e.endsWith(".css"))
     return "text/css; charset=UTF-8";
   if (e.endsWith(".jpg"))
@@ -282,7 +282,7 @@ const g = {
     return "video/mp4";
   if (e.endsWith(".svg"))
     return "image/svg+xml";
-}, Ae = ({ archive: e, resourcePath: n }) => async (s) => {
+}, Le = ({ archive: e, resourcePath: n }) => async (s) => {
   const r = Object.values(e.files).find(
     (a) => a.uri === n
   );
@@ -303,7 +303,7 @@ const g = {
       }
     }
   };
-}, Ie = async (e, n) => {
+}, Ae = async (e, n) => {
   const s = Object.values(e.files).find(
     (a) => a.uri === n
   );
@@ -314,7 +314,7 @@ const g = {
       status: 200
     }
   }, t = [
-    Ae({ archive: e, resourcePath: n }),
+    Le({ archive: e, resourcePath: n }),
     $e({ archive: e, resourcePath: n }),
     ve({ archive: e, resourcePath: n })
   ];
@@ -327,7 +327,7 @@ const g = {
   } catch (a) {
     throw g.error(a), a;
   }
-}, qe = (e) => ({
+}, Je = (e) => ({
   body: `
     <!DOCTYPE html>
     <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
@@ -409,7 +409,7 @@ const g = {
   return t ? De(new y.XmlDocument(t)) : !1;
 }, Promise.resolve(!0)), je = ({ archive: e }) => async (n) => {
   if (n.renditionLayout === "reflowable" && n.spineItems.every((r) => r.renditionLayout === "reflowable")) {
-    const r = await E({ archive: e });
+    const r = await K({ archive: e });
     if (await Oe(r))
       return {
         ...n,
@@ -421,7 +421,7 @@ const g = {
       };
   }
   return n;
-}, I = (e, n) => {
+}, A = (e, n) => {
   var t;
   const s = e.split(/(\d+)/), r = n.split(/(\d+)/);
   for (let a = 0, i = s.length; a < i; a++)
@@ -431,7 +431,7 @@ const g = {
 }, ze = ({ archive: e, baseUrl: n }) => async (s) => {
   if (s.nav) return s;
   const r = [...e.files].sort(
-    (a, i) => I(a.uri, i.uri)
+    (a, i) => A(a.uri, i.uri)
   ), t = Object.values(
     r
   ).reduce(
@@ -466,7 +466,7 @@ const g = {
   renditionSpread: "auto",
   spineItems: [],
   title: ""
-}, Ve = async (e, { baseUrl: n = "" } = {}) => {
+}, Ue = async (e, { baseUrl: n = "" } = {}) => {
   const s = [
     Ce({ archive: e, baseUrl: n }),
     Re({ archive: e, baseUrl: n }),
@@ -480,7 +480,7 @@ const g = {
   } catch (r) {
     throw g.error(r), r;
   }
-}, $ = (e) => e.substring(e.lastIndexOf("/") + 1) || e, q = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Ye = async (e, n) => {
+}, $ = (e) => e.substring(e.lastIndexOf("/") + 1) || e, J = (e) => e.endsWith("/") ? e.slice(0, -1) : e, qe = async (e, n) => {
   const s = `
     <?xml version="1.0" encoding="UTF-8"?><package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="bookid">
       <metadata>
@@ -521,13 +521,13 @@ const g = {
     }, ...r],
     close: () => Promise.resolve()
   };
-}, Ue = async (e) => new Promise((n) => {
+}, Ve = async (e) => new Promise((n) => {
   const s = new FileReader();
   s.readAsDataURL(e), s.onloadend = function() {
     const r = s.result;
     n(r);
   };
-}), Ke = async (e, {
+}), Ye = async (e, {
   mimeType: n,
   direction: s
 } = { mimeType: "text/plain" }) => {
@@ -565,16 +565,16 @@ const g = {
         uri: "p01.txt",
         blob: async () => typeof e == "string" ? new Blob([e]) : e,
         string: async () => typeof e == "string" ? e : e.text(),
-        base64: async () => typeof e == "string" ? btoa(e) : Ue(e),
+        base64: async () => typeof e == "string" ? btoa(e) : Ve(e),
         size: typeof e == "string" ? e.length : e.size,
         encodingFormat: n
       }
     ],
     close: () => Promise.resolve()
   };
-}, Ee = async (e, { orderByAlpha: n, name: s } = {}) => {
+}, Ke = async (e, { orderByAlpha: n, name: s } = {}) => {
   let r = Object.values(e.files);
-  n && (r = r.slice().sort((a, i) => I(a.name, i.name)));
+  n && (r = r.slice().sort((a, i) => A(a.name, i.name)));
   const t = {
     filename: s || "",
     files: r.map((a) => ({
@@ -612,7 +612,7 @@ const g = {
   return g.log("Generated archive", r), r;
 }, Ze = async (e, { orderByAlpha: n, name: s } = {}) => {
   let r = e;
-  return n && (r = r.slice().sort((t, a) => I(t.name, a.name))), {
+  return n && (r = r.slice().sort((t, a) => A(t.name, a.name))), {
     filename: s || "",
     files: r.map((t) => ({
       dir: t.isDir,
@@ -639,13 +639,13 @@ const g = {
   getArchive: e,
   cleanArchiveAfter: n
 }) => {
-  const s = new V(), r = new V(), t = {}, a = s.pipe(
-    L((c) => {
+  const s = new U(), r = new U(), t = {}, a = s.pipe(
+    I((c) => {
       const l = t[c];
       return !l || l.getValue().status !== "idle" ? de : (l.next({
         ...l.getValue(),
         status: "loading"
-      }), A(e(c)).pipe(
+      }), L(e(c)).pipe(
         v((d) => (l.next({
           ...l.getValue(),
           archive: d,
@@ -660,12 +660,12 @@ const g = {
         })
       ));
     }),
-    F((c) => (console.error(c), U)),
+    F((c) => (console.error(c), V)),
     le()
   ), i = a.pipe(
     X(({ archiveEntry: c, key: l }) => c.pipe(v(({ locks: f }) => f)).pipe(v((f) => f <= 0)).pipe(
       X(
-        (f) => f ? me(n) : U
+        (f) => f ? me(n) : V
       ),
       B(() => {
         var f;
@@ -714,13 +714,16 @@ const g = {
   };
 };
 class Be {
-  constructor(n) {
-    this.epubLoader = Xe(n);
+  constructor({
+    onError: n,
+    ...s
+  }) {
+    this.onError = (r) => new Response(String(r), { status: 500 }), this.epubLoader = Xe(s), this.onError = n ?? this.onError;
   }
   fetchManifest({ key: n, baseUrl: s }) {
     const r = this.epubLoader.access(n).pipe(
-      L(({ archive: t, release: a }) => A(
-        Ve(t, { baseUrl: s })
+      I(({ archive: t, release: a }) => L(
+        Ue(t, { baseUrl: s })
       ).pipe(
         v(
           (o) => new Response(JSON.stringify(o), {
@@ -731,26 +734,26 @@ class Be {
           a();
         })
       )),
-      F((t) => G(new Response(String(t), { status: 500 })))
+      F((t) => E(this.onError(t)))
     );
-    return J(r);
+    return G(r);
   }
   fetchResource({
     key: n,
     resourcePath: s
   }) {
     const r = this.epubLoader.access(n).pipe(
-      L(({ archive: t, release: a }) => A(
-        Ie(t, s)
+      I(({ archive: t, release: a }) => L(
+        Ae(t, s)
       ).pipe(
         v((o) => new Response(o.body, { status: 200 })),
         H(() => {
           a();
         })
       )),
-      F((t) => G(new Response(String(t), { status: 500 })))
+      F((t) => E(this.onError(t)))
     );
-    return J(r);
+    return G(r);
   }
 }
 class tt extends Be {
@@ -764,10 +767,10 @@ class tt extends Be {
     try {
       const s = this.getUriInfo(n);
       if (!s) return;
-      const r = q(s.baseUrl), t = n.request.url.substring(
+      const r = J(s.baseUrl), t = n.request.url.substring(
         r.length + 1
-      ), [a = ""] = t.split("/"), i = q(
-        t.substring(a.length + 1)
+      ), [a = ""] = t.split("/"), i = decodeURIComponent(
+        J(t.substring(a.length + 1))
       );
       t.endsWith("/manifest") ? n.respondWith(
         this.fetchManifest({ key: a, baseUrl: `${r}/${a}/` })
@@ -782,13 +785,13 @@ export {
   Be as Streamer,
   et as configure,
   Ze as createArchiveFromArrayBufferList,
-  Ee as createArchiveFromJszip,
+  Ke as createArchiveFromJszip,
   Qe as createArchiveFromLibArchive,
-  Ke as createArchiveFromText,
-  Ye as createArchiveFromUrls,
-  Ve as generateManifestFromArchive,
-  Ie as generateResourceFromArchive,
-  qe as generateResourceFromError,
+  Ye as createArchiveFromText,
+  qe as createArchiveFromUrls,
+  Ue as generateManifestFromArchive,
+  Ae as generateResourceFromArchive,
+  Je as generateResourceFromError,
   T as getArchiveOpfInfo
 };
 //# sourceMappingURL=index.js.map