@upyo/ses 0.6.0-dev.309 → 0.6.0-dev.312

package/dist/index.cjs

@@ -275,7 +275,7 @@ var SesApiError = class extends Error {
 
 //#endregion
 //#region src/message-converter.ts
-async function convertMessage(message, config) {
+async function convertMessage(message, config, signal) {
 	const destination = {};
 	if (message.recipients.length > 0) destination.ToAddresses = message.recipients.map(formatAddress);
 	if (message.ccRecipients.length > 0) destination.CcAddresses = message.ccRecipients.map(formatAddress);
@@ -287,7 +287,7 @@ async function convertMessage(message, config) {
 	};
 	if (message.replyRecipients.length > 0) sesMessage.ReplyToAddresses = message.replyRecipients.map(formatAddress);
 	if (config.configurationSetName) sesMessage.ConfigurationSetName = config.configurationSetName;
-	sesMessage.Content.Simple = await createSimpleContent(message);
+	sesMessage.Content.Simple = await createSimpleContent(message, signal);
 	const tags = [];
 	if (message.tags.length > 0) for (const tag of message.tags) tags.push({
 		Name: "category",
@@ -304,7 +304,7 @@ async function convertMessage(message, config) {
 	if (tags.length > 0) sesMessage.Tags = tags;
 	return sesMessage;
 }
-async function createSimpleContent(message) {
+async function createSimpleContent(message, signal) {
 	const content = {
 		Subject: {
 			Data: message.subject,
@@ -325,18 +325,29 @@ async function createSimpleContent(message) {
 		Data: message.content.text,
 		Charset: "UTF-8"
 	};
-	if (message.attachments.length > 0) content.Attachments = await Promise.all(message.attachments.map(async (attachment) => {
-		const contentBytes = await attachment.content;
-		const base64Content = btoa(String.fromCharCode(...contentBytes));
-		return {
-			FileName: attachment.filename,
-			ContentType: attachment.contentType || "application/octet-stream",
-			ContentDisposition: attachment.inline ? "INLINE" : "ATTACHMENT",
-			ContentId: attachment.contentId,
-			ContentTransferEncoding: "BASE64",
-			RawContent: base64Content
-		};
-	}));
+	if (message.attachments.length > 0) {
+		const cancellation = new AbortController();
+		const combined = (0, __upyo_core.combineSignals)(cancellation.signal, signal);
+		try {
+			content.Attachments = await Promise.all(message.attachments.map(async (attachment) => {
+				const contentBytes = await (0, __upyo_core.readAttachmentContent)(attachment.content, combined.signal);
+				const parts = [];
+				for (let offset = 0; offset < contentBytes.length; offset += 8192) parts.push(String.fromCharCode(...contentBytes.subarray(offset, offset + 8192)));
+				const base64Content = btoa(parts.join(""));
+				return {
+					FileName: attachment.filename,
+					ContentType: attachment.contentType || "application/octet-stream",
+					ContentDisposition: attachment.inline ? "INLINE" : "ATTACHMENT",
+					ContentId: attachment.contentId,
+					ContentTransferEncoding: "BASE64",
+					RawContent: base64Content
+				};
+			}));
+		} finally {
+			cancellation.abort();
+			combined.cleanup();
+		}
+	}
 	return content;
 }
 function formatAddress(address) {
@@ -427,7 +438,7 @@ var SesTransport = class {
 	async send(message, options) {
 		options?.signal?.throwIfAborted();
 		try {
-			const sesMessage = await convertMessage(message, this.config);
+			const sesMessage = await convertMessage(message, this.config, options?.signal);
 			options?.signal?.throwIfAborted();
 			const response = await this.httpClient.sendMessage(sesMessage, options?.signal);
 			const messageId = this.extractMessageId(response);

package/dist/index.js

@@ -1,4 +1,4 @@
-import { combineSignals, createFailedReceipt, parseRetryAfter } from "@upyo/core";
+import { combineSignals, createFailedReceipt, parseRetryAfter, readAttachmentContent } from "@upyo/core";
 
 //#region src/config.ts
 /**
@@ -252,7 +252,7 @@ var SesApiError = class extends Error {
 
 //#endregion
 //#region src/message-converter.ts
-async function convertMessage(message, config) {
+async function convertMessage(message, config, signal) {
 	const destination = {};
 	if (message.recipients.length > 0) destination.ToAddresses = message.recipients.map(formatAddress);
 	if (message.ccRecipients.length > 0) destination.CcAddresses = message.ccRecipients.map(formatAddress);
@@ -264,7 +264,7 @@ async function convertMessage(message, config) {
 	};
 	if (message.replyRecipients.length > 0) sesMessage.ReplyToAddresses = message.replyRecipients.map(formatAddress);
 	if (config.configurationSetName) sesMessage.ConfigurationSetName = config.configurationSetName;
-	sesMessage.Content.Simple = await createSimpleContent(message);
+	sesMessage.Content.Simple = await createSimpleContent(message, signal);
 	const tags = [];
 	if (message.tags.length > 0) for (const tag of message.tags) tags.push({
 		Name: "category",
@@ -281,7 +281,7 @@ async function convertMessage(message, config) {
 	if (tags.length > 0) sesMessage.Tags = tags;
 	return sesMessage;
 }
-async function createSimpleContent(message) {
+async function createSimpleContent(message, signal) {
 	const content = {
 		Subject: {
 			Data: message.subject,
@@ -302,18 +302,29 @@ async function createSimpleContent(message) {
 		Data: message.content.text,
 		Charset: "UTF-8"
 	};
-	if (message.attachments.length > 0) content.Attachments = await Promise.all(message.attachments.map(async (attachment) => {
-		const contentBytes = await attachment.content;
-		const base64Content = btoa(String.fromCharCode(...contentBytes));
-		return {
-			FileName: attachment.filename,
-			ContentType: attachment.contentType || "application/octet-stream",
-			ContentDisposition: attachment.inline ? "INLINE" : "ATTACHMENT",
-			ContentId: attachment.contentId,
-			ContentTransferEncoding: "BASE64",
-			RawContent: base64Content
-		};
-	}));
+	if (message.attachments.length > 0) {
+		const cancellation = new AbortController();
+		const combined = combineSignals(cancellation.signal, signal);
+		try {
+			content.Attachments = await Promise.all(message.attachments.map(async (attachment) => {
+				const contentBytes = await readAttachmentContent(attachment.content, combined.signal);
+				const parts = [];
+				for (let offset = 0; offset < contentBytes.length; offset += 8192) parts.push(String.fromCharCode(...contentBytes.subarray(offset, offset + 8192)));
+				const base64Content = btoa(parts.join(""));
+				return {
+					FileName: attachment.filename,
+					ContentType: attachment.contentType || "application/octet-stream",
+					ContentDisposition: attachment.inline ? "INLINE" : "ATTACHMENT",
+					ContentId: attachment.contentId,
+					ContentTransferEncoding: "BASE64",
+					RawContent: base64Content
+				};
+			}));
+		} finally {
+			cancellation.abort();
+			combined.cleanup();
+		}
+	}
 	return content;
 }
 function formatAddress(address) {
@@ -404,7 +415,7 @@ var SesTransport = class {
 	async send(message, options) {
 		options?.signal?.throwIfAborted();
 		try {
-			const sesMessage = await convertMessage(message, this.config);
+			const sesMessage = await convertMessage(message, this.config, options?.signal);
 			options?.signal?.throwIfAborted();
 			const response = await this.httpClient.sendMessage(sesMessage, options?.signal);
 			const messageId = this.extractMessageId(response);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/ses",
-  "version": "0.6.0-dev.309",
+  "version": "0.6.0-dev.312",
   "description": "Amazon SES transport for Upyo email library",
   "keywords": [
     "email",
@@ -55,7 +55,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.6.0-dev.309+0e4d9155"
+    "@upyo/core": "0.6.0-dev.312+646e2370"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",