@upyo/resend 0.5.0-dev.168 → 0.5.0-dev.172

package/dist/index.cjs

@@ -160,7 +160,7 @@ var ResendHttpClient = class {
 				throw new Error(`Invalid JSON response from Resend API: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
 			}
 		} catch (error) {
-			if (isCallerAbort(error, options.signal)) throw error;
+			if (isCallerAbort$1(error, options.signal)) throw error;
 			lastError = error instanceof Error ? error : new Error(String(error));
 			if (error instanceof ResendApiError && error.statusCode !== void 0 && error.statusCode >= 400 && error.statusCode < 500) throw error;
 			if (error instanceof Error && error.name === "AbortError") throw error;
@@ -186,7 +186,7 @@ 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);
-		const combinedSignal = combineSignals(controller.signal, options.signal);
+		const combinedSignal = (0, __upyo_core.combineSignals)(controller.signal, options.signal);
 		try {
 			const response = await fetch(url, {
 				...options,
@@ -203,40 +203,10 @@ var ResendHttpClient = class {
 		}
 	}
 };
-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 = (signal) => {
-		controller.abort(getAbortReason(signal));
-	};
-	const abortTimeout = () => abort(timeoutSignal);
-	const abortExternal = () => abort(externalSignal);
-	timeoutSignal.addEventListener("abort", abortTimeout, { once: true });
-	externalSignal.addEventListener("abort", abortExternal, { once: true });
-	if (timeoutSignal.aborted) abortTimeout();
-	else if (externalSignal.aborted) abortExternal();
-	return {
-		signal: controller.signal,
-		cleanup: () => {
-			timeoutSignal.removeEventListener("abort", abortTimeout);
-			externalSignal.removeEventListener("abort", abortExternal);
-		}
-	};
-}
-function getAbortReason(signal) {
-	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
-}
 function isAbortError$1(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
-function isCallerAbort(error, signal) {
+function isCallerAbort$1(error, signal) {
 	return signal?.aborted === true && (isAbortError$1(error) || error === signal.reason);
 }
 function truncateErrorBody(text) {
@@ -491,7 +461,7 @@ var ResendTransport = class {
 				provider: "resend"
 			};
 		} catch (error) {
-			if (isAbortError(error) && options?.signal?.aborted) throw error;
+			if (isCallerAbort(error, options?.signal)) throw error;
 			const errorMessage = error instanceof Error ? error.message : String(error);
 			return createResendFailure(errorMessage, error);
 		}
@@ -606,7 +576,7 @@ var ResendTransport = class {
 				provider: "resend"
 			};
 		} catch (error) {
-			if (isAbortError(error) && options?.signal?.aborted) throw error;
+			if (isCallerAbort(error, options?.signal)) throw error;
 			const errorMessage = error instanceof Error ? error.message : String(error);
 			for (let i = 0; i < messages.length; i++) yield createResendFailure(errorMessage, error);
 		}
@@ -650,6 +620,9 @@ function createResendFailure(message, error) {
 function isAbortError(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
+function isCallerAbort(error, signal) {
+	return signal?.aborted === true && (isAbortError(error) || error === signal.reason);
+}
 
 //#endregion
 exports.ResendTransport = ResendTransport;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createFailedReceipt, parseRetryAfter } from "@upyo/core";
+import { combineSignals, createFailedReceipt, parseRetryAfter } from "@upyo/core";
 
 //#region src/config.ts
 /**
@@ -137,7 +137,7 @@ var ResendHttpClient = class {
 				throw new Error(`Invalid JSON response from Resend API: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
 			}
 		} catch (error) {
-			if (isCallerAbort(error, options.signal)) throw error;
+			if (isCallerAbort$1(error, options.signal)) throw error;
 			lastError = error instanceof Error ? error : new Error(String(error));
 			if (error instanceof ResendApiError && error.statusCode !== void 0 && error.statusCode >= 400 && error.statusCode < 500) throw error;
 			if (error instanceof Error && error.name === "AbortError") throw error;
@@ -180,40 +180,10 @@ var ResendHttpClient = class {
 		}
 	}
 };
-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 = (signal) => {
-		controller.abort(getAbortReason(signal));
-	};
-	const abortTimeout = () => abort(timeoutSignal);
-	const abortExternal = () => abort(externalSignal);
-	timeoutSignal.addEventListener("abort", abortTimeout, { once: true });
-	externalSignal.addEventListener("abort", abortExternal, { once: true });
-	if (timeoutSignal.aborted) abortTimeout();
-	else if (externalSignal.aborted) abortExternal();
-	return {
-		signal: controller.signal,
-		cleanup: () => {
-			timeoutSignal.removeEventListener("abort", abortTimeout);
-			externalSignal.removeEventListener("abort", abortExternal);
-		}
-	};
-}
-function getAbortReason(signal) {
-	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
-}
 function isAbortError$1(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
-function isCallerAbort(error, signal) {
+function isCallerAbort$1(error, signal) {
 	return signal?.aborted === true && (isAbortError$1(error) || error === signal.reason);
 }
 function truncateErrorBody(text) {
@@ -468,7 +438,7 @@ var ResendTransport = class {
 				provider: "resend"
 			};
 		} catch (error) {
-			if (isAbortError(error) && options?.signal?.aborted) throw error;
+			if (isCallerAbort(error, options?.signal)) throw error;
 			const errorMessage = error instanceof Error ? error.message : String(error);
 			return createResendFailure(errorMessage, error);
 		}
@@ -583,7 +553,7 @@ var ResendTransport = class {
 				provider: "resend"
 			};
 		} catch (error) {
-			if (isAbortError(error) && options?.signal?.aborted) throw error;
+			if (isCallerAbort(error, options?.signal)) throw error;
 			const errorMessage = error instanceof Error ? error.message : String(error);
 			for (let i = 0; i < messages.length; i++) yield createResendFailure(errorMessage, error);
 		}
@@ -627,6 +597,9 @@ function createResendFailure(message, error) {
 function isAbortError(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
+function isCallerAbort(error, signal) {
+	return signal?.aborted === true && (isAbortError(error) || error === signal.reason);
+}
 
 //#endregion
 export { ResendTransport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/resend",
-  "version": "0.5.0-dev.168",
+  "version": "0.5.0-dev.172",
   "description": "Resend transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.5.0-dev.168+1e808a3a"
+    "@upyo/core": "0.5.0-dev.172+1b1248e1"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",