@upyo/retry 0.5.0-dev.0 → 0.5.0-dev.193

package/dist/index.cjs

@@ -74,7 +74,7 @@ async function defaultWait(context, signal) {
 		const abort = () => {
 			clearTimeout(timeout);
 			cleanup();
-			reject(createAbortError());
+			reject(signal?.reason ?? createAbortError());
 		};
 		if (signal?.aborted) {
 			abort();
@@ -153,7 +153,7 @@ var RetryTransport = class {
 					attempt,
 					nextAttempt: attempt + 1,
 					maxAttempts: this.config.maxAttempts,
-					delayMilliseconds: this.calculateDelay(attempt),
+					delayMilliseconds: this.calculateDelay(attempt, toReceiptError(error)),
 					error,
 					reason: "retry"
 				}, options?.signal);
@@ -178,17 +178,36 @@ var RetryTransport = class {
 		let inputDone = false;
 		let nextLaunchIndex = 0;
 		let nextYieldIndex = 0;
+		let launchPromise;
+		let launchError;
+		let hasLaunchError = false;
+		let pullingInput = false;
+		let closed = false;
+		const controller = new AbortController();
+		const combinedSignal = (0, __upyo_core.combineSignals)(controller.signal, options?.signal);
+		const sendOptions = {
+			...options,
+			signal: combinedSignal.signal
+		};
 		const launchNext = async () => {
 			if (inputDone) return;
-			options?.signal?.throwIfAborted();
-			const next = await iterator.next();
+			combinedSignal.signal.throwIfAborted();
+			pullingInput = true;
+			let next;
+			try {
+				next = await iterator.next();
+			} finally {
+				pullingInput = false;
+			}
+			if (closed) return;
 			if (next.done) {
 				inputDone = true;
 				return;
 			}
 			const index = nextLaunchIndex++;
-			if (index > 0) await this.waitBetweenSendMany(options?.signal);
-			const promise = this.send(next.value, options).then((receipt) => ({
+			if (index > 0) await this.waitBetweenSendMany(combinedSignal.signal);
+			if (closed) return;
+			const promise = this.send(next.value, sendOptions).then((receipt) => ({
 				index,
 				successful: true,
 				receipt
@@ -199,12 +218,19 @@ var RetryTransport = class {
 			}));
 			inFlight.set(index, promise);
 		};
-		const launchAvailable = async () => {
-			while (!inputDone && inFlight.size < this.config.sendMany.maxConcurrent) await launchNext();
+		const startLaunch = () => {
+			if (launchPromise != null || inputDone || inFlight.size >= this.config.sendMany.maxConcurrent) return;
+			launchPromise = launchNext().catch((error) => {
+				launchError = error;
+				hasLaunchError = true;
+			}).finally(() => {
+				launchPromise = void 0;
+			});
 		};
 		try {
-			await launchAvailable();
-			while (inFlight.size > 0 || completed.has(nextYieldIndex)) {
+			startLaunch();
+			while (inFlight.size > 0 || completed.has(nextYieldIndex) || launchPromise != null || !inputDone) {
+				if (hasLaunchError) throw launchError;
 				while (completed.has(nextYieldIndex)) {
 					const result$1 = completed.get(nextYieldIndex);
 					completed.delete(nextYieldIndex);
@@ -212,16 +238,33 @@ var RetryTransport = class {
 					if (!result$1.successful) throw result$1.error;
 					yield result$1.receipt;
 					nextYieldIndex++;
-					await launchAvailable();
+					startLaunch();
 				}
-				if (inFlight.size <= 0) break;
-				const result = await Promise.race(inFlight.values());
+				startLaunch();
+				if (inFlight.size <= 0 && launchPromise == null) break;
+				const launch = launchPromise?.then(() => ({ launched: true }));
+				const result = await Promise.race([...inFlight.values(), ...launch == null ? [] : [launch]]);
+				if ("launched" in result) continue;
 				inFlight.delete(result.index);
 				completed.set(result.index, result);
-				if (result.index !== nextYieldIndex) await launchAvailable();
+				startLaunch();
 			}
+			if (hasLaunchError) throw launchError;
 		} finally {
-			if (!inputDone) await iterator.return?.();
+			closed = true;
+			controller.abort(new DOMException("The operation was aborted.", "AbortError"));
+			launchPromise?.catch(() => {});
+			try {
+				const closeIterator = async () => {
+					if (!inputDone) await iterator.return?.();
+				};
+				if (pullingInput) launchPromise?.finally(() => {
+					closeIterator().catch(() => {});
+				});
+				else await closeIterator();
+			} finally {
+				combinedSignal.cleanup();
+			}
 		}
 	}
 	/**
@@ -256,32 +299,47 @@ var RetryTransport = class {
 		};
 	}
 	shouldRetryReceipt(receipt) {
-		if (this.config.shouldRetry != null) return this.config.shouldRetry(receipt);
+		const shouldRetry = this.config.shouldRetry;
+		if (shouldRetry != null) return shouldRetry({
+			kind: "receipt",
+			receipt
+		});
 		if (receipt.retryable != null) return receipt.retryable;
 		return this.hasRetryableError(receipt.errors);
 	}
 	shouldRetryError(error) {
-		if (this.config.shouldRetry != null) return this.config.shouldRetry(error);
+		const receiptError = toReceiptError(error);
+		const shouldRetry = this.config.shouldRetry;
+		if (shouldRetry != null) return shouldRetry({
+			kind: "error",
+			error,
+			receiptError
+		});
+		if (receiptError != null) return receiptError.retryable;
+		if (error instanceof Error && error.name === "AbortError") return true;
 		return (0, __upyo_core.classifyReceiptError)(error).retryable;
 	}
 	hasRetryableError(errors) {
 		return errors?.some((error) => error.retryable) ?? false;
 	}
-	calculateDelay(attempt, receipt) {
-		const retryAfterMilliseconds = getRetryAfterMilliseconds(receipt);
+	calculateDelay(attempt, failure) {
+		const retryAfterMilliseconds = getRetryAfterMilliseconds(failure);
 		const cappedRetryAfter = retryAfterMilliseconds == null ? void 0 : Math.min(retryAfterMilliseconds, this.config.backoff.maxDelayMilliseconds);
 		if (cappedRetryAfter != null) return cappedRetryAfter;
 		const computedDelay = Math.min(this.config.backoff.baseDelayMilliseconds * Math.pow(this.config.backoff.factor, attempt - 1), this.config.backoff.maxDelayMilliseconds);
 		if (this.config.jitter === false || this.config.jitter === "none") return computedDelay;
-		return Math.floor(this.config.random() * computedDelay);
+		const random = this.config.random;
+		return Math.floor(random() * computedDelay);
 	}
 	waitBeforeRetry(context, signal) {
-		return this.config.wait(context, signal);
+		const wait = this.config.wait;
+		return wait(context, signal);
 	}
 	waitBetweenSendMany(signal) {
 		const delayMilliseconds = this.config.sendMany.intervalMilliseconds;
 		if (delayMilliseconds <= 0) return Promise.resolve();
-		return this.config.wait({
+		const wait = this.config.wait;
+		return wait({
 			attempt: 0,
 			nextAttempt: 0,
 			maxAttempts: this.config.maxAttempts,
@@ -290,6 +348,11 @@ var RetryTransport = class {
 		}, signal);
 	}
 	createThrownFailure(error, attempts) {
+		const receiptError = toReceiptError(error);
+		if (receiptError != null) return (0, __upyo_core.createFailedReceipt)(receiptError, {
+			provider: receiptError.provider ?? this.id,
+			attempts
+		});
 		const message = error instanceof Error ? error.message : String(error);
 		const classification = (0, __upyo_core.classifyReceiptError)(error);
 		return (0, __upyo_core.createFailedReceipt)((0, __upyo_core.createReceiptError)(message, {
@@ -315,13 +378,20 @@ var RetryTransport = class {
 function createRetryTransport(baseTransport, config = {}) {
 	return new RetryTransport(baseTransport, config);
 }
-function getRetryAfterMilliseconds(receipt) {
-	const receiptDelay = receipt?.errors?.map((error) => error.retryAfterMilliseconds).find((delay) => delay != null);
-	return receiptDelay;
+function getRetryAfterMilliseconds(failure) {
+	if (failure == null) return void 0;
+	if (isReceiptError(failure)) return failure.retryAfterMilliseconds;
+	return failure.errors?.find((error) => error.retryAfterMilliseconds != null)?.retryAfterMilliseconds;
 }
 async function* toAsyncIterator(values) {
 	for await (const value of values) yield value;
 }
+function toReceiptError(value) {
+	return isReceiptError(value) ? value : void 0;
+}
+function isReceiptError(value) {
+	return typeof value === "object" && value != null && typeof value.message === "string" && typeof value.code === "string" && typeof value.category === "string" && typeof value.retryable === "boolean";
+}
 
 //#endregion
 exports.RetryTransport = RetryTransport;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Message, Receipt, Transport, TransportOptions } from "@upyo/core";
+import { Message, Receipt, ReceiptError, Transport, TransportOptions } from "@upyo/core";
 
 //#region src/config.d.ts
 
@@ -80,16 +80,29 @@ interface DelayContext<TProviderId extends string = string> {
  * @since 0.5.0
  */
 type WaitFunction<TProviderId extends string = string> = (context: DelayContext<TProviderId>, signal?: AbortSignal) => Promise<void>;
+/**
+ * Failure passed to a custom retry classifier.
+ *
+ * @since 0.5.0
+ */
+type RetryFailure<TProviderId extends string = string> = {
+  readonly kind: "receipt";
+  readonly receipt: Receipt<TProviderId> & {
+    readonly successful: false;
+  };
+} | {
+  readonly kind: "error";
+  readonly error: unknown;
+  readonly receiptError?: ReceiptError<TProviderId>;
+};
 /**
  * Function that decides whether a failure should be retried.
  *
- * @param failure Failed receipt or thrown error.
+ * @param failure Failed receipt or thrown error metadata.
  * @returns Whether another attempt should be made.
  * @since 0.5.0
  */
-type RetryClassifier<TProviderId extends string = string> = (failure: (Receipt<TProviderId> & {
-  readonly successful: false;
-}) | unknown) => boolean;
+type RetryClassifier<TProviderId extends string = string> = (failure: RetryFailure<TProviderId>) => boolean;
 /**
  * Retry behavior for `sendMany()`.
  *
@@ -243,4 +256,4 @@ declare class RetryTransport<TProviderId extends string = string> implements Tra
  */
 declare function createRetryTransport<TProviderId extends string = string>(baseTransport: Transport<TProviderId>, config?: RetryConfig<TProviderId>): RetryTransport<TProviderId>;
 //#endregion
-export { BackoffConfig, DelayContext, JitterConfig, RetryClassifier, RetryConfig, RetryTransport, SendManyRetryConfig, WaitFunction, createRetryTransport };
+export { BackoffConfig, DelayContext, JitterConfig, RetryClassifier, RetryConfig, RetryFailure, RetryTransport, SendManyRetryConfig, WaitFunction, createRetryTransport };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Message, Receipt, Transport, TransportOptions } from "@upyo/core";
+import { Message, Receipt, ReceiptError, Transport, TransportOptions } from "@upyo/core";
 
 //#region src/config.d.ts
 
@@ -80,16 +80,29 @@ interface DelayContext<TProviderId extends string = string> {
  * @since 0.5.0
  */
 type WaitFunction<TProviderId extends string = string> = (context: DelayContext<TProviderId>, signal?: AbortSignal) => Promise<void>;
+/**
+ * Failure passed to a custom retry classifier.
+ *
+ * @since 0.5.0
+ */
+type RetryFailure<TProviderId extends string = string> = {
+  readonly kind: "receipt";
+  readonly receipt: Receipt<TProviderId> & {
+    readonly successful: false;
+  };
+} | {
+  readonly kind: "error";
+  readonly error: unknown;
+  readonly receiptError?: ReceiptError<TProviderId>;
+};
 /**
  * Function that decides whether a failure should be retried.
  *
- * @param failure Failed receipt or thrown error.
+ * @param failure Failed receipt or thrown error metadata.
  * @returns Whether another attempt should be made.
  * @since 0.5.0
  */
-type RetryClassifier<TProviderId extends string = string> = (failure: (Receipt<TProviderId> & {
-  readonly successful: false;
-}) | unknown) => boolean;
+type RetryClassifier<TProviderId extends string = string> = (failure: RetryFailure<TProviderId>) => boolean;
 /**
  * Retry behavior for `sendMany()`.
  *
@@ -243,4 +256,4 @@ declare class RetryTransport<TProviderId extends string = string> implements Tra
  */
 declare function createRetryTransport<TProviderId extends string = string>(baseTransport: Transport<TProviderId>, config?: RetryConfig<TProviderId>): RetryTransport<TProviderId>;
 //#endregion
-export { BackoffConfig, DelayContext, JitterConfig, RetryClassifier, RetryConfig, RetryTransport, SendManyRetryConfig, WaitFunction, createRetryTransport };
+export { BackoffConfig, DelayContext, JitterConfig, RetryClassifier, RetryConfig, RetryFailure, RetryTransport, SendManyRetryConfig, WaitFunction, createRetryTransport };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { classifyReceiptError, createFailedReceipt, createReceiptError } from "@upyo/core";
+import { classifyReceiptError, combineSignals, createFailedReceipt, createReceiptError } from "@upyo/core";
 
 //#region src/config.ts
 /**
@@ -51,7 +51,7 @@ async function defaultWait(context, signal) {
 		const abort = () => {
 			clearTimeout(timeout);
 			cleanup();
-			reject(createAbortError());
+			reject(signal?.reason ?? createAbortError());
 		};
 		if (signal?.aborted) {
 			abort();
@@ -130,7 +130,7 @@ var RetryTransport = class {
 					attempt,
 					nextAttempt: attempt + 1,
 					maxAttempts: this.config.maxAttempts,
-					delayMilliseconds: this.calculateDelay(attempt),
+					delayMilliseconds: this.calculateDelay(attempt, toReceiptError(error)),
 					error,
 					reason: "retry"
 				}, options?.signal);
@@ -155,17 +155,36 @@ var RetryTransport = class {
 		let inputDone = false;
 		let nextLaunchIndex = 0;
 		let nextYieldIndex = 0;
+		let launchPromise;
+		let launchError;
+		let hasLaunchError = false;
+		let pullingInput = false;
+		let closed = false;
+		const controller = new AbortController();
+		const combinedSignal = combineSignals(controller.signal, options?.signal);
+		const sendOptions = {
+			...options,
+			signal: combinedSignal.signal
+		};
 		const launchNext = async () => {
 			if (inputDone) return;
-			options?.signal?.throwIfAborted();
-			const next = await iterator.next();
+			combinedSignal.signal.throwIfAborted();
+			pullingInput = true;
+			let next;
+			try {
+				next = await iterator.next();
+			} finally {
+				pullingInput = false;
+			}
+			if (closed) return;
 			if (next.done) {
 				inputDone = true;
 				return;
 			}
 			const index = nextLaunchIndex++;
-			if (index > 0) await this.waitBetweenSendMany(options?.signal);
-			const promise = this.send(next.value, options).then((receipt) => ({
+			if (index > 0) await this.waitBetweenSendMany(combinedSignal.signal);
+			if (closed) return;
+			const promise = this.send(next.value, sendOptions).then((receipt) => ({
 				index,
 				successful: true,
 				receipt
@@ -176,12 +195,19 @@ var RetryTransport = class {
 			}));
 			inFlight.set(index, promise);
 		};
-		const launchAvailable = async () => {
-			while (!inputDone && inFlight.size < this.config.sendMany.maxConcurrent) await launchNext();
+		const startLaunch = () => {
+			if (launchPromise != null || inputDone || inFlight.size >= this.config.sendMany.maxConcurrent) return;
+			launchPromise = launchNext().catch((error) => {
+				launchError = error;
+				hasLaunchError = true;
+			}).finally(() => {
+				launchPromise = void 0;
+			});
 		};
 		try {
-			await launchAvailable();
-			while (inFlight.size > 0 || completed.has(nextYieldIndex)) {
+			startLaunch();
+			while (inFlight.size > 0 || completed.has(nextYieldIndex) || launchPromise != null || !inputDone) {
+				if (hasLaunchError) throw launchError;
 				while (completed.has(nextYieldIndex)) {
 					const result$1 = completed.get(nextYieldIndex);
 					completed.delete(nextYieldIndex);
@@ -189,16 +215,33 @@ var RetryTransport = class {
 					if (!result$1.successful) throw result$1.error;
 					yield result$1.receipt;
 					nextYieldIndex++;
-					await launchAvailable();
+					startLaunch();
 				}
-				if (inFlight.size <= 0) break;
-				const result = await Promise.race(inFlight.values());
+				startLaunch();
+				if (inFlight.size <= 0 && launchPromise == null) break;
+				const launch = launchPromise?.then(() => ({ launched: true }));
+				const result = await Promise.race([...inFlight.values(), ...launch == null ? [] : [launch]]);
+				if ("launched" in result) continue;
 				inFlight.delete(result.index);
 				completed.set(result.index, result);
-				if (result.index !== nextYieldIndex) await launchAvailable();
+				startLaunch();
 			}
+			if (hasLaunchError) throw launchError;
 		} finally {
-			if (!inputDone) await iterator.return?.();
+			closed = true;
+			controller.abort(new DOMException("The operation was aborted.", "AbortError"));
+			launchPromise?.catch(() => {});
+			try {
+				const closeIterator = async () => {
+					if (!inputDone) await iterator.return?.();
+				};
+				if (pullingInput) launchPromise?.finally(() => {
+					closeIterator().catch(() => {});
+				});
+				else await closeIterator();
+			} finally {
+				combinedSignal.cleanup();
+			}
 		}
 	}
 	/**
@@ -233,32 +276,47 @@ var RetryTransport = class {
 		};
 	}
 	shouldRetryReceipt(receipt) {
-		if (this.config.shouldRetry != null) return this.config.shouldRetry(receipt);
+		const shouldRetry = this.config.shouldRetry;
+		if (shouldRetry != null) return shouldRetry({
+			kind: "receipt",
+			receipt
+		});
 		if (receipt.retryable != null) return receipt.retryable;
 		return this.hasRetryableError(receipt.errors);
 	}
 	shouldRetryError(error) {
-		if (this.config.shouldRetry != null) return this.config.shouldRetry(error);
+		const receiptError = toReceiptError(error);
+		const shouldRetry = this.config.shouldRetry;
+		if (shouldRetry != null) return shouldRetry({
+			kind: "error",
+			error,
+			receiptError
+		});
+		if (receiptError != null) return receiptError.retryable;
+		if (error instanceof Error && error.name === "AbortError") return true;
 		return classifyReceiptError(error).retryable;
 	}
 	hasRetryableError(errors) {
 		return errors?.some((error) => error.retryable) ?? false;
 	}
-	calculateDelay(attempt, receipt) {
-		const retryAfterMilliseconds = getRetryAfterMilliseconds(receipt);
+	calculateDelay(attempt, failure) {
+		const retryAfterMilliseconds = getRetryAfterMilliseconds(failure);
 		const cappedRetryAfter = retryAfterMilliseconds == null ? void 0 : Math.min(retryAfterMilliseconds, this.config.backoff.maxDelayMilliseconds);
 		if (cappedRetryAfter != null) return cappedRetryAfter;
 		const computedDelay = Math.min(this.config.backoff.baseDelayMilliseconds * Math.pow(this.config.backoff.factor, attempt - 1), this.config.backoff.maxDelayMilliseconds);
 		if (this.config.jitter === false || this.config.jitter === "none") return computedDelay;
-		return Math.floor(this.config.random() * computedDelay);
+		const random = this.config.random;
+		return Math.floor(random() * computedDelay);
 	}
 	waitBeforeRetry(context, signal) {
-		return this.config.wait(context, signal);
+		const wait = this.config.wait;
+		return wait(context, signal);
 	}
 	waitBetweenSendMany(signal) {
 		const delayMilliseconds = this.config.sendMany.intervalMilliseconds;
 		if (delayMilliseconds <= 0) return Promise.resolve();
-		return this.config.wait({
+		const wait = this.config.wait;
+		return wait({
 			attempt: 0,
 			nextAttempt: 0,
 			maxAttempts: this.config.maxAttempts,
@@ -267,6 +325,11 @@ var RetryTransport = class {
 		}, signal);
 	}
 	createThrownFailure(error, attempts) {
+		const receiptError = toReceiptError(error);
+		if (receiptError != null) return createFailedReceipt(receiptError, {
+			provider: receiptError.provider ?? this.id,
+			attempts
+		});
 		const message = error instanceof Error ? error.message : String(error);
 		const classification = classifyReceiptError(error);
 		return createFailedReceipt(createReceiptError(message, {
@@ -292,13 +355,20 @@ var RetryTransport = class {
 function createRetryTransport(baseTransport, config = {}) {
 	return new RetryTransport(baseTransport, config);
 }
-function getRetryAfterMilliseconds(receipt) {
-	const receiptDelay = receipt?.errors?.map((error) => error.retryAfterMilliseconds).find((delay) => delay != null);
-	return receiptDelay;
+function getRetryAfterMilliseconds(failure) {
+	if (failure == null) return void 0;
+	if (isReceiptError(failure)) return failure.retryAfterMilliseconds;
+	return failure.errors?.find((error) => error.retryAfterMilliseconds != null)?.retryAfterMilliseconds;
 }
 async function* toAsyncIterator(values) {
 	for await (const value of values) yield value;
 }
+function toReceiptError(value) {
+	return isReceiptError(value) ? value : void 0;
+}
+function isReceiptError(value) {
+	return typeof value === "object" && value != null && typeof value.message === "string" && typeof value.code === "string" && typeof value.category === "string" && typeof value.retryable === "boolean";
+}
 
 //#endregion
 export { RetryTransport, createRetryTransport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/retry",
-  "version": "0.5.0-dev.0",
+  "version": "0.5.0-dev.193",
   "description": "Retry and backoff decorator transport for Upyo email library",
   "keywords": [
     "email",
@@ -54,7 +54,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.5.0"
+    "@upyo/core": "0.5.0-dev.193+eb1e84b9"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",