@askrjs/fetch 0.4.1 → 0.4.2

package/dist/client.js

@@ -1,6 +1,7 @@
 //#region src/client.ts
 const media = (response) => response.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() ?? null;
 const compatible = (codec, type) => codec.kind === "empty" || codec.kind === "blob" || codec.kind === "arrayBuffer" || codec.kind === "stream" || !!type && codec.mediaTypes.some((expected) => expected === "*/*" || expected === type || expected === "text/*" && type.startsWith("text/") || expected === "+json" && type.endsWith("+json"));
+const selectCodec = (codec, response) => codec.kind === "content" ? codec.variants?.[media(response) ?? ""] : codec;
 const validationFailure = (result) => "error" in result ? result.error : result.issues;
 async function decode(response, codec) {
 	const type = media(response);
@@ -39,6 +40,58 @@ async function decode(response, codec) {
 	}
 	return value;
 }
+function responseWithStreamCleanup(response, cleanup) {
+	const source = response.body;
+	if (!source) {
+		cleanup();
+		return response;
+	}
+	const reader = source.getReader();
+	let finished = false;
+	const finish = () => {
+		if (finished) return;
+		finished = true;
+		cleanup();
+	};
+	const body = new ReadableStream({
+		async pull(streamController) {
+			try {
+				const chunk = await reader.read();
+				if (chunk.done) {
+					finish();
+					streamController.close();
+				} else streamController.enqueue(chunk.value);
+			} catch (error) {
+				finish();
+				streamController.error(error);
+			}
+		},
+		async cancel(reason) {
+			finish();
+			return reader.cancel(reason);
+		}
+	});
+	const wrapped = new Response(body, {
+		status: response.status,
+		statusText: response.statusText,
+		headers: response.headers
+	});
+	Object.defineProperties(wrapped, {
+		url: {
+			value: response.url,
+			enumerable: true
+		},
+		redirected: {
+			value: response.redirected,
+			enumerable: true
+		},
+		type: {
+			value: response.type,
+			enumerable: true
+		}
+	});
+	return wrapped;
+}
 function encode(value, codec, headers, requestedMediaType) {
 	if (codec.validator) {
 		const parsed = codec.validator.safeParse(value);
@@ -176,17 +229,19 @@ function createFetch(options = {}) {
 		const controller = new AbortController();
 		let timedOut = false;
 		let timer;
+		let streamOwnsCleanup = false;
 		const abort = () => controller.abort(call.signal?.reason);
+		const cleanup = () => {
+			if (timer) clearTimeout(timer);
+			call.signal?.removeEventListener("abort", abort);
+		};
+		controller.signal.addEventListener("abort", cleanup, { once: true });
 		call.signal?.addEventListener("abort", abort, { once: true });
-		if (call.signal?.aborted) abort();
 		if (timeout !== void 0) timer = setTimeout(() => {
 			timedOut = true;
 			controller.abort(new DOMException("Timed out", "TimeoutError"));
 		}, timeout);
-		const cleanup = () => {
-			if (timer) clearTimeout(timer);
-			call.signal?.removeEventListener("abort", abort);
-		};
+		if (call.signal?.aborted) abort();
 		if (controller.signal.aborted) {
 			cleanup();
 			return failure("abort", controller.signal.reason, url);
@@ -216,7 +271,14 @@ function createFetch(options = {}) {
 			const codec = response.ok ? call.responses?.[response.status] ?? call.response : call.errors?.[response.status] ?? call.errors?.default;
 			if (!codec) return failure("decode", /* @__PURE__ */ new TypeError(`No codec for status ${response.status}`), url, response);
 			try {
-				const data = await decode(response.clone(), codec);
+				const selected = selectCodec(codec, response);
+				let data = await decode(selected?.kind === "stream" ? response : response.clone(), codec);
+				let resultResponse = response;
+				if (selected?.kind === "stream" && response.body) {
+					resultResponse = responseWithStreamCleanup(response, cleanup);
+					streamOwnsCleanup = true;
+					data = resultResponse.body;
+				}
 				return response.ok ? {
 					ok: true,
 					kind: "success",
@@ -224,8 +286,8 @@ function createFetch(options = {}) {
 					data,
 					mediaType: media(response),
 					headers: response.headers,
-					url: response.url || url,
-					response
+					url: resultResponse.url || url,
+					response: resultResponse
 				} : {
 					ok: false,
 					kind: "http",
@@ -233,8 +295,8 @@ function createFetch(options = {}) {
 					error: data,
 					mediaType: media(response),
 					headers: response.headers,
-					url: response.url || url,
-					response
+					url: resultResponse.url || url,
+					response: resultResponse
 				};
 			} catch (error) {
 				return failure("decode", error, url, response);
@@ -255,7 +317,7 @@ function createFetch(options = {}) {
 		} catch (error) {
 			return failure("middleware", error, url);
 		} finally {
-			cleanup();
+			if (!streamOwnsCleanup) cleanup();
 		}
 	};
 }

package/dist/types.d.ts

@@ -97,6 +97,7 @@ export type SuccessResult<T = unknown, S extends number = number> = {
   mediaType: string | null;
   headers: Headers;
   url: string;
+  /** For stream codecs, this body is the same one-shot stream exposed by `data`. */
   response: Response;
 };
 /** A non-2xx fetch outcome where the server responded with a decodable error body. */
@@ -108,6 +109,7 @@ export type HttpResult<T = unknown, S extends number = number> = {
   mediaType: string | null;
   headers: Headers;
   url: string;
+  /** For stream codecs, this body is the same one-shot stream exposed by `error`. */
   response: Response;
 };
 /** Categorizes why a fetch could not produce an {@link HttpResult} or {@link SuccessResult}. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askrjs/fetch",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Function-first typed HTTP contracts and clients for Askr.",
   "keywords": [
     "askr",