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

package/dist/index.cjs

@@ -249,7 +249,16 @@ async function convertMessage(message, _config, options = {}) {
 		emailData.html = message.content.html;
 		if (message.content.text) emailData.text = message.content.text;
 	} else emailData.text = message.content.text;
-	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, options.signal);
+		try {
+			emailData.attachments = await Promise.all(message.attachments.map((attachment) => convertAttachment(attachment, combined.signal)));
+		} finally {
+			cancellation.abort();
+			combined.cleanup();
+		}
+	}
 	if (message.tags.length > 0) emailData.tags = message.tags.map((tag, index) => ({
 		name: `tag${index + 1}`,
 		value: tag
@@ -306,8 +315,8 @@ function formatAddress(address) {
 * @param attachment - The Upyo attachment to convert
 * @returns Resend attachment object
 */
-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 resendAttachment = {
 		filename: attachment.filename,
 		content: await uint8ArrayToBase64(content)
@@ -333,8 +342,11 @@ function uint8ArrayToBase64(bytes) {
 		const bitmap = a << 16 | b << 8 | c;
 		result += chars.charAt(bitmap >> 18 & 63) + chars.charAt(bitmap >> 12 & 63) + chars.charAt(bitmap >> 6 & 63) + chars.charAt(bitmap & 63);
 	}
-	const padding = 3 - (bytes.length - 1) % 3;
-	if (padding < 3) result = result.slice(0, -padding) + "=".repeat(padding);
+	const remainder = bytes.length % 3;
+	if (remainder !== 0) {
+		const padding = 3 - remainder;
+		result = result.slice(0, -padding) + "=".repeat(padding);
+	}
 	return result;
 }
 /**
@@ -452,7 +464,7 @@ var ResendTransport = class {
 		try {
 			options?.signal?.throwIfAborted();
 			const idempotencyKey = message.idempotencyKey ?? generateIdempotencyKey();
-			const emailData = await convertMessage(message, this.config);
+			const emailData = await convertMessage(message, this.config, { signal: options?.signal });
 			options?.signal?.throwIfAborted();
 			const response = await this.httpClient.sendMessage(emailData, options?.signal, idempotencyKey);
 			return {

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
 /**
@@ -226,7 +226,16 @@ async function convertMessage(message, _config, options = {}) {
 		emailData.html = message.content.html;
 		if (message.content.text) emailData.text = message.content.text;
 	} else emailData.text = message.content.text;
-	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, options.signal);
+		try {
+			emailData.attachments = await Promise.all(message.attachments.map((attachment) => convertAttachment(attachment, combined.signal)));
+		} finally {
+			cancellation.abort();
+			combined.cleanup();
+		}
+	}
 	if (message.tags.length > 0) emailData.tags = message.tags.map((tag, index) => ({
 		name: `tag${index + 1}`,
 		value: tag
@@ -283,8 +292,8 @@ function formatAddress(address) {
 * @param attachment - The Upyo attachment to convert
 * @returns Resend attachment object
 */
-async function convertAttachment(attachment) {
-	const content = await attachment.content;
+async function convertAttachment(attachment, signal) {
+	const content = await readAttachmentContent(attachment.content, signal);
 	const resendAttachment = {
 		filename: attachment.filename,
 		content: await uint8ArrayToBase64(content)
@@ -310,8 +319,11 @@ function uint8ArrayToBase64(bytes) {
 		const bitmap = a << 16 | b << 8 | c;
 		result += chars.charAt(bitmap >> 18 & 63) + chars.charAt(bitmap >> 12 & 63) + chars.charAt(bitmap >> 6 & 63) + chars.charAt(bitmap & 63);
 	}
-	const padding = 3 - (bytes.length - 1) % 3;
-	if (padding < 3) result = result.slice(0, -padding) + "=".repeat(padding);
+	const remainder = bytes.length % 3;
+	if (remainder !== 0) {
+		const padding = 3 - remainder;
+		result = result.slice(0, -padding) + "=".repeat(padding);
+	}
 	return result;
 }
 /**
@@ -429,7 +441,7 @@ var ResendTransport = class {
 		try {
 			options?.signal?.throwIfAborted();
 			const idempotencyKey = message.idempotencyKey ?? generateIdempotencyKey();
-			const emailData = await convertMessage(message, this.config);
+			const emailData = await convertMessage(message, this.config, { signal: options?.signal });
 			options?.signal?.throwIfAborted();
 			const response = await this.httpClient.sendMessage(emailData, options?.signal, idempotencyKey);
 			return {

package/package.json

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