@upyo/plunk 0.5.0-dev.87 → 0.5.1-dev.259

package/README.md

@@ -72,7 +72,7 @@ See the [Plunk docs] for more information about configuration options.
 ### Available Options
 
  -  `apiKey`: Your Plunk API key
- -  `baseUrl`: API base URL (default: `https://api.useplunk.com`)
+ -  `baseUrl`: API base URL (default: `https://next-api.useplunk.com`)
  -  `timeout`: Request timeout in milliseconds (default: `30000`)
  -  `retries`: Number of retry attempts (default: `3`)
  -  `validateSsl`: Whether to validate SSL certificates (default: `true`)

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
 /**
@@ -14,7 +38,7 @@
 function createPlunkConfig(config) {
 	return {
 		apiKey: config.apiKey,
-		baseUrl: config.baseUrl ?? "https://api.useplunk.com",
+		baseUrl: config.baseUrl ?? "https://next-api.useplunk.com",
 		timeout: config.timeout ?? 3e4,
 		retries: config.retries ?? 3,
 		validateSsl: config.validateSsl ?? true,
@@ -25,6 +49,40 @@ function createPlunkConfig(config) {
 //#endregion
 //#region src/http-client.ts
 /**
+* Error thrown when a Plunk API request fails.
+*
+* @since 0.5.0
+*/
+var PlunkApiError = class extends Error {
+	/**
+	* HTTP status code returned by Plunk, if the request reached the API.
+	*/
+	statusCode;
+	/**
+	* Retry delay from Plunk's `Retry-After` response header.
+	*/
+	retryAfterMilliseconds;
+	/**
+	* Number of attempts made before this error was produced.
+	*/
+	attempts;
+	/**
+	* Creates a Plunk API error.
+	*
+	* @param message Error message.
+	* @param statusCode HTTP status code returned by Plunk.
+	* @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 = "PlunkApiError";
+		this.statusCode = statusCode;
+		this.retryAfterMilliseconds = retryAfterMilliseconds;
+		this.attempts = attempts;
+	}
+};
+/**
 * HTTP client wrapper for Plunk API requests.
 *
 * This class handles authentication, request formatting, error handling,
@@ -60,18 +118,18 @@ 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) {
-					if (error.name === "AbortError") throw error;
-					if (error.message.includes("status: 4")) throw this.createPlunkError(error.message, 400);
-				}
+				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);
 				if (attempt === this.config.retries) break;
 				const delay = Math.min(1e3 * Math.pow(2, attempt), 1e4);
 				await this.sleep(delay);
 			}
 		}
 		const errorMessage = lastError?.message ?? "Unknown error occurred";
-		throw this.createPlunkError(errorMessage);
+		if (lastError instanceof PlunkApiError) throw new PlunkApiError(lastError.message, lastError.statusCode, lastError.retryAfterMilliseconds, this.config.retries + 1);
+		throw new PlunkApiError(errorMessage, void 0, void 0, this.config.retries + 1);
 	}
 	/**
 	* Makes an HTTP request to the Plunk API.
@@ -87,13 +145,24 @@ var PlunkHttpClient = class {
 			"Content-Type": "application/json",
 			...this.config.headers
 		};
-		const response = await fetch(url, {
-			method: "POST",
-			headers,
-			body: JSON.stringify(emailData),
-			signal,
-			...this.config.timeout > 0 && typeof globalThis.AbortSignal?.timeout === "function" ? { signal: AbortSignal.any([signal, AbortSignal.timeout(this.config.timeout)].filter(Boolean)) } : {}
-		});
+		const timeoutController = new AbortController();
+		const timeoutId = this.config.timeout > 0 ? setTimeout(() => timeoutController.abort(), this.config.timeout) : void 0;
+		const combinedSignal = (0, __upyo_core.combineSignals)(timeoutController.signal, signal);
+		let response;
+		try {
+			response = await fetch(url, {
+				method: "POST",
+				headers,
+				body: JSON.stringify(emailData),
+				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) {
 			let errorBody;
 			try {
@@ -101,7 +170,7 @@ var PlunkHttpClient = class {
 			} catch {
 				errorBody = "Failed to read error response";
 			}
-			throw new Error(`HTTP ${response.status}: ${response.statusText}. ${errorBody}`);
+			throw new PlunkApiError(`HTTP ${response.status}: ${response.statusText}. ${truncateErrorBody(errorBody)}`, response.status, (0, __upyo_core.parseRetryAfter)(response.headers.get("Retry-After")));
 		}
 		return response;
 	}
@@ -117,26 +186,19 @@ var PlunkHttpClient = class {
 			if (typeof data !== "object" || data === null) throw new Error("Invalid response format: expected object");
 			if (typeof data.success !== "boolean") throw new Error("Invalid response format: missing success field");
 			if (!data.success) throw new Error(data.message ?? "Send operation failed without error details");
-			return data;
+			const responseData = "data" in data ? data.data : data;
+			if (typeof responseData !== "object" || responseData === null) throw new Error("Invalid response format: missing data field");
+			return {
+				success: true,
+				emails: responseData.emails,
+				timestamp: responseData.timestamp
+			};
 		} catch (error) {
 			if (error instanceof SyntaxError) throw new Error("Invalid JSON response from Plunk API");
 			throw error;
 		}
 	}
 	/**
-	* Creates a PlunkError from an error message and optional status code.
-	*
-	* @param message - The error message
-	* @param statusCode - Optional HTTP status code
-	* @returns PlunkError instance
-	*/
-	createPlunkError(message, statusCode) {
-		return {
-			message,
-			statusCode
-		};
-	}
-	/**
 	* Sleeps for the specified number of milliseconds.
 	*
 	* @param ms - Milliseconds to sleep
@@ -146,6 +208,15 @@ var PlunkHttpClient = class {
 		return new Promise((resolve) => setTimeout(resolve, ms));
 	}
 };
+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 truncateErrorBody(text) {
+	return text.length > 500 ? `${text.slice(0, 500)}...` : text;
+}
 
 //#endregion
 //#region src/message-converter.ts
@@ -191,8 +262,7 @@ async function convertMessage(message, _config) {
 	const plunkEmail = {
 		to,
 		subject: message.subject,
-		body,
-		subscribed: false
+		body
 	};
 	if (senderName) plunkEmail.name = senderName;
 	if (senderEmail) plunkEmail.from = senderEmail;
@@ -214,7 +284,7 @@ async function convertAttachment(attachment) {
 		return {
 			filename: attachment.filename,
 			content: base64Content,
-			type: attachment.contentType
+			contentType: attachment.contentType
 		};
 	} catch (error) {
 		console.warn(`Failed to convert attachment ${attachment.filename}:`, error);
@@ -263,7 +333,7 @@ function arrayBufferToBase64(buffer) {
 *
 * const transport = new PlunkTransport({
 *   apiKey: 'your-plunk-api-key',
-*   baseUrl: 'https://api.useplunk.com', // or self-hosted URL
+*   baseUrl: 'https://next-api.useplunk.com', // or self-hosted URL
 *   timeout: 30000,
 *   retries: 3
 * });
@@ -277,6 +347,7 @@ function arrayBufferToBase64(buffer) {
 * ```
 */
 var PlunkTransport = class {
+	id = "plunk";
 	/**
 	* The resolved Plunk configuration used by this transport.
 	*/
@@ -333,14 +404,13 @@ var PlunkTransport = class {
 			const messageId = this.extractMessageId(response, message);
 			return {
 				successful: true,
-				messageId
+				messageId,
+				provider: "plunk"
 			};
 		} catch (error) {
+			if (isCallerAbort(error, options?.signal)) throw error;
 			const errorMessage = error instanceof Error ? error.message : String(error);
-			return {
-				successful: false,
-				errorMessages: [errorMessage]
-			};
+			return createPlunkFailure(errorMessage, error);
 		}
 	}
 	/**
@@ -410,25 +480,37 @@ var PlunkTransport = class {
 	/**
 	* Extracts or generates a message ID from the Plunk response.
 	*
-	* Plunk returns email details in the response, so we can use the contact ID
-	* and timestamp to create a meaningful message ID.
+	* Plunk returns its email record ID in the response. This ID can be used to
+	* correlate the send operation with webhook events.
 	*
 	* @param response The Plunk API response.
 	* @param message The original message for fallback ID generation.
 	* @returns A message ID string.
 	*/
 	extractMessageId(response, message) {
-		if (response.emails && response.emails.length > 0) {
-			const contactId = response.emails[0].contact?.id;
-			const timestamp$1 = response.timestamp;
-			if (contactId && timestamp$1) return `plunk-${contactId}-${new Date(timestamp$1).getTime()}`;
-		}
+		const emailId = response.emails?.[0]?.email;
+		if (emailId) return emailId;
 		const timestamp = Date.now();
 		const recipientHash = message.recipients[0]?.address.split("@")[0].substring(0, 8) ?? "unknown";
 		const random = Math.random().toString(36).substring(2, 8);
 		return `plunk-${timestamp}-${recipientHash}-${random}`;
 	}
 };
+function createPlunkFailure(message, error) {
+	if (error instanceof PlunkApiError) return (0, __upyo_core.createFailedReceipt)(message, {
+		provider: "plunk",
+		statusCode: error.statusCode,
+		retryAfterMilliseconds: error.retryAfterMilliseconds,
+		attempts: error.attempts
+	});
+	return (0, __upyo_core.createFailedReceipt)(message, { provider: "plunk" });
+}
+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.d.cts

@@ -13,7 +13,7 @@ import { Message, Receipt, Transport, TransportOptions } from "@upyo/core";
  * ```typescript
  * const config: PlunkConfig = {
  *   apiKey: 'your-api-key',
- *   baseUrl: 'https://api.useplunk.com', // or self-hosted URL
+ *   baseUrl: 'https://next-api.useplunk.com', // or self-hosted URL
  *   timeout: 30000,
  *   retries: 3
  * };
@@ -30,11 +30,11 @@ interface PlunkConfig {
   /**
    * Base URL for the Plunk API.
    *
-   * For Plunk's hosted service, use "https://api.useplunk.com" (default).
+   * For Plunk's hosted service, use "https://next-api.useplunk.com" (default).
    * For self-hosted instances, use your domain with "/api" path
    * (e.g., "https://plunk.example.com/api").
    *
-   * @default "https://api.useplunk.com"
+   * @default "https://next-api.useplunk.com"
    */
   readonly baseUrl?: string;
   /**
@@ -93,7 +93,7 @@ type ResolvedPlunkConfig = Required<PlunkConfig>;
  *
  * const transport = new PlunkTransport({
  *   apiKey: 'your-plunk-api-key',
- *   baseUrl: 'https://api.useplunk.com', // or self-hosted URL
+ *   baseUrl: 'https://next-api.useplunk.com', // or self-hosted URL
  *   timeout: 30000,
  *   retries: 3
  * });
@@ -106,7 +106,8 @@ type ResolvedPlunkConfig = Required<PlunkConfig>;
  * }
  * ```
  */
-declare class PlunkTransport implements Transport {
+declare class PlunkTransport implements Transport<"plunk"> {
+  readonly id = "plunk";
   /**
    * The resolved Plunk configuration used by this transport.
    */
@@ -151,7 +152,7 @@ declare class PlunkTransport 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<"plunk">>;
   /**
    * Sends multiple email messages efficiently via Plunk API.
    *
@@ -204,12 +205,12 @@ declare class PlunkTransport 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<"plunk">>;
   /**
    * Extracts or generates a message ID from the Plunk response.
    *
-   * Plunk returns email details in the response, so we can use the contact ID
-   * and timestamp to create a meaningful message ID.
+   * Plunk returns its email record ID in the response. This ID can be used to
+   * correlate the send operation with webhook events.
    *
    * @param response The Plunk API response.
    * @param message The original message for fallback ID generation.
@@ -235,6 +236,9 @@ interface PlunkResponse {
       readonly id: string;
       readonly email: string;
     };
+    /**
+     * Plunk email record ID used to correlate webhook events.
+     */
     readonly email: string;
   }[];
   /**
@@ -260,10 +264,9 @@ interface PlunkError {
   readonly details?: unknown;
 }
 /**
- * HTTP client wrapper for Plunk API requests.
+ * Error thrown when a Plunk API request fails.
  *
- * This class handles authentication, request formatting, error handling,
- * and retry logic for the Plunk HTTP API.
+ * @since 0.5.0
  */
 //#endregion
 export { PlunkConfig, PlunkError, PlunkResponse, PlunkTransport, ResolvedPlunkConfig };

package/dist/index.d.ts

@@ -13,7 +13,7 @@ import { Message, Receipt, Transport, TransportOptions } from "@upyo/core";
  * ```typescript
  * const config: PlunkConfig = {
  *   apiKey: 'your-api-key',
- *   baseUrl: 'https://api.useplunk.com', // or self-hosted URL
+ *   baseUrl: 'https://next-api.useplunk.com', // or self-hosted URL
  *   timeout: 30000,
  *   retries: 3
  * };
@@ -30,11 +30,11 @@ interface PlunkConfig {
   /**
    * Base URL for the Plunk API.
    *
-   * For Plunk's hosted service, use "https://api.useplunk.com" (default).
+   * For Plunk's hosted service, use "https://next-api.useplunk.com" (default).
    * For self-hosted instances, use your domain with "/api" path
    * (e.g., "https://plunk.example.com/api").
    *
-   * @default "https://api.useplunk.com"
+   * @default "https://next-api.useplunk.com"
    */
   readonly baseUrl?: string;
   /**
@@ -93,7 +93,7 @@ type ResolvedPlunkConfig = Required<PlunkConfig>;
  *
  * const transport = new PlunkTransport({
  *   apiKey: 'your-plunk-api-key',
- *   baseUrl: 'https://api.useplunk.com', // or self-hosted URL
+ *   baseUrl: 'https://next-api.useplunk.com', // or self-hosted URL
  *   timeout: 30000,
  *   retries: 3
  * });
@@ -106,7 +106,8 @@ type ResolvedPlunkConfig = Required<PlunkConfig>;
  * }
  * ```
  */
-declare class PlunkTransport implements Transport {
+declare class PlunkTransport implements Transport<"plunk"> {
+  readonly id = "plunk";
   /**
    * The resolved Plunk configuration used by this transport.
    */
@@ -151,7 +152,7 @@ declare class PlunkTransport 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<"plunk">>;
   /**
    * Sends multiple email messages efficiently via Plunk API.
    *
@@ -204,12 +205,12 @@ declare class PlunkTransport 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<"plunk">>;
   /**
    * Extracts or generates a message ID from the Plunk response.
    *
-   * Plunk returns email details in the response, so we can use the contact ID
-   * and timestamp to create a meaningful message ID.
+   * Plunk returns its email record ID in the response. This ID can be used to
+   * correlate the send operation with webhook events.
    *
    * @param response The Plunk API response.
    * @param message The original message for fallback ID generation.
@@ -235,6 +236,9 @@ interface PlunkResponse {
       readonly id: string;
       readonly email: string;
     };
+    /**
+     * Plunk email record ID used to correlate webhook events.
+     */
     readonly email: string;
   }[];
   /**
@@ -260,10 +264,9 @@ interface PlunkError {
   readonly details?: unknown;
 }
 /**
- * HTTP client wrapper for Plunk API requests.
+ * Error thrown when a Plunk API request fails.
  *
- * This class handles authentication, request formatting, error handling,
- * and retry logic for the Plunk HTTP API.
+ * @since 0.5.0
  */
 //#endregion
 export { PlunkConfig, PlunkError, PlunkResponse, PlunkTransport, ResolvedPlunkConfig };

package/dist/index.js

@@ -1,3 +1,5 @@
+import { combineSignals, createFailedReceipt, parseRetryAfter } from "@upyo/core";
+
 //#region src/config.ts
 /**
 * Creates a resolved Plunk configuration by applying default values to optional fields.
@@ -13,7 +15,7 @@
 function createPlunkConfig(config) {
 	return {
 		apiKey: config.apiKey,
-		baseUrl: config.baseUrl ?? "https://api.useplunk.com",
+		baseUrl: config.baseUrl ?? "https://next-api.useplunk.com",
 		timeout: config.timeout ?? 3e4,
 		retries: config.retries ?? 3,
 		validateSsl: config.validateSsl ?? true,
@@ -24,6 +26,40 @@ function createPlunkConfig(config) {
 //#endregion
 //#region src/http-client.ts
 /**
+* Error thrown when a Plunk API request fails.
+*
+* @since 0.5.0
+*/
+var PlunkApiError = class extends Error {
+	/**
+	* HTTP status code returned by Plunk, if the request reached the API.
+	*/
+	statusCode;
+	/**
+	* Retry delay from Plunk's `Retry-After` response header.
+	*/
+	retryAfterMilliseconds;
+	/**
+	* Number of attempts made before this error was produced.
+	*/
+	attempts;
+	/**
+	* Creates a Plunk API error.
+	*
+	* @param message Error message.
+	* @param statusCode HTTP status code returned by Plunk.
+	* @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 = "PlunkApiError";
+		this.statusCode = statusCode;
+		this.retryAfterMilliseconds = retryAfterMilliseconds;
+		this.attempts = attempts;
+	}
+};
+/**
 * HTTP client wrapper for Plunk API requests.
 *
 * This class handles authentication, request formatting, error handling,
@@ -59,18 +95,18 @@ 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) {
-					if (error.name === "AbortError") throw error;
-					if (error.message.includes("status: 4")) throw this.createPlunkError(error.message, 400);
-				}
+				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);
 				if (attempt === this.config.retries) break;
 				const delay = Math.min(1e3 * Math.pow(2, attempt), 1e4);
 				await this.sleep(delay);
 			}
 		}
 		const errorMessage = lastError?.message ?? "Unknown error occurred";
-		throw this.createPlunkError(errorMessage);
+		if (lastError instanceof PlunkApiError) throw new PlunkApiError(lastError.message, lastError.statusCode, lastError.retryAfterMilliseconds, this.config.retries + 1);
+		throw new PlunkApiError(errorMessage, void 0, void 0, this.config.retries + 1);
 	}
 	/**
 	* Makes an HTTP request to the Plunk API.
@@ -86,13 +122,24 @@ var PlunkHttpClient = class {
 			"Content-Type": "application/json",
 			...this.config.headers
 		};
-		const response = await fetch(url, {
-			method: "POST",
-			headers,
-			body: JSON.stringify(emailData),
-			signal,
-			...this.config.timeout > 0 && typeof globalThis.AbortSignal?.timeout === "function" ? { signal: AbortSignal.any([signal, AbortSignal.timeout(this.config.timeout)].filter(Boolean)) } : {}
-		});
+		const timeoutController = new AbortController();
+		const timeoutId = this.config.timeout > 0 ? setTimeout(() => timeoutController.abort(), this.config.timeout) : void 0;
+		const combinedSignal = combineSignals(timeoutController.signal, signal);
+		let response;
+		try {
+			response = await fetch(url, {
+				method: "POST",
+				headers,
+				body: JSON.stringify(emailData),
+				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) {
 			let errorBody;
 			try {
@@ -100,7 +147,7 @@ var PlunkHttpClient = class {
 			} catch {
 				errorBody = "Failed to read error response";
 			}
-			throw new Error(`HTTP ${response.status}: ${response.statusText}. ${errorBody}`);
+			throw new PlunkApiError(`HTTP ${response.status}: ${response.statusText}. ${truncateErrorBody(errorBody)}`, response.status, parseRetryAfter(response.headers.get("Retry-After")));
 		}
 		return response;
 	}
@@ -116,26 +163,19 @@ var PlunkHttpClient = class {
 			if (typeof data !== "object" || data === null) throw new Error("Invalid response format: expected object");
 			if (typeof data.success !== "boolean") throw new Error("Invalid response format: missing success field");
 			if (!data.success) throw new Error(data.message ?? "Send operation failed without error details");
-			return data;
+			const responseData = "data" in data ? data.data : data;
+			if (typeof responseData !== "object" || responseData === null) throw new Error("Invalid response format: missing data field");
+			return {
+				success: true,
+				emails: responseData.emails,
+				timestamp: responseData.timestamp
+			};
 		} catch (error) {
 			if (error instanceof SyntaxError) throw new Error("Invalid JSON response from Plunk API");
 			throw error;
 		}
 	}
 	/**
-	* Creates a PlunkError from an error message and optional status code.
-	*
-	* @param message - The error message
-	* @param statusCode - Optional HTTP status code
-	* @returns PlunkError instance
-	*/
-	createPlunkError(message, statusCode) {
-		return {
-			message,
-			statusCode
-		};
-	}
-	/**
 	* Sleeps for the specified number of milliseconds.
 	*
 	* @param ms - Milliseconds to sleep
@@ -145,6 +185,15 @@ var PlunkHttpClient = class {
 		return new Promise((resolve) => setTimeout(resolve, ms));
 	}
 };
+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 truncateErrorBody(text) {
+	return text.length > 500 ? `${text.slice(0, 500)}...` : text;
+}
 
 //#endregion
 //#region src/message-converter.ts
@@ -190,8 +239,7 @@ async function convertMessage(message, _config) {
 	const plunkEmail = {
 		to,
 		subject: message.subject,
-		body,
-		subscribed: false
+		body
 	};
 	if (senderName) plunkEmail.name = senderName;
 	if (senderEmail) plunkEmail.from = senderEmail;
@@ -213,7 +261,7 @@ async function convertAttachment(attachment) {
 		return {
 			filename: attachment.filename,
 			content: base64Content,
-			type: attachment.contentType
+			contentType: attachment.contentType
 		};
 	} catch (error) {
 		console.warn(`Failed to convert attachment ${attachment.filename}:`, error);
@@ -262,7 +310,7 @@ function arrayBufferToBase64(buffer) {
 *
 * const transport = new PlunkTransport({
 *   apiKey: 'your-plunk-api-key',
-*   baseUrl: 'https://api.useplunk.com', // or self-hosted URL
+*   baseUrl: 'https://next-api.useplunk.com', // or self-hosted URL
 *   timeout: 30000,
 *   retries: 3
 * });
@@ -276,6 +324,7 @@ function arrayBufferToBase64(buffer) {
 * ```
 */
 var PlunkTransport = class {
+	id = "plunk";
 	/**
 	* The resolved Plunk configuration used by this transport.
 	*/
@@ -332,14 +381,13 @@ var PlunkTransport = class {
 			const messageId = this.extractMessageId(response, message);
 			return {
 				successful: true,
-				messageId
+				messageId,
+				provider: "plunk"
 			};
 		} catch (error) {
+			if (isCallerAbort(error, options?.signal)) throw error;
 			const errorMessage = error instanceof Error ? error.message : String(error);
-			return {
-				successful: false,
-				errorMessages: [errorMessage]
-			};
+			return createPlunkFailure(errorMessage, error);
 		}
 	}
 	/**
@@ -409,25 +457,37 @@ var PlunkTransport = class {
 	/**
 	* Extracts or generates a message ID from the Plunk response.
 	*
-	* Plunk returns email details in the response, so we can use the contact ID
-	* and timestamp to create a meaningful message ID.
+	* Plunk returns its email record ID in the response. This ID can be used to
+	* correlate the send operation with webhook events.
 	*
 	* @param response The Plunk API response.
 	* @param message The original message for fallback ID generation.
 	* @returns A message ID string.
 	*/
 	extractMessageId(response, message) {
-		if (response.emails && response.emails.length > 0) {
-			const contactId = response.emails[0].contact?.id;
-			const timestamp$1 = response.timestamp;
-			if (contactId && timestamp$1) return `plunk-${contactId}-${new Date(timestamp$1).getTime()}`;
-		}
+		const emailId = response.emails?.[0]?.email;
+		if (emailId) return emailId;
 		const timestamp = Date.now();
 		const recipientHash = message.recipients[0]?.address.split("@")[0].substring(0, 8) ?? "unknown";
 		const random = Math.random().toString(36).substring(2, 8);
 		return `plunk-${timestamp}-${recipientHash}-${random}`;
 	}
 };
+function createPlunkFailure(message, error) {
+	if (error instanceof PlunkApiError) return createFailedReceipt(message, {
+		provider: "plunk",
+		statusCode: error.statusCode,
+		retryAfterMilliseconds: error.retryAfterMilliseconds,
+		attempts: error.attempts
+	});
+	return createFailedReceipt(message, { provider: "plunk" });
+}
+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.87",
+  "version": "0.5.1-dev.259",
   "description": "Plunk 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.1-dev.259+e2930fa8"
   },
   "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"
   }
 }