@prose-reader/streamer 1.208.0 → 1.209.0

package/dist/archives/archiveLoader.d.ts

@@ -29,6 +29,6 @@ export declare const createArchiveLoader: ({ getArchive, cleanArchiveAfter, }: {
         release: () => void;
     }>;
     purge: () => void;
-    archives: Record<string, ArchiveEntry>;
+    _archives: Record<string, ArchiveEntry>;
 };
 export {};

package/dist/index.js

@@ -1,8 +1,8 @@
-import $, { XmlDocument as de, XmlTextNode as le, XmlElement as pe } from "xmldoc";
-import { urlJoin as W, isXmlBasedMimeType as fe, parseContentType as ue, detectMimeTypeFromName as O } from "@prose-reader/shared";
-import { Subject as R, mergeMap as M, EMPTY as _, pairwise as me, filter as D, startWith as he, from as P, tap as j, catchError as C, switchMap as L, merge as q, takeUntil as ge, map as F, ignoreElements as ye, first as be, BehaviorSubject as we, distinctUntilChanged as ve, shareReplay as $e, NEVER as G, timer as xe, finalize as K, of as J, lastValueFrom as Y } from "rxjs";
+import v, { XmlDocument as le, XmlTextNode as pe, XmlElement as fe } from "xmldoc";
+import { urlJoin as N, isXmlBasedMimeType as ue, parseContentType as me, detectMimeTypeFromName as O } from "@prose-reader/shared";
+import { Subject as R, mergeMap as M, EMPTY as _, pairwise as he, filter as D, startWith as ge, from as C, tap as j, catchError as P, switchMap as W, merge as q, first as G, takeUntil as ye, map as F, ignoreElements as be, BehaviorSubject as we, distinctUntilChanged as ve, shareReplay as $e, NEVER as K, timer as xe, finalize as J, of as Y, lastValueFrom as Q } from "rxjs";
 let S = !1;
-const v = {
+const w = {
   enable: (e) => {
     S = e;
   },
@@ -36,7 +36,7 @@ const v = {
     (n) => n.uri === t
   );
   if (r != null && r.basename.endsWith(".xhtml")) {
-    const n = i.body ?? await r.string(), s = new de(n);
+    const n = i.body ?? await r.string(), s = new le(n);
     if (Fe(s)) {
       const o = Ae(s);
       return o && delete o.attr.preserveAspectRatio, {
@@ -61,10 +61,10 @@ const v = {
     };
   }
   return i;
-}, ee = (e) => e ? e.children.map((t) => t instanceof le ? t.text : t instanceof pe ? ee(t) : "").join("").trim() : "", A = (e) => e.substring(e.lastIndexOf("/") + 1) || e, Q = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Ne = (e) => {
+}, te = (e) => e ? e.children.map((t) => t instanceof pe ? t.text : t instanceof fe ? te(t) : "").join("").trim() : "", A = (e) => e.substring(e.lastIndexOf("/") + 1) || e, Z = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Ne = (e) => {
   const t = e.lastIndexOf("/");
   return t >= 0 ? e.substring(0, t) : "";
-}, te = (e, { basePath: t, baseUrl: i }) => {
+}, ne = (e, { basePath: t, baseUrl: i }) => {
   const r = {
     contents: [],
     path: "",
@@ -72,14 +72,14 @@ const v = {
     title: ""
   };
   let n = e.childNamed("span") || e.childNamed("a");
-  r.title = ((n == null ? void 0 : n.attr.title) || (n == null ? void 0 : n.val.trim()) || ee(n)) ?? "";
+  r.title = ((n == null ? void 0 : n.attr.title) || (n == null ? void 0 : n.val.trim()) || te(n)) ?? "";
   let s = n == null ? void 0 : n.name;
-  s !== "a" && (n = e.descendantWithPath(`${s}.a`), n && (s = n.name.toLowerCase())), s === "a" && (n != null && n.attr.href) && (r.path = W(t, n.attr.href), r.href = W(i, t, n.attr.href));
+  s !== "a" && (n = e.descendantWithPath(`${s}.a`), n && (s = n.name.toLowerCase())), s === "a" && (n != null && n.attr.href) && (r.path = N(t, n.attr.href), r.href = N(i, t, n.attr.href));
   const o = e.childNamed("ol");
   if (o) {
     const a = o.childrenNamed("li");
     a && a.length > 0 && (r.contents = a.map(
-      (d) => te(d, { basePath: t, baseUrl: i })
+      (d) => ne(d, { basePath: t, baseUrl: i })
     ));
   }
   return r;
@@ -88,7 +88,7 @@ const v = {
   const r = [];
   let n;
   return e.descendantWithPath("body.nav.ol") ? n = (s = e.descendantWithPath("body.nav.ol")) == null ? void 0 : s.children : e.descendantWithPath("body.section.nav.ol") && (n = (o = e.descendantWithPath("body.section.nav.ol")) == null ? void 0 : o.children), n && n.length > 0 && n.filter((a) => a.name === "li").forEach(
-    (a) => r.push(te(a, { basePath: t, baseUrl: i }))
+    (a) => r.push(ne(a, { basePath: t, baseUrl: i }))
   ), r;
 }, Se = async (e, t, { baseUrl: i }) => {
   var n;
@@ -98,11 +98,11 @@ const v = {
       (o) => o.uri.endsWith(r.attr.href || "")
     );
     if (s) {
-      const o = new $.XmlDocument(await s.string()), a = Ne(s.uri);
+      const o = new v.XmlDocument(await s.string()), a = Ne(s.uri);
       return ke(o, { basePath: a, baseUrl: i });
     }
   }
-}, ne = (e, {
+}, re = (e, {
   opfBasePath: t,
   baseUrl: i,
   prefix: r
@@ -110,21 +110,21 @@ const v = {
   var a, d;
   const n = ((a = e == null ? void 0 : e.childNamed(`${r}content`)) == null ? void 0 : a.attr.src) || "", s = {
     title: ((d = e == null ? void 0 : e.descendantWithPath(`${r}navLabel.${r}text`)) == null ? void 0 : d.val) || "",
-    path: W(t, n),
-    href: W(i, t, n),
+    path: N(t, n),
+    href: N(i, t, n),
     contents: []
   }, o = e.childrenNamed(`${r}navPoint`);
   return o && o.length > 0 && (s.contents = o.map(
-    (l) => ne(l, { opfBasePath: t, baseUrl: i, prefix: r })
+    (l) => re(l, { opfBasePath: t, baseUrl: i, prefix: r })
   )), s;
-}, Pe = (e, { opfBasePath: t, baseUrl: i }) => {
+}, Ce = (e, { opfBasePath: t, baseUrl: i }) => {
   var o;
   const r = [], n = e.name;
   let s = "";
   return n.indexOf(":") !== -1 && (s = `${n.split(":")[0]}:`), (o = e.childNamed(`${s}navMap`)) == null || o.childrenNamed(`${s}navPoint`).forEach(
-    (a) => r.push(ne(a, { opfBasePath: t, baseUrl: i, prefix: s }))
+    (a) => r.push(re(a, { opfBasePath: t, baseUrl: i, prefix: s }))
   ), r;
-}, Ce = async ({
+}, Pe = async ({
   opfData: e,
   opfBasePath: t,
   baseUrl: i,
@@ -139,13 +139,13 @@ const v = {
         (c) => c.uri.endsWith(d)
       );
       if (l) {
-        const c = new $.XmlDocument(await l.string());
-        return Pe(c, { opfBasePath: t, baseUrl: i });
+        const c = new v.XmlDocument(await l.string());
+        return Ce(c, { opfBasePath: t, baseUrl: i });
       }
     }
   }
 }, Ie = async (e, t, { baseUrl: i }) => {
-  const { basePath: r } = N(t) || {}, n = await Ce({
+  const { basePath: r } = k(t) || {}, n = await Pe({
     opfData: e,
     opfBasePath: r,
     archive: t,
@@ -163,18 +163,18 @@ const v = {
     pageSpreadLeft: t.some((n) => n === "page-spread-left") || void 0,
     pageSpreadRight: t.some((n) => n === "page-spread-right") || void 0
   };
-}, N = (e) => {
+}, k = (e) => {
   const i = Object.values(e.files).filter((r) => !r.dir).find((r) => r.uri.endsWith(".opf"));
   return {
     data: i,
     basePath: (i == null ? void 0 : i.uri.substring(0, i.uri.lastIndexOf("/"))) || ""
   };
-}, re = async ({
+}, se = async ({
   archive: e
 }) => {
-  const { data: t, basePath: i } = N(e) || {}, r = await (t == null ? void 0 : t.string());
+  const { data: t, basePath: i } = k(e) || {}, r = await (t == null ? void 0 : t.string());
   if (!r) return [];
-  const n = new $.XmlDocument(r), s = n.childNamed("manifest"), o = n.childNamed("spine"), a = o == null ? void 0 : o.childrenNamed("itemref").map((c) => c.attr.idref), d = (s == null ? void 0 : s.childrenNamed("item").filter((c) => a.includes(c.attr.id || ""))) || [];
+  const n = new v.XmlDocument(r), s = n.childNamed("manifest"), o = n.childNamed("spine"), a = o == null ? void 0 : o.childrenNamed("itemref").map((c) => c.attr.idref), d = (s == null ? void 0 : s.childrenNamed("item").filter((c) => a.includes(c.attr.id || ""))) || [];
   return e.files.filter((c) => d.find((p) => i ? `${i}/${p.attr.href}` === c.uri : `${p.attr.href}` === c.uri));
 }, De = (e, t, i) => {
   const r = e.attr.href || "", n = i == null ? void 0 : i(e);
@@ -183,25 +183,25 @@ const v = {
     id: e.attr.id || "",
     mediaType: e.attr["media-type"]
   };
-}, se = (e, t, i) => {
+}, ie = (e, t, i) => {
   var s;
-  const r = e.childNamed("manifest"), { basePath: n } = N(t) || {};
+  const r = e.childNamed("manifest"), { basePath: n } = k(t) || {};
   return ((s = r == null ? void 0 : r.childrenNamed("item")) == null ? void 0 : s.map((o) => De(o, n, i))) || [];
 }, je = ({ archive: e, baseUrl: t }) => async (i) => {
   var X;
-  const { data: r, basePath: n } = N(e) || {};
+  const { data: r, basePath: n } = k(e) || {};
   if (!r)
     return i;
   const s = await r.string();
-  v.log("data", s);
-  const o = new $.XmlDocument(s), a = await Ie(o, e, { baseUrl: t }) || [], d = o.childNamed("metadata"), l = o.childNamed("manifest"), c = o.childNamed("spine"), p = o.childNamed("guide"), u = d == null ? void 0 : d.childNamed("dc:title"), g = (d == null ? void 0 : d.childrenNamed("meta")) || [], b = g.find(
+  w.log("data", s);
+  const o = new v.XmlDocument(s), a = await Ie(o, e, { baseUrl: t }) || [], d = o.childNamed("metadata"), l = o.childNamed("manifest"), c = o.childNamed("spine"), p = o.childNamed("guide"), u = d == null ? void 0 : d.childNamed("dc:title"), g = (d == null ? void 0 : d.childrenNamed("meta")) || [], b = g.find(
     (m) => m.attr.property === "rendition:layout"
   ), h = g.find(
     (m) => m.attr.property === "rendition:flow"
-  ), x = g.find(
+  ), $ = g.find(
     (m) => m.attr.property === "rendition:spread"
-  ), y = b == null ? void 0 : b.val, w = h == null ? void 0 : h.val, k = x == null ? void 0 : x.val, ie = (u == null ? void 0 : u.val) || ((X = e.files.find(({ dir: m }) => m)) == null ? void 0 : X.basename) || "", oe = c == null ? void 0 : c.attr["page-progression-direction"], ae = (await re({ archive: e })).reduce(
-    (m, T) => T.size + m,
+  ), y = b == null ? void 0 : b.val, x = h == null ? void 0 : h.val, T = $ == null ? void 0 : $.val, oe = (u == null ? void 0 : u.val) || ((X = e.files.find(({ dir: m }) => m)) == null ? void 0 : X.basename) || "", ae = c == null ? void 0 : c.attr["page-progression-direction"], ce = (await se({ archive: e })).reduce(
+    (m, L) => L.size + m,
     0
   );
   return {
@@ -210,30 +210,30 @@ const v = {
       toc: a
     },
     renditionLayout: y,
-    renditionFlow: w || "auto",
-    renditionSpread: k,
-    title: ie,
-    readingDirection: oe || "ltr",
+    renditionFlow: x || "auto",
+    renditionSpread: T,
+    title: oe,
+    readingDirection: ae || "ltr",
     /**
      * @see https://www.w3.org/TR/epub/#sec-itemref-elem
      */
-    spineItems: (c == null ? void 0 : c.childrenNamed("itemref").map((m, T) => {
+    spineItems: (c == null ? void 0 : c.childrenNamed("itemref").map((m, L) => {
       var H, V;
-      const f = l == null ? void 0 : l.childrenNamed("item").find((I) => I.attr.id === (m == null ? void 0 : m.attr.idref)), U = (f == null ? void 0 : f.attr.href) || "", ce = ((H = e.files.find((I) => I.uri.endsWith(U))) == null ? void 0 : H.size) || 0, B = t || (/^https?:\/\//.test(U) ? "" : "file://"), E = Re(m);
+      const f = l == null ? void 0 : l.childrenNamed("item").find((I) => I.attr.id === (m == null ? void 0 : m.attr.idref)), U = (f == null ? void 0 : f.attr.href) || "", de = ((H = e.files.find((I) => I.uri.endsWith(U))) == null ? void 0 : H.size) || 0, B = t || (/^https?:\/\//.test(U) ? "" : "file://"), E = Re(m);
       return {
         ...E,
         id: (f == null ? void 0 : f.attr.id) || "",
-        index: T,
+        index: L,
         href: (V = f == null ? void 0 : f.attr.href) != null && V.startsWith("https://") ? f == null ? void 0 : f.attr.href : n ? `${B}${n}/${f == null ? void 0 : f.attr.href}` : `${B}${f == null ? void 0 : f.attr.href}`,
         renditionLayout: E.renditionLayout ?? y,
-        progressionWeight: ce / ae,
+        progressionWeight: de / ce,
         // size: itemSize
         mediaType: f == null ? void 0 : f.attr["media-type"]
       };
     })) || [],
-    items: se(o, e, (m) => {
-      const T = m.attr.href || "";
-      return /^https?:\/\//.test(T) ? "" : t || "file://";
+    items: ie(o, e, (m) => {
+      const L = m.attr.href || "";
+      return /^https?:\/\//.test(L) ? "" : t || "file://";
     }),
     guide: p == null ? void 0 : p.childrenNamed("reference").map((m) => ({
       href: m.attr.href || "",
@@ -243,9 +243,9 @@ const v = {
   };
 }, Oe = async (e, t) => {
   var n, s, o;
-  const r = await ((n = N(e).data) == null ? void 0 : n.string());
+  const r = await ((n = k(e).data) == null ? void 0 : n.string());
   if (r) {
-    const a = new $.XmlDocument(r), d = se(a, e, () => "");
+    const a = new v.XmlDocument(r), d = ie(a, e, () => "");
     if ((s = d.find(
       (c) => t.endsWith(c.href)
     )) == null ? void 0 : s.mediaType)
@@ -285,7 +285,7 @@ const v = {
       }
     }
   };
-}, Z = [
+}, ee = [
   "div",
   "span",
   "p",
@@ -343,12 +343,12 @@ const v = {
   if (r != null && r.basename.endsWith(".xhtml")) {
     const n = i.body ?? await r.string();
     if (!new RegExp(
-      `<(${Z.join("|")})[\\s/>]`,
+      `<(${ee.join("|")})[\\s/>]`,
       "i"
     ).test(n))
       return i;
     const o = new RegExp(
-      `<(${Z.join("|")})(\\s[^>]*)?\\s*/>`,
+      `<(${ee.join("|")})(\\s[^>]*)?\\s*/>`,
       "gi"
     ), a = n.replace(
       o,
@@ -376,12 +376,12 @@ const v = {
   ];
   try {
     const s = await n.reduce(async (o, a) => await a(await o), Promise.resolve(r));
-    return v.log("Generated resource", t, s), {
+    return w.log("Generated resource", t, s), {
       ...s,
       body: s.body ?? await i.blob()
     };
   } catch (s) {
-    throw v.error(s), s;
+    throw w.error(s), s;
   }
 }, Be = ({ archive: e, baseUrl: t }) => async () => {
   var r;
@@ -421,7 +421,7 @@ const v = {
     e.files.map(async (i) => {
       var r, n;
       if (i.uri.endsWith("com.kobobooks.display-options.xml")) {
-        const o = (r = new $.XmlDocument(await i.string()).childNamed("platform")) == null ? void 0 : r.childNamed("option");
+        const o = (r = new v.XmlDocument(await i.string()).childNamed("platform")) == null ? void 0 : r.childNamed("option");
         ((n = o == null ? void 0 : o.attr) == null ? void 0 : n.name) === "fixed-layout" && o.val === "true" && (t.renditionLayout = "pre-paginated");
       }
     })
@@ -437,16 +437,16 @@ const v = {
   const t = (i = e.descendantWithPath("head")) == null ? void 0 : i.childrenNamed("meta").find((r) => r.attr.name === "viewport");
   return !!(t && t.attr.name === "viewport");
 }, _e = (e) => e.reduce(async (t, i) => {
-  if (!await t || !fe({
+  if (!await t || !ue({
     mimeType: i.encodingFormat,
     uri: i.uri
   }))
     return !1;
   const n = await i.string();
-  return n ? Ve(new $.XmlDocument(n)) : !1;
+  return n ? Ve(new v.XmlDocument(n)) : !1;
 }, Promise.resolve(!0)), qe = ({ archive: e }) => async (t) => {
   if (t.renditionLayout === "reflowable" && t.spineItems.every((r) => r.renditionLayout === "reflowable")) {
-    const r = await re({ archive: e });
+    const r = await se({ archive: e });
     if (await _e(r))
       return {
         ...t,
@@ -472,7 +472,7 @@ const v = {
   ), n = Object.values(r), s = (a, d, l, c, p) => {
     const u = a.find((h) => h.title === d), [g, ...b] = l;
     return u ? g ? [
-      ...a.filter((x) => x !== u),
+      ...a.filter(($) => $ !== u),
       {
         ...u,
         contents: [
@@ -487,7 +487,7 @@ const v = {
         ]
       }
     ] : u.path.split("/").length > p.split("/").length ? [
-      ...a.filter((x) => x !== u),
+      ...a.filter(($) => $ !== u),
       {
         ...u,
         path: p,
@@ -521,7 +521,7 @@ const v = {
       if (d.dir) return a;
       const c = d.uri.split("/").slice(0, -1), [p, ...u] = c;
       if (p) {
-        const g = W(t, encodeURI(d.uri)).replace(/\/$/, ""), b = d.uri.replace(/\/$/, "");
+        const g = N(t, encodeURI(d.uri)).replace(/\/$/, ""), b = d.uri.replace(/\/$/, "");
         return s(a, p, u, g, b);
       }
       return a;
@@ -549,7 +549,7 @@ const v = {
     }))
   }, n = await i.string();
   try {
-    const a = ((s = new $.XmlDocument(n).childNamed("Manga")) == null ? void 0 : s.val) || "unknown";
+    const a = ((s = new v.XmlDocument(n).childNamed("Manga")) == null ? void 0 : s.val) || "unknown";
     return {
       ...r,
       readingDirection: a === "YesAndRightToLeft" ? "rtl" : "ltr"
@@ -563,7 +563,7 @@ const v = {
   spineItems: t.spineItems.map((r) => {
     const n = e.files.find(
       (o) => decodeURI(r.href).endsWith(o.uri)
-    ), s = ue((n == null ? void 0 : n.encodingFormat) ?? "") ?? O((n == null ? void 0 : n.basename) ?? "");
+    ), s = me((n == null ? void 0 : n.encodingFormat) ?? "") ?? O((n == null ? void 0 : n.basename) ?? "");
     return {
       ...r,
       renditionLayout: s != null && s.startsWith("image/") ? "pre-paginated" : r.renditionLayout
@@ -578,7 +578,7 @@ const v = {
     return t;
   const r = await (await i.blob()).text();
   try {
-    const a = new $.XmlDocument(r).childNamed("platform"), d = ((s = (n = a == null ? void 0 : a.childrenNamed("option")) == null ? void 0 : n.find((l) => l.attr.name === "fixed-layout")) == null ? void 0 : s.val) || "false";
+    const a = new v.XmlDocument(r).childNamed("platform"), d = ((s = (n = a == null ? void 0 : a.childrenNamed("option")) == null ? void 0 : n.find((l) => l.attr.name === "fixed-layout")) == null ? void 0 : s.val) || "false";
     return {
       ...t,
       renditionLayout: d === "true" ? "pre-paginated" : t.renditionLayout
@@ -602,9 +602,9 @@ const v = {
   ];
   try {
     const r = Be({ archive: e, baseUrl: t })(), n = await i.reduce(async (s, o) => await o(await s), r);
-    return v.log("Generated manifest", n), n;
+    return w.log("Generated manifest", n), n;
   } catch (r) {
-    throw v.error(r), r;
+    throw w.error(r), r;
   }
 }, at = async (e, t) => {
   const i = `
@@ -708,7 +708,7 @@ const v = {
     })),
     close: () => Promise.resolve()
   };
-  return v.log("Generated archive", n), n;
+  return w.log("Generated archive", n), n;
 }, lt = async (e, { name: t } = {}) => {
   const i = await e.getFilesArray(), r = {
     close: () => e.close(),
@@ -722,7 +722,7 @@ const v = {
       string: async () => (await n.file.extract()).text()
     }))
   };
-  return v.log("Generated archive", r), r;
+  return w.log("Generated archive", r), r;
 }, pt = async (e, { orderByAlpha: t, name: i } = {}) => {
   let r = e;
   return t && (r = r.slice().sort((n, s) => z(n.name, s.name))), {
@@ -746,7 +746,7 @@ const v = {
 }, ft = ({
   enableReport: e
 } = {}) => {
-  v.enable(!!e);
+  w.enable(!!e);
 };
 class et {
   constructor(t) {
@@ -773,8 +773,8 @@ class et {
   }
   get overTTL$() {
     return this.isUnlocked$.pipe(
-      L(
-        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? G : xe(this.cleanArchiveAfter) : G
+      W(
+        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? K : xe(this.cleanArchiveAfter) : K
       )
     );
   }
@@ -790,44 +790,46 @@ const tt = ({
       if (!c || c.state.status !== "idle") return _;
       let p = !1;
       const u = (y) => {
-        var k;
-        v.debug(`Cleaning up archive with key: ${y}`);
-        const w = s[y];
-        delete s[y], p || ((k = w == null ? void 0 : w.state.archive) == null || k.close(), p = !0);
+        var T;
+        w.debug(`Cleaning up archive with key: ${y}`);
+        const x = s[y];
+        delete s[y], p || ((T = x == null ? void 0 : x.state.archive) == null || T.close(), p = !0);
       };
       c.update({
         status: "loading"
       });
       const g = c.locks$, b = c.isUnlocked$, h = g.pipe(
-        me(),
-        D(([y, w]) => w > y),
-        he(!0)
+        he(),
+        D(([y, x]) => x > y),
+        ge(!0)
       );
-      return P(e(l)).pipe(
+      return C(e(l)).pipe(
         j((y) => {
           c.update({
             archive: y,
             status: "success"
           });
         }),
-        C((y) => (u(l), c.update({
+        P((y) => (u(l), c.update({
           status: "error",
           error: y
         }), _)),
-        L(() => {
+        W(() => {
           const y = h.pipe(
-            L(() => n),
-            L(() => b),
-            D((w) => w)
+            W(() => n),
+            W(() => b),
+            D((T) => T)
+          );
+          return q(y, c.overTTL$).pipe(
+            G(),
+            j(() => {
+              u(l);
+            })
           );
-          return q(y, c.overTTL$);
-        }),
-        j(() => {
-          u(l);
         })
       );
     }),
-    ge(r)
+    ye(r)
   ), a = (l) => {
     let c = !1;
     const p = s[l] ?? new et(t);
@@ -848,12 +850,12 @@ const tt = ({
         if (h)
           throw h;
       }),
-      ye()
+      be()
     );
     return q(g, b).pipe(
-      be(),
+      G(),
       F((h) => ({ archive: h, release: u })),
-      C((h) => {
+      P((h) => {
         throw u(), h;
       })
     );
@@ -863,7 +865,7 @@ const tt = ({
   return o.subscribe(), {
     access: a,
     purge: d,
-    archives: s
+    _archives: s
   };
 };
 class nt {
@@ -887,24 +889,24 @@ class nt {
   }
   fetchManifest({ key: t, baseUrl: i }) {
     const r = this.accessArchive(t).pipe(
-      M(({ archive: n, release: s }) => P(
+      M(({ archive: n, release: s }) => C(
         Ze(n, { baseUrl: i })
       ).pipe(
-        L(
-          (a) => P(this.onManifestSuccess({ manifest: a, archive: n }))
+        W(
+          (a) => C(this.onManifestSuccess({ manifest: a, archive: n }))
         ),
         F(
           (a) => new Response(JSON.stringify(a), {
             status: 200
           })
         ),
-        K(() => {
+        J(() => {
           s();
         })
       )),
-      C((n) => J(this.onError(n)))
+      P((n) => Y(this.onError(n)))
     );
-    return Y(r);
+    return Q(r);
   }
   fetchResource({
     key: t,
@@ -913,7 +915,7 @@ class nt {
     const r = this.accessArchive(t).pipe(
       M(({ archive: n, release: s }) => {
         const o = i.replaceAll("file://", "");
-        return P(
+        return C(
           Ue(n, o)
         ).pipe(
           F(
@@ -926,14 +928,14 @@ class nt {
               }
             })
           ),
-          K(() => {
+          J(() => {
             s();
           })
         );
       }),
-      C((n) => J(this.onError(n)))
+      P((n) => Y(this.onError(n)))
     );
-    return Y(r);
+    return Q(r);
   }
 }
 class ut extends nt {
@@ -947,10 +949,10 @@ class ut extends nt {
     try {
       const i = this.getUriInfo(t);
       if (!i) return;
-      const r = Q(i.baseUrl), n = t.request.url.substring(
+      const r = Z(i.baseUrl), n = t.request.url.substring(
         r.length + 1
       ), [s = ""] = n.split("/"), o = decodeURIComponent(
-        Q(n.substring(s.length + 1))
+        Z(n.substring(s.length + 1))
       );
       n.endsWith("/manifest") ? t.respondWith(
         this.fetchManifest({ key: s, baseUrl: `${r}/${s}/` })
@@ -971,6 +973,6 @@ export {
   at as createArchiveFromUrls,
   Ze as generateManifestFromArchive,
   Ue as generateResourceFromArchive,
-  N as getArchiveOpfInfo
+  k as getArchiveOpfInfo
 };
 //# sourceMappingURL=index.js.map