@prose-reader/streamer 1.319.0 → 1.320.0

package/dist/index/index.js

@@ -1,7 +1,7 @@
 import { a as e, i as t, n, o as r, r as i, s as a, t as o } from "../createArchiveFromEntries-CNz716dm.js";
 import { n as s, t as c } from "../fileAccessors-etcCPnpQ.js";
 import { detectMimeTypeFromName as l, escapeXmlAttributeValue as u, isMediaContentMimeType as d, isXmlBasedMimeType as f, parseContentType as p, urlJoin as m } from "@prose-reader/shared";
-import { APPLE_IBOOKS_DISPLAY_OPTIONS_FILENAME as h, COMIC_INFO_FILENAME as g, KOBO_DISPLAY_OPTIONS_FILENAME as _, parseAppleDisplayOptionsXml as ee, parseComicInfo as te, parseKoboXml as ne, parseOpf as re, resolveArchiveMetadata as v, tokenizeXmlSpaceSeparatedList as ie } from "@prose-reader/archive-parser";
+import { APPLE_IBOOKS_DISPLAY_OPTIONS_FILENAME as h, COMIC_INFO_FILENAME as g, KOBO_DISPLAY_OPTIONS_FILENAME as _, parseAppleDisplayOptionsXml as ee, parseComicInfo as te, parseKoboXml as ne, parseOpf as re, resolveArchiveMetadata as v, tokenizeXmlSpaceSeparatedList as ie } from "@prose-reader/archive-reader";
 import { XmlDocument as y, XmlElement as ae, XmlTextNode as oe } from "xmldoc";
 import { BehaviorSubject as se, EMPTY as b, NEVER as x, Subject as S, catchError as C, distinctUntilChanged as ce, filter as w, finalize as le, first as T, from as E, ignoreElements as ue, lastValueFrom as de, map as D, merge as O, mergeMap as k, of as fe, pairwise as pe, shareReplay as me, startWith as he, switchMap as A, takeUntil as ge, tap as j, timer as _e } from "rxjs";
 //#region src/archives/createArchiveFromArrayBufferList.ts
@@ -158,11 +158,11 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 	} catch (e) {
 		return console.error(`Unable to parse ${g} for content\n`, i), console.error(e), r;
 	}
-}, Ne = ({ baseUrl: e = "", resourcePath: t }) => {
+}, U = ({ baseUrl: e = "", resourcePath: t }) => {
 	if (!e && /^https?:\/\//.test(t)) return encodeURI(t);
 	let n = e ? `${e}${e.endsWith("/") ? "" : "/"}` : "file://";
 	return encodeURI(`${n}${t}`);
-}, Pe = ({ archive: e, baseUrl: t }) => async () => {
+}, Ne = ({ archive: e, baseUrl: t }) => async () => {
 	let n = e.records.filter((e) => !e.dir), r = I(), i = n.map((e) => ({
 		file: e,
 		id: r(e.uri)
@@ -176,7 +176,7 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		spineItems: i.filter(({ file: e }) => !e.basename.endsWith(".db")).map(({ file: e, id: r }, i) => ({
 			id: r,
 			index: i,
-			href: Ne({
+			href: U({
 				baseUrl: t,
 				resourcePath: e.uri
 			}),
@@ -191,11 +191,11 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 			href: encodeURI(`${t}${e.uri}`)
 		}))
 	};
-}, U = async ({ archive: e, archiveOpf: t }) => {
+}, W = async ({ archive: e, archiveOpf: t }) => {
 	if (!t) return [];
 	let { opf: n, basePath: r } = t, { spineRows: i } = n;
 	return e.records.filter((e) => i.find((t) => r ? `${r}/${t.href}` === e.uri : `${t.href}` === e.uri));
-}, W = (e, t, n) => {
+}, G = (e, t, n) => {
 	let { basePath: r } = V(t) || {};
 	return e.map((e) => {
 		let t = e.href, i = n?.(t) ?? "";
@@ -205,25 +205,25 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 			mediaType: e.mediaType
 		};
 	});
-}, Fe = (e) => {
+}, Pe = (e) => {
 	let t = e?.trim();
 	return t === "scrolled-continuous" || t === "scrolled-doc" || t === "paginated" || t === "auto" ? t : "auto";
-}, Ie = (e) => {
+}, Fe = (e) => {
 	let t = e?.trim();
 	if (t === "none" || t === "landscape" || t === "portrait" || t === "both" || t === "auto") return t;
-}, Le = (e) => {
+}, Ie = (e) => {
 	let t = e?.trim();
 	if (t === "cover" || t === "title-page" || t === "copyright-page" || t === "text") return t;
-}, Re = ({ archive: e, baseUrl: t, archiveOpf: n }) => async (r) => {
+}, Le = ({ archive: e, baseUrl: t, archiveOpf: n }) => async (r) => {
 	if (!n) return r;
 	let { opf: i, basePath: o } = n, s = v(i);
 	a.groupCollapsed(...a.getGroupArgs("OPF parsed")), a.log("opf", i), a.groupEnd();
-	let c = i.renditionLayoutMeta?.trim(), l = c === "reflowable" || c === "pre-paginated" ? c : s.renditionLayout, u = i.title?.trim() || e.records.find(({ dir: e }) => e)?.basename || "", d = s.readingDirection ?? r.readingDirection, f = (await U({
+	let c = i.renditionLayoutMeta?.trim(), l = c === "reflowable" || c === "pre-paginated" ? c : s.renditionLayout, u = i.title?.trim() || e.records.find(({ dir: e }) => e)?.basename || "", d = s.readingDirection ?? r.readingDirection, f = (await W({
 		archive: e,
 		archiveOpf: n
 	})).filter(L).reduce((e, t) => t.size + e, 0), p = i.guide, m = [];
 	for (let e of p) {
-		let t = Le(e.type);
+		let t = Ie(e.type);
 		t !== void 0 && m.push({
 			href: e.href,
 			title: e.title,
@@ -233,8 +233,8 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 	return {
 		filename: e.filename ?? "",
 		renditionLayout: l,
-		renditionFlow: Fe(i.renditionFlowMeta),
-		renditionSpread: Ie(i.renditionSpreadMeta),
+		renditionFlow: Pe(i.renditionFlowMeta),
+		renditionSpread: Fe(i.renditionSpreadMeta),
 		title: u,
 		readingDirection: d,
 		spineItems: i.spineRows.map((n, r) => {
@@ -251,20 +251,20 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 				mediaType: n.mediaType
 			};
 		}),
-		items: W(i.manifestItems, e, (e) => /^https?:\/\//.test(e) ? "" : t || "file://"),
+		items: G(i.manifestItems, e, (e) => /^https?:\/\//.test(e) ? "" : t || "file://"),
 		guide: m.length > 0 ? m : void 0
 	};
-}, ze = (e) => {
+}, Re = (e) => {
 	let t = e.descendantWithPath("head")?.childrenNamed("meta").find((e) => e.attr.name === "viewport");
 	return !!(t && t.attr.name === "viewport");
-}, Be = (e) => e.reduce(async (e, t) => {
+}, ze = (e) => e.reduce(async (e, t) => {
 	if (!await e || !f({
 		mimeType: L(t) ? t.encodingFormat : void 0,
 		uri: t.uri
 	})) return !1;
 	let n = t.dir ? null : await B(t);
-	return n ? ze(new y(n)) : !1;
-}, Promise.resolve(!0)), Ve = ({ archive: e, archiveOpf: t }) => async (n) => n.renditionLayout === "reflowable" && n.spineItems.every((e) => e.renditionLayout === "reflowable") && await Be(await U({
+	return n ? Re(new y(n)) : !1;
+}, Promise.resolve(!0)), Be = ({ archive: e, archiveOpf: t }) => async (n) => n.renditionLayout === "reflowable" && n.spineItems.every((e) => e.renditionLayout === "reflowable") && await ze(await W({
 	archive: e,
 	archiveOpf: t
 })) ? {
@@ -274,10 +274,10 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		renditionLayout: "pre-paginated"
 	})),
 	renditionLayout: "pre-paginated"
-} : n, He = () => (e) => ({
+} : n, Ve = () => (e) => ({
 	...e,
 	readingDirection: e.readingDirection ?? "ltr"
-}), Ue = async (e) => {
+}), He = async (e) => {
 	let t;
 	return await Promise.all(e.records.map(async (e) => {
 		if (e.dir || !e.uri.endsWith(_)) return;
@@ -292,13 +292,13 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		kind: "kobo",
 		...t === void 0 ? {} : { renditionLayout: t }
 	};
-}, We = ({ archive: e }) => async (t) => {
-	let { renditionLayout: n } = v(await Ue(e));
+}, Ue = ({ archive: e }) => async (t) => {
+	let { renditionLayout: n } = v(await He(e));
 	return {
 		...t,
 		renditionLayout: t.renditionLayout ?? n
 	};
-}, G = (e) => e.toLowerCase().endsWith(".opf"), Ge = (e) => e.records.some((e) => !e.dir && (G(e.basename) || G(e.uri))), Ke = ({ archive: e }) => async (t) => Ge(e) ? t : {
+}, K = (e) => e.toLowerCase().endsWith(".opf"), We = (e) => e.records.some((e) => !e.dir && (K(e.basename) || K(e.uri))), Ge = ({ archive: e }) => async (t) => We(e) ? t : {
 	...t,
 	spineItems: t.spineItems.map((t) => {
 		let n = e.records.find((e) => decodeURI(t.href).endsWith(e.uri)), r = p((n && L(n) ? n.encodingFormat : void 0) ?? "") || l(n?.basename ?? "");
@@ -307,96 +307,96 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 			renditionLayout: r && d(r) ? "pre-paginated" : t.renditionLayout
 		};
 	})
-}, K = (e) => e ? e.children.map((e) => e instanceof oe ? e.text : e instanceof ae ? K(e) : "").join("").trim() : "", qe = (e) => ie(e.properties).includes("nav"), q = (e, { basePath: t, baseUrl: n }) => {
+}, q = (e) => e ? e.children.map((e) => e instanceof oe ? e.text : e instanceof ae ? q(e) : "").join("").trim() : "", Ke = (e) => ie(e.properties).includes("nav"), J = (e, { basePath: t, baseUrl: n }) => {
 	let r = {
 		contents: [],
 		path: "",
 		href: "",
 		title: ""
 	}, i = e.childNamed("span") || e.childNamed("a");
-	r.title = (i?.attr.title || i?.val.trim() || K(i)) ?? "";
+	r.title = (i?.attr.title || i?.val.trim() || q(i)) ?? "";
 	let a = i?.name;
 	a !== "a" && (i = e.descendantWithPath(`${a}.a`), i && (a = i.name.toLowerCase())), a === "a" && i?.attr.href && (r.path = m(t, i.attr.href), r.href = m(n, t, i.attr.href));
 	let o = e.childNamed("ol");
 	if (o) {
 		let e = o.childrenNamed("li");
-		e && e.length > 0 && (r.contents = e.map((e) => q(e, {
+		e && e.length > 0 && (r.contents = e.map((e) => J(e, {
 			basePath: t,
 			baseUrl: n
 		})));
 	}
 	return r;
-}, Je = (e, { basePath: t, baseUrl: n }) => {
+}, qe = (e, { basePath: t, baseUrl: n }) => {
 	let r = [], i;
 	return e.descendantWithPath("body.nav.ol") ? i = e.descendantWithPath("body.nav.ol")?.children : e.descendantWithPath("body.section.nav.ol") && (i = e.descendantWithPath("body.section.nav.ol")?.children), i && i.length > 0 && i.filter((e) => e.name === "li").forEach((e) => {
-		r.push(q(e, {
+		r.push(J(e, {
 			basePath: t,
 			baseUrl: n
 		}));
 	}), r;
-}, Ye = async (e, t, { baseUrl: r }) => {
-	let i = e.manifestItems.find(qe);
+}, Je = async (e, t, { baseUrl: r }) => {
+	let i = e.manifestItems.find(Ke);
 	if (i?.href) {
 		let e = t.records.find((e) => e.uri.endsWith(i.href));
-		if (e && !e.dir) return Je(new y(await B(e)), {
+		if (e && !e.dir) return qe(new y(await B(e)), {
 			basePath: n(e.uri),
 			baseUrl: r
 		});
 	}
-}, J = (e, { opfBasePath: t, baseUrl: n, prefix: r }) => {
+}, Y = (e, { opfBasePath: t, baseUrl: n, prefix: r }) => {
 	let i = e?.childNamed(`${r}content`)?.attr.src || "", a = {
 		title: e?.descendantWithPath(`${r}navLabel.${r}text`)?.val || "",
 		path: m(t, i),
 		href: m(n, t, i),
 		contents: []
 	}, o = e.childrenNamed(`${r}navPoint`);
-	return o && o.length > 0 && (a.contents = o.map((e) => J(e, {
+	return o && o.length > 0 && (a.contents = o.map((e) => Y(e, {
 		opfBasePath: t,
 		baseUrl: n,
 		prefix: r
 	}))), a;
-}, Xe = (e, { opfBasePath: t, baseUrl: n }) => {
+}, Ye = (e, { opfBasePath: t, baseUrl: n }) => {
 	let r = [], i = e.name, a = "";
 	return i.indexOf(":") !== -1 && (a = `${i.split(":")[0]}:`), e.childNamed(`${a}navMap`)?.childrenNamed(`${a}navPoint`).forEach((e) => {
-		r.push(J(e, {
+		r.push(Y(e, {
 			opfBasePath: t,
 			baseUrl: n,
 			prefix: a
 		}));
 	}), r;
-}, Ze = async ({ opf: e, opfBasePath: t, baseUrl: n, archive: r }) => {
+}, Xe = async ({ opf: e, opfBasePath: t, baseUrl: n, archive: r }) => {
 	let i = e.spineTocIdref;
 	if (i) {
 		let a = e.manifestItems.find((e) => e.id === i);
 		if (a) {
 			let e = `${t}${t === "" ? "" : "/"}${a.href}`, i = r.records.find((t) => t.uri.endsWith(e));
-			if (i && !i.dir) return Xe(new y(await B(i)), {
+			if (i && !i.dir) return Ye(new y(await B(i)), {
 				opfBasePath: t,
 				baseUrl: n
 			});
 		}
 	}
-}, Qe = async (e, t, { baseUrl: n }) => {
-	let { basePath: r } = V(t) || {}, i = await Ye(e, t, { baseUrl: n });
+}, Ze = async (e, t, { baseUrl: n }) => {
+	let { basePath: r } = V(t) || {}, i = await Je(e, t, { baseUrl: n });
 	if (i) return i;
-	let a = await Ze({
+	let a = await Xe({
 		opf: e,
 		opfBasePath: r ?? "",
 		archive: t,
 		baseUrl: n
 	});
 	if (a) return a;
-}, $e = (e) => e.replace(/\.[^.]+$/, "").replace(/[_-]/g, " ").replace(/\s+/g, " ").trim(), et = (e, t) => {
+}, Qe = (e) => e.replace(/\.[^.]+$/, "").replace(/[_-]/g, " ").replace(/\s+/g, " ").trim(), $e = (e, t) => {
 	if (e.spineItems.length !== 0 && e.spineItems.every((e) => (p(e.mediaType ?? "") || l(e.href))?.startsWith("audio/"))) return e.spineItems.map((e) => {
 		let n = t.records.find((t) => !t.dir && decodeURI(e.href).endsWith(t.uri));
 		return {
-			title: $e(n?.basename ?? e.href),
+			title: Qe(n?.basename ?? e.href),
 			href: e.href,
 			path: n?.uri ?? e.href,
 			contents: []
 		};
 	});
-}, tt = (t, { baseUrl: n }) => {
+}, et = (t, { baseUrl: n }) => {
 	let r = [...t.records].sort((t, n) => e(t.uri, n.uri)), i = (e, t, n, r, a) => {
 		let o = e.find((e) => e.title === t), [s, ...c] = n;
 		return o ? s ? [...e.filter((e) => e !== o), {
@@ -425,15 +425,15 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		let o = m(n, encodeURI(t.uri)).replace(/\/$/, ""), s = t.uri.replace(/\/$/, "");
 		return i(e, r, a, o, s);
 	}, []);
-}, nt = async (e, t, { baseUrl: n, archiveOpf: r }) => {
-	if (r) return await Qe(r.opf, e, { baseUrl: n }) || [];
-	let i = et(t, e);
+}, tt = async (e, t, { baseUrl: n, archiveOpf: r }) => {
+	if (r) return await Ze(r.opf, e, { baseUrl: n }) || [];
+	let i = $e(t, e);
 	if (i) return i;
-	let a = tt(e, { baseUrl: n });
+	let a = et(e, { baseUrl: n });
 	if (a.length !== 0) return a;
-}, rt = ({ archive: e, baseUrl: t, archiveOpf: n }) => async (r) => {
+}, nt = ({ archive: e, baseUrl: t, archiveOpf: n }) => async (r) => {
 	if (r.nav) return r;
-	let i = await nt(e, r, {
+	let i = await tt(e, r, {
 		baseUrl: t,
 		archiveOpf: n
 	});
@@ -441,13 +441,13 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		...r,
 		nav: { toc: i }
 	} : r;
-}, it = (e) => e ? e.endsWith("/") ? e : `${e}/` : "", Y = async (e, { baseUrl: t = "", hooks: n = {} } = {}) => {
+}, rt = (e) => e ? e.endsWith("/") ? e : `${e}/` : "", X = async (e, { baseUrl: t = "", hooks: n = {} } = {}) => {
 	a.log("Generating manifest from archive", e);
-	let r = await H(e), i = it(t), o = (t) => (t ?? []).map((t) => t({
+	let r = await H(e), i = rt(t), o = (t) => (t ?? []).map((t) => t({
 		archive: e,
 		baseUrl: i
 	})), s = [
-		Re({
+		Le({
 			archive: e,
 			baseUrl: i,
 			archiveOpf: r
@@ -460,23 +460,23 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 			archive: e,
 			baseUrl: i
 		}),
-		Ke({
+		Ge({
 			archive: e,
 			baseUrl: i
 		}),
 		...o(n.content)
 	], c = o(n.spine), l = [
-		Ve({
+		Be({
 			archive: e,
 			baseUrl: i,
 			archiveOpf: r
 		}),
-		We({
+		Ue({
 			archive: e,
 			baseUrl: i
 		}),
 		...o(n.presentation)
-	], u = [rt({
+	], u = [nt({
 		archive: e,
 		baseUrl: i,
 		archiveOpf: r
@@ -485,10 +485,10 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		...c,
 		...l,
 		...u,
-		He()
+		Ve()
 	];
 	try {
-		let t = Pe({
+		let t = Ne({
 			archive: e,
 			baseUrl: i
 		})(), n = await d.reduce(async (e, t) => await t(await e), t);
@@ -500,15 +500,15 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 	} catch (e) {
 		throw a.error(e), e;
 	}
-}, at = (e) => {
+}, it = (e) => {
 	let t = e.descendantWithPath("head")?.childrenNamed("meta").find((e) => e.attr.name === "calibre:cover");
 	return !!(t && t.attr.name === "calibre:cover");
-}, ot = (e) => e.descendantWithPath("body")?.descendantWithPath("div")?.childrenNamed("svg")?.find((e) => e.attr.width === "100%" && e.attr.preserveAspectRatio === "none"), st = ({ archive: e, resourcePath: t }) => async (n) => {
+}, at = (e) => e.descendantWithPath("body")?.descendantWithPath("div")?.childrenNamed("svg")?.find((e) => e.attr.width === "100%" && e.attr.preserveAspectRatio === "none"), ot = ({ archive: e, resourcePath: t }) => async (n) => {
 	let r = R(e, t);
 	if (r?.basename.endsWith(".xhtml")) {
 		let e = new y(typeof n.body == "string" ? n.body : await B(r));
-		if (at(e)) {
-			let t = ot(e);
+		if (it(e)) {
+			let t = at(e);
 			return t && delete t.attr.preserveAspectRatio, {
 				...n,
 				body: e?.toString()
@@ -516,10 +516,10 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		}
 	}
 	return n;
-}, ct = ({ archive: e, resourcePath: t }) => async (n) => st({
+}, st = ({ archive: e, resourcePath: t }) => async (n) => ot({
 	archive: e,
 	resourcePath: t
-})(n), lt = ({ archive: e, resourcePath: t }) => async (n) => {
+})(n), ct = ({ archive: e, resourcePath: t }) => async (n) => {
 	let r = R(e, t);
 	if (r?.basename.endsWith(".css")) {
 		let e = (typeof n.body == "string" ? n.body : await B(r)).replaceAll("-webkit-writing-mode", "writing-mode");
@@ -529,23 +529,23 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		};
 	}
 	return n;
-}, ut = async (e, t) => {
+}, lt = async (e, t) => {
 	let n = await H(e);
 	if (n) {
-		let { opf: r } = n, i = W(r.manifestItems, e, () => "").find((e) => t.endsWith(e.href))?.mediaType;
+		let { opf: r } = n, i = G(r.manifestItems, e, () => "").find((e) => t.endsWith(e.href))?.mediaType;
 		if (i) return { mediaType: i };
 	}
-	return { mediaType: dt(t) };
-}, dt = (e) => {
+	return { mediaType: ut(t) };
+}, ut = (e) => {
 	if (e.endsWith(".css")) return "text/css; charset=UTF-8";
 	if (e.endsWith(".jpg")) return "image/jpg";
 	if (e.endsWith(".xhtml")) return "application/xhtml+xml";
 	if (e.endsWith(".mp4")) return "video/mp4";
 	if (e.endsWith(".svg")) return "image/svg+xml";
-}, ft = ({ archive: e, resourcePath: t }) => async (n) => {
+}, dt = ({ archive: e, resourcePath: t }) => async (n) => {
 	let r = R(e, t);
 	if (!r) return n;
-	let i = await ut(e, t);
+	let i = await lt(e, t);
 	return {
 		...n,
 		params: {
@@ -554,37 +554,37 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 			...i.mediaType && { contentType: i.mediaType }
 		}
 	};
-}, X = /* @__PURE__ */ "div.span.p.a.li.ul.ol.h1.h2.h3.h4.h5.h6.table.tr.td.th.thead.tbody.tfoot.section.article.header.footer.nav.aside.main.figure.figcaption.blockquote.pre.code.form.textarea.select.option.button.label.fieldset.legend.caption.dl.dt.dd.iframe.video.audio.canvas.script.style".split("."), pt = ({ archive: e, resourcePath: t }) => async (n) => {
+}, Z = /* @__PURE__ */ "div.span.p.a.li.ul.ol.h1.h2.h3.h4.h5.h6.table.tr.td.th.thead.tbody.tfoot.section.article.header.footer.nav.aside.main.figure.figcaption.blockquote.pre.code.form.textarea.select.option.button.label.fieldset.legend.caption.dl.dt.dd.iframe.video.audio.canvas.script.style".split("."), ft = ({ archive: e, resourcePath: t }) => async (n) => {
 	let r = R(e, t);
 	if (r?.basename.endsWith(".xhtml")) {
 		let e = typeof n.body == "string" ? n.body : await B(r);
-		if (!RegExp(`<(${X.join("|")})[\\s/>]`, "i").test(e)) return n;
-		let t = RegExp(`<(${X.join("|")})(\\s[^>]*)?\\s*/>`, "gi"), i = e.replace(t, (e, t, n = "") => `<${t} ${n.trim()}></${t}>`);
+		if (!RegExp(`<(${Z.join("|")})[\\s/>]`, "i").test(e)) return n;
+		let t = RegExp(`<(${Z.join("|")})(\\s[^>]*)?\\s*/>`, "gi"), i = e.replace(t, (e, t, n = "") => `<${t} ${n.trim()}></${t}>`);
 		return {
 			...n,
 			body: i
 		};
 	}
 	return n;
-}, Z = async (e, t, { hooks: n = [] } = {}) => {
+}, Q = async (e, t, { hooks: n = [] } = {}) => {
 	let r = { params: {} }, i = [
 		...n.map((n) => n({
 			archive: e,
 			resourcePath: t
 		})),
-		ft({
+		dt({
 			archive: e,
 			resourcePath: t
 		}),
-		pt({
+		ft({
 			archive: e,
 			resourcePath: t
 		}),
-		lt({
+		ct({
 			archive: e,
 			resourcePath: t
 		}),
-		ct({
+		st({
 			archive: e,
 			resourcePath: t
 		})
@@ -601,7 +601,7 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 	} catch (e) {
 		throw a.error(e), e;
 	}
-}, mt = class {
+}, pt = class {
 	constructor(e) {
 		this.cleanArchiveAfter = e, this.state$ = new se({
 			status: "idle",
@@ -626,7 +626,7 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 	get overTTL$() {
 		return this.isUnlocked$.pipe(A((e) => e ? this.cleanArchiveAfter === Infinity ? x : _e(this.cleanArchiveAfter) : x));
 	}
-}, ht = ({ getArchive: e, cleanArchiveAfter: t = 300 * 1e3 }) => {
+}, mt = ({ getArchive: e, cleanArchiveAfter: t = 300 * 1e3 }) => {
 	let n = new S(), r = new S(), i = new S(), o = {};
 	return n.pipe(k((t) => {
 		let n = o[t];
@@ -651,7 +651,7 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		}))));
 	}), ge(r)).subscribe(), {
 		access: (e) => {
-			let r = !1, i = o[e] ?? new mt(t);
+			let r = !1, i = o[e] ?? new pt(t);
 			o[e] = i, i.update({ locks: i.state.locks + 1 });
 			let a = () => {
 				r || (r = !0, i.update({ locks: i.state.locks - 1 }));
@@ -670,7 +670,7 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		},
 		_archives: o
 	};
-}, Q = (e) => e ? /^\d+$/.test(e) ? {
+}, $ = (e) => e ? /^\d+$/.test(e) ? {
 	valid: !0,
 	value: Number.parseInt(e, 10)
 } : {
@@ -679,20 +679,20 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 } : {
 	valid: !0,
 	value: void 0
-}, gt = (e) => {
+}, ht = (e) => {
 	if (!e.toLowerCase().startsWith("bytes=")) return { kind: "missing" };
 	let t = e.slice(6).trim();
 	if (!t) return { kind: "invalid" };
 	if (t.includes(",")) return { kind: "multi" };
 	let n = /^(\d*)-(\d*)$/.exec(t);
 	if (!n) return { kind: "invalid" };
-	let [, r = "", i = ""] = n, a = Q(r.trim()), o = Q(i.trim());
+	let [, r = "", i = ""] = n, a = $(r.trim()), o = $(i.trim());
 	return !a.valid || !o.valid ? { kind: "invalid" } : {
 		kind: "single",
 		start: a.value,
 		end: o.value
 	};
-}, _t = (e) => {
+}, gt = (e) => {
 	if (e instanceof Blob) return {
 		size: e.size,
 		slice: (t, n) => {
@@ -714,18 +714,18 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 			};
 		}
 	};
-}, vt = ({ body: e, contentType: t, rangeHeader: n }) => {
+}, _t = ({ body: e, contentType: t, rangeHeader: n }) => {
 	let r = new Headers();
 	if (t && r.set("Content-Type", t), r.set("Accept-Ranges", "bytes"), !n) return e instanceof Blob && r.set("Content-Length", String(e.size)), new Response(e, {
 		status: 200,
 		headers: r
 	});
-	let i = gt(n);
+	let i = ht(n);
 	if (i.kind === "missing" || i.kind === "multi") return e instanceof Blob && r.set("Content-Length", String(e.size)), new Response(e, {
 		status: 200,
 		headers: r
 	});
-	let a = _t(e), o = a.size;
+	let a = gt(e), o = a.size;
 	if (i.kind === "invalid") return new Response(null, {
 		status: 416,
 		headers: { "Content-Range": `bytes */${o}` }
@@ -740,18 +740,18 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 		status: 206,
 		headers: r
 	});
-}, $ = "file://", yt = /^https?:\/\//, bt = (e) => {
+}, vt = "file://", yt = /^https?:\/\//, bt = (e) => {
 	try {
 		return decodeURIComponent(e);
 	} catch {
 		return e;
 	}
-}, xt = (e) => e.startsWith($) ? e.slice($.length) : e, St = (e) => {
+}, xt = (e) => e.startsWith(vt) ? e.slice(vt.length) : e, St = (e) => {
 	let t = xt(e);
 	return yt.test(t) ? t : xt(bt(t));
 }, Ct = class {
 	constructor({ hooks: e, onError: t, onManifestSuccess: n, ...r }) {
-		this.onError = (e) => (console.error(e), new Response(String(e), { status: 500 })), this.archiveLoader = ht(r), this.hooks = e ?? {}, this.onManifestSuccess = n ?? (({ manifest: e }) => Promise.resolve(e)), this.onError = t ?? this.onError;
+		this.onError = (e) => (console.error(e), new Response(String(e), { status: 500 })), this.archiveLoader = mt(r), this.hooks = e ?? {}, this.onManifestSuccess = n ?? (({ manifest: e }) => Promise.resolve(e)), this.onError = t ?? this.onError;
 	}
 	prune() {
 		this.archiveLoader.purge();
@@ -770,7 +770,7 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 	fetchManifest({ key: e, baseUrl: t }) {
 		return this.withArchiveResponse({
 			key: e,
-			getResponse: (e) => E(Y(e, {
+			getResponse: (e) => E(X(e, {
 				baseUrl: t,
 				hooks: this.hooks.manifest
 			})).pipe(A((t) => E(this.onManifestSuccess({
@@ -782,7 +782,7 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 	fetchResource({ key: e, resourcePath: t, request: n }) {
 		return this.withArchiveResponse({
 			key: e,
-			getResponse: (e) => E(Z(e, St(t), { hooks: this.hooks.resource })).pipe(D((e) => vt({
+			getResponse: (e) => E(Q(e, St(t), { hooks: this.hooks.resource })).pipe(D((e) => _t({
 				body: e.body ?? "",
 				contentType: e.params.contentType,
 				rangeHeader: n?.headers.get("range")
@@ -812,6 +812,6 @@ var ke = h.toLowerCase(), Ae = ({ archive: e }) => async (t) => {
 	}
 };
 //#endregion
-export { wt as ServiceWorkerStreamer, Ct as Streamer, c as arrayBufferFileAccessors, s as blobFileAccessors, Oe as configure, r as createArchive, ve as createArchiveFromArrayBufferList, o as createArchiveFromEntries, ye as createArchiveFromText, Te as createArchiveFromUrls, F as createUniqueXmlSafeId, P as createXmlSafeId, I as createXmlSafeIdFactory, Y as generateManifestFromArchive, Z as generateResourceFromArchive, R as getArchiveFileRecordByUri, z as getArchiveHasComicInfo, V as getArchiveOpfInfo, n as getUriBasePath, i as getUriBasename, Ee as isDirectoryRecord, L as isFileRecord, B as readRecordAsText, t as removeTrailingSlash, e as sortByTitleComparator };
+export { wt as ServiceWorkerStreamer, Ct as Streamer, c as arrayBufferFileAccessors, s as blobFileAccessors, Oe as configure, r as createArchive, ve as createArchiveFromArrayBufferList, o as createArchiveFromEntries, ye as createArchiveFromText, Te as createArchiveFromUrls, U as createManifestResourceHref, F as createUniqueXmlSafeId, P as createXmlSafeId, I as createXmlSafeIdFactory, X as generateManifestFromArchive, Q as generateResourceFromArchive, R as getArchiveFileRecordByUri, z as getArchiveHasComicInfo, V as getArchiveOpfInfo, n as getUriBasePath, i as getUriBasename, Ee as isDirectoryRecord, L as isFileRecord, B as readRecordAsText, t as removeTrailingSlash, e as sortByTitleComparator };
 
 //# sourceMappingURL=index.js.map