@upyo/mailgun 0.5.0-dev.168 → 0.5.0-dev.170

package/dist/index.cjs

@@ -149,7 +149,7 @@ var MailgunHttpClient = 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 {
 			return await globalThis.fetch(url, {
 				...options,
@@ -220,39 +220,6 @@ function sleep(milliseconds, signal) {
 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
-	};
-}
 function truncateErrorBody(text) {
 	return text.length > 500 ? `${text.slice(0, 500)}...` : text;
 }

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
 /**
@@ -197,39 +197,6 @@ function sleep(milliseconds, signal) {
 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
-	};
-}
 function truncateErrorBody(text) {
 	return text.length > 500 ? `${text.slice(0, 500)}...` : text;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/mailgun",
-  "version": "0.5.0-dev.168",
+  "version": "0.5.0-dev.170",
   "description": "Mailgun 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.170+643994fd"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",