@prose-reader/streamer 1.322.0 → 1.324.0

package/dist/index/index.js

@@ -1,287 +1,143 @@
-import { Report as e, createXmlSafeIdFactory as t, detectMimeTypeFromName as n, isMediaContentMimeType as r, isXmlBasedMimeType as i, parseContentType as a, removeTrailingSlash as o, urlJoin as s } from "@prose-reader/shared";
-import { APPLE_IBOOKS_DISPLAY_OPTIONS_FILENAME as c, COMIC_INFO_FILENAME as l, KOBO_DISPLAY_OPTIONS_FILENAME as u, getArchiveFileRecordByUri as d, getArchiveHasComicInfo as f, getArchiveOpfInfo as p, getSpineItemFilesFromArchive as m, isArchiveEpub as h, isFileRecord as g, parseAppleDisplayOptionsXml as ee, parseComicInfo as _, parseKoboXml as te, readArchiveOpf as v, readRecordAsText as y, resolveArchiveMetadata as b, resolveArchiveToc as x } from "@prose-reader/archive-reader";
-import { XmlDocument as S } from "xmldoc";
-import { BehaviorSubject as ne, EMPTY as C, NEVER as w, Subject as T, catchError as E, distinctUntilChanged as re, filter as D, finalize as ie, first as O, from as k, ignoreElements as A, lastValueFrom as ae, map as j, merge as M, mergeMap as N, of as oe, pairwise as se, shareReplay as ce, startWith as le, switchMap as P, takeUntil as ue, tap as F, timer as I } from "rxjs";
+import { Report as e, createXmlSafeIdFactory as t, detectMimeTypeFromName as n, parseContentType as r, removeTrailingSlash as i, urlJoin as a } from "@prose-reader/shared";
+import { getArchiveFileRecordByUri as o, readArchiveOpf as s, readRecordAsText as c, resolveArchive as l } from "@prose-reader/archive-reader";
+import { XmlDocument as u } from "xmldoc";
+import { BehaviorSubject as d, EMPTY as f, NEVER as p, Subject as m, catchError as h, distinctUntilChanged as g, filter as _, finalize as ee, first as v, from as y, ignoreElements as te, lastValueFrom as ne, map as b, merge as x, mergeMap as S, of as C, pairwise as w, shareReplay as T, startWith as re, switchMap as E, takeUntil as ie, tap as D, timer as ae } from "rxjs";
 //#endregion
 //#region src/report.ts
-var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R = ({ enableReport: e } = {}) => {
-	L.enable(!!e);
-}, z = c.toLowerCase(), B = ({ archive: e }) => async (t) => {
-	let n = e.records.find((e) => !e.dir && e.basename.toLowerCase() === z);
-	if (!n || n.dir) return t;
-	let r = await y(n);
-	try {
-		let { renditionLayout: e } = b(ee(r));
-		return {
-			...t,
-			renditionLayout: t.renditionLayout ?? e
-		};
-	} catch (e) {
-		return console.error(`Unable to parse ${c} for content\n`, r), console.error(e), t;
-	}
-}, V = l.toLowerCase(), H = ({ archive: e }) => async (t) => {
-	let n = f(e);
-	if (!n) return t;
-	let r = {
-		...t,
-		spineItems: t.spineItems.filter((e) => !e.id.toLowerCase().endsWith(V)).map((e, t, n) => ({
-			...e,
-			progressionWeight: 1 / n.length
-		}))
-	}, i = await y(n);
-	try {
-		let e = b(_(i));
+var O = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), oe = ({ enableReport: e } = {}) => {
+	O.enable(!!e);
+}, k = (e) => e.replace(/\.[^.]+$/, "").replace(/[_-]/g, " ").replace(/\s+/g, " ").trim(), A = (e, t) => {
+	if (e.spineItems.length !== 0 && e.spineItems.every((e) => (r(e.mediaType ?? "") || n(e.href))?.startsWith("audio/"))) return e.spineItems.map((e) => {
+		let n = t.records.find((t) => !t.dir && decodeURI(e.href).endsWith(t.uri));
 		return {
-			...r,
-			readingDirection: e.readingDirection ?? r.readingDirection
+			title: k(n?.basename ?? e.href),
+			href: e.href,
+			path: n?.uri ?? e.href,
+			contents: []
 		};
-	} catch (e) {
-		return console.error(`Unable to parse ${l} for content\n`, i), console.error(e), r;
-	}
-}, U = ({ baseUrl: e = "", resourcePath: t }) => {
+	});
+}, j = ({ baseUrl: e = "", resourcePath: t }) => {
 	if (!e && /^https?:\/\//.test(t)) return encodeURI(t);
 	let n = e ? `${e}${e.endsWith("/") ? "" : "/"}` : "file://";
 	return encodeURI(`${n}${t}`);
-}, de = ({ archive: e, baseUrl: n }) => async () => {
-	let r = e.records.filter((e) => !e.dir), i = t(), a = r.map((e) => ({
-		file: e,
-		id: i(e.uri)
-	}));
+}, M = (e) => (t) => ({
+	title: t.title,
+	path: t.path,
+	href: t.containerHref ? a(e, t.containerHref) : "",
+	contents: t.contents.map(M(e))
+}), N = (e) => {
+	let t = e?.trim();
+	if (t === "cover" || t === "title-page" || t === "copyright-page" || t === "text") return t;
+}, P = (e) => /^https?:\/\//.test(e), F = (e) => e.records.find(({ dir: e }) => e)?.basename.replace(/\/$/, ""), I = (e, n, r, i) => {
+	let { metadata: a, readingOrder: o } = r, s = i.basePath, c = [];
+	for (let e of i.opf.guide) {
+		let t = N(e.type);
+		t !== void 0 && c.push({
+			href: e.href,
+			title: e.title,
+			type: t
+		});
+	}
+	let l = t();
 	return {
 		filename: e.filename ?? "",
-		title: e.records.find(({ dir: e }) => e)?.basename.replace(/\/$/, "") || e.filename || "",
-		renditionLayout: void 0,
+		title: a.title || F(e) || "",
+		renditionLayout: a.renditionLayout,
+		renditionFlow: a.renditionFlow ?? "auto",
+		renditionSpread: a.renditionSpread,
+		readingDirection: a.readingDirection,
+		spineItems: o.map((e, t) => ({
+			id: e.id ?? l(e.uri),
+			index: t,
+			href: P(e.uri) ? e.uri : `${n || "file://"}${e.uri}`,
+			renditionLayout: e.renditionLayout,
+			...e.renditionFlow === void 0 ? {} : { renditionFlow: e.renditionFlow },
+			progressionWeight: e.progressionWeight,
+			pageSpreadLeft: e.pageSpreadLeft,
+			pageSpreadRight: e.pageSpreadRight,
+			mediaType: e.mediaType
+		})),
+		items: i.opf.manifestItems.map((e) => ({
+			id: e.id,
+			href: P(e.href) ? e.href : `${n || "file://"}${s ? `${s}/` : ""}${e.href}`,
+			mediaType: e.mediaType
+		})),
+		guide: c.length > 0 ? c : void 0,
+		nav: { toc: (r.toc ?? []).map(M(n)) }
+	};
+}, L = (e, n, r) => {
+	let { metadata: i, readingOrder: a } = r, o = e.records.filter((e) => !e.dir), s = t(), c = new Map(o.map((e) => [e.uri, s(e.uri)])), l = {
+		filename: e.filename ?? "",
+		title: i.title || F(e) || e.filename || "",
+		renditionLayout: i.renditionLayout,
 		renditionSpread: "auto",
-		readingDirection: void 0,
-		spineItems: a.filter(({ file: e }) => !e.basename.endsWith(".db")).map(({ file: e, id: t }, i) => ({
-			id: t,
-			index: i,
-			href: U({
+		readingDirection: i.readingDirection,
+		spineItems: a.map((e, t) => ({
+			id: c.get(e.uri) ?? s(e.uri),
+			index: t,
+			href: j({
 				baseUrl: n,
 				resourcePath: e.uri
 			}),
-			renditionLayout: void 0,
-			progressionWeight: 1 / r.length,
+			renditionLayout: e.renditionLayout,
+			progressionWeight: e.progressionWeight,
 			pageSpreadLeft: void 0,
 			pageSpreadRight: void 0,
-			mediaType: e.encodingFormat
+			mediaType: e.mediaType
 		})),
-		items: a.map(({ file: e, id: t }) => ({
-			id: t,
+		items: o.map((e) => ({
+			id: c.get(e.uri) ?? s(e.uri),
 			href: encodeURI(`${n}${e.uri}`)
 		}))
-	};
-}, W = (e, t, n) => {
-	let { basePath: r } = p(t) || {};
-	return e.map((e) => {
-		let t = e.href, i = n?.(t) ?? "";
-		return {
-			href: r ? `${i}${r}/${t}` : `${i}${t}`,
-			id: e.id,
-			mediaType: e.mediaType
-		};
-	});
-}, fe = (e) => {
-	let t = e?.trim();
-	return t === "scrolled-continuous" || t === "scrolled-doc" || t === "paginated" || t === "auto" ? t : "auto";
-}, pe = (e) => {
-	let t = e?.trim();
-	if (t === "none" || t === "landscape" || t === "portrait" || t === "both" || t === "auto") return t;
-}, me = (e) => {
-	let t = e?.trim();
-	if (t === "cover" || t === "title-page" || t === "copyright-page" || t === "text") return t;
-}, he = ({ archive: e, baseUrl: t, archiveOpf: n }) => async (r) => {
-	if (!n) return r;
-	let { opf: i, basePath: a } = n, o = b(i);
-	L.groupCollapsed(...L.getGroupArgs("OPF parsed")), L.log("opf", i), L.groupEnd();
-	let s = i.renditionLayoutMeta?.trim(), c = s === "reflowable" || s === "pre-paginated" ? s : o.renditionLayout, l = i.title?.trim() || e.records.find(({ dir: e }) => e)?.basename || "", u = o.readingDirection ?? r.readingDirection, f = (await m({
-		archive: e,
-		archiveOpf: n
-	})).filter(g).reduce((e, t) => t.size + e, 0), p = i.guide, h = [];
-	for (let e of p) {
-		let t = me(e.type);
-		t !== void 0 && h.push({
-			href: e.href,
-			title: e.title,
-			type: t
-		});
-	}
-	return {
-		filename: e.filename ?? "",
-		renditionLayout: c,
-		renditionFlow: fe(i.renditionFlowMeta),
-		renditionSpread: pe(i.renditionSpreadMeta),
-		title: l,
-		readingDirection: u,
-		spineItems: i.spineRows.map((n, r) => {
-			let o = d(e, a ? `${a}/${n.href}` : n.href), s = o ? o.size : 0, l = t || (/^https?:\/\//.test(n.href) ? "" : "file://");
-			return {
-				id: n.id,
-				index: r,
-				href: n.href.startsWith("https://") ? n.href : a ? `${l}${a}/${n.href}` : `${l}${n.href}`,
-				renditionLayout: n.renditionLayout ?? c,
-				...n.renditionFlow === void 0 ? {} : { renditionFlow: n.renditionFlow },
-				progressionWeight: f > 0 ? s / f : 1 / i.spineRows.length,
-				pageSpreadLeft: n.pageSpreadLeft,
-				pageSpreadRight: n.pageSpreadRight,
-				mediaType: n.mediaType
-			};
-		}),
-		items: W(i.manifestItems, e, (e) => /^https?:\/\//.test(e) ? "" : t || "file://"),
-		guide: h.length > 0 ? h : void 0
-	};
-}, ge = (e) => {
-	let t = e.descendantWithPath("head")?.childrenNamed("meta").find((e) => e.attr.name === "viewport");
-	return !!(t && t.attr.name === "viewport");
-}, _e = (e) => e.reduce(async (e, t) => {
-	if (!await e || !i({
-		mimeType: g(t) ? t.encodingFormat : void 0,
-		uri: t.uri
-	})) return !1;
-	let n = t.dir ? null : await y(t);
-	return n ? ge(new S(n)) : !1;
-}, Promise.resolve(!0)), ve = ({ archive: e, archiveOpf: t }) => async (n) => n.renditionLayout === "reflowable" && n.spineItems.every((e) => e.renditionLayout === "reflowable") && await _e(await m({
-	archive: e,
-	archiveOpf: t
-})) ? {
-	...n,
-	spineItems: n.spineItems.map((e) => ({
-		...e,
-		renditionLayout: "pre-paginated"
-	})),
-	renditionLayout: "pre-paginated"
-} : n, ye = () => (e) => ({
-	...e,
-	readingDirection: e.readingDirection ?? "ltr"
-}), be = async (e) => {
-	let t;
-	return await Promise.all(e.records.map(async (e) => {
-		if (e.dir || !e.uri.endsWith(u)) return;
-		let n = await y(e);
-		try {
-			let { renditionLayout: e } = te(n);
-			e && (t = e);
-		} catch (e) {
-			console.error(`Unable to parse ${u} for content\n`, n), console.error(e);
-		}
-	})), {
-		kind: "kobo",
-		...t === void 0 ? {} : { renditionLayout: t }
-	};
-}, xe = ({ archive: e }) => async (t) => {
-	let { renditionLayout: n } = b(await be(e));
-	return {
-		...t,
-		renditionLayout: t.renditionLayout ?? n
-	};
-}, Se = ({ archive: e }) => async (t) => h(e) ? t : {
-	...t,
-	spineItems: t.spineItems.map((t) => {
-		let i = e.records.find((e) => decodeURI(t.href).endsWith(e.uri)), o = a((i && g(i) ? i.encodingFormat : void 0) ?? "") || n(i?.basename ?? "");
-		return {
-			...t,
-			renditionLayout: o && r(o) ? "pre-paginated" : t.renditionLayout
-		};
-	})
-}, Ce = (e) => e.replace(/\.[^.]+$/, "").replace(/[_-]/g, " ").replace(/\s+/g, " ").trim(), we = (e, t) => {
-	if (e.spineItems.length !== 0 && e.spineItems.every((e) => (a(e.mediaType ?? "") || n(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: Ce(n?.basename ?? e.href),
-			href: e.href,
-			path: n?.uri ?? e.href,
-			contents: []
-		};
-	});
-}, G = (e) => (t) => ({
-	title: t.title,
-	path: t.path,
-	href: t.containerHref ? s(e, t.containerHref) : "",
-	contents: t.contents.map(G(e))
-}), Te = async (e, t, { baseUrl: n, archiveOpf: r }) => {
-	if (r) return (await x(e, { opf: r }) ?? []).map(G(n));
-	let i = we(t, e);
-	if (i) return i;
-	let a = await x(e);
-	if (a) return a.map(G(n));
-}, Ee = ({ archive: e, baseUrl: t, archiveOpf: n }) => async (r) => {
-	if (r.nav) return r;
-	let i = await Te(e, r, {
-		baseUrl: t,
-		archiveOpf: n
-	});
-	return i ? {
-		...r,
-		nav: { toc: i }
-	} : r;
-}, De = (e) => e ? e.endsWith("/") ? e : `${e}/` : "", K = async (e, { baseUrl: t = "", hooks: n = {} } = {}) => {
-	L.log("Generating manifest from archive", e);
-	let r = await v(e), i = De(t), a = (t) => (t ?? []).map((t) => t({
-		archive: e,
-		baseUrl: i
-	})), o = [
-		he({
-			archive: e,
-			baseUrl: i,
-			archiveOpf: r
-		}),
-		H({
-			archive: e,
-			baseUrl: i
-		}),
-		B({
-			archive: e,
-			baseUrl: i
-		}),
-		Se({
-			archive: e,
-			baseUrl: i
-		}),
-		...a(n.content)
-	], s = a(n.spine), c = [
-		ve({
-			archive: e,
-			baseUrl: i,
-			archiveOpf: r
-		}),
-		xe({
-			archive: e,
-			baseUrl: i
-		}),
-		...a(n.presentation)
-	], l = [Ee({
-		archive: e,
-		baseUrl: i,
-		archiveOpf: r
-	}), ...a(n.navigation)], u = [
-		...o,
-		...s,
-		...c,
+	}, u = A(l, e) ?? r.toc?.map(M(n));
+	return u === void 0 ? l : {
 		...l,
-		ye()
-	];
+		nav: { toc: u }
+	};
+}, R = ({ archive: e, baseUrl: t, resolved: n }) => {
+	let r = n.sources.opf;
+	return r ? I(e, t, n, r) : L(e, t, n);
+}, z = (e) => e ? e.endsWith("/") ? e : `${e}/` : "", B = async (e, { baseUrl: t = "", hooks: n = [] } = {}) => {
+	O.log("Generating manifest from archive", e);
+	let r = z(t);
 	try {
-		let t = de({
+		let t = R({
 			archive: e,
-			baseUrl: i
-		})(), n = await u.reduce(async (e, t) => await t(await e), t);
-		if (L.log("Generated manifest", n), process.env.NODE_ENV === "development" && L.isEnabled()) {
-			let e = JSON.stringify(n, null, 2);
-			L.groupCollapsed(...L.getGroupArgs("Generated manifest")), L.log(`\n${e}`), L.groupEnd();
+			baseUrl: r,
+			resolved: await l(e, {
+				include: [
+					"metadata",
+					"readingOrder",
+					"toc",
+					"sources"
+				],
+				layoutScan: !0
+			})
+		});
+		for (let i of n) t = await i({
+			archive: e,
+			baseUrl: r
+		})(t);
+		if (t = {
+			...t,
+			readingDirection: t.readingDirection ?? "ltr"
+		}, O.log("Generated manifest", t), process.env.NODE_ENV === "development" && O.isEnabled()) {
+			let e = JSON.stringify(t, null, 2);
+			O.groupCollapsed(...O.getGroupArgs("Generated manifest")), O.log(`\n${e}`), O.groupEnd();
 		}
-		return n;
+		return t;
 	} catch (e) {
-		throw L.error(e), e;
+		throw O.error(e), e;
 	}
-}, Oe = (e) => {
+}, V = (e) => {
 	let t = e.descendantWithPath("head")?.childrenNamed("meta").find((e) => e.attr.name === "calibre:cover");
 	return !!(t && t.attr.name === "calibre:cover");
-}, ke = (e) => e.descendantWithPath("body")?.descendantWithPath("div")?.childrenNamed("svg")?.find((e) => e.attr.width === "100%" && e.attr.preserveAspectRatio === "none"), Ae = ({ archive: e, resourcePath: t }) => async (n) => {
-	let r = d(e, t);
+}, H = (e) => e.descendantWithPath("body")?.descendantWithPath("div")?.childrenNamed("svg")?.find((e) => e.attr.width === "100%" && e.attr.preserveAspectRatio === "none"), U = ({ archive: e, resourcePath: t }) => async (n) => {
+	let r = o(e, t);
 	if (r?.basename.endsWith(".xhtml")) {
-		let e = new S(typeof n.body == "string" ? n.body : await y(r));
-		if (Oe(e)) {
-			let t = ke(e);
+		let e = new u(typeof n.body == "string" ? n.body : await c(r));
+		if (V(e)) {
+			let t = H(e);
 			return t && delete t.attr.preserveAspectRatio, {
 				...n,
 				body: e?.toString()
@@ -289,36 +145,39 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 		}
 	}
 	return n;
-}, je = ({ archive: e, resourcePath: t }) => async (n) => Ae({
+}, W = ({ archive: e, resourcePath: t }) => async (n) => U({
 	archive: e,
 	resourcePath: t
-})(n), Me = ({ archive: e, resourcePath: t }) => async (n) => {
-	let r = d(e, t);
+})(n), se = ({ archive: e, resourcePath: t }) => async (n) => {
+	let r = o(e, t);
 	if (r?.basename.endsWith(".css")) {
-		let e = (typeof n.body == "string" ? n.body : await y(r)).replaceAll("-webkit-writing-mode", "writing-mode");
+		let e = (typeof n.body == "string" ? n.body : await c(r)).replaceAll("-webkit-writing-mode", "writing-mode");
 		return {
 			...n,
 			body: e
 		};
 	}
 	return n;
-}, Ne = async (e, t) => {
-	let n = await v(e);
+}, G = async (e, t) => {
+	let n = await s(e);
 	if (n) {
-		let { opf: r } = n, i = W(r.manifestItems, e, () => "").find((e) => t.endsWith(e.href))?.mediaType;
+		let { opf: e, basePath: r } = n, i = e.manifestItems.find((e) => {
+			let n = r ? `${r}/${e.href}` : e.href;
+			return t.endsWith(n);
+		})?.mediaType;
 		if (i) return { mediaType: i };
 	}
-	return { mediaType: Pe(t) };
-}, Pe = (e) => {
+	return { mediaType: K(t) };
+}, K = (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";
-}, Fe = ({ archive: e, resourcePath: t }) => async (n) => {
-	let r = d(e, t);
+}, ce = ({ archive: e, resourcePath: t }) => async (n) => {
+	let r = o(e, t);
 	if (!r) return n;
-	let i = await Ne(e, t);
+	let i = await G(e, t);
 	return {
 		...n,
 		params: {
@@ -327,10 +186,10 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 			...i.mediaType && { contentType: i.mediaType }
 		}
 	};
-}, q = /* @__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("."), Ie = ({ archive: e, resourcePath: t }) => async (n) => {
-	let r = d(e, t);
+}, q = /* @__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("."), le = ({ archive: e, resourcePath: t }) => async (n) => {
+	let r = o(e, t);
 	if (r?.basename.endsWith(".xhtml")) {
-		let e = typeof n.body == "string" ? n.body : await y(r);
+		let e = typeof n.body == "string" ? n.body : await c(r);
 		if (!RegExp(`<(${q.join("|")})[\\s/>]`, "i").test(e)) return n;
 		let t = RegExp(`<(${q.join("|")})(\\s[^>]*)?\\s*/>`, "gi"), i = e.replace(t, (e, t, n = "") => `<${t} ${n.trim()}></${t}>`);
 		return {
@@ -345,38 +204,38 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 			archive: e,
 			resourcePath: t
 		})),
-		Fe({
+		ce({
 			archive: e,
 			resourcePath: t
 		}),
-		Ie({
+		le({
 			archive: e,
 			resourcePath: t
 		}),
-		Me({
+		se({
 			archive: e,
 			resourcePath: t
 		}),
-		je({
+		W({
 			archive: e,
 			resourcePath: t
 		})
 	];
 	try {
 		let n = await i.reduce(async (e, t) => await t(await e), Promise.resolve(r));
-		if (L.log("Generated resource", t, n), n.body !== void 0) return n;
-		let a = d(e, t);
+		if (O.log("Generated resource", t, n), n.body !== void 0) return n;
+		let a = o(e, t);
 		if (!a) throw Error(`no file found for resourcePath:${t}`);
 		return {
 			...n,
 			body: await a.blob()
 		};
 	} catch (e) {
-		throw L.error(e), e;
+		throw O.error(e), e;
 	}
-}, Le = class {
+}, ue = class {
 	constructor(e) {
-		this.cleanArchiveAfter = e, this.state$ = new ne({
+		this.cleanArchiveAfter = e, this.state$ = new d({
 			status: "idle",
 			locks: 0
 		});
@@ -388,53 +247,53 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 		});
 	}
 	get locks$() {
-		return this.state$.pipe(j(({ locks: e }) => e));
+		return this.state$.pipe(b(({ locks: e }) => e));
 	}
 	get state() {
 		return this.state$.getValue();
 	}
 	get isUnlocked$() {
-		return this.locks$.pipe(j((e) => e <= 0), re(), ce());
+		return this.locks$.pipe(b((e) => e <= 0), g(), T());
 	}
 	get overTTL$() {
-		return this.isUnlocked$.pipe(P((e) => e ? this.cleanArchiveAfter === Infinity ? w : I(this.cleanArchiveAfter) : w));
+		return this.isUnlocked$.pipe(E((e) => e ? this.cleanArchiveAfter === Infinity ? p : ae(this.cleanArchiveAfter) : p));
 	}
-}, Re = ({ getArchive: e, cleanArchiveAfter: t = 300 * 1e3 }) => {
-	let n = new T(), r = new T(), i = new T(), a = {};
-	return n.pipe(N((t) => {
+}, de = ({ getArchive: e, cleanArchiveAfter: t = 300 * 1e3 }) => {
+	let n = new m(), r = new m(), i = new m(), a = {};
+	return n.pipe(S((t) => {
 		let n = a[t];
-		if (n?.state.status !== "idle") return C;
+		if (n?.state.status !== "idle") return f;
 		let r = !1, o = (e) => {
-			L.debug(`Cleaning up archive with key: ${e}`);
+			O.debug(`Cleaning up archive with key: ${e}`);
 			let t = a[e];
 			delete a[e], r ||= (t?.state.archive?.close(), !0);
 		};
 		n.update({ status: "loading" });
-		let s = n.locks$, c = n.isUnlocked$, l = s.pipe(se(), D(([e, t]) => t > e), le(!0));
-		return k(e(t)).pipe(F((e) => {
+		let s = n.locks$, c = n.isUnlocked$, l = s.pipe(w(), _(([e, t]) => t > e), re(!0));
+		return y(e(t)).pipe(D((e) => {
 			n.update({
 				archive: e,
 				status: "success"
 			});
-		}), E((e) => (o(t), n.update({
+		}), h((e) => (o(t), n.update({
 			status: "error",
 			error: e
-		}), C)), P(() => M(l.pipe(P(() => i), P(() => c), D((e) => e)), n.overTTL$).pipe(O(), F(() => {
+		}), f)), E(() => x(l.pipe(E(() => i), E(() => c), _((e) => e)), n.overTTL$).pipe(v(), D(() => {
 			o(t);
 		}))));
-	}), ue(r)).subscribe(), {
+	}), ie(r)).subscribe(), {
 		access: (e) => {
-			let r = !1, i = a[e] ?? new Le(t);
+			let r = !1, i = a[e] ?? new ue(t);
 			a[e] = i, i.update({ locks: i.state.locks + 1 });
 			let o = () => {
 				r || (r = !0, i.update({ locks: i.state.locks - 1 }));
 			};
-			return n.next(e), M(i.state$.pipe(j(({ archive: e }) => e), D((e) => !!e)), i.state$.pipe(F(({ error: e }) => {
+			return n.next(e), x(i.state$.pipe(b(({ archive: e }) => e), _((e) => !!e)), i.state$.pipe(D(({ error: e }) => {
 				if (e) throw e;
-			}), A())).pipe(O(), j((e) => ({
+			}), te())).pipe(v(), b((e) => ({
 				archive: e,
 				release: o
-			})), E((e) => {
+			})), h((e) => {
 				throw o(), e;
 			}));
 		},
@@ -452,7 +311,7 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 } : {
 	valid: !0,
 	value: void 0
-}, ze = (e) => {
+}, fe = (e) => {
 	if (!e.toLowerCase().startsWith("bytes=")) return { kind: "missing" };
 	let t = e.slice(6).trim();
 	if (!t) return { kind: "invalid" };
@@ -465,7 +324,7 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 		start: a.value,
 		end: o.value
 	};
-}, Be = (e) => {
+}, pe = (e) => {
 	if (e instanceof Blob) return {
 		size: e.size,
 		slice: (t, n) => {
@@ -487,18 +346,18 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 			};
 		}
 	};
-}, X = ({ body: e, contentType: t, rangeHeader: n }) => {
+}, me = ({ 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 = ze(n);
+	let i = fe(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 = Be(e), o = a.size;
+	let a = pe(e), o = a.size;
 	if (i.kind === "invalid") return new Response(null, {
 		status: 416,
 		headers: { "Content-Range": `bytes */${o}` }
@@ -513,18 +372,18 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 		status: 206,
 		headers: r
 	});
-}, Z = "file://", Ve = /^https?:\/\//, He = (e) => {
+}, X = "file://", he = /^https?:\/\//, Z = (e) => {
 	try {
 		return decodeURIComponent(e);
 	} catch {
 		return e;
 	}
-}, Q = (e) => e.startsWith(Z) ? e.slice(Z.length) : e, Ue = (e) => {
+}, Q = (e) => e.startsWith(X) ? e.slice(X.length) : e, ge = (e) => {
 	let t = Q(e);
-	return Ve.test(t) ? t : Q(He(t));
+	return he.test(t) ? t : Q(Z(t));
 }, $ = class {
 	constructor({ hooks: e, onError: t, onManifestSuccess: n, ...r }) {
-		this.onError = (e) => (console.error(e), new Response(String(e), { status: 500 })), this.archiveLoader = Re(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 = de(r), this.hooks = e ?? {}, this.onManifestSuccess = n ?? (({ manifest: e }) => Promise.resolve(e)), this.onError = t ?? this.onError;
 	}
 	prune() {
 		this.archiveLoader.purge();
@@ -533,36 +392,36 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 		return this.lastAccessedKey !== void 0 && this.lastAccessedKey !== e && this.archiveLoader.purge(), this.lastAccessedKey = e, this.archiveLoader.access(e);
 	}
 	accessArchiveWithoutLock(e) {
-		return this.accessArchive(e).pipe(j(({ archive: e, release: t }) => (t(), e)));
+		return this.accessArchive(e).pipe(b(({ archive: e, release: t }) => (t(), e)));
 	}
 	withArchiveResponse({ key: e, getResponse: t }) {
-		return ae(this.accessArchive(e).pipe(N(({ archive: e, release: n }) => k(t(e)).pipe(ie(() => {
+		return ne(this.accessArchive(e).pipe(S(({ archive: e, release: n }) => y(t(e)).pipe(ee(() => {
 			n();
-		}))), E((e) => oe(this.onError(e)))));
+		}))), h((e) => C(this.onError(e)))));
 	}
 	fetchManifest({ key: e, baseUrl: t }) {
 		return this.withArchiveResponse({
 			key: e,
-			getResponse: (e) => k(K(e, {
+			getResponse: (e) => y(B(e, {
 				baseUrl: t,
 				hooks: this.hooks.manifest
-			})).pipe(P((t) => k(this.onManifestSuccess({
+			})).pipe(E((t) => y(this.onManifestSuccess({
 				manifest: t,
 				archive: e
-			}))), j((e) => new Response(JSON.stringify(e), { status: 200 })))
+			}))), b((e) => new Response(JSON.stringify(e), { status: 200 })))
 		});
 	}
 	fetchResource({ key: e, resourcePath: t, request: n }) {
 		return this.withArchiveResponse({
 			key: e,
-			getResponse: (e) => k(J(e, Ue(t), { hooks: this.hooks.resource })).pipe(j((e) => X({
+			getResponse: (e) => y(J(e, ge(t), { hooks: this.hooks.resource })).pipe(b((e) => me({
 				body: e.body ?? "",
 				contentType: e.params.contentType,
 				rangeHeader: n?.headers.get("range")
 			})))
 		});
 	}
-}, We = class extends $ {
+}, _e = class extends $ {
 	constructor({ getUriInfo: e, ...t }) {
 		super(t), this.getUriInfo = e, this.fetchEventListener = this.fetchEventListener.bind(this);
 	}
@@ -570,13 +429,13 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 		try {
 			let t = this.getUriInfo(e);
 			if (!t) return;
-			let n = o(t.baseUrl), r = e.request.url.substring(n.length + 1), [i = ""] = r.split("/"), a = o(r.substring(i.length + 1));
+			let n = i(t.baseUrl), r = e.request.url.substring(n.length + 1), [a = ""] = r.split("/"), o = i(r.substring(a.length + 1));
 			r.endsWith("/manifest") ? e.respondWith(this.fetchManifest({
-				key: i,
-				baseUrl: `${n}/${i}/`
+				key: a,
+				baseUrl: `${n}/${a}/`
 			})) : e.respondWith(this.fetchResource({
-				key: i,
-				resourcePath: a,
+				key: a,
+				resourcePath: o,
 				request: e.request
 			}));
 		} catch (t) {
@@ -585,6 +444,6 @@ var L = e.namespace("@prose-reader/streamer", void 0, { color: "#ffae42" }), R =
 	}
 };
 //#endregion
-export { We as ServiceWorkerStreamer, $ as Streamer, R as configure, U as createManifestResourceHref, K as generateManifestFromArchive, J as generateResourceFromArchive };
+export { _e as ServiceWorkerStreamer, $ as Streamer, oe as configure, j as createManifestResourceHref, B as generateManifestFromArchive, J as generateResourceFromArchive };
 
 //# sourceMappingURL=index.js.map