@upyo/mailtrap 0.6.0-dev.311 → 0.6.0-dev.312

package/dist/index.cjs

@@ -263,20 +263,20 @@ function parseErrorMessage(text, statusCode) {
 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) {
@@ -346,7 +346,16 @@ async function convertMessage(message, config, signal) {
 	}
 	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((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;
 }
@@ -368,7 +377,7 @@ function formatAddress(address) {
 }
 async function convertAttachment(attachment, signal) {
 	signal?.throwIfAborted();
-	const contentBytes = await waitForAttachmentContent(attachment.content, signal);
+	const contentBytes = await (0, __upyo_core.readAttachmentContent)(attachment.content, signal);
 	signal?.throwIfAborted();
 	const converted = {
 		content: uint8ArrayToBase64(contentBytes),
@@ -381,28 +390,6 @@ async function convertAttachment(attachment, signal) {
 	} else converted.disposition = "attachment";
 	return converted;
 }
-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 });
-		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 uint8ArrayToBase64(bytes) {
 	const nativeToBase64 = getNativeToBase64(bytes);
 	if (nativeToBase64 != null) return nativeToBase64();

package/dist/index.js

@@ -1,4 +1,4 @@
-import { combineSignals, createFailedReceipt } from "@upyo/core";
+import { combineSignals, createFailedReceipt, readAttachmentContent } from "@upyo/core";
 
 //#region src/config.ts
 const DEFAULT_SEND_BASE_URL = "https://send.api.mailtrap.io";
@@ -240,20 +240,20 @@ function parseErrorMessage(text, statusCode) {
 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) {
@@ -323,7 +323,16 @@ async function convertMessage(message, config, signal) {
 	}
 	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((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;
 }
@@ -345,7 +354,7 @@ function formatAddress(address) {
 }
 async function convertAttachment(attachment, signal) {
 	signal?.throwIfAborted();
-	const contentBytes = await waitForAttachmentContent(attachment.content, signal);
+	const contentBytes = await readAttachmentContent(attachment.content, signal);
 	signal?.throwIfAborted();
 	const converted = {
 		content: uint8ArrayToBase64(contentBytes),
@@ -358,28 +367,6 @@ async function convertAttachment(attachment, signal) {
 	} else converted.disposition = "attachment";
 	return converted;
 }
-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 });
-		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 uint8ArrayToBase64(bytes) {
 	const nativeToBase64 = getNativeToBase64(bytes);
 	if (nativeToBase64 != null) return nativeToBase64();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/mailtrap",
-  "version": "0.6.0-dev.311",
+  "version": "0.6.0-dev.312",
   "description": "Mailtrap 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.312+646e2370"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",