@prose-reader/streamer 1.301.0 → 1.303.0

package/dist/index.js

@@ -1,50 +1,55 @@
-import { detectMimeTypeFromName as b, Report as ae, escapeXmlAttributeValue as _, isXmlBasedMimeType as ce, parseContentType as J, isMediaContentMimeType as de, urlJoin as I } from "@prose-reader/shared";
-import { parseOpf as le, APPLE_IBOOKS_DISPLAY_OPTIONS_FILENAME as Z, parseAppleDisplayOptionsXml as ue, resolveArchiveMetadata as S, COMIC_INFO_FILENAME as Y, parseComicInfo as pe, KOBO_DISPLAY_OPTIONS_FILENAME as N, parseKoboXml as fe, tokenizeXmlSpaceSeparatedList as me } from "@prose-reader/archive-parser";
-import { XmlDocument as R, XmlTextNode as he, XmlElement as ge } from "xmldoc";
-import { Subject as x, mergeMap as Q, EMPTY as z, pairwise as ye, filter as E, startWith as be, from as F, tap as k, catchError as C, switchMap as T, merge as O, first as M, takeUntil as ve, map as $, ignoreElements as we, BehaviorSubject as $e, distinctUntilChanged as Ae, shareReplay as Fe, NEVER as B, timer as Te, finalize as Ie, of as Se, lastValueFrom as Re } from "rxjs";
-const W = (e, t) => {
+import { detectMimeTypeFromName as b, Report as ie, escapeXmlAttributeValue as N, isXmlBasedMimeType as ae, parseContentType as J, isMediaContentMimeType as ce, urlJoin as T } from "@prose-reader/shared";
+import { COMIC_INFO_FILENAME as W, parseOpf as de, APPLE_IBOOKS_DISPLAY_OPTIONS_FILENAME as Z, parseAppleDisplayOptionsXml as le, resolveArchiveMetadata as S, parseComicInfo as ue, KOBO_DISPLAY_OPTIONS_FILENAME as z, parseKoboXml as pe, tokenizeXmlSpaceSeparatedList as fe } from "@prose-reader/archive-parser";
+import { XmlDocument as R, XmlTextNode as me, XmlElement as he } from "xmldoc";
+import { Subject as x, mergeMap as Y, EMPTY as O, pairwise as ge, filter as E, startWith as ye, from as F, tap as k, catchError as C, switchMap as I, merge as M, first as D, takeUntil as be, map as $, ignoreElements as ve, BehaviorSubject as we, distinctUntilChanged as $e, shareReplay as Ae, NEVER as B, timer as Fe, finalize as Ie, of as Te, lastValueFrom as Se } from "rxjs";
+const P = (e, t) => {
   const o = e.split(/(\d+)/), r = t.split(/(\d+)/);
   for (let n = 0, s = o.length; n < s; n++)
     if (o[n] !== r[n])
       return o[n]?.match(/\d/) ? +(o[n] || "") - +(r[n] || "") : (o[n] || "").localeCompare(r[n] || "");
   return 1;
-}, A = (e) => e.substring(e.lastIndexOf("/") + 1) || e, j = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Le = (e) => {
+}, A = (e) => e.substring(e.lastIndexOf("/") + 1) || e, j = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Re = (e) => {
   const t = e.lastIndexOf("/");
   return t >= 0 ? e.substring(0, t) : "";
-}, Nt = async (e, { orderByAlpha: t, name: o } = {}) => {
-  let r = e;
-  return t && (r = r.slice().sort((n, s) => W(n.name, s.name))), {
+}, Dt = async (e, {
+  orderByAlpha: t,
+  name: o,
+  encodingFormat: r
+} = {}) => {
+  let n = e;
+  return t && (n = n.slice().sort((s, i) => P(s.name, i.name))), {
     filename: o || "",
-    records: r.map((n) => {
-      const s = n.size, i = A(n.name);
-      return n.isDir ? {
+    encodingFormat: r,
+    records: n.map((s) => {
+      const i = s.size, a = A(s.name);
+      return s.isDir ? {
         dir: !0,
-        basename: i,
-        uri: n.name,
-        size: s
+        basename: a,
+        uri: s.name,
+        size: i
       } : {
-        dir: n.isDir,
-        basename: i,
-        encodingFormat: b(n.name),
-        uri: n.name,
-        blob: async () => new Blob([await n.data()], {
-          type: b(n.name) ?? ""
+        dir: s.isDir,
+        basename: a,
+        encodingFormat: b(s.name),
+        uri: s.name,
+        blob: async () => new Blob([await s.data()], {
+          type: b(s.name) ?? ""
         }),
         string: async () => {
-          const a = await n.data();
+          const c = await s.data();
           return String.fromCharCode.apply(
             null,
-            Array.from(new Uint16Array(a))
+            Array.from(new Uint16Array(c))
           );
         },
-        size: s
+        size: i
       };
     }),
     close: () => Promise.resolve()
   };
-}, xe = "@prose-reader/streamer", f = ae.namespace(xe, !1, {
+}, Le = "@prose-reader/streamer", f = ie.namespace(Le, !1, {
   color: "#ffae42"
-}), Ee = (e) => {
+}), xe = (e) => {
   const t = {};
   for (const r of e) {
     const n = r.split("/");
@@ -61,57 +66,66 @@ ${o(p, u)}` : `${d}${s}`;
   }).join(`
 `);
   return o(t);
-}, zt = async (e, { orderByAlpha: t, name: o } = {}) => {
-  let r = Object.values(e.files);
-  t && (r = r.slice().sort((s, i) => W(s.name, i.name)));
-  const n = {
+}, Bt = async (e, {
+  orderByAlpha: t,
+  name: o,
+  encodingFormat: r
+} = {}) => {
+  let n = Object.values(e.files);
+  t && (n = n.slice().sort((i, a) => P(i.name, a.name)));
+  const s = {
     filename: o || "",
-    records: r.map((s) => {
-      const i = s._data.uncompressedSize, a = A(s.name);
-      return s.dir ? {
+    encodingFormat: r,
+    records: n.map((i) => {
+      const a = i._data.uncompressedSize, c = A(i.name);
+      return i.dir ? {
         dir: !0,
-        basename: a,
-        uri: s.name,
-        size: i
+        basename: c,
+        uri: i.name,
+        size: a
       } : {
         dir: !1,
-        basename: A(s.name),
-        uri: s.name,
-        encodingFormat: b(s.name),
-        blob: () => s.async("blob"),
-        string: () => s.async("string"),
-        ...s.internalStream && {
-          stream: s.internalStream
+        basename: A(i.name),
+        uri: i.name,
+        encodingFormat: b(i.name),
+        blob: () => i.async("blob"),
+        string: () => i.async("string"),
+        ...i.internalStream && {
+          stream: i.internalStream
         },
         // this is private API
         // @ts-expect-error
-        size: s._data.uncompressedSize
+        size: i._data.uncompressedSize
       };
     }),
     close: () => Promise.resolve()
   };
-  if (f.log("Generated archive", n), process.env.NODE_ENV === "development" && f.isEnabled()) {
-    const s = Ee(r.map((i) => i.name));
+  if (f.log("Generated archive", s), process.env.NODE_ENV === "development" && f.isEnabled()) {
+    const i = xe(n.map((a) => a.name));
     f.groupCollapsed(...f.getGroupArgs("Archive folder structure")), f.log(`
-${s}`), f.groupEnd();
+${i}`), f.groupEnd();
   }
-  return n;
-}, Ot = async (e, { name: t } = {}) => {
-  const o = await e.getFilesArray(), r = {
+  return s;
+}, jt = async (e, {
+  name: t,
+  encodingFormat: o
+} = {}) => {
+  const r = await e.getFilesArray(), n = {
     close: () => e.close(),
     filename: t ?? "",
-    records: o.map((n) => ({
+    encodingFormat: o,
+    records: r.map((s) => ({
       dir: !1,
-      basename: n.file.name,
-      encodingFormat: b(n.file.name),
-      size: n.file.size,
-      uri: `${n.path}${n.file.name}`,
-      blob: async () => await n.file.extract(),
-      string: async () => (await n.file.extract()).text()
+      basename: s.file.name,
+      encodingFormat: b(s.file.name),
+      size: s.file.size,
+      uri: `${s.path}${s.file.name}`,
+      blob: async () => await s.file.extract(),
+      string: async () => (await s.file.extract()).text()
     }))
   };
-  return f.log("Generated archive", r), r;
-}, Mt = async (e, {
+  return f.log("Generated archive", n), n;
+}, Ut = async (e, {
   mimeType: t,
   direction: o
 } = { mimeType: "text/plain" }) => {
@@ -133,6 +147,7 @@ ${s}`), f.groupEnd();
     `;
   return {
     filename: "content.txt",
+    encodingFormat: t,
     records: [
       {
         dir: !1,
@@ -154,26 +169,26 @@ ${s}`), f.groupEnd();
     ],
     close: () => Promise.resolve()
   };
-}, ke = /^[A-Za-z0-9_][A-Za-z0-9_.-]*$/, Ce = /^[A-Za-z0-9_]/, D = /^xml/i, We = /[^A-Za-z0-9_.-]+/g, U = "_", Pe = (e) => e.replace(/^_+|_+$/g, ""), _e = (e) => Pe(
-  e.trim().replaceAll("/", "_").replace(We, "_")
-), Ne = (e) => {
-  if (ke.test(e) && !D.test(e))
+}, Ee = /^[A-Za-z0-9_][A-Za-z0-9_.-]*$/, ke = /^[A-Za-z0-9_]/, U = /^xml/i, Ce = /[^A-Za-z0-9_.-]+/g, H = "_", We = (e) => e.replace(/^_+|_+$/g, ""), Pe = (e) => We(
+  e.trim().replaceAll("/", "_").replace(Ce, "_")
+), _e = (e) => {
+  if (Ee.test(e) && !U.test(e))
     return e;
-  const t = _e(e), o = t && !D.test(t) ? t : `${U}${t}`;
-  return Ce.test(o) ? o : `${U}${o}`;
-}, ze = (e, t) => {
-  const o = Ne(e);
+  const t = Pe(e), o = t && !U.test(t) ? t : `${H}${t}`;
+  return ke.test(o) ? o : `${H}${o}`;
+}, Ne = (e, t) => {
+  const o = _e(e);
   if (!t.has(o))
     return t.add(o), o;
   let r = 2, n = `${o}-${r}`;
   for (; t.has(n); )
     r += 1, n = `${o}-${r}`;
   return t.add(n), n;
-}, ee = () => {
+}, Q = () => {
   const e = /* @__PURE__ */ new Set();
-  return (t) => ze(t, e);
-}, Bt = async (e, t) => {
-  const o = ee(), r = e.map((a) => ({
+  return (t) => Ne(t, e);
+}, Ht = async (e, t) => {
+  const o = Q(), r = e.map((a) => ({
     id: o(a),
     url: a
   })), n = `
@@ -185,7 +200,7 @@ ${s}`), f.groupEnd();
       <manifest>
         ${r.map(({ id: a, url: c }) => {
     const d = b(c);
-    return `<item id="${a}" href="${_(c)}" media-type="${_(d ?? "")}"/>`;
+    return `<item id="${a}" href="${N(c)}" media-type="${N(d ?? "")}"/>`;
   }).join(`
 `)}
       </manifest>
@@ -215,11 +230,13 @@ ${s}`), f.groupEnd();
     }, ...s],
     close: () => Promise.resolve()
   };
-}, jt = ({
+}, ze = (e) => !e.dir, Oe = W.toLowerCase(), Me = (e) => e.records.find(
+  (t) => ze(t) && t.basename.toLowerCase() === Oe
+), Xt = ({
   enableReport: e
 } = {}) => {
   f.enable(!!e);
-}, P = (e) => {
+}, _ = (e) => {
   const o = Object.values(e.records).filter(
     (r) => !r.dir
   ).find((r) => r.uri.endsWith(".opf"));
@@ -228,25 +245,25 @@ ${s}`), f.groupEnd();
     basePath: o?.uri.substring(0, o.uri.lastIndexOf("/")) || ""
   };
 };
-async function te(e) {
-  const { data: t, basePath: o } = P(e) || {};
+async function ee(e) {
+  const { data: t, basePath: o } = _(e) || {};
   if (!t || t.dir)
     return;
   const r = await t.string();
   return {
-    opf: le(r),
+    opf: de(r),
     basePath: o
   };
 }
-const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
+const De = Z.toLowerCase(), Be = ({ archive: e }) => async (t) => {
   const o = e.records.find(
-    (n) => !n.dir && n.basename.toLowerCase() === Oe
+    (n) => !n.dir && n.basename.toLowerCase() === De
   );
   if (!o || o.dir)
     return t;
   const r = await o.string();
   try {
-    const n = ue(r), { renditionLayout: s } = S(n);
+    const n = le(r), { renditionLayout: s } = S(n);
     return {
       ...t,
       renditionLayout: t.renditionLayout ?? s
@@ -258,35 +275,33 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
       r
     ), console.error(n), t;
   }
-}, H = Y.toLowerCase(), Be = ({ archive: e }) => async (t) => {
-  const o = e.records.find(
-    (s) => s.basename.toLowerCase() === H && !s.dir
-  );
-  if (!o || o.dir)
+}, je = W.toLowerCase(), Ue = ({ archive: e }) => async (t) => {
+  const o = Me(e);
+  if (!o)
     return t;
   const r = {
     ...t,
     spineItems: t.spineItems.filter(
-      (s) => !s.id.toLowerCase().endsWith(H)
+      (s) => !s.id.toLowerCase().endsWith(je)
     ).map((s, i, a) => ({
       ...s,
       progressionWeight: 1 / a.length
     }))
   }, n = await o.string();
   try {
-    const s = pe(n), i = S(s);
+    const s = ue(n), i = S(s);
     return {
       ...r,
-      readingDirection: i.readingDirection ?? "ltr"
+      readingDirection: i.readingDirection ?? r.readingDirection
     };
   } catch (s) {
     return console.error(
-      `Unable to parse ${Y} for content
+      `Unable to parse ${W} for content
 `,
       n
     ), console.error(s), r;
   }
-}, je = ({
+}, He = ({
   baseUrl: e = "",
   resourcePath: t
 }) => {
@@ -294,8 +309,8 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
     return encodeURI(t);
   const o = e ? `${e}${e.endsWith("/") ? "" : "/"}` : "file://";
   return encodeURI(`${o}${t}`);
-}, De = ({ archive: e, baseUrl: t }) => async () => {
-  const o = Object.values(e.records).filter((s) => !s.dir), r = ee(), n = o.map((s) => ({
+}, Xe = ({ archive: e, baseUrl: t }) => async () => {
+  const o = Object.values(e.records).filter((s) => !s.dir), r = Q(), n = o.map((s) => ({
     file: s,
     id: r(s.uri)
   }));
@@ -304,11 +319,11 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
     title: e.records.find(({ dir: s }) => s)?.basename.replace(/\/$/, "") || e.filename,
     renditionLayout: void 0,
     renditionSpread: "auto",
-    readingDirection: "ltr",
+    readingDirection: void 0,
     spineItems: n.filter(({ file: s }) => !s.basename.endsWith(".db")).map(({ file: s, id: i }, a) => ({
       id: i,
       index: a,
-      href: je({
+      href: He({
         baseUrl: t,
         resourcePath: s.uri
       }),
@@ -323,15 +338,15 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
       href: encodeURI(`${t}${s.uri}`)
     }))
   };
-}, ne = async ({
+}, te = async ({
   archive: e,
   archiveOpf: t
 }) => {
   if (!t) return [];
   const { opf: o, basePath: r } = t, { spineRows: n } = o;
   return e.records.filter((i) => n.find((a) => r ? `${r}/${a.href}` === i.uri : `${a.href}` === i.uri));
-}, re = (e, t, o) => {
-  const { basePath: r } = P(t) || {};
+}, ne = (e, t, o) => {
+  const { basePath: r } = _(t) || {};
   return e.map((n) => {
     const s = n.href, i = o?.(s) ?? "";
     return {
@@ -340,18 +355,18 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
       mediaType: n.mediaType
     };
   });
-}, Ue = (e) => {
+}, Ve = (e) => {
   const t = e?.trim();
   return t === "scrolled-continuous" || t === "scrolled-doc" || t === "paginated" || t === "auto" ? t : "auto";
-}, He = (e) => {
+}, Ge = (e) => {
   const t = e?.trim();
   if (t === "none" || t === "landscape" || t === "portrait" || t === "both" || t === "auto")
     return t;
-}, Xe = (e) => {
+}, Ke = (e) => {
   const t = e?.trim();
   if (t === "cover" || t === "title-page" || t === "copyright-page" || t === "text")
     return t;
-}, Ve = ({
+}, qe = ({
   archive: e,
   baseUrl: t,
   archiveOpf: o
@@ -360,7 +375,7 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
     return r;
   const { opf: n, basePath: s } = o, i = S(n);
   f.groupCollapsed(...f.getGroupArgs("OPF parsed")), f.log("opf", n), f.groupEnd();
-  const a = n.renditionLayoutMeta?.trim(), c = a === "reflowable" || a === "pre-paginated" ? a : i.renditionLayout, d = n.title?.trim() || e.records.find(({ dir: l }) => l)?.basename || "", u = i.readingDirection ?? "ltr", m = (await ne({
+  const a = n.renditionLayoutMeta?.trim(), c = a === "reflowable" || a === "pre-paginated" ? a : i.renditionLayout, d = n.title?.trim() || e.records.find(({ dir: l }) => l)?.basename || "", u = i.readingDirection ?? r.readingDirection, m = (await te({
     archive: e,
     archiveOpf: o
   })).reduce(
@@ -368,14 +383,14 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
     0
   ), h = n.guide, y = [];
   for (const l of h) {
-    const v = Xe(l.type);
+    const v = Ke(l.type);
     v !== void 0 && y.push({ href: l.href, title: l.title, type: v });
   }
   return {
     filename: e.filename,
     renditionLayout: c,
-    renditionFlow: Ue(n.renditionFlowMeta),
-    renditionSpread: He(n.renditionSpreadMeta),
+    renditionFlow: Ve(n.renditionFlowMeta),
+    renditionSpread: Ge(n.renditionSpreadMeta),
     title: d,
     readingDirection: u,
     /**
@@ -395,30 +410,30 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
         mediaType: l.mediaType
       };
     }),
-    items: re(n.manifestItems, e, (l) => /^https?:\/\//.test(l) ? "" : t || "file://"),
+    items: ne(n.manifestItems, e, (l) => /^https?:\/\//.test(l) ? "" : t || "file://"),
     guide: y.length > 0 ? y : void 0
   };
-}, Ge = (e) => {
+}, Je = (e) => {
   const t = e.descendantWithPath("head")?.childrenNamed("meta").find((o) => o.attr.name === "viewport");
   return !!(t && t.attr.name === "viewport");
-}, Ke = (e) => e.reduce(async (t, o) => {
-  if (!await t || !ce({
+}, Ze = (e) => e.reduce(async (t, o) => {
+  if (!await t || !ae({
     mimeType: o.encodingFormat,
     uri: o.uri
   }))
     return !1;
   const n = o.dir ? null : await o.string();
-  return n ? Ge(new R(n)) : !1;
-}, Promise.resolve(!0)), qe = ({
+  return n ? Je(new R(n)) : !1;
+}, Promise.resolve(!0)), Ye = ({
   archive: e,
   archiveOpf: t
 }) => async (o) => {
   if (o.renditionLayout === "reflowable" && o.spineItems.every((n) => n.renditionLayout === "reflowable")) {
-    const n = await ne({
+    const n = await te({
       archive: e,
       archiveOpf: t
     });
-    if (await Ke(n))
+    if (await Ze(n))
       return {
         ...o,
         spineItems: o.spineItems.map((i) => ({
@@ -429,18 +444,21 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
       };
   }
   return o;
-}, Je = async (e) => {
+}, Qe = () => (e) => ({
+  ...e,
+  readingDirection: e.readingDirection ?? "ltr"
+}), et = async (e) => {
   let t;
   return await Promise.all(
     e.records.map(async (o) => {
-      if (o.dir || !o.uri.endsWith(N)) return;
+      if (o.dir || !o.uri.endsWith(z)) return;
       const r = await o.string();
       try {
-        const { renditionLayout: n } = fe(r);
+        const { renditionLayout: n } = pe(r);
         n && (t = n);
       } catch (n) {
         console.error(
-          `Unable to parse ${N} for content
+          `Unable to parse ${z} for content
 `,
           r
         ), console.error(n);
@@ -450,15 +468,15 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
     kind: "kobo",
     ...t !== void 0 ? { renditionLayout: t } : {}
   };
-}, Ze = ({ archive: e }) => async (t) => {
-  const o = await Je(e), { renditionLayout: r } = S(o);
+}, tt = ({ archive: e }) => async (t) => {
+  const o = await et(e), { renditionLayout: r } = S(o);
   return {
     ...t,
     renditionLayout: t.renditionLayout ?? r
   };
-}, X = (e) => e.toLowerCase().endsWith(".opf"), Ye = (e) => e.records.some(
+}, X = (e) => e.toLowerCase().endsWith(".opf"), nt = (e) => e.records.some(
   (t) => !t.dir && (X(t.basename) || X(t.uri))
-), Qe = ({ archive: e }) => async (t) => Ye(e) ? t : {
+), rt = ({ archive: e }) => async (t) => nt(e) ? t : {
   ...t,
   spineItems: t.spineItems.map((r) => {
     const n = e.records.find(
@@ -466,10 +484,10 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
     ), s = J(n?.encodingFormat ?? "") || b(n?.basename ?? "");
     return {
       ...r,
-      renditionLayout: s && de(s) ? "pre-paginated" : r.renditionLayout
+      renditionLayout: s && ce(s) ? "pre-paginated" : r.renditionLayout
     };
   })
-}, se = (e) => e ? e.children.map((t) => t instanceof he ? t.text : t instanceof ge ? se(t) : "").join("").trim() : "", et = (e) => me(e.properties).includes("nav"), oe = (e, { basePath: t, baseUrl: o }) => {
+}, re = (e) => e ? e.children.map((t) => t instanceof me ? t.text : t instanceof he ? re(t) : "").join("").trim() : "", st = (e) => fe(e.properties).includes("nav"), se = (e, { basePath: t, baseUrl: o }) => {
   const r = {
     contents: [],
     path: "",
@@ -477,55 +495,55 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
     title: ""
   };
   let n = e.childNamed("span") || e.childNamed("a");
-  r.title = (n?.attr.title || n?.val.trim() || se(n)) ?? "";
+  r.title = (n?.attr.title || n?.val.trim() || re(n)) ?? "";
   let s = n?.name;
-  s !== "a" && (n = e.descendantWithPath(`${s}.a`), n && (s = n.name.toLowerCase())), s === "a" && n?.attr.href && (r.path = I(t, n.attr.href), r.href = I(o, t, n.attr.href));
+  s !== "a" && (n = e.descendantWithPath(`${s}.a`), n && (s = n.name.toLowerCase())), s === "a" && n?.attr.href && (r.path = T(t, n.attr.href), r.href = T(o, t, n.attr.href));
   const i = e.childNamed("ol");
   if (i) {
     const a = i.childrenNamed("li");
     a && a.length > 0 && (r.contents = a.map(
-      (c) => oe(c, { basePath: t, baseUrl: o })
+      (c) => se(c, { basePath: t, baseUrl: o })
     ));
   }
   return r;
-}, tt = (e, { basePath: t, baseUrl: o }) => {
+}, ot = (e, { basePath: t, baseUrl: o }) => {
   const r = [];
   let n;
   return e.descendantWithPath("body.nav.ol") ? n = e.descendantWithPath("body.nav.ol")?.children : e.descendantWithPath("body.section.nav.ol") && (n = e.descendantWithPath("body.section.nav.ol")?.children), n && n.length > 0 && n.filter((s) => s.name === "li").forEach((s) => {
-    r.push(oe(s, { basePath: t, baseUrl: o }));
+    r.push(se(s, { basePath: t, baseUrl: o }));
   }), r;
-}, nt = async (e, t, { baseUrl: o }) => {
-  const r = e.manifestItems.find(et);
+}, it = async (e, t, { baseUrl: o }) => {
+  const r = e.manifestItems.find(st);
   if (r?.href) {
     const n = Object.values(t.records).find(
       (s) => s.uri.endsWith(r.href)
     );
     if (n && !n.dir) {
-      const s = new R(await n.string()), i = Le(n.uri);
-      return tt(s, { basePath: i, baseUrl: o });
+      const s = new R(await n.string()), i = Re(n.uri);
+      return ot(s, { basePath: i, baseUrl: o });
     }
   }
-}, ie = (e, {
+}, oe = (e, {
   opfBasePath: t,
   baseUrl: o,
   prefix: r
 }) => {
   const n = e?.childNamed(`${r}content`)?.attr.src || "", s = {
     title: e?.descendantWithPath(`${r}navLabel.${r}text`)?.val || "",
-    path: I(t, n),
-    href: I(o, t, n),
+    path: T(t, n),
+    href: T(o, t, n),
     contents: []
   }, i = e.childrenNamed(`${r}navPoint`);
   return i && i.length > 0 && (s.contents = i.map(
-    (a) => ie(a, { opfBasePath: t, baseUrl: o, prefix: r })
+    (a) => oe(a, { opfBasePath: t, baseUrl: o, prefix: r })
   )), s;
-}, rt = (e, { opfBasePath: t, baseUrl: o }) => {
+}, at = (e, { opfBasePath: t, baseUrl: o }) => {
   const r = [], n = e.name;
   let s = "";
   return n.indexOf(":") !== -1 && (s = `${n.split(":")[0]}:`), e.childNamed(`${s}navMap`)?.childrenNamed(`${s}navPoint`).forEach((i) => {
-    r.push(ie(i, { opfBasePath: t, baseUrl: o, prefix: s }));
+    r.push(oe(i, { opfBasePath: t, baseUrl: o, prefix: s }));
   }), r;
-}, st = async ({
+}, ct = async ({
   opf: e,
   opfBasePath: t,
   baseUrl: o,
@@ -540,17 +558,17 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
       );
       if (a && !a.dir) {
         const c = new R(await a.string());
-        return rt(c, { opfBasePath: t, baseUrl: o });
+        return at(c, { opfBasePath: t, baseUrl: o });
       }
     }
   }
-}, ot = async (e, t, { baseUrl: o }) => {
-  const { basePath: r } = P(t) || {}, n = await nt(e, t, {
+}, dt = async (e, t, { baseUrl: o }) => {
+  const { basePath: r } = _(t) || {}, n = await it(e, t, {
     baseUrl: o
   });
   if (n)
     return n;
-  const s = await st({
+  const s = await ct({
     opf: e,
     opfBasePath: r ?? "",
     archive: t,
@@ -558,22 +576,22 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
   });
   if (s)
     return s;
-}, it = (e) => e.replace(/\.[^.]+$/, "").replace(/[_-]/g, " ").replace(/\s+/g, " ").trim(), at = (e, t) => {
+}, lt = (e) => e.replace(/\.[^.]+$/, "").replace(/[_-]/g, " ").replace(/\s+/g, " ").trim(), ut = (e, t) => {
   if (!(e.spineItems.length === 0 || !e.spineItems.every((r) => (J(r.mediaType ?? "") || b(r.href))?.startsWith("audio/"))))
     return e.spineItems.map((r) => {
       const n = t.records.find(
         (s) => !s.dir && decodeURI(r.href).endsWith(s.uri)
       );
       return {
-        title: it(n?.basename ?? r.href),
+        title: lt(n?.basename ?? r.href),
         href: r.href,
         path: n?.uri ?? r.href,
         contents: []
       };
     });
-}, ct = (e, { baseUrl: t }) => {
+}, pt = (e, { baseUrl: t }) => {
   const o = [...e.records].sort(
-    (n, s) => W(n.uri, s.uri)
+    (n, s) => P(n.uri, s.uri)
   ), r = (n, s, i, a, c) => {
     const d = n.find((m) => m.title === s), [u, ...p] = i;
     return d ? u ? [
@@ -626,27 +644,27 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
     if (s.dir) return n;
     const i = s.uri.split("/").slice(0, -1), [a, ...c] = i;
     if (!a) return n;
-    const d = I(t, encodeURI(s.uri)).replace(/\/$/, ""), u = s.uri.replace(/\/$/, "");
+    const d = T(t, encodeURI(s.uri)).replace(/\/$/, ""), u = s.uri.replace(/\/$/, "");
     return r(n, a, c, d, u);
   }, []);
-}, dt = async (e, t, {
+}, ft = async (e, t, {
   baseUrl: o,
   archiveOpf: r
 }) => {
   if (r)
-    return await ot(r.opf, e, { baseUrl: o }) || [];
-  const n = at(t, e);
+    return await dt(r.opf, e, { baseUrl: o }) || [];
+  const n = ut(t, e);
   if (n) return n;
-  const s = ct(e, { baseUrl: o });
+  const s = pt(e, { baseUrl: o });
   if (s.length !== 0)
     return s;
-}, lt = ({
+}, mt = ({
   archive: e,
   baseUrl: t,
   archiveOpf: o
 }) => async (r) => {
   if (r.nav) return r;
-  const n = await dt(e, r, {
+  const n = await ft(e, r, {
     baseUrl: t,
     archiveOpf: o
   });
@@ -656,34 +674,35 @@ const Oe = Z.toLowerCase(), Me = ({ archive: e }) => async (t) => {
       toc: n
     }
   } : r;
-}, ut = (e) => e ? e.endsWith("/") ? e : `${e}/` : "", pt = async (e, {
+}, ht = (e) => e ? e.endsWith("/") ? e : `${e}/` : "", gt = async (e, {
   baseUrl: t = "",
   hooks: o = {}
 } = {}) => {
   f.log("Generating manifest from archive", e);
-  const r = await te(e), n = ut(t), s = (p) => (p ?? []).map(
+  const r = await ee(e), n = ht(t), s = (p) => (p ?? []).map(
     (m) => m({ archive: e, baseUrl: n })
   ), i = [
-    Ve({ archive: e, baseUrl: n, archiveOpf: r }),
+    qe({ archive: e, baseUrl: n, archiveOpf: r }),
+    Ue({ archive: e }),
     Be({ archive: e }),
-    Me({ archive: e }),
-    Qe({ archive: e }),
+    rt({ archive: e }),
     ...s(o.content)
   ], a = s(o.spine), c = [
-    qe({ archive: e, archiveOpf: r }),
-    Ze({ archive: e }),
+    Ye({ archive: e, archiveOpf: r }),
+    tt({ archive: e }),
     ...s(o.presentation)
   ], d = [
-    lt({ archive: e, baseUrl: n, archiveOpf: r }),
+    mt({ archive: e, baseUrl: n, archiveOpf: r }),
     ...s(o.navigation)
   ], u = [
     ...i,
     ...a,
     ...c,
-    ...d
+    ...d,
+    Qe()
   ];
   try {
-    const p = De({
+    const p = Xe({
       archive: e,
       baseUrl: n
     })(), m = await u.reduce(async (h, y) => await y(await h), p);
@@ -696,19 +715,19 @@ ${h}`), f.groupEnd();
   } catch (p) {
     throw f.error(p), p;
   }
-}, ft = (e) => {
+}, yt = (e) => {
   const t = e.descendantWithPath("head")?.childrenNamed("meta").find((o) => o.attr.name === "calibre:cover");
   return !!(t && t.attr.name === "calibre:cover");
-}, mt = (e) => e.descendantWithPath("body")?.descendantWithPath("div")?.childrenNamed("svg")?.find(
+}, bt = (e) => e.descendantWithPath("body")?.descendantWithPath("div")?.childrenNamed("svg")?.find(
   (t) => t.attr.width === "100%" && t.attr.preserveAspectRatio === "none"
-), ht = ({ archive: e, resourcePath: t }) => async (o) => {
+), vt = ({ archive: e, resourcePath: t }) => async (o) => {
   const r = Object.values(e.records).find(
     (n) => n.uri === t && !n.dir
   );
   if (r && !r.dir && r.basename.endsWith(".xhtml")) {
     const n = typeof o.body == "string" ? o.body : await r.string(), s = new R(n);
-    if (ft(s)) {
-      const i = mt(s);
+    if (yt(s)) {
+      const i = bt(s);
       return i && delete i.attr.preserveAspectRatio, {
         ...o,
         body: s?.toString()
@@ -716,7 +735,7 @@ ${h}`), f.groupEnd();
     }
   }
   return o;
-}, gt = ({ archive: e, resourcePath: t }) => async (o) => ht({ archive: e, resourcePath: t })(o), yt = ({ archive: e, resourcePath: t }) => async (o) => {
+}, wt = ({ archive: e, resourcePath: t }) => async (o) => vt({ archive: e, resourcePath: t })(o), $t = ({ archive: e, resourcePath: t }) => async (o) => {
   const r = Object.values(e.records).find(
     (n) => n.uri === t && !n.dir
   );
@@ -731,10 +750,10 @@ ${h}`), f.groupEnd();
     };
   }
   return o;
-}, bt = async (e, t) => {
-  const o = await te(e);
+}, At = async (e, t) => {
+  const o = await ee(e);
   if (o) {
-    const { opf: r } = o, n = re(r.manifestItems, e, () => "");
+    const { opf: r } = o, n = ne(r.manifestItems, e, () => "");
     if (n.find(
       (i) => t.endsWith(i.href)
     )?.mediaType)
@@ -743,9 +762,9 @@ ${h}`), f.groupEnd();
       };
   }
   return {
-    mediaType: vt(t)
+    mediaType: Ft(t)
   };
-}, vt = (e) => {
+}, Ft = (e) => {
   if (e.endsWith(".css"))
     return "text/css; charset=UTF-8";
   if (e.endsWith(".jpg"))
@@ -756,12 +775,12 @@ ${h}`), f.groupEnd();
     return "video/mp4";
   if (e.endsWith(".svg"))
     return "image/svg+xml";
-}, wt = ({ archive: e, resourcePath: t }) => async (o) => {
+}, It = ({ archive: e, resourcePath: t }) => async (o) => {
   const r = Object.values(e.records).find(
     (s) => s.uri === t && !s.dir
   );
   if (!r || r.dir) return o;
-  const n = await bt(e, t);
+  const n = await At(e, t);
   return {
     ...o,
     params: {
@@ -825,7 +844,7 @@ ${h}`), f.groupEnd();
   "canvas",
   "script",
   "style"
-], $t = ({ archive: e, resourcePath: t }) => async (o) => {
+], Tt = ({ archive: e, resourcePath: t }) => async (o) => {
   const r = Object.values(e.records).find(
     (n) => n.uri === t && !n.dir
   );
@@ -849,15 +868,15 @@ ${h}`), f.groupEnd();
     };
   }
   return o;
-}, At = async (e, t, { hooks: o = [] } = {}) => {
+}, St = async (e, t, { hooks: o = [] } = {}) => {
   const r = {
     params: {}
   }, s = [
     ...o.map((i) => i({ archive: e, resourcePath: t })),
-    wt({ archive: e, resourcePath: t }),
+    It({ archive: e, resourcePath: t }),
+    Tt({ archive: e, resourcePath: t }),
     $t({ archive: e, resourcePath: t }),
-    yt({ archive: e, resourcePath: t }),
-    gt({ archive: e, resourcePath: t })
+    wt({ archive: e, resourcePath: t })
   ];
   try {
     const i = await s.reduce(async (c, d) => await d(await c), Promise.resolve(r));
@@ -876,9 +895,9 @@ ${h}`), f.groupEnd();
     throw f.error(i), i;
   }
 };
-class Ft {
+class Rt {
   constructor(t) {
-    this.cleanArchiveAfter = t, this.state$ = new $e({
+    this.cleanArchiveAfter = t, this.state$ = new we({
       status: "idle",
       locks: 0
     });
@@ -895,27 +914,27 @@ class Ft {
   get isUnlocked$() {
     return this.locks$.pipe(
       $((t) => t <= 0),
-      Ae(),
-      Fe()
+      $e(),
+      Ae()
     );
   }
   get overTTL$() {
     return this.isUnlocked$.pipe(
-      T(
-        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? B : Te(this.cleanArchiveAfter) : B
+      I(
+        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? B : Fe(this.cleanArchiveAfter) : B
       )
     );
   }
 }
-const Tt = ({
+const Lt = ({
   getArchive: e,
   cleanArchiveAfter: t = 300 * 1e3
   // 5mn
 }) => {
   const o = new x(), r = new x(), n = new x(), s = {}, i = o.pipe(
-    Q((d) => {
+    Y((d) => {
       const u = s[d];
-      if (!u || u.state.status !== "idle") return z;
+      if (!u || u.state.status !== "idle") return O;
       let p = !1;
       const m = (g) => {
         f.debug(`Cleaning up archive with key: ${g}`);
@@ -926,9 +945,9 @@ const Tt = ({
         status: "loading"
       });
       const h = u.locks$, y = u.isUnlocked$, l = h.pipe(
-        ye(),
+        ge(),
         E(([g, w]) => w > g),
-        be(!0)
+        ye(!0)
       );
       return F(e(d)).pipe(
         k((g) => {
@@ -940,15 +959,15 @@ const Tt = ({
         C((g) => (m(d), u.update({
           status: "error",
           error: g
-        }), z)),
-        T(() => {
+        }), O)),
+        I(() => {
           const g = l.pipe(
-            T(() => n),
-            T(() => y),
+            I(() => n),
+            I(() => y),
             E((L) => L)
           );
-          return O(g, u.overTTL$).pipe(
-            M(),
+          return M(g, u.overTTL$).pipe(
+            D(),
             k(() => {
               m(d);
             })
@@ -956,10 +975,10 @@ const Tt = ({
         })
       );
     }),
-    ve(r)
+    be(r)
   ), a = (d) => {
     let u = !1;
-    const p = s[d] ?? new Ft(t);
+    const p = s[d] ?? new Rt(t);
     s[d] = p, p.update({
       locks: p.state.locks + 1
     });
@@ -977,10 +996,10 @@ const Tt = ({
         if (l)
           throw l;
       }),
-      we()
+      ve()
     );
-    return O(h, y).pipe(
-      M(),
+    return M(h, y).pipe(
+      D(),
       $((l) => ({ archive: l, release: m })),
       C((l) => {
         throw m(), l;
@@ -1003,7 +1022,7 @@ const Tt = ({
 } : {
   valid: !0,
   value: void 0
-}, It = (e) => {
+}, xt = (e) => {
   if (!e.toLowerCase().startsWith("bytes="))
     return {
       kind: "missing"
@@ -1030,7 +1049,7 @@ const Tt = ({
     start: s.value,
     end: i.value
   };
-}, St = (e) => {
+}, Et = (e) => {
   if (e instanceof Blob)
     return {
       size: e.size,
@@ -1047,7 +1066,7 @@ const Tt = ({
       return { content: n, length: n.byteLength };
     }
   };
-}, Rt = ({
+}, kt = ({
   body: e,
   contentType: t,
   rangeHeader: o
@@ -1058,13 +1077,13 @@ const Tt = ({
       status: 200,
       headers: r
     });
-  const n = It(o);
+  const n = xt(o);
   if (n.kind === "missing" || n.kind === "multi")
     return e instanceof Blob && r.set("Content-Length", String(e.size)), new Response(e, {
       status: 200,
       headers: r
     });
-  const s = St(e), i = s.size;
+  const s = Et(e), i = s.size;
   if (n.kind === "invalid")
     return new Response(null, {
       status: 416,
@@ -1096,24 +1115,24 @@ const Tt = ({
     status: 206,
     headers: r
   });
-}, K = "file://", Lt = /^https?:\/\//, xt = (e) => {
+}, K = "file://", Ct = /^https?:\/\//, Wt = (e) => {
   try {
     return decodeURIComponent(e);
   } catch {
     return e;
   }
-}, q = (e) => e.startsWith(K) ? e.slice(K.length) : e, Et = (e) => {
+}, q = (e) => e.startsWith(K) ? e.slice(K.length) : e, Pt = (e) => {
   const t = q(e);
-  return Lt.test(t) ? t : q(xt(t));
+  return Ct.test(t) ? t : q(Wt(t));
 };
-class kt {
+class _t {
   constructor({
     hooks: t,
     onError: o,
     onManifestSuccess: r,
     ...n
   }) {
-    this.onError = (s) => (console.error(s), new Response(String(s), { status: 500 })), this.archiveLoader = Tt(n), this.hooks = t ?? {}, this.onManifestSuccess = r ?? (({ manifest: s }) => Promise.resolve(s)), this.onError = o ?? this.onError;
+    this.onError = (s) => (console.error(s), new Response(String(s), { status: 500 })), this.archiveLoader = Lt(n), this.hooks = t ?? {}, this.onManifestSuccess = r ?? (({ manifest: s }) => Promise.resolve(s)), this.onError = o ?? this.onError;
   }
   prune() {
     this.archiveLoader.purge();
@@ -1131,27 +1150,27 @@ class kt {
     getResponse: o
   }) {
     const r = this.accessArchive(t).pipe(
-      Q(
+      Y(
         ({ archive: n, release: s }) => F(o(n)).pipe(
           Ie(() => {
             s();
           })
         )
       ),
-      C((n) => Se(this.onError(n)))
+      C((n) => Te(this.onError(n)))
     );
-    return Re(r);
+    return Se(r);
   }
   fetchManifest({ key: t, baseUrl: o }) {
     return this.withArchiveResponse({
       key: t,
       getResponse: (r) => F(
-        pt(r, {
+        gt(r, {
           baseUrl: o,
           hooks: this.hooks.manifest
         })
       ).pipe(
-        T(
+        I(
           (s) => F(this.onManifestSuccess({ manifest: s, archive: r }))
         ),
         $(
@@ -1170,14 +1189,14 @@ class kt {
     return this.withArchiveResponse({
       key: t,
       getResponse: (n) => {
-        const s = Et(o);
+        const s = Pt(o);
         return F(
-          At(n, s, {
+          St(n, s, {
             hooks: this.hooks.resource
           })
         ).pipe(
           $(
-            (a) => Rt({
+            (a) => kt({
               body: a.body ?? "",
               contentType: a.params.contentType,
               rangeHeader: r?.headers.get("range")
@@ -1188,7 +1207,7 @@ class kt {
     });
   }
 }
-class Dt extends kt {
+class Vt extends _t {
   constructor({
     getUriInfo: t,
     ...o
@@ -1219,23 +1238,24 @@ class Dt extends kt {
   }
 }
 export {
-  Dt as ServiceWorkerStreamer,
-  kt as Streamer,
-  jt as configure,
-  Nt as createArchiveFromArrayBufferList,
-  zt as createArchiveFromJszip,
-  Ot as createArchiveFromLibArchive,
-  Mt as createArchiveFromText,
-  Bt as createArchiveFromUrls,
-  ze as createUniqueXmlSafeId,
-  Ne as createXmlSafeId,
-  ee as createXmlSafeIdFactory,
-  pt as generateManifestFromArchive,
-  At as generateResourceFromArchive,
-  P as getArchiveOpfInfo,
-  Le as getUriBasePath,
+  Vt as ServiceWorkerStreamer,
+  _t as Streamer,
+  Xt as configure,
+  Dt as createArchiveFromArrayBufferList,
+  Bt as createArchiveFromJszip,
+  jt as createArchiveFromLibArchive,
+  Ut as createArchiveFromText,
+  Ht as createArchiveFromUrls,
+  Ne as createUniqueXmlSafeId,
+  _e as createXmlSafeId,
+  Q as createXmlSafeIdFactory,
+  gt as generateManifestFromArchive,
+  St as generateResourceFromArchive,
+  Me as getArchiveHasComicInfo,
+  _ as getArchiveOpfInfo,
+  Re as getUriBasePath,
   A as getUriBasename,
   j as removeTrailingSlash,
-  W as sortByTitleComparator
+  P as sortByTitleComparator
 };
 //# sourceMappingURL=index.js.map