@upyo/plunk 0.5.0 → 0.5.1

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

@@ -38,7 +38,7 @@ const __upyo_core = __toESM(require("@upyo/core"));
 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,
@@ -186,7 +186,13 @@ 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;
@@ -256,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;
@@ -279,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);
@@ -328,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
 * });
@@ -475,19 +480,16 @@ 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);

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
  * });
@@ -209,8 +209,8 @@ declare class PlunkTransport implements Transport<"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.
@@ -236,6 +236,9 @@ interface PlunkResponse {
       readonly id: string;
       readonly email: string;
     };
+    /**
+     * Plunk email record ID used to correlate webhook events.
+     */
     readonly email: string;
   }[];
   /**

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
  * });
@@ -209,8 +209,8 @@ declare class PlunkTransport implements Transport<"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.
@@ -236,6 +236,9 @@ interface PlunkResponse {
       readonly id: string;
       readonly email: string;
     };
+    /**
+     * Plunk email record ID used to correlate webhook events.
+     */
     readonly email: string;
   }[];
   /**

package/dist/index.js

@@ -15,7 +15,7 @@ import { combineSignals, createFailedReceipt, parseRetryAfter } from "@upyo/core
 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,
@@ -163,7 +163,13 @@ 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;
@@ -233,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;
@@ -256,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);
@@ -305,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
 * });
@@ -452,19 +457,16 @@ 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/plunk",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Plunk transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.5.0"
+    "@upyo/core": "0.5.1"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",