@upyo/mailgun 0.5.0-dev.87 → 0.5.0

package/dist/index.cjs

@@ -1,3 +1,27 @@
+//#region rolldown:runtime
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+
+//#endregion
+const __upyo_core = __toESM(require("@upyo/core"));
 
 //#region src/config.ts
 /**
@@ -76,6 +100,8 @@ var MailgunHttpClient = class {
 	* @param url The URL to make the request to.
 	* @param options Fetch options.
 	* @returns Promise that resolves to the parsed response.
+	* @throws {MailgunApiError} If Mailgun returns an error response or all
+	*                           retry attempts are exhausted.
 	*/
 	async makeRequest(url, options) {
 		let lastError = null;
@@ -87,7 +113,7 @@ var MailgunHttpClient = class {
 				try {
 					errorMessage = JSON.parse(text)?.message;
 				} catch {}
-				throw new MailgunApiError(errorMessage || text || `HTTP ${response.status}`, response.status);
+				throw new MailgunApiError(errorMessage || truncateErrorBody(text) || `HTTP ${response.status}`, response.status, (0, __upyo_core.parseRetryAfter)(response.headers.get("Retry-After")), attempt + 1);
 			}
 			try {
 				return JSON.parse(text);
@@ -96,10 +122,15 @@ var MailgunHttpClient = class {
 			}
 		} catch (error) {
 			lastError = error instanceof Error ? error : new Error(String(error));
+			if (options.signal?.aborted) throw createAbortError(options.signal);
+			if (isAbortError$1(error)) throw error;
 			if (error instanceof MailgunApiError && error.statusCode && error.statusCode >= 400 && error.statusCode < 500) throw error;
-			if (attempt === this.config.retries) throw error;
+			if (attempt === this.config.retries) {
+				if (lastError instanceof MailgunApiError) throw lastError;
+				throw new MailgunApiError(lastError.message, void 0, void 0, attempt + 1);
+			}
 			const delay = Math.pow(2, attempt) * 1e3;
-			await new Promise((resolve) => setTimeout(resolve, delay));
+			await sleep(delay, options.signal);
 		}
 		throw lastError || /* @__PURE__ */ new Error("Request failed after all retries");
 	}
@@ -109,6 +140,8 @@ var MailgunHttpClient = class {
 	* @param url The URL to make the request to.
 	* @param options Fetch options.
 	* @returns Promise that resolves to the fetch response.
+	* @throws {Error} If the configured request timeout is reached.
+	* @throws {DOMException} If the caller aborts the request.
 	*/
 	async fetchWithAuth(url, options) {
 		const headers = new Headers(options.headers);
@@ -117,30 +150,80 @@ 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);
-		let signal = controller.signal;
-		if (options.signal) signal = AbortSignal.any([controller.signal, options.signal]);
+		const combinedSignal = (0, __upyo_core.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(`Mailgun API request timed out after ${this.config.timeout} ms.`);
+			throw error;
 		} finally {
+			combinedSignal.cleanup();
 			clearTimeout(timeoutId);
 		}
 	}
 };
 /**
-* Custom error class for Mailgun API errors.
+* Error thrown when a Mailgun API request fails.
+*
+* @since 0.5.0
 */
 var MailgunApiError = class extends Error {
+	/**
+	* HTTP status code returned by Mailgun, if the request reached the API.
+	*/
 	statusCode;
-	constructor(message, statusCode) {
+	/**
+	* Retry delay from Mailgun's `Retry-After` response header.
+	*/
+	retryAfterMilliseconds;
+	/**
+	* Number of attempts made before this error was produced.
+	*/
+	attempts;
+	/**
+	* Creates a Mailgun API error.
+	*
+	* @param message Error message.
+	* @param statusCode HTTP status code returned by Mailgun.
+	* @param retryAfterMilliseconds Retry delay from the response.
+	* @param attempts Number of attempts made before this error.
+	*/
+	constructor(message, statusCode, retryAfterMilliseconds, attempts) {
 		super(message);
 		this.name = "MailgunApiError";
 		this.statusCode = statusCode;
+		this.retryAfterMilliseconds = retryAfterMilliseconds;
+		this.attempts = attempts;
 	}
 };
+function isAbortError$1(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
+function sleep(milliseconds, signal) {
+	if (signal?.aborted) return Promise.reject(createAbortError(signal));
+	return new Promise((resolve, reject) => {
+		function abort() {
+			clearTimeout(timeoutId);
+			signal?.removeEventListener("abort", abort);
+			reject(createAbortError(signal));
+		}
+		const timeoutId = setTimeout(() => {
+			signal?.removeEventListener("abort", abort);
+			resolve();
+		}, milliseconds);
+		signal?.addEventListener("abort", abort, { once: true });
+	});
+}
+function createAbortError(signal) {
+	return signal?.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
+function truncateErrorBody(text) {
+	return text.length > 500 ? `${text.slice(0, 500)}...` : text;
+}
 
 //#endregion
 //#region src/message-converter.ts
@@ -267,6 +350,7 @@ function isStandardHeader(headerName) {
 * ```
 */
 var MailgunTransport = class {
+	id = "mailgun";
 	/**
 	* The resolved Mailgun configuration used by this transport.
 	*/
@@ -322,14 +406,13 @@ var MailgunTransport = class {
 			const response = await this.httpClient.sendMessage(formData, options?.signal);
 			return {
 				successful: true,
-				messageId: response.id
+				messageId: response.id,
+				provider: "mailgun"
 			};
 		} catch (error) {
+			if (isCallerAbort(error, options?.signal)) throw error;
 			const errorMessage = error instanceof Error ? error.message : String(error);
-			return {
-				successful: false,
-				errorMessages: [errorMessage]
-			};
+			return createMailgunFailure(errorMessage, error);
 		}
 	}
 	/**
@@ -397,6 +480,21 @@ var MailgunTransport = class {
 		}
 	}
 };
+function createMailgunFailure(message, error) {
+	if (error instanceof MailgunApiError) return (0, __upyo_core.createFailedReceipt)(message, {
+		provider: "mailgun",
+		statusCode: error.statusCode,
+		retryAfterMilliseconds: error.retryAfterMilliseconds,
+		attempts: error.attempts
+	});
+	return (0, __upyo_core.createFailedReceipt)(message, { provider: "mailgun" });
+}
+function isCallerAbort(error, signal) {
+	return signal?.aborted === true && (isAbortError(error) || error === signal.reason);
+}
+function isAbortError(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
 
 //#endregion
 exports.MailgunApiError = MailgunApiError;

package/dist/index.d.cts

@@ -132,7 +132,8 @@ type ResolvedMailgunConfig = Required<MailgunConfig>;
  * }
  * ```
  */
-declare class MailgunTransport implements Transport {
+declare class MailgunTransport implements Transport<"mailgun"> {
+  readonly id = "mailgun";
   /**
    * The resolved Mailgun configuration used by this transport.
    */
@@ -177,7 +178,7 @@ declare class MailgunTransport implements Transport {
    * @returns A promise that resolves to a receipt indicating success or
    *          failure.
    */
-  send(message: Message, options?: TransportOptions): Promise<Receipt>;
+  send(message: Message, options?: TransportOptions): Promise<Receipt<"mailgun">>;
   /**
    * Sends multiple email messages efficiently via Mailgun API.
    *
@@ -230,17 +231,38 @@ declare class MailgunTransport implements Transport {
    *                cancellation.
    * @returns An async iterable of receipts, one for each message.
    */
-  sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt>;
+  sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt<"mailgun">>;
 }
 //#endregion
 //#region src/http-client.d.ts
 
 /**
- * Custom error class for Mailgun API errors.
+ * Error thrown when a Mailgun API request fails.
+ *
+ * @since 0.5.0
  */
 declare class MailgunApiError extends Error {
+  /**
+   * HTTP status code returned by Mailgun, if the request reached the API.
+   */
   statusCode?: number;
-  constructor(message: string, statusCode?: number);
+  /**
+   * Retry delay from Mailgun's `Retry-After` response header.
+   */
+  retryAfterMilliseconds?: number;
+  /**
+   * Number of attempts made before this error was produced.
+   */
+  attempts?: number;
+  /**
+   * Creates a Mailgun API error.
+   *
+   * @param message Error message.
+   * @param statusCode HTTP status code returned by Mailgun.
+   * @param retryAfterMilliseconds Retry delay from the response.
+   * @param attempts Number of attempts made before this error.
+   */
+  constructor(message: string, statusCode?: number, retryAfterMilliseconds?: number, attempts?: number);
 }
 //#endregion
 export { MailgunApiError, MailgunConfig, MailgunTransport };

package/dist/index.d.ts

@@ -132,7 +132,8 @@ type ResolvedMailgunConfig = Required<MailgunConfig>;
  * }
  * ```
  */
-declare class MailgunTransport implements Transport {
+declare class MailgunTransport implements Transport<"mailgun"> {
+  readonly id = "mailgun";
   /**
    * The resolved Mailgun configuration used by this transport.
    */
@@ -177,7 +178,7 @@ declare class MailgunTransport implements Transport {
    * @returns A promise that resolves to a receipt indicating success or
    *          failure.
    */
-  send(message: Message, options?: TransportOptions): Promise<Receipt>;
+  send(message: Message, options?: TransportOptions): Promise<Receipt<"mailgun">>;
   /**
    * Sends multiple email messages efficiently via Mailgun API.
    *
@@ -230,17 +231,38 @@ declare class MailgunTransport implements Transport {
    *                cancellation.
    * @returns An async iterable of receipts, one for each message.
    */
-  sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt>;
+  sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt<"mailgun">>;
 }
 //#endregion
 //#region src/http-client.d.ts
 
 /**
- * Custom error class for Mailgun API errors.
+ * Error thrown when a Mailgun API request fails.
+ *
+ * @since 0.5.0
  */
 declare class MailgunApiError extends Error {
+  /**
+   * HTTP status code returned by Mailgun, if the request reached the API.
+   */
   statusCode?: number;
-  constructor(message: string, statusCode?: number);
+  /**
+   * Retry delay from Mailgun's `Retry-After` response header.
+   */
+  retryAfterMilliseconds?: number;
+  /**
+   * Number of attempts made before this error was produced.
+   */
+  attempts?: number;
+  /**
+   * Creates a Mailgun API error.
+   *
+   * @param message Error message.
+   * @param statusCode HTTP status code returned by Mailgun.
+   * @param retryAfterMilliseconds Retry delay from the response.
+   * @param attempts Number of attempts made before this error.
+   */
+  constructor(message: string, statusCode?: number, retryAfterMilliseconds?: number, attempts?: number);
 }
 //#endregion
 export { MailgunApiError, MailgunConfig, MailgunTransport };

package/dist/index.js

@@ -1,3 +1,5 @@
+import { combineSignals, createFailedReceipt, parseRetryAfter } from "@upyo/core";
+
 //#region src/config.ts
 /**
 * Creates a resolved Mailgun configuration by applying default values to optional fields.
@@ -75,6 +77,8 @@ var MailgunHttpClient = class {
 	* @param url The URL to make the request to.
 	* @param options Fetch options.
 	* @returns Promise that resolves to the parsed response.
+	* @throws {MailgunApiError} If Mailgun returns an error response or all
+	*                           retry attempts are exhausted.
 	*/
 	async makeRequest(url, options) {
 		let lastError = null;
@@ -86,7 +90,7 @@ var MailgunHttpClient = class {
 				try {
 					errorMessage = JSON.parse(text)?.message;
 				} catch {}
-				throw new MailgunApiError(errorMessage || text || `HTTP ${response.status}`, response.status);
+				throw new MailgunApiError(errorMessage || truncateErrorBody(text) || `HTTP ${response.status}`, response.status, parseRetryAfter(response.headers.get("Retry-After")), attempt + 1);
 			}
 			try {
 				return JSON.parse(text);
@@ -95,10 +99,15 @@ var MailgunHttpClient = class {
 			}
 		} catch (error) {
 			lastError = error instanceof Error ? error : new Error(String(error));
+			if (options.signal?.aborted) throw createAbortError(options.signal);
+			if (isAbortError$1(error)) throw error;
 			if (error instanceof MailgunApiError && error.statusCode && error.statusCode >= 400 && error.statusCode < 500) throw error;
-			if (attempt === this.config.retries) throw error;
+			if (attempt === this.config.retries) {
+				if (lastError instanceof MailgunApiError) throw lastError;
+				throw new MailgunApiError(lastError.message, void 0, void 0, attempt + 1);
+			}
 			const delay = Math.pow(2, attempt) * 1e3;
-			await new Promise((resolve) => setTimeout(resolve, delay));
+			await sleep(delay, options.signal);
 		}
 		throw lastError || /* @__PURE__ */ new Error("Request failed after all retries");
 	}
@@ -108,6 +117,8 @@ var MailgunHttpClient = class {
 	* @param url The URL to make the request to.
 	* @param options Fetch options.
 	* @returns Promise that resolves to the fetch response.
+	* @throws {Error} If the configured request timeout is reached.
+	* @throws {DOMException} If the caller aborts the request.
 	*/
 	async fetchWithAuth(url, options) {
 		const headers = new Headers(options.headers);
@@ -116,30 +127,80 @@ 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);
-		let signal = controller.signal;
-		if (options.signal) 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(`Mailgun API request timed out after ${this.config.timeout} ms.`);
+			throw error;
 		} finally {
+			combinedSignal.cleanup();
 			clearTimeout(timeoutId);
 		}
 	}
 };
 /**
-* Custom error class for Mailgun API errors.
+* Error thrown when a Mailgun API request fails.
+*
+* @since 0.5.0
 */
 var MailgunApiError = class extends Error {
+	/**
+	* HTTP status code returned by Mailgun, if the request reached the API.
+	*/
 	statusCode;
-	constructor(message, statusCode) {
+	/**
+	* Retry delay from Mailgun's `Retry-After` response header.
+	*/
+	retryAfterMilliseconds;
+	/**
+	* Number of attempts made before this error was produced.
+	*/
+	attempts;
+	/**
+	* Creates a Mailgun API error.
+	*
+	* @param message Error message.
+	* @param statusCode HTTP status code returned by Mailgun.
+	* @param retryAfterMilliseconds Retry delay from the response.
+	* @param attempts Number of attempts made before this error.
+	*/
+	constructor(message, statusCode, retryAfterMilliseconds, attempts) {
 		super(message);
 		this.name = "MailgunApiError";
 		this.statusCode = statusCode;
+		this.retryAfterMilliseconds = retryAfterMilliseconds;
+		this.attempts = attempts;
 	}
 };
+function isAbortError$1(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
+function sleep(milliseconds, signal) {
+	if (signal?.aborted) return Promise.reject(createAbortError(signal));
+	return new Promise((resolve, reject) => {
+		function abort() {
+			clearTimeout(timeoutId);
+			signal?.removeEventListener("abort", abort);
+			reject(createAbortError(signal));
+		}
+		const timeoutId = setTimeout(() => {
+			signal?.removeEventListener("abort", abort);
+			resolve();
+		}, milliseconds);
+		signal?.addEventListener("abort", abort, { once: true });
+	});
+}
+function createAbortError(signal) {
+	return signal?.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
+function truncateErrorBody(text) {
+	return text.length > 500 ? `${text.slice(0, 500)}...` : text;
+}
 
 //#endregion
 //#region src/message-converter.ts
@@ -266,6 +327,7 @@ function isStandardHeader(headerName) {
 * ```
 */
 var MailgunTransport = class {
+	id = "mailgun";
 	/**
 	* The resolved Mailgun configuration used by this transport.
 	*/
@@ -321,14 +383,13 @@ var MailgunTransport = class {
 			const response = await this.httpClient.sendMessage(formData, options?.signal);
 			return {
 				successful: true,
-				messageId: response.id
+				messageId: response.id,
+				provider: "mailgun"
 			};
 		} catch (error) {
+			if (isCallerAbort(error, options?.signal)) throw error;
 			const errorMessage = error instanceof Error ? error.message : String(error);
-			return {
-				successful: false,
-				errorMessages: [errorMessage]
-			};
+			return createMailgunFailure(errorMessage, error);
 		}
 	}
 	/**
@@ -396,6 +457,21 @@ var MailgunTransport = class {
 		}
 	}
 };
+function createMailgunFailure(message, error) {
+	if (error instanceof MailgunApiError) return createFailedReceipt(message, {
+		provider: "mailgun",
+		statusCode: error.statusCode,
+		retryAfterMilliseconds: error.retryAfterMilliseconds,
+		attempts: error.attempts
+	});
+	return createFailedReceipt(message, { provider: "mailgun" });
+}
+function isCallerAbort(error, signal) {
+	return signal?.aborted === true && (isAbortError(error) || error === signal.reason);
+}
+function isAbortError(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
 
 //#endregion
 export { MailgunApiError, MailgunTransport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/mailgun",
-  "version": "0.5.0-dev.87",
+  "version": "0.5.0",
   "description": "Mailgun transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,18 +53,13 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.5.0-dev.87+50b9f2d4"
+    "@upyo/core": "0.5.0"
   },
   "devDependencies": {
-    "@dotenvx/dotenvx": "^1.47.3",
     "tsdown": "^0.12.7",
     "typescript": "5.8.3"
   },
   "scripts": {
-    "build": "tsdown",
-    "prepublish": "tsdown",
-    "test": "tsdown && dotenvx run --ignore=MISSING_ENV_FILE -- node --experimental-transform-types --test",
-    "test:bun": "tsdown && bun test --timeout=30000 --env-file=.env",
-    "test:deno": "deno test --allow-env --allow-net --env-file=.env"
+    "prepublish": "mise run --no-deps :build"
   }
 }