@prose-reader/streamer 1.95.0 → 1.96.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 I, mergeMap as k, EMPTY as le, from as A, map as v, catchError as T, NEVER as B, shareReplay as _, switchMap as C, startWith as me, distinctUntilChanged as pe, withLatestFrom as fe, timer as ue, of as P, tap as E, merge as H, 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) => {
@@ -35,133 +35,133 @@ const y = {
     ));
   },
   // 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, a) => (...s) => {
+    const t = performance.now(), r = a(...s);
+    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");
+  const n = (a = e.descendantWithPath("head")) == null ? void 0 : a.childrenNamed("meta").find((s) => s.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, a, s;
+  return (s = (a = (n = e.descendantWithPath("body")) == null ? void 0 : n.descendantWithPath("div")) == null ? void 0 : a.childrenNamed("svg")) == null ? void 0 : s.find(
     (t) => t.attr.width === "100%" && t.attr.preserveAspectRatio === "none"
   );
 }, xe = ({ archive: e, resourcePath: n }) => async (a) => {
-  const r = Object.values(e.files).find(
+  const s = 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 (s != null && s.basename.endsWith(".xhtml")) {
+    const t = a.body ?? await s.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()
+        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(
+  const s = 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 (s != null && s.basename.endsWith(".css")) {
+    const r = (a.body ?? await s.string()).replaceAll(
       "-webkit-writing-mode",
       "writing-mode"
     );
     return {
       ...a,
-      body: s
+      body: r
     };
   }
   return a;
 }, L = (e) => {
-  const a = Object.values(e.files).filter((r) => !r.dir).find((r) => r.uri.endsWith(".opf"));
+  const a = Object.values(e.files).filter((s) => !s.dir).find((s) => s.uri.endsWith(".opf"));
   return {
     data: a,
     basePath: (a == null ? void 0 : a.uri.substring(0, a.uri.lastIndexOf("/"))) || ""
   };
 }, K = (e, { opfBasePath: n, baseUrl: a }) => {
-  const r = {
+  const s = {
     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));
+  s.title = (t == null ? void 0 : t.attr.title) || (t == null ? void 0 : t.val.trim()) || s.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) && (s.path = S(n, t.attr.href), s.href = S(a, n, t.attr.href));
   const i = e.childNamed("ol");
   if (i) {
     const o = i.childrenNamed("li");
-    o && o.length > 0 && (r.contents = o.map(
+    o && o.length > 0 && (s.contents = o.map(
       (m) => K(m, { opfBasePath: n, baseUrl: a })
     ));
   }
-  return r;
+  return s;
 }, Te = (e, { opfBasePath: n, baseUrl: a }) => {
-  var s, i;
-  const r = [];
+  var r, i;
+  const s = [];
   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) => s.push(K(o, { opfBasePath: n, baseUrl: a }))
+  ), s;
+}, Se = async (e, n, { opfBasePath: a, baseUrl: s }) => {
+  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 Te(o, { opfBasePath: a, baseUrl: s });
     }
   }
 }, Y = (e, {
   opfBasePath: n,
   baseUrl: a,
-  prefix: r
+  prefix: s
 }) => {
   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(`${s}content`)) == null ? void 0 : o.attr.src) || "", r = {
+    title: ((m = e == null ? void 0 : e.descendantWithPath(`${s}navLabel.${s}text`)) == null ? void 0 : m.val) || "",
     path: S(n, t),
     href: S(a, 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;
+  }, i = e.childrenNamed(`${s}navPoint`);
+  return i && i.length > 0 && (r.contents = i.map(
+    (u) => Y(u, { opfBasePath: n, baseUrl: a, prefix: s })
+  )), r;
 }, Ae = (e, { opfBasePath: n, baseUrl: a }) => {
   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;
+  const s = [], 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) => s.push(Y(o, { opfBasePath: n, baseUrl: a, prefix: r }))
+  ), s;
 }, Le = async ({
   opfData: e,
   opfBasePath: n,
   baseUrl: a,
-  archive: r
+  archive: s
 }) => {
   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}`, u = Object.values(s.files).find(
         (c) => c.uri.endsWith(m)
       );
       if (u) {
@@ -171,22 +171,22 @@ const y = {
     }
   }
 }, Re = async (e, n, { baseUrl: a }) => {
-  const { basePath: r } = L(n) || {}, t = await Le({
+  const { basePath: s } = L(n) || {}, t = await Le({
     opfData: e,
-    opfBasePath: r,
+    opfBasePath: s,
     archive: n,
     baseUrl: a
   });
-  return t || await Se(e, n, { opfBasePath: r, baseUrl: a });
+  return t || await Se(e, n, { opfBasePath: s, baseUrl: a });
 }, We = async (e) => {
   const n = {
     renditionLayout: void 0
   };
   return await Promise.all(
     e.files.map(async (a) => {
-      var r, t;
+      var s, 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");
+        const i = (s = new $.XmlDocument(await a.string()).childNamed("platform")) == null ? void 0 : s.childNamed("option");
         ((t = i == null ? void 0 : i.attr) == null ? void 0 : t.name) === "fixed-layout" && i.val === "true" && (n.renditionLayout = "pre-paginated");
       }
     })
@@ -194,32 +194,32 @@ 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 || ""))) || [];
+  const { data: n, basePath: a } = L(e) || {}, s = await (n == null ? void 0 : n.string());
+  if (!s) return [];
+  const t = new $.XmlDocument(s), 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) => a ? `${a}/${d.attr.href}` === c.uri : `${d.attr.href}` === c.uri));
 }, Z = (e) => {
   var a;
   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 ((a = n == null ? void 0 : n.childrenNamed("item")) == null ? void 0 : a.map((s) => ({
+    href: s.attr.href || "",
+    id: s.attr.id || "",
+    mediaType: s.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)
+  var j;
+  const { data: s, basePath: t } = L(e) || {}, r = await We(e);
+  if (!s)
     return a;
-  const i = await r.string();
-  y.log(i, s);
+  const i = await s.string();
+  y.log(i, r);
   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"
   ), 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(
+  ), O = 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) || ((j = e.files.find(({ dir: f }) => f)) == null ? void 0 : j.basename) || "", re = d == null ? void 0 : d.attr["page-progression-direction"], se = (await Q({ archive: e })).reduce(
     (f, l) => l.size + f,
     0
   );
@@ -228,18 +228,18 @@ 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 ?? "";
+      var z, U, V;
+      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 = ((z = f == null ? void 0 : f.attr.properties) == null ? void 0 : z.split(" ")) || [], ie = ((U = e.files.find((w) => w.uri.endsWith(ae))) == 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",
+        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",
         ...W.find(
           (w) => w === "rendition:layout-reflowable"
         ) && {
@@ -260,12 +260,12 @@ const y = {
     }))
   };
 }, 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);
+  var t, r;
+  const s = await ((t = L(e).data) == null ? void 0 : t.string());
+  if (s) {
+    const i = new $.XmlDocument(s);
     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 {
@@ -283,10 +283,10 @@ const y = {
   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
+  const s = Object.values(e.files).find(
+    (r) => r.uri === n
   );
-  if (!r) return a;
+  if (!s) return a;
   const t = await ke(e, n);
   return {
     ...a,
@@ -294,8 +294,8 @@ const y = {
       ...a.params,
       status: 200,
       headers: {
-        ...(r == null ? void 0 : r.encodingFormat) && {
-          "Content-Type": r.encodingFormat
+        ...(s == null ? void 0 : s.encodingFormat) && {
+          "Content-Type": s.encodingFormat
         },
         ...t.mediaType && {
           "Content-Type": t.mediaType
@@ -305,11 +305,11 @@ const y = {
   };
 }, De = async (e, n) => {
   const a = Object.values(e.files).find(
-    (s) => s.uri === n
+    (r) => r.uri === n
   );
   if (!a)
     throw new Error("no file found");
-  const r = {
+  const s = {
     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(s));
+    return y.log("Generated resource", n, r), {
+      ...r,
+      body: r.body || await a.blob()
     };
-  } catch (s) {
-    throw y.error(s), s;
+  } catch (r) {
+    throw y.error(r), r;
   }
 }, Ye = (e) => ({
   body: `
@@ -346,19 +346,19 @@ const y = {
     }
   }
 }), Oe = ({ archive: e, baseUrl: n }) => async () => {
-  var r;
+  var s;
   const a = 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: ((s = e.files.find(({ dir: t }) => t)) == null ? void 0 : s.basename.replace(/\/$/, "")) || "",
     renditionLayout: "pre-paginated",
     renditionSpread: "auto",
     readingDirection: "ltr",
-    spineItems: a.filter((t) => !t.basename.endsWith(".db")).map((t, s) => ({
+    spineItems: a.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,
@@ -366,19 +366,19 @@ const y = {
       pageSpreadRight: void 0,
       mediaType: t.encodingFormat
     })),
-    items: a.map((t, s) => ({
-      id: `${s}.${t.basename}`,
+    items: a.map((t, r) => ({
+      id: `${r}.${t.basename}`,
       href: `${n}${t.uri}`
     }))
   };
 }, je = ({ archive: e }) => async (n) => {
-  var s;
+  var r;
   const a = e.files.find(
     (i) => i.basename.toLowerCase() === "comicinfo.xml"
   );
   if (!a)
     return n;
-  const r = {
+  const s = {
     ...n,
     spineItems: n.spineItems.filter((i) => !i.id.toLowerCase().endsWith("comicinfo.xml")).map((i, o, m) => ({
       ...i,
@@ -386,18 +386,18 @@ const y = {
     }))
   }, t = await a.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,
+      ...s,
       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), s;
   }
 }, Me = (e) => {
   var a;
-  const n = (a = e.descendantWithPath("head")) == null ? void 0 : a.childrenNamed("meta").find((r) => r.attr.name === "viewport");
+  const n = (a = e.descendantWithPath("head")) == null ? void 0 : a.childrenNamed("meta").find((s) => s.attr.name === "viewport");
   return !!(n && n.attr.name === "viewport");
 }, ze = (e) => e.reduce(async (n, a) => {
   if (!await n || !ce({
@@ -408,44 +408,44 @@ const y = {
   const t = await a.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((s) => s.renditionLayout === "reflowable")) {
+    const s = await Q({ archive: e });
+    if (await ze(s))
       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 a = e.split(/(\d+)/), s = n.split(/(\d+)/);
+  for (let r = 0, i = a.length; r < i; r++)
+    if (a[r] !== s[r])
+      return (t = a[r]) != null && t.match(/\d/) ? +(a[r] || "") - +(s[r] || "") : (a[r] || "").localeCompare(s[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)
+  const s = [...e.files].sort(
+    (r, i) => D(r.uri, i.uri)
   ), t = Object.values(
-    r
+    s
   ).reduce(
-    (s, i) => {
+    (r, i) => {
       const o = i.uri.split("/");
       return !i.dir && o.length > 1 && o.forEach((u, c) => {
         if (c === o.length - 1) return;
-        s.find(({ title: b }) => b === u) || s.push({
+        r.find(({ title: b }) => b === u) || r.push({
           contents: [],
           href: S(n, encodeURI(i.uri)).replace(/\/$/, ""),
           path: i.uri.replace(/\/$/, ""),
           title: o[0] ?? ""
         });
-      }), s;
+      }), r;
     },
     []
   );
@@ -475,10 +475,10 @@ const y = {
     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 s = await a.reduce(async (t, r) => await r(await t), Promise.resolve(Xe));
+    return y.log("Generated manifest", s), s;
+  } catch (s) {
+    throw y.error(s), s;
   }
 }, x = (e) => e.substring(e.lastIndexOf("/") + 1) || e, q = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Qe = async (e, n) => {
   const a = `
@@ -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) => ({
+  `, s = 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(),
@@ -518,20 +518,20 @@ const y = {
       base64: async () => a,
       blob: async () => new Blob(),
       string: async () => a
-    }, ...r],
+    }, ...s],
     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 = a.result;
+    n(s);
   };
 }), Ze = async (e, {
   mimeType: n,
   direction: a
 } = { mimeType: "text/plain" }) => {
-  const r = `
+  const s = `
       <?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">
@@ -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([s]),
+        string: async () => s,
+        base64: async () => btoa(s),
         size: 0
       },
       {
@@ -573,30 +573,30 @@ 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)));
+  let s = Object.values(e.files);
+  n && (s = s.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
+    files: s.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 a = await e.getFilesArray(), s = {
     close: () => e.close(),
     filename: n ?? "",
     files: a.map((t) => ({
@@ -609,21 +609,21 @@ const y = {
       string: async () => (await t.file.extract()).text()
     }))
   };
-  return y.log("Generated archive", r), r;
+  return y.log("Generated archive", s), s;
 }, nt = async (e, { orderByAlpha: n, name: a } = {}) => {
-  let r = e;
-  return n && (r = r.slice().sort((t, s) => P(t.name, s.name))), {
+  let s = e;
+  return n && (s = s.slice().sort((t, r) => D(t.name, r.name))), {
     filename: a || "",
-    files: r.map((t) => ({
+    files: s.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 () => "",
@@ -635,13 +635,13 @@ const y = {
   enableReport: e
 } = {}) => {
   y.enable(!!e);
-}, He = ({
+}, Ee = ({
   getArchive: e,
   cleanArchiveAfter: n
 }) => {
-  const a = new I(), r = new I(), t = new I(), s = {}, i = a.pipe(
+  const a = new I(), s = new I(), t = new I(), r = {}, i = a.pipe(
     k((c) => {
-      const d = s[c];
+      const d = r[c];
       return !d || d.getValue().status !== "idle" ? le : (d.next({
         ...d.getValue(),
         status: "loading"
@@ -660,14 +660,14 @@ const y = {
         })
       ));
     }),
-    T(() => X),
-    B()
+    T(() => 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()
+        _()
       );
       return p.pipe(
         v((g) => g <= 0),
@@ -675,23 +675,23 @@ const y = {
       ).pipe(
         fe(b),
         C(
-          ([g, h]) => g ? ue(h ? 1 : n) : X
+          ([g, h]) => g ? h ? P(null) : ue(n) : B
         ),
-        _(() => {
+        E(() => {
           var g;
-          console.log("ARCHIVE DELETED"), delete s[d], (g = c.getValue().archive) == null || g.close();
+          console.log("ARCHIVE DELETED"), 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
     });
@@ -706,7 +706,7 @@ const y = {
       v(({ archive: h }) => h),
       be((h) => !!h)
     ), g = p.pipe(
-      _(({ error: h }) => {
+      E(({ error: h }) => {
         if (h)
           throw h;
       }),
@@ -719,26 +719,30 @@ const y = {
         throw b(), h;
       })
     );
-  }, u = () => t.next();
-  return H(o, i).pipe(he(r)).subscribe(), {
+  }, u = () => {
+    Object.keys(r).forEach((c) => {
+      delete r[c];
+    }), t.next();
+  };
+  return H(o, i).pipe(he(s)).subscribe(), {
     access: m,
     purge: u
   };
 };
-class Ee {
+class He {
   constructor({
     onError: n,
     onManifestSuccess: a,
-    ...r
+    ...s
   }) {
-    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 = Ee(s), this.onManifestSuccess = a ?? (({ 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(
+    const s = this.accessArchive(n).pipe(
+      k(({ archive: t, release: r }) => A(
         Be(t, { baseUrl: a })
       ).pipe(
         C(
@@ -749,33 +753,33 @@ class Ee {
             status: 200
           })
         ),
-        E(() => {
-          s();
+        G(() => {
+          r();
         })
       )),
-      T((t) => G(this.onError(t)))
+      T((t) => P(this.onError(t)))
     );
-    return J(r);
+    return J(s);
   }
   fetchResource({
     key: n,
     resourcePath: a
   }) {
-    const r = this.accessArchive(n).pipe(
-      k(({ archive: t, release: s }) => A(
+    const s = this.accessArchive(n).pipe(
+      k(({ archive: t, release: r }) => A(
         De(t, a)
       ).pipe(
         v((o) => new Response(o.body, { status: 200 })),
-        E(() => {
-          s();
+        G(() => {
+          r();
         })
       )),
-      T((t) => G(this.onError(t)))
+      T((t) => P(this.onError(t)))
     );
-    return J(r);
+    return J(s);
   }
 }
-class st extends Ee {
+class st extends He {
   constructor({
     getUriInfo: n,
     ...a
@@ -786,14 +790,14 @@ class st extends Ee {
     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 = q(a.baseUrl), t = n.request.url.substring(
+        s.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 }));
+        this.fetchManifest({ key: r, baseUrl: `${s}/${r}/` })
+      ) : n.respondWith(this.fetchResource({ key: r, resourcePath: i }));
     } catch (a) {
       n.respondWith(new Response(String(a), { status: 500 }));
     }
@@ -801,7 +805,7 @@ class st extends Ee {
 }
 export {
   st as ServiceWorkerStreamer,
-  Ee as Streamer,
+  He as Streamer,
   rt as configure,
   nt as createArchiveFromArrayBufferList,
   et as createArchiveFromJszip,