@prose-reader/streamer 1.95.0 → 1.97.0

package/dist/index.js

@@ -1,6 +1,6 @@
-import { urlJoin as S, PROSE_READER_RESOURCE_ERROR_INJECTED_META_NAME as oe, isXmlBasedMimeType as ce, detectMimeTypeFromName as V } from "@prose-reader/shared";
+import { urlJoin as S, PROSE_READER_RESOURCE_ERROR_INJECTED_META_NAME as oe, isXmlBasedMimeType as ce, detectMimeTypeFromName as X } from "@prose-reader/shared";
 import $, { XmlDocument as de } from "xmldoc";
-import { Subject as I, mergeMap as k, EMPTY as le, from as A, map as v, catchError as T, NEVER as X, shareReplay as B, switchMap as C, startWith as me, distinctUntilChanged as pe, withLatestFrom as fe, timer as ue, tap as _, merge as H, takeUntil as he, BehaviorSubject as ge, filter as be, ignoreElements as ye, first as we, finalize as E, of as G, lastValueFrom as J } from "rxjs";
+import { Subject as k, mergeMap as I, EMPTY as B, from as T, map as v, catchError as A, shareReplay as _, switchMap as C, startWith as le, distinctUntilChanged as me, withLatestFrom as pe, NEVER as ue, timer as fe, of as P, tap as H, merge as E, takeUntil as he, BehaviorSubject as ge, filter as be, ignoreElements as ye, first as we, finalize as G, lastValueFrom as J } from "rxjs";
 let N = !1;
 const y = {
   enable: (e) => {
@@ -25,168 +25,168 @@ const y = {
     N && console.timeEnd(`[prose-reader-streamer] [metric] ${e}`);
   },
   metric: (e, n = 1 / 0) => {
-    const a = typeof e == "number" ? e : e.duration;
+    const s = typeof e == "number" ? e : e.duration;
     N && (e.duration <= n ? console.log(
       "[prose-reader-streamer] [metric] ",
-      `${e.name} took ${a}ms`
+      `${e.name} took ${s}ms`
     ) : console.warn(
       "[prose-reader-streamer] [metric] ",
       `${e.name} took ${e.duration}ms which is above the ${n}ms target for this function`
     ));
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  measurePerformance: (e, n = 10, a) => (...r) => {
-    const t = performance.now(), s = a(...r);
-    if (s && s.then)
-      return s.then((o) => {
+  measurePerformance: (e, n = 10, s) => (...a) => {
+    const t = performance.now(), r = s(...a);
+    if (r && r.then)
+      return r.then((o) => {
         const m = performance.now();
         return y.metric({ name: e, duration: m - t }, n), o;
       });
     const i = performance.now();
-    return y.metric({ name: e, duration: i - t }, n), s;
+    return y.metric({ name: e, duration: i - t }, n), r;
   }
 }, ve = (e) => {
-  var a;
-  const n = (a = e.descendantWithPath("head")) == null ? void 0 : a.childrenNamed("meta").find((r) => r.attr.name === "calibre:cover");
+  var s;
+  const n = (s = e.descendantWithPath("head")) == null ? void 0 : s.childrenNamed("meta").find((a) => a.attr.name === "calibre:cover");
   return !!(n && n.attr.name === "calibre:cover");
 }, $e = (e) => {
-  var n, a, r;
-  return (r = (a = (n = e.descendantWithPath("body")) == null ? void 0 : n.descendantWithPath("div")) == null ? void 0 : a.childrenNamed("svg")) == null ? void 0 : r.find(
+  var n, s, a;
+  return (a = (s = (n = e.descendantWithPath("body")) == null ? void 0 : n.descendantWithPath("div")) == null ? void 0 : s.childrenNamed("svg")) == null ? void 0 : a.find(
     (t) => t.attr.width === "100%" && t.attr.preserveAspectRatio === "none"
   );
-}, xe = ({ archive: e, resourcePath: n }) => async (a) => {
-  const r = Object.values(e.files).find(
+}, xe = ({ archive: e, resourcePath: n }) => async (s) => {
+  const a = Object.values(e.files).find(
     (t) => t.uri === n
   );
-  if (r != null && r.basename.endsWith(".xhtml")) {
-    const t = a.body ?? await r.string(), s = new de(t);
-    if (ve(s)) {
-      const i = $e(s);
+  if (a != null && a.basename.endsWith(".xhtml")) {
+    const t = s.body ?? await a.string(), r = new de(t);
+    if (ve(r)) {
+      const i = $e(r);
       return i && delete i.attr.preserveAspectRatio, {
-        ...a,
-        body: s == null ? void 0 : s.toString()
+        ...s,
+        body: r == null ? void 0 : r.toString()
       };
     }
   }
-  return a;
-}, Fe = ({ archive: e, resourcePath: n }) => async (a) => xe({ archive: e, resourcePath: n })(a), Ne = ({ archive: e, resourcePath: n }) => async (a) => {
-  const r = Object.values(e.files).find(
+  return s;
+}, Fe = ({ archive: e, resourcePath: n }) => async (s) => xe({ archive: e, resourcePath: n })(s), Ne = ({ archive: e, resourcePath: n }) => async (s) => {
+  const a = Object.values(e.files).find(
     (t) => t.uri === n
   );
-  if (r != null && r.basename.endsWith(".css")) {
-    const s = (a.body ?? await r.string()).replaceAll(
+  if (a != null && a.basename.endsWith(".css")) {
+    const r = (s.body ?? await a.string()).replaceAll(
       "-webkit-writing-mode",
       "writing-mode"
     );
     return {
-      ...a,
-      body: s
+      ...s,
+      body: r
     };
   }
-  return a;
-}, L = (e) => {
-  const a = Object.values(e.files).filter((r) => !r.dir).find((r) => r.uri.endsWith(".opf"));
+  return s;
+}, W = (e) => {
+  const s = Object.values(e.files).filter((a) => !a.dir).find((a) => a.uri.endsWith(".opf"));
   return {
-    data: a,
-    basePath: (a == null ? void 0 : a.uri.substring(0, a.uri.lastIndexOf("/"))) || ""
+    data: s,
+    basePath: (s == null ? void 0 : s.uri.substring(0, s.uri.lastIndexOf("/"))) || ""
   };
-}, K = (e, { opfBasePath: n, baseUrl: a }) => {
-  const r = {
+}, K = (e, { opfBasePath: n, baseUrl: s }) => {
+  const a = {
     contents: [],
     path: "",
     href: "",
     title: ""
   };
   let t = e.childNamed("span") || e.childNamed("a");
-  r.title = (t == null ? void 0 : t.attr.title) || (t == null ? void 0 : t.val.trim()) || r.title;
-  let s = t == null ? void 0 : t.name;
-  s !== "a" && (t = e.descendantWithPath(`${s}.a`), t && (s = t.name.toLowerCase())), s === "a" && (t != null && t.attr.href) && (r.path = S(n, t.attr.href), r.href = S(a, n, t.attr.href));
+  a.title = (t == null ? void 0 : t.attr.title) || (t == null ? void 0 : t.val.trim()) || a.title;
+  let r = t == null ? void 0 : t.name;
+  r !== "a" && (t = e.descendantWithPath(`${r}.a`), t && (r = t.name.toLowerCase())), r === "a" && (t != null && t.attr.href) && (a.path = S(n, t.attr.href), a.href = S(s, n, t.attr.href));
   const i = e.childNamed("ol");
   if (i) {
     const o = i.childrenNamed("li");
-    o && o.length > 0 && (r.contents = o.map(
-      (m) => K(m, { opfBasePath: n, baseUrl: a })
+    o && o.length > 0 && (a.contents = o.map(
+      (m) => K(m, { opfBasePath: n, baseUrl: s })
     ));
   }
-  return r;
-}, Te = (e, { opfBasePath: n, baseUrl: a }) => {
-  var s, i;
-  const r = [];
+  return a;
+}, Se = (e, { opfBasePath: n, baseUrl: s }) => {
+  var r, i;
+  const a = [];
   let t;
-  return e.descendantWithPath("body.nav.ol") ? t = (s = e.descendantWithPath("body.nav.ol")) == null ? void 0 : s.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(K(o, { opfBasePath: n, baseUrl: a }))
-  ), r;
-}, Se = async (e, n, { opfBasePath: a, baseUrl: r }) => {
-  var s;
-  const t = (s = e.childNamed("manifest")) == null ? void 0 : s.childrenNamed("item").find((i) => i.attr.properties === "nav");
+  return e.descendantWithPath("body.nav.ol") ? t = (r = e.descendantWithPath("body.nav.ol")) == null ? void 0 : r.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) => a.push(K(o, { opfBasePath: n, baseUrl: s }))
+  ), a;
+}, Te = async (e, n, { opfBasePath: s, baseUrl: a }) => {
+  var r;
+  const t = (r = e.childNamed("manifest")) == null ? void 0 : r.childrenNamed("item").find((i) => i.attr.properties === "nav");
   if (t) {
     const i = Object.values(n.files).find(
       (o) => o.uri.endsWith(t.attr.href || "")
     );
     if (i) {
       const o = new $.XmlDocument(await i.string());
-      return Te(o, { opfBasePath: a, baseUrl: r });
+      return Se(o, { opfBasePath: s, baseUrl: a });
     }
   }
 }, Y = (e, {
   opfBasePath: n,
-  baseUrl: a,
-  prefix: r
+  baseUrl: s,
+  prefix: a
 }) => {
   var o, m;
-  const t = ((o = e == null ? void 0 : e.childNamed(`${r}content`)) == null ? void 0 : o.attr.src) || "", s = {
-    title: ((m = e == null ? void 0 : e.descendantWithPath(`${r}navLabel.${r}text`)) == null ? void 0 : m.val) || "",
+  const t = ((o = e == null ? void 0 : e.childNamed(`${a}content`)) == null ? void 0 : o.attr.src) || "", r = {
+    title: ((m = e == null ? void 0 : e.descendantWithPath(`${a}navLabel.${a}text`)) == null ? void 0 : m.val) || "",
     path: S(n, t),
-    href: S(a, n, t),
+    href: S(s, n, t),
     contents: []
-  }, i = e.childrenNamed(`${r}navPoint`);
-  return i && i.length > 0 && (s.contents = i.map(
-    (u) => Y(u, { opfBasePath: n, baseUrl: a, prefix: r })
-  )), s;
-}, Ae = (e, { opfBasePath: n, baseUrl: a }) => {
+  }, i = e.childrenNamed(`${a}navPoint`);
+  return i && i.length > 0 && (r.contents = i.map(
+    (f) => Y(f, { opfBasePath: n, baseUrl: s, prefix: a })
+  )), r;
+}, Ae = (e, { opfBasePath: n, baseUrl: s }) => {
   var i;
-  const r = [], t = e.name;
-  let s = "";
-  return t.indexOf(":") !== -1 && (s = t.split(":")[0] + ":"), (i = e.childNamed(`${s}navMap`)) == null || i.childrenNamed(`${s}navPoint`).forEach(
-    (o) => r.push(Y(o, { opfBasePath: n, baseUrl: a, prefix: s }))
-  ), r;
-}, Le = async ({
+  const a = [], t = e.name;
+  let r = "";
+  return t.indexOf(":") !== -1 && (r = t.split(":")[0] + ":"), (i = e.childNamed(`${r}navMap`)) == null || i.childrenNamed(`${r}navPoint`).forEach(
+    (o) => a.push(Y(o, { opfBasePath: n, baseUrl: s, prefix: r }))
+  ), a;
+}, We = async ({
   opfData: e,
   opfBasePath: n,
-  baseUrl: a,
-  archive: r
+  baseUrl: s,
+  archive: a
 }) => {
   var i;
-  const t = e.childNamed("spine"), s = t && t.attr.toc;
-  if (s) {
-    const o = (i = e.childNamed("manifest")) == null ? void 0 : i.childrenNamed("item").find((m) => m.attr.id === s);
+  const t = e.childNamed("spine"), r = t && t.attr.toc;
+  if (r) {
+    const o = (i = e.childNamed("manifest")) == null ? void 0 : i.childrenNamed("item").find((m) => m.attr.id === r);
     if (o) {
-      const m = `${n}${n === "" ? "" : "/"}${o.attr.href}`, u = Object.values(r.files).find(
+      const m = `${n}${n === "" ? "" : "/"}${o.attr.href}`, f = Object.values(a.files).find(
         (c) => c.uri.endsWith(m)
       );
-      if (u) {
-        const c = new $.XmlDocument(await u.string());
-        return Ae(c, { opfBasePath: n, baseUrl: a });
+      if (f) {
+        const c = new $.XmlDocument(await f.string());
+        return Ae(c, { opfBasePath: n, baseUrl: s });
       }
     }
   }
-}, Re = async (e, n, { baseUrl: a }) => {
-  const { basePath: r } = L(n) || {}, t = await Le({
+}, Le = async (e, n, { baseUrl: s }) => {
+  const { basePath: a } = W(n) || {}, t = await We({
     opfData: e,
-    opfBasePath: r,
+    opfBasePath: a,
     archive: n,
-    baseUrl: a
+    baseUrl: s
   });
-  return t || await Se(e, n, { opfBasePath: r, baseUrl: a });
-}, We = async (e) => {
+  return t || await Te(e, n, { opfBasePath: a, baseUrl: s });
+}, Re = async (e) => {
   const n = {
     renditionLayout: void 0
   };
   return await Promise.all(
-    e.files.map(async (a) => {
-      var r, t;
-      if (a.uri.endsWith("com.kobobooks.display-options.xml")) {
-        const i = (r = new $.XmlDocument(await a.string()).childNamed("platform")) == null ? void 0 : r.childNamed("option");
+    e.files.map(async (s) => {
+      var a, t;
+      if (s.uri.endsWith("com.kobobooks.display-options.xml")) {
+        const i = (a = new $.XmlDocument(await s.string()).childNamed("platform")) == null ? void 0 : a.childNamed("option");
         ((t = i == null ? void 0 : i.attr) == null ? void 0 : t.name) === "fixed-layout" && i.val === "true" && (n.renditionLayout = "pre-paginated");
       }
     })
@@ -194,33 +194,33 @@ const y = {
 }, Q = async ({
   archive: e
 }) => {
-  const { data: n, basePath: a } = L(e) || {}, r = await (n == null ? void 0 : n.string());
-  if (!r) return [];
-  const t = new $.XmlDocument(r), s = t.childNamed("manifest"), i = t.childNamed("spine"), o = i == null ? void 0 : i.childrenNamed("itemref").map((c) => c.attr.idref), m = (s == null ? void 0 : s.childrenNamed("item").filter((c) => o.includes(c.attr.id || ""))) || [];
-  return e.files.filter((c) => m.find((d) => a ? `${a}/${d.attr.href}` === c.uri : `${d.attr.href}` === c.uri));
+  const { data: n, basePath: s } = W(e) || {}, a = await (n == null ? void 0 : n.string());
+  if (!a) return [];
+  const t = new $.XmlDocument(a), r = t.childNamed("manifest"), i = t.childNamed("spine"), o = i == null ? void 0 : i.childrenNamed("itemref").map((c) => c.attr.idref), m = (r == null ? void 0 : r.childrenNamed("item").filter((c) => o.includes(c.attr.id || ""))) || [];
+  return e.files.filter((c) => m.find((d) => s ? `${s}/${d.attr.href}` === c.uri : `${d.attr.href}` === c.uri));
 }, Z = (e) => {
-  var a;
+  var s;
   const n = e.childNamed("manifest");
-  return ((a = n == null ? void 0 : n.childrenNamed("item")) == null ? void 0 : a.map((r) => ({
-    href: r.attr.href || "",
-    id: r.attr.id || "",
-    mediaType: r.attr["media-type"]
+  return ((s = n == null ? void 0 : n.childrenNamed("item")) == null ? void 0 : s.map((a) => ({
+    href: a.attr.href || "",
+    id: a.attr.id || "",
+    mediaType: a.attr["media-type"]
   }))) || [];
-}, Ie = ({ archive: e, baseUrl: n }) => async (a) => {
-  var O;
-  const { data: r, basePath: t } = L(e) || {}, s = await We(e);
-  if (!r)
-    return a;
-  const i = await r.string();
-  y.log(i, s);
-  const o = new $.XmlDocument(i), m = await Re(o, e, { baseUrl: n }) || [], u = o.childNamed("metadata"), c = o.childNamed("manifest"), d = o.childNamed("spine"), p = o.childNamed("guide"), b = u == null ? void 0 : u.childNamed("dc:title"), F = (u == null ? void 0 : u.childrenNamed("meta")) || [], g = F.find(
-    (f) => f.attr.property === "rendition:layout"
+}, ke = ({ archive: e, baseUrl: n }) => async (s) => {
+  var j;
+  const { data: a, basePath: t } = W(e) || {}, r = await Re(e);
+  if (!a)
+    return s;
+  const i = await a.string();
+  y.log(i, r);
+  const o = new $.XmlDocument(i), m = await Le(o, e, { baseUrl: n }) || [], f = o.childNamed("metadata"), c = o.childNamed("manifest"), d = o.childNamed("spine"), p = o.childNamed("guide"), b = f == null ? void 0 : f.childNamed("dc:title"), F = (f == null ? void 0 : f.childrenNamed("meta")) || [], g = F.find(
+    (u) => u.attr.property === "rendition:layout"
   ), h = F.find(
-    (f) => f.attr.property === "rendition:flow"
-  ), R = F.find(
-    (f) => f.attr.property === "rendition:spread"
-  ), D = g == null ? void 0 : g.val, ee = h == null ? void 0 : h.val, te = R == null ? void 0 : R.val, ne = (b == null ? void 0 : b.val) || ((O = e.files.find(({ dir: f }) => f)) == null ? void 0 : O.basename) || "", re = d == null ? void 0 : d.attr["page-progression-direction"], se = (await Q({ archive: e })).reduce(
-    (f, l) => l.size + f,
+    (u) => u.attr.property === "rendition:flow"
+  ), L = F.find(
+    (u) => u.attr.property === "rendition:spread"
+  ), O = g == null ? void 0 : g.val, ee = h == null ? void 0 : h.val, te = L == null ? void 0 : L.val, ne = (b == null ? void 0 : b.val) || ((j = e.files.find(({ dir: u }) => u)) == null ? void 0 : j.basename) || "", re = d == null ? void 0 : d.attr["page-progression-direction"], ae = (await Q({ archive: e })).reduce(
+    (u, l) => l.size + u,
     0
   );
   return {
@@ -228,44 +228,44 @@ const y = {
     nav: {
       toc: m
     },
-    renditionLayout: D || s.renditionLayout || "reflowable",
+    renditionLayout: O || r.renditionLayout || "reflowable",
     renditionFlow: ee || "auto",
     renditionSpread: te,
     title: ne,
     readingDirection: re || "ltr",
-    spineItems: (d == null ? void 0 : d.childrenNamed("itemref").map((f) => {
-      var M, z, U;
-      const l = c == null ? void 0 : c.childrenNamed("item").find((w) => w.attr.id === (f == null ? void 0 : f.attr.idref)), ae = (l == null ? void 0 : l.attr.href) || "", W = ((M = f == null ? void 0 : f.attr.properties) == null ? void 0 : M.split(" ")) || [], ie = ((z = e.files.find((w) => w.uri.endsWith(ae))) == null ? void 0 : z.size) || 0, j = n ?? "";
+    spineItems: (d == null ? void 0 : d.childrenNamed("itemref").map((u) => {
+      var z, U, V;
+      const l = c == null ? void 0 : c.childrenNamed("item").find((w) => w.attr.id === (u == null ? void 0 : u.attr.idref)), se = (l == null ? void 0 : l.attr.href) || "", R = ((z = u == null ? void 0 : u.attr.properties) == null ? void 0 : z.split(" ")) || [], ie = ((U = e.files.find((w) => w.uri.endsWith(se))) == null ? void 0 : U.size) || 0, M = n ?? "";
       return {
         id: (l == null ? void 0 : l.attr.id) || "",
-        href: (U = l == null ? void 0 : l.attr.href) != null && U.startsWith("https://") ? l == null ? void 0 : l.attr.href : t ? `${j}${t}/${l == null ? void 0 : l.attr.href}` : `${j}${l == null ? void 0 : l.attr.href}`,
-        renditionLayout: D || "reflowable",
-        ...W.find(
+        href: (V = l == null ? void 0 : l.attr.href) != null && V.startsWith("https://") ? l == null ? void 0 : l.attr.href : t ? `${M}${t}/${l == null ? void 0 : l.attr.href}` : `${M}${l == null ? void 0 : l.attr.href}`,
+        renditionLayout: O || "reflowable",
+        ...R.find(
           (w) => w === "rendition:layout-reflowable"
         ) && {
           renditionLayout: "reflowable"
         },
-        progressionWeight: ie / se,
-        pageSpreadLeft: W.some((w) => w === "page-spread-left") || void 0,
-        pageSpreadRight: W.some((w) => w === "page-spread-right") || void 0,
+        progressionWeight: ie / ae,
+        pageSpreadLeft: R.some((w) => w === "page-spread-left") || void 0,
+        pageSpreadRight: R.some((w) => w === "page-spread-right") || void 0,
         // size: itemSize
         mediaType: l == null ? void 0 : l.attr["media-type"]
       };
     })) || [],
     items: Z(o),
-    guide: p == null ? void 0 : p.childrenNamed("reference").map((f) => ({
-      href: f.attr.href || "",
-      title: f.attr.title || "",
-      type: f.attr.type
+    guide: p == null ? void 0 : p.childrenNamed("reference").map((u) => ({
+      href: u.attr.href || "",
+      title: u.attr.title || "",
+      type: u.attr.type
     }))
   };
-}, ke = async (e, n) => {
-  var t, s;
-  const r = await ((t = L(e).data) == null ? void 0 : t.string());
-  if (r) {
-    const i = new $.XmlDocument(r);
+}, Ie = async (e, n) => {
+  var t, r;
+  const a = await ((t = W(e).data) == null ? void 0 : t.string());
+  if (a) {
+    const i = new $.XmlDocument(a);
     return {
-      mediaType: (s = Z(i).find((m) => n.endsWith(m.href))) == null ? void 0 : s.mediaType
+      mediaType: (r = Z(i).find((m) => n.endsWith(m.href))) == null ? void 0 : r.mediaType
     };
   }
   return {
@@ -282,20 +282,20 @@ const y = {
     return "video/mp4";
   if (e.endsWith(".svg"))
     return "image/svg+xml";
-}, Pe = ({ archive: e, resourcePath: n }) => async (a) => {
-  const r = Object.values(e.files).find(
-    (s) => s.uri === n
+}, Pe = ({ archive: e, resourcePath: n }) => async (s) => {
+  const a = Object.values(e.files).find(
+    (r) => r.uri === n
   );
-  if (!r) return a;
-  const t = await ke(e, n);
+  if (!a) return s;
+  const t = await Ie(e, n);
   return {
-    ...a,
+    ...s,
     params: {
-      ...a.params,
+      ...s.params,
       status: 200,
       headers: {
-        ...(r == null ? void 0 : r.encodingFormat) && {
-          "Content-Type": r.encodingFormat
+        ...(a == null ? void 0 : a.encodingFormat) && {
+          "Content-Type": a.encodingFormat
         },
         ...t.mediaType && {
           "Content-Type": t.mediaType
@@ -304,12 +304,12 @@ const y = {
     }
   };
 }, De = async (e, n) => {
-  const a = Object.values(e.files).find(
-    (s) => s.uri === n
+  const s = Object.values(e.files).find(
+    (r) => r.uri === n
   );
-  if (!a)
+  if (!s)
     throw new Error("no file found");
-  const r = {
+  const a = {
     params: {
       status: 200
     }
@@ -319,13 +319,13 @@ const y = {
     Fe({ archive: e, resourcePath: n })
   ];
   try {
-    const s = await t.reduce(async (i, o) => await o(await i), Promise.resolve(r));
-    return y.log("Generated resource", n, s), {
-      ...s,
-      body: s.body || await a.blob()
+    const r = await t.reduce(async (i, o) => await o(await i), Promise.resolve(a));
+    return y.log("Generated resource", n, r), {
+      ...r,
+      body: r.body || await s.blob()
     };
-  } catch (s) {
-    throw y.error(s), s;
+  } catch (r) {
+    throw y.error(r), r;
   }
 }, Ye = (e) => ({
   body: `
@@ -346,111 +346,111 @@ const y = {
     }
   }
 }), Oe = ({ archive: e, baseUrl: n }) => async () => {
-  var r;
-  const a = Object.values(e.files).filter((t) => !t.dir);
+  var a;
+  const s = Object.values(e.files).filter((t) => !t.dir);
   return {
     filename: e.filename,
-    title: ((r = e.files.find(({ dir: t }) => t)) == null ? void 0 : r.basename.replace(/\/$/, "")) || "",
+    title: ((a = e.files.find(({ dir: t }) => t)) == null ? void 0 : a.basename.replace(/\/$/, "")) || "",
     renditionLayout: "pre-paginated",
     renditionSpread: "auto",
     readingDirection: "ltr",
-    spineItems: a.filter((t) => !t.basename.endsWith(".db")).map((t, s) => ({
+    spineItems: s.filter((t) => !t.basename.endsWith(".db")).map((t, r) => ({
       // 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: `${s}.${t.basename}`,
+      id: `${r}.${t.basename}`,
       href: encodeURI(`${n}${t.uri}`),
       renditionLayout: "pre-paginated",
-      progressionWeight: 1 / a.length,
+      progressionWeight: 1 / s.length,
       pageSpreadLeft: void 0,
       pageSpreadRight: void 0,
       mediaType: t.encodingFormat
     })),
-    items: a.map((t, s) => ({
-      id: `${s}.${t.basename}`,
+    items: s.map((t, r) => ({
+      id: `${r}.${t.basename}`,
       href: `${n}${t.uri}`
     }))
   };
 }, je = ({ archive: e }) => async (n) => {
-  var s;
-  const a = e.files.find(
+  var r;
+  const s = e.files.find(
     (i) => i.basename.toLowerCase() === "comicinfo.xml"
   );
-  if (!a)
+  if (!s)
     return n;
-  const r = {
+  const a = {
     ...n,
     spineItems: n.spineItems.filter((i) => !i.id.toLowerCase().endsWith("comicinfo.xml")).map((i, o, m) => ({
       ...i,
       progressionWeight: 1 / m.length
     }))
-  }, t = await a.string();
+  }, t = await s.string();
   try {
-    const o = ((s = new $.XmlDocument(t).childNamed("Manga")) == null ? void 0 : s.val) || "unknown";
+    const o = ((r = new $.XmlDocument(t).childNamed("Manga")) == null ? void 0 : r.val) || "unknown";
     return {
-      ...r,
+      ...a,
       readingDirection: o === "YesAndRightToLeft" ? "rtl" : "ltr"
     };
   } catch (i) {
     return console.error(`Unable to parse comicinfo.xml for content
-`, t), console.error(i), r;
+`, t), console.error(i), a;
   }
 }, Me = (e) => {
-  var a;
-  const n = (a = e.descendantWithPath("head")) == null ? void 0 : a.childrenNamed("meta").find((r) => r.attr.name === "viewport");
+  var s;
+  const n = (s = e.descendantWithPath("head")) == null ? void 0 : s.childrenNamed("meta").find((a) => a.attr.name === "viewport");
   return !!(n && n.attr.name === "viewport");
-}, ze = (e) => e.reduce(async (n, a) => {
+}, ze = (e) => e.reduce(async (n, s) => {
   if (!await n || !ce({
-    mimeType: a.encodingFormat,
-    uri: a.uri
+    mimeType: s.encodingFormat,
+    uri: s.uri
   }))
     return !1;
-  const t = await a.string();
+  const t = await s.string();
   return t ? Me(new $.XmlDocument(t)) : !1;
 }, Promise.resolve(!0)), Ue = ({ archive: e }) => async (n) => {
-  if (n.renditionLayout === "reflowable" && n.spineItems.every((r) => r.renditionLayout === "reflowable")) {
-    const r = await Q({ archive: e });
-    if (await ze(r))
+  if (n.renditionLayout === "reflowable" && n.spineItems.every((a) => a.renditionLayout === "reflowable")) {
+    const a = await Q({ archive: e });
+    if (await ze(a))
       return {
         ...n,
-        spineItems: n.spineItems.map((s) => ({
-          ...s,
+        spineItems: n.spineItems.map((r) => ({
+          ...r,
           renditionLayout: "pre-paginated"
         })),
         renditionLayout: "pre-paginated"
       };
   }
   return n;
-}, P = (e, n) => {
+}, D = (e, n) => {
   var t;
-  const a = e.split(/(\d+)/), r = n.split(/(\d+)/);
-  for (let s = 0, i = a.length; s < i; s++)
-    if (a[s] !== r[s])
-      return (t = a[s]) != null && t.match(/\d/) ? +(a[s] || "") - +(r[s] || "") : (a[s] || "").localeCompare(r[s] || "");
+  const s = e.split(/(\d+)/), a = n.split(/(\d+)/);
+  for (let r = 0, i = s.length; r < i; r++)
+    if (s[r] !== a[r])
+      return (t = s[r]) != null && t.match(/\d/) ? +(s[r] || "") - +(a[r] || "") : (s[r] || "").localeCompare(a[r] || "");
   return 1;
-}, Ve = ({ archive: e, baseUrl: n }) => async (a) => {
-  if (a.nav) return a;
-  const r = [...e.files].sort(
-    (s, i) => P(s.uri, i.uri)
+}, Ve = ({ archive: e, baseUrl: n }) => async (s) => {
+  if (s.nav) return s;
+  const a = [...e.files].sort(
+    (r, i) => D(r.uri, i.uri)
   ), t = Object.values(
-    r
+    a
   ).reduce(
-    (s, i) => {
+    (r, i) => {
       const o = i.uri.split("/");
-      return !i.dir && o.length > 1 && o.forEach((u, c) => {
+      return !i.dir && o.length > 1 && o.forEach((f, c) => {
         if (c === o.length - 1) return;
-        s.find(({ title: b }) => b === u) || s.push({
+        r.find(({ title: b }) => b === f) || r.push({
           contents: [],
           href: S(n, encodeURI(i.uri)).replace(/\/$/, ""),
           path: i.uri.replace(/\/$/, ""),
           title: o[0] ?? ""
         });
-      }), s;
+      }), r;
     },
     []
   );
-  return t.length === 0 ? a : {
-    ...a,
+  return t.length === 0 ? s : {
+    ...s,
     nav: {
       toc: t
     }
@@ -467,21 +467,21 @@ const y = {
   spineItems: [],
   title: ""
 }, Be = async (e, { baseUrl: n = "" } = {}) => {
-  const a = [
+  const s = [
     Oe({ archive: e, baseUrl: n }),
-    Ie({ archive: e, baseUrl: n }),
+    ke({ archive: e, baseUrl: n }),
     Ue({ archive: e, baseUrl: n }),
     je({ archive: e, baseUrl: n }),
     Ve({ archive: e, baseUrl: n })
   ];
   try {
-    const r = await a.reduce(async (t, s) => await s(await t), Promise.resolve(Xe));
-    return y.log("Generated manifest", r), r;
-  } catch (r) {
-    throw y.error(r), r;
+    const a = await s.reduce(async (t, r) => await r(await t), Promise.resolve(Xe));
+    return y.log("Generated manifest", a), a;
+  } catch (a) {
+    throw y.error(a), a;
   }
 }, x = (e) => e.substring(e.lastIndexOf("/") + 1) || e, q = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Qe = async (e, n) => {
-  const a = `
+  const s = `
     <?xml version="1.0" encoding="UTF-8"?><package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="bookid">
       <metadata>
         <meta property="rendition:layout">${n != null && n.useRenditionFlow ? "reflowable" : "pre-paginated"}</meta>
@@ -489,20 +489,20 @@ const y = {
       </metadata>
       <manifest>
         ${e.map(
-    (s) => `<item id="${x(s)}" href="${s}" media-type="${V(s)}"/>`
+    (r) => `<item id="${x(r)}" href="${r}" media-type="${X(r)}"/>`
   ).join(`
 `)}
       </manifest>
       <spine>
-        ${e.map((s) => `<itemref idref="${x(s)}" />`).join(`
+        ${e.map((r) => `<itemref idref="${x(r)}" />`).join(`
 `)}
       </spine>
     </package>
-  `, r = e.map((s) => ({
+  `, a = e.map((r) => ({
     dir: !1,
-    basename: x(s),
-    encodingFormat: V(s),
-    uri: s,
+    basename: x(r),
+    encodingFormat: X(r),
+    uri: r,
     size: 100 / e.length,
     base64: async () => "",
     blob: async () => new Blob(),
@@ -515,23 +515,23 @@ const y = {
       basename: "content.opf",
       uri: "content.opf",
       size: 0,
-      base64: async () => a,
+      base64: async () => s,
       blob: async () => new Blob(),
-      string: async () => a
-    }, ...r],
+      string: async () => s
+    }, ...a],
     close: () => Promise.resolve()
   };
 }, _e = async (e) => new Promise((n) => {
-  const a = new FileReader();
-  a.readAsDataURL(e), a.onloadend = function() {
-    const r = a.result;
-    n(r);
+  const s = new FileReader();
+  s.readAsDataURL(e), s.onloadend = function() {
+    const a = s.result;
+    n(a);
   };
 }), Ze = async (e, {
   mimeType: n,
-  direction: a
+  direction: s
 } = { mimeType: "text/plain" }) => {
-  const r = `
+  const a = `
       <?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">
@@ -542,7 +542,7 @@ const y = {
         <manifest>
             <item id="p01" href="p01.txt" media-type="text/plain"/>
         </manifest>
-        <spine page-progression-direction="${a ?? "ltr"}">
+        <spine page-progression-direction="${s ?? "ltr"}">
           <itemref idref="p01" />
         </spine>
       </package>
@@ -554,9 +554,9 @@ const y = {
         dir: !1,
         basename: x("generated.opf"),
         uri: "generated.opf",
-        blob: async () => new Blob([r]),
-        string: async () => r,
-        base64: async () => btoa(r),
+        blob: async () => new Blob([a]),
+        string: async () => a,
+        base64: async () => btoa(a),
         size: 0
       },
       {
@@ -572,34 +572,34 @@ const y = {
     ],
     close: () => Promise.resolve()
   };
-}, et = async (e, { orderByAlpha: n, name: a } = {}) => {
-  let r = Object.values(e.files);
-  n && (r = r.slice().sort((s, i) => P(s.name, i.name)));
+}, et = async (e, { orderByAlpha: n, name: s } = {}) => {
+  let a = Object.values(e.files);
+  n && (a = a.slice().sort((r, i) => D(r.name, i.name)));
   const t = {
-    filename: a || "",
-    files: r.map((s) => ({
-      dir: s.dir,
-      basename: x(s.name),
-      uri: s.name,
-      blob: () => s.async("blob"),
-      string: () => s.async("string"),
-      base64: () => s.async("base64"),
-      ...s.internalStream && {
-        stream: s.internalStream
+    filename: s || "",
+    files: a.map((r) => ({
+      dir: r.dir,
+      basename: x(r.name),
+      uri: r.name,
+      blob: () => r.async("blob"),
+      string: () => r.async("string"),
+      base64: () => r.async("base64"),
+      ...r.internalStream && {
+        stream: r.internalStream
       },
       // this is private API
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      size: s._data.uncompressedSize
+      size: r._data.uncompressedSize
     })),
     close: () => Promise.resolve()
   };
   return y.log("Generated archive", t), t;
 }, tt = async (e, { name: n } = {}) => {
-  const a = await e.getFilesArray(), r = {
+  const s = await e.getFilesArray(), a = {
     close: () => e.close(),
     filename: n ?? "",
-    files: a.map((t) => ({
+    files: s.map((t) => ({
       dir: !1,
       basename: t.file.name,
       size: t.file.size,
@@ -609,21 +609,21 @@ const y = {
       string: async () => (await t.file.extract()).text()
     }))
   };
-  return y.log("Generated archive", r), r;
-}, nt = async (e, { orderByAlpha: n, name: a } = {}) => {
-  let r = e;
-  return n && (r = r.slice().sort((t, s) => P(t.name, s.name))), {
-    filename: a || "",
-    files: r.map((t) => ({
+  return y.log("Generated archive", a), a;
+}, nt = async (e, { orderByAlpha: n, name: s } = {}) => {
+  let a = e;
+  return n && (a = a.slice().sort((t, r) => D(t.name, r.name))), {
+    filename: s || "",
+    files: a.map((t) => ({
       dir: t.isDir,
       basename: x(t.name),
       uri: t.name,
       blob: async () => new Blob([await t.data()]),
       string: async () => {
-        const s = await t.data();
+        const r = await t.data();
         return String.fromCharCode.apply(
           null,
-          Array.from(new Uint16Array(s))
+          Array.from(new Uint16Array(r))
         );
       },
       base64: async () => "",
@@ -639,59 +639,56 @@ const y = {
   getArchive: e,
   cleanArchiveAfter: n
 }) => {
-  const a = new I(), r = new I(), t = new I(), s = {}, i = a.pipe(
-    k((c) => {
-      const d = s[c];
-      return !d || d.getValue().status !== "idle" ? le : (d.next({
+  const s = new k(), a = new k(), t = new k(), r = {}, i = s.pipe(
+    I((c) => {
+      const d = r[c];
+      return !d || d.getValue().status !== "idle" ? B : (d.next({
         ...d.getValue(),
         status: "loading"
-      }), A(e(c)).pipe(
+      }), T(e(c)).pipe(
         v((p) => (d.next({
           ...d.getValue(),
           archive: p,
           status: "success"
         }), { key: c, archiveEntry: d })),
-        T((p) => {
-          throw d.next({
-            ...d.getValue(),
-            status: "error",
-            error: p
-          }), p;
-        })
+        A((p) => (d.next({
+          ...d.getValue(),
+          status: "error",
+          error: p
+        }), B))
       ));
     }),
-    T(() => X),
-    B()
+    _()
   ), o = i.pipe(
     C(({ archiveEntry: c, key: d }) => {
       const p = c.pipe(v(({ locks: g }) => g)), b = t.pipe(
         v(() => !0),
-        me(!1),
-        B()
+        le(!1),
+        _()
       );
       return p.pipe(
         v((g) => g <= 0),
-        pe()
+        me()
       ).pipe(
-        fe(b),
+        pe(b),
         C(
-          ([g, h]) => g ? ue(h ? 1 : n) : X
+          ([g, h]) => g ? h ? P(null) : fe(n) : ue
         ),
-        _(() => {
+        H(() => {
           var g;
-          console.log("ARCHIVE DELETED"), delete s[d], (g = c.getValue().archive) == null || g.close();
+          delete r[d], (g = c.getValue().archive) == null || g.close();
         })
       );
     })
   ), m = (c) => {
     let d = !1;
-    const p = s[c] ?? new ge({
+    const p = r[c] ?? new ge({
       archive: void 0,
       status: "idle",
       locks: 0,
       error: void 0
     });
-    s[c] = p, p.next({
+    r[c] = p, p.next({
       ...p.getValue(),
       locks: p.getValue().locks + 1
     });
@@ -701,106 +698,110 @@ const y = {
         locks: p.getValue().locks - 1
       }));
     };
-    a.next(c);
+    s.next(c);
     const F = p.pipe(
       v(({ archive: h }) => h),
       be((h) => !!h)
     ), g = p.pipe(
-      _(({ error: h }) => {
+      H(({ error: h }) => {
         if (h)
           throw h;
       }),
       ye()
     );
-    return H(F, g).pipe(
+    return E(F, g).pipe(
       we(),
       v((h) => ({ archive: h, release: b })),
-      T((h) => {
+      A((h) => {
         throw b(), h;
       })
     );
-  }, u = () => t.next();
-  return H(o, i).pipe(he(r)).subscribe(), {
+  }, f = () => {
+    Object.keys(r).forEach((c) => {
+      delete r[c];
+    }), t.next();
+  };
+  return E(o, i).pipe(he(a)).subscribe(), {
     access: m,
-    purge: u
+    purge: f
   };
 };
 class Ee {
   constructor({
     onError: n,
-    onManifestSuccess: a,
-    ...r
+    onManifestSuccess: s,
+    ...a
   }) {
-    this.onError = (t) => new Response(String(t), { status: 500 }), this.epubLoader = He(r), this.onManifestSuccess = a ?? (({ manifest: t }) => Promise.resolve(t)), this.onError = n ?? this.onError;
+    this.onError = (t) => new Response(String(t), { status: 500 }), this.epubLoader = He(a), this.onManifestSuccess = s ?? (({ manifest: t }) => Promise.resolve(t)), this.onError = n ?? this.onError;
   }
   accessArchive(n) {
     return this.lastAccessedKey !== n && this.epubLoader.purge(), this.lastAccessedKey = n, this.epubLoader.access(n);
   }
-  fetchManifest({ key: n, baseUrl: a }) {
-    const r = this.accessArchive(n).pipe(
-      k(({ archive: t, release: s }) => A(
-        Be(t, { baseUrl: a })
+  fetchManifest({ key: n, baseUrl: s }) {
+    const a = this.accessArchive(n).pipe(
+      I(({ archive: t, release: r }) => T(
+        Be(t, { baseUrl: s })
       ).pipe(
         C(
-          (o) => A(this.onManifestSuccess({ manifest: o, archive: t }))
+          (o) => T(this.onManifestSuccess({ manifest: o, archive: t }))
         ),
         v(
           (o) => new Response(JSON.stringify(o), {
             status: 200
           })
         ),
-        E(() => {
-          s();
+        G(() => {
+          r();
         })
       )),
-      T((t) => G(this.onError(t)))
+      A((t) => P(this.onError(t)))
     );
-    return J(r);
+    return J(a);
   }
   fetchResource({
     key: n,
-    resourcePath: a
+    resourcePath: s
   }) {
-    const r = this.accessArchive(n).pipe(
-      k(({ archive: t, release: s }) => A(
-        De(t, a)
+    const a = this.accessArchive(n).pipe(
+      I(({ archive: t, release: r }) => T(
+        De(t, s)
       ).pipe(
         v((o) => new Response(o.body, { status: 200 })),
-        E(() => {
-          s();
+        G(() => {
+          r();
         })
       )),
-      T((t) => G(this.onError(t)))
+      A((t) => P(this.onError(t)))
     );
-    return J(r);
+    return J(a);
   }
 }
-class st extends Ee {
+class at extends Ee {
   constructor({
     getUriInfo: n,
-    ...a
+    ...s
   }) {
-    super(a), this.getUriInfo = n, this.fetchEventListener = this.fetchEventListener.bind(this);
+    super(s), this.getUriInfo = n, this.fetchEventListener = this.fetchEventListener.bind(this);
   }
   fetchEventListener(n) {
     try {
-      const a = this.getUriInfo(n);
-      if (!a) return;
-      const r = q(a.baseUrl), t = n.request.url.substring(
-        r.length + 1
-      ), [s = ""] = t.split("/"), i = decodeURIComponent(
-        q(t.substring(s.length + 1))
+      const s = this.getUriInfo(n);
+      if (!s) return;
+      const a = q(s.baseUrl), t = n.request.url.substring(
+        a.length + 1
+      ), [r = ""] = t.split("/"), i = decodeURIComponent(
+        q(t.substring(r.length + 1))
       );
       t.endsWith("/manifest") ? n.respondWith(
-        this.fetchManifest({ key: s, baseUrl: `${r}/${s}/` })
-      ) : n.respondWith(this.fetchResource({ key: s, resourcePath: i }));
-    } catch (a) {
-      n.respondWith(new Response(String(a), { status: 500 }));
+        this.fetchManifest({ key: r, baseUrl: `${a}/${r}/` })
+      ) : n.respondWith(this.fetchResource({ key: r, resourcePath: i }));
+    } catch (s) {
+      n.respondWith(new Response(String(s), { status: 500 }));
     }
   }
 }
 export {
-  st as ServiceWorkerStreamer,
+  at as ServiceWorkerStreamer,
   Ee as Streamer,
   rt as configure,
   nt as createArchiveFromArrayBufferList,
@@ -811,6 +812,6 @@ export {
   Be as generateManifestFromArchive,
   De as generateResourceFromArchive,
   Ye as generateResourceFromError,
-  L as getArchiveOpfInfo
+  W as getArchiveOpfInfo
 };
 //# sourceMappingURL=index.js.map