@upyo/smtp 0.2.0-dev.20 → 0.2.0-dev.24

package/dist/index.cjs

@@ -278,10 +278,10 @@ async function buildRawMessage(message) {
 	const hasHtml = "html" in message.content;
 	const hasText = "text" in message.content;
 	const isMultipart = hasAttachments || hasHtml && hasText;
-	lines.push(`From: ${(0, __upyo_core.formatAddress)(message.sender)}`);
-	lines.push(`To: ${message.recipients.map(__upyo_core.formatAddress).join(", ")}`);
-	if (message.ccRecipients.length > 0) lines.push(`Cc: ${message.ccRecipients.map(__upyo_core.formatAddress).join(", ")}`);
-	if (message.replyRecipients.length > 0) lines.push(`Reply-To: ${message.replyRecipients.map(__upyo_core.formatAddress).join(", ")}`);
+	lines.push(`From: ${encodeHeaderValue((0, __upyo_core.formatAddress)(message.sender))}`);
+	lines.push(`To: ${encodeHeaderValue(message.recipients.map(__upyo_core.formatAddress).join(", "))}`);
+	if (message.ccRecipients.length > 0) lines.push(`Cc: ${encodeHeaderValue(message.ccRecipients.map(__upyo_core.formatAddress).join(", "))}`);
+	if (message.replyRecipients.length > 0) lines.push(`Reply-To: ${encodeHeaderValue(message.replyRecipients.map(__upyo_core.formatAddress).join(", "))}`);
 	lines.push(`Subject: ${encodeHeaderValue(message.subject)}`);
 	lines.push(`Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`);
 	lines.push(`Message-ID: <${generateMessageId()}>`);
@@ -365,17 +365,48 @@ function encodeHeaderValue(value) {
 	if (!/^[\x20-\x7E]*$/.test(value)) {
 		const utf8Bytes = new TextEncoder().encode(value);
 		const base64 = btoa(String.fromCharCode(...utf8Bytes));
-		return `=?UTF-8?B?${base64}?=`;
+		const maxEncodedLength = 75;
+		const encodedWord = `=?UTF-8?B?${base64}?=`;
+		if (encodedWord.length <= maxEncodedLength) return encodedWord;
+		const words = [];
+		let currentBase64 = "";
+		for (let i = 0; i < base64.length; i += 4) {
+			const chunk = base64.slice(i, i + 4);
+			const testWord = `=?UTF-8?B?${currentBase64}${chunk}?=`;
+			if (testWord.length <= maxEncodedLength) currentBase64 += chunk;
+			else {
+				if (currentBase64) words.push(`=?UTF-8?B?${currentBase64}?=`);
+				currentBase64 = chunk;
+			}
+		}
+		if (currentBase64) words.push(`=?UTF-8?B?${currentBase64}?=`);
+		return words.join(" ");
 	}
 	return value;
 }
 function encodeQuotedPrintable(text) {
-	return text.replace(/[^\x20-\x7E]/g, (char) => {
-		const code = char.charCodeAt(0);
-		if (code < 256) return `=${code.toString(16).toUpperCase().padStart(2, "0")}`;
-		const utf8 = new TextEncoder().encode(char);
-		return Array.from(utf8).map((byte) => `=${byte.toString(16).toUpperCase().padStart(2, "0")}`).join("");
-	}).replace(/=$/gm, "=3D").replace(/^\./, "=2E");
+	const utf8Bytes = new TextEncoder().encode(text);
+	let result = "";
+	let lineLength = 0;
+	const maxLineLength = 76;
+	for (let i = 0; i < utf8Bytes.length; i++) {
+		const byte = utf8Bytes[i];
+		let encoded = "";
+		if (byte < 32 || byte > 126 || byte === 61 || byte === 46 && lineLength === 0) encoded = `=${byte.toString(16).toUpperCase().padStart(2, "0")}`;
+		else encoded = String.fromCharCode(byte);
+		if (lineLength + encoded.length > maxLineLength) {
+			result += "=\r\n";
+			lineLength = 0;
+		}
+		result += encoded;
+		lineLength += encoded.length;
+		if (byte === 13 && i + 1 < utf8Bytes.length && utf8Bytes[i + 1] === 10) {
+			i++;
+			result += String.fromCharCode(10);
+			lineLength = 0;
+		} else if (byte === 10 && (i === 0 || utf8Bytes[i - 1] !== 13)) lineLength = 0;
+	}
+	return result;
 }
 function encodeBase64(data) {
 	const base64 = btoa(String.fromCharCode(...data));

package/dist/index.js

@@ -255,10 +255,10 @@ async function buildRawMessage(message) {
 	const hasHtml = "html" in message.content;
 	const hasText = "text" in message.content;
 	const isMultipart = hasAttachments || hasHtml && hasText;
-	lines.push(`From: ${formatAddress(message.sender)}`);
-	lines.push(`To: ${message.recipients.map(formatAddress).join(", ")}`);
-	if (message.ccRecipients.length > 0) lines.push(`Cc: ${message.ccRecipients.map(formatAddress).join(", ")}`);
-	if (message.replyRecipients.length > 0) lines.push(`Reply-To: ${message.replyRecipients.map(formatAddress).join(", ")}`);
+	lines.push(`From: ${encodeHeaderValue(formatAddress(message.sender))}`);
+	lines.push(`To: ${encodeHeaderValue(message.recipients.map(formatAddress).join(", "))}`);
+	if (message.ccRecipients.length > 0) lines.push(`Cc: ${encodeHeaderValue(message.ccRecipients.map(formatAddress).join(", "))}`);
+	if (message.replyRecipients.length > 0) lines.push(`Reply-To: ${encodeHeaderValue(message.replyRecipients.map(formatAddress).join(", "))}`);
 	lines.push(`Subject: ${encodeHeaderValue(message.subject)}`);
 	lines.push(`Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`);
 	lines.push(`Message-ID: <${generateMessageId()}>`);
@@ -342,17 +342,48 @@ function encodeHeaderValue(value) {
 	if (!/^[\x20-\x7E]*$/.test(value)) {
 		const utf8Bytes = new TextEncoder().encode(value);
 		const base64 = btoa(String.fromCharCode(...utf8Bytes));
-		return `=?UTF-8?B?${base64}?=`;
+		const maxEncodedLength = 75;
+		const encodedWord = `=?UTF-8?B?${base64}?=`;
+		if (encodedWord.length <= maxEncodedLength) return encodedWord;
+		const words = [];
+		let currentBase64 = "";
+		for (let i = 0; i < base64.length; i += 4) {
+			const chunk = base64.slice(i, i + 4);
+			const testWord = `=?UTF-8?B?${currentBase64}${chunk}?=`;
+			if (testWord.length <= maxEncodedLength) currentBase64 += chunk;
+			else {
+				if (currentBase64) words.push(`=?UTF-8?B?${currentBase64}?=`);
+				currentBase64 = chunk;
+			}
+		}
+		if (currentBase64) words.push(`=?UTF-8?B?${currentBase64}?=`);
+		return words.join(" ");
 	}
 	return value;
 }
 function encodeQuotedPrintable(text) {
-	return text.replace(/[^\x20-\x7E]/g, (char) => {
-		const code = char.charCodeAt(0);
-		if (code < 256) return `=${code.toString(16).toUpperCase().padStart(2, "0")}`;
-		const utf8 = new TextEncoder().encode(char);
-		return Array.from(utf8).map((byte) => `=${byte.toString(16).toUpperCase().padStart(2, "0")}`).join("");
-	}).replace(/=$/gm, "=3D").replace(/^\./, "=2E");
+	const utf8Bytes = new TextEncoder().encode(text);
+	let result = "";
+	let lineLength = 0;
+	const maxLineLength = 76;
+	for (let i = 0; i < utf8Bytes.length; i++) {
+		const byte = utf8Bytes[i];
+		let encoded = "";
+		if (byte < 32 || byte > 126 || byte === 61 || byte === 46 && lineLength === 0) encoded = `=${byte.toString(16).toUpperCase().padStart(2, "0")}`;
+		else encoded = String.fromCharCode(byte);
+		if (lineLength + encoded.length > maxLineLength) {
+			result += "=\r\n";
+			lineLength = 0;
+		}
+		result += encoded;
+		lineLength += encoded.length;
+		if (byte === 13 && i + 1 < utf8Bytes.length && utf8Bytes[i + 1] === 10) {
+			i++;
+			result += String.fromCharCode(10);
+			lineLength = 0;
+		} else if (byte === 10 && (i === 0 || utf8Bytes[i - 1] !== 13)) lineLength = 0;
+	}
+	return result;
 }
 function encodeBase64(data) {
 	const base64 = btoa(String.fromCharCode(...data));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/smtp",
-  "version": "0.2.0-dev.20+303f6594",
+  "version": "0.2.0-dev.24+97755606",
   "description": "SMTP transport for Upyo email library",
   "keywords": [
     "email",
@@ -14,7 +14,7 @@
     "email": "hong@minhee.org",
     "url": "https://hongminhee.org/"
   },
-  "homepage": "https://upyo.org/",
+  "homepage": "https://upyo.org/transports/smtp",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dahlia/upyo.git",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.2.0-dev.20+303f6594"
+    "@upyo/core": "0.2.0-dev.24+97755606"
   },
   "devDependencies": {
     "@dotenvx/dotenvx": "^1.47.3",