@upyo/smtp 0.2.0 → 0.2.1-dev.29

package/dist/index.cjs

@@ -23,7 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 const node_net = __toESM(require("node:net"));
 const node_tls = __toESM(require("node:tls"));
-const __upyo_core = __toESM(require("@upyo/core"));
+const node_buffer = __toESM(require("node:buffer"));
 
 //#region src/config.ts
 /**
@@ -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: ${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(`From: ${encodeAddress(message.sender)}`);
+	lines.push(`To: ${message.recipients.map(encodeAddress).join(", ")}`);
+	if (message.ccRecipients.length > 0) lines.push(`Cc: ${message.ccRecipients.map(encodeAddress).join(", ")}`);
+	if (message.replyRecipients.length > 0) lines.push(`Reply-To: ${message.replyRecipients.map(encodeAddress).join(", ")}`);
 	lines.push(`Subject: ${encodeHeaderValue(message.subject)}`);
 	lines.push(`Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`);
 	lines.push(`Message-ID: <${generateMessageId()}>`);
@@ -361,10 +361,15 @@ function generateMessageId() {
 	const random = Math.random().toString(36).substr(2, 9);
 	return `${timestamp}.${random}@upyo.local`;
 }
+function encodeAddress(address) {
+	if (address.name == null) return address.address;
+	const encodedDisplayName = encodeHeaderValue(address.name);
+	return `${encodedDisplayName} <${address.address}>`;
+}
 function encodeHeaderValue(value) {
 	if (!/^[\x20-\x7E]*$/.test(value)) {
 		const utf8Bytes = new TextEncoder().encode(value);
-		const base64 = btoa(String.fromCharCode(...utf8Bytes));
+		const base64 = node_buffer.Buffer.from(utf8Bytes).toString("base64");
 		const maxEncodedLength = 75;
 		const encodedWord = `=?UTF-8?B?${base64}?=`;
 		if (encodedWord.length <= maxEncodedLength) return encodedWord;
@@ -409,7 +414,7 @@ function encodeQuotedPrintable(text) {
 	return result;
 }
 function encodeBase64(data) {
-	const base64 = btoa(String.fromCharCode(...data));
+	const base64 = node_buffer.Buffer.from(data).toString("base64");
 	return base64.replace(/(.{76})/g, "$1\r\n").trim();
 }
 

package/dist/index.js

@@ -1,6 +1,6 @@
 import { Socket } from "node:net";
 import { connect } from "node:tls";
-import { formatAddress } from "@upyo/core";
+import { Buffer } from "node:buffer";
 
 //#region src/config.ts
 /**
@@ -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: ${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(`From: ${encodeAddress(message.sender)}`);
+	lines.push(`To: ${message.recipients.map(encodeAddress).join(", ")}`);
+	if (message.ccRecipients.length > 0) lines.push(`Cc: ${message.ccRecipients.map(encodeAddress).join(", ")}`);
+	if (message.replyRecipients.length > 0) lines.push(`Reply-To: ${message.replyRecipients.map(encodeAddress).join(", ")}`);
 	lines.push(`Subject: ${encodeHeaderValue(message.subject)}`);
 	lines.push(`Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`);
 	lines.push(`Message-ID: <${generateMessageId()}>`);
@@ -338,10 +338,15 @@ function generateMessageId() {
 	const random = Math.random().toString(36).substr(2, 9);
 	return `${timestamp}.${random}@upyo.local`;
 }
+function encodeAddress(address) {
+	if (address.name == null) return address.address;
+	const encodedDisplayName = encodeHeaderValue(address.name);
+	return `${encodedDisplayName} <${address.address}>`;
+}
 function encodeHeaderValue(value) {
 	if (!/^[\x20-\x7E]*$/.test(value)) {
 		const utf8Bytes = new TextEncoder().encode(value);
-		const base64 = btoa(String.fromCharCode(...utf8Bytes));
+		const base64 = Buffer.from(utf8Bytes).toString("base64");
 		const maxEncodedLength = 75;
 		const encodedWord = `=?UTF-8?B?${base64}?=`;
 		if (encodedWord.length <= maxEncodedLength) return encodedWord;
@@ -386,7 +391,7 @@ function encodeQuotedPrintable(text) {
 	return result;
 }
 function encodeBase64(data) {
-	const base64 = btoa(String.fromCharCode(...data));
+	const base64 = Buffer.from(data).toString("base64");
 	return base64.replace(/(.{76})/g, "$1\r\n").trim();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/smtp",
-  "version": "0.2.0",
+  "version": "0.2.1-dev.29+e2006b62",
   "description": "SMTP transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.2.0"
+    "@upyo/core": "0.2.1-dev.29+e2006b62"
   },
   "devDependencies": {
     "@dotenvx/dotenvx": "^1.47.3",