@upyo/pool 0.5.0-dev.164 → 0.5.0-dev.170

package/README.md

@@ -97,7 +97,7 @@ const transport = new PoolTransport({
     { transport: backupTransport, priority: 50 },
     { transport: emergencyTransport, priority: 10 },
   ],
-  maxRetries: 3, // Try up to 3 transports
+  maxRetries: 2, // Retry up to 2 other transports
 });
 
 // Always tries primary first, only uses backup if primary fails
@@ -219,13 +219,13 @@ Configuration
 
 ### `PoolConfig`
 
-| Property            | Type                                                                        | Required | Default              | Description                                                       |
-| ------------------- | --------------------------------------------------------------------------- | -------- | -------------------- | ----------------------------------------------------------------- |
-| `strategy`          | `"round-robin" \| "weighted" \| "priority" \| "selector-based" \| Strategy` | Yes      |                      | The strategy for selecting transports                             |
-| `transports`        | `TransportEntry[]`                                                          | Yes      |                      | Array of transport configurations                                 |
-| `maxRetries`        | `number`                                                                    | No       | Number of transports | Maximum retry attempts on failure                                 |
-| `timeout`           | `number`                                                                    | No       |                      | Timeout in milliseconds for each send attempt                     |
-| `continueOnSuccess` | `boolean`                                                                   | No       | `false`              | Continue trying transports after success (selector strategy only) |
+| Property            | Type                                                                        | Required | Default                           | Description                                                       |
+| ------------------- | --------------------------------------------------------------------------- | -------- | --------------------------------- | ----------------------------------------------------------------- |
+| `strategy`          | `"round-robin" \| "weighted" \| "priority" \| "selector-based" \| Strategy` | Yes      |                                   | The strategy for selecting transports                             |
+| `transports`        | `TransportEntry[]`                                                          | Yes      |                                   | Array of transport configurations                                 |
+| `maxRetries`        | `number`                                                                    | No       | Enough to try each transport once | Maximum retry attempts after the initial attempt                  |
+| `timeout`           | `number`                                                                    | No       |                                   | Timeout in milliseconds for each send attempt                     |
+| `continueOnSuccess` | `boolean`                                                                   | No       | `false`                           | Continue trying transports after success (selector strategy only) |
 
 ### `TransportEntry`
 

package/dist/index.cjs

@@ -50,7 +50,7 @@ function createPoolConfig(config) {
 	return {
 		strategy: config.strategy,
 		transports: resolvedTransports,
-		maxRetries: config.maxRetries ?? enabledTransports.length,
+		maxRetries: config.maxRetries ?? enabledTransports.length - 1,
 		timeout: config.timeout,
 		continueOnSuccess: config.continueOnSuccess ?? false
 	};
@@ -328,7 +328,8 @@ var PoolTransport = class {
 		const attemptedIndices = /* @__PURE__ */ new Set();
 		const errorMessages = [];
 		const errors = [];
-		for (let attempt = 0; attempt < this.config.maxRetries; attempt++) {
+		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);
 			if (!selection) break;
@@ -340,7 +341,7 @@ var PoolTransport = class {
 				try {
 					receipt = await selection.entry.transport.send(message, sendOptions.options);
 				} catch (error) {
-					if (isAbortError(error) && sendOptions.abortedByCaller()) {
+					if (sendOptions.abortedByCaller() && isCallerAbort(error, options?.signal)) {
 						abortedByCaller = true;
 						throw error;
 					}
@@ -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 (isAbortError(error) && abortedByCaller) throw 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,
@@ -433,39 +439,50 @@ var PoolTransport = class {
 			abortedByCaller: () => options?.signal?.aborted ?? false,
 			cleanup: () => {}
 		};
-		const controller = new AbortController();
+		const timeoutController = new AbortController();
 		let abortSource;
 		const timeoutId = setTimeout(() => {
 			abortSource ??= "timeout";
-			controller.abort();
+			timeoutController.abort(createAbortError());
 		}, this.config.timeout);
-		let cleanup = () => clearTimeout(timeoutId);
+		let cleanupAbortSource = () => {};
+		let signal = timeoutController.signal;
+		let cleanupCombinedSignal = () => {};
 		if (options?.signal) {
-			const abort = () => {
+			const markCallerAbort = () => {
 				abortSource ??= "caller";
 				clearTimeout(timeoutId);
-				controller.abort();
-			};
-			if (options.signal.aborted) abort();
-			else options.signal.addEventListener("abort", abort, { once: true });
-			cleanup = () => {
-				clearTimeout(timeoutId);
-				options.signal?.removeEventListener("abort", abort);
 			};
+			if (options.signal.aborted) markCallerAbort();
+			else options.signal.addEventListener("abort", markCallerAbort, { once: true });
+			cleanupAbortSource = () => options.signal?.removeEventListener("abort", markCallerAbort);
+			const combinedSignal = (0, __upyo_core.combineSignals)(timeoutController.signal, options.signal);
+			signal = combinedSignal.signal;
+			cleanupCombinedSignal = combinedSignal.cleanup;
 		}
-		controller.signal.addEventListener("abort", () => {
+		timeoutController.signal.addEventListener("abort", () => {
 			clearTimeout(timeoutId);
 		});
 		return {
 			options: {
 				...options,
-				signal: controller.signal
+				signal
 			},
 			abortedByCaller: () => abortSource === "caller",
-			cleanup
+			cleanup: () => {
+				clearTimeout(timeoutId);
+				cleanupAbortSource();
+				cleanupCombinedSignal();
+			}
 		};
 	}
 };
+function createAbortError() {
+	return new DOMException("The operation was aborted.", "AbortError");
+}
+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,

package/dist/index.d.cts

@@ -95,8 +95,9 @@ interface PoolConfig<TProviderId extends string = string> {
    */
   readonly transports: readonly TransportEntry<TProviderId>[];
   /**
-   * Maximum number of retry attempts when a transport fails.
-   * Set to 0 to disable retries. Defaults to the number of transports.
+   * Maximum number of retry attempts after the initial send attempt fails.
+   * Set to 0 to disable retries. Defaults to enough retries to try every
+   * enabled transport once.
    */
   readonly maxRetries?: number;
   /**

package/dist/index.d.ts

@@ -95,8 +95,9 @@ interface PoolConfig<TProviderId extends string = string> {
    */
   readonly transports: readonly TransportEntry<TProviderId>[];
   /**
-   * Maximum number of retry attempts when a transport fails.
-   * Set to 0 to disable retries. Defaults to the number of transports.
+   * Maximum number of retry attempts after the initial send attempt fails.
+   * Set to 0 to disable retries. Defaults to enough retries to try every
+   * enabled transport once.
    */
   readonly maxRetries?: number;
   /**

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
 /**
@@ -27,7 +27,7 @@ function createPoolConfig(config) {
 	return {
 		strategy: config.strategy,
 		transports: resolvedTransports,
-		maxRetries: config.maxRetries ?? enabledTransports.length,
+		maxRetries: config.maxRetries ?? enabledTransports.length - 1,
 		timeout: config.timeout,
 		continueOnSuccess: config.continueOnSuccess ?? false
 	};
@@ -305,7 +305,8 @@ var PoolTransport = class {
 		const attemptedIndices = /* @__PURE__ */ new Set();
 		const errorMessages = [];
 		const errors = [];
-		for (let attempt = 0; attempt < this.config.maxRetries; attempt++) {
+		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);
 			if (!selection) break;
@@ -317,7 +318,7 @@ var PoolTransport = class {
 				try {
 					receipt = await selection.entry.transport.send(message, sendOptions.options);
 				} catch (error) {
-					if (isAbortError(error) && sendOptions.abortedByCaller()) {
+					if (sendOptions.abortedByCaller() && isCallerAbort(error, options?.signal)) {
 						abortedByCaller = true;
 						throw error;
 					}
@@ -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 (isAbortError(error) && abortedByCaller) throw 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,
@@ -410,39 +416,50 @@ var PoolTransport = class {
 			abortedByCaller: () => options?.signal?.aborted ?? false,
 			cleanup: () => {}
 		};
-		const controller = new AbortController();
+		const timeoutController = new AbortController();
 		let abortSource;
 		const timeoutId = setTimeout(() => {
 			abortSource ??= "timeout";
-			controller.abort();
+			timeoutController.abort(createAbortError());
 		}, this.config.timeout);
-		let cleanup = () => clearTimeout(timeoutId);
+		let cleanupAbortSource = () => {};
+		let signal = timeoutController.signal;
+		let cleanupCombinedSignal = () => {};
 		if (options?.signal) {
-			const abort = () => {
+			const markCallerAbort = () => {
 				abortSource ??= "caller";
 				clearTimeout(timeoutId);
-				controller.abort();
-			};
-			if (options.signal.aborted) abort();
-			else options.signal.addEventListener("abort", abort, { once: true });
-			cleanup = () => {
-				clearTimeout(timeoutId);
-				options.signal?.removeEventListener("abort", abort);
 			};
+			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);
+			signal = combinedSignal.signal;
+			cleanupCombinedSignal = combinedSignal.cleanup;
 		}
-		controller.signal.addEventListener("abort", () => {
+		timeoutController.signal.addEventListener("abort", () => {
 			clearTimeout(timeoutId);
 		});
 		return {
 			options: {
 				...options,
-				signal: controller.signal
+				signal
 			},
 			abortedByCaller: () => abortSource === "caller",
-			cleanup
+			cleanup: () => {
+				clearTimeout(timeoutId);
+				cleanupAbortSource();
+				cleanupCombinedSignal();
+			}
 		};
 	}
 };
+function createAbortError() {
+	return new DOMException("The operation was aborted.", "AbortError");
+}
+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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/pool",
-  "version": "0.5.0-dev.164",
+  "version": "0.5.0-dev.170",
   "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.164+5e283c64"
+    "@upyo/core": "0.5.0-dev.170+643994fd"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",
     "typescript": "5.8.3",
-    "@upyo/mock": "0.5.0-dev.164+5e283c64"
+    "@upyo/mock": "0.5.0-dev.170+643994fd"
   },
   "scripts": {
     "prepublish": "mise run --no-deps :build"