arn-rawmime 0.0.2 → 0.0.3

package/package.json

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

package/src/rawmimeBuilder.js

@@ -96,15 +96,17 @@ class MimeMessage {
 							currentLineLength = 0;
 						}
 						if (token.length > 75) {
-							// Hard split for giant tokens
-							const chunks = token.match(/.{1,73}/g);
-							chunks.forEach((chunk, idx) => {
-								if (idx < chunks.length - 1) {
-									result += chunk + "=\r\n";
-								} else {
-									result += chunk;
-									currentLineLength = chunk.length;
+							// Hard split for giant tokens (Atom-aware)
+							// Find QP sequences (=XX) or single chars to avoid breaking a triplet
+							const atoms = token.match(/=[0-9A-F]{2}|./g) || [];
+							atoms.forEach((atom) => {
+								// Check if adding this atom exceeds the safety limit (75 to leave room for soft break '=')
+								if (currentLineLength + atom.length > 75) {
+									result += "=\r\n";
+									currentLineLength = 0;
 								}
+								result += atom;
+								currentLineLength += atom.length;
 							});
 						} else {
 							result += token;
@@ -123,6 +125,32 @@ class MimeMessage {
 
 	// ─── HELPER: Header Folding (RFC 5322) ──────────────────────────
 	_foldHeader(name, value) {
+		const hasNonAscii = /[^\x00-\x7F]/.test(value);
+
+		// 1. Unstructured headers (Subject, etc) -> Full Encode
+		const unstructured = ["subject", "x-report-abuse", "thread-topic"];
+		if (hasNonAscii && unstructured.includes(name.toLowerCase())) {
+			const encodedValue = Buffer.from(value, "utf8").toString("base64");
+			return `${name}: =?UTF-8?B?${encodedValue}?=`;
+		}
+
+		// 2. Structured headers (From, To) -> Smart Replace
+		// Finds quoted strings with special chars, e.g. "René", and encodes JUST that part.
+		if (hasNonAscii) {
+			const encodedStruct = value.replace(/"([^"]*)"/g, (match, content) => {
+				if (/[^\x00-\x7F]/.test(content)) {
+					const b64 = Buffer.from(content, "utf8").toString("base64");
+					return `=?UTF-8?B?${b64}?=`;
+				}
+				return match;
+			});
+			// If we changed anything, return it. If not (e.g. unquoted special chars), fallback to old folding
+			if (encodedStruct !== value) {
+				return `${name}: ${encodedStruct}`;
+			}
+		}
+
+		// 3. Standard folding for ASCII-only (or unhandled) headers
 		const line = `${name}: ${value}`;
 		if (line.length <= 76) return line;