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

package/dist/index.cjs

@@ -263,7 +263,7 @@ const STANDARD_HEADERS = new Set([
 * @throws {RangeError} If the message has more than one tag.
 * @since 0.5.0
 */
-async function convertMessage(message, config) {
+async function convertMessage(message, config, signal) {
 	if (message.tags.length > 1) throw new RangeError("Lettermint supports at most one tag per message.");
 	const emailData = {
 		from: formatAddress(message.sender),
@@ -294,7 +294,16 @@ async function convertMessage(message, config) {
 	}
 	for (const [key, value] of message.headers.entries()) if (!isStandardHeader(key)) headers[key] = value;
 	if (Object.keys(headers).length > 0) emailData.headers = headers;
-	if (message.attachments.length > 0) emailData.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 {
+			emailData.attachments = await Promise.all(message.attachments.map((attachment) => convertAttachment(attachment, combined.signal)));
+		} finally {
+			cancellation.abort();
+			combined.cleanup();
+		}
+	}
 	return emailData;
 }
 function convertSettings(config) {
@@ -311,8 +320,8 @@ function formatAddress(address) {
 	}
 	return address.address;
 }
-async function convertAttachment(attachment) {
-	const content = await attachment.content;
+async function convertAttachment(attachment, signal) {
+	const content = await (0, __upyo_core.readAttachmentContent)(attachment.content, signal);
 	const converted = {
 		filename: attachment.filename,
 		content: uint8ArrayToBase64(content),
@@ -399,7 +408,7 @@ var LettermintTransport = class {
 	async send(message, options) {
 		try {
 			options?.signal?.throwIfAborted();
-			const emailData = await convertMessage(message, this.config);
+			const emailData = await convertMessage(message, this.config, options?.signal);
 			const idempotencyKey = normalizeIdempotencyKey(message.idempotencyKey);
 			options?.signal?.throwIfAborted();
 			const response = await this.httpClient.sendMessage(emailData, options?.signal, idempotencyKey);
@@ -441,9 +450,10 @@ var LettermintTransport = class {
 		const batchData = [];
 		const receipts = [];
 		for (const message of messages) try {
-			batchData.push(await convertMessage(message, this.config));
+			batchData.push(await convertMessage(message, this.config, options?.signal));
 			receipts.push(void 0);
 		} catch (error) {
+			if (isCallerAbort(error, options?.signal)) throw error;
 			receipts.push(createLettermintFailure(error instanceof Error ? error.message : String(error), error));
 		}
 		if (batchData.length === 0) {

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
 /**
@@ -240,7 +240,7 @@ const STANDARD_HEADERS = new Set([
 * @throws {RangeError} If the message has more than one tag.
 * @since 0.5.0
 */
-async function convertMessage(message, config) {
+async function convertMessage(message, config, signal) {
 	if (message.tags.length > 1) throw new RangeError("Lettermint supports at most one tag per message.");
 	const emailData = {
 		from: formatAddress(message.sender),
@@ -271,7 +271,16 @@ async function convertMessage(message, config) {
 	}
 	for (const [key, value] of message.headers.entries()) if (!isStandardHeader(key)) headers[key] = value;
 	if (Object.keys(headers).length > 0) emailData.headers = headers;
-	if (message.attachments.length > 0) emailData.attachments = await Promise.all(message.attachments.map(convertAttachment));
+	if (message.attachments.length > 0) {
+		const cancellation = new AbortController();
+		const combined = combineSignals(cancellation.signal, signal);
+		try {
+			emailData.attachments = await Promise.all(message.attachments.map((attachment) => convertAttachment(attachment, combined.signal)));
+		} finally {
+			cancellation.abort();
+			combined.cleanup();
+		}
+	}
 	return emailData;
 }
 function convertSettings(config) {
@@ -288,8 +297,8 @@ function formatAddress(address) {
 	}
 	return address.address;
 }
-async function convertAttachment(attachment) {
-	const content = await attachment.content;
+async function convertAttachment(attachment, signal) {
+	const content = await readAttachmentContent(attachment.content, signal);
 	const converted = {
 		filename: attachment.filename,
 		content: uint8ArrayToBase64(content),
@@ -376,7 +385,7 @@ var LettermintTransport = class {
 	async send(message, options) {
 		try {
 			options?.signal?.throwIfAborted();
-			const emailData = await convertMessage(message, this.config);
+			const emailData = await convertMessage(message, this.config, options?.signal);
 			const idempotencyKey = normalizeIdempotencyKey(message.idempotencyKey);
 			options?.signal?.throwIfAborted();
 			const response = await this.httpClient.sendMessage(emailData, options?.signal, idempotencyKey);
@@ -418,9 +427,10 @@ var LettermintTransport = class {
 		const batchData = [];
 		const receipts = [];
 		for (const message of messages) try {
-			batchData.push(await convertMessage(message, this.config));
+			batchData.push(await convertMessage(message, this.config, options?.signal));
 			receipts.push(void 0);
 		} catch (error) {
+			if (isCallerAbort(error, options?.signal)) throw error;
 			receipts.push(createLettermintFailure(error instanceof Error ? error.message : String(error), error));
 		}
 		if (batchData.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/lettermint",
-  "version": "0.6.0-dev.311",
+  "version": "0.6.0-dev.314",
   "description": "Lettermint 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",