@prose-reader/streamer 1.132.0 → 1.134.0

package/dist/index.js

@@ -1,32 +1,32 @@
-import F, { XmlDocument as pe, XmlTextNode as fe, XmlElement as ue } from "xmldoc";
-import { urlJoin as N, isXmlBasedMimeType as me, detectMimeTypeFromName as q } from "@prose-reader/shared";
-import { Subject as j, mergeMap as M, EMPTY as G, pairwise as he, filter as D, startWith as ge, from as I, tap as O, catchError as C, switchMap as k, merge as K, takeUntil as ye, map as A, ignoreElements as be, first as we, BehaviorSubject as ve, distinctUntilChanged as $e, shareReplay as xe, NEVER as J, timer as Fe, finalize as Y, of as E, lastValueFrom as Q } from "rxjs";
-let S = !1;
+import x, { XmlDocument as de, XmlTextNode as le, XmlElement as pe } from "xmldoc";
+import { urlJoin as L, isXmlBasedMimeType as fe, parseContentType as ue, detectMimeTypeFromName as O } from "@prose-reader/shared";
+import { Subject as R, mergeMap as M, EMPTY as _, pairwise as me, filter as j, startWith as he, from as P, tap as D, catchError as I, switchMap as k, merge as q, takeUntil as ge, map as F, ignoreElements as ye, first as be, BehaviorSubject as we, distinctUntilChanged as ve, shareReplay as $e, NEVER as G, timer as xe, finalize as K, of as J, lastValueFrom as Y } from "rxjs";
+let T = !1;
 const v = {
   enable: (e) => {
-    S = e;
+    T = e;
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   log: (...e) => {
-    S && console.log("[prose-reader-streamer]", ...e);
+    T && console.log("[prose-reader-streamer]", ...e);
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   warn: (...e) => {
-    S && console.warn("[prose-reader-streamer]", ...e);
+    T && console.warn("[prose-reader-streamer]", ...e);
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   error: (...e) => {
     console.error(...e);
   },
   time: (e) => {
-    S && console.time(`[prose-reader-streamer] [metric] ${e}`);
+    T && console.time(`[prose-reader-streamer] [metric] ${e}`);
   },
   timeEnd: (e) => {
-    S && console.timeEnd(`[prose-reader-streamer] [metric] ${e}`);
+    T && console.timeEnd(`[prose-reader-streamer] [metric] ${e}`);
   },
   metric: (e, t = 1 / 0) => {
     const i = typeof e == "number" ? e : e.duration;
-    S && (e.duration <= t ? console.log(
+    T && (e.duration <= t ? console.log(
       "[prose-reader-streamer] [metric] ",
       `${e.name} took ${i}ms`
     ) : console.warn(
@@ -35,256 +35,247 @@ const v = {
     ));
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  measurePerformance: (e, t = 10, i) => (...s) => {
-    const n = performance.now(), r = i(...s);
-    if (r && r.then)
-      return r.then((o) => {
+  measurePerformance: (e, t = 10, i) => (...r) => {
+    const n = performance.now(), s = i(...r);
+    if (s && s.then)
+      return s.then((a) => {
         const d = performance.now();
-        return v.metric({ name: e, duration: d - n }, t), o;
+        return v.metric({ name: e, duration: d - n }, t), a;
       });
-    const a = performance.now();
-    return v.metric({ name: e, duration: a - n }, t), r;
+    const o = performance.now();
+    return v.metric({ name: e, duration: o - n }, t), s;
   }
-}, Ae = (e) => {
+}, Fe = (e) => {
   var i;
-  const t = (i = e.descendantWithPath("head")) == null ? void 0 : i.childrenNamed("meta").find((s) => s.attr.name === "calibre:cover");
+  const t = (i = e.descendantWithPath("head")) == null ? void 0 : i.childrenNamed("meta").find((r) => r.attr.name === "calibre:cover");
   return !!(t && t.attr.name === "calibre:cover");
-}, Te = (e) => {
-  var t, i, s;
-  return (s = (i = (t = e.descendantWithPath("body")) == null ? void 0 : t.descendantWithPath("div")) == null ? void 0 : i.childrenNamed("svg")) == null ? void 0 : s.find(
+}, Ae = (e) => {
+  var t, i, r;
+  return (r = (i = (t = e.descendantWithPath("body")) == null ? void 0 : t.descendantWithPath("div")) == null ? void 0 : i.childrenNamed("svg")) == null ? void 0 : r.find(
     (n) => n.attr.width === "100%" && n.attr.preserveAspectRatio === "none"
   );
-}, Se = ({ archive: e, resourcePath: t }) => async (i) => {
-  const s = Object.values(e.files).find(
+}, Te = ({ archive: e, resourcePath: t }) => async (i) => {
+  const r = Object.values(e.files).find(
     (n) => n.uri === t
   );
-  if (s != null && s.basename.endsWith(".xhtml")) {
-    const n = i.body ?? await s.string(), r = new pe(n);
-    if (Ae(r)) {
-      const a = Te(r);
-      return a && delete a.attr.preserveAspectRatio, {
+  if (r != null && r.basename.endsWith(".xhtml")) {
+    const n = i.body ?? await r.string(), s = new de(n);
+    if (Fe(s)) {
+      const o = Ae(s);
+      return o && delete o.attr.preserveAspectRatio, {
         ...i,
-        body: r == null ? void 0 : r.toString()
+        body: s == null ? void 0 : s.toString()
       };
     }
   }
   return i;
-}, We = ({ archive: e, resourcePath: t }) => async (i) => Se({ archive: e, resourcePath: t })(i), ke = ({ archive: e, resourcePath: t }) => async (i) => {
-  const s = Object.values(e.files).find(
+}, We = ({ archive: e, resourcePath: t }) => async (i) => Te({ archive: e, resourcePath: t })(i), ke = ({ archive: e, resourcePath: t }) => async (i) => {
+  const r = Object.values(e.files).find(
     (n) => n.uri === t
   );
-  if (s != null && s.basename.endsWith(".css")) {
-    const r = (i.body ?? await s.string()).replaceAll(
+  if (r != null && r.basename.endsWith(".css")) {
+    const s = (i.body ?? await r.string()).replaceAll(
       "-webkit-writing-mode",
       "writing-mode"
     );
     return {
       ...i,
-      body: r
+      body: s
     };
   }
   return i;
-}, L = (e) => {
-  const i = Object.values(e.files).filter((s) => !s.dir).find((s) => s.uri.endsWith(".opf"));
-  return {
-    data: i,
-    basePath: (i == null ? void 0 : i.uri.substring(0, i.uri.lastIndexOf("/"))) || ""
-  };
-}, te = (e) => e ? e.children.map((t) => t instanceof fe ? t.text : t instanceof ue ? te(t) : "").join("").trim() : "", T = (e) => e.substring(e.lastIndexOf("/") + 1) || e, Z = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Ne = (e) => {
+}, ee = (e) => e ? e.children.map((t) => t instanceof le ? t.text : t instanceof pe ? ee(t) : "").join("").trim() : "", A = (e) => e.substring(e.lastIndexOf("/") + 1) || e, Q = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Le = (e) => {
   const t = e.lastIndexOf("/");
   return t >= 0 ? e.substring(0, t) : "";
-}, ne = (e, { basePath: t, baseUrl: i }) => {
-  const s = {
+}, te = (e, { basePath: t, baseUrl: i }) => {
+  const r = {
     contents: [],
     path: "",
     href: "",
     title: ""
   };
   let n = e.childNamed("span") || e.childNamed("a");
-  s.title = ((n == null ? void 0 : n.attr.title) || (n == null ? void 0 : n.val.trim()) || te(n)) ?? "";
-  let r = n == null ? void 0 : n.name;
-  r !== "a" && (n = e.descendantWithPath(`${r}.a`), n && (r = n.name.toLowerCase())), r === "a" && (n != null && n.attr.href) && (s.path = N(t, n.attr.href), s.href = N(i, t, n.attr.href));
-  const a = e.childNamed("ol");
-  if (a) {
-    const o = a.childrenNamed("li");
-    o && o.length > 0 && (s.contents = o.map(
-      (d) => ne(d, { basePath: t, baseUrl: i })
+  r.title = ((n == null ? void 0 : n.attr.title) || (n == null ? void 0 : n.val.trim()) || ee(n)) ?? "";
+  let s = n == null ? void 0 : n.name;
+  s !== "a" && (n = e.descendantWithPath(`${s}.a`), n && (s = n.name.toLowerCase())), s === "a" && (n != null && n.attr.href) && (r.path = L(t, n.attr.href), r.href = L(i, t, n.attr.href));
+  const o = e.childNamed("ol");
+  if (o) {
+    const a = o.childrenNamed("li");
+    a && a.length > 0 && (r.contents = a.map(
+      (d) => te(d, { basePath: t, baseUrl: i })
     ));
   }
-  return s;
-}, Le = (e, { basePath: t, baseUrl: i }) => {
-  var r, a;
-  const s = [];
+  return r;
+}, Se = (e, { basePath: t, baseUrl: i }) => {
+  var s, o;
+  const r = [];
   let n;
-  return e.descendantWithPath("body.nav.ol") ? n = (r = e.descendantWithPath("body.nav.ol")) == null ? void 0 : r.children : e.descendantWithPath("body.section.nav.ol") && (n = (a = e.descendantWithPath("body.section.nav.ol")) == null ? void 0 : a.children), n && n.length > 0 && n.filter((o) => o.name === "li").forEach(
-    (o) => s.push(ne(o, { basePath: t, baseUrl: i }))
-  ), s;
-}, Pe = async (e, t, { baseUrl: i }) => {
+  return e.descendantWithPath("body.nav.ol") ? n = (s = e.descendantWithPath("body.nav.ol")) == null ? void 0 : s.children : e.descendantWithPath("body.section.nav.ol") && (n = (o = e.descendantWithPath("body.section.nav.ol")) == null ? void 0 : o.children), n && n.length > 0 && n.filter((a) => a.name === "li").forEach(
+    (a) => r.push(te(a, { basePath: t, baseUrl: i }))
+  ), r;
+}, Ne = async (e, t, { baseUrl: i }) => {
   var n;
-  const s = (n = e.childNamed("manifest")) == null ? void 0 : n.childrenNamed("item").find((r) => r.attr.properties === "nav");
-  if (s) {
-    const r = Object.values(t.files).find(
-      (a) => a.uri.endsWith(s.attr.href || "")
+  const r = (n = e.childNamed("manifest")) == null ? void 0 : n.childrenNamed("item").find((s) => s.attr.properties === "nav");
+  if (r) {
+    const s = Object.values(t.files).find(
+      (o) => o.uri.endsWith(r.attr.href || "")
     );
-    if (r) {
-      const a = new F.XmlDocument(await r.string()), o = Ne(r.uri);
-      return Le(a, { basePath: o, baseUrl: i });
+    if (s) {
+      const o = new x.XmlDocument(await s.string()), a = Le(s.uri);
+      return Se(o, { basePath: a, baseUrl: i });
     }
   }
-}, re = (e, {
+}, ne = (e, {
   opfBasePath: t,
   baseUrl: i,
-  prefix: s
+  prefix: r
 }) => {
-  var o, d;
-  const n = ((o = e == null ? void 0 : e.childNamed(`${s}content`)) == null ? void 0 : o.attr.src) || "", r = {
-    title: ((d = e == null ? void 0 : e.descendantWithPath(`${s}navLabel.${s}text`)) == null ? void 0 : d.val) || "",
-    path: N(t, n),
-    href: N(i, t, n),
+  var a, d;
+  const n = ((a = e == null ? void 0 : e.childNamed(`${r}content`)) == null ? void 0 : a.attr.src) || "", s = {
+    title: ((d = e == null ? void 0 : e.descendantWithPath(`${r}navLabel.${r}text`)) == null ? void 0 : d.val) || "",
+    path: L(t, n),
+    href: L(i, t, n),
     contents: []
-  }, a = e.childrenNamed(`${s}navPoint`);
-  return a && a.length > 0 && (r.contents = a.map(
-    (p) => re(p, { opfBasePath: t, baseUrl: i, prefix: s })
-  )), r;
-}, Ie = (e, { opfBasePath: t, baseUrl: i }) => {
-  var a;
-  const s = [], n = e.name;
-  let r = "";
-  return n.indexOf(":") !== -1 && (r = n.split(":")[0] + ":"), (a = e.childNamed(`${r}navMap`)) == null || a.childrenNamed(`${r}navPoint`).forEach(
-    (o) => s.push(re(o, { opfBasePath: t, baseUrl: i, prefix: r }))
-  ), s;
-}, Ce = async ({
+  }, o = e.childrenNamed(`${r}navPoint`);
+  return o && o.length > 0 && (s.contents = o.map(
+    (p) => ne(p, { opfBasePath: t, baseUrl: i, prefix: r })
+  )), s;
+}, Pe = (e, { opfBasePath: t, baseUrl: i }) => {
+  var o;
+  const r = [], n = e.name;
+  let s = "";
+  return n.indexOf(":") !== -1 && (s = n.split(":")[0] + ":"), (o = e.childNamed(`${s}navMap`)) == null || o.childrenNamed(`${s}navPoint`).forEach(
+    (a) => r.push(ne(a, { opfBasePath: t, baseUrl: i, prefix: s }))
+  ), r;
+}, Ie = async ({
   opfData: e,
   opfBasePath: t,
   baseUrl: i,
-  archive: s
+  archive: r
 }) => {
-  var a;
-  const n = e.childNamed("spine"), r = n && n.attr.toc;
-  if (r) {
-    const o = (a = e.childNamed("manifest")) == null ? void 0 : a.childrenNamed("item").find((d) => d.attr.id === r);
-    if (o) {
-      const d = `${t}${t === "" ? "" : "/"}${o.attr.href}`, p = Object.values(s.files).find(
+  var o;
+  const n = e.childNamed("spine"), s = n && n.attr.toc;
+  if (s) {
+    const a = (o = e.childNamed("manifest")) == null ? void 0 : o.childrenNamed("item").find((d) => d.attr.id === s);
+    if (a) {
+      const d = `${t}${t === "" ? "" : "/"}${a.attr.href}`, p = Object.values(r.files).find(
         (c) => c.uri.endsWith(d)
       );
       if (p) {
-        const c = new F.XmlDocument(await p.string());
-        return Ie(c, { opfBasePath: t, baseUrl: i });
+        const c = new x.XmlDocument(await p.string());
+        return Pe(c, { opfBasePath: t, baseUrl: i });
       }
     }
   }
-}, Re = async (e, t, { baseUrl: i }) => {
-  const { basePath: s } = L(t) || {}, n = await Ce({
+}, Ce = async (e, t, { baseUrl: i }) => {
+  const { basePath: r } = S(t) || {}, n = await Ie({
     opfData: e,
-    opfBasePath: s,
+    opfBasePath: r,
     archive: t,
     baseUrl: i
   });
-  return n || await Pe(e, t, { opfBasePath: s, baseUrl: i });
-}, je = async (e) => {
-  const t = {
-    renditionLayout: void 0
+  return n || await Ne(e, t, { opfBasePath: r, baseUrl: i });
+}, Re = (e) => {
+  var r;
+  const t = ((r = e.attr.properties) == null ? void 0 : r.split(" ")) || [];
+  let i;
+  return t.find((n) => n === "rendition:layout-reflowable") && (i = "reflowable"), t.find((n) => n === "rendition:layout-pre-paginated") && (i = "pre-paginated"), {
+    renditionLayout: i,
+    pageSpreadLeft: t.some((n) => n === "page-spread-left") || void 0,
+    pageSpreadRight: t.some((n) => n === "page-spread-right") || void 0
   };
-  return await Promise.all(
-    e.files.map(async (i) => {
-      var s, n;
-      if (i.uri.endsWith("com.kobobooks.display-options.xml")) {
-        const a = (s = new F.XmlDocument(await i.string()).childNamed("platform")) == null ? void 0 : s.childNamed("option");
-        ((n = a == null ? void 0 : a.attr) == null ? void 0 : n.name) === "fixed-layout" && a.val === "true" && (t.renditionLayout = "pre-paginated");
-      }
-    })
-  ), t;
-}, se = async ({
+}, S = (e) => {
+  const i = Object.values(e.files).filter((r) => !r.dir).find((r) => r.uri.endsWith(".opf"));
+  return {
+    data: i,
+    basePath: (i == null ? void 0 : i.uri.substring(0, i.uri.lastIndexOf("/"))) || ""
+  };
+}, re = async ({
   archive: e
 }) => {
-  const { data: t, basePath: i } = L(e) || {}, s = await (t == null ? void 0 : t.string());
-  if (!s) return [];
-  const n = new F.XmlDocument(s), r = n.childNamed("manifest"), a = n.childNamed("spine"), o = a == null ? void 0 : a.childrenNamed("itemref").map((c) => c.attr.idref), d = (r == null ? void 0 : r.childrenNamed("item").filter((c) => o.includes(c.attr.id || ""))) || [];
+  const { data: t, basePath: i } = S(e) || {}, r = await (t == null ? void 0 : t.string());
+  if (!r) return [];
+  const n = new x.XmlDocument(r), s = n.childNamed("manifest"), o = n.childNamed("spine"), a = o == null ? void 0 : o.childrenNamed("itemref").map((c) => c.attr.idref), d = (s == null ? void 0 : s.childrenNamed("item").filter((c) => a.includes(c.attr.id || ""))) || [];
   return e.files.filter((c) => d.find((l) => i ? `${i}/${l.attr.href}` === c.uri : `${l.attr.href}` === c.uri));
-}, De = (e, t, i) => {
-  const s = e.attr.href || "", n = i == null ? void 0 : i(e);
+}, je = (e, t, i) => {
+  const r = e.attr.href || "", n = i == null ? void 0 : i(e);
   return {
-    href: t ? `${n}${t}/${s}` : `${n}${s}`,
+    href: t ? `${n}${t}/${r}` : `${n}${r}`,
     id: e.attr.id || "",
     mediaType: e.attr["media-type"]
   };
-}, ie = (e, t, i) => {
-  var r;
-  const s = e.childNamed("manifest"), { basePath: n } = L(t) || {};
-  return ((r = s == null ? void 0 : s.childrenNamed("item")) == null ? void 0 : r.map((a) => De(a, n, i))) || [];
-}, Oe = ({ archive: e, baseUrl: t }) => async (i) => {
+}, se = (e, t, i) => {
+  var s;
+  const r = e.childNamed("manifest"), { basePath: n } = S(t) || {};
+  return ((s = r == null ? void 0 : r.childrenNamed("item")) == null ? void 0 : s.map((o) => je(o, n, i))) || [];
+}, De = ({ archive: e, baseUrl: t }) => async (i) => {
   var X;
-  const { data: s, basePath: n } = L(e) || {}, r = await je(e);
-  if (!s)
+  const { data: r, basePath: n } = S(e) || {};
+  if (!r)
     return i;
-  const a = await s.string();
-  v.log(a, r);
-  const o = new F.XmlDocument(a), d = await Re(o, e, { baseUrl: t }) || [], p = o.childNamed("metadata"), c = o.childNamed("manifest"), l = o.childNamed("spine"), m = o.childNamed("guide"), g = p == null ? void 0 : p.childNamed("dc:title"), b = (p == null ? void 0 : p.childrenNamed("meta")) || [], h = b.find(
-    (f) => f.attr.property === "rendition:layout"
-  ), x = b.find(
-    (f) => f.attr.property === "rendition:flow"
-  ), y = b.find(
-    (f) => f.attr.property === "rendition:spread"
-  ), w = h == null ? void 0 : h.val, P = x == null ? void 0 : x.val, ae = y == null ? void 0 : y.val, oe = (g == null ? void 0 : g.val) || ((X = e.files.find(({ dir: f }) => f)) == null ? void 0 : X.basename) || "", ce = l == null ? void 0 : l.attr["page-progression-direction"], de = (await se({ archive: e })).reduce(
-    (f, W) => W.size + f,
+  const s = await r.string(), o = new x.XmlDocument(s), a = await Ce(o, e, { baseUrl: t }) || [], d = o.childNamed("metadata"), p = o.childNamed("manifest"), c = o.childNamed("spine"), l = o.childNamed("guide"), u = d == null ? void 0 : d.childNamed("dc:title"), g = (d == null ? void 0 : d.childrenNamed("meta")) || [], b = g.find(
+    (m) => m.attr.property === "rendition:layout"
+  ), h = g.find(
+    (m) => m.attr.property === "rendition:flow"
+  ), $ = g.find(
+    (m) => m.attr.property === "rendition:spread"
+  ), y = b == null ? void 0 : b.val, w = h == null ? void 0 : h.val, N = $ == null ? void 0 : $.val, ie = (u == null ? void 0 : u.val) || ((X = e.files.find(({ dir: m }) => m)) == null ? void 0 : X.basename) || "", oe = c == null ? void 0 : c.attr["page-progression-direction"], ae = (await re({ archive: e })).reduce(
+    (m, W) => W.size + m,
     0
   );
   return {
     filename: e.filename,
     nav: {
-      toc: d
+      toc: a
     },
-    renditionLayout: w || r.renditionLayout || "reflowable",
-    renditionFlow: P || "auto",
-    renditionSpread: ae,
-    title: oe,
-    readingDirection: ce || "ltr",
-    spineItems: (l == null ? void 0 : l.childrenNamed("itemref").map((f, W) => {
-      var H, V, _;
-      const u = c == null ? void 0 : c.childrenNamed("item").find(($) => $.attr.id === (f == null ? void 0 : f.attr.idref)), B = (u == null ? void 0 : u.attr.href) || "", R = ((H = f == null ? void 0 : f.attr.properties) == null ? void 0 : H.split(" ")) || [], le = ((V = e.files.find(($) => $.uri.endsWith(B))) == null ? void 0 : V.size) || 0, U = t || (/^https?:\/\//.test(B) ? "" : "file://");
+    renditionLayout: y,
+    renditionFlow: w || "auto",
+    renditionSpread: N,
+    title: ie,
+    readingDirection: oe || "ltr",
+    /**
+     * @see https://www.w3.org/TR/epub/#sec-itemref-elem
+     */
+    spineItems: (c == null ? void 0 : c.childrenNamed("itemref").map((m, W) => {
+      var V, E;
+      const f = p == null ? void 0 : p.childrenNamed("item").find((C) => C.attr.id === (m == null ? void 0 : m.attr.idref)), B = (f == null ? void 0 : f.attr.href) || "", ce = ((V = e.files.find((C) => C.uri.endsWith(B))) == null ? void 0 : V.size) || 0, H = t || (/^https?:\/\//.test(B) ? "" : "file://"), U = Re(m);
       return {
-        id: (u == null ? void 0 : u.attr.id) || "",
+        ...U,
+        id: (f == null ? void 0 : f.attr.id) || "",
         index: W,
-        href: (_ = u == null ? void 0 : u.attr.href) != null && _.startsWith("https://") ? u == null ? void 0 : u.attr.href : n ? `${U}${n}/${u == null ? void 0 : u.attr.href}` : `${U}${u == null ? void 0 : u.attr.href}`,
-        renditionLayout: w || "reflowable",
-        ...R.find(
-          ($) => $ === "rendition:layout-reflowable"
-        ) && {
-          renditionLayout: "reflowable"
-        },
-        progressionWeight: le / de,
-        pageSpreadLeft: R.some(($) => $ === "page-spread-left") || void 0,
-        pageSpreadRight: R.some(($) => $ === "page-spread-right") || void 0,
+        href: (E = f == null ? void 0 : f.attr.href) != null && E.startsWith("https://") ? f == null ? void 0 : f.attr.href : n ? `${H}${n}/${f == null ? void 0 : f.attr.href}` : `${H}${f == null ? void 0 : f.attr.href}`,
+        renditionLayout: U.renditionLayout ?? y,
+        progressionWeight: ce / ae,
         // size: itemSize
-        mediaType: u == null ? void 0 : u.attr["media-type"]
+        mediaType: f == null ? void 0 : f.attr["media-type"]
       };
     })) || [],
-    items: ie(o, e, (f) => {
-      const W = f.attr.href || "";
+    items: se(o, e, (m) => {
+      const W = m.attr.href || "";
       return /^https?:\/\//.test(W) ? "" : t || "file://";
     }),
-    guide: m == null ? void 0 : m.childrenNamed("reference").map((f) => ({
-      href: f.attr.href || "",
-      title: f.attr.title || "",
-      type: f.attr.type
+    guide: l == null ? void 0 : l.childrenNamed("reference").map((m) => ({
+      href: m.attr.href || "",
+      title: m.attr.title || "",
+      type: m.attr.type
     }))
   };
-}, Me = async (e, t) => {
-  var n, r, a;
-  const s = await ((n = L(e).data) == null ? void 0 : n.string());
-  if (s) {
-    const o = new F.XmlDocument(s), d = ie(o, e, () => "");
-    if ((r = d.find(
+}, Oe = async (e, t) => {
+  var n, s, o;
+  const r = await ((n = S(e).data) == null ? void 0 : n.string());
+  if (r) {
+    const a = new x.XmlDocument(r), d = se(a, e, () => "");
+    if ((s = d.find(
       (c) => t.endsWith(c.href)
-    )) == null ? void 0 : r.mediaType)
+    )) == null ? void 0 : s.mediaType)
       return {
-        mediaType: (a = d.find((c) => t.endsWith(c.href))) == null ? void 0 : a.mediaType
+        mediaType: (o = d.find((c) => t.endsWith(c.href))) == null ? void 0 : o.mediaType
       };
   }
   return {
-    mediaType: ze(t)
+    mediaType: Me(t)
   };
-}, ze = (e) => {
+}, Me = (e) => {
   if (e.endsWith(".css"))
     return "text/css; charset=UTF-8";
   if (e.endsWith(".jpg"))
@@ -295,25 +286,25 @@ const v = {
     return "video/mp4";
   if (e.endsWith(".svg"))
     return "image/svg+xml";
-}, Xe = ({ archive: e, resourcePath: t }) => async (i) => {
-  const s = Object.values(e.files).find(
-    (r) => r.uri === t
+}, ze = ({ archive: e, resourcePath: t }) => async (i) => {
+  const r = Object.values(e.files).find(
+    (s) => s.uri === t
   );
-  if (!s) return i;
-  const n = await Me(e, t);
+  if (!r) return i;
+  const n = await Oe(e, t);
   return {
     ...i,
     params: {
       ...i.params,
-      ...(s == null ? void 0 : s.encodingFormat) && {
-        contentType: s.encodingFormat
+      ...(r == null ? void 0 : r.encodingFormat) && {
+        contentType: r.encodingFormat
       },
       ...n.mediaType && {
         contentType: n.mediaType
       }
     }
   };
-}, ee = [
+}, Z = [
   "div",
   "span",
   "p",
@@ -364,124 +355,119 @@ const v = {
   "canvas",
   "script",
   "style"
-], Be = ({ archive: e, resourcePath: t }) => async (i) => {
-  const s = Object.values(e.files).find(
+], Xe = ({ archive: e, resourcePath: t }) => async (i) => {
+  const r = Object.values(e.files).find(
     (n) => n.uri === t
   );
-  if (s != null && s.basename.endsWith(".xhtml")) {
-    const n = i.body ?? await s.string();
+  if (r != null && r.basename.endsWith(".xhtml")) {
+    const n = i.body ?? await r.string();
     if (!new RegExp(
-      `<(${ee.join("|")})[\\s/>]`,
+      `<(${Z.join("|")})[\\s/>]`,
       "i"
     ).test(n))
       return i;
-    const a = new RegExp(
-      `<(${ee.join("|")})(\\s[^>]*)?\\s*/>`,
+    const o = new RegExp(
+      `<(${Z.join("|")})(\\s[^>]*)?\\s*/>`,
       "gi"
-    ), o = n.replace(
-      a,
+    ), a = n.replace(
+      o,
       (d, p, c = "") => `<${p} ${c.trim()}></${p}>`
     );
     return {
       ...i,
-      body: o
+      body: a
     };
   }
   return i;
-}, Ue = async (e, t) => {
+}, Be = async (e, t) => {
   const i = Object.values(e.files).find(
-    (r) => r.uri === t
+    (s) => s.uri === t
   );
   if (!i)
     throw new Error("no file found");
-  const s = {
+  const r = {
     params: {}
   }, n = [
+    ze({ archive: e, resourcePath: t }),
     Xe({ archive: e, resourcePath: t }),
-    Be({ archive: e, resourcePath: t }),
     ke({ archive: e, resourcePath: t }),
     We({ archive: e, resourcePath: t })
   ];
   try {
-    const r = await n.reduce(async (a, o) => await o(await a), Promise.resolve(s));
-    return v.log("Generated resource", t, r), {
-      ...r,
-      body: r.body ?? await i.blob()
+    const s = await n.reduce(async (o, a) => await a(await o), Promise.resolve(r));
+    return v.log("Generated resource", t, s), {
+      ...s,
+      body: s.body ?? await i.blob()
     };
-  } catch (r) {
-    throw v.error(r), r;
+  } catch (s) {
+    throw v.error(s), s;
   }
 }, He = ({ archive: e, baseUrl: t }) => async () => {
-  var s;
+  var r;
   const i = Object.values(e.files).filter((n) => !n.dir);
   return {
     filename: e.filename,
-    title: ((s = e.files.find(({ dir: n }) => n)) == null ? void 0 : s.basename.replace(/\/$/, "")) || "",
-    renditionLayout: "pre-paginated",
+    title: ((r = e.files.find(({ dir: n }) => n)) == null ? void 0 : r.basename.replace(/\/$/, "")) || "",
+    renditionLayout: void 0,
     renditionSpread: "auto",
     readingDirection: "ltr",
-    spineItems: i.filter((n) => !n.basename.endsWith(".db")).map((n, r) => ({
+    spineItems: i.filter((n) => !n.basename.endsWith(".db")).map((n, s) => ({
       // some books such as cbz can have same basename inside different sub folder
       // we need to make sure to have unique index
       // /chap01/01.png, /chap02/01.png, etc
-      id: `${r}.${n.basename}`,
-      index: r,
+      id: `${s}.${n.basename}`,
+      index: s,
       href: encodeURI(`${t}${n.uri}`),
-      renditionLayout: "pre-paginated",
+      renditionLayout: void 0,
       progressionWeight: 1 / i.length,
       pageSpreadLeft: void 0,
       pageSpreadRight: void 0,
       mediaType: n.encodingFormat
     })),
-    items: i.map((n, r) => ({
-      id: `${r}.${n.basename}`,
+    items: i.map((n, s) => ({
+      id: `${s}.${n.basename}`,
       href: encodeURI(`${t}${n.uri}`)
     }))
   };
+}, Ue = async (e) => {
+  const t = {
+    renditionLayout: void 0
+  };
+  return await Promise.all(
+    e.files.map(async (i) => {
+      var r, n;
+      if (i.uri.endsWith("com.kobobooks.display-options.xml")) {
+        const o = (r = new x.XmlDocument(await i.string()).childNamed("platform")) == null ? void 0 : r.childNamed("option");
+        ((n = o == null ? void 0 : o.attr) == null ? void 0 : n.name) === "fixed-layout" && o.val === "true" && (t.renditionLayout = "pre-paginated");
+      }
+    })
+  ), t;
 }, Ve = ({ archive: e }) => async (t) => {
-  var r;
-  const i = e.files.find(
-    (a) => a.basename.toLowerCase() === "comicinfo.xml"
-  );
-  if (!i)
-    return t;
-  const s = {
+  const i = await Ue(e);
+  return {
     ...t,
-    spineItems: t.spineItems.filter((a) => !a.id.toLowerCase().endsWith("comicinfo.xml")).map((a, o, d) => ({
-      ...a,
-      progressionWeight: 1 / d.length
-    }))
-  }, n = await i.string();
-  try {
-    const o = ((r = new F.XmlDocument(n).childNamed("Manga")) == null ? void 0 : r.val) || "unknown";
-    return {
-      ...s,
-      readingDirection: o === "YesAndRightToLeft" ? "rtl" : "ltr"
-    };
-  } catch (a) {
-    return console.error(`Unable to parse comicinfo.xml for content
-`, n), console.error(a), s;
-  }
-}, _e = (e) => {
+    renditionLayout: t.renditionLayout ?? i.renditionLayout
+  };
+}, Ee = (e) => {
   var i;
-  const t = (i = e.descendantWithPath("head")) == null ? void 0 : i.childrenNamed("meta").find((s) => s.attr.name === "viewport");
+  const t = (i = e.descendantWithPath("head")) == null ? void 0 : i.childrenNamed("meta").find((r) => r.attr.name === "viewport");
   return !!(t && t.attr.name === "viewport");
-}, qe = (e) => e.reduce(async (t, i) => {
-  if (!await t || !me({
+}, _e = (e) => e.reduce(async (t, i) => {
+  if (!await t || !fe({
     mimeType: i.encodingFormat,
     uri: i.uri
   }))
     return !1;
   const n = await i.string();
-  return n ? _e(new F.XmlDocument(n)) : !1;
-}, Promise.resolve(!0)), Ge = ({ archive: e }) => async (t) => {
-  if (t.renditionLayout === "reflowable" && t.spineItems.every((s) => s.renditionLayout === "reflowable")) {
-    const s = await se({ archive: e });
-    if (await qe(s))
+  return n ? Ee(new x.XmlDocument(n)) : !1;
+}, Promise.resolve(!0)), qe = ({ archive: e }) => async (t) => {
+  if (t.renditionLayout === "reflowable" && t.spineItems.every((r) => r.renditionLayout === "reflowable")) {
+    const r = await re({ archive: e });
+    if (await _e(r))
       return {
         ...t,
-        spineItems: t.spineItems.map((r) => ({
-          ...r,
+        spineItems: t.spineItems.map((s) => ({
+          ...s,
           renditionLayout: "pre-paginated"
         })),
         renditionLayout: "pre-paginated"
@@ -490,25 +476,25 @@ const v = {
   return t;
 }, z = (e, t) => {
   var n;
-  const i = e.split(/(\d+)/), s = t.split(/(\d+)/);
-  for (let r = 0, a = i.length; r < a; r++)
-    if (i[r] !== s[r])
-      return (n = i[r]) != null && n.match(/\d/) ? +(i[r] || "") - +(s[r] || "") : (i[r] || "").localeCompare(s[r] || "");
+  const i = e.split(/(\d+)/), r = t.split(/(\d+)/);
+  for (let s = 0, o = i.length; s < o; s++)
+    if (i[s] !== r[s])
+      return (n = i[s]) != null && n.match(/\d/) ? +(i[s] || "") - +(r[s] || "") : (i[s] || "").localeCompare(r[s] || "");
   return 1;
-}, Ke = ({ archive: e, baseUrl: t }) => async (i) => {
+}, Ge = ({ archive: e, baseUrl: t }) => async (i) => {
   if (i.nav) return i;
-  const s = [...e.files].sort(
-    (o, d) => z(o.uri, d.uri)
-  ), n = Object.values(s), r = (o, d, p, c, l) => {
-    const m = o.find((h) => h.title === d), [g, ...b] = p;
-    return m ? g ? [
-      ...o.filter((x) => x != m),
+  const r = [...e.files].sort(
+    (a, d) => z(a.uri, d.uri)
+  ), n = Object.values(r), s = (a, d, p, c, l) => {
+    const u = a.find((h) => h.title === d), [g, ...b] = p;
+    return u ? g ? [
+      ...a.filter(($) => $ != u),
       {
-        ...m,
+        ...u,
         contents: [
-          ...m.contents,
-          ...r(
-            m.contents,
+          ...u.contents,
+          ...s(
+            u.contents,
             g,
             b,
             c,
@@ -516,17 +502,17 @@ const v = {
           )
         ]
       }
-    ] : m.path.split("/").length > l.split("/").length ? [
-      ...o.filter((x) => x != m),
+    ] : u.path.split("/").length > l.split("/").length ? [
+      ...a.filter(($) => $ != u),
       {
-        ...m,
+        ...u,
         path: l,
         href: c
       }
-    ] : o : g ? [
-      ...o,
+    ] : a : g ? [
+      ...a,
       {
-        contents: r(
+        contents: s(
           [],
           g,
           b,
@@ -538,7 +524,7 @@ const v = {
         title: d
       }
     ] : [
-      ...o,
+      ...a,
       {
         contents: [],
         href: c,
@@ -546,50 +532,75 @@ const v = {
         title: d
       }
     ];
-  }, a = n.reduce(
-    (o, d) => {
-      if (d.dir) return o;
-      const c = d.uri.split("/").slice(0, -1), [l, ...m] = c;
+  }, o = n.reduce(
+    (a, d) => {
+      if (d.dir) return a;
+      const c = d.uri.split("/").slice(0, -1), [l, ...u] = c;
       if (l) {
-        const g = N(t, encodeURI(d.uri)).replace(/\/$/, ""), b = d.uri.replace(/\/$/, "");
-        return r(o, l, m, g, b);
+        const g = L(t, encodeURI(d.uri)).replace(/\/$/, ""), b = d.uri.replace(/\/$/, "");
+        return s(a, l, u, g, b);
       }
-      return o;
+      return a;
     },
     []
   );
-  return a.length === 0 ? i : {
+  return o.length === 0 ? i : {
     ...i,
     nav: {
-      toc: a
+      toc: o
     }
   };
-}, Je = {
-  filename: "",
-  items: [],
-  nav: {
-    toc: []
-  },
-  readingDirection: "ltr",
-  renditionLayout: "pre-paginated",
-  renditionSpread: "auto",
-  spineItems: [],
-  title: ""
-}, Ye = async (e, { baseUrl: t = "" } = {}) => {
+}, Ke = ({ archive: e }) => async (t) => {
+  var s;
+  const i = e.files.find(
+    (o) => o.basename.toLowerCase() === "comicinfo.xml"
+  );
+  if (!i)
+    return t;
+  const r = {
+    ...t,
+    spineItems: t.spineItems.filter((o) => !o.id.toLowerCase().endsWith("comicinfo.xml")).map((o, a, d) => ({
+      ...o,
+      progressionWeight: 1 / d.length
+    }))
+  }, n = await i.string();
+  try {
+    const a = ((s = new x.XmlDocument(n).childNamed("Manga")) == null ? void 0 : s.val) || "unknown";
+    return {
+      ...r,
+      readingDirection: a === "YesAndRightToLeft" ? "rtl" : "ltr"
+    };
+  } catch (o) {
+    return console.error(`Unable to parse comicinfo.xml for content
+`, n), console.error(o), r;
+  }
+}, Je = (e) => e.files.some((t) => t.basename.endsWith(".opf")), Ye = ({ archive: e }) => async (t) => Je(e) ? t : {
+  ...t,
+  spineItems: t.spineItems.map((r) => {
+    const n = e.files.find(
+      (o) => decodeURI(r.href).endsWith(o.uri)
+    ), s = ue((n == null ? void 0 : n.encodingFormat) ?? "") ?? O((n == null ? void 0 : n.basename) ?? "");
+    return {
+      ...r,
+      renditionLayout: s != null && s.startsWith("image/") ? "pre-paginated" : r.renditionLayout
+    };
+  })
+}, Qe = async (e, { baseUrl: t = "" } = {}) => {
   const i = [
-    He({ archive: e, baseUrl: t }),
-    Oe({ archive: e, baseUrl: t }),
-    Ge({ archive: e, baseUrl: t }),
+    De({ archive: e, baseUrl: t }),
+    Ke({ archive: e, baseUrl: t }),
+    Ye({ archive: e, baseUrl: t }),
+    qe({ archive: e, baseUrl: t }),
     Ve({ archive: e, baseUrl: t }),
-    Ke({ archive: e, baseUrl: t })
+    Ge({ archive: e, baseUrl: t })
   ];
   try {
-    const s = await i.reduce(async (n, r) => await r(await n), Promise.resolve(Je));
-    return v.log("Generated manifest", s), s;
-  } catch (s) {
-    throw v.error(s), s;
+    const r = He({ archive: e, baseUrl: t })(), n = await i.reduce(async (s, o) => await o(await s), r);
+    return v.log("Generated manifest", n), n;
+  } catch (r) {
+    throw v.error(r), r;
   }
-}, st = async (e, t) => {
+}, ot = async (e, t) => {
   const i = `
     <?xml version="1.0" encoding="UTF-8"?><package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="bookid">
       <metadata>
@@ -598,22 +609,22 @@ const v = {
       </metadata>
       <manifest>
         ${e.map(
-    (r) => `<item id="${T(r)}" href="${r}" media-type="${q(r)}"/>`
+    (s) => `<item id="${A(s)}" href="${s}" media-type="${O(s)}"/>`
   ).join(`
 `)}
       </manifest>
       <spine>
-        ${e.map((r) => `<itemref idref="${T(r)}" />`).join(`
+        ${e.map((s) => `<itemref idref="${A(s)}" />`).join(`
 `)}
       </spine>
     </package>
-  `, s = e.map((r) => ({
+  `, r = e.map((s) => ({
     dir: !1,
-    basename: T(r),
-    encodingFormat: q(r),
-    uri: r,
+    basename: A(s),
+    encodingFormat: O(s),
+    uri: s,
     size: 100 / e.length,
-    blob: async () => (await fetch(r)).blob(),
+    blob: async () => (await fetch(s)).blob(),
     string: async () => ""
   }));
   return {
@@ -625,14 +636,14 @@ const v = {
       size: 0,
       blob: async () => new Blob(),
       string: async () => i
-    }, ...s],
+    }, ...r],
     close: () => Promise.resolve()
   };
-}, it = async (e, {
+}, at = async (e, {
   mimeType: t,
   direction: i
 } = { mimeType: "text/plain" }) => {
-  const s = `
+  const r = `
       <?xml version="1.0" encoding="UTF-8"?>
       <package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="ja" prefix="rendition: http://www.idpf.org/vocab/rendition/#"
         unique-identifier="ootuya-id">
@@ -653,15 +664,15 @@ const v = {
     files: [
       {
         dir: !1,
-        basename: T("generated.opf"),
+        basename: A("generated.opf"),
         uri: "generated.opf",
-        blob: async () => new Blob([s]),
-        string: async () => s,
+        blob: async () => new Blob([r]),
+        string: async () => r,
         size: 0
       },
       {
         dir: !1,
-        basename: T("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(),
@@ -671,30 +682,30 @@ const v = {
     ],
     close: () => Promise.resolve()
   };
-}, at = async (e, { orderByAlpha: t, name: i } = {}) => {
-  let s = Object.values(e.files);
-  t && (s = s.slice().sort((r, a) => z(r.name, a.name)));
+}, ct = async (e, { orderByAlpha: t, name: i } = {}) => {
+  let r = Object.values(e.files);
+  t && (r = r.slice().sort((s, o) => z(s.name, o.name)));
   const n = {
     filename: i || "",
-    files: s.map((r) => ({
-      dir: r.dir,
-      basename: T(r.name),
-      uri: r.name,
-      blob: () => r.async("blob"),
-      string: () => r.async("string"),
-      ...r.internalStream && {
-        stream: r.internalStream
+    files: r.map((s) => ({
+      dir: s.dir,
+      basename: A(s.name),
+      uri: s.name,
+      blob: () => s.async("blob"),
+      string: () => s.async("string"),
+      ...s.internalStream && {
+        stream: s.internalStream
       },
       // this is private API
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      size: r._data.uncompressedSize
+      size: s._data.uncompressedSize
     })),
     close: () => Promise.resolve()
   };
   return v.log("Generated archive", n), n;
-}, ot = async (e, { name: t } = {}) => {
-  const i = await e.getFilesArray(), s = {
+}, dt = async (e, { name: t } = {}) => {
+  const i = await e.getFilesArray(), r = {
     close: () => e.close(),
     filename: t ?? "",
     files: i.map((n) => ({
@@ -706,35 +717,35 @@ const v = {
       string: async () => (await n.file.extract()).text()
     }))
   };
-  return v.log("Generated archive", s), s;
-}, ct = async (e, { orderByAlpha: t, name: i } = {}) => {
-  let s = e;
-  return t && (s = s.slice().sort((n, r) => z(n.name, r.name))), {
+  return v.log("Generated archive", r), r;
+}, lt = async (e, { orderByAlpha: t, name: i } = {}) => {
+  let r = e;
+  return t && (r = r.slice().sort((n, s) => z(n.name, s.name))), {
     filename: i || "",
-    files: s.map((n) => ({
+    files: r.map((n) => ({
       dir: n.isDir,
-      basename: T(n.name),
+      basename: A(n.name),
       uri: n.name,
       blob: async () => new Blob([await n.data()]),
       string: async () => {
-        const r = await n.data();
+        const s = await n.data();
         return String.fromCharCode.apply(
           null,
-          Array.from(new Uint16Array(r))
+          Array.from(new Uint16Array(s))
         );
       },
       size: n.size
     })),
     close: () => Promise.resolve()
   };
-}, dt = ({
+}, pt = ({
   enableReport: e
 } = {}) => {
   v.enable(!!e);
 };
-class Ee {
+class Ze {
   constructor(t) {
-    this.cleanArchiveAfter = t, this.state$ = new ve({
+    this.cleanArchiveAfter = t, this.state$ = new we({
       status: "idle",
       locks: 0
     });
@@ -743,119 +754,119 @@ class Ee {
     this.state$.next({ ...this.state$.getValue(), ...t });
   }
   get locks$() {
-    return this.state$.pipe(A(({ locks: t }) => t));
+    return this.state$.pipe(F(({ locks: t }) => t));
   }
   get state() {
     return this.state$.getValue();
   }
   get isUnlocked$() {
     return this.locks$.pipe(
-      A((t) => t <= 0),
-      $e(),
-      xe()
+      F((t) => t <= 0),
+      ve(),
+      $e()
     );
   }
   get overTTL$() {
     return this.isUnlocked$.pipe(
       k(
-        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? J : Fe(this.cleanArchiveAfter) : J
+        (t) => t ? this.cleanArchiveAfter === 1 / 0 ? G : xe(this.cleanArchiveAfter) : G
       )
     );
   }
 }
-const Qe = ({
+const et = ({
   getArchive: e,
   cleanArchiveAfter: t = 5 * 60 * 1e3
   // 5mn
 }) => {
-  const i = new j(), s = new j(), n = new j(), r = {}, a = i.pipe(
+  const i = new R(), r = new R(), n = new R(), s = {}, o = i.pipe(
     M((p) => {
-      const c = r[p];
-      if (!c || c.state.status !== "idle") return G;
+      const c = s[p];
+      if (!c || c.state.status !== "idle") return _;
       let l = !1;
-      const m = (y) => {
-        var P;
-        const w = r[y];
-        delete r[y], l || ((P = w == null ? void 0 : w.state.archive) == null || P.close(), l = !0);
+      const u = (y) => {
+        var N;
+        const w = s[y];
+        delete s[y], l || ((N = w == null ? void 0 : w.state.archive) == null || N.close(), l = !0);
       };
       c.update({
         status: "loading"
       });
       const g = c.locks$, b = c.isUnlocked$, h = g.pipe(
-        he(),
-        D(([y, w]) => w > y),
-        ge(!0)
+        me(),
+        j(([y, w]) => w > y),
+        he(!0)
       );
-      return I(e(p)).pipe(
-        O((y) => {
+      return P(e(p)).pipe(
+        D((y) => {
           c.update({
             archive: y,
             status: "success"
           });
         }),
-        C((y) => (m(p), c.update({
+        I((y) => (u(p), c.update({
           status: "error",
           error: y
-        }), G)),
+        }), _)),
         k(() => {
           const y = h.pipe(
             k(() => n),
             k(() => b),
-            D((w) => w)
+            j((w) => w)
           );
-          return K(y, c.overTTL$);
+          return q(y, c.overTTL$);
         }),
-        O(() => {
-          m(p);
+        D(() => {
+          u(p);
         })
       );
     }),
-    ye(s)
-  ), o = (p) => {
+    ge(r)
+  ), a = (p) => {
     let c = !1;
-    const l = r[p] ?? new Ee(t);
-    r[p] = l, l.update({
+    const l = s[p] ?? new Ze(t);
+    s[p] = l, l.update({
       locks: l.state.locks + 1
     });
-    const m = () => {
+    const u = () => {
       c || (c = !0, l.update({
         locks: l.state.locks - 1
       }));
     };
     i.next(p);
     const g = l.state$.pipe(
-      A(({ archive: h }) => h),
-      D((h) => !!h)
+      F(({ archive: h }) => h),
+      j((h) => !!h)
     ), b = l.state$.pipe(
-      O(({ error: h }) => {
+      D(({ error: h }) => {
         if (h)
           throw h;
       }),
-      be()
+      ye()
     );
-    return K(g, b).pipe(
-      we(),
-      A((h) => ({ archive: h, release: m })),
-      C((h) => {
-        throw m(), h;
+    return q(g, b).pipe(
+      be(),
+      F((h) => ({ archive: h, release: u })),
+      I((h) => {
+        throw u(), h;
       })
     );
   }, d = () => {
     n.next();
   };
-  return a.subscribe(), {
-    access: o,
+  return o.subscribe(), {
+    access: a,
     purge: d,
-    archives: r
+    archives: s
   };
 };
-class Ze {
+class tt {
   constructor({
     onError: t,
     onManifestSuccess: i,
-    ...s
+    ...r
   }) {
-    this.onError = (n) => (console.error(n), new Response(String(n), { status: 500 })), this.epubLoader = Qe(s), this.onManifestSuccess = i ?? (({ manifest: n }) => Promise.resolve(n)), this.onError = t ?? this.onError;
+    this.onError = (n) => (console.error(n), new Response(String(n), { status: 500 })), this.epubLoader = et(r), this.onManifestSuccess = i ?? (({ manifest: n }) => Promise.resolve(n)), this.onError = t ?? this.onError;
   }
   prune() {
     this.epubLoader.purge();
@@ -865,41 +876,41 @@ class Ze {
   }
   accessArchiveWithoutLock(t) {
     return this.accessArchive(t).pipe(
-      A(({ archive: i, release: s }) => (s(), i))
+      F(({ archive: i, release: r }) => (r(), i))
     );
   }
   fetchManifest({ key: t, baseUrl: i }) {
-    const s = this.accessArchive(t).pipe(
-      M(({ archive: n, release: r }) => I(
-        Ye(n, { baseUrl: i })
+    const r = this.accessArchive(t).pipe(
+      M(({ archive: n, release: s }) => P(
+        Qe(n, { baseUrl: i })
       ).pipe(
         k(
-          (o) => I(this.onManifestSuccess({ manifest: o, archive: n }))
+          (a) => P(this.onManifestSuccess({ manifest: a, archive: n }))
         ),
-        A(
-          (o) => new Response(JSON.stringify(o), {
+        F(
+          (a) => new Response(JSON.stringify(a), {
             status: 200
           })
         ),
-        Y(() => {
-          r();
+        K(() => {
+          s();
         })
       )),
-      C((n) => E(this.onError(n)))
+      I((n) => J(this.onError(n)))
     );
-    return Q(s);
+    return Y(r);
   }
   fetchResource({
     key: t,
     resourcePath: i
   }) {
-    const s = this.accessArchive(t).pipe(
-      M(({ archive: n, release: r }) => {
-        const a = i.replaceAll("file://", "");
-        return I(
-          Ue(n, a)
+    const r = this.accessArchive(t).pipe(
+      M(({ archive: n, release: s }) => {
+        const o = i.replaceAll("file://", "");
+        return P(
+          Be(n, o)
         ).pipe(
-          A(
+          F(
             (d) => new Response(d.body, {
               status: 200,
               headers: {
@@ -909,17 +920,17 @@ class Ze {
               }
             })
           ),
-          Y(() => {
-            r();
+          K(() => {
+            s();
           })
         );
       }),
-      C((n) => E(this.onError(n)))
+      I((n) => J(this.onError(n)))
     );
-    return Q(s);
+    return Y(r);
   }
 }
-class lt extends Ze {
+class ft extends tt {
   constructor({
     getUriInfo: t,
     ...i
@@ -930,30 +941,30 @@ class lt extends Ze {
     try {
       const i = this.getUriInfo(t);
       if (!i) return;
-      const s = Z(i.baseUrl), n = t.request.url.substring(
-        s.length + 1
-      ), [r = ""] = n.split("/"), a = decodeURIComponent(
-        Z(n.substring(r.length + 1))
+      const r = Q(i.baseUrl), n = t.request.url.substring(
+        r.length + 1
+      ), [s = ""] = n.split("/"), o = decodeURIComponent(
+        Q(n.substring(s.length + 1))
       );
       n.endsWith("/manifest") ? t.respondWith(
-        this.fetchManifest({ key: r, baseUrl: `${s}/${r}/` })
-      ) : t.respondWith(this.fetchResource({ key: r, resourcePath: a }));
+        this.fetchManifest({ key: s, baseUrl: `${r}/${s}/` })
+      ) : t.respondWith(this.fetchResource({ key: s, resourcePath: o }));
     } catch (i) {
       t.respondWith(new Response(String(i), { status: 500 }));
     }
   }
 }
 export {
-  lt as ServiceWorkerStreamer,
-  Ze as Streamer,
-  dt as configure,
-  ct as createArchiveFromArrayBufferList,
-  at as createArchiveFromJszip,
-  ot as createArchiveFromLibArchive,
-  it as createArchiveFromText,
-  st as createArchiveFromUrls,
-  Ye as generateManifestFromArchive,
-  Ue as generateResourceFromArchive,
-  L as getArchiveOpfInfo
+  ft as ServiceWorkerStreamer,
+  tt as Streamer,
+  pt as configure,
+  lt as createArchiveFromArrayBufferList,
+  ct as createArchiveFromJszip,
+  dt as createArchiveFromLibArchive,
+  at as createArchiveFromText,
+  ot as createArchiveFromUrls,
+  Qe as generateManifestFromArchive,
+  Be as generateResourceFromArchive,
+  S as getArchiveOpfInfo
 };
 //# sourceMappingURL=index.js.map