@npy/fetch 0.1.1 → 0.1.2

package/_internal/decode-stream-error.cjs

@@ -0,0 +1,18 @@
+//#region src/_internal/decode-stream-error.ts
+/**
+* Internal sentinel thrown when a decompression stream fails.
+*
+* Tagged at the source (inside createDecoder) so that error classifiers
+* can use `instanceof` instead of heuristics on error messages or codes.
+* Never exposed in the public API — callers receive ResponseDecodeError.
+*/
+var DecodeStreamError = class extends Error {
+	cause;
+	constructor(cause) {
+		super("Response decode failed", { cause });
+		this.name = "DecodeStreamError";
+		this.cause = cause;
+	}
+};
+//#endregion
+exports.DecodeStreamError = DecodeStreamError;

package/_internal/decode-stream-error.d.cts

@@ -0,0 +1,11 @@
+/**
+ * Internal sentinel thrown when a decompression stream fails.
+ *
+ * Tagged at the source (inside createDecoder) so that error classifiers
+ * can use `instanceof` instead of heuristics on error messages or codes.
+ * Never exposed in the public API — callers receive ResponseDecodeError.
+ */
+export declare class DecodeStreamError extends Error {
+    readonly cause: unknown;
+    constructor(cause: unknown);
+}

package/_internal/decode-stream-error.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Internal sentinel thrown when a decompression stream fails.
+ *
+ * Tagged at the source (inside createDecoder) so that error classifiers
+ * can use `instanceof` instead of heuristics on error messages or codes.
+ * Never exposed in the public API — callers receive ResponseDecodeError.
+ */
+export declare class DecodeStreamError extends Error {
+    readonly cause: unknown;
+    constructor(cause: unknown);
+}

package/_internal/decode-stream-error.js

@@ -0,0 +1,18 @@
+//#region src/_internal/decode-stream-error.ts
+/**
+* Internal sentinel thrown when a decompression stream fails.
+*
+* Tagged at the source (inside createDecoder) so that error classifiers
+* can use `instanceof` instead of heuristics on error messages or codes.
+* Never exposed in the public API — callers receive ResponseDecodeError.
+*/
+var DecodeStreamError = class extends Error {
+	cause;
+	constructor(cause) {
+		super("Response decode failed", { cause });
+		this.name = "DecodeStreamError";
+		this.cause = cause;
+	}
+};
+//#endregion
+export { DecodeStreamError };

package/_internal/error-mapping.cjs

@@ -0,0 +1,44 @@
+const require_decode_stream_error = require("./decode-stream-error.cjs");
+const require_errors = require("../errors.cjs");
+//#region src/_internal/error-mapping.ts
+/** Casts or converts the unknown into an Error */
+function unknownToError(err) {
+	if (err instanceof Error) return err;
+	if (typeof err === "string") return new Error(err);
+	return new Error("unknown error", { cause: err });
+}
+function isAbortOrTimeoutError(error) {
+	if (!error || typeof error !== "object") return false;
+	const name = String(error.name ?? "");
+	return name === "AbortError" || name === "TimeoutError";
+}
+function toConnectError(error, { signal, context, timedOut }) {
+	if (error instanceof require_errors.FetchError) return error;
+	if (timedOut || signal?.reason?.name === "TimeoutError") return new require_errors.ConnectTimeoutError(unknownToError(error), context, "Connection timeout");
+	if (signal?.aborted || isAbortOrTimeoutError(error)) return new require_errors.RequestAbortedError(unknownToError(signal?.reason ?? error ?? new DOMException("This operation was aborted", "AbortError")), context, "The request was aborted while connecting");
+	return new require_errors.ConnectionError(unknownToError(error), context, "Connection failed");
+}
+function toSendError(error, { signal, context, phase }) {
+	if (error instanceof require_errors.FetchError) return error;
+	if (signal?.aborted || isAbortOrTimeoutError(error)) return new require_errors.RequestAbortedError(unknownToError(signal?.reason ?? error ?? new DOMException("This operation was aborted", "AbortError")), context, phase === "body" ? "The request was aborted while reading the response body" : "The request was aborted");
+	const cause = unknownToError(error);
+	if (phase === "request") return new require_errors.RequestWriteError(cause, context);
+	if (phase === "response") return new require_errors.ResponseHeaderError(cause, context);
+	if (error instanceof require_decode_stream_error.DecodeStreamError) return new require_errors.ResponseDecodeError(unknownToError(error.cause), context);
+	return new require_errors.ResponseBodyError(cause, context);
+}
+function toWebFetchError(error, signal) {
+	if (signal?.aborted) return signal.reason ?? new DOMException("This operation was aborted", "AbortError");
+	if (error instanceof DOMException || error instanceof TypeError) return error;
+	return new TypeError("fetch failed", { cause: unknownToError(error) });
+}
+function toWebBodyReadError(error, signal) {
+	if (signal?.aborted) return signal.reason ?? new DOMException("This operation was aborted", "AbortError");
+	if (error instanceof DOMException || error instanceof TypeError || error instanceof RangeError) return error;
+	return new TypeError("Failed to read response body", { cause: unknownToError(error) });
+}
+//#endregion
+exports.toConnectError = toConnectError;
+exports.toSendError = toSendError;
+exports.toWebBodyReadError = toWebBodyReadError;
+exports.toWebFetchError = toWebFetchError;

package/_internal/error-mapping.d.cts

@@ -0,0 +1,15 @@
+import { FetchError, FetchErrorContext } from '../errors';
+/** Casts or converts the unknown into an Error */
+export declare function unknownToError(err: unknown): Error;
+export declare function toConnectError(error: unknown, { signal, context, timedOut, }: {
+    signal?: AbortSignal;
+    context?: FetchErrorContext;
+    timedOut?: boolean;
+}): FetchError;
+export declare function toSendError(error: unknown, { signal, context, phase, }: {
+    signal?: AbortSignal;
+    context?: FetchErrorContext;
+    phase: "request" | "response" | "body";
+}): FetchError;
+export declare function toWebFetchError(error: unknown, signal?: AbortSignal): unknown;
+export declare function toWebBodyReadError(error: unknown, signal?: AbortSignal): unknown;

package/_internal/error-mapping.d.ts

@@ -0,0 +1,15 @@
+import { FetchError, FetchErrorContext } from '../errors';
+/** Casts or converts the unknown into an Error */
+export declare function unknownToError(err: unknown): Error;
+export declare function toConnectError(error: unknown, { signal, context, timedOut, }: {
+    signal?: AbortSignal;
+    context?: FetchErrorContext;
+    timedOut?: boolean;
+}): FetchError;
+export declare function toSendError(error: unknown, { signal, context, phase, }: {
+    signal?: AbortSignal;
+    context?: FetchErrorContext;
+    phase: "request" | "response" | "body";
+}): FetchError;
+export declare function toWebFetchError(error: unknown, signal?: AbortSignal): unknown;
+export declare function toWebBodyReadError(error: unknown, signal?: AbortSignal): unknown;

package/_internal/error-mapping.js

@@ -0,0 +1,41 @@
+import { DecodeStreamError } from "./decode-stream-error.js";
+import { ConnectTimeoutError, ConnectionError, FetchError, RequestAbortedError, RequestWriteError, ResponseBodyError, ResponseDecodeError, ResponseHeaderError } from "../errors.js";
+//#region src/_internal/error-mapping.ts
+/** Casts or converts the unknown into an Error */
+function unknownToError(err) {
+	if (err instanceof Error) return err;
+	if (typeof err === "string") return new Error(err);
+	return new Error("unknown error", { cause: err });
+}
+function isAbortOrTimeoutError(error) {
+	if (!error || typeof error !== "object") return false;
+	const name = String(error.name ?? "");
+	return name === "AbortError" || name === "TimeoutError";
+}
+function toConnectError(error, { signal, context, timedOut }) {
+	if (error instanceof FetchError) return error;
+	if (timedOut || signal?.reason?.name === "TimeoutError") return new ConnectTimeoutError(unknownToError(error), context, "Connection timeout");
+	if (signal?.aborted || isAbortOrTimeoutError(error)) return new RequestAbortedError(unknownToError(signal?.reason ?? error ?? new DOMException("This operation was aborted", "AbortError")), context, "The request was aborted while connecting");
+	return new ConnectionError(unknownToError(error), context, "Connection failed");
+}
+function toSendError(error, { signal, context, phase }) {
+	if (error instanceof FetchError) return error;
+	if (signal?.aborted || isAbortOrTimeoutError(error)) return new RequestAbortedError(unknownToError(signal?.reason ?? error ?? new DOMException("This operation was aborted", "AbortError")), context, phase === "body" ? "The request was aborted while reading the response body" : "The request was aborted");
+	const cause = unknownToError(error);
+	if (phase === "request") return new RequestWriteError(cause, context);
+	if (phase === "response") return new ResponseHeaderError(cause, context);
+	if (error instanceof DecodeStreamError) return new ResponseDecodeError(unknownToError(error.cause), context);
+	return new ResponseBodyError(cause, context);
+}
+function toWebFetchError(error, signal) {
+	if (signal?.aborted) return signal.reason ?? new DOMException("This operation was aborted", "AbortError");
+	if (error instanceof DOMException || error instanceof TypeError) return error;
+	return new TypeError("fetch failed", { cause: unknownToError(error) });
+}
+function toWebBodyReadError(error, signal) {
+	if (signal?.aborted) return signal.reason ?? new DOMException("This operation was aborted", "AbortError");
+	if (error instanceof DOMException || error instanceof TypeError || error instanceof RangeError) return error;
+	return new TypeError("Failed to read response body", { cause: unknownToError(error) });
+}
+//#endregion
+export { toConnectError, toSendError, toWebBodyReadError, toWebFetchError };

package/_internal/guards.cjs

@@ -1,22 +1,21 @@
 require("../_virtual/_rolldown/runtime.cjs");
 let node_stream = require("node:stream");
 //#region src/_internal/guards.ts
-var isReadable = (object) => node_stream.Readable.isReadable(object);
+var isReadable = (object) => Boolean(node_stream.Readable.isReadable(object));
 var isIterable = (object) => typeof object?.[Symbol.asyncIterator] === "function" || typeof object?.[Symbol.iterator] === "function";
-var isMultipartFormDataStream = (object) => typeof object?.getBoundary === "function" && typeof object?.hasKnownLength === "function" && typeof object?.getLengthSync === "function" && node_stream.Readable.isReadable(object);
+var isMultipartFormDataStream = (object) => typeof object?.getBoundary === "function" && typeof object?.hasKnownLength === "function" && typeof object?.getLengthSync === "function" && Boolean(node_stream.Readable.isReadable(object));
 var isFormData = (object) => typeof object === "object" && typeof object?.append === "function" && typeof object?.set === "function" && typeof object?.get === "function" && typeof object?.getAll === "function" && typeof object?.delete === "function" && typeof object?.keys === "function" && typeof object?.values === "function" && typeof object?.entries === "function" && typeof object?.constructor === "function" && object?.[Symbol.toStringTag] === "FormData";
 var isURLSearchParameters = (object) => typeof object === "object" && typeof object?.append === "function" && typeof object?.delete === "function" && typeof object?.get === "function" && typeof object?.getAll === "function" && typeof object?.has === "function" && typeof object?.set === "function" && typeof object?.sort === "function" && object?.[Symbol.toStringTag] === "URLSearchParams";
 var isReadableStream = (object) => typeof object === "object" && typeof object?.getReader === "function" && typeof object?.cancel === "function" && typeof object?.tee === "function";
+var isFumanReadable = (object) => typeof object?.read === "function" && typeof object?.close === "function" && !isReadable(object) && !isReadableStream(object);
 var isBlob = (object) => {
-	if (typeof object === "object" && typeof object?.arrayBuffer === "function" && typeof object?.type === "string" && typeof object?.stream === "function" && typeof object?.constructor === "function") {
-		const tag = object[Symbol.toStringTag];
-		return typeof tag === "string" && (tag.startsWith("Blob") || tag.startsWith("File"));
-	}
+	if (typeof object === "object" && object !== null && typeof object.arrayBuffer === "function" && typeof object.size === "number" && typeof object.slice === "function" && typeof object.stream === "function" && typeof object.text === "function" && typeof object.type === "string") return true;
 	return false;
 };
 //#endregion
 exports.isBlob = isBlob;
 exports.isFormData = isFormData;
+exports.isFumanReadable = isFumanReadable;
 exports.isIterable = isIterable;
 exports.isMultipartFormDataStream = isMultipartFormDataStream;
 exports.isReadable = isReadable;

package/{src/_internal → _internal}/guards.d.cts

@@ -1,4 +1,5 @@
 import { Readable } from 'node:stream';
+import { IClosable, IReadable } from '@fuman/io';
 export interface FormDataPolyfill extends Readable {
     getBoundary(): string;
     getLengthSync(): number;
@@ -10,4 +11,5 @@ export declare const isMultipartFormDataStream: (object: any) => object is FormD
 export declare const isFormData: (object: any) => object is FormData;
 export declare const isURLSearchParameters: (object: any) => object is URLSearchParams;
 export declare const isReadableStream: (object: any) => object is ReadableStream;
+export declare const isFumanReadable: (object: any) => object is IReadable & IClosable;
 export declare const isBlob: (object: any) => object is Blob;

package/{src/_internal → _internal}/guards.d.ts

@@ -1,4 +1,5 @@
 import { Readable } from 'node:stream';
+import { IClosable, IReadable } from '@fuman/io';
 export interface FormDataPolyfill extends Readable {
     getBoundary(): string;
     getLengthSync(): number;
@@ -10,4 +11,5 @@ export declare const isMultipartFormDataStream: (object: any) => object is FormD
 export declare const isFormData: (object: any) => object is FormData;
 export declare const isURLSearchParameters: (object: any) => object is URLSearchParams;
 export declare const isReadableStream: (object: any) => object is ReadableStream;
+export declare const isFumanReadable: (object: any) => object is IReadable & IClosable;
 export declare const isBlob: (object: any) => object is Blob;

package/_internal/guards.js

@@ -1,17 +1,15 @@
 import { Readable } from "node:stream";
 //#region src/_internal/guards.ts
-var isReadable = (object) => Readable.isReadable(object);
+var isReadable = (object) => Boolean(Readable.isReadable(object));
 var isIterable = (object) => typeof object?.[Symbol.asyncIterator] === "function" || typeof object?.[Symbol.iterator] === "function";
-var isMultipartFormDataStream = (object) => typeof object?.getBoundary === "function" && typeof object?.hasKnownLength === "function" && typeof object?.getLengthSync === "function" && Readable.isReadable(object);
+var isMultipartFormDataStream = (object) => typeof object?.getBoundary === "function" && typeof object?.hasKnownLength === "function" && typeof object?.getLengthSync === "function" && Boolean(Readable.isReadable(object));
 var isFormData = (object) => typeof object === "object" && typeof object?.append === "function" && typeof object?.set === "function" && typeof object?.get === "function" && typeof object?.getAll === "function" && typeof object?.delete === "function" && typeof object?.keys === "function" && typeof object?.values === "function" && typeof object?.entries === "function" && typeof object?.constructor === "function" && object?.[Symbol.toStringTag] === "FormData";
 var isURLSearchParameters = (object) => typeof object === "object" && typeof object?.append === "function" && typeof object?.delete === "function" && typeof object?.get === "function" && typeof object?.getAll === "function" && typeof object?.has === "function" && typeof object?.set === "function" && typeof object?.sort === "function" && object?.[Symbol.toStringTag] === "URLSearchParams";
 var isReadableStream = (object) => typeof object === "object" && typeof object?.getReader === "function" && typeof object?.cancel === "function" && typeof object?.tee === "function";
+var isFumanReadable = (object) => typeof object?.read === "function" && typeof object?.close === "function" && !isReadable(object) && !isReadableStream(object);
 var isBlob = (object) => {
-	if (typeof object === "object" && typeof object?.arrayBuffer === "function" && typeof object?.type === "string" && typeof object?.stream === "function" && typeof object?.constructor === "function") {
-		const tag = object[Symbol.toStringTag];
-		return typeof tag === "string" && (tag.startsWith("Blob") || tag.startsWith("File"));
-	}
+	if (typeof object === "object" && object !== null && typeof object.arrayBuffer === "function" && typeof object.size === "number" && typeof object.slice === "function" && typeof object.stream === "function" && typeof object.text === "function" && typeof object.type === "string") return true;
 	return false;
 };
 //#endregion
-export { isBlob, isFormData, isIterable, isMultipartFormDataStream, isReadable, isReadableStream, isURLSearchParameters };
+export { isBlob, isFormData, isFumanReadable, isIterable, isMultipartFormDataStream, isReadable, isReadableStream, isURLSearchParameters };

package/{src/_internal → _internal}/net.d.cts

@@ -1,6 +1,6 @@
 import { ConnectFunction, TcpEndpoint, TlsUpgradeFunction } from '@fuman/net';
 import { NodeTlsConnectOptions, NodeTlsUpgradeOptions, TcpConnection, TlsConnection } from '@fuman/node';
-type WithSignal<T = {}> = T & {
+export type WithSignal<T = {}> = T & {
     signal?: AbortSignal;
 };
 export interface AbortError extends Error {
@@ -9,4 +9,3 @@ export interface AbortError extends Error {
 export declare const connectTcp: ConnectFunction<WithSignal<TcpEndpoint>, TcpConnection>;
 export declare const connectTls: ConnectFunction<WithSignal<NodeTlsConnectOptions>, TlsConnection>;
 export declare const upgradeTls: TlsUpgradeFunction<WithSignal<NodeTlsUpgradeOptions>, TcpConnection, TlsConnection>;
-export {};

package/{src/_internal → _internal}/net.d.ts

@@ -1,6 +1,6 @@
 import { ConnectFunction, TcpEndpoint, TlsUpgradeFunction } from '@fuman/net';
 import { NodeTlsConnectOptions, NodeTlsUpgradeOptions, TcpConnection, TlsConnection } from '@fuman/node';
-type WithSignal<T = {}> = T & {
+export type WithSignal<T = {}> = T & {
     signal?: AbortSignal;
 };
 export interface AbortError extends Error {
@@ -9,4 +9,3 @@ export interface AbortError extends Error {
 export declare const connectTcp: ConnectFunction<WithSignal<TcpEndpoint>, TcpConnection>;
 export declare const connectTls: ConnectFunction<WithSignal<NodeTlsConnectOptions>, TlsConnection>;
 export declare const upgradeTls: TlsUpgradeFunction<WithSignal<NodeTlsUpgradeOptions>, TcpConnection, TlsConnection>;
-export {};

package/_internal/symbols.cjs

@@ -0,0 +1,4 @@
+//#region src/_internal/symbols.ts
+var bodyErrorMapperSymbol = Symbol("fetch.bodyErrorMapper");
+//#endregion
+exports.bodyErrorMapperSymbol = bodyErrorMapperSymbol;

package/_internal/symbols.d.cts

@@ -0,0 +1 @@
+export declare const bodyErrorMapperSymbol: unique symbol;

package/_internal/symbols.d.ts

@@ -0,0 +1 @@
+export declare const bodyErrorMapperSymbol: unique symbol;

package/_internal/symbols.js

@@ -0,0 +1,4 @@
+//#region src/_internal/symbols.ts
+var bodyErrorMapperSymbol = Symbol("fetch.bodyErrorMapper");
+//#endregion
+export { bodyErrorMapperSymbol };

package/agent-pool.cjs

@@ -1,7 +1,7 @@
 require("./_virtual/_rolldown/runtime.cjs");
-const require_tcp = require("./dialers/tcp.cjs");
 const require_errors = require("./errors.cjs");
 const require_agent = require("./agent.cjs");
+const require_tcp = require("./dialers/tcp.cjs");
 let generic_pool = require("generic-pool");
 //#region src/agent-pool.ts
 var defaultEvictionInterval = 1e4;
@@ -40,13 +40,14 @@ function createAgentPool(baseUrl, options = {}) {
 		min
 	});
 	let releaseAgentFns = [];
+	let closePromise;
 	async function send(sendOptions) {
 		let agent;
 		let agentReleased = false;
 		const releaseAgentFn = async (forceClose = false) => {
 			if (!agent || agentReleased) return;
 			agentReleased = true;
-			releaseAgentFns = releaseAgentFns.filter((r) => r !== releaseAgentFn);
+			releaseAgentFns = releaseAgentFns.filter((release) => release !== releaseAgentFn);
 			if (forceClose) agent.close();
 			if (pool.isBorrowedResource(agent)) await pool.release(agent);
 		};
@@ -62,9 +63,26 @@ function createAgentPool(baseUrl, options = {}) {
 		}
 	}
 	async function close() {
-		await Promise.all(releaseAgentFns.map((release) => release(true)));
-		await pool.drain();
-		await pool.clear();
+		if (closePromise) return closePromise;
+		const promise = (async () => {
+			const pendingReleases = releaseAgentFns;
+			releaseAgentFns = [];
+			const errors = (await Promise.allSettled([...pendingReleases.map((release) => release(true)), (async () => {
+				try {
+					await pool.drain();
+				} finally {
+					await pool.clear();
+				}
+			})()])).flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+			if (errors.length === 1) throw errors[0];
+			if (errors.length > 1) throw new AggregateError(errors, "Failed to close agent pool cleanly");
+		})();
+		closePromise = promise;
+		try {
+			await promise;
+		} finally {
+			if (closePromise === promise) closePromise = void 0;
+		}
 	}
 	return {
 		[Symbol.asyncDispose]: close,

package/agent-pool.d.cts

@@ -0,0 +1,2 @@
+import { AgentPool } from './types/agent';
+export declare function createAgentPool(baseUrl: string, options?: AgentPool.Options): AgentPool;

package/agent-pool.d.ts

@@ -0,0 +1,2 @@
+import { AgentPool } from './types/agent';
+export declare function createAgentPool(baseUrl: string, options?: AgentPool.Options): AgentPool;

package/agent-pool.js

@@ -1,6 +1,6 @@
-import { AutoDialer } from "./dialers/tcp.js";
 import { UnsupportedProtocolError } from "./errors.js";
 import { createAgent } from "./agent.js";
+import { AutoDialer } from "./dialers/tcp.js";
 import { createPool } from "generic-pool";
 //#region src/agent-pool.ts
 var defaultEvictionInterval = 1e4;
@@ -39,13 +39,14 @@ function createAgentPool(baseUrl, options = {}) {
 		min
 	});
 	let releaseAgentFns = [];
+	let closePromise;
 	async function send(sendOptions) {
 		let agent;
 		let agentReleased = false;
 		const releaseAgentFn = async (forceClose = false) => {
 			if (!agent || agentReleased) return;
 			agentReleased = true;
-			releaseAgentFns = releaseAgentFns.filter((r) => r !== releaseAgentFn);
+			releaseAgentFns = releaseAgentFns.filter((release) => release !== releaseAgentFn);
 			if (forceClose) agent.close();
 			if (pool.isBorrowedResource(agent)) await pool.release(agent);
 		};
@@ -61,9 +62,26 @@ function createAgentPool(baseUrl, options = {}) {
 		}
 	}
 	async function close() {
-		await Promise.all(releaseAgentFns.map((release) => release(true)));
-		await pool.drain();
-		await pool.clear();
+		if (closePromise) return closePromise;
+		const promise = (async () => {
+			const pendingReleases = releaseAgentFns;
+			releaseAgentFns = [];
+			const errors = (await Promise.allSettled([...pendingReleases.map((release) => release(true)), (async () => {
+				try {
+					await pool.drain();
+				} finally {
+					await pool.clear();
+				}
+			})()])).flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+			if (errors.length === 1) throw errors[0];
+			if (errors.length > 1) throw new AggregateError(errors, "Failed to close agent pool cleanly");
+		})();
+		closePromise = promise;
+		try {
+			await promise;
+		} finally {
+			if (closePromise === promise) closePromise = void 0;
+		}
 	}
 	return {
 		[Symbol.asyncDispose]: close,

package/agent.cjs

@@ -1,7 +1,8 @@
 require("./_virtual/_rolldown/runtime.cjs");
 const require_errors = require("./errors.cjs");
-const require_error_adapters = require("./_internal/error-adapters.cjs");
+const require_error_mapping = require("./_internal/error-mapping.cjs");
 const require_promises = require("./_internal/promises.cjs");
+const require_symbols = require("./_internal/symbols.cjs");
 const require_io = require("./io/io.cjs");
 let _fuman_utils = require("@fuman/utils");
 //#region src/agent.ts
@@ -104,9 +105,7 @@ function createAgent(dialer, baseUrl, options = {}) {
 		let timedOut = false;
 		let timeoutId;
 		const abortController = new AbortController();
-		const onAbort = () => {
-			abortController.abort(signal?.reason);
-		};
+		const onAbort = () => abortController.abort(signal?.reason);
 		const cleanup = () => {
 			if (timeoutId !== void 0) {
 				clearTimeout(timeoutId);
@@ -142,7 +141,7 @@ function createAgent(dialer, baseUrl, options = {}) {
 				conn = nextConn;
 				return nextConn;
 			} catch (error) {
-				throw require_error_adapters.mapAdvancedConnectError(error, {
+				throw require_error_mapping.toConnectError(error, {
 					signal,
 					timedOut,
 					context: createBaseErrorContext()
@@ -154,7 +153,7 @@ function createAgent(dialer, baseUrl, options = {}) {
 		})();
 		return withSignal(connectPromise, signal);
 	}
-	async function send(sendOptions) {
+	async function executeRequest(sendOptions, mapBodyError) {
 		assertUsable();
 		const url = typeof sendOptions.url === "string" ? new URL(sendOptions.url) : sendOptions.url;
 		const method = sendOptions.method.toUpperCase();
@@ -198,7 +197,7 @@ function createAgent(dialer, baseUrl, options = {}) {
 					signal: sendOptions.signal
 				}, writerOptions), sendOptions.signal);
 			} catch (error) {
-				throw require_error_adapters.mapAdvancedSendError(error, {
+				throw require_error_mapping.toSendError(error, {
 					signal: sendOptions.signal,
 					context: errorContext,
 					phase: "request"
@@ -211,19 +210,15 @@ function createAgent(dialer, baseUrl, options = {}) {
 				response = await withSignal(require_io.readResponse(activeConn, readerOptions, shouldIgnoreBody, (reusable) => {
 					sendOptions.signal?.removeEventListener("abort", abortListener);
 					finalize(reusable);
-				}), sendOptions.signal);
+				}, mapBodyError), sendOptions.signal);
 			} catch (error) {
-				throw require_error_adapters.mapAdvancedSendError(error, {
+				throw require_error_mapping.toSendError(error, {
 					signal: sendOptions.signal,
 					context: errorContext,
 					phase: "response"
 				});
 			}
-			return require_error_adapters.wrapResponseBodyErrors(response, (error) => require_error_adapters.mapAdvancedSendError(error, {
-				signal: sendOptions.signal,
-				context: errorContext,
-				phase: "body"
-			}));
+			return response;
 		} catch (error) {
 			sendOptions.signal?.removeEventListener("abort", abortListener);
 			if (activeConn) {
@@ -236,6 +231,14 @@ function createAgent(dialer, baseUrl, options = {}) {
 			throw error;
 		}
 	}
+	async function send(sendOptions) {
+		const errorContext = createRequestErrorContext(typeof sendOptions.url === "string" ? new URL(sendOptions.url) : sendOptions.url, sendOptions.method.toUpperCase());
+		return executeRequest(sendOptions, sendOptions[require_symbols.bodyErrorMapperSymbol] ?? ((error) => require_error_mapping.toSendError(error, {
+			signal: sendOptions.signal,
+			context: errorContext,
+			phase: "body"
+		})));
+	}
 	return {
 		[Symbol.dispose]: forceClose,
 		close: forceClose,

package/agent.js

@@ -1,6 +1,7 @@
 import { AgentBusyError, AgentClosedError, OriginMismatchError, RequestAbortedError, UnsupportedAlpnProtocolError, UnsupportedMethodError, UnsupportedProtocolError } from "./errors.js";
-import { mapAdvancedConnectError, mapAdvancedSendError, wrapResponseBodyErrors } from "./_internal/error-adapters.js";
+import { toConnectError, toSendError } from "./_internal/error-mapping.js";
 import { raceSignal } from "./_internal/promises.js";
+import { bodyErrorMapperSymbol } from "./_internal/symbols.js";
 import { readResponse, writeRequest } from "./io/io.js";
 import { Deferred } from "@fuman/utils";
 //#region src/agent.ts
@@ -103,9 +104,7 @@ function createAgent(dialer, baseUrl, options = {}) {
 		let timedOut = false;
 		let timeoutId;
 		const abortController = new AbortController();
-		const onAbort = () => {
-			abortController.abort(signal?.reason);
-		};
+		const onAbort = () => abortController.abort(signal?.reason);
 		const cleanup = () => {
 			if (timeoutId !== void 0) {
 				clearTimeout(timeoutId);
@@ -141,7 +140,7 @@ function createAgent(dialer, baseUrl, options = {}) {
 				conn = nextConn;
 				return nextConn;
 			} catch (error) {
-				throw mapAdvancedConnectError(error, {
+				throw toConnectError(error, {
 					signal,
 					timedOut,
 					context: createBaseErrorContext()
@@ -153,7 +152,7 @@ function createAgent(dialer, baseUrl, options = {}) {
 		})();
 		return withSignal(connectPromise, signal);
 	}
-	async function send(sendOptions) {
+	async function executeRequest(sendOptions, mapBodyError) {
 		assertUsable();
 		const url = typeof sendOptions.url === "string" ? new URL(sendOptions.url) : sendOptions.url;
 		const method = sendOptions.method.toUpperCase();
@@ -197,7 +196,7 @@ function createAgent(dialer, baseUrl, options = {}) {
 					signal: sendOptions.signal
 				}, writerOptions), sendOptions.signal);
 			} catch (error) {
-				throw mapAdvancedSendError(error, {
+				throw toSendError(error, {
 					signal: sendOptions.signal,
 					context: errorContext,
 					phase: "request"
@@ -210,19 +209,15 @@ function createAgent(dialer, baseUrl, options = {}) {
 				response = await withSignal(readResponse(activeConn, readerOptions, shouldIgnoreBody, (reusable) => {
 					sendOptions.signal?.removeEventListener("abort", abortListener);
 					finalize(reusable);
-				}), sendOptions.signal);
+				}, mapBodyError), sendOptions.signal);
 			} catch (error) {
-				throw mapAdvancedSendError(error, {
+				throw toSendError(error, {
 					signal: sendOptions.signal,
 					context: errorContext,
 					phase: "response"
 				});
 			}
-			return wrapResponseBodyErrors(response, (error) => mapAdvancedSendError(error, {
-				signal: sendOptions.signal,
-				context: errorContext,
-				phase: "body"
-			}));
+			return response;
 		} catch (error) {
 			sendOptions.signal?.removeEventListener("abort", abortListener);
 			if (activeConn) {
@@ -235,6 +230,14 @@ function createAgent(dialer, baseUrl, options = {}) {
 			throw error;
 		}
 	}
+	async function send(sendOptions) {
+		const errorContext = createRequestErrorContext(typeof sendOptions.url === "string" ? new URL(sendOptions.url) : sendOptions.url, sendOptions.method.toUpperCase());
+		return executeRequest(sendOptions, sendOptions[bodyErrorMapperSymbol] ?? ((error) => toSendError(error, {
+			signal: sendOptions.signal,
+			context: errorContext,
+			phase: "body"
+		})));
+	}
 	return {
 		[Symbol.dispose]: forceClose,
 		close: forceClose,