@upyo/sendgrid 0.5.0-dev.164 → 0.5.0-dev.168

package/dist/index.cjs

@@ -134,17 +134,18 @@ var SendGridHttpClient = 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 signal = options.signal == null ? controller.signal : AbortSignal.any([controller.signal, options.signal]);
+		const combinedSignal = combineSignals(controller.signal, options.signal);
 		try {
 			return await globalThis.fetch(url, {
 				...options,
 				headers,
-				signal
+				signal: combinedSignal.signal
 			});
 		} catch (error) {
 			if (isAbortError$1(error) && controller.signal.aborted && !options.signal?.aborted) throw new Error(`SendGrid API request timed out after ${this.config.timeout} ms.`);
 			throw error;
 		} finally {
+			combinedSignal.cleanup();
 			clearTimeout(timeoutId);
 		}
 	}
@@ -204,12 +205,12 @@ function isAbortError$1(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
 function sleep(milliseconds, signal) {
-	if (signal?.aborted) return Promise.reject(createAbortError());
+	if (signal?.aborted) return Promise.reject(createAbortError(signal));
 	return new Promise((resolve, reject) => {
 		function abort() {
 			clearTimeout(timeoutId);
 			signal?.removeEventListener("abort", abort);
-			reject(createAbortError());
+			reject(createAbortError(signal));
 		}
 		const timeoutId = setTimeout(() => {
 			signal?.removeEventListener("abort", abort);
@@ -218,8 +219,41 @@ function sleep(milliseconds, signal) {
 		signal?.addEventListener("abort", abort, { once: true });
 	});
 }
-function createAbortError() {
-	return new DOMException("The operation was aborted.", "AbortError");
+function createAbortError(signal) {
+	return signal?.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
+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 cleanup = () => {
+		timeoutSignal.removeEventListener("abort", abortFromTimeout);
+		externalSignal.removeEventListener("abort", abortFromExternal);
+	};
+	const abortFromTimeout = () => {
+		cleanup();
+		controller.abort(timeoutSignal.reason);
+	};
+	const abortFromExternal = () => {
+		cleanup();
+		controller.abort(externalSignal.reason);
+	};
+	if (timeoutSignal.aborted) controller.abort(timeoutSignal.reason);
+	else if (externalSignal.aborted) controller.abort(externalSignal.reason);
+	else {
+		timeoutSignal.addEventListener("abort", abortFromTimeout, { once: true });
+		externalSignal.addEventListener("abort", abortFromExternal, { once: true });
+	}
+	return {
+		signal: controller.signal,
+		cleanup
+	};
 }
 
 //#endregion
@@ -452,7 +486,7 @@ var SendGridTransport = class {
 				provider: "sendgrid"
 			};
 		} 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 createSendGridFailure(errorMessage, error);
 		}
@@ -548,6 +582,9 @@ function createSendGridFailure(message, error) {
 	});
 	return (0, __upyo_core.createFailedReceipt)(message, { provider: "sendgrid" });
 }
+function isCallerAbort(error, signal) {
+	return signal?.aborted === true && (isAbortError(error) || error === signal.reason);
+}
 function isAbortError(error) {
 	return error instanceof Error && error.name === "AbortError";
 }

package/dist/index.js

@@ -111,17 +111,18 @@ var SendGridHttpClient = 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 signal = options.signal == null ? controller.signal : AbortSignal.any([controller.signal, options.signal]);
+		const combinedSignal = combineSignals(controller.signal, options.signal);
 		try {
 			return await globalThis.fetch(url, {
 				...options,
 				headers,
-				signal
+				signal: combinedSignal.signal
 			});
 		} catch (error) {
 			if (isAbortError$1(error) && controller.signal.aborted && !options.signal?.aborted) throw new Error(`SendGrid API request timed out after ${this.config.timeout} ms.`);
 			throw error;
 		} finally {
+			combinedSignal.cleanup();
 			clearTimeout(timeoutId);
 		}
 	}
@@ -181,12 +182,12 @@ function isAbortError$1(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
 function sleep(milliseconds, signal) {
-	if (signal?.aborted) return Promise.reject(createAbortError());
+	if (signal?.aborted) return Promise.reject(createAbortError(signal));
 	return new Promise((resolve, reject) => {
 		function abort() {
 			clearTimeout(timeoutId);
 			signal?.removeEventListener("abort", abort);
-			reject(createAbortError());
+			reject(createAbortError(signal));
 		}
 		const timeoutId = setTimeout(() => {
 			signal?.removeEventListener("abort", abort);
@@ -195,8 +196,41 @@ function sleep(milliseconds, signal) {
 		signal?.addEventListener("abort", abort, { once: true });
 	});
 }
-function createAbortError() {
-	return new DOMException("The operation was aborted.", "AbortError");
+function createAbortError(signal) {
+	return signal?.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
+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 cleanup = () => {
+		timeoutSignal.removeEventListener("abort", abortFromTimeout);
+		externalSignal.removeEventListener("abort", abortFromExternal);
+	};
+	const abortFromTimeout = () => {
+		cleanup();
+		controller.abort(timeoutSignal.reason);
+	};
+	const abortFromExternal = () => {
+		cleanup();
+		controller.abort(externalSignal.reason);
+	};
+	if (timeoutSignal.aborted) controller.abort(timeoutSignal.reason);
+	else if (externalSignal.aborted) controller.abort(externalSignal.reason);
+	else {
+		timeoutSignal.addEventListener("abort", abortFromTimeout, { once: true });
+		externalSignal.addEventListener("abort", abortFromExternal, { once: true });
+	}
+	return {
+		signal: controller.signal,
+		cleanup
+	};
 }
 
 //#endregion
@@ -429,7 +463,7 @@ var SendGridTransport = class {
 				provider: "sendgrid"
 			};
 		} 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 createSendGridFailure(errorMessage, error);
 		}
@@ -525,6 +559,9 @@ function createSendGridFailure(message, error) {
 	});
 	return createFailedReceipt(message, { provider: "sendgrid" });
 }
+function isCallerAbort(error, signal) {
+	return signal?.aborted === true && (isAbortError(error) || error === signal.reason);
+}
 function isAbortError(error) {
 	return error instanceof Error && error.name === "AbortError";
 }

package/package.json

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