arn-rawmime 0.1.9 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "arn-rawmime",
-	"version": "0.1.9",
+	"version": "0.1.11",
 	"description": "A lightweight, dependency-free raw MIME email builder with DKIM support.",
 	"author": "ARNDESK",
 	"type": "module",

package/src/rawmimeBuilder.d.ts

@@ -38,7 +38,12 @@ export class MimeMessage {
     /**
      * Sets the style of the multipart boundary separator.
      */
-    setBoundaryStyle(style: "google" | "outlook" | "apple-mail" | "yahoo"): void;
+    setBoundaryStyle(style: "google_hex" | "outlook_exchange" | "outlook_nextpart" | "apple_mail_equal" | "apple_mail_dash" | "apple_webmail" | "yahoo_part" | "samsung_android" | "edomail" | "hex_segments" | "custom_dashes"): void;
+
+    /**
+     * Sets the style of the Message-ID generation.
+     */
+    setMessageIdStyle(style: "apple_uuid" | "yahoo_mobile" | "yahoo_web" | "gmail_ca" | "outlook_exchange" | "outlook_web" | "samsung_android" | "generic_uuid" | "timestamp_dot" | "icloud_mail" | "android_email" | "google_mx_relay" | "generic" | "none"): void;
 
     /**
      * Sets whether to preserve the exact insertion order of MIME parts.

package/src/rawmimeBuilder.js

@@ -5,6 +5,8 @@ import { randomBytes } from "crypto";
 import { convert } from "html-to-text";
 import { DKIMSign } from "./dkim-signer.js";
 import { processMarkDown } from "./processMarkDown.js";
+import { generateBoundary, ALLOWED_BOUNDARY_STYLES } from "./utility/boundaryGenerator.js";
+import { generateMessageId, ALLOWED_MESSAGE_ID_STYLES } from "./utility/messageIdGenerator.js";
 
 const desiredOrder = [
 	"List-Unsubscribe-Post",
@@ -29,7 +31,8 @@ class MimeMessage {
 		this.attachmentPromises = [];
 		this.processingPromises = [];
 		this.removedHeaders = new Set();
-		this.boundaryStyle = "google";
+		this.boundaryStyle = "google_hex";
+		this.messageIdStyle = "gmail_ca";
 		this.preserveOrder = false;
 	}
 
@@ -38,13 +41,19 @@ class MimeMessage {
 	}
 
 	setBoundaryStyle(style) {
-		const allowed = ["google", "outlook", "apple-mail", "yahoo"];
-		if (!allowed.includes(style)) {
-			throw new Error(`Invalid boundary style: ${style}. Allowed: ${allowed.join(", ")}`);
+		if (!ALLOWED_BOUNDARY_STYLES.includes(style)) {
+			throw new Error(`Invalid boundary style: ${style}. Allowed: ${ALLOWED_BOUNDARY_STYLES.join(", ")}`);
 		}
 		this.boundaryStyle = style;
 	}
 
+	setMessageIdStyle(style) {
+		if (!ALLOWED_MESSAGE_ID_STYLES.includes(style)) {
+			throw new Error(`Invalid Message-ID style: ${style}. Allowed: ${ALLOWED_MESSAGE_ID_STYLES.join(", ")}`);
+		}
+		this.messageIdStyle = style;
+	}
+
 	// ─── HELPER: HTML to Text Converter ─────────────────────────────
 	_htmlToText(html) {
 		if (!html) return "";
@@ -366,7 +375,6 @@ class MimeMessage {
 
 	messageId(options = {}) {
 		const { id, domain } = options;
-		let localPart = id ? id : "CA" + this._generateRandomString(49);
 		let msgDomain = domain;
 		if (!msgDomain) {
 			const fromHeader = this.headers.find((h) => h.name.toLowerCase() === "from");
@@ -379,8 +387,17 @@ class MimeMessage {
 				msgDomain = "mail.gmail.com";
 			}
 		}
-		const fullMessageId = `<${localPart.trim()}@${msgDomain.trim()}>`;
-		this.updateHeader("Message-ID", fullMessageId);
+		if (id) {
+			const fullMessageId = `<${id.trim()}@${msgDomain.trim()}>`;
+			this.updateHeader("Message-ID", fullMessageId);
+		} else {
+			const generated = generateMessageId(this.messageIdStyle, msgDomain);
+			if (generated) {
+				this.updateHeader("Message-ID", generated);
+			} else {
+				this.removeHeaders(["Message-ID"]);
+			}
+		}
 	}
 
 	_generateRandomString(length) {
@@ -597,41 +614,7 @@ class MimeMessage {
 	}
 
 	generateBoundary(oldBoundary) {
-		if (oldBoundary) {
-			const prefix = oldBoundary.slice(0, 17);
-			let newPart;
-			do {
-				newPart = randomBytes(6).toString("hex").slice(0, 11);
-			} while (prefix + newPart === oldBoundary);
-			return prefix + newPart;
-		}
-
-		if (this.boundaryStyle === "outlook") {
-			// Office 365/Outlook format: _000_HashedIDapcp_
-			const middle = randomBytes(24).toString("hex").toUpperCase();
-			return `_000_${middle}apcp_`;
-		} else if (this.boundaryStyle === "yahoo") {
-			// Yahoo style: ----=_Part_[Part1]_[Part2].[Timestamp]
-			// e.g. ----=_Part_1660954_1899761734.1782525050322
-			const part1 = Math.floor(Math.random() * 9000000) + 1000000;
-			const part2 = Math.floor(Math.random() * 9000000000) + 1000000000;
-			const timestamp = Date.now();
-			return `----=_Part_${part1}_${part2}.${timestamp}`;
-		} else if (this.boundaryStyle === "apple-mail") {
-			// Apple Mail style: Apple-Mail=_UUID
-			const uuid = randomBytes(16).toString("hex").toUpperCase();
-			const formattedUuid = [
-				uuid.slice(0, 8),
-				uuid.slice(8, 12),
-				uuid.slice(12, 16),
-				uuid.slice(16, 20),
-				uuid.slice(20),
-			].join("-");
-			return `Apple-Mail=_${formattedUuid}`;
-		} else {
-			// Default Google style
-			return "000000000000" + randomBytes(8).toString("hex");
-		}
+		return generateBoundary(this.boundaryStyle, oldBoundary);
 	}
 
 	// ─── BUILDING THE RAW EMAIL ───────────────────────────────────────

package/src/utility/boundaryGenerator.js

@@ -0,0 +1,113 @@
+import { randomBytes } from "crypto";
+
+export const ALLOWED_BOUNDARY_STYLES = [
+  "google_hex",
+  "outlook_exchange",
+  "outlook_nextpart",
+  "apple_mail_equal",
+  "apple_mail_dash",
+  "apple_webmail",
+  "yahoo_part",
+  "samsung_android",
+  "edomail",
+  "hex_segments",
+  "custom_dashes"
+];
+
+export function generateBoundary(style, oldBoundary) {
+  if (oldBoundary) {
+    const prefix = oldBoundary.slice(0, 17);
+    let newPart;
+    do {
+      newPart = randomBytes(6).toString("hex").slice(0, 11);
+    } while (prefix + newPart === oldBoundary);
+    return prefix + newPart;
+  }
+
+  switch (style) {
+    case "google_hex":
+      return "000000000000" + randomBytes(8).toString("hex");
+    
+    case "outlook_exchange": {
+      const middle = randomBytes(24).toString("hex").toUpperCase();
+      return `_000_${middle}apcp_`;
+    }
+    
+    case "outlook_nextpart": {
+      const part1 = Math.floor(Math.random() * 9000000) + 1000000;
+      const part2 = Math.floor(Math.random() * 9000000000) + 1000000000;
+      const timestamp = Date.now();
+      return `----=_NextPart_${part1}_${part2}.${timestamp}`;
+    }
+    
+    case "apple_mail_equal": {
+      const uuid = randomBytes(16).toString("hex").toUpperCase();
+      const formattedUuid = [
+        uuid.slice(0, 8),
+        uuid.slice(8, 12),
+        uuid.slice(12, 16),
+        uuid.slice(16, 20),
+        uuid.slice(20)
+      ].join("-");
+      return `Apple-Mail=_${formattedUuid}`;
+    }
+    
+    case "apple_mail_dash": {
+      const uuid = randomBytes(16).toString("hex").toUpperCase();
+      const formattedUuid = [
+        uuid.slice(0, 8),
+        uuid.slice(8, 12),
+        uuid.slice(12, 16),
+        uuid.slice(16, 20),
+        uuid.slice(20)
+      ].join("-");
+      return `Apple-Mail-_${formattedUuid}`;
+    }
+    
+    case "apple_webmail": {
+      const uuid = randomBytes(16).toString("hex").toUpperCase();
+      const formattedUuid = [
+        uuid.slice(0, 8),
+        uuid.slice(8, 12),
+        uuid.slice(12, 16),
+        uuid.slice(16, 20),
+        uuid.slice(20)
+      ].join("-");
+      return `Apple-Webmail-_${formattedUuid}`;
+    }
+    
+    case "yahoo_part": {
+      const part1 = Math.floor(Math.random() * 9000000) + 1000000;
+      const part2 = Math.floor(Math.random() * 9000000000) + 1000000000;
+      const timestamp = Date.now();
+      return `----=_Part_${part1}_${part2}.${timestamp}`;
+    }
+    
+    case "samsung_android": {
+      const timestamp = Date.now();
+      const rand = Math.floor(Math.random() * 900000000) + 100000000;
+      return `_com.samsung.android.email_${timestamp}_${rand}`;
+    }
+    
+    case "edomail": {
+      const uuid = randomBytes(16).toString("hex").toUpperCase();
+      return `EdoMail_${uuid}`;
+    }
+    
+    case "hex_segments": {
+      const seg1 = randomBytes(4).toString("hex");
+      const seg2 = randomBytes(4).toString("hex");
+      const seg3 = randomBytes(2).toString("hex");
+      return `${seg1}_${seg2}_${seg3}`;
+    }
+    
+    case "custom_dashes": {
+      const randStr = Math.random().toString(36).substring(2, 15).toUpperCase();
+      return `----${randStr}`;
+    }
+    
+    default:
+      // Default fallback
+      return "000000000000" + randomBytes(8).toString("hex");
+  }
+}

package/src/utility/messageIdGenerator.js

@@ -0,0 +1,128 @@
+import { randomBytes } from "crypto";
+
+export const ALLOWED_MESSAGE_ID_STYLES = [
+  "apple_uuid",
+  "yahoo_mobile",
+  "yahoo_web",
+  "gmail_ca",
+  "outlook_exchange",
+  "outlook_web",
+  "samsung_android",
+  "generic_uuid",
+  "timestamp_dot",
+  "icloud_mail",
+  "android_email",
+  "google_mx_relay",
+  "generic",
+  "none"
+];
+
+function generateRandomString(length) {
+  const allowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789=";
+  const bytes = randomBytes(length);
+  let result = "";
+  for (let i = 0; i < length; i++) {
+    result += allowed[bytes[i] % allowed.length];
+  }
+  return result;
+}
+
+export function generateMessageId(style, domain) {
+  if (style === "none") return null;
+
+  const msgDomain = domain || "mail.gmail.com";
+
+  switch (style) {
+    case "apple_uuid": {
+      const uuid = randomBytes(16).toString("hex").toUpperCase();
+      const formattedUuid = [
+        uuid.slice(0, 8),
+        uuid.slice(8, 12),
+        uuid.slice(12, 16),
+        uuid.slice(16, 20),
+        uuid.slice(20)
+      ].join("-");
+      return `<${formattedUuid}@${msgDomain}>`;
+    }
+
+    case "yahoo_mobile": {
+      const part1 = Math.floor(Math.random() * 900000000) + 100000000;
+      const part2 = Math.floor(Math.random() * 9000000) + 1000000;
+      const timestamp = Date.now();
+      return `<${part1}.${part2}.${timestamp}@mail.yahoo.com>`;
+    }
+
+    case "yahoo_web": {
+      const part1 = Math.floor(Math.random() * 9000000) + 1000000;
+      const part2 = Math.floor(Math.random() * 9000000) + 1000000;
+      const timestamp = Date.now();
+      return `<Part_${part1}_${part2}.${timestamp}@mail.yahoo.com>`;
+    }
+
+    case "gmail_ca": {
+      const randStr = generateRandomString(49);
+      return `<CA${randStr}@${msgDomain}>`;
+    }
+
+    case "outlook_exchange": {
+      const rand1 = randomBytes(12).toString("hex").toUpperCase();
+      const rand2 = randomBytes(6).toString("hex").toLowerCase();
+      return `<${rand1}apcp@${rand2}.prod.outlook.com>`;
+    }
+
+    case "outlook_web": {
+      const rand = randomBytes(16).toString("hex").toUpperCase();
+      return `<${rand}@${msgDomain}>`;
+    }
+
+    case "samsung_android": {
+      const timestamp = Date.now();
+      const rand1 = Math.floor(Math.random() * 9000000) + 1000000;
+      const rand2 = Math.floor(Math.random() * 900000000) + 100000000;
+      return `<${timestamp}.${rand1}.${rand2}@com.samsung.android.email>`;
+    }
+
+    case "generic_uuid": {
+      const uuid = randomBytes(16).toString("hex").toLowerCase();
+      const formattedUuid = [
+        uuid.slice(0, 8),
+        uuid.slice(8, 12),
+        uuid.slice(12, 16),
+        uuid.slice(16, 20),
+        uuid.slice(20)
+      ].join("-");
+      return `<${formattedUuid}@${msgDomain}>`;
+    }
+
+    case "timestamp_dot": {
+      const timestamp = Date.now();
+      const rand = Math.floor(Math.random() * 900000) + 100000;
+      return `<${timestamp}.${rand}@${msgDomain}>`;
+    }
+
+    case "icloud_mail": {
+      const prefix = generateRandomString(12).toLowerCase().replace(/=/g, 'a');
+      return `<${prefix}@${msgDomain}>`;
+    }
+
+    case "android_email": {
+      const prefix = generateRandomString(24).toLowerCase().replace(/=/g, 'z');
+      const timestamp = Date.now();
+      return `<${prefix}.${timestamp}@email.android.com>`;
+    }
+
+    case "google_mx_relay": {
+      const hex1 = randomBytes(4).toString("hex");
+      const hex2 = randomBytes(4).toString("hex");
+      const hex3 = randomBytes(3).toString("hex");
+      const hex4 = randomBytes(2).toString("hex");
+      return `<${hex1}.${hex2}.${hex3}.${hex4}@mx.google.com>`;
+    }
+
+    case "generic":
+    default: {
+      const randStr = generateRandomString(40);
+      return `<${randStr}@${msgDomain}>`;
+    }
+  }
+}