@upyo/resend 0.5.0-dev.154 → 0.5.0-dev.158

package/dist/index.cjs

@@ -185,38 +185,45 @@ var ResendHttpClient = class {
 		for (const [key, value] of Object.entries(this.config.headers)) headers.set(key, value);
 		const controller = new AbortController();
 		const timeoutId = setTimeout(() => controller.abort(), this.config.timeout);
-		let signal;
-		let cleanup = () => {};
-		if (options.signal) {
-			const combinedController = new AbortController();
-			const onAbort = () => combinedController.abort();
-			if (options.signal.aborted || controller.signal.aborted) combinedController.abort();
-			else {
-				options.signal.addEventListener("abort", onAbort, { once: true });
-				controller.signal.addEventListener("abort", onAbort, { once: true });
-			}
-			cleanup = () => {
-				options.signal?.removeEventListener("abort", onAbort);
-				controller.signal.removeEventListener("abort", onAbort);
-			};
-			signal = combinedController.signal;
-		} else signal = controller.signal;
+		const combinedSignal = combineSignals(controller.signal, options.signal);
 		try {
 			const response = await fetch(url, {
 				...options,
 				headers,
-				signal
+				signal: combinedSignal.signal
 			});
 			return response;
 		} catch (error) {
 			if (isAbortError$1(error) && controller.signal.aborted && !options.signal?.aborted) throw new Error(`Resend API request timed out after ${this.config.timeout} ms.`);
 			throw error;
 		} finally {
-			cleanup();
+			combinedSignal.cleanup();
 			clearTimeout(timeoutId);
 		}
 	}
 };
+function combineSignals(timeoutSignal, externalSignal) {
+	if (externalSignal == null) return {
+		signal: timeoutSignal,
+		cleanup: () => {}
+	};
+	if (typeof AbortSignal.any === "function") return {
+		signal: AbortSignal.any([timeoutSignal, externalSignal]),
+		cleanup: () => {}
+	};
+	const controller = new AbortController();
+	const abort = () => controller.abort();
+	timeoutSignal.addEventListener("abort", abort, { once: true });
+	externalSignal.addEventListener("abort", abort, { once: true });
+	if (timeoutSignal.aborted || externalSignal.aborted) controller.abort();
+	return {
+		signal: controller.signal,
+		cleanup: () => {
+			timeoutSignal.removeEventListener("abort", abort);
+			externalSignal.removeEventListener("abort", abort);
+		}
+	};
+}
 function isAbortError$1(error) {
 	return error instanceof Error && error.name === "AbortError";
 }

package/dist/index.js

@@ -162,38 +162,45 @@ var ResendHttpClient = class {
 		for (const [key, value] of Object.entries(this.config.headers)) headers.set(key, value);
 		const controller = new AbortController();
 		const timeoutId = setTimeout(() => controller.abort(), this.config.timeout);
-		let signal;
-		let cleanup = () => {};
-		if (options.signal) {
-			const combinedController = new AbortController();
-			const onAbort = () => combinedController.abort();
-			if (options.signal.aborted || controller.signal.aborted) combinedController.abort();
-			else {
-				options.signal.addEventListener("abort", onAbort, { once: true });
-				controller.signal.addEventListener("abort", onAbort, { once: true });
-			}
-			cleanup = () => {
-				options.signal?.removeEventListener("abort", onAbort);
-				controller.signal.removeEventListener("abort", onAbort);
-			};
-			signal = combinedController.signal;
-		} else signal = controller.signal;
+		const combinedSignal = combineSignals(controller.signal, options.signal);
 		try {
 			const response = await fetch(url, {
 				...options,
 				headers,
-				signal
+				signal: combinedSignal.signal
 			});
 			return response;
 		} catch (error) {
 			if (isAbortError$1(error) && controller.signal.aborted && !options.signal?.aborted) throw new Error(`Resend API request timed out after ${this.config.timeout} ms.`);
 			throw error;
 		} finally {
-			cleanup();
+			combinedSignal.cleanup();
 			clearTimeout(timeoutId);
 		}
 	}
 };
+function combineSignals(timeoutSignal, externalSignal) {
+	if (externalSignal == null) return {
+		signal: timeoutSignal,
+		cleanup: () => {}
+	};
+	if (typeof AbortSignal.any === "function") return {
+		signal: AbortSignal.any([timeoutSignal, externalSignal]),
+		cleanup: () => {}
+	};
+	const controller = new AbortController();
+	const abort = () => controller.abort();
+	timeoutSignal.addEventListener("abort", abort, { once: true });
+	externalSignal.addEventListener("abort", abort, { once: true });
+	if (timeoutSignal.aborted || externalSignal.aborted) controller.abort();
+	return {
+		signal: controller.signal,
+		cleanup: () => {
+			timeoutSignal.removeEventListener("abort", abort);
+			externalSignal.removeEventListener("abort", abort);
+		}
+	};
+}
 function isAbortError$1(error) {
 	return error instanceof Error && error.name === "AbortError";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/resend",
-  "version": "0.5.0-dev.154",
+  "version": "0.5.0-dev.158",
   "description": "Resend transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.5.0-dev.154+2f72d353"
+    "@upyo/core": "0.5.0-dev.158+468b767c"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",