@prose-reader/streamer 1.300.0 → 1.303.0

package/dist/index.js

@@ -1,50 +1,55 @@
-import { detectMimeTypeFromName as v, Report as re, isXmlBasedMimeType as se, parseContentType as G, isMediaContentMimeType as oe, urlJoin as L } from "@prose-reader/shared";
-import { parseOpf as ie, APPLE_IBOOKS_DISPLAY_OPTIONS_FILENAME as K, parseAppleDisplayOptionsXml as ae, resolveArchiveMetadata as I, COMIC_INFO_FILENAME as q, parseComicInfo as ce, KOBO_DISPLAY_OPTIONS_FILENAME as N, parseKoboXml as de, tokenizeXmlSpaceSeparatedList as le } from "@prose-reader/archive-parser";
-import { XmlDocument as R, XmlTextNode as pe, XmlElement as ue } from "xmldoc";
-import { Subject as S, mergeMap as J, EMPTY as O, pairwise as fe, filter as k, startWith as me, from as x, tap as C, catchError as W, switchMap as A, merge as z, first as M, takeUntil as he, map as F, ignoreElements as ge, BehaviorSubject as ye, distinctUntilChanged as be, shareReplay as ve, NEVER as B, timer as we, finalize as $e, of as Fe, lastValueFrom as xe } from "rxjs";
-const E = (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;
-}, b = (e) => e.substring(e.lastIndexOf("/") + 1) || e, j = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Ae = (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) : "";
-}, Lt = async (e, { orderByAlpha: t, name: o } = {}) => {
-  let r = e;
-  return t && (r = r.slice().sort((n, s) => E(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 = b(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: v(n.name),
-        uri: n.name,
-        blob: async () => new Blob([await n.data()], {
-          type: v(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()
   };
-}, Le = "@prose-reader/streamer", f = re.namespace(Le, !1, {
+}, Le = "@prose-reader/streamer", f = ie.namespace(Le, !1, {
   color: "#ffae42"
-}), Ie = (e) => {
+}), xe = (e) => {
   const t = {};
   for (const r of e) {
     const n = r.split("/");
@@ -55,63 +60,72 @@ const E = (e, t) => {
     }
   }
   const o = (r, n = "") => Object.keys(r).sort().map((s, i, a) => {
-    const c = i === a.length - 1, l = n + (c ? "└── " : "├── "), p = n + (c ? "    " : "│   "), u = r[s];
-    return u && Object.keys(u).length > 0 ? `${l}${s}/
-${o(u, p)}` : `${l}${s}`;
+    const c = i === a.length - 1, d = n + (c ? "└── " : "├── "), u = n + (c ? "    " : "│   "), p = r[s];
+    return p && Object.keys(p).length > 0 ? `${d}${s}/
+${o(p, u)}` : `${d}${s}`;
   }).join(`
 `);
   return o(t);
-}, It = async (e, { orderByAlpha: t, name: o } = {}) => {
-  let r = Object.values(e.files);
-  t && (r = r.slice().sort((s, i) => E(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 = b(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: b(s.name),
-        uri: s.name,
-        encodingFormat: v(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 = Ie(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;
-}, Rt = 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: v(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;
-}, Tt = async (e, {
+  return f.log("Generated archive", n), n;
+}, Ut = async (e, {
   mimeType: t,
   direction: o
 } = { mimeType: "text/plain" }) => {
@@ -133,10 +147,11 @@ ${s}`), f.groupEnd();
     `;
   return {
     filename: "content.txt",
+    encodingFormat: t,
     records: [
       {
         dir: !1,
-        basename: b("generated.opf"),
+        basename: A("generated.opf"),
         uri: "generated.opf",
         blob: async () => new Blob([r]),
         string: async () => r,
@@ -144,7 +159,7 @@ ${s}`), f.groupEnd();
       },
       {
         dir: !1,
-        basename: b("p01.txt"),
+        basename: A("p01.txt"),
         uri: "p01.txt",
         blob: async () => typeof e == "string" ? new Blob([e]) : e,
         string: async () => typeof e == "string" ? e : e.text(),
@@ -154,31 +169,53 @@ ${s}`), f.groupEnd();
     ],
     close: () => Promise.resolve()
   };
-}, St = async (e, t) => {
-  const o = `
+}, 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 = 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;
+}, Q = () => {
+  const e = /* @__PURE__ */ new Set();
+  return (t) => Ne(t, e);
+}, Ht = async (e, t) => {
+  const o = Q(), r = e.map((a) => ({
+    id: o(a),
+    url: a
+  })), n = `
     <?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">${t?.useRenditionFlow ? "reflowable" : "pre-paginated"}</meta>
         ${t?.useRenditionFlow ? '<meta property="rendition:flow">scrolled-continuous</meta>' : ""}
       </metadata>
       <manifest>
-        ${e.map(
-    (s) => `<item id="${b(s)}" href="${s}" media-type="${v(s)}"/>`
-  ).join(`
+        ${r.map(({ id: a, url: c }) => {
+    const d = b(c);
+    return `<item id="${a}" href="${N(c)}" media-type="${N(d ?? "")}"/>`;
+  }).join(`
 `)}
       </manifest>
       <spine>
-        ${e.map((s) => `<itemref idref="${b(s)}" />`).join(`
+        ${r.map(({ id: a }) => `<itemref idref="${a}" />`).join(`
 `)}
       </spine>
     </package>
-  `, r = e.map((s) => ({
+  `, s = e.map((a) => ({
     dir: !1,
-    basename: b(s),
-    encodingFormat: v(s),
-    uri: s,
+    basename: A(a),
+    encodingFormat: b(a),
+    uri: a,
     size: 100 / e.length,
-    blob: async () => (await fetch(s)).blob(),
+    blob: async () => (await fetch(a)).blob(),
     string: async () => ""
   }));
   return {
@@ -189,15 +226,17 @@ ${s}`), f.groupEnd();
       uri: "content.opf",
       size: 0,
       blob: async () => new Blob(),
-      string: async () => o
-    }, ...r],
+      string: async () => n
+    }, ...s],
     close: () => Promise.resolve()
   };
-}, kt = ({
+}, 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"));
@@ -206,65 +245,63 @@ ${s}`), f.groupEnd();
     basePath: o?.uri.substring(0, o.uri.lastIndexOf("/")) || ""
   };
 };
-async function Y(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: ie(r),
+    opf: de(r),
     basePath: o
   };
 }
-const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
+const De = Z.toLowerCase(), Be = ({ archive: e }) => async (t) => {
   const o = e.records.find(
-    (n) => !n.dir && n.basename.toLowerCase() === Re
+    (n) => !n.dir && n.basename.toLowerCase() === De
   );
   if (!o || o.dir)
     return t;
   const r = await o.string();
   try {
-    const n = ae(r), { renditionLayout: s } = I(n);
+    const n = le(r), { renditionLayout: s } = S(n);
     return {
       ...t,
       renditionLayout: t.renditionLayout ?? s
     };
   } catch (n) {
     return console.error(
-      `Unable to parse ${K} for content
+      `Unable to parse ${Z} for content
 `,
       r
     ), console.error(n), t;
   }
-}, U = q.toLowerCase(), Se = ({ archive: e }) => async (t) => {
-  const o = e.records.find(
-    (s) => s.basename.toLowerCase() === U && !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(U)
+      (s) => !s.id.toLowerCase().endsWith(je)
     ).map((s, i, a) => ({
       ...s,
       progressionWeight: 1 / a.length
     }))
   }, n = await o.string();
   try {
-    const s = ce(n), i = I(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 ${q} for content
+      `Unable to parse ${W} for content
 `,
       n
     ), console.error(s), r;
   }
-}, ke = ({
+}, He = ({
   baseUrl: e = "",
   resourcePath: t
 }) => {
@@ -272,44 +309,44 @@ const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
     return encodeURI(t);
   const o = e ? `${e}${e.endsWith("/") ? "" : "/"}` : "file://";
   return encodeURI(`${o}${t}`);
-}, Ce = ({ archive: e, baseUrl: t }) => async () => {
-  const o = Object.values(e.records).filter((r) => !r.dir);
+}, 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)
+  }));
   return {
     filename: e.filename,
-    title: e.records.find(({ dir: r }) => r)?.basename.replace(/\/$/, "") || e.filename,
+    title: e.records.find(({ dir: s }) => s)?.basename.replace(/\/$/, "") || e.filename,
     renditionLayout: void 0,
     renditionSpread: "auto",
-    readingDirection: "ltr",
-    spineItems: o.filter((r) => !r.basename.endsWith(".db")).map((r, n) => ({
-      // 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: `${n}.${r.basename}`,
-      index: n,
-      href: ke({
+    readingDirection: void 0,
+    spineItems: n.filter(({ file: s }) => !s.basename.endsWith(".db")).map(({ file: s, id: i }, a) => ({
+      id: i,
+      index: a,
+      href: He({
         baseUrl: t,
-        resourcePath: r.uri
+        resourcePath: s.uri
       }),
       renditionLayout: void 0,
       progressionWeight: 1 / o.length,
       pageSpreadLeft: void 0,
       pageSpreadRight: void 0,
-      mediaType: r.encodingFormat
+      mediaType: s.encodingFormat
     })),
-    items: o.map((r, n) => ({
-      id: `${n}.${r.basename}`,
-      href: encodeURI(`${t}${r.uri}`)
+    items: n.map(({ file: s, id: i }) => ({
+      id: i,
+      href: encodeURI(`${t}${s.uri}`)
     }))
   };
-}, Q = 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));
-}, Z = (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 {
@@ -318,85 +355,85 @@ const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
       mediaType: n.mediaType
     };
   });
-}, We = (e) => {
+}, Ve = (e) => {
   const t = e?.trim();
   return t === "scrolled-continuous" || t === "scrolled-doc" || t === "paginated" || t === "auto" ? t : "auto";
-}, Ee = (e) => {
+}, Ge = (e) => {
   const t = e?.trim();
   if (t === "none" || t === "landscape" || t === "portrait" || t === "both" || t === "auto")
     return t;
-}, Pe = (e) => {
+}, Ke = (e) => {
   const t = e?.trim();
   if (t === "cover" || t === "title-page" || t === "copyright-page" || t === "text")
     return t;
-}, Ne = ({
+}, qe = ({
   archive: e,
   baseUrl: t,
   archiveOpf: o
 }) => async (r) => {
   if (!o)
     return r;
-  const { opf: n, basePath: s } = o, i = I(n);
+  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, l = n.title?.trim() || e.records.find(({ dir: d }) => d)?.basename || "", p = i.readingDirection ?? "ltr", m = (await Q({
+  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(
-    (d, w) => w.size + d,
+    (l, v) => v.size + l,
     0
   ), h = n.guide, y = [];
-  for (const d of h) {
-    const w = Pe(d.type);
-    w !== void 0 && y.push({ href: d.href, title: d.title, type: w });
+  for (const l of h) {
+    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: We(n.renditionFlowMeta),
-    renditionSpread: Ee(n.renditionSpreadMeta),
-    title: l,
-    readingDirection: p,
+    renditionFlow: Ve(n.renditionFlowMeta),
+    renditionSpread: Ge(n.renditionSpreadMeta),
+    title: d,
+    readingDirection: u,
     /**
      * @see https://www.w3.org/TR/epub/#sec-itemref-elem
      */
-    spineItems: n.spineRows.map((d, w) => {
-      const g = e.records.find((T) => T.uri.endsWith(d.href))?.size || 0, $ = t || (/^https?:\/\//.test(d.href) ? "" : "file://");
+    spineItems: n.spineRows.map((l, v) => {
+      const g = e.records.find((L) => L.uri.endsWith(l.href))?.size || 0, w = t || (/^https?:\/\//.test(l.href) ? "" : "file://");
       return {
-        id: d.id,
-        index: w,
-        href: d.href.startsWith("https://") ? d.href : s ? `${$}${s}/${d.href}` : `${$}${d.href}`,
-        renditionLayout: d.renditionLayout ?? c,
-        ...d.renditionFlow !== void 0 ? { renditionFlow: d.renditionFlow } : {},
+        id: l.id,
+        index: v,
+        href: l.href.startsWith("https://") ? l.href : s ? `${w}${s}/${l.href}` : `${w}${l.href}`,
+        renditionLayout: l.renditionLayout ?? c,
+        ...l.renditionFlow !== void 0 ? { renditionFlow: l.renditionFlow } : {},
         progressionWeight: g / m,
-        pageSpreadLeft: d.pageSpreadLeft,
-        pageSpreadRight: d.pageSpreadRight,
-        mediaType: d.mediaType
+        pageSpreadLeft: l.pageSpreadLeft,
+        pageSpreadRight: l.pageSpreadRight,
+        mediaType: l.mediaType
       };
     }),
-    items: Z(n.manifestItems, e, (d) => /^https?:\/\//.test(d) ? "" : t || "file://"),
+    items: ne(n.manifestItems, e, (l) => /^https?:\/\//.test(l) ? "" : t || "file://"),
     guide: y.length > 0 ? y : void 0
   };
-}, Oe = (e) => {
+}, Je = (e) => {
   const t = e.descendantWithPath("head")?.childrenNamed("meta").find((o) => o.attr.name === "viewport");
   return !!(t && t.attr.name === "viewport");
-}, ze = (e) => e.reduce(async (t, o) => {
-  if (!await t || !se({
+}, 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 ? Oe(new R(n)) : !1;
-}, Promise.resolve(!0)), Me = ({
+  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 Q({
+    const n = await te({
       archive: e,
       archiveOpf: t
     });
-    if (await ze(n))
+    if (await Ze(n))
       return {
         ...o,
         spineItems: o.spineItems.map((i) => ({
@@ -407,18 +444,21 @@ const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
       };
   }
   return o;
-}, Be = 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 } = de(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);
@@ -428,26 +468,26 @@ const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
     kind: "kobo",
     ...t !== void 0 ? { renditionLayout: t } : {}
   };
-}, je = ({ archive: e }) => async (t) => {
-  const o = await Be(e), { renditionLayout: r } = I(o);
+}, tt = ({ archive: e }) => async (t) => {
+  const o = await et(e), { renditionLayout: r } = S(o);
   return {
     ...t,
     renditionLayout: t.renditionLayout ?? r
   };
-}, D = (e) => e.toLowerCase().endsWith(".opf"), Ue = (e) => e.records.some(
-  (t) => !t.dir && (D(t.basename) || D(t.uri))
-), De = ({ archive: e }) => async (t) => Ue(e) ? t : {
+}, X = (e) => e.toLowerCase().endsWith(".opf"), nt = (e) => e.records.some(
+  (t) => !t.dir && (X(t.basename) || X(t.uri))
+), rt = ({ archive: e }) => async (t) => nt(e) ? t : {
   ...t,
   spineItems: t.spineItems.map((r) => {
     const n = e.records.find(
       (i) => decodeURI(r.href).endsWith(i.uri)
-    ), s = G(n?.encodingFormat ?? "") || v(n?.basename ?? "");
+    ), s = J(n?.encodingFormat ?? "") || b(n?.basename ?? "");
     return {
       ...r,
-      renditionLayout: s && oe(s) ? "pre-paginated" : r.renditionLayout
+      renditionLayout: s && ce(s) ? "pre-paginated" : r.renditionLayout
     };
   })
-}, ee = (e) => e ? e.children.map((t) => t instanceof pe ? t.text : t instanceof ue ? ee(t) : "").join("").trim() : "", He = (e) => le(e.properties).includes("nav"), te = (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: "",
@@ -455,55 +495,55 @@ const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
     title: ""
   };
   let n = e.childNamed("span") || e.childNamed("a");
-  r.title = (n?.attr.title || n?.val.trim() || ee(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 = L(t, n.attr.href), r.href = L(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) => te(c, { basePath: t, baseUrl: o })
+      (c) => se(c, { basePath: t, baseUrl: o })
     ));
   }
   return r;
-}, _e = (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(te(s, { basePath: t, baseUrl: o }));
+    r.push(se(s, { basePath: t, baseUrl: o }));
   }), r;
-}, Ve = async (e, t, { baseUrl: o }) => {
-  const r = e.manifestItems.find(He);
+}, 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 = Ae(n.uri);
-      return _e(s, { basePath: i, baseUrl: o });
+      const s = new R(await n.string()), i = Re(n.uri);
+      return ot(s, { basePath: i, baseUrl: o });
     }
   }
-}, ne = (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: L(t, n),
-    href: L(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) => ne(a, { opfBasePath: t, baseUrl: o, prefix: r })
+    (a) => oe(a, { opfBasePath: t, baseUrl: o, prefix: r })
   )), s;
-}, Xe = (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(ne(i, { opfBasePath: t, baseUrl: o, prefix: s }));
+    r.push(oe(i, { opfBasePath: t, baseUrl: o, prefix: s }));
   }), r;
-}, Ge = async ({
+}, ct = async ({
   opf: e,
   opfBasePath: t,
   baseUrl: o,
@@ -518,17 +558,17 @@ const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
       );
       if (a && !a.dir) {
         const c = new R(await a.string());
-        return Xe(c, { opfBasePath: t, baseUrl: o });
+        return at(c, { opfBasePath: t, baseUrl: o });
       }
     }
   }
-}, Ke = async (e, t, { baseUrl: o }) => {
-  const { basePath: r } = P(t) || {}, n = await Ve(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 Ge({
+  const s = await ct({
     opf: e,
     opfBasePath: r ?? "",
     archive: t,
@@ -536,53 +576,53 @@ const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
   });
   if (s)
     return s;
-}, qe = (e) => e.replace(/\.[^.]+$/, "").replace(/[_-]/g, " ").replace(/\s+/g, " ").trim(), Je = (e, t) => {
-  if (!(e.spineItems.length === 0 || !e.spineItems.every((r) => (G(r.mediaType ?? "") || v(r.href))?.startsWith("audio/"))))
+}, 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: qe(n?.basename ?? r.href),
+        title: lt(n?.basename ?? r.href),
         href: r.href,
         path: n?.uri ?? r.href,
         contents: []
       };
     });
-}, Ye = (e, { baseUrl: t }) => {
+}, pt = (e, { baseUrl: t }) => {
   const o = [...e.records].sort(
-    (n, s) => E(n.uri, s.uri)
+    (n, s) => P(n.uri, s.uri)
   ), r = (n, s, i, a, c) => {
-    const l = n.find((m) => m.title === s), [p, ...u] = i;
-    return l ? p ? [
-      ...n.filter((h) => h !== l),
+    const d = n.find((m) => m.title === s), [u, ...p] = i;
+    return d ? u ? [
+      ...n.filter((h) => h !== d),
       {
-        ...l,
+        ...d,
         contents: [
-          ...l.contents,
+          ...d.contents,
           ...r(
-            l.contents,
-            p,
+            d.contents,
             u,
+            p,
             a,
             c
           )
         ]
       }
-    ] : l.path.split("/").length > c.split("/").length ? [
-      ...n.filter((h) => h !== l),
+    ] : d.path.split("/").length > c.split("/").length ? [
+      ...n.filter((h) => h !== d),
       {
-        ...l,
+        ...d,
         path: c,
         href: a
       }
-    ] : n : p ? [
+    ] : n : u ? [
       ...n,
       {
         contents: r(
           [],
-          p,
           u,
+          p,
           a,
           c
         ),
@@ -604,27 +644,27 @@ const Re = K.toLowerCase(), Te = ({ 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 l = L(t, encodeURI(s.uri)).replace(/\/$/, ""), p = s.uri.replace(/\/$/, "");
-    return r(n, a, c, l, p);
+    const d = T(t, encodeURI(s.uri)).replace(/\/$/, ""), u = s.uri.replace(/\/$/, "");
+    return r(n, a, c, d, u);
   }, []);
-}, Qe = async (e, t, {
+}, ft = async (e, t, {
   baseUrl: o,
   archiveOpf: r
 }) => {
   if (r)
-    return await Ke(r.opf, e, { baseUrl: o }) || [];
-  const n = Je(t, e);
+    return await dt(r.opf, e, { baseUrl: o }) || [];
+  const n = ut(t, e);
   if (n) return n;
-  const s = Ye(e, { baseUrl: o });
+  const s = pt(e, { baseUrl: o });
   if (s.length !== 0)
     return s;
-}, Ze = ({
+}, mt = ({
   archive: e,
   baseUrl: t,
   archiveOpf: o
 }) => async (r) => {
   if (r.nav) return r;
-  const n = await Qe(e, r, {
+  const n = await ft(e, r, {
     baseUrl: t,
     archiveOpf: o
   });
@@ -634,58 +674,60 @@ const Re = K.toLowerCase(), Te = ({ archive: e }) => async (t) => {
       toc: n
     }
   } : r;
-}, et = (e) => e ? e.endsWith("/") ? e : `${e}/` : "", tt = async (e, {
+}, ht = (e) => e ? e.endsWith("/") ? e : `${e}/` : "", gt = async (e, {
   baseUrl: t = "",
   hooks: o = {}
 } = {}) => {
-  const r = await Y(e), n = et(t), s = (u) => (u ?? []).map(
+  f.log("Generating manifest from archive", e);
+  const r = await ee(e), n = ht(t), s = (p) => (p ?? []).map(
     (m) => m({ archive: e, baseUrl: n })
   ), i = [
-    Ne({ archive: e, baseUrl: n, archiveOpf: r }),
-    Se({ archive: e }),
-    Te({ archive: e }),
-    De({ archive: e }),
+    qe({ archive: e, baseUrl: n, archiveOpf: r }),
+    Ue({ archive: e }),
+    Be({ archive: e }),
+    rt({ archive: e }),
     ...s(o.content)
   ], a = s(o.spine), c = [
-    Me({ archive: e, archiveOpf: r }),
-    je({ archive: e }),
+    Ye({ archive: e, archiveOpf: r }),
+    tt({ archive: e }),
     ...s(o.presentation)
-  ], l = [
-    Ze({ archive: e, baseUrl: n, archiveOpf: r }),
+  ], d = [
+    mt({ archive: e, baseUrl: n, archiveOpf: r }),
     ...s(o.navigation)
-  ], p = [
+  ], u = [
     ...i,
     ...a,
     ...c,
-    ...l
+    ...d,
+    Qe()
   ];
   try {
-    const u = Ce({
+    const p = Xe({
       archive: e,
       baseUrl: n
-    })(), m = await p.reduce(async (h, y) => await y(await h), u);
+    })(), m = await u.reduce(async (h, y) => await y(await h), p);
     if (f.log("Generated manifest", m), process.env.NODE_ENV === "development" && f.isEnabled()) {
       const h = JSON.stringify(m, null, 2);
       f.groupCollapsed(...f.getGroupArgs("Generated manifest")), f.log(`
 ${h}`), f.groupEnd();
     }
     return m;
-  } catch (u) {
-    throw f.error(u), u;
+  } catch (p) {
+    throw f.error(p), p;
   }
-}, nt = (e) => {
+}, yt = (e) => {
   const t = e.descendantWithPath("head")?.childrenNamed("meta").find((o) => o.attr.name === "calibre:cover");
   return !!(t && t.attr.name === "calibre:cover");
-}, rt = (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"
-), st = ({ 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 (nt(s)) {
-      const i = rt(s);
+    if (yt(s)) {
+      const i = bt(s);
       return i && delete i.attr.preserveAspectRatio, {
         ...o,
         body: s?.toString()
@@ -693,7 +735,7 @@ ${h}`), f.groupEnd();
     }
   }
   return o;
-}, ot = ({ archive: e, resourcePath: t }) => async (o) => st({ archive: e, resourcePath: t })(o), it = ({ 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
   );
@@ -708,10 +750,10 @@ ${h}`), f.groupEnd();
     };
   }
   return o;
-}, at = async (e, t) => {
-  const o = await Y(e);
+}, At = async (e, t) => {
+  const o = await ee(e);
   if (o) {
-    const { opf: r } = o, n = Z(r.manifestItems, e, () => "");
+    const { opf: r } = o, n = ne(r.manifestItems, e, () => "");
     if (n.find(
       (i) => t.endsWith(i.href)
     )?.mediaType)
@@ -720,9 +762,9 @@ ${h}`), f.groupEnd();
       };
   }
   return {
-    mediaType: ct(t)
+    mediaType: Ft(t)
   };
-}, ct = (e) => {
+}, Ft = (e) => {
   if (e.endsWith(".css"))
     return "text/css; charset=UTF-8";
   if (e.endsWith(".jpg"))
@@ -733,12 +775,12 @@ ${h}`), f.groupEnd();
     return "video/mp4";
   if (e.endsWith(".svg"))
     return "image/svg+xml";
-}, dt = ({ 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 at(e, t);
+  const n = await At(e, t);
   return {
     ...o,
     params: {
@@ -751,7 +793,7 @@ ${h}`), f.groupEnd();
       }
     }
   };
-}, H = [
+}, V = [
   "div",
   "span",
   "p",
@@ -802,23 +844,23 @@ ${h}`), f.groupEnd();
   "canvas",
   "script",
   "style"
-], lt = ({ 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
   );
   if (r && !r.dir && r.basename.endsWith(".xhtml")) {
     const n = typeof o.body == "string" ? o.body : await r.string();
     if (!new RegExp(
-      `<(${H.join("|")})[\\s/>]`,
+      `<(${V.join("|")})[\\s/>]`,
       "i"
     ).test(n))
       return o;
     const i = new RegExp(
-      `<(${H.join("|")})(\\s[^>]*)?\\s*/>`,
+      `<(${V.join("|")})(\\s[^>]*)?\\s*/>`,
       "gi"
     ), a = n.replace(
       i,
-      (c, l, p = "") => `<${l} ${p.trim()}></${l}>`
+      (c, d, u = "") => `<${d} ${u.trim()}></${d}>`
     );
     return {
       ...o,
@@ -826,18 +868,18 @@ ${h}`), f.groupEnd();
     };
   }
   return o;
-}, pt = async (e, t, { hooks: o = [] } = {}) => {
+}, St = async (e, t, { hooks: o = [] } = {}) => {
   const r = {
     params: {}
   }, s = [
     ...o.map((i) => i({ archive: e, resourcePath: t })),
-    dt({ archive: e, resourcePath: t }),
-    lt({ archive: e, resourcePath: t }),
-    it({ archive: e, resourcePath: t }),
-    ot({ archive: e, resourcePath: t })
+    It({ archive: e, resourcePath: t }),
+    Tt({ archive: e, resourcePath: t }),
+    $t({ archive: e, resourcePath: t }),
+    wt({ archive: e, resourcePath: t })
   ];
   try {
-    const i = await s.reduce(async (c, l) => await l(await c), Promise.resolve(r));
+    const i = await s.reduce(async (c, d) => await d(await c), Promise.resolve(r));
     if (f.log("Generated resource", t, i), i.body !== void 0)
       return i;
     const a = Object.values(e.records).find(
@@ -853,9 +895,9 @@ ${h}`), f.groupEnd();
     throw f.error(i), i;
   }
 };
-class ut {
+class Rt {
   constructor(t) {
-    this.cleanArchiveAfter = t, this.state$ = new ye({
+    this.cleanArchiveAfter = t, this.state$ = new we({
       status: "idle",
       locks: 0
     });
@@ -864,103 +906,103 @@ class ut {
     this.state$.next({ ...this.state$.getValue(), ...t });
   }
   get locks$() {
-    return this.state$.pipe(F(({ locks: t }) => t));
+    return this.state$.pipe($(({ locks: t }) => t));
   }
   get state() {
     return this.state$.getValue();
   }
   get isUnlocked$() {
     return this.locks$.pipe(
-      F((t) => t <= 0),
-      be(),
-      ve()
+      $((t) => t <= 0),
+      $e(),
+      Ae()
     );
   }
   get overTTL$() {
     return this.isUnlocked$.pipe(
-      A(
-        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? B : we(this.cleanArchiveAfter) : B
+      I(
+        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? B : Fe(this.cleanArchiveAfter) : B
       )
     );
   }
 }
-const ft = ({
+const Lt = ({
   getArchive: e,
   cleanArchiveAfter: t = 300 * 1e3
   // 5mn
 }) => {
-  const o = new S(), r = new S(), n = new S(), s = {}, i = o.pipe(
-    J((l) => {
-      const p = s[l];
-      if (!p || p.state.status !== "idle") return O;
-      let u = !1;
+  const o = new x(), r = new x(), n = new x(), s = {}, i = o.pipe(
+    Y((d) => {
+      const u = s[d];
+      if (!u || u.state.status !== "idle") return O;
+      let p = !1;
       const m = (g) => {
         f.debug(`Cleaning up archive with key: ${g}`);
-        const $ = s[g];
-        delete s[g], u || ($?.state.archive?.close(), u = !0);
+        const w = s[g];
+        delete s[g], p || (w?.state.archive?.close(), p = !0);
       };
-      p.update({
+      u.update({
         status: "loading"
       });
-      const h = p.locks$, y = p.isUnlocked$, d = h.pipe(
-        fe(),
-        k(([g, $]) => $ > g),
-        me(!0)
+      const h = u.locks$, y = u.isUnlocked$, l = h.pipe(
+        ge(),
+        E(([g, w]) => w > g),
+        ye(!0)
       );
-      return x(e(l)).pipe(
-        C((g) => {
-          p.update({
+      return F(e(d)).pipe(
+        k((g) => {
+          u.update({
             archive: g,
             status: "success"
           });
         }),
-        W((g) => (m(l), p.update({
+        C((g) => (m(d), u.update({
           status: "error",
           error: g
         }), O)),
-        A(() => {
-          const g = d.pipe(
-            A(() => n),
-            A(() => y),
-            k((T) => T)
+        I(() => {
+          const g = l.pipe(
+            I(() => n),
+            I(() => y),
+            E((L) => L)
           );
-          return z(g, p.overTTL$).pipe(
-            M(),
-            C(() => {
-              m(l);
+          return M(g, u.overTTL$).pipe(
+            D(),
+            k(() => {
+              m(d);
             })
           );
         })
       );
     }),
-    he(r)
-  ), a = (l) => {
-    let p = !1;
-    const u = s[l] ?? new ut(t);
-    s[l] = u, u.update({
-      locks: u.state.locks + 1
+    be(r)
+  ), a = (d) => {
+    let u = !1;
+    const p = s[d] ?? new Rt(t);
+    s[d] = p, p.update({
+      locks: p.state.locks + 1
     });
     const m = () => {
-      p || (p = !0, u.update({
-        locks: u.state.locks - 1
+      u || (u = !0, p.update({
+        locks: p.state.locks - 1
       }));
     };
-    o.next(l);
-    const h = u.state$.pipe(
-      F(({ archive: d }) => d),
-      k((d) => !!d)
-    ), y = u.state$.pipe(
-      C(({ error: d }) => {
-        if (d)
-          throw d;
+    o.next(d);
+    const h = p.state$.pipe(
+      $(({ archive: l }) => l),
+      E((l) => !!l)
+    ), y = p.state$.pipe(
+      k(({ error: l }) => {
+        if (l)
+          throw l;
       }),
-      ge()
+      ve()
     );
-    return z(h, y).pipe(
-      M(),
-      F((d) => ({ archive: d, release: m })),
-      W((d) => {
-        throw m(), d;
+    return M(h, y).pipe(
+      D(),
+      $((l) => ({ archive: l, release: m })),
+      C((l) => {
+        throw m(), l;
       })
     );
   }, c = () => {
@@ -971,7 +1013,7 @@ const ft = ({
     purge: c,
     _archives: s
   };
-}, _ = (e) => e ? /^\d+$/.test(e) ? {
+}, G = (e) => e ? /^\d+$/.test(e) ? {
   valid: !0,
   value: Number.parseInt(e, 10)
 } : {
@@ -980,7 +1022,7 @@ const ft = ({
 } : {
   valid: !0,
   value: void 0
-}, mt = (e) => {
+}, xt = (e) => {
   if (!e.toLowerCase().startsWith("bytes="))
     return {
       kind: "missing"
@@ -999,7 +1041,7 @@ const ft = ({
     return {
       kind: "invalid"
     };
-  const [, r = "", n = ""] = o, s = _(r.trim()), i = _(n.trim());
+  const [, r = "", n = ""] = o, s = G(r.trim()), i = G(n.trim());
   return !s.valid || !i.valid ? {
     kind: "invalid"
   } : {
@@ -1007,7 +1049,7 @@ const ft = ({
     start: s.value,
     end: i.value
   };
-}, ht = (e) => {
+}, Et = (e) => {
   if (e instanceof Blob)
     return {
       size: e.size,
@@ -1024,7 +1066,7 @@ const ft = ({
       return { content: n, length: n.byteLength };
     }
   };
-}, gt = ({
+}, kt = ({
   body: e,
   contentType: t,
   rangeHeader: o
@@ -1035,13 +1077,13 @@ const ft = ({
       status: 200,
       headers: r
     });
-  const n = mt(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 = ht(e), i = s.size;
+  const s = Et(e), i = s.size;
   if (n.kind === "invalid")
     return new Response(null, {
       status: 416,
@@ -1058,8 +1100,8 @@ const ft = ({
       }
     });
   if (a === void 0) {
-    const p = Math.min(c ?? 0, i);
-    a = Math.max(0, i - p), c = i - 1;
+    const u = Math.min(c ?? 0, i);
+    a = Math.max(0, i - u), c = i - 1;
   } else (c === void 0 || c >= i) && (c = i - 1);
   if (a < 0 || c < 0 || a >= i || c >= i || a > c)
     return new Response(null, {
@@ -1068,29 +1110,29 @@ const ft = ({
         "Content-Range": `bytes */${i}`
       }
     });
-  const l = s.slice(a, c + 1);
-  return r.set("Content-Length", String(l.length)), r.set("Content-Range", `bytes ${a}-${c}/${i}`), new Response(l.content, {
+  const d = s.slice(a, c + 1);
+  return r.set("Content-Length", String(d.length)), r.set("Content-Range", `bytes ${a}-${c}/${i}`), new Response(d.content, {
     status: 206,
     headers: r
   });
-}, V = "file://", yt = /^https?:\/\//, bt = (e) => {
+}, K = "file://", Ct = /^https?:\/\//, Wt = (e) => {
   try {
     return decodeURIComponent(e);
   } catch {
     return e;
   }
-}, X = (e) => e.startsWith(V) ? e.slice(V.length) : e, vt = (e) => {
-  const t = X(e);
-  return yt.test(t) ? t : X(bt(t));
+}, q = (e) => e.startsWith(K) ? e.slice(K.length) : e, Pt = (e) => {
+  const t = q(e);
+  return Ct.test(t) ? t : q(Wt(t));
 };
-class wt {
+class _t {
   constructor({
     hooks: t,
     onError: o,
     onManifestSuccess: r,
     ...n
   }) {
-    this.onError = (s) => (console.error(s), new Response(String(s), { status: 500 })), this.archiveLoader = ft(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();
@@ -1100,7 +1142,7 @@ class wt {
   }
   accessArchiveWithoutLock(t) {
     return this.accessArchive(t).pipe(
-      F(({ archive: o, release: r }) => (r(), o))
+      $(({ archive: o, release: r }) => (r(), o))
     );
   }
   withArchiveResponse({
@@ -1108,30 +1150,30 @@ class wt {
     getResponse: o
   }) {
     const r = this.accessArchive(t).pipe(
-      J(
-        ({ archive: n, release: s }) => x(o(n)).pipe(
-          $e(() => {
+      Y(
+        ({ archive: n, release: s }) => F(o(n)).pipe(
+          Ie(() => {
             s();
           })
         )
       ),
-      W((n) => Fe(this.onError(n)))
+      C((n) => Te(this.onError(n)))
     );
-    return xe(r);
+    return Se(r);
   }
   fetchManifest({ key: t, baseUrl: o }) {
     return this.withArchiveResponse({
       key: t,
-      getResponse: (r) => x(
-        tt(r, {
+      getResponse: (r) => F(
+        gt(r, {
           baseUrl: o,
           hooks: this.hooks.manifest
         })
       ).pipe(
-        A(
-          (s) => x(this.onManifestSuccess({ manifest: s, archive: r }))
+        I(
+          (s) => F(this.onManifestSuccess({ manifest: s, archive: r }))
         ),
-        F(
+        $(
           (s) => new Response(JSON.stringify(s), {
             status: 200
           })
@@ -1147,14 +1189,14 @@ class wt {
     return this.withArchiveResponse({
       key: t,
       getResponse: (n) => {
-        const s = vt(o);
-        return x(
-          pt(n, s, {
+        const s = Pt(o);
+        return F(
+          St(n, s, {
             hooks: this.hooks.resource
           })
         ).pipe(
-          F(
-            (a) => gt({
+          $(
+            (a) => kt({
               body: a.body ?? "",
               contentType: a.params.contentType,
               rangeHeader: r?.headers.get("range")
@@ -1165,7 +1207,7 @@ class wt {
     });
   }
 }
-class Ct extends wt {
+class Vt extends _t {
   constructor({
     getUriInfo: t,
     ...o
@@ -1196,20 +1238,24 @@ class Ct extends wt {
   }
 }
 export {
-  Ct as ServiceWorkerStreamer,
-  wt as Streamer,
-  kt as configure,
-  Lt as createArchiveFromArrayBufferList,
-  It as createArchiveFromJszip,
-  Rt as createArchiveFromLibArchive,
-  Tt as createArchiveFromText,
-  St as createArchiveFromUrls,
-  tt as generateManifestFromArchive,
-  pt as generateResourceFromArchive,
-  P as getArchiveOpfInfo,
-  Ae as getUriBasePath,
-  b as getUriBasename,
+  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,
-  E as sortByTitleComparator
+  P as sortByTitleComparator
 };
 //# sourceMappingURL=index.js.map