@c9up/rover 0.1.9 → 0.1.10

package/src/transports/BrevoTransport.ts

@@ -5,7 +5,7 @@ import {
 	type MailTransport,
 	registerTransport,
 } from "../Mail.js";
-import { attachmentsFor } from "../MessageBuilder.js";
+import { attachmentsFor, headerValue } from "../MessageBuilder.js";
 import { RoverError } from "../RoverError.js";
 import { fetchWithTimeout, wrapFetchNetworkError } from "./fetchError.js";
 
@@ -99,7 +99,8 @@ export class BrevoTransport implements MailTransport {
 		const customHeaders = Object.entries(message.headers);
 		if (customHeaders.length > 0) {
 			body.headers = {};
-			for (const [k, v] of customHeaders) {
+			for (const [k, raw] of customHeaders) {
+				const v = headerValue(raw);
 				body.headers[stripCrlf(k)] = Array.isArray(v)
 					? v.map(stripCrlf).join(", ")
 					: stripCrlf(v);

package/src/transports/MailgunTransport.ts

@@ -7,7 +7,7 @@ import {
 	type MailTransport,
 	registerTransport,
 } from "../Mail.js";
-import { attachmentsFor } from "../MessageBuilder.js";
+import { attachmentsFor, headerValue } from "../MessageBuilder.js";
 import { RoverError } from "../RoverError.js";
 
 const stripCrlf = (v: string): string => v.replace(/[\r\n]/g, "");
@@ -128,7 +128,8 @@ export class MailgunTransport implements MailTransport {
 		if (message.text) data.text = message.text;
 		if (message.html) data.html = message.html;
 		if (message.replyTo) data["h:Reply-To"] = stripCrlf(message.replyTo);
-		for (const [k, v] of Object.entries(message.headers)) {
+		for (const [k, raw] of Object.entries(message.headers)) {
+			const v = headerValue(raw);
 			data[`h:${stripCrlf(k)}`] = Array.isArray(v)
 				? v.map(stripCrlf).join(", ")
 				: stripCrlf(v);

package/src/transports/ResendTransport.ts

@@ -5,7 +5,7 @@ import {
 	type MailTransport,
 	registerTransport,
 } from "../Mail.js";
-import { attachmentsFor } from "../MessageBuilder.js";
+import { attachmentsFor, headerValue } from "../MessageBuilder.js";
 import { RoverError } from "../RoverError.js";
 import { fetchWithTimeout, wrapFetchNetworkError } from "./fetchError.js";
 
@@ -92,7 +92,8 @@ export class ResendTransport implements MailTransport {
 		const customHeaders = Object.entries(message.headers);
 		if (customHeaders.length > 0) {
 			body.headers = {};
-			for (const [k, v] of customHeaders) {
+			for (const [k, raw] of customHeaders) {
+				const v = headerValue(raw);
 				body.headers[stripCrlf(k)] = Array.isArray(v)
 					? v.map(stripCrlf).join(", ")
 					: stripCrlf(v);

package/src/transports/SendGridTransport.ts

@@ -8,7 +8,7 @@ import {
 	type MailTransport,
 	registerTransport,
 } from "../Mail.js";
-import { attachmentsFor } from "../MessageBuilder.js";
+import { attachmentsFor, headerValue } from "../MessageBuilder.js";
 import { RoverError } from "../RoverError.js";
 
 const stripCrlf = (v: string): string => v.replace(/[\r\n]/g, "");
@@ -91,10 +91,13 @@ export class SendGridTransport implements MailTransport {
 			...(Object.keys(message.headers).length
 				? {
 						headers: Object.fromEntries(
-							Object.entries(message.headers).map(([k, v]) => [
-								stripCrlf(k),
-								Array.isArray(v) ? v.map(stripCrlf).join(", ") : stripCrlf(v),
-							]),
+							Object.entries(message.headers).map(([k, raw]) => {
+								const v = headerValue(raw);
+								return [
+									stripCrlf(k),
+									Array.isArray(v) ? v.map(stripCrlf).join(", ") : stripCrlf(v),
+								];
+							}),
 						),
 					}
 				: {}),

package/src/transports/SesTransport.ts

@@ -281,10 +281,17 @@ function buildRawMime(message: MailMessage): string {
 		"content-transfer-encoding",
 		"content-disposition",
 	]);
-	for (const [k, v] of Object.entries(message.headers)) {
+	for (const [k, raw] of Object.entries(message.headers)) {
 		if (reserved.has(k.toLowerCase())) continue;
+		// A PREPARED header is the one case the flag actually decides: this
+		// builds raw MIME, and re-encoding a value that is already exactly what
+		// must go on the wire — a signature, a pre-encoded id — corrupts it.
+		if (!Array.isArray(raw) && typeof raw !== "string") {
+			parts.push(`${stripCrlf(k)}: ${stripCrlf(raw.value)}`);
+			continue;
+		}
 		parts.push(
-			`${stripCrlf(k)}: ${encodeHeaderWord(Array.isArray(v) ? v.join(", ") : v)}`,
+			`${stripCrlf(k)}: ${encodeHeaderWord(Array.isArray(raw) ? raw.join(", ") : raw)}`,
 		);
 	}
 

package/src/transports/SparkPostTransport.ts

@@ -5,7 +5,7 @@ import {
 	type MailTransport,
 	registerTransport,
 } from "../Mail.js";
-import { attachmentsFor } from "../MessageBuilder.js";
+import { attachmentsFor, headerValue } from "../MessageBuilder.js";
 import { RoverError } from "../RoverError.js";
 import { fetchWithTimeout, wrapFetchNetworkError } from "./fetchError.js";
 
@@ -103,7 +103,8 @@ export class SparkPostTransport implements MailTransport {
 		if (message.text) body.content.text = message.text;
 		if (message.replyTo) body.content.reply_to = stripCrlf(message.replyTo);
 		const headers: Record<string, string> = {};
-		for (const [k, v] of Object.entries(message.headers)) {
+		for (const [k, raw] of Object.entries(message.headers)) {
+			const v = headerValue(raw);
 			headers[stripCrlf(k)] = Array.isArray(v)
 				? v.map(stripCrlf).join(", ")
 				: stripCrlf(v);