@prose-reader/streamer 1.207.0 → 1.209.0

package/dist/index.js

@@ -1,176 +1,153 @@
-import $, { XmlDocument as de, XmlTextNode as le, XmlElement as pe } from "xmldoc";
-import { urlJoin as k, 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 j, startWith as he, from as P, tap as D, catchError as I, switchMap as W, 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";
-let T = !1;
+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 w = {
   enable: (e) => {
-    T = e;
+    S = e;
   },
   // biome-ignore lint/suspicious/noExplicitAny: <explanation>
   log: (...e) => {
-    T && console.log("[prose-reader-streamer]", ...e);
+    S && console.log("[prose-reader-streamer]", ...e);
+  },
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  debug: (...e) => {
+    S && console.debug("[prose-reader-streamer]", ...e);
   },
   // biome-ignore lint/suspicious/noExplicitAny: <explanation>
   warn: (...e) => {
-    T && console.warn("[prose-reader-streamer]", ...e);
+    S && console.warn("[prose-reader-streamer]", ...e);
   },
   // biome-ignore lint/suspicious/noExplicitAny: <explanation>
   error: (...e) => {
     console.error(...e);
-  },
-  time: (e) => {
-    T && console.time(`[prose-reader-streamer] [metric] ${e}`);
-  },
-  timeEnd: (e) => {
-    T && console.timeEnd(`[prose-reader-streamer] [metric] ${e}`);
-  },
-  metric: (e, t = 1 / 0) => {
-    const i = typeof e == "number" ? e : e.duration;
-    T && (e.duration <= t ? console.log(
-      "[prose-reader-streamer] [metric] ",
-      `${e.name} took ${i}ms`
-    ) : console.warn(
-      "[prose-reader-streamer] [metric] ",
-      `${e.name} took ${e.duration}ms which is above the ${t}ms target for this function`
-    ));
-  },
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-  measurePerformance: (e, t, i) => (...s) => {
-    const n = performance.now(), r = i(...s);
-    if (r != null && r.then)
-      return r.then((a) => {
-        const c = performance.now();
-        return w.metric({ name: e, duration: c - n }, t), a;
-      });
-    const o = performance.now();
-    return w.metric({ name: e, duration: o - n }, t), r;
   }
 }, Fe = (e) => {
   var i;
-  const t = (i = e.descendantWithPath("head")) == null ? void 0 : i.childrenNamed("meta").find((s) => s.attr.name === "calibre:cover");
+  const t = (i = e.descendantWithPath("head")) == null ? void 0 : i.childrenNamed("meta").find((r) => r.attr.name === "calibre:cover");
   return !!(t && t.attr.name === "calibre:cover");
 }, Ae = (e) => {
-  var t, i, s;
-  return (s = (i = (t = e.descendantWithPath("body")) == null ? void 0 : t.descendantWithPath("div")) == null ? void 0 : i.childrenNamed("svg")) == null ? void 0 : s.find(
+  var t, i, r;
+  return (r = (i = (t = e.descendantWithPath("body")) == null ? void 0 : t.descendantWithPath("div")) == null ? void 0 : i.childrenNamed("svg")) == null ? void 0 : r.find(
     (n) => n.attr.width === "100%" && n.attr.preserveAspectRatio === "none"
   );
 }, Te = ({ archive: e, resourcePath: t }) => async (i) => {
-  const s = Object.values(e.files).find(
+  const r = Object.values(e.files).find(
     (n) => n.uri === t
   );
-  if (s != null && s.basename.endsWith(".xhtml")) {
-    const n = i.body ?? await s.string(), r = new de(n);
-    if (Fe(r)) {
-      const o = Ae(r);
+  if (r != null && r.basename.endsWith(".xhtml")) {
+    const n = i.body ?? await r.string(), s = new le(n);
+    if (Fe(s)) {
+      const o = Ae(s);
       return o && delete o.attr.preserveAspectRatio, {
         ...i,
-        body: r == null ? void 0 : r.toString()
+        body: s == null ? void 0 : s.toString()
       };
     }
   }
   return i;
 }, Le = ({ archive: e, resourcePath: t }) => async (i) => Te({ archive: e, resourcePath: t })(i), We = ({ archive: e, resourcePath: t }) => async (i) => {
-  const s = Object.values(e.files).find(
+  const r = Object.values(e.files).find(
     (n) => n.uri === t
   );
-  if (s != null && s.basename.endsWith(".css")) {
-    const r = (i.body ?? await s.string()).replaceAll(
+  if (r != null && r.basename.endsWith(".css")) {
+    const s = (i.body ?? await r.string()).replaceAll(
       "-webkit-writing-mode",
       "writing-mode"
     );
     return {
       ...i,
-      body: r
+      body: s
     };
   }
   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, ke = (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 }) => {
-  const s = {
+}, ne = (e, { basePath: t, baseUrl: i }) => {
+  const r = {
     contents: [],
     path: "",
     href: "",
     title: ""
   };
   let n = e.childNamed("span") || e.childNamed("a");
-  s.title = ((n == null ? void 0 : n.attr.title) || (n == null ? void 0 : n.val.trim()) || ee(n)) ?? "";
-  let r = n == null ? void 0 : n.name;
-  r !== "a" && (n = e.descendantWithPath(`${r}.a`), n && (r = n.name.toLowerCase())), r === "a" && (n != null && n.attr.href) && (s.path = k(t, n.attr.href), s.href = k(i, t, n.attr.href));
+  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 = 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 && (s.contents = a.map(
-      (c) => te(c, { basePath: t, baseUrl: i })
+    a && a.length > 0 && (r.contents = a.map(
+      (d) => ne(d, { basePath: t, baseUrl: i })
     ));
   }
-  return s;
-}, Ne = (e, { basePath: t, baseUrl: i }) => {
-  var r, o;
-  const s = [];
+  return r;
+}, ke = (e, { basePath: t, baseUrl: i }) => {
+  var s, o;
+  const r = [];
   let n;
-  return e.descendantWithPath("body.nav.ol") ? n = (r = e.descendantWithPath("body.nav.ol")) == null ? void 0 : r.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) => s.push(te(a, { basePath: t, baseUrl: i }))
-  ), s;
+  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(ne(a, { basePath: t, baseUrl: i }))
+  ), r;
 }, Se = async (e, t, { baseUrl: i }) => {
   var n;
-  const s = (n = e.childNamed("manifest")) == null ? void 0 : n.childrenNamed("item").find((r) => r.attr.properties === "nav");
-  if (s) {
-    const r = Object.values(t.files).find(
-      (o) => o.uri.endsWith(s.attr.href || "")
+  const r = (n = e.childNamed("manifest")) == null ? void 0 : n.childrenNamed("item").find((s) => s.attr.properties === "nav");
+  if (r) {
+    const s = Object.values(t.files).find(
+      (o) => o.uri.endsWith(r.attr.href || "")
     );
-    if (r) {
-      const o = new $.XmlDocument(await r.string()), a = ke(r.uri);
-      return Ne(o, { basePath: a, baseUrl: i });
+    if (s) {
+      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: s
+  prefix: r
 }) => {
-  var a, c;
-  const n = ((a = e == null ? void 0 : e.childNamed(`${s}content`)) == null ? void 0 : a.attr.src) || "", r = {
-    title: ((c = e == null ? void 0 : e.descendantWithPath(`${s}navLabel.${s}text`)) == null ? void 0 : c.val) || "",
-    path: k(t, n),
-    href: k(i, t, n),
+  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: N(t, n),
+    href: N(i, t, n),
     contents: []
-  }, o = e.childrenNamed(`${s}navPoint`);
-  return o && o.length > 0 && (r.contents = o.map(
-    (l) => ne(l, { opfBasePath: t, baseUrl: i, prefix: s })
-  )), r;
-}, Pe = (e, { opfBasePath: t, baseUrl: i }) => {
+  }, o = e.childrenNamed(`${r}navPoint`);
+  return o && o.length > 0 && (s.contents = o.map(
+    (l) => re(l, { opfBasePath: t, baseUrl: i, prefix: r })
+  )), s;
+}, Ce = (e, { opfBasePath: t, baseUrl: i }) => {
   var o;
-  const s = [], n = e.name;
-  let r = "";
-  return n.indexOf(":") !== -1 && (r = `${n.split(":")[0]}:`), (o = e.childNamed(`${r}navMap`)) == null || o.childrenNamed(`${r}navPoint`).forEach(
-    (a) => s.push(ne(a, { opfBasePath: t, baseUrl: i, prefix: r }))
-  ), s;
-}, Ie = async ({
+  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(re(a, { opfBasePath: t, baseUrl: i, prefix: s }))
+  ), r;
+}, Pe = async ({
   opfData: e,
   opfBasePath: t,
   baseUrl: i,
-  archive: s
+  archive: r
 }) => {
   var o;
-  const n = e.childNamed("spine"), r = n == null ? void 0 : n.attr.toc;
-  if (r) {
-    const a = (o = e.childNamed("manifest")) == null ? void 0 : o.childrenNamed("item").find((c) => c.attr.id === r);
+  const n = e.childNamed("spine"), s = n == null ? void 0 : n.attr.toc;
+  if (s) {
+    const a = (o = e.childNamed("manifest")) == null ? void 0 : o.childrenNamed("item").find((d) => d.attr.id === s);
     if (a) {
-      const c = `${t}${t === "" ? "" : "/"}${a.attr.href}`, l = Object.values(s.files).find(
-        (d) => d.uri.endsWith(c)
+      const d = `${t}${t === "" ? "" : "/"}${a.attr.href}`, l = Object.values(r.files).find(
+        (c) => c.uri.endsWith(d)
       );
       if (l) {
-        const d = new $.XmlDocument(await l.string());
-        return Pe(d, { opfBasePath: t, baseUrl: i });
+        const c = new v.XmlDocument(await l.string());
+        return Ce(c, { opfBasePath: t, baseUrl: i });
       }
     }
   }
-}, Ce = async (e, t, { baseUrl: i }) => {
-  const { basePath: s } = N(t) || {}, n = await Ie({
+}, Ie = async (e, t, { baseUrl: i }) => {
+  const { basePath: r } = k(t) || {}, n = await Pe({
     opfData: e,
-    opfBasePath: s,
+    opfBasePath: r,
     archive: t,
     baseUrl: i
   });
@@ -178,52 +155,52 @@ const w = {
     baseUrl: i
   });
 }, Re = (e) => {
-  var s;
-  const t = ((s = e.attr.properties) == null ? void 0 : s.split(" ")) || [];
+  var r;
+  const t = ((r = e.attr.properties) == null ? void 0 : r.split(" ")) || [];
   let i;
   return t.find((n) => n === "rendition:layout-reflowable") && (i = "reflowable"), t.find((n) => n === "rendition:layout-pre-paginated") && (i = "pre-paginated"), {
     renditionLayout: i,
     pageSpreadLeft: t.some((n) => n === "page-spread-left") || void 0,
     pageSpreadRight: t.some((n) => n === "page-spread-right") || void 0
   };
-}, N = (e) => {
-  const i = Object.values(e.files).filter((s) => !s.dir).find((s) => s.uri.endsWith(".opf"));
+}, 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) || {}, s = await (t == null ? void 0 : t.string());
-  if (!s) return [];
-  const n = new $.XmlDocument(s), r = n.childNamed("manifest"), o = n.childNamed("spine"), a = o == null ? void 0 : o.childrenNamed("itemref").map((d) => d.attr.idref), c = (r == null ? void 0 : r.childrenNamed("item").filter((d) => a.includes(d.attr.id || ""))) || [];
-  return e.files.filter((d) => c.find((p) => i ? `${i}/${p.attr.href}` === d.uri : `${p.attr.href}` === d.uri));
-}, je = (e, t, i) => {
-  const s = e.attr.href || "", n = i == null ? void 0 : i(e);
+  const { data: t, basePath: i } = k(e) || {}, r = await (t == null ? void 0 : t.string());
+  if (!r) return [];
+  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);
   return {
-    href: t ? `${n}${t}/${s}` : `${n}${s}`,
+    href: t ? `${n}${t}/${r}` : `${n}${r}`,
     id: e.attr.id || "",
     mediaType: e.attr["media-type"]
   };
-}, se = (e, t, i) => {
-  var r;
-  const s = e.childNamed("manifest"), { basePath: n } = N(t) || {};
-  return ((r = s == null ? void 0 : s.childrenNamed("item")) == null ? void 0 : r.map((o) => je(o, n, i))) || [];
-}, De = ({ archive: e, baseUrl: t }) => async (i) => {
+}, ie = (e, t, i) => {
+  var s;
+  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: s, basePath: n } = N(e) || {};
-  if (!s)
+  const { data: r, basePath: n } = k(e) || {};
+  if (!r)
     return i;
-  const r = await s.string();
-  w.log("data", r);
-  const o = new $.XmlDocument(r), a = await Ce(o, e, { baseUrl: t }) || [], c = o.childNamed("metadata"), l = o.childNamed("manifest"), d = o.childNamed("spine"), p = o.childNamed("guide"), u = c == null ? void 0 : c.childNamed("dc:title"), g = (c == null ? void 0 : c.childrenNamed("meta")) || [], b = g.find(
+  const s = await r.string();
+  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, v = h == null ? void 0 : h.val, S = 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 = d == null ? void 0 : d.attr["page-progression-direction"], ae = (await re({ archive: e })).reduce(
+  ), 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
   );
@@ -233,28 +210,28 @@ const w = {
       toc: a
     },
     renditionLayout: y,
-    renditionFlow: v || "auto",
-    renditionSpread: S,
-    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: (d == null ? void 0 : d.childrenNamed("itemref").map((m, L) => {
-      var V, E;
-      const f = l == null ? void 0 : l.childrenNamed("item").find((C) => C.attr.id === (m == null ? void 0 : m.attr.idref)), U = (f == null ? void 0 : f.attr.href) || "", ce = ((V = e.files.find((C) => C.uri.endsWith(U))) == null ? void 0 : V.size) || 0, B = t || (/^https?:\/\//.test(U) ? "" : "file://"), H = Re(m);
+    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) || "", 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 {
-        ...H,
+        ...E,
         id: (f == null ? void 0 : f.attr.id) || "",
         index: L,
-        href: (E = f == null ? void 0 : f.attr.href) != null && E.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: H.renditionLayout ?? y,
-        progressionWeight: ce / ae,
+        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: de / ce,
         // size: itemSize
         mediaType: f == null ? void 0 : f.attr["media-type"]
       };
     })) || [],
-    items: se(o, e, (m) => {
+    items: ie(o, e, (m) => {
       const L = m.attr.href || "";
       return /^https?:\/\//.test(L) ? "" : t || "file://";
     }),
@@ -265,15 +242,15 @@ const w = {
     }))
   };
 }, Oe = async (e, t) => {
-  var n, r, o;
-  const s = await ((n = N(e).data) == null ? void 0 : n.string());
-  if (s) {
-    const a = new $.XmlDocument(s), c = se(a, e, () => "");
-    if ((r = c.find(
-      (d) => t.endsWith(d.href)
-    )) == null ? void 0 : r.mediaType)
+  var n, s, o;
+  const r = await ((n = k(e).data) == null ? void 0 : n.string());
+  if (r) {
+    const a = new v.XmlDocument(r), d = ie(a, e, () => "");
+    if ((s = d.find(
+      (c) => t.endsWith(c.href)
+    )) == null ? void 0 : s.mediaType)
       return {
-        mediaType: (o = c.find((d) => t.endsWith(d.href))) == null ? void 0 : o.mediaType
+        mediaType: (o = d.find((c) => t.endsWith(c.href))) == null ? void 0 : o.mediaType
       };
   }
   return {
@@ -291,24 +268,24 @@ const w = {
   if (e.endsWith(".svg"))
     return "image/svg+xml";
 }, ze = ({ archive: e, resourcePath: t }) => async (i) => {
-  const s = Object.values(e.files).find(
-    (r) => r.uri === t
+  const r = Object.values(e.files).find(
+    (s) => s.uri === t
   );
-  if (!s) return i;
+  if (!r) return i;
   const n = await Oe(e, t);
   return {
     ...i,
     params: {
       ...i.params,
-      ...(s == null ? void 0 : s.encodingFormat) && {
-        contentType: s.encodingFormat
+      ...(r == null ? void 0 : r.encodingFormat) && {
+        contentType: r.encodingFormat
       },
       ...n.mediaType && {
         contentType: n.mediaType
       }
     }
   };
-}, Z = [
+}, ee = [
   "div",
   "span",
   "p",
@@ -360,22 +337,22 @@ const w = {
   "script",
   "style"
 ], Xe = ({ archive: e, resourcePath: t }) => async (i) => {
-  const s = Object.values(e.files).find(
+  const r = Object.values(e.files).find(
     (n) => n.uri === t
   );
-  if (s != null && s.basename.endsWith(".xhtml")) {
-    const n = i.body ?? await s.string();
+  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,
-      (c, l, d = "") => `<${l} ${d.trim()}></${l}>`
+      (d, l, c = "") => `<${l} ${c.trim()}></${l}>`
     );
     return {
       ...i,
@@ -385,11 +362,11 @@ const w = {
   return i;
 }, Ue = async (e, t) => {
   const i = Object.values(e.files).find(
-    (r) => r.uri === t
+    (s) => s.uri === t
   );
   if (!i)
     throw new Error("no file found");
-  const s = {
+  const r = {
     params: {}
   }, n = [
     ze({ archive: e, resourcePath: t }),
@@ -398,31 +375,31 @@ const w = {
     Le({ archive: e, resourcePath: t })
   ];
   try {
-    const r = await n.reduce(async (o, a) => await a(await o), Promise.resolve(s));
-    return w.log("Generated resource", t, r), {
-      ...r,
-      body: r.body ?? await i.blob()
+    const s = await n.reduce(async (o, a) => await a(await o), Promise.resolve(r));
+    return w.log("Generated resource", t, s), {
+      ...s,
+      body: s.body ?? await i.blob()
     };
-  } catch (r) {
-    throw w.error(r), r;
+  } catch (s) {
+    throw w.error(s), s;
   }
 }, Be = ({ archive: e, baseUrl: t }) => async () => {
-  var s;
+  var r;
   const i = Object.values(e.files).filter((n) => !n.dir);
   return {
     filename: e.filename,
-    title: ((s = e.files.find(({ dir: n }) => n)) == null ? void 0 : s.basename.replace(/\/$/, "")) || "",
+    title: ((r = e.files.find(({ dir: n }) => n)) == null ? void 0 : r.basename.replace(/\/$/, "")) || "",
     renditionLayout: void 0,
     renditionSpread: "auto",
     readingDirection: "ltr",
-    spineItems: i.filter((n) => !n.basename.endsWith(".db")).map((n, r) => {
+    spineItems: i.filter((n) => !n.basename.endsWith(".db")).map((n, s) => {
       const o = t || (/^https?:\/\//.test(n.uri) ? "" : "file://");
       return {
         // some books such as cbz can have same basename inside different sub folder
         // we need to make sure to have unique index
         // /chap01/01.png, /chap02/01.png, etc
-        id: `${r}.${n.basename}`,
-        index: r,
+        id: `${s}.${n.basename}`,
+        index: s,
         href: encodeURI(`${o}${n.uri}`),
         renditionLayout: void 0,
         progressionWeight: 1 / i.length,
@@ -431,50 +408,50 @@ const w = {
         mediaType: n.encodingFormat
       };
     }),
-    items: i.map((n, r) => ({
-      id: `${r}.${n.basename}`,
+    items: i.map((n, s) => ({
+      id: `${s}.${n.basename}`,
       href: encodeURI(`${t}${n.uri}`)
     }))
   };
-}, He = async (e) => {
+}, Ee = async (e) => {
   const t = {
     renditionLayout: void 0
   };
   return await Promise.all(
     e.files.map(async (i) => {
-      var s, n;
+      var r, n;
       if (i.uri.endsWith("com.kobobooks.display-options.xml")) {
-        const o = (s = new $.XmlDocument(await i.string()).childNamed("platform")) == null ? void 0 : s.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");
       }
     })
   ), t;
-}, Ve = ({ archive: e }) => async (t) => {
-  const i = await He(e);
+}, He = ({ archive: e }) => async (t) => {
+  const i = await Ee(e);
   return {
     ...t,
     renditionLayout: t.renditionLayout ?? i.renditionLayout
   };
-}, Ee = (e) => {
+}, Ve = (e) => {
   var i;
-  const t = (i = e.descendantWithPath("head")) == null ? void 0 : i.childrenNamed("meta").find((s) => s.attr.name === "viewport");
+  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 ? Ee(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((s) => s.renditionLayout === "reflowable")) {
-    const s = await re({ archive: e });
-    if (await _e(s))
+  if (t.renditionLayout === "reflowable" && t.spineItems.every((r) => r.renditionLayout === "reflowable")) {
+    const r = await se({ archive: e });
+    if (await _e(r))
       return {
         ...t,
-        spineItems: t.spineItems.map((r) => ({
-          ...r,
+        spineItems: t.spineItems.map((s) => ({
+          ...s,
           renditionLayout: "pre-paginated"
         })),
         renditionLayout: "pre-paginated"
@@ -483,69 +460,69 @@ const w = {
   return t;
 }, z = (e, t) => {
   var n;
-  const i = e.split(/(\d+)/), s = t.split(/(\d+)/);
-  for (let r = 0, o = i.length; r < o; r++)
-    if (i[r] !== s[r])
-      return (n = i[r]) != null && n.match(/\d/) ? +(i[r] || "") - +(s[r] || "") : (i[r] || "").localeCompare(s[r] || "");
+  const i = e.split(/(\d+)/), r = t.split(/(\d+)/);
+  for (let s = 0, o = i.length; s < o; s++)
+    if (i[s] !== r[s])
+      return (n = i[s]) != null && n.match(/\d/) ? +(i[s] || "") - +(r[s] || "") : (i[s] || "").localeCompare(r[s] || "");
   return 1;
 }, Ge = ({ archive: e, baseUrl: t }) => async (i) => {
   if (i.nav) return i;
-  const s = [...e.files].sort(
-    (a, c) => z(a.uri, c.uri)
-  ), n = Object.values(s), r = (a, c, l, d, p) => {
-    const u = a.find((h) => h.title === c), [g, ...b] = l;
+  const r = [...e.files].sort(
+    (a, d) => z(a.uri, d.uri)
+  ), 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: [
           ...u.contents,
-          ...r(
+          ...s(
             u.contents,
             g,
             b,
-            d,
+            c,
             p
           )
         ]
       }
     ] : u.path.split("/").length > p.split("/").length ? [
-      ...a.filter((x) => x !== u),
+      ...a.filter(($) => $ !== u),
       {
         ...u,
         path: p,
-        href: d
+        href: c
       }
     ] : a : g ? [
       ...a,
       {
-        contents: r(
+        contents: s(
           [],
           g,
           b,
-          d,
+          c,
           p
         ),
-        href: d,
+        href: c,
         path: p,
-        title: c
+        title: d
       }
     ] : [
       ...a,
       {
         contents: [],
-        href: d,
+        href: c,
         path: p,
-        title: c
+        title: d
       }
     ];
   }, o = n.reduce(
-    (a, c) => {
-      if (c.dir) return a;
-      const d = c.uri.split("/").slice(0, -1), [p, ...u] = d;
+    (a, d) => {
+      if (d.dir) return a;
+      const c = d.uri.split("/").slice(0, -1), [p, ...u] = c;
       if (p) {
-        const g = k(t, encodeURI(c.uri)).replace(/\/$/, ""), b = c.uri.replace(/\/$/, "");
-        return r(a, p, u, g, b);
+        const g = N(t, encodeURI(d.uri)).replace(/\/$/, ""), b = d.uri.replace(/\/$/, "");
+        return s(a, p, u, g, b);
       }
       return a;
     },
@@ -558,76 +535,76 @@ const w = {
     }
   };
 }, Ke = ({ archive: e }) => async (t) => {
-  var r;
+  var s;
   const i = e.files.find(
     (o) => o.basename.toLowerCase() === "comicinfo.xml"
   );
   if (!i)
     return t;
-  const s = {
+  const r = {
     ...t,
-    spineItems: t.spineItems.filter((o) => !o.id.toLowerCase().endsWith("comicinfo.xml")).map((o, a, c) => ({
+    spineItems: t.spineItems.filter((o) => !o.id.toLowerCase().endsWith("comicinfo.xml")).map((o, a, d) => ({
       ...o,
-      progressionWeight: 1 / c.length
+      progressionWeight: 1 / d.length
     }))
   }, n = await i.string();
   try {
-    const a = ((r = new $.XmlDocument(n).childNamed("Manga")) == null ? void 0 : r.val) || "unknown";
+    const a = ((s = new v.XmlDocument(n).childNamed("Manga")) == null ? void 0 : s.val) || "unknown";
     return {
-      ...s,
+      ...r,
       readingDirection: a === "YesAndRightToLeft" ? "rtl" : "ltr"
     };
   } catch (o) {
     return console.error(`Unable to parse comicinfo.xml for content
-`, n), console.error(o), s;
+`, n), console.error(o), r;
   }
 }, Je = (e) => e.files.some((t) => t.basename.endsWith(".opf")), Ye = ({ archive: e }) => async (t) => Je(e) ? t : {
   ...t,
-  spineItems: t.spineItems.map((s) => {
+  spineItems: t.spineItems.map((r) => {
     const n = e.files.find(
-      (o) => decodeURI(s.href).endsWith(o.uri)
-    ), r = ue((n == null ? void 0 : n.encodingFormat) ?? "") ?? O((n == null ? void 0 : n.basename) ?? "");
+      (o) => decodeURI(r.href).endsWith(o.uri)
+    ), s = me((n == null ? void 0 : n.encodingFormat) ?? "") ?? O((n == null ? void 0 : n.basename) ?? "");
     return {
-      ...s,
-      renditionLayout: r != null && r.startsWith("image/") ? "pre-paginated" : s.renditionLayout
+      ...r,
+      renditionLayout: s != null && s.startsWith("image/") ? "pre-paginated" : r.renditionLayout
     };
   })
 }, Qe = ({ archive: e }) => async (t) => {
-  var n, r;
+  var n, s;
   const i = e.files.find(
     (o) => o.basename.toLowerCase() === "com.apple.ibooks.display-options.xml"
   );
   if (!i)
     return t;
-  const s = await (await i.blob()).text();
+  const r = await (await i.blob()).text();
   try {
-    const a = new $.XmlDocument(s).childNamed("platform"), c = ((r = (n = a == null ? void 0 : a.childrenNamed("option")) == null ? void 0 : n.find((l) => l.attr.name === "fixed-layout")) == null ? void 0 : r.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: c === "true" ? "pre-paginated" : t.renditionLayout
+      renditionLayout: d === "true" ? "pre-paginated" : t.renditionLayout
     };
   } catch (o) {
     return console.error(
       `Unable to parse com.apple.ibooks.display-options.xml for content
 `,
-      s
+      r
     ), console.error(o), t;
   }
 }, Ze = async (e, { baseUrl: t = "" } = {}) => {
   const i = [
-    De({ archive: e, baseUrl: t }),
+    je({ archive: e, baseUrl: t }),
     Ke({ archive: e }),
     Qe({ archive: e }),
     Ye({ archive: e }),
     qe({ archive: e }),
-    Ve({ archive: e }),
+    He({ archive: e }),
     Ge({ archive: e, baseUrl: t })
   ];
   try {
-    const s = Be({ archive: e, baseUrl: t })(), n = await i.reduce(async (r, o) => await o(await r), s);
+    const r = Be({ archive: e, baseUrl: t })(), n = await i.reduce(async (s, o) => await o(await s), r);
     return w.log("Generated manifest", n), n;
-  } catch (s) {
-    throw w.error(s), s;
+  } catch (r) {
+    throw w.error(r), r;
   }
 }, at = async (e, t) => {
   const i = `
@@ -638,22 +615,22 @@ const w = {
       </metadata>
       <manifest>
         ${e.map(
-    (r) => `<item id="${A(r)}" href="${r}" media-type="${O(r)}"/>`
+    (s) => `<item id="${A(s)}" href="${s}" media-type="${O(s)}"/>`
   ).join(`
 `)}
       </manifest>
       <spine>
-        ${e.map((r) => `<itemref idref="${A(r)}" />`).join(`
+        ${e.map((s) => `<itemref idref="${A(s)}" />`).join(`
 `)}
       </spine>
     </package>
-  `, s = e.map((r) => ({
+  `, r = e.map((s) => ({
     dir: !1,
-    basename: A(r),
-    encodingFormat: O(r),
-    uri: r,
+    basename: A(s),
+    encodingFormat: O(s),
+    uri: s,
     size: 100 / e.length,
-    blob: async () => (await fetch(r)).blob(),
+    blob: async () => (await fetch(s)).blob(),
     string: async () => ""
   }));
   return {
@@ -665,14 +642,14 @@ const w = {
       size: 0,
       blob: async () => new Blob(),
       string: async () => i
-    }, ...s],
+    }, ...r],
     close: () => Promise.resolve()
   };
 }, ct = async (e, {
   mimeType: t,
   direction: i
 } = { mimeType: "text/plain" }) => {
-  const s = `
+  const r = `
       <?xml version="1.0" encoding="UTF-8"?>
       <package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="ja" prefix="rendition: http://www.idpf.org/vocab/rendition/#"
         unique-identifier="ootuya-id">
@@ -695,8 +672,8 @@ const w = {
         dir: !1,
         basename: A("generated.opf"),
         uri: "generated.opf",
-        blob: async () => new Blob([s]),
-        string: async () => s,
+        blob: async () => new Blob([r]),
+        string: async () => r,
         size: 0
       },
       {
@@ -712,28 +689,28 @@ const w = {
     close: () => Promise.resolve()
   };
 }, dt = async (e, { orderByAlpha: t, name: i } = {}) => {
-  let s = Object.values(e.files);
-  t && (s = s.slice().sort((r, o) => z(r.name, o.name)));
+  let r = Object.values(e.files);
+  t && (r = r.slice().sort((s, o) => z(s.name, o.name)));
   const n = {
     filename: i || "",
-    files: s.map((r) => ({
-      dir: r.dir,
-      basename: A(r.name),
-      uri: r.name,
-      blob: () => r.async("blob"),
-      string: () => r.async("string"),
-      ...r.internalStream && {
-        stream: r.internalStream
+    files: r.map((s) => ({
+      dir: s.dir,
+      basename: A(s.name),
+      uri: s.name,
+      blob: () => s.async("blob"),
+      string: () => s.async("string"),
+      ...s.internalStream && {
+        stream: s.internalStream
       },
       // this is private API
       // @ts-ignore
-      size: r._data.uncompressedSize
+      size: s._data.uncompressedSize
     })),
     close: () => Promise.resolve()
   };
   return w.log("Generated archive", n), n;
 }, lt = async (e, { name: t } = {}) => {
-  const i = await e.getFilesArray(), s = {
+  const i = await e.getFilesArray(), r = {
     close: () => e.close(),
     filename: t ?? "",
     files: i.map((n) => ({
@@ -745,21 +722,21 @@ const w = {
       string: async () => (await n.file.extract()).text()
     }))
   };
-  return w.log("Generated archive", s), s;
+  return w.log("Generated archive", r), r;
 }, pt = async (e, { orderByAlpha: t, name: i } = {}) => {
-  let s = e;
-  return t && (s = s.slice().sort((n, r) => z(n.name, r.name))), {
+  let r = e;
+  return t && (r = r.slice().sort((n, s) => z(n.name, s.name))), {
     filename: i || "",
-    files: s.map((n) => ({
+    files: r.map((n) => ({
       dir: n.isDir,
       basename: A(n.name),
       uri: n.name,
       blob: async () => new Blob([await n.data()]),
       string: async () => {
-        const r = await n.data();
+        const s = await n.data();
         return String.fromCharCode.apply(
           null,
-          Array.from(new Uint16Array(r))
+          Array.from(new Uint16Array(s))
         );
       },
       size: n.size
@@ -797,7 +774,7 @@ class et {
   get overTTL$() {
     return this.isUnlocked$.pipe(
       W(
-        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? G : xe(this.cleanArchiveAfter) : G
+        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? K : xe(this.cleanArchiveAfter) : K
       )
     );
   }
@@ -807,32 +784,33 @@ const tt = ({
   cleanArchiveAfter: t = 5 * 60 * 1e3
   // 5mn
 }) => {
-  const i = new R(), s = new R(), n = new R(), r = {}, o = i.pipe(
+  const i = new R(), r = new R(), n = new R(), s = {}, o = i.pipe(
     M((l) => {
-      const d = r[l];
-      if (!d || d.state.status !== "idle") return _;
+      const c = s[l];
+      if (!c || c.state.status !== "idle") return _;
       let p = !1;
       const u = (y) => {
-        var S;
-        const v = r[y];
-        delete r[y], p || ((S = v == null ? void 0 : v.state.archive) == null || S.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);
       };
-      d.update({
+      c.update({
         status: "loading"
       });
-      const g = d.locks$, b = d.isUnlocked$, h = g.pipe(
-        me(),
-        j(([y, v]) => v > y),
-        he(!0)
+      const g = c.locks$, b = c.isUnlocked$, h = g.pipe(
+        he(),
+        D(([y, x]) => x > y),
+        ge(!0)
       );
-      return P(e(l)).pipe(
-        D((y) => {
-          d.update({
+      return C(e(l)).pipe(
+        j((y) => {
+          c.update({
             archive: y,
             status: "success"
           });
         }),
-        I((y) => (u(l), d.update({
+        P((y) => (u(l), c.update({
           status: "error",
           error: y
         }), _)),
@@ -840,61 +818,63 @@ const tt = ({
           const y = h.pipe(
             W(() => n),
             W(() => b),
-            j((v) => v)
+            D((T) => T)
+          );
+          return q(y, c.overTTL$).pipe(
+            G(),
+            j(() => {
+              u(l);
+            })
           );
-          return q(y, d.overTTL$);
-        }),
-        D(() => {
-          u(l);
         })
       );
     }),
-    ge(s)
+    ye(r)
   ), a = (l) => {
-    let d = !1;
-    const p = r[l] ?? new et(t);
-    r[l] = p, p.update({
+    let c = !1;
+    const p = s[l] ?? new et(t);
+    s[l] = p, p.update({
       locks: p.state.locks + 1
     });
     const u = () => {
-      d || (d = !0, p.update({
+      c || (c = !0, p.update({
         locks: p.state.locks - 1
       }));
     };
     i.next(l);
     const g = p.state$.pipe(
       F(({ archive: h }) => h),
-      j((h) => !!h)
+      D((h) => !!h)
     ), b = p.state$.pipe(
-      D(({ error: h }) => {
+      j(({ error: h }) => {
         if (h)
           throw h;
       }),
-      ye()
+      be()
     );
     return q(g, b).pipe(
-      be(),
+      G(),
       F((h) => ({ archive: h, release: u })),
-      I((h) => {
+      P((h) => {
         throw u(), h;
       })
     );
-  }, c = () => {
+  }, d = () => {
     n.next();
   };
   return o.subscribe(), {
     access: a,
-    purge: c,
-    archives: r
+    purge: d,
+    _archives: s
   };
 };
 class nt {
   constructor({
     onError: t,
     onManifestSuccess: i,
-    ...s
+    ...r
   }) {
-    this.onError = (n) => (console.error(n), new Response(String(n), { status: 500 })), this.epubLoader = tt(s), this.onManifestSuccess = i ?? (({ manifest: n }) => Promise.resolve(n)), this.onError = t ?? this.onError;
+    this.onError = (n) => (console.error(n), new Response(String(n), { status: 500 })), this.epubLoader = tt(r), this.onManifestSuccess = i ?? (({ manifest: n }) => Promise.resolve(n)), this.onError = t ?? this.onError;
   }
   prune() {
     this.epubLoader.purge();
@@ -904,58 +884,58 @@ class nt {
   }
   accessArchiveWithoutLock(t) {
     return this.accessArchive(t).pipe(
-      F(({ archive: i, release: s }) => (s(), i))
+      F(({ archive: i, release: r }) => (r(), i))
     );
   }
   fetchManifest({ key: t, baseUrl: i }) {
-    const s = this.accessArchive(t).pipe(
-      M(({ archive: n, release: r }) => P(
+    const r = this.accessArchive(t).pipe(
+      M(({ archive: n, release: s }) => C(
         Ze(n, { baseUrl: i })
       ).pipe(
         W(
-          (a) => P(this.onManifestSuccess({ manifest: a, archive: n }))
+          (a) => C(this.onManifestSuccess({ manifest: a, archive: n }))
         ),
         F(
           (a) => new Response(JSON.stringify(a), {
             status: 200
           })
         ),
-        K(() => {
-          r();
+        J(() => {
+          s();
         })
       )),
-      I((n) => J(this.onError(n)))
+      P((n) => Y(this.onError(n)))
     );
-    return Y(s);
+    return Q(r);
   }
   fetchResource({
     key: t,
     resourcePath: i
   }) {
-    const s = this.accessArchive(t).pipe(
-      M(({ archive: n, release: r }) => {
+    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(
-            (c) => new Response(c.body, {
+            (d) => new Response(d.body, {
               status: 200,
               headers: {
-                ...c.params.contentType && {
-                  "Content-Type": c.params.contentType
+                ...d.params.contentType && {
+                  "Content-Type": d.params.contentType
                 }
               }
             })
           ),
-          K(() => {
-            r();
+          J(() => {
+            s();
           })
         );
       }),
-      I((n) => J(this.onError(n)))
+      P((n) => Y(this.onError(n)))
     );
-    return Y(s);
+    return Q(r);
   }
 }
 class ut extends nt {
@@ -969,14 +949,14 @@ class ut extends nt {
     try {
       const i = this.getUriInfo(t);
       if (!i) return;
-      const s = Q(i.baseUrl), n = t.request.url.substring(
-        s.length + 1
-      ), [r = ""] = n.split("/"), o = decodeURIComponent(
-        Q(n.substring(r.length + 1))
+      const r = Z(i.baseUrl), n = t.request.url.substring(
+        r.length + 1
+      ), [s = ""] = n.split("/"), o = decodeURIComponent(
+        Z(n.substring(s.length + 1))
       );
       n.endsWith("/manifest") ? t.respondWith(
-        this.fetchManifest({ key: r, baseUrl: `${s}/${r}/` })
-      ) : t.respondWith(this.fetchResource({ key: r, resourcePath: o }));
+        this.fetchManifest({ key: s, baseUrl: `${r}/${s}/` })
+      ) : t.respondWith(this.fetchResource({ key: s, resourcePath: o }));
     } catch (i) {
       t.respondWith(new Response(String(i), { status: 500 }));
     }
@@ -993,6 +973,6 @@ export {
   at as createArchiveFromUrls,
   Ze as generateManifestFromArchive,
   Ue as generateResourceFromArchive,
-  N as getArchiveOpfInfo
+  k as getArchiveOpfInfo
 };
 //# sourceMappingURL=index.js.map