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

package/dist/index.cjs

@@ -187,6 +187,7 @@ var RetryTransport = class {
 		let launchPromise;
 		let launchError;
 		let hasLaunchError = false;
+		let hasQueuedFailure = false;
 		let pullingInput = false;
 		let closed = false;
 		const controller = new AbortController();
@@ -229,7 +230,7 @@ var RetryTransport = class {
 			inFlight.set(index, promise);
 		};
 		const startLaunch = () => {
-			if (launchPromise != null || inputDone || hasLaunchError || inFlight.size >= this.config.sendMany.maxConcurrent) return;
+			if (launchPromise != null || inputDone || hasLaunchError || hasQueuedFailure || inFlight.size >= this.config.sendMany.maxConcurrent) return;
 			launchPromise = launchNext().catch((error) => {
 				launchError = error;
 				hasLaunchError = true;
@@ -240,6 +241,7 @@ var RetryTransport = class {
 		try {
 			startLaunch();
 			while (inFlight.size > 0 || completed.has(nextYieldIndex) || launchPromise != null || !inputDone) {
+				combinedSignal.signal.throwIfAborted();
 				while (completed.has(nextYieldIndex)) {
 					const result$1 = completed.get(nextYieldIndex);
 					completed.delete(nextYieldIndex);
@@ -253,10 +255,11 @@ var RetryTransport = class {
 				startLaunch();
 				if (inFlight.size <= 0 && launchPromise == null) break;
 				const launch = launchPromise?.then(() => ({ launched: true }));
-				const result = await Promise.race([...inFlight.values(), ...launch == null ? [] : [launch]]);
+				const result = await raceWithAbort(Promise.race([...inFlight.values(), ...launch == null ? [] : [launch]]), combinedSignal.signal);
 				if ("launched" in result) continue;
 				inFlight.delete(result.index);
 				completed.set(result.index, result);
+				if (!result.successful) hasQueuedFailure = true;
 				startLaunch();
 			}
 			if (hasLaunchError) throw launchError;
@@ -282,15 +285,20 @@ var RetryTransport = class {
 	* @since 0.5.0
 	*/
 	async [Symbol.asyncDispose]() {
-		const asyncDisposable = this.wrappedTransport;
-		const asyncDispose = asyncDisposable[Symbol.asyncDispose];
-		if (typeof asyncDispose === "function") {
-			await asyncDispose.call(asyncDisposable);
-			return;
+		const wrappedTransport = Object(this.wrappedTransport);
+		const asyncDisposeSymbol = Symbol.asyncDispose;
+		if (typeof asyncDisposeSymbol === "symbol") {
+			const asyncDispose = wrappedTransport[asyncDisposeSymbol];
+			if (typeof asyncDispose === "function") {
+				await asyncDispose.call(wrappedTransport);
+				return;
+			}
+		}
+		const disposeSymbol = Symbol.dispose;
+		if (typeof disposeSymbol === "symbol") {
+			const dispose = wrappedTransport[disposeSymbol];
+			if (typeof dispose === "function") dispose.call(wrappedTransport);
 		}
-		const disposable = this.wrappedTransport;
-		const dispose = disposable[Symbol.dispose];
-		if (typeof dispose === "function") dispose.call(disposable);
 	}
 	withSuccessMetadata(receipt, attempts) {
 		return {
@@ -333,7 +341,7 @@ var RetryTransport = class {
 	}
 	calculateDelay(attempt, failure) {
 		const retryAfterMilliseconds = getRetryAfterMilliseconds(failure);
-		const cappedRetryAfter = retryAfterMilliseconds == null || !Number.isFinite(retryAfterMilliseconds) || retryAfterMilliseconds <= 0 ? 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;
@@ -397,7 +405,8 @@ function getRetryAfterMilliseconds(failure) {
 	return failure.errors?.find((error) => error.retryAfterMilliseconds != null)?.retryAfterMilliseconds;
 }
 function toAsyncIterator(values) {
-	if (Symbol.asyncIterator in values) return values[Symbol.asyncIterator]();
+	const asyncIterator = values[Symbol.asyncIterator];
+	if (typeof asyncIterator === "function") return asyncIterator.call(values);
 	const iterator = values[Symbol.iterator]();
 	return {
 		async next() {
@@ -412,11 +421,11 @@ function toAsyncIterator(values) {
 	};
 }
 function raceWithAbort(promise, signal) {
-	if (signal.aborted) return Promise.reject(signal.reason);
+	if (signal.aborted) return Promise.reject(getAbortReason(signal));
 	return new Promise((resolve, reject) => {
 		const abort = () => {
 			cleanup();
-			reject(signal.reason);
+			reject(getAbortReason(signal));
 		};
 		const cleanup = () => {
 			signal.removeEventListener("abort", abort);
@@ -431,6 +440,9 @@ function raceWithAbort(promise, signal) {
 		});
 	});
 }
+function getAbortReason(signal) {
+	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
 function toReceiptError(value) {
 	return isReceiptError(value) ? value : void 0;
 }

package/dist/index.js

@@ -164,6 +164,7 @@ var RetryTransport = class {
 		let launchPromise;
 		let launchError;
 		let hasLaunchError = false;
+		let hasQueuedFailure = false;
 		let pullingInput = false;
 		let closed = false;
 		const controller = new AbortController();
@@ -206,7 +207,7 @@ var RetryTransport = class {
 			inFlight.set(index, promise);
 		};
 		const startLaunch = () => {
-			if (launchPromise != null || inputDone || hasLaunchError || inFlight.size >= this.config.sendMany.maxConcurrent) return;
+			if (launchPromise != null || inputDone || hasLaunchError || hasQueuedFailure || inFlight.size >= this.config.sendMany.maxConcurrent) return;
 			launchPromise = launchNext().catch((error) => {
 				launchError = error;
 				hasLaunchError = true;
@@ -217,6 +218,7 @@ var RetryTransport = class {
 		try {
 			startLaunch();
 			while (inFlight.size > 0 || completed.has(nextYieldIndex) || launchPromise != null || !inputDone) {
+				combinedSignal.signal.throwIfAborted();
 				while (completed.has(nextYieldIndex)) {
 					const result$1 = completed.get(nextYieldIndex);
 					completed.delete(nextYieldIndex);
@@ -230,10 +232,11 @@ var RetryTransport = class {
 				startLaunch();
 				if (inFlight.size <= 0 && launchPromise == null) break;
 				const launch = launchPromise?.then(() => ({ launched: true }));
-				const result = await Promise.race([...inFlight.values(), ...launch == null ? [] : [launch]]);
+				const result = await raceWithAbort(Promise.race([...inFlight.values(), ...launch == null ? [] : [launch]]), combinedSignal.signal);
 				if ("launched" in result) continue;
 				inFlight.delete(result.index);
 				completed.set(result.index, result);
+				if (!result.successful) hasQueuedFailure = true;
 				startLaunch();
 			}
 			if (hasLaunchError) throw launchError;
@@ -259,15 +262,20 @@ var RetryTransport = class {
 	* @since 0.5.0
 	*/
 	async [Symbol.asyncDispose]() {
-		const asyncDisposable = this.wrappedTransport;
-		const asyncDispose = asyncDisposable[Symbol.asyncDispose];
-		if (typeof asyncDispose === "function") {
-			await asyncDispose.call(asyncDisposable);
-			return;
+		const wrappedTransport = Object(this.wrappedTransport);
+		const asyncDisposeSymbol = Symbol.asyncDispose;
+		if (typeof asyncDisposeSymbol === "symbol") {
+			const asyncDispose = wrappedTransport[asyncDisposeSymbol];
+			if (typeof asyncDispose === "function") {
+				await asyncDispose.call(wrappedTransport);
+				return;
+			}
+		}
+		const disposeSymbol = Symbol.dispose;
+		if (typeof disposeSymbol === "symbol") {
+			const dispose = wrappedTransport[disposeSymbol];
+			if (typeof dispose === "function") dispose.call(wrappedTransport);
 		}
-		const disposable = this.wrappedTransport;
-		const dispose = disposable[Symbol.dispose];
-		if (typeof dispose === "function") dispose.call(disposable);
 	}
 	withSuccessMetadata(receipt, attempts) {
 		return {
@@ -310,7 +318,7 @@ var RetryTransport = class {
 	}
 	calculateDelay(attempt, failure) {
 		const retryAfterMilliseconds = getRetryAfterMilliseconds(failure);
-		const cappedRetryAfter = retryAfterMilliseconds == null || !Number.isFinite(retryAfterMilliseconds) || retryAfterMilliseconds <= 0 ? 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;
@@ -374,7 +382,8 @@ function getRetryAfterMilliseconds(failure) {
 	return failure.errors?.find((error) => error.retryAfterMilliseconds != null)?.retryAfterMilliseconds;
 }
 function toAsyncIterator(values) {
-	if (Symbol.asyncIterator in values) return values[Symbol.asyncIterator]();
+	const asyncIterator = values[Symbol.asyncIterator];
+	if (typeof asyncIterator === "function") return asyncIterator.call(values);
 	const iterator = values[Symbol.iterator]();
 	return {
 		async next() {
@@ -389,11 +398,11 @@ function toAsyncIterator(values) {
 	};
 }
 function raceWithAbort(promise, signal) {
-	if (signal.aborted) return Promise.reject(signal.reason);
+	if (signal.aborted) return Promise.reject(getAbortReason(signal));
 	return new Promise((resolve, reject) => {
 		const abort = () => {
 			cleanup();
-			reject(signal.reason);
+			reject(getAbortReason(signal));
 		};
 		const cleanup = () => {
 			signal.removeEventListener("abort", abort);
@@ -408,6 +417,9 @@ function raceWithAbort(promise, signal) {
 		});
 	});
 }
+function getAbortReason(signal) {
+	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
 function toReceiptError(value) {
 	return isReceiptError(value) ? value : void 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/retry",
-  "version": "0.5.0-dev.199",
+  "version": "0.5.0-dev.205",
   "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.199+f10145fc"
+    "@upyo/core": "0.5.0-dev.205+0a836319"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",