@upyo/sendgrid 0.6.0-dev.311 → 0.6.0-dev.314

package/dist/index.cjs

@@ -244,7 +244,7 @@ function createAbortError(signal) {
 * const response = await httpClient.sendMessage(mailData);
 * ```
 */
-async function convertMessage(message, config) {
+async function convertMessage(message, config, signal) {
 	const sendGridMail = {
 		personalizations: [],
 		from: formatAddress(message.sender)
@@ -299,7 +299,16 @@ async function convertMessage(message, config) {
 		...sendGridMail.headers,
 		...customHeaders
 	};
-	if (message.attachments.length > 0) sendGridMail.attachments = await Promise.all(message.attachments.map(convertAttachment));
+	if (message.attachments.length > 0) {
+		const cancellation = new AbortController();
+		const combined = (0, __upyo_core.combineSignals)(cancellation.signal, signal);
+		try {
+			sendGridMail.attachments = await Promise.all(message.attachments.map((attachment) => convertAttachment(attachment, combined.signal)));
+		} finally {
+			cancellation.abort();
+			combined.cleanup();
+		}
+	}
 	const trackingSettings = {};
 	if (config.clickTracking !== void 0) trackingSettings.click_tracking = {
 		enable: config.clickTracking,
@@ -328,9 +337,11 @@ function formatAddress(address) {
 * @param attachment - The attachment to convert
 * @returns Promise that resolves to a SendGrid attachment object
 */
-async function convertAttachment(attachment) {
-	const contentBytes = await attachment.content;
-	const base64Content = btoa(String.fromCharCode(...contentBytes));
+async function convertAttachment(attachment, signal) {
+	const contentBytes = await (0, __upyo_core.readAttachmentContent)(attachment.content, 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(""));
 	const sendGridAttachment = {
 		content: base64Content,
 		filename: attachment.filename
@@ -446,7 +457,7 @@ var SendGridTransport = class {
 	async send(message, options) {
 		options?.signal?.throwIfAborted();
 		try {
-			const mailData = await convertMessage(message, this.config);
+			const mailData = await convertMessage(message, this.config, options?.signal);
 			options?.signal?.throwIfAborted();
 			const response = await this.httpClient.sendMessage(mailData, 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
 /**
@@ -221,7 +221,7 @@ function createAbortError(signal) {
 * const response = await httpClient.sendMessage(mailData);
 * ```
 */
-async function convertMessage(message, config) {
+async function convertMessage(message, config, signal) {
 	const sendGridMail = {
 		personalizations: [],
 		from: formatAddress(message.sender)
@@ -276,7 +276,16 @@ async function convertMessage(message, config) {
 		...sendGridMail.headers,
 		...customHeaders
 	};
-	if (message.attachments.length > 0) sendGridMail.attachments = await Promise.all(message.attachments.map(convertAttachment));
+	if (message.attachments.length > 0) {
+		const cancellation = new AbortController();
+		const combined = combineSignals(cancellation.signal, signal);
+		try {
+			sendGridMail.attachments = await Promise.all(message.attachments.map((attachment) => convertAttachment(attachment, combined.signal)));
+		} finally {
+			cancellation.abort();
+			combined.cleanup();
+		}
+	}
 	const trackingSettings = {};
 	if (config.clickTracking !== void 0) trackingSettings.click_tracking = {
 		enable: config.clickTracking,
@@ -305,9 +314,11 @@ function formatAddress(address) {
 * @param attachment - The attachment to convert
 * @returns Promise that resolves to a SendGrid attachment object
 */
-async function convertAttachment(attachment) {
-	const contentBytes = await attachment.content;
-	const base64Content = btoa(String.fromCharCode(...contentBytes));
+async function convertAttachment(attachment, signal) {
+	const contentBytes = await readAttachmentContent(attachment.content, 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(""));
 	const sendGridAttachment = {
 		content: base64Content,
 		filename: attachment.filename
@@ -423,7 +434,7 @@ var SendGridTransport = class {
 	async send(message, options) {
 		options?.signal?.throwIfAborted();
 		try {
-			const mailData = await convertMessage(message, this.config);
+			const mailData = await convertMessage(message, this.config, options?.signal);
 			options?.signal?.throwIfAborted();
 			const response = await this.httpClient.sendMessage(mailData, options?.signal);
 			const messageId = this.extractMessageId(response);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/sendgrid",
-  "version": "0.6.0-dev.311",
+  "version": "0.6.0-dev.314",
   "description": "SendGrid transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.6.0-dev.311+375af6f4"
+    "@upyo/core": "0.6.0-dev.314+70a7c9c7"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",