@openstage/monadyssey-fetch 3.0.0-beta.7 → 3.0.0-rc.1

package/dist/monadyssey-fetch.mjs

@@ -1,17 +1,18 @@
-import { IO as e, List as t, Option as n, Some as r, Stream as i } from "@openstage/monadyssey-core";
+import { IO as e, List as t, Option as n, Stream as r } from "@openstage/monadyssey-core";
 //#region src/http-error.ts
-var a = {
+var i = {
 	describe: (e) => e instanceof Error ? e.message : typeof e == "string" ? e : typeof e == "object" && e && "message" in e ? String(e.message) : "An unknown error occurred.",
 	format: (e, t, n, r, i) => {
 		switch (e) {
 			case "response": return `Request to '${t}' failed with status ${n} and message: ${r}.`;
+			case "decode": return `Response from '${t}' (status ${n}) could not be decoded: ${r}.`;
 			case "request": return `Request to '${t}' could not be sent: ${r}.`;
 			case "timeout": return `Request to '${t}' timed out after ${i} ms.`;
 			case "aborted": return `Request to '${t}' was aborted before a response arrived: ${r}.`;
 			default: return `Request to '${t}' failed before a response arrived: ${r}.`;
 		}
 	}
-}, o = class e extends Error {
+}, a = class e extends Error {
 	kind;
 	status;
 	rawMessage;
@@ -20,38 +21,49 @@ var a = {
 	headers;
 	cause;
 	timeoutMs;
-	constructor(e, t, n, r, i, o = "response", s, c) {
-		super(a.format(o, r, e, t, c)), this.name = "HttpError", this.kind = o, this.status = e, this.rawMessage = t, this.body = n, this.url = r, this.headers = i, this.cause = s, this.timeoutMs = c;
+	constructor(e, t, n, r, a, o = "response", s, c) {
+		super(i.format(o, r, e, t, c)), this.name = "HttpError", this.kind = o, this.status = e, this.rawMessage = t, this.body = n, this.url = r, this.headers = a, this.cause = s, this.timeoutMs = c;
 	}
 	static network(t, n) {
-		return new e(0, a.describe(n), null, t, void 0, "network", n);
+		return new e(0, i.describe(n), null, t, void 0, "network", n);
 	}
 	static timeout(t, n) {
 		return new e(0, `Request timed out after ${n} ms`, null, t, void 0, "timeout", void 0, n);
 	}
+	static decode(t, n, r) {
+		let a = {};
+		try {
+			a = Object.fromEntries(n.headers.entries());
+		} catch {}
+		return new e(n.status, i.describe(r), null, t, a, "decode", r);
+	}
 	static request(t, n) {
-		return new e(0, a.describe(n), null, t, void 0, "request", n);
+		return new e(0, i.describe(n), null, t, void 0, "request", n);
 	}
 	static aborted(t, n) {
-		return new e(0, a.describe(n), null, t, void 0, "aborted", n);
+		return new e(0, i.describe(n), null, t, void 0, "aborted", n);
 	}
 	bodyAs(e) {
-		return e(this.body) ? r.of(this.body) : n.empty();
+		return e(this.body) ? n.ofNullable(this.body) : n.empty();
 	}
-}, s = (e) => typeof e != "object" || !e || e instanceof FormData || e instanceof Blob || e instanceof ArrayBuffer || e instanceof URLSearchParams || typeof ReadableStream < "u" && e instanceof ReadableStream || ArrayBuffer.isView(e), c = (e) => Object.fromEntries(Object.entries(e).filter((e) => e[1] !== void 0).map(([e, t]) => [e.toLowerCase(), t])), l = (e, t) => {
+}, o = (e) => typeof e != "object" || !e || e instanceof FormData || e instanceof Blob || e instanceof ArrayBuffer || e instanceof URLSearchParams || typeof ReadableStream < "u" && e instanceof ReadableStream || ArrayBuffer.isView(e), s = (e) => Object.fromEntries(Object.entries(e).filter((e) => e[1] !== void 0).map(([e, t]) => [e.toLowerCase(), t])), c = (e, t) => {
 	if (t instanceof FormData) {
 		let { "content-type": t, ...n } = e;
 		return n;
 	}
-	return typeof t == "object" && t && !s(t) && !("content-type" in e) ? {
+	return typeof t == "object" && t && !o(t) && !("content-type" in e) ? {
 		...e,
 		"content-type": "application/json"
 	} : e;
-}, u = (e, t, n) => e === "GET" || e === "HEAD" || t == null ? void 0 : s(t) ? t : n["content-type"] === "application/json" ? JSON.stringify(t) : t, d = {
-	isNativeBody: s,
-	normalizeHeaders: c,
+}, l = (e) => {
+	if (e === void 0) return !1;
+	let t = e.split(";")[0].trim().toLowerCase();
+	return t === "application/json" || t.endsWith("+json");
+}, u = (e, t, n) => e === "GET" || e === "HEAD" || t == null ? void 0 : o(t) ? t : l(n["content-type"]) ? JSON.stringify(t) : t, d = {
+	isNativeBody: o,
+	normalizeHeaders: s,
 	prepare: (e, t, n) => {
-		let r = l(c({
+		let r = c(s({
 			...n.headers,
 			...t.headers ?? {}
 		}), t.body);
@@ -74,17 +86,45 @@ var a = {
 	} catch {
 		return {};
 	}
-}, h = (e, t, n) => new o(n.status, a.describe(e), null, t, m(n), "response", e), g = (e, t, n) => new o(e.status, e.statusText, t, n, m(e)), _ = {
+}, h = (e, t, n) => a.decode(t, n, e), g = Symbol("HttpResponse.noBody"), _ = (e, t, n) => new a(e.status, e.statusText, t, n, m(e)), v = async (e) => {
+	if (typeof e.text != "function") return e.json();
+	let t = await e.text();
+	return t.trim() === "" ? g : JSON.parse(t);
+}, y = {
 	headers: m,
 	error: h,
-	failure: g,
-	read: (t, n, r) => e.from(p(n), () => h(`Unsupported response type: ${n}`, r, t)).flatMap((n) => e.lift(() => t.status === 204 || t.status === 205 ? null : n(t), (e) => h(e, r, t))),
-	settle: (t, n, r) => t.ok ? e.of(n) : e.fail(g(t, n, r))
-}, v = (e) => typeof e == "object" && !!e && "name" in e && e.name === "AbortError", y = {
-	error: (e, t) => e instanceof o ? e : v(e) ? o.aborted(t, e) : o.network(t, e),
+	failure: _,
+	read: (t, n, r, i) => e.from(p(n), () => h(`Unsupported response type: ${n}`, r, t)).flatMap((a) => e.lift(async () => t.status === 204 || t.status === 205 || i === "HEAD" ? g : n === "json" ? v(t) : a(t), (e) => h(e, r, t))),
+	readFailure: (t, n, r) => e.promise(async () => {
+		try {
+			if (n !== "json") return await p(n).fold(async () => null, (e) => e(t));
+			if (typeof t.text != "function") return await t.json();
+			let e = await t.text();
+			if (e.trim() === "") return null;
+			try {
+				return JSON.parse(e);
+			} catch {
+				return e;
+			}
+		} catch {
+			return null;
+		}
+	}).flatMap((n) => e.fail(_(t, n, r)))
+}, b = (e) => typeof e == "object" && !!e && "name" in e && e.name === "AbortError", x = {
+	error: (e, t) => e instanceof a ? e : b(e) ? a.aborted(t, e) : a.network(t, e),
 	isRetryable: (e) => e.kind === "network" || e.kind === "response" && e.status >= 500
-}, b = { run: (e, t, n) => e.reduceRight((e, t) => (n) => t.intercept(n, e), n)(t) }, x = (e) => {
-	let t, n, r, i = [];
+}, S = {
+	run: (e, t, n) => e.reduceRight((e, t) => (n) => t.intercept(n, e), n)(t),
+	request: (e, t) => ({
+		url: e,
+		init: {
+			...t,
+			headers: new Headers(t.headers)
+		}
+	}),
+	fetch: (e) => fetch(e.url, e.init)
+}, C = (e) => {
+	let t = "", n, r, i = [];
 	for (let a of e.split("\n")) {
 		if (a === "" || a.startsWith(":")) continue;
 		let e = a.indexOf(":"), o = e === -1 ? a : a.slice(0, e), s = e === -1 ? "" : a.slice(e + 1);
@@ -96,45 +136,63 @@ var a = {
 				i.push(s);
 				break;
 			case "id":
-				n = s;
+				s.includes("\0") || (n = s);
 				break;
 			case "retry": /^\d+$/.test(s) && (r = Number.parseInt(s, 10));
 		}
 	}
-	return i.length === 0 ? null : {
-		event: t ?? "message",
-		data: i.join("\n"),
+	return {
+		event: i.length === 0 ? null : {
+			event: t || "message",
+			data: i.join("\n"),
+			...n === void 0 ? {} : { id: n },
+			...r === void 0 ? {} : { retry: r }
+		},
 		...n === void 0 ? {} : { id: n },
 		...r === void 0 ? {} : { retry: r }
 	};
-}, S = class {
+}, w = (e, t) => {
+	let { id: n, ...r } = e;
+	return t === void 0 ? r : {
+		...r,
+		id: t
+	};
+}, T = class {
 	decoder = new TextDecoder("utf-8");
 	buffered = "";
+	skipLeadingLF = !1;
 	push(e) {
-		let t = this.buffered + this.decoder.decode(e, { stream: !0 }), n = !1;
-		t.endsWith("\r") && (t = t.slice(0, -1), n = !0), t = t.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-		let r = t.split("\n\n"), i = r.pop() ?? "";
-		return n && (i += "\r"), this.buffered = i, r.map(x).filter((e) => e !== null);
+		let t = this.decoder.decode(e, { stream: !0 });
+		if (t.length === 0) return [];
+		this.skipLeadingLF && t.startsWith("\n") && (t = t.slice(1)), this.skipLeadingLF = t.endsWith("\r"), t = this.buffered + t.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+		let n = t.split("\n\n");
+		return this.buffered = n.pop() ?? "", n.map(C);
 	}
 	reset() {
-		this.decoder = new TextDecoder("utf-8"), this.buffered = "";
+		this.decoder = new TextDecoder("utf-8"), this.buffered = "", this.skipLeadingLF = !1;
 	}
-}, C = () => {
-	let e = new S();
-	return (n) => n.mapAccumulate(null, (n) => [null, t.from(e.push(n))]);
-}, w = 100, T = (t) => e.cancellable((e) => new Promise((n) => {
+}, E = () => {
+	let e = new T();
+	return (n) => n.mapAccumulate(void 0, (n, r) => {
+		let i = [], a = n;
+		for (let t of e.push(r)) t.id !== void 0 && (a = t.id), t.event !== null && i.push(w(t.event, a));
+		return [a, t.from(i)];
+	});
+}, D = 100, O = 2147483647, k = (t) => e.promise((e) => new Promise((n) => {
 	let r = () => {
 		clearTimeout(i), n();
 	}, i = setTimeout(() => {
 		e.removeEventListener("abort", r), n();
-	}, t);
+	}, Math.min(t, O));
 	e.addEventListener("abort", r, { once: !0 });
-})), E = class {
+})), A = class {
 	controller = new AbortController();
-	frames = new S();
+	frames = new T();
 	pending = [];
 	lastEventId = void 0;
 	retryMs;
+	serverRetryMs = void 0;
+	reconnects = 0;
 	connection = null;
 	unlinkParent;
 	constructor(e, t) {
@@ -158,33 +216,43 @@ var a = {
 	close() {
 		this.closeConnection(), this.unlinkParent(), this.controller.abort();
 	}
-}, D = { stream: (t) => {
-	let { url: r, headers: a, defaultHeaders: o, credentials: s, interceptors: c, reconnect: l, retry: u } = t, f = (t) => {
+}, j = (e) => e.split(";")[0].trim().toLowerCase(), M = { stream: (t) => {
+	let { url: i, headers: a, defaultHeaders: o, credentials: s, interceptors: c, reconnect: l, retry: u } = t, f = (t) => {
 		let n = d.prepare("GET", {
 			headers: {
 				...a,
 				accept: "text/event-stream",
-				...t.lastEventId === void 0 ? {} : { "last-event-id": t.lastEventId }
+				...t.lastEventId ? { "last-event-id": t.lastEventId } : {}
 			},
 			credentials: s
 		}, {
 			headers: o,
 			credentials: s
 		});
-		return e.lift(() => b.run(c, {
+		return e.lift(() => S.run(c, S.request(i, {
 			...n,
 			signal: t.controller.signal
-		}, (e) => fetch(r, e)), (e) => y.error(e, r)).flatMap((t) => t.ok ? e.of(t) : _.read(t, "text", r).flatMapErr(() => e.of(null)).flatMap((n) => e.fail(_.failure(t, n, r)))).flatMap((t) => t.body === null ? e.fail(_.error("Response has no body", r, t)) : e.of(t.body.getReader()));
-	}, p = (t) => e.lift(() => t.read(), (e) => y.error(e, r)), m = e.of(n.empty()), h = (e) => T(e.retryMs).flatMap(() => g(e)), g = (t) => {
-		if (t.pending.length > 0) {
+		}), S.fetch), (e) => x.error(e, i)).flatMap((t) => t.ok ? e.of(t) : y.readFailure(t, "text", i)).flatMap((t) => {
+			if (t.status === 204) return t.body?.cancel().catch(() => {}), e.of(null);
+			let n = t.headers.get("content-type");
+			return n !== null && j(n) !== "text/event-stream" ? (t.body?.cancel().catch(() => {}), e.fail(y.error(`Expected text/event-stream, got ${n}`, i, t))) : t.body === null ? e.fail(y.error("Response has no body", i, t)) : e.of(t.body.getReader());
+		});
+	}, p = (t) => e.lift(() => t.read(), (e) => x.error(e, i)), m = e.of(n.empty()), h = (e, t) => {
+		if (l === !1) return t;
+		let n = e.reconnects + 1;
+		if (l !== !0 && !l.allowsAttempt(n)) return t;
+		let r = e.serverRetryMs ?? (l === !0 ? e.retryMs : l.delayAfter(n));
+		return e.reconnects = n, k(r).flatMap(() => g(e));
+	}, g = (t) => {
+		for (; t.pending.length > 0;) {
 			let r = t.pending.shift();
-			return r.id !== void 0 && (t.lastEventId = r.id), r.retry !== void 0 && (t.retryMs = Math.max(r.retry, w)), e.of(n.of([r, t]));
+			if (r.id !== void 0 && (t.lastEventId = r.id), r.retry !== void 0 && (t.serverRetryMs = Math.max(r.retry, D)), r.event !== null) return t.reconnects = 0, e.of(n.of([w(r.event, t.lastEventId), t]));
 		}
 		let r = t.reader;
-		return r === null ? f(t).foldM((n) => l && y.isRetryable(n) ? h(t) : e.fail(n), (e) => (t.attach(e), g(t))) : p(r).foldM((n) => (t.closeConnection(), l && y.isRetryable(n) ? h(t) : e.fail(n)), (e) => e.done ? (t.closeConnection(), l ? h(t) : m) : (t.pending.push(...t.frames.push(e.value)), g(t)));
+		return r === null ? f(t).foldM((n) => x.isRetryable(n) ? h(t, e.fail(n)) : e.fail(n), (e) => e === null ? m : (t.attach(e), g(t))) : p(r).foldM((n) => (t.closeConnection(), x.isRetryable(n) ? h(t, e.fail(n)) : e.fail(n)), (e) => e.done ? (t.closeConnection(), h(t, m)) : (t.pending.push(...t.frames.push(e.value)), g(t)));
 	};
-	return i.bracket(e.cancellable((e) => new E(u, e)), (e) => i.unfoldEval(e, g), (t) => e.lift(() => t.close()));
-} }, O = class {
+	return r.bracket(e.promise(async (e) => new A(u, e)), (e) => r.unfoldEval(e, g), (t) => e.sync(() => t.close()));
+} }, N = class {
 	interceptors;
 	baseUrl;
 	defaultHeaders;
@@ -193,35 +261,44 @@ var a = {
 	constructor(e = {}) {
 		this.interceptors = Object.freeze([...e.interceptors ?? []]), this.baseUrl = e.baseUrl, this.defaultHeaders = e.defaultHeaders ?? {}, this.defaultTimeout = e.timeout, this.defaultCredentials = e.credentials ?? "same-origin";
 	}
-	get(e, t) {
+	get(e, t = {}) {
 		return this.request(e, "GET", t);
 	}
-	post(e, t, n) {
+	post(e, t, n = {}) {
 		return this.request(e, "POST", {
 			...n,
 			body: t
 		});
 	}
-	put(e, t, n) {
+	put(e, t, n = {}) {
 		return this.request(e, "PUT", {
 			...n,
 			body: t
 		});
 	}
-	patch(e, t, n) {
+	patch(e, t, n = {}) {
 		return this.request(e, "PATCH", {
 			...n,
 			body: t
 		});
 	}
-	delete(e, t) {
+	delete(e, t = {}) {
 		return this.request(e, "DELETE", t);
 	}
 	fetch(e, t, n = {}) {
 		return this.request(e, t, n);
 	}
+	send(t, n, r = {}) {
+		let i = this.resolveUrl(n);
+		return this.withTimeout(i, r.timeout, this.exchange(i, t, r).flatMap((t) => t.ok ? e.sync(() => void t.body?.cancel().catch(() => {})) : y.readFailure(t, "json", i)));
+	}
+	raw(t, n, r = {}) {
+		let i = this.resolveUrl(n);
+		return this.withTimeout(i, r.timeout, this.exchange(i, t, r).flatMap((t) => t.ok ? e.of(t) : y.readFailure(t, "json", i)));
+	}
 	sse(e, t = {}) {
-		return D.stream({
+		if (t.retry !== void 0 && !(t.retry >= 0)) throw RangeError(`HttpClient.sse: retry must be a non-negative number of milliseconds, got ${t.retry}`);
+		return M.stream({
 			url: this.resolveUrl(e),
 			headers: t.headers ?? {},
 			defaultHeaders: this.defaultHeaders,
@@ -232,25 +309,29 @@ var a = {
 		});
 	}
 	resolveUrl(e) {
-		if (!this.baseUrl) return e;
-		try {
-			return new URL(e), e;
-		} catch {
-			return `${this.baseUrl.endsWith("/") ? this.baseUrl.slice(0, -1) : this.baseUrl}${e.startsWith("/") ? e : `/${e}`}`;
-		}
+		return !this.baseUrl || /^[a-z][a-z\d+.-]*:\/\//i.test(e) || /^(data|blob):/i.test(e) ? e : `${this.baseUrl.endsWith("/") ? this.baseUrl.slice(0, -1) : this.baseUrl}${e.startsWith("/") ? e : `/${e}`}`;
 	}
-	request(t, n, r = {}) {
-		let i = this.resolveUrl(t), a = r.timeout ?? this.defaultTimeout, { responseType: s = "json", observe: c = "body", transform: l = (e) => e } = r, u = {
+	exchange(t, n, r) {
+		if ((n === "GET" || n === "HEAD") && r.body != null) throw TypeError(`A ${n} request cannot have a body (${t})`);
+		let i = {
 			headers: this.defaultHeaders,
 			credentials: this.defaultCredentials
-		}, f = e.lift(() => d.prepare(n, r, u), (e) => o.request(i, e)), p = (t) => e.cancellable((e) => b.run(this.interceptors, {
-			...t,
+		};
+		return e.lift(() => d.prepare(n, r, i), (e) => a.request(t, e)).flatMap((n) => e.cancellable((e) => S.run(this.interceptors, S.request(t, {
+			...n,
 			signal: e
-		}, (e) => fetch(i, e)), (e) => y.error(e, i)), m = (t) => _.read(t, s, i).flatMap((e) => _.settle(t, e, i)).flatMap((n) => e.lift(() => l(n), (e) => _.error(e, i, t))), h = f.flatMap(p).flatMap((t) => t.ok && c === "response" ? e.of(t) : m(t));
-		return a == null ? h : h.timeout(a, () => o.timeout(i, a));
+		}), S.fetch), (e) => x.error(e, t)));
+	}
+	withTimeout(e, t, n) {
+		let r = t ?? this.defaultTimeout;
+		return r == null ? n : n.timeout(r, () => a.timeout(e, r));
+	}
+	request(t, r, i) {
+		let o = this.resolveUrl(t), { responseType: s = "json", transform: c = (e) => e, empty: l = "error" } = i;
+		return this.withTimeout(o, i.timeout, this.exchange(o, r, i).flatMap((t) => t.ok ? y.read(t, s, o, r).flatMap((r) => r === g ? l === "option" ? e.of(n.empty()) : e.fail(a.decode(o, t, `expected a response body, got none (status ${t.status}); use send() or { empty: "option" }`)) : e.lift(() => c(r), (e) => a.decode(o, t, e)).map((e) => l === "option" ? n.ofNullable(e) : e)) : y.readFailure(t, s, o)));
 	}
 };
 //#endregion
-export { O as HttpClient, o as HttpError, C as decodeEvents };
+export { N as HttpClient, a as HttpError, E as decodeEvents };
 
 //# sourceMappingURL=monadyssey-fetch.mjs.map