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

package/dist/index.cjs

@@ -118,6 +118,7 @@ var PlunkHttpClient = class {
 				const response = await this.makeRequest(url, emailData, signal);
 				return await this.parseResponse(response);
 			} catch (error) {
+				if (isCallerAbort$1(error, signal)) throw error;
 				lastError = error instanceof Error ? error : new Error(String(error));
 				if (error instanceof Error && error.name === "AbortError") throw error;
 				if (error instanceof PlunkApiError && error.statusCode !== void 0 && error.statusCode >= 400 && error.statusCode < 500) throw new PlunkApiError(error.message, error.statusCode, error.retryAfterMilliseconds, attempt + 1);
@@ -146,19 +147,20 @@ var PlunkHttpClient = class {
 		};
 		const timeoutController = new AbortController();
 		const timeoutId = this.config.timeout > 0 ? setTimeout(() => timeoutController.abort(), this.config.timeout) : void 0;
-		const requestSignal = signal == null ? timeoutController.signal : AbortSignal.any([timeoutController.signal, signal]);
+		const combinedSignal = combineSignals(timeoutController.signal, signal);
 		let response;
 		try {
 			response = await fetch(url, {
 				method: "POST",
 				headers,
 				body: JSON.stringify(emailData),
-				signal: requestSignal
+				signal: combinedSignal.signal
 			});
 		} catch (error) {
 			if (isAbortError$1(error) && timeoutController.signal.aborted && !signal?.aborted) throw new Error(`Plunk API request timed out after ${this.config.timeout} ms.`);
 			throw error;
 		} finally {
+			combinedSignal.cleanup();
 			if (timeoutId !== void 0) clearTimeout(timeoutId);
 		}
 		if (!response.ok) {
@@ -203,6 +205,39 @@ var PlunkHttpClient = class {
 function isAbortError$1(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
+function isCallerAbort$1(error, signal) {
+	return signal?.aborted === true && (isAbortError$1(error) || error === signal.reason);
+}
+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 truncateErrorBody(text) {
 	return text.length > 500 ? `${text.slice(0, 500)}...` : text;
 }
@@ -398,7 +433,7 @@ var PlunkTransport = class {
 				provider: "plunk"
 			};
 		} 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 createPlunkFailure(errorMessage, error);
 		}
@@ -501,6 +536,9 @@ function createPlunkFailure(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.PlunkTransport = PlunkTransport;

package/dist/index.js

@@ -95,6 +95,7 @@ var PlunkHttpClient = class {
 				const response = await this.makeRequest(url, emailData, signal);
 				return await this.parseResponse(response);
 			} catch (error) {
+				if (isCallerAbort$1(error, signal)) throw error;
 				lastError = error instanceof Error ? error : new Error(String(error));
 				if (error instanceof Error && error.name === "AbortError") throw error;
 				if (error instanceof PlunkApiError && error.statusCode !== void 0 && error.statusCode >= 400 && error.statusCode < 500) throw new PlunkApiError(error.message, error.statusCode, error.retryAfterMilliseconds, attempt + 1);
@@ -123,19 +124,20 @@ var PlunkHttpClient = class {
 		};
 		const timeoutController = new AbortController();
 		const timeoutId = this.config.timeout > 0 ? setTimeout(() => timeoutController.abort(), this.config.timeout) : void 0;
-		const requestSignal = signal == null ? timeoutController.signal : AbortSignal.any([timeoutController.signal, signal]);
+		const combinedSignal = combineSignals(timeoutController.signal, signal);
 		let response;
 		try {
 			response = await fetch(url, {
 				method: "POST",
 				headers,
 				body: JSON.stringify(emailData),
-				signal: requestSignal
+				signal: combinedSignal.signal
 			});
 		} catch (error) {
 			if (isAbortError$1(error) && timeoutController.signal.aborted && !signal?.aborted) throw new Error(`Plunk API request timed out after ${this.config.timeout} ms.`);
 			throw error;
 		} finally {
+			combinedSignal.cleanup();
 			if (timeoutId !== void 0) clearTimeout(timeoutId);
 		}
 		if (!response.ok) {
@@ -180,6 +182,39 @@ var PlunkHttpClient = class {
 function isAbortError$1(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
+function isCallerAbort$1(error, signal) {
+	return signal?.aborted === true && (isAbortError$1(error) || error === signal.reason);
+}
+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 truncateErrorBody(text) {
 	return text.length > 500 ? `${text.slice(0, 500)}...` : text;
 }
@@ -375,7 +410,7 @@ var PlunkTransport = class {
 				provider: "plunk"
 			};
 		} 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 createPlunkFailure(errorMessage, error);
 		}
@@ -478,6 +513,9 @@ function createPlunkFailure(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 { PlunkTransport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/plunk",
-  "version": "0.5.0-dev.164",
+  "version": "0.5.0-dev.168",
   "description": "Plunk 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",