@prose-reader/streamer 1.81.0 → 1.83.0

package/dist/index.js

@@ -1,32 +1,32 @@
-import { urlJoin as N, PROSE_READER_RESOURCE_ERROR_INJECTED_META_NAME as se, isXmlBasedMimeType as ie, detectMimeTypeFromName as z } from "@prose-reader/shared";
-import y, { XmlDocument as oe } from "xmldoc";
-import { Subject as M, mergeMap as W, EMPTY as ce, from as A, map as v, catchError as F, NEVER as V, shareReplay as de, switchMap as B, timer as le, tap as X, merge as _, takeUntil as me, BehaviorSubject as pe, filter as fe, ignoreElements as ue, first as he, finalize as H, of as G, lastValueFrom as J } from "rxjs";
-let $ = !1;
+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";
+let x = !1;
 const g = {
   enable: (e) => {
-    $ = e;
+    x = e;
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   log: (...e) => {
-    $ && console.log("[prose-reader-streamer]", ...e);
+    x && console.log("[prose-reader-streamer]", ...e);
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   warn: (...e) => {
-    $ && console.warn("[prose-reader-streamer]", ...e);
+    x && console.warn("[prose-reader-streamer]", ...e);
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   error: (...e) => {
     console.error(...e);
   },
   time: (e) => {
-    $ && console.time(`[prose-reader-streamer] [metric] ${e}`);
+    x && console.time(`[prose-reader-streamer] [metric] ${e}`);
   },
   timeEnd: (e) => {
-    $ && console.timeEnd(`[prose-reader-streamer] [metric] ${e}`);
+    x && console.timeEnd(`[prose-reader-streamer] [metric] ${e}`);
   },
   metric: (e, n = 1 / 0) => {
     const s = typeof e == "number" ? e : e.duration;
-    $ && (e.duration <= n ? console.log(
+    x && (e.duration <= n ? console.log(
       "[prose-reader-streamer] [metric] ",
       `${e.name} took ${s}ms`
     ) : console.warn(
@@ -45,23 +45,23 @@ const g = {
     const i = performance.now();
     return g.metric({ name: e, duration: i - t }, n), a;
   }
-}, ge = (e) => {
+}, be = (e) => {
   var s;
   const n = (s = e.descendantWithPath("head")) == null ? void 0 : s.childrenNamed("meta").find((r) => r.attr.name === "calibre:cover");
   return !!(n && n.attr.name === "calibre:cover");
-}, be = (e) => {
+}, ye = (e) => {
   var n, s, r;
   return (r = (s = (n = e.descendantWithPath("body")) == null ? void 0 : n.descendantWithPath("div")) == null ? void 0 : s.childrenNamed("svg")) == null ? void 0 : r.find(
     (t) => t.attr.width === "100%" && t.attr.preserveAspectRatio === "none"
   );
-}, ye = ({ archive: e, resourcePath: n }) => async (s) => {
+}, we = ({ archive: e, resourcePath: n }) => async (s) => {
   const r = Object.values(e.files).find(
     (t) => t.uri === n
   );
   if (r != null && r.basename.endsWith(".xhtml")) {
-    const t = s.body ?? await r.string(), a = new oe(t);
-    if (ge(a)) {
-      const i = be(a);
+    const t = s.body ?? await r.string(), a = new ce(t);
+    if (be(a)) {
+      const i = ye(a);
       return i && delete i.attr.preserveAspectRatio, {
         ...s,
         body: a == null ? void 0 : a.toString()
@@ -69,7 +69,7 @@ const g = {
     }
   }
   return s;
-}, we = ({ archive: e, resourcePath: n }) => async (s) => ye({ archive: e, resourcePath: n })(s), ve = ({ archive: e, resourcePath: n }) => async (s) => {
+}, ve = ({ archive: e, resourcePath: n }) => async (s) => we({ archive: e, resourcePath: n })(s), $e = ({ archive: e, resourcePath: n }) => async (s) => {
   const r = Object.values(e.files).find(
     (t) => t.uri === n
   );
@@ -84,13 +84,13 @@ const g = {
     };
   }
   return s;
-}, S = (e) => {
+}, T = (e) => {
   const s = Object.values(e.files).filter((r) => !r.dir).find((r) => r.uri.endsWith(".opf"));
   return {
     data: s,
     basePath: (s == null ? void 0 : s.uri.substring(0, s.uri.lastIndexOf("/"))) || ""
   };
-}, q = (e, { opfBasePath: n, baseUrl: s }) => {
+}, Y = (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) => q(c, { opfBasePath: n, baseUrl: s })
+      (c) => Y(c, { opfBasePath: n, baseUrl: s })
     ));
   }
   return r;
@@ -114,9 +114,9 @@ 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(q(o, { opfBasePath: n, baseUrl: s }))
+    (o) => r.push(Y(o, { opfBasePath: n, baseUrl: s }))
   ), r;
-}, $e = async (e, n, { opfBasePath: s, baseUrl: r }) => {
+}, Fe = async (e, n, { opfBasePath: s, baseUrl: r }) => {
   var a;
   const t = (a = e.childNamed("manifest")) == null ? void 0 : a.childrenNamed("item").find((i) => i.attr.properties === "nav");
   if (t) {
@@ -128,7 +128,7 @@ const g = {
       return xe(o, { opfBasePath: s, baseUrl: r });
     }
   }
-}, Y = (e, {
+}, K = (e, {
   opfBasePath: n,
   baseUrl: s,
   prefix: r
@@ -141,16 +141,16 @@ const g = {
     contents: []
   }, i = e.childrenNamed(`${r}navPoint`);
   return i && i.length > 0 && (a.contents = i.map(
-    (l) => Y(l, { opfBasePath: n, baseUrl: s, prefix: r })
+    (l) => K(l, { opfBasePath: n, baseUrl: s, prefix: r })
   )), a;
-}, Fe = (e, { opfBasePath: n, baseUrl: s }) => {
+}, 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(Y(o, { opfBasePath: n, baseUrl: s, prefix: a }))
+    (o) => r.push(K(o, { opfBasePath: n, baseUrl: s, prefix: a }))
   ), r;
-}, Ne = async ({
+}, Te = async ({
   opfData: e,
   opfBasePath: n,
   baseUrl: s,
@@ -166,19 +166,19 @@ const g = {
       );
       if (l) {
         const d = new y.XmlDocument(await l.string());
-        return Fe(d, { opfBasePath: n, baseUrl: s });
+        return Ne(d, { opfBasePath: n, baseUrl: s });
       }
     }
   }
 }, Se = async (e, n, { baseUrl: s }) => {
-  const { basePath: r } = S(n) || {}, t = await Ne({
+  const { basePath: r } = T(n) || {}, t = await Te({
     opfData: e,
     opfBasePath: r,
     archive: n,
     baseUrl: s
   });
-  return t || await $e(e, n, { opfBasePath: r, baseUrl: s });
-}, Te = async (e) => {
+  return t || await Fe(e, n, { opfBasePath: r, baseUrl: s });
+}, ke = async (e) => {
   const n = {
     renditionLayout: void 0
   };
@@ -191,14 +191,14 @@ const g = {
       }
     })
   ), n;
-}, K = async ({
+}, E = async ({
   archive: e
 }) => {
-  const { data: n, basePath: s } = S(e) || {}, r = await (n == null ? void 0 : n.string());
+  const { data: n, basePath: s } = T(e) || {}, r = await (n == null ? void 0 : n.string());
   if (!r) return [];
   const t = new y.XmlDocument(r), a = t.childNamed("manifest"), i = t.childNamed("spine"), o = i == null ? void 0 : i.childrenNamed("itemref").map((d) => d.attr.idref), c = (a == null ? void 0 : a.childrenNamed("item").filter((d) => o.includes(d.attr.id || ""))) || [];
   return e.files.filter((d) => c.find((u) => s ? `${s}/${u.attr.href}` === d.uri : `${u.attr.href}` === d.uri));
-}, E = (e) => {
+}, Q = (e) => {
   var s;
   const n = e.childNamed("manifest");
   return ((s = n == null ? void 0 : n.childrenNamed("item")) == null ? void 0 : s.map((r) => ({
@@ -206,20 +206,20 @@ const g = {
     id: r.attr.id || "",
     mediaType: r.attr["media-type"]
   }))) || [];
-}, ke = ({ archive: e, baseUrl: n }) => async (s) => {
+}, Re = ({ archive: e, baseUrl: n }) => async (s) => {
   var P;
-  const { data: r, basePath: t } = S(e) || {}, a = await Te(e);
+  const { data: r, basePath: t } = T(e) || {}, a = await ke(e);
   if (!r)
     return s;
   const i = await r.string();
   g.log(i, a);
-  const o = new y.XmlDocument(i), c = await Se(o, e, { baseUrl: n }) || [], l = o.childNamed("metadata"), d = o.childNamed("manifest"), u = o.childNamed("spine"), f = o.childNamed("guide"), w = l == null ? void 0 : l.childNamed("dc:title"), h = (l == null ? void 0 : l.childrenNamed("meta")) || [], T = h.find(
+  const o = new y.XmlDocument(i), c = await Se(o, e, { baseUrl: n }) || [], l = o.childNamed("metadata"), d = o.childNamed("manifest"), u = o.childNamed("spine"), f = o.childNamed("guide"), w = l == null ? void 0 : l.childNamed("dc:title"), h = (l == null ? void 0 : l.childrenNamed("meta")) || [], S = h.find(
     (p) => p.attr.property === "rendition:layout"
   ), k = h.find(
     (p) => p.attr.property === "rendition:flow"
   ), R = h.find(
     (p) => p.attr.property === "rendition:spread"
-  ), C = T == null ? void 0 : T.val, Q = k == null ? void 0 : k.val, Z = R == null ? void 0 : R.val, ee = (w == null ? void 0 : w.val) || ((P = e.files.find(({ dir: p }) => p)) == null ? void 0 : P.basename) || "", te = u == null ? void 0 : u.attr["page-progression-direction"], ne = (await K({ 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 E({ archive: e })).reduce(
     (p, m) => m.size + p,
     0
   );
@@ -229,43 +229,43 @@ const g = {
       toc: c
     },
     renditionLayout: C || a.renditionLayout || "reflowable",
-    renditionFlow: Q || "auto",
-    renditionSpread: Z,
-    title: ee,
-    readingDirection: te || "ltr",
+    renditionFlow: Z || "auto",
+    renditionSpread: ee,
+    title: te,
+    readingDirection: ne || "ltr",
     spineItems: (u == null ? void 0 : u.childrenNamed("itemref").map((p) => {
-      var O, j, U;
-      const m = d == null ? void 0 : d.childrenNamed("item").find((b) => b.attr.id === (p == null ? void 0 : p.attr.idref)), re = (m == null ? void 0 : m.attr.href) || "", L = ((O = p == null ? void 0 : p.attr.properties) == null ? void 0 : O.split(" ")) || [], ae = ((j = e.files.find((b) => b.uri.endsWith(re))) == null ? void 0 : j.size) || 0, D = n ?? "";
+      var O, j, z;
+      const m = d == null ? void 0 : d.childrenNamed("item").find((b) => b.attr.id === (p == null ? void 0 : p.attr.idref)), ae = (m == null ? void 0 : m.attr.href) || "", W = ((O = p == null ? void 0 : p.attr.properties) == null ? void 0 : O.split(" ")) || [], se = ((j = e.files.find((b) => b.uri.endsWith(ae))) == null ? void 0 : j.size) || 0, D = n ?? "";
       return {
         id: (m == null ? void 0 : m.attr.id) || "",
-        href: (U = m == null ? void 0 : m.attr.href) != null && U.startsWith("https://") ? m == null ? void 0 : m.attr.href : t ? `${D}${t}/${m == null ? void 0 : m.attr.href}` : `${D}${m == null ? void 0 : m.attr.href}`,
+        href: (z = m == null ? void 0 : m.attr.href) != null && z.startsWith("https://") ? m == null ? void 0 : m.attr.href : t ? `${D}${t}/${m == null ? void 0 : m.attr.href}` : `${D}${m == null ? void 0 : m.attr.href}`,
         renditionLayout: C || "reflowable",
-        ...L.find(
+        ...W.find(
           (b) => b === "rendition:layout-reflowable"
         ) && {
           renditionLayout: "reflowable"
         },
-        progressionWeight: ae / ne,
-        pageSpreadLeft: L.some((b) => b === "page-spread-left") || void 0,
-        pageSpreadRight: L.some((b) => b === "page-spread-right") || void 0,
+        progressionWeight: se / re,
+        pageSpreadLeft: W.some((b) => b === "page-spread-left") || void 0,
+        pageSpreadRight: W.some((b) => b === "page-spread-right") || void 0,
         // size: itemSize
         mediaType: m == null ? void 0 : m.attr["media-type"]
       };
     })) || [],
-    items: E(o),
+    items: Q(o),
     guide: f == null ? void 0 : f.childrenNamed("reference").map((p) => ({
       href: p.attr.href || "",
       title: p.attr.title || "",
       type: p.attr.type
     }))
   };
-}, Re = async (e, n) => {
+}, We = async (e, n) => {
   var t, a;
-  const r = await ((t = S(e).data) == null ? void 0 : t.string());
+  const r = await ((t = T(e).data) == null ? void 0 : t.string());
   if (r) {
     const i = new y.XmlDocument(r);
     return {
-      mediaType: (a = E(i).find((c) => n.endsWith(c.href))) == null ? void 0 : a.mediaType
+      mediaType: (a = Q(i).find((c) => n.endsWith(c.href))) == null ? void 0 : a.mediaType
     };
   }
   return {
@@ -282,12 +282,12 @@ const g = {
     return "video/mp4";
   if (e.endsWith(".svg"))
     return "image/svg+xml";
-}, We = ({ archive: e, resourcePath: n }) => async (s) => {
+}, Ae = ({ archive: e, resourcePath: n }) => async (s) => {
   const r = Object.values(e.files).find(
     (a) => a.uri === n
   );
   if (!r) return s;
-  const t = await Re(e, n);
+  const t = await We(e, n);
   return {
     ...s,
     params: {
@@ -303,7 +303,7 @@ const g = {
       }
     }
   };
-}, Ae = async (e, n) => {
+}, Ie = async (e, n) => {
   const s = Object.values(e.files).find(
     (a) => a.uri === n
   );
@@ -314,9 +314,9 @@ const g = {
       status: 200
     }
   }, t = [
-    We({ archive: e, resourcePath: n }),
-    ve({ archive: e, resourcePath: n }),
-    we({ archive: e, resourcePath: n })
+    Ae({ archive: e, resourcePath: n }),
+    $e({ archive: e, resourcePath: n }),
+    ve({ archive: e, resourcePath: n })
   ];
   try {
     const a = await t.reduce(async (i, o) => await o(await i), Promise.resolve(r));
@@ -332,7 +332,7 @@ const g = {
     <!DOCTYPE html>
     <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
       <head>
-        <meta name="${se}" content="${String(e)}" />
+        <meta name="${ie}" content="${String(e)}" />
       </head>
       <body>
         <pre>${String(e)}</pre>
@@ -345,7 +345,7 @@ const g = {
       "Content-Type": "text/html;charset=UTF-8"
     }
   }
-}), Ie = ({ archive: e, baseUrl: n }) => async () => {
+}), Ce = ({ archive: e, baseUrl: n }) => async () => {
   var r;
   const s = Object.values(e.files).filter((t) => !t.dir);
   return {
@@ -371,7 +371,7 @@ const g = {
       href: `${n}${t.uri}`
     }))
   };
-}, Ce = ({ archive: e }) => async (n) => {
+}, Pe = ({ archive: e }) => async (n) => {
   var a;
   const s = e.files.find(
     (i) => i.basename.toLowerCase() === "comicinfo.xml"
@@ -395,22 +395,22 @@ const g = {
     return console.error(`Unable to parse comicinfo.xml for content
 `, t), console.error(i), r;
   }
-}, Pe = (e) => {
+}, De = (e) => {
   var s;
   const n = (s = e.descendantWithPath("head")) == null ? void 0 : s.childrenNamed("meta").find((r) => r.attr.name === "viewport");
   return !!(n && n.attr.name === "viewport");
-}, De = (e) => e.reduce(async (n, s) => {
-  if (!await n || !ie({
+}, Oe = (e) => e.reduce(async (n, s) => {
+  if (!await n || !oe({
     mimeType: s.encodingFormat,
     uri: s.uri
   }))
     return !1;
   const t = await s.string();
-  return t ? Pe(new y.XmlDocument(t)) : !1;
-}, Promise.resolve(!0)), Oe = ({ archive: e }) => async (n) => {
+  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 K({ archive: e });
-    if (await De(r))
+    const r = await E({ archive: e });
+    if (await Oe(r))
       return {
         ...n,
         spineItems: n.spineItems.map((a) => ({
@@ -428,7 +428,7 @@ const g = {
     if (s[a] !== r[a])
       return (t = s[a]) != null && t.match(/\d/) ? +(s[a] || "") - +(r[a] || "") : (s[a] || "").localeCompare(r[a] || "");
   return 1;
-}, je = ({ archive: e, baseUrl: n }) => async (s) => {
+}, ze = ({ archive: e, baseUrl: n }) => async (s) => {
   if (s.nav) return s;
   const r = [...e.files].sort(
     (a, i) => I(a.uri, i.uri)
@@ -455,7 +455,7 @@ const g = {
       toc: t
     }
   };
-}, Ue = {
+}, Me = {
   filename: "",
   items: [],
   nav: {
@@ -466,21 +466,21 @@ const g = {
   renditionSpread: "auto",
   spineItems: [],
   title: ""
-}, ze = async (e, { baseUrl: n = "" } = {}) => {
+}, Ve = async (e, { baseUrl: n = "" } = {}) => {
   const s = [
-    Ie({ archive: e, baseUrl: n }),
-    ke({ archive: e, baseUrl: n }),
-    Oe({ archive: e, baseUrl: n }),
     Ce({ archive: e, baseUrl: n }),
-    je({ archive: e, baseUrl: n })
+    Re({ archive: e, baseUrl: n }),
+    je({ archive: e, baseUrl: n }),
+    Pe({ archive: e, baseUrl: n }),
+    ze({ archive: e, baseUrl: n })
   ];
   try {
-    const r = await s.reduce(async (t, a) => await a(await t), Promise.resolve(Ue));
+    const r = await s.reduce(async (t, a) => await a(await t), Promise.resolve(Me));
     return g.log("Generated manifest", r), r;
   } catch (r) {
     throw g.error(r), r;
   }
-}, x = (e) => e.substring(e.lastIndexOf("/") + 1) || e, Ye = async (e, n) => {
+}, $ = (e) => e.substring(e.lastIndexOf("/") + 1) || e, q = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Ye = 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>
@@ -489,19 +489,19 @@ const g = {
       </metadata>
       <manifest>
         ${e.map(
-    (a) => `<item id="${x(a)}" href="${a}" media-type="${z(a)}"/>`
+    (a) => `<item id="${$(a)}" href="${a}" media-type="${M(a)}"/>`
   ).join(`
 `)}
       </manifest>
       <spine>
-        ${e.map((a) => `<itemref idref="${x(a)}" />`).join(`
+        ${e.map((a) => `<itemref idref="${$(a)}" />`).join(`
 `)}
       </spine>
     </package>
   `, r = e.map((a) => ({
     dir: !1,
-    basename: x(a),
-    encodingFormat: z(a),
+    basename: $(a),
+    encodingFormat: M(a),
     uri: a,
     size: 100 / e.length,
     base64: async () => "",
@@ -521,7 +521,7 @@ const g = {
     }, ...r],
     close: () => Promise.resolve()
   };
-}, Me = async (e) => new Promise((n) => {
+}, Ue = async (e) => new Promise((n) => {
   const s = new FileReader();
   s.readAsDataURL(e), s.onloadend = function() {
     const r = s.result;
@@ -548,11 +548,11 @@ const g = {
       </package>
     `;
   return {
-    filename: "comicinfo.xml",
+    filename: "content.txt",
     files: [
       {
         dir: !1,
-        basename: x("generated.opf"),
+        basename: $("generated.opf"),
         uri: "generated.opf",
         blob: async () => new Blob([r]),
         string: async () => r,
@@ -561,11 +561,11 @@ const g = {
       },
       {
         dir: !1,
-        basename: x("comicinfo.xml"),
-        uri: "comicinfo.xml",
+        basename: $("p01.txt"),
+        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) : Me(e),
+        base64: async () => typeof e == "string" ? btoa(e) : Ue(e),
         size: typeof e == "string" ? e.length : e.size,
         encodingFormat: n
       }
@@ -579,7 +579,7 @@ const g = {
     filename: s || "",
     files: r.map((a) => ({
       dir: a.dir,
-      basename: x(a.name),
+      basename: $(a.name),
       uri: a.name,
       blob: () => a.async("blob"),
       string: () => a.async("string"),
@@ -616,7 +616,7 @@ const g = {
     filename: s || "",
     files: r.map((t) => ({
       dir: t.isDir,
-      basename: x(t.name),
+      basename: $(t.name),
       uri: t.name,
       blob: async () => new Blob([await t.data()]),
       string: async () => {
@@ -635,14 +635,14 @@ const g = {
   enableReport: e
 } = {}) => {
   g.enable(!!e);
-}, Ve = ({
+}, Xe = ({
   getArchive: e,
-  cleanAfter: n
+  cleanArchiveAfter: n
 }) => {
-  const s = new M(), r = new M(), t = {}, a = s.pipe(
-    W((c) => {
+  const s = new V(), r = new V(), t = {}, a = s.pipe(
+    L((c) => {
       const l = t[c];
-      return !l || l.getValue().status !== "idle" ? ce : (l.next({
+      return !l || l.getValue().status !== "idle" ? de : (l.next({
         ...l.getValue(),
         status: "loading"
       }), A(e(c)).pipe(
@@ -660,19 +660,26 @@ const g = {
         })
       ));
     }),
-    F((c) => (console.error(c), V)),
-    de()
+    F((c) => (console.error(c), U)),
+    le()
   ), i = a.pipe(
-    B(({ archiveEntry: c, key: l }) => c.pipe(v(({ locks: f }) => f)).pipe(v((f) => f <= 0)).pipe(
-      B((f) => f ? le(n) : V),
-      X(() => {
+    X(({ archiveEntry: c, key: l }) => c.pipe(v(({ locks: f }) => f)).pipe(v((f) => f <= 0)).pipe(
+      X(
+        (f) => f ? me(n) : U
+      ),
+      B(() => {
         var f;
         delete t[l], (f = c.getValue().archive) == null || f.close();
       })
     ))
   ), o = (c) => {
     let l = !1;
-    const d = t[c] ?? new pe({ archive: void 0, status: "idle", locks: 0, error: void 0 });
+    const d = t[c] ?? new fe({
+      archive: void 0,
+      status: "idle",
+      locks: 0,
+      error: void 0
+    });
     t[c] = d, d.next({
       ...d.getValue(),
       locks: d.getValue().locks + 1
@@ -686,34 +693,34 @@ const g = {
     s.next(c);
     const f = d.pipe(
       v(({ archive: h }) => h),
-      fe((h) => !!h)
+      ue((h) => !!h)
     ), w = d.pipe(
-      X(({ error: h }) => {
+      B(({ error: h }) => {
         if (h)
           throw h;
       }),
-      ue()
+      he()
     );
     return _(f, w).pipe(
-      he(),
+      ge(),
       v((h) => ({ archive: h, release: u })),
       F((h) => {
         throw u(), h;
       })
     );
   };
-  return _(i, a).pipe(me(r)).subscribe(), {
+  return _(i, a).pipe(pe(r)).subscribe(), {
     access: o
   };
 };
 class Be {
   constructor(n) {
-    this.epubLoader = Ve(n);
+    this.epubLoader = Xe(n);
   }
   fetchManifest({ key: n, baseUrl: s }) {
     const r = this.epubLoader.access(n).pipe(
-      W(({ archive: t, release: a }) => A(
-        ze(t, { baseUrl: s })
+      L(({ archive: t, release: a }) => A(
+        Ve(t, { baseUrl: s })
       ).pipe(
         v(
           (o) => new Response(JSON.stringify(o), {
@@ -733,8 +740,8 @@ class Be {
     resourcePath: s
   }) {
     const r = this.epubLoader.access(n).pipe(
-      W(({ archive: t, release: a }) => A(
-        Ae(t, s)
+      L(({ archive: t, release: a }) => A(
+        Ie(t, s)
       ).pipe(
         v((o) => new Response(o.body, { status: 200 })),
         H(() => {
@@ -746,31 +753,25 @@ class Be {
     return J(r);
   }
 }
-const Xe = (e) => e.indexOf("/") !== -1 ? e.substring(0, e.indexOf("/")) : e;
 class tt extends Be {
   constructor({
-    getStreamerUri: n,
+    getUriInfo: n,
     ...s
   }) {
-    super(s), this.getStreamerUri = n, this.fetchEventListener = this.fetchEventListener.bind(this);
+    super(s), this.getUriInfo = n, this.fetchEventListener = this.fetchEventListener.bind(this);
   }
   fetchEventListener(n) {
     try {
-      const s = new URL(n.request.url), r = this.getStreamerUri(n), t = `/${r}`;
-      if (!r) return;
-      const a = Xe(r), o = `${s.href.substring(
-        0,
-        s.href.length - t.length
-      )}/${a}/`;
-      if (r.endsWith("/manifest"))
-        n.respondWith(this.fetchManifest({ key: a, baseUrl: o }));
-      else {
-        const c = r.substring(
-          a.length + 1,
-          r.length
-        );
-        n.respondWith(this.fetchResource({ key: a, resourcePath: c }));
-      }
+      const s = this.getUriInfo(n);
+      if (!s) return;
+      const r = q(s.baseUrl), t = n.request.url.substring(
+        r.length + 1
+      ), [a = ""] = t.split("/"), i = q(
+        t.substring(a.length + 1)
+      );
+      t.endsWith("/manifest") ? n.respondWith(
+        this.fetchManifest({ key: a, baseUrl: `${r}/${a}/` })
+      ) : n.respondWith(this.fetchResource({ key: a, resourcePath: i }));
     } catch (s) {
       n.respondWith(new Response(String(s), { status: 500 }));
     }
@@ -785,9 +786,9 @@ export {
   Qe as createArchiveFromLibArchive,
   Ke as createArchiveFromText,
   Ye as createArchiveFromUrls,
-  ze as generateManifestFromArchive,
-  Ae as generateResourceFromArchive,
+  Ve as generateManifestFromArchive,
+  Ie as generateResourceFromArchive,
   qe as generateResourceFromError,
-  S as getArchiveOpfInfo
+  T as getArchiveOpfInfo
 };
 //# sourceMappingURL=index.js.map