@upyo/retry 0.5.0-dev.197 → 0.5.0-dev.199

package/dist/index.cjs

@@ -113,6 +113,7 @@ var RetryTransport = class {
 	* @param transport The transport to wrap.
 	* @param config Retry configuration.
 	* @throws {RangeError} If retry configuration is invalid.
+	* @since 0.5.0
 	*/
 	constructor(transport, config = {}) {
 		this.wrappedTransport = transport;
@@ -126,25 +127,16 @@ var RetryTransport = class {
 	* @param options Optional transport options.
 	* @returns The final delivery receipt.
 	* @throws {DOMException} If the operation is aborted.
+	* @since 0.5.0
 	*/
 	async send(message, options) {
 		options?.signal?.throwIfAborted();
 		let lastThrownError;
 		for (let attempt = 1; attempt <= this.config.maxAttempts; attempt++) {
 			options?.signal?.throwIfAborted();
+			let receipt;
 			try {
-				const receipt = await this.wrappedTransport.send(message, options);
-				if (receipt.successful) return this.withSuccessMetadata(receipt, attempt);
-				const failedReceipt = this.withFailureMetadata(receipt, attempt);
-				if (attempt >= this.config.maxAttempts || !this.shouldRetryReceipt(failedReceipt)) return failedReceipt;
-				await this.waitBeforeRetry({
-					attempt,
-					nextAttempt: attempt + 1,
-					maxAttempts: this.config.maxAttempts,
-					delayMilliseconds: this.calculateDelay(attempt, failedReceipt),
-					receipt: failedReceipt,
-					reason: "retry"
-				}, options?.signal);
+				receipt = await this.wrappedTransport.send(message, options);
 			} catch (error) {
 				options?.signal?.throwIfAborted();
 				lastThrownError = error;
@@ -157,7 +149,20 @@ var RetryTransport = class {
 					error,
 					reason: "retry"
 				}, options?.signal);
+				continue;
 			}
+			options?.signal?.throwIfAborted();
+			if (receipt.successful) return this.withSuccessMetadata(receipt, attempt);
+			const failedReceipt = this.withFailureMetadata(receipt, attempt);
+			if (attempt >= this.config.maxAttempts || !this.shouldRetryReceipt(failedReceipt)) return failedReceipt;
+			await this.waitBeforeRetry({
+				attempt,
+				nextAttempt: attempt + 1,
+				maxAttempts: this.config.maxAttempts,
+				delayMilliseconds: this.calculateDelay(attempt, failedReceipt),
+				receipt: failedReceipt,
+				reason: "retry"
+			}, options?.signal);
 		}
 		return this.createThrownFailure(lastThrownError, this.config.maxAttempts);
 	}
@@ -170,6 +175,7 @@ var RetryTransport = class {
 	* @param options Optional transport options.
 	* @returns An async iterable of receipts.
 	* @throws {DOMException} If the operation is aborted.
+	* @since 0.5.0
 	*/
 	async *sendMany(messages, options) {
 		const iterator = toAsyncIterator(messages);
@@ -193,12 +199,16 @@ var RetryTransport = class {
 			if (inputDone) return;
 			combinedSignal.signal.throwIfAborted();
 			pullingInput = true;
-			let next;
+			let inputPull;
 			try {
-				next = await iterator.next();
-			} finally {
-				pullingInput = false;
+				inputPull = Promise.resolve(iterator.next());
+			} catch (error) {
+				inputPull = Promise.reject(error);
 			}
+			inputPull = inputPull.finally(() => {
+				pullingInput = false;
+			});
+			const next = await raceWithAbort(inputPull, combinedSignal.signal);
 			if (closed) return;
 			if (next.done) {
 				inputDone = true;
@@ -323,7 +333,7 @@ var RetryTransport = class {
 	}
 	calculateDelay(attempt, failure) {
 		const retryAfterMilliseconds = getRetryAfterMilliseconds(failure);
-		const cappedRetryAfter = retryAfterMilliseconds == null ? void 0 : Math.min(retryAfterMilliseconds, this.config.backoff.maxDelayMilliseconds);
+		const cappedRetryAfter = retryAfterMilliseconds == null || !Number.isFinite(retryAfterMilliseconds) || retryAfterMilliseconds <= 0 ? 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;
@@ -390,17 +400,37 @@ function toAsyncIterator(values) {
 	if (Symbol.asyncIterator in values) return values[Symbol.asyncIterator]();
 	const iterator = values[Symbol.iterator]();
 	return {
-		next() {
-			return Promise.resolve(iterator.next());
+		async next() {
+			return await Promise.resolve(iterator.next());
 		},
-		return(value) {
-			return Promise.resolve(iterator.return?.(value) ?? {
+		async return(value) {
+			return await Promise.resolve(iterator.return?.(value) ?? {
 				done: true,
 				value
 			});
 		}
 	};
 }
+function raceWithAbort(promise, signal) {
+	if (signal.aborted) return Promise.reject(signal.reason);
+	return new Promise((resolve, reject) => {
+		const abort = () => {
+			cleanup();
+			reject(signal.reason);
+		};
+		const cleanup = () => {
+			signal.removeEventListener("abort", abort);
+		};
+		signal.addEventListener("abort", abort, { once: true });
+		promise.then((value) => {
+			cleanup();
+			resolve(value);
+		}, (error) => {
+			cleanup();
+			reject(error);
+		});
+	});
+}
 function toReceiptError(value) {
 	return isReceiptError(value) ? value : void 0;
 }

package/dist/index.d.cts

@@ -207,6 +207,7 @@ declare class RetryTransport<TProviderId extends string = string> implements Tra
    * @param transport The transport to wrap.
    * @param config Retry configuration.
    * @throws {RangeError} If retry configuration is invalid.
+   * @since 0.5.0
    */
   constructor(transport: Transport<TProviderId>, config?: RetryConfig<TProviderId>);
   /**
@@ -216,6 +217,7 @@ declare class RetryTransport<TProviderId extends string = string> implements Tra
    * @param options Optional transport options.
    * @returns The final delivery receipt.
    * @throws {DOMException} If the operation is aborted.
+   * @since 0.5.0
    */
   send(message: Message, options?: TransportOptions): Promise<Receipt<TProviderId>>;
   /**
@@ -227,6 +229,7 @@ declare class RetryTransport<TProviderId extends string = string> implements Tra
    * @param options Optional transport options.
    * @returns An async iterable of receipts.
    * @throws {DOMException} If the operation is aborted.
+   * @since 0.5.0
    */
   sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt<TProviderId>>;
   /**

package/dist/index.d.ts

@@ -207,6 +207,7 @@ declare class RetryTransport<TProviderId extends string = string> implements Tra
    * @param transport The transport to wrap.
    * @param config Retry configuration.
    * @throws {RangeError} If retry configuration is invalid.
+   * @since 0.5.0
    */
   constructor(transport: Transport<TProviderId>, config?: RetryConfig<TProviderId>);
   /**
@@ -216,6 +217,7 @@ declare class RetryTransport<TProviderId extends string = string> implements Tra
    * @param options Optional transport options.
    * @returns The final delivery receipt.
    * @throws {DOMException} If the operation is aborted.
+   * @since 0.5.0
    */
   send(message: Message, options?: TransportOptions): Promise<Receipt<TProviderId>>;
   /**
@@ -227,6 +229,7 @@ declare class RetryTransport<TProviderId extends string = string> implements Tra
    * @param options Optional transport options.
    * @returns An async iterable of receipts.
    * @throws {DOMException} If the operation is aborted.
+   * @since 0.5.0
    */
   sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt<TProviderId>>;
   /**

package/dist/index.js

@@ -90,6 +90,7 @@ var RetryTransport = class {
 	* @param transport The transport to wrap.
 	* @param config Retry configuration.
 	* @throws {RangeError} If retry configuration is invalid.
+	* @since 0.5.0
 	*/
 	constructor(transport, config = {}) {
 		this.wrappedTransport = transport;
@@ -103,25 +104,16 @@ var RetryTransport = class {
 	* @param options Optional transport options.
 	* @returns The final delivery receipt.
 	* @throws {DOMException} If the operation is aborted.
+	* @since 0.5.0
 	*/
 	async send(message, options) {
 		options?.signal?.throwIfAborted();
 		let lastThrownError;
 		for (let attempt = 1; attempt <= this.config.maxAttempts; attempt++) {
 			options?.signal?.throwIfAborted();
+			let receipt;
 			try {
-				const receipt = await this.wrappedTransport.send(message, options);
-				if (receipt.successful) return this.withSuccessMetadata(receipt, attempt);
-				const failedReceipt = this.withFailureMetadata(receipt, attempt);
-				if (attempt >= this.config.maxAttempts || !this.shouldRetryReceipt(failedReceipt)) return failedReceipt;
-				await this.waitBeforeRetry({
-					attempt,
-					nextAttempt: attempt + 1,
-					maxAttempts: this.config.maxAttempts,
-					delayMilliseconds: this.calculateDelay(attempt, failedReceipt),
-					receipt: failedReceipt,
-					reason: "retry"
-				}, options?.signal);
+				receipt = await this.wrappedTransport.send(message, options);
 			} catch (error) {
 				options?.signal?.throwIfAborted();
 				lastThrownError = error;
@@ -134,7 +126,20 @@ var RetryTransport = class {
 					error,
 					reason: "retry"
 				}, options?.signal);
+				continue;
 			}
+			options?.signal?.throwIfAborted();
+			if (receipt.successful) return this.withSuccessMetadata(receipt, attempt);
+			const failedReceipt = this.withFailureMetadata(receipt, attempt);
+			if (attempt >= this.config.maxAttempts || !this.shouldRetryReceipt(failedReceipt)) return failedReceipt;
+			await this.waitBeforeRetry({
+				attempt,
+				nextAttempt: attempt + 1,
+				maxAttempts: this.config.maxAttempts,
+				delayMilliseconds: this.calculateDelay(attempt, failedReceipt),
+				receipt: failedReceipt,
+				reason: "retry"
+			}, options?.signal);
 		}
 		return this.createThrownFailure(lastThrownError, this.config.maxAttempts);
 	}
@@ -147,6 +152,7 @@ var RetryTransport = class {
 	* @param options Optional transport options.
 	* @returns An async iterable of receipts.
 	* @throws {DOMException} If the operation is aborted.
+	* @since 0.5.0
 	*/
 	async *sendMany(messages, options) {
 		const iterator = toAsyncIterator(messages);
@@ -170,12 +176,16 @@ var RetryTransport = class {
 			if (inputDone) return;
 			combinedSignal.signal.throwIfAborted();
 			pullingInput = true;
-			let next;
+			let inputPull;
 			try {
-				next = await iterator.next();
-			} finally {
-				pullingInput = false;
+				inputPull = Promise.resolve(iterator.next());
+			} catch (error) {
+				inputPull = Promise.reject(error);
 			}
+			inputPull = inputPull.finally(() => {
+				pullingInput = false;
+			});
+			const next = await raceWithAbort(inputPull, combinedSignal.signal);
 			if (closed) return;
 			if (next.done) {
 				inputDone = true;
@@ -300,7 +310,7 @@ var RetryTransport = class {
 	}
 	calculateDelay(attempt, failure) {
 		const retryAfterMilliseconds = getRetryAfterMilliseconds(failure);
-		const cappedRetryAfter = retryAfterMilliseconds == null ? void 0 : Math.min(retryAfterMilliseconds, this.config.backoff.maxDelayMilliseconds);
+		const cappedRetryAfter = retryAfterMilliseconds == null || !Number.isFinite(retryAfterMilliseconds) || retryAfterMilliseconds <= 0 ? 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;
@@ -367,17 +377,37 @@ function toAsyncIterator(values) {
 	if (Symbol.asyncIterator in values) return values[Symbol.asyncIterator]();
 	const iterator = values[Symbol.iterator]();
 	return {
-		next() {
-			return Promise.resolve(iterator.next());
+		async next() {
+			return await Promise.resolve(iterator.next());
 		},
-		return(value) {
-			return Promise.resolve(iterator.return?.(value) ?? {
+		async return(value) {
+			return await Promise.resolve(iterator.return?.(value) ?? {
 				done: true,
 				value
 			});
 		}
 	};
 }
+function raceWithAbort(promise, signal) {
+	if (signal.aborted) return Promise.reject(signal.reason);
+	return new Promise((resolve, reject) => {
+		const abort = () => {
+			cleanup();
+			reject(signal.reason);
+		};
+		const cleanup = () => {
+			signal.removeEventListener("abort", abort);
+		};
+		signal.addEventListener("abort", abort, { once: true });
+		promise.then((value) => {
+			cleanup();
+			resolve(value);
+		}, (error) => {
+			cleanup();
+			reject(error);
+		});
+	});
+}
 function toReceiptError(value) {
 	return isReceiptError(value) ? value : void 0;
 }

package/package.json

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