@upyo/pool 0.5.0-dev.168 → 0.5.0-dev.172

package/dist/index.cjs

@@ -328,6 +328,7 @@ var PoolTransport = class {
 		const attemptedIndices = /* @__PURE__ */ new Set();
 		const errorMessages = [];
 		const errors = [];
+		let checkCallerAbortBeforeFailure = false;
 		for (let attempt = 0; attempt <= this.config.maxRetries; attempt++) {
 			if (options?.signal?.aborted) throw new DOMException("The operation was aborted.", "AbortError");
 			const selection = this.strategy.select(message, this.config.transports, attemptedIndices);
@@ -351,24 +352,29 @@ var PoolTransport = class {
 				if (receipt.successful) return receipt;
 				errorMessages.push(...receipt.errorMessages);
 				errors.push(...getReceiptErrors(receipt, selection.entry.transport.id));
+				checkCallerAbortBeforeFailure = true;
 			} catch (error) {
 				if (abortedByCaller && isCallerAbort(error, options?.signal)) throw error;
 				const thrownErrors = getThrownReceiptErrors(error, selection.entry.transport.id);
 				if (thrownErrors.length > 0) {
 					errorMessages.push(...thrownErrors.map((item) => item.message));
 					errors.push(...thrownErrors);
+					checkCallerAbortBeforeFailure = true;
 					continue;
 				}
 				const timeoutMessage = "Transport send timed out.";
-				const errorMessage = isAbortError(error) ? timeoutMessage : error instanceof Error ? error.message : String(error);
+				const abortError = isAbortError(error);
+				const errorMessage = abortError ? timeoutMessage : error instanceof Error ? error.message : String(error);
 				errorMessages.push(errorMessage);
 				errors.push((0, __upyo_core.createReceiptError)(errorMessage, {
 					provider: selection.entry.transport.id,
-					category: isAbortError(error) ? "timeout" : void 0,
-					retryable: isAbortError(error) ? true : void 0
+					category: abortError ? "timeout" : void 0,
+					retryable: abortError ? true : void 0
 				}));
+				checkCallerAbortBeforeFailure ||= !abortError;
 			}
 		}
+		if (checkCallerAbortBeforeFailure) options?.signal?.throwIfAborted();
 		return (0, __upyo_core.createFailedReceipt)(errorMessages.length > 0 ? errorMessages : ["All transports failed to send the message."], {
 			provider: "pool",
 			errors: errors.length > 0 ? errors : void 0,
@@ -450,7 +456,7 @@ var PoolTransport = class {
 			if (options.signal.aborted) markCallerAbort();
 			else options.signal.addEventListener("abort", markCallerAbort, { once: true });
 			cleanupAbortSource = () => options.signal?.removeEventListener("abort", markCallerAbort);
-			const combinedSignal = combineSignals(timeoutController.signal, options.signal);
+			const combinedSignal = (0, __upyo_core.combineSignals)(timeoutController.signal, options.signal);
 			signal = combinedSignal.signal;
 			cleanupCombinedSignal = combinedSignal.cleanup;
 		}
@@ -471,32 +477,6 @@ var PoolTransport = class {
 		};
 	}
 };
-function combineSignals(timeoutSignal, externalSignal) {
-	if (typeof AbortSignal.any === "function") return {
-		signal: AbortSignal.any([timeoutSignal, externalSignal]),
-		cleanup: () => {}
-	};
-	const controller = new AbortController();
-	const abort = (signal) => {
-		controller.abort(getAbortReason(signal));
-	};
-	const abortTimeout = () => abort(timeoutSignal);
-	const abortExternal = () => abort(externalSignal);
-	timeoutSignal.addEventListener("abort", abortTimeout, { once: true });
-	externalSignal.addEventListener("abort", abortExternal, { once: true });
-	if (timeoutSignal.aborted) abortTimeout();
-	else if (externalSignal.aborted) abortExternal();
-	return {
-		signal: controller.signal,
-		cleanup: () => {
-			timeoutSignal.removeEventListener("abort", abortTimeout);
-			externalSignal.removeEventListener("abort", abortExternal);
-		}
-	};
-}
-function getAbortReason(signal) {
-	return signal.reason ?? createAbortError();
-}
 function createAbortError() {
 	return new DOMException("The operation was aborted.", "AbortError");
 }
@@ -504,20 +484,26 @@ function isCallerAbort(error, signal) {
 	return isAbortError(error) || error === signal?.reason;
 }
 function getReceiptErrors(receipt, provider) {
-	if (receipt.errors != null && receipt.errors.length > 0) return receipt.errors.map((error) => error.provider == null ? {
-		...error,
-		provider
-	} : error);
+	if (receipt.errors != null && receipt.errors.length > 0) return receipt.errors.map((error) => withReceiptErrorProvider(error, provider));
 	return receipt.errorMessages.map((message) => (0, __upyo_core.createReceiptError)(message, { provider: receipt.provider ?? provider }));
 }
 function getThrownReceiptErrors(error, provider) {
-	if (isReceiptError(error)) return [error.provider == null ? {
-		...error,
-		provider
-	} : error];
+	if (isReceiptError(error)) return [withReceiptErrorProvider(error, provider)];
 	if (isFailedReceipt(error)) return getReceiptErrors(error, provider);
 	return [];
 }
+function withReceiptErrorProvider(error, provider) {
+	return {
+		message: error.message,
+		code: error.code,
+		category: error.category,
+		retryable: error.retryable,
+		provider: error.provider ?? provider,
+		statusCode: error.statusCode,
+		retryAfterMilliseconds: error.retryAfterMilliseconds,
+		providerDetails: error.providerDetails
+	};
+}
 function isReceiptError(value) {
 	return typeof value === "object" && value != null && typeof value.message === "string" && typeof value.code === "string" && typeof value.retryable === "boolean" && typeof value.category === "string";
 }

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createFailedReceipt, createReceiptError } from "@upyo/core";
+import { combineSignals, createFailedReceipt, createReceiptError } from "@upyo/core";
 
 //#region src/config.ts
 /**
@@ -305,6 +305,7 @@ var PoolTransport = class {
 		const attemptedIndices = /* @__PURE__ */ new Set();
 		const errorMessages = [];
 		const errors = [];
+		let checkCallerAbortBeforeFailure = false;
 		for (let attempt = 0; attempt <= this.config.maxRetries; attempt++) {
 			if (options?.signal?.aborted) throw new DOMException("The operation was aborted.", "AbortError");
 			const selection = this.strategy.select(message, this.config.transports, attemptedIndices);
@@ -328,24 +329,29 @@ var PoolTransport = class {
 				if (receipt.successful) return receipt;
 				errorMessages.push(...receipt.errorMessages);
 				errors.push(...getReceiptErrors(receipt, selection.entry.transport.id));
+				checkCallerAbortBeforeFailure = true;
 			} catch (error) {
 				if (abortedByCaller && isCallerAbort(error, options?.signal)) throw error;
 				const thrownErrors = getThrownReceiptErrors(error, selection.entry.transport.id);
 				if (thrownErrors.length > 0) {
 					errorMessages.push(...thrownErrors.map((item) => item.message));
 					errors.push(...thrownErrors);
+					checkCallerAbortBeforeFailure = true;
 					continue;
 				}
 				const timeoutMessage = "Transport send timed out.";
-				const errorMessage = isAbortError(error) ? timeoutMessage : error instanceof Error ? error.message : String(error);
+				const abortError = isAbortError(error);
+				const errorMessage = abortError ? timeoutMessage : error instanceof Error ? error.message : String(error);
 				errorMessages.push(errorMessage);
 				errors.push(createReceiptError(errorMessage, {
 					provider: selection.entry.transport.id,
-					category: isAbortError(error) ? "timeout" : void 0,
-					retryable: isAbortError(error) ? true : void 0
+					category: abortError ? "timeout" : void 0,
+					retryable: abortError ? true : void 0
 				}));
+				checkCallerAbortBeforeFailure ||= !abortError;
 			}
 		}
+		if (checkCallerAbortBeforeFailure) options?.signal?.throwIfAborted();
 		return createFailedReceipt(errorMessages.length > 0 ? errorMessages : ["All transports failed to send the message."], {
 			provider: "pool",
 			errors: errors.length > 0 ? errors : void 0,
@@ -448,32 +454,6 @@ var PoolTransport = class {
 		};
 	}
 };
-function combineSignals(timeoutSignal, externalSignal) {
-	if (typeof AbortSignal.any === "function") return {
-		signal: AbortSignal.any([timeoutSignal, externalSignal]),
-		cleanup: () => {}
-	};
-	const controller = new AbortController();
-	const abort = (signal) => {
-		controller.abort(getAbortReason(signal));
-	};
-	const abortTimeout = () => abort(timeoutSignal);
-	const abortExternal = () => abort(externalSignal);
-	timeoutSignal.addEventListener("abort", abortTimeout, { once: true });
-	externalSignal.addEventListener("abort", abortExternal, { once: true });
-	if (timeoutSignal.aborted) abortTimeout();
-	else if (externalSignal.aborted) abortExternal();
-	return {
-		signal: controller.signal,
-		cleanup: () => {
-			timeoutSignal.removeEventListener("abort", abortTimeout);
-			externalSignal.removeEventListener("abort", abortExternal);
-		}
-	};
-}
-function getAbortReason(signal) {
-	return signal.reason ?? createAbortError();
-}
 function createAbortError() {
 	return new DOMException("The operation was aborted.", "AbortError");
 }
@@ -481,20 +461,26 @@ function isCallerAbort(error, signal) {
 	return isAbortError(error) || error === signal?.reason;
 }
 function getReceiptErrors(receipt, provider) {
-	if (receipt.errors != null && receipt.errors.length > 0) return receipt.errors.map((error) => error.provider == null ? {
-		...error,
-		provider
-	} : error);
+	if (receipt.errors != null && receipt.errors.length > 0) return receipt.errors.map((error) => withReceiptErrorProvider(error, provider));
 	return receipt.errorMessages.map((message) => createReceiptError(message, { provider: receipt.provider ?? provider }));
 }
 function getThrownReceiptErrors(error, provider) {
-	if (isReceiptError(error)) return [error.provider == null ? {
-		...error,
-		provider
-	} : error];
+	if (isReceiptError(error)) return [withReceiptErrorProvider(error, provider)];
 	if (isFailedReceipt(error)) return getReceiptErrors(error, provider);
 	return [];
 }
+function withReceiptErrorProvider(error, provider) {
+	return {
+		message: error.message,
+		code: error.code,
+		category: error.category,
+		retryable: error.retryable,
+		provider: error.provider ?? provider,
+		statusCode: error.statusCode,
+		retryAfterMilliseconds: error.retryAfterMilliseconds,
+		providerDetails: error.providerDetails
+	};
+}
 function isReceiptError(value) {
 	return typeof value === "object" && value != null && typeof value.message === "string" && typeof value.code === "string" && typeof value.retryable === "boolean" && typeof value.category === "string";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/pool",
-  "version": "0.5.0-dev.168",
+  "version": "0.5.0-dev.172",
   "description": "Pool transport for Upyo email library—provides load balancing and failover for multiple email providers",
   "keywords": [
     "email",
@@ -56,12 +56,12 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.5.0-dev.168+1e808a3a"
+    "@upyo/core": "0.5.0-dev.172+1b1248e1"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",
     "typescript": "5.8.3",
-    "@upyo/mock": "0.5.0-dev.168+1e808a3a"
+    "@upyo/mock": "0.5.0-dev.172+1b1248e1"
   },
   "scripts": {
     "prepublish": "mise run --no-deps :build"