arn-rawmime 0.0.9 → 0.1.1

package/package.json

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

package/src/rawmimeBuilder.d.ts

@@ -35,6 +35,11 @@ export class MimeMessage {
     setReplyTo(replyTo: MailboxInput): void;
     setSubject(subject: string): void;
 
+    /**
+     * Sets the style of the multipart boundary separator.
+     */
+    setBoundaryStyle(style: "google" | "outlook" | "apple-mail"): void;
+
     /**
      * Sets the Date header using a specific Time Zone or a random US Time Zone.
      * @param options Configuration object.
@@ -51,20 +56,25 @@ export class MimeMessage {
     /**
      * Adds the plain text version of the email.
      */
-    addText(options: { data: string; encoding?: "quoted-printable" | "base64" }): void;
+    addText(options: {
+        data: string | Buffer;
+        encoding?: "quoted-printable" | "base64" | "7bit" | "8bit";
+        charset?: "UTF-8" | "ISO-8859-1" | "US-ASCII" | (string & {});
+    }): void;
 
     /**
      * Adds the HTML version of the email.
      */
     addHtml(options: {
-        data: string;
-        encoding?: "quoted-printable" | "base64";
+        data: string | Buffer;
+        encoding?: "quoted-printable" | "base64" | "7bit" | "8bit";
         autoTextPart?: boolean;
         autoMinify?: boolean;
         /** * If true, the `data` is treated as input for the markdown processor.
          * It will be converted to HTML, sanitized, and used to generate the body.
          */
         markdownToHtml?: boolean;
+        charset?: "UTF-8" | "ISO-8859-1" | "US-ASCII" | (string & {});
     }): void;
 
     /**

package/src/rawmimeBuilder.js

@@ -29,6 +29,15 @@ class MimeMessage {
 		this.attachmentPromises = [];
 		this.processingPromises = [];
 		this.removedHeaders = new Set();
+		this.boundaryStyle = "google";
+	}
+
+	setBoundaryStyle(style) {
+		const allowed = ["google", "outlook", "apple-mail"];
+		if (!allowed.includes(style)) {
+			throw new Error(`Invalid boundary style: ${style}. Allowed: ${allowed.join(", ")}`);
+		}
+		this.boundaryStyle = style;
 	}
 
 	// ─── HELPER: HTML to Text Converter ─────────────────────────────
@@ -57,8 +66,14 @@ class MimeMessage {
 		return minified.trim();
 	}
 
-	// ─── HELPER: Smart Quoted-Printable Encoder (Word-Wrap) ─────────
-	_encodeQuotedPrintable(str) {
+	_getBufferEncoding(charset) {
+		const clean = (charset || "").toLowerCase().replace(/[^a-z0-9]/g, "");
+		if (clean === "iso88591" || clean === "latin1") return "latin1";
+		if (clean === "usascii" || clean === "ascii") return "ascii";
+		return "utf8";
+	}
+
+	_encodeQuotedPrintable(str, bufferEncoding = "utf8") {
 		if (!str) return "";
 
 		// 1. Split into paragraphs first to preserve user's hard returns
@@ -66,7 +81,7 @@ class MimeMessage {
 
 		return paragraphs
 			.map((line) => {
-				const buffer = Buffer.from(line, "utf8");
+				const buffer = Buffer.from(line, bufferEncoding);
 
 				// 2. Pre-encode characters
 				let tempStr = "";
@@ -372,38 +387,96 @@ class MimeMessage {
 	}
 
 	_validateEncoding(encoding) {
-		const allowed = ["quoted-printable", "base64"];
+		const allowed = ["quoted-printable", "base64", "7bit", "8bit"];
 		if (!allowed.includes(encoding)) {
 			throw new Error(`Invalid encoding: ${encoding}. Allowed options: ${allowed.join(", ")}`);
 		}
 	}
 
-	_addBodyPart(data, contentType, encoding) {
-		this._validateEncoding(encoding);
-		if (typeof data !== "string") data = "";
+	_addBodyPart(data, contentType, encoding, charset = "UTF-8") {
+		// 1. Normalize data to string
+		if (Buffer.isBuffer(data)) {
+			data = data.toString("utf8");
+		} else if (typeof data !== "string") {
+			data = data !== null && data !== undefined ? String(data) : "";
+		}
+
+		let finalEncoding = encoding;
+		let finalCharset = charset;
 
-		let encodedData;
-		if (encoding === "quoted-printable") {
-			encodedData = this._encodeQuotedPrintable(data);
+		// 2. Validate and Fallback Encoding
+		const allowedEncodings = ["quoted-printable", "base64", "7bit", "8bit"];
+		if (!allowedEncodings.includes(finalEncoding)) {
+			finalEncoding = "quoted-printable";
+		}
+
+		// 3. Map/Validate Charset Support in Node.js
+		const cleanCharset = (finalCharset || "").toLowerCase().replace(/[^a-z0-9]/g, "");
+		let bufferEncoding = "utf8";
+		
+		if (cleanCharset === "iso88591" || cleanCharset === "latin1") {
+			bufferEncoding = "latin1";
+			finalCharset = "ISO-8859-1";
+		} else if (cleanCharset === "usascii" || cleanCharset === "ascii") {
+			bufferEncoding = "ascii";
+			finalCharset = "US-ASCII";
 		} else {
+			bufferEncoding = "utf8";
+			finalCharset = "UTF-8";
+		}
+
+		// 4. Content Character Compatibility Checks
+		const hasNonAscii = /[^\x00-\x7F]/.test(data);
+		const hasNonLatin1 = /[^\x00-\xFF]/.test(data);
+
+		// If the data contains non-ASCII characters, 7bit encoding/ASCII charset are unsupported -> Upgrade
+		if (hasNonAscii) {
+			if (bufferEncoding === "ascii") {
+				bufferEncoding = "utf8";
+				finalCharset = "UTF-8";
+			}
+			if (finalEncoding === "7bit") {
+				finalEncoding = "quoted-printable";
+			}
+		}
+
+		// If the data contains characters outside Latin-1, ISO-8859-1 is unsupported -> Upgrade
+		if (hasNonLatin1) {
+			if (bufferEncoding === "latin1") {
+				bufferEncoding = "utf8";
+				finalCharset = "UTF-8";
+			}
+		}
+
+		let encodedData;
+		if (finalEncoding === "quoted-printable") {
+			encodedData = this._encodeQuotedPrintable(data, bufferEncoding);
+		} else if (finalEncoding === "base64") {
 			encodedData =
-				Buffer.from(data, "utf8")
+				Buffer.from(data, bufferEncoding)
 					.toString("base64")
 					.match(/.{1,76}/g)
 					?.join("\r\n") || "";
+		} else {
+			// For 7bit and 8bit, normalize newlines to CRLF
+			encodedData = data.replace(/\r?\n|\r/g, "\r\n");
 		}
 
+		// Ensure charset is wrapped in quotes
+		const cleanCharsetName = finalCharset.replace(/"/g, "");
+		const formattedCharset = `"${cleanCharsetName}"`;
+
 		this.bodyParts.push({
 			data: encodedData,
 			contentType,
-			charset: '"UTF-8"', // Added quotes for compliance
-			encoding,
+			charset: formattedCharset,
+			encoding: finalEncoding,
 		});
 	}
 
 	// Default encoding is now 'quoted-printable'
-	addText({ data, encoding = "quoted-printable" }) {
-		this._addBodyPart(data, "text/plain", encoding);
+	addText({ data, encoding = "quoted-printable", charset = "UTF-8" }) {
+		this._addBodyPart(data, "text/plain", encoding, charset);
 	}
 
 	/**
@@ -420,6 +493,7 @@ class MimeMessage {
 		autoTextPart = false,
 		autoMinify = true,
 		markdownToHtml = false,
+		charset = "UTF-8",
 	}) {
 		if (markdownToHtml) {
 			// Push the async operation to the queue
@@ -436,6 +510,7 @@ class MimeMessage {
 						autoTextPart,
 						autoMinify,
 						markdownToHtml: false,
+						charset,
 					});
 				})
 				.catch((err) => {
@@ -447,6 +522,7 @@ class MimeMessage {
 						autoTextPart,
 						autoMinify,
 						markdownToHtml: false,
+						charset,
 					});
 				});
 
@@ -460,12 +536,12 @@ class MimeMessage {
 			finalHtml = this._minifyHtml(finalHtml);
 		}
 
-		this._addBodyPart(finalHtml, "text/html", encoding);
+		this._addBodyPart(finalHtml, "text/html", encoding, charset);
 
 		if (autoTextPart) {
 			// Use ORIGINAL data for text conversion to ensure readability
 			const plainText = this._htmlToText(data);
-			this.addText({ data: plainText, encoding: encoding });
+			this.addText({ data: plainText, encoding: encoding, charset: charset });
 		}
 	}
 
@@ -524,7 +600,26 @@ class MimeMessage {
 			} while (prefix + newPart === oldBoundary);
 			return prefix + newPart;
 		}
-		return "000000000000" + randomBytes(8).toString("hex");
+
+		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 === "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");
+		}
 	}
 
 	// ─── BUILDING THE RAW EMAIL ───────────────────────────────────────
@@ -533,18 +628,27 @@ class MimeMessage {
 		// Wait for Attachments AND Markdown Processing
 		await Promise.all([...this.attachmentPromises, ...this.processingPromises]);
 
-		if (!this.headers.some((h) => h.name.toLowerCase() === "mime-version"))
+		if (!this.headers.some((h) => h.name.toLowerCase() === "mime-version") && !this.removedHeaders.has("mime-version"))
 			this.headers.unshift({ name: "MIME-Version", value: "1.0" });
-		if (!this.headers.some((h) => h.name.toLowerCase() === "date")) this.setDate();
-		if (!this.headers.some((h) => h.name.toLowerCase() === "message-id")) this.messageId();
-		if (!this.headers.some((h) => h.name.toLowerCase() === "subject")) this.setSubject("");
-
-		// Sort Body: Text MUST be first
-		this.bodyParts.sort((a, b) => {
-			if (a.contentType === "text/plain") return -1;
-			if (b.contentType === "text/plain") return 1;
-			return 0;
-		});
+		if (!this.headers.some((h) => h.name.toLowerCase() === "date") && !this.removedHeaders.has("date")) 
+			this.setDate();
+		if (!this.headers.some((h) => h.name.toLowerCase() === "message-id") && !this.removedHeaders.has("message-id")) 
+			this.messageId();
+		if (!this.headers.some((h) => h.name.toLowerCase() === "subject") && !this.removedHeaders.has("subject")) 
+			this.setSubject("");
+
+		// Sort Body: Text parts must come before HTML parts, keeping stable addition order
+		const texts = this.bodyParts.filter((p) => p.contentType === "text/plain");
+		const htmls = this.bodyParts.filter((p) => p.contentType === "text/html");
+
+		if (texts.length > 1) {
+			console.warn(`[MimeMessage] Warning: Multiple text/plain parts added (${texts.length}). Most email clients will only display the last text/plain part.`);
+		}
+		if (htmls.length > 1) {
+			console.warn(`[MimeMessage] Warning: Multiple text/html parts added (${htmls.length}). Most email clients will only display the last text/html part.`);
+		}
+
+		this.bodyParts = [...texts, ...htmls];
 
 		let body = "";
 		const numAttachments = this.attachments.length;

package/src/utility/mailParser.js

@@ -89,11 +89,37 @@ export const parseMail = async ({ rawData }) => {
         });
 
         // --- 3. Extract Headers ---
-        let envelopeTo = (mail.headers.get("envelope-to") || "").toLowerCase();
+        let envelopeToRaw = mail.headers.get("envelope-to");
+        if (Array.isArray(envelopeToRaw)) {
+            envelopeToRaw = envelopeToRaw[0];
+        }
+        let envelopeTo = "";
+        if (envelopeToRaw) {
+            if (typeof envelopeToRaw === "string") {
+                envelopeTo = envelopeToRaw.replace(/[<>]/g, "").trim().toLowerCase();
+            } else if (typeof envelopeToRaw === "object") {
+                const val = envelopeToRaw.text || envelopeToRaw.value || "";
+                envelopeTo = val.toString().replace(/[<>]/g, "").trim().toLowerCase();
+            }
+        }
         let envelopeToDomain = envelopeTo && envelopeTo.includes("@") ? envelopeTo.split("@")[1].toLowerCase() : null;
 
-        let fromEmail = mail.from?.value[0]?.address ? mail.from.value[0].address.toLowerCase() : null;
-        let toEmail = mail.to?.value[0]?.address ? mail.to.value[0].address.toLowerCase() : null;
+        let returnPathRaw = mail.headers.get("return-path");
+        if (Array.isArray(returnPathRaw)) {
+            returnPathRaw = returnPathRaw[0];
+        }
+        let returnPath = null;
+        if (returnPathRaw) {
+            if (typeof returnPathRaw === "string") {
+                returnPath = returnPathRaw.replace(/[<>]/g, "").trim().toLowerCase();
+            } else if (typeof returnPathRaw === "object") {
+                const val = returnPathRaw.text || returnPathRaw.value || "";
+                returnPath = val.toString().replace(/[<>]/g, "").trim().toLowerCase();
+            }
+        }
+
+        let fromEmail = mail.from?.value?.[0]?.address ? mail.from.value[0].address.toLowerCase() : null;
+        let toEmail = mail.to?.value?.[0]?.address ? mail.to.value[0].address.toLowerCase() : null;
 
         // New: toEmailArray with Deduplication
         let toEmailArray = [];
@@ -104,7 +130,7 @@ export const parseMail = async ({ rawData }) => {
             toEmailArray = [...new Set(rawEmails)]; // Remove duplicates
         }
 
-        let replyToEmail = mail.replyTo?.value[0]?.address ? mail.replyTo.value[0].address.toLowerCase() : null;
+        let replyToEmail = mail.replyTo?.value?.[0]?.address ? mail.replyTo.value[0].address.toLowerCase() : null;
 
         // --- 4. Clean Names ---
         const cleanName = (nameObj, emailObj) => {
@@ -115,9 +141,9 @@ export const parseMail = async ({ rawData }) => {
             return name ? name.trim().substring(0, 100) : "";
         };
 
-        let fromName = cleanName(mail.from?.value[0]?.name, fromEmail);
-        let toName = cleanName(mail.to?.value[0]?.name, toEmail);
-        let replyToName = cleanName(mail.replyTo?.value[0]?.name, replyToEmail);
+        let fromName = cleanName(mail.from?.value?.[0]?.name, fromEmail);
+        let toName = cleanName(mail.to?.value?.[0]?.name, toEmail);
+        let replyToName = cleanName(mail.replyTo?.value?.[0]?.name, replyToEmail);
 
         // --- 5. Clean HTML & Text ---
         let html = mail.html || mail.textAsHtml || "";
@@ -179,7 +205,7 @@ export const parseMail = async ({ rawData }) => {
 
         // --- 8. Traffic Source ---
         const isOfficialMailer = fromEmail === "mailer@mailersp.doublelist.com" || fromEmail === "robot@doublelist.com";
-        if (isOfficialMailer && mail.replyTo?.value[0]?.address) {
+        if (isOfficialMailer && mail.replyTo?.value?.[0]?.address) {
             fromEmail = mail.replyTo?.value[0]?.address?.toLowerCase();
             fromName = "";
             trafficSource = "dbr-w4m";
@@ -208,7 +234,7 @@ export const parseMail = async ({ rawData }) => {
                 messageId: mail.messageId || null,
                 inReplyTo: mail.inReplyTo || null,
                 references: mail.references || null,
-                returnPath: mail.headers.get("return-path")?.text?.toLowerCase() || null,
+                returnPath,
 
                 html,
                 markdownResult, // This now contains the Cleaned Reply Markdown