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

package/dist/index.cjs

@@ -222,20 +222,20 @@ function parseResponse(text) {
 function truncateErrorMessage(message) {
 	return message.length > maxErrorMessageLength ? `${message.slice(0, maxErrorMessageLength)}...` : message;
 }
-function abortReason$1(signal) {
+function abortReason(signal) {
 	return signal?.reason ?? new DOMException("The operation was aborted.", "AbortError");
 }
 function sleep(ms, signal) {
 	return new Promise((resolve, reject) => {
 		if (signal?.aborted) {
-			reject(abortReason$1(signal));
+			reject(abortReason(signal));
 			return;
 		}
 		const timeoutState = {};
 		const onAbort = () => {
 			if (timeoutState.id !== void 0) clearTimeout(timeoutState.id);
 			signal?.removeEventListener("abort", onAbort);
-			reject(abortReason$1(signal));
+			reject(abortReason(signal));
 		};
 		signal?.addEventListener("abort", onAbort, { once: true });
 		if (signal?.aborted) {
@@ -299,7 +299,16 @@ async function convertMessage(message, config, signal) {
 	if (Object.keys(tags).length > 0) emailData.tags = tags;
 	const headers = convertHeaders(message);
 	if (Object.keys(headers).length > 0) emailData.headers = headers;
-	if (message.attachments.length > 0) emailData.attachments = await Promise.all(message.attachments.map((attachment) => convertAttachment(attachment, signal)));
+	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();
+		}
+	}
 	signal?.throwIfAborted();
 	return emailData;
 }
@@ -363,7 +372,7 @@ function convertHeaders(message) {
 }
 async function convertAttachment(attachment, signal) {
 	signal?.throwIfAborted();
-	const content = await waitForAttachmentContent(attachment.content, signal);
+	const content = await (0, __upyo_core.readAttachmentContent)(attachment.content, signal);
 	signal?.throwIfAborted();
 	return {
 		file_name: getAttachmentFileName(attachment),
@@ -372,28 +381,6 @@ async function convertAttachment(attachment, signal) {
 		inline: attachment.inline || void 0
 	};
 }
-function waitForAttachmentContent(content, signal) {
-	if (content instanceof Uint8Array) return signal?.aborted ? Promise.reject(abortReason(signal)) : Promise.resolve(content);
-	if (signal == null) return content;
-	if (signal.aborted) return Promise.reject(abortReason(signal));
-	return new Promise((resolve, reject) => {
-		const onAbort = () => {
-			signal.removeEventListener("abort", onAbort);
-			reject(abortReason(signal));
-		};
-		signal.addEventListener("abort", onAbort, { once: true });
-		Promise.resolve(content).then((value) => {
-			signal.removeEventListener("abort", onAbort);
-			resolve(value);
-		}, (error) => {
-			signal.removeEventListener("abort", onAbort);
-			reject(error);
-		});
-	});
-}
-function abortReason(signal) {
-	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
-}
 function getAttachmentFileName(attachment) {
 	return attachment.inline && typeof attachment.contentId === "string" && attachment.contentId !== "" ? attachment.contentId : attachment.filename;
 }

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
 /**
@@ -199,20 +199,20 @@ function parseResponse(text) {
 function truncateErrorMessage(message) {
 	return message.length > maxErrorMessageLength ? `${message.slice(0, maxErrorMessageLength)}...` : message;
 }
-function abortReason$1(signal) {
+function abortReason(signal) {
 	return signal?.reason ?? new DOMException("The operation was aborted.", "AbortError");
 }
 function sleep(ms, signal) {
 	return new Promise((resolve, reject) => {
 		if (signal?.aborted) {
-			reject(abortReason$1(signal));
+			reject(abortReason(signal));
 			return;
 		}
 		const timeoutState = {};
 		const onAbort = () => {
 			if (timeoutState.id !== void 0) clearTimeout(timeoutState.id);
 			signal?.removeEventListener("abort", onAbort);
-			reject(abortReason$1(signal));
+			reject(abortReason(signal));
 		};
 		signal?.addEventListener("abort", onAbort, { once: true });
 		if (signal?.aborted) {
@@ -276,7 +276,16 @@ async function convertMessage(message, config, signal) {
 	if (Object.keys(tags).length > 0) emailData.tags = tags;
 	const headers = convertHeaders(message);
 	if (Object.keys(headers).length > 0) emailData.headers = headers;
-	if (message.attachments.length > 0) emailData.attachments = await Promise.all(message.attachments.map((attachment) => convertAttachment(attachment, signal)));
+	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();
+		}
+	}
 	signal?.throwIfAborted();
 	return emailData;
 }
@@ -340,7 +349,7 @@ function convertHeaders(message) {
 }
 async function convertAttachment(attachment, signal) {
 	signal?.throwIfAborted();
-	const content = await waitForAttachmentContent(attachment.content, signal);
+	const content = await readAttachmentContent(attachment.content, signal);
 	signal?.throwIfAborted();
 	return {
 		file_name: getAttachmentFileName(attachment),
@@ -349,28 +358,6 @@ async function convertAttachment(attachment, signal) {
 		inline: attachment.inline || void 0
 	};
 }
-function waitForAttachmentContent(content, signal) {
-	if (content instanceof Uint8Array) return signal?.aborted ? Promise.reject(abortReason(signal)) : Promise.resolve(content);
-	if (signal == null) return content;
-	if (signal.aborted) return Promise.reject(abortReason(signal));
-	return new Promise((resolve, reject) => {
-		const onAbort = () => {
-			signal.removeEventListener("abort", onAbort);
-			reject(abortReason(signal));
-		};
-		signal.addEventListener("abort", onAbort, { once: true });
-		Promise.resolve(content).then((value) => {
-			signal.removeEventListener("abort", onAbort);
-			resolve(value);
-		}, (error) => {
-			signal.removeEventListener("abort", onAbort);
-			reject(error);
-		});
-	});
-}
-function abortReason(signal) {
-	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
-}
 function getAttachmentFileName(attachment) {
 	return attachment.inline && typeof attachment.contentId === "string" && attachment.contentId !== "" ? attachment.contentId : attachment.filename;
 }

package/package.json

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