@upyo/maileroo 0.6.0-dev.223 → 0.6.0-dev.227

package/dist/index.cjs

@@ -134,20 +134,23 @@ var MailerooHttpClient = class {
 		return this.makeRequest(url, messageData, signal);
 	}
 	async makeRequest(url, body, signal) {
-		let lastError = null;
+		let lastError;
 		for (let attempt = 0; attempt <= this.config.retries; attempt++) {
 			signal?.throwIfAborted();
+			let responseText;
 			try {
 				const { response, text } = await this.fetchWithAuth(url, body, signal);
 				if (!response.ok) throw new MailerooApiError(parseErrorMessage(text, response.status), response.status, (0, __upyo_core.parseRetryAfter)(response.headers.get("Retry-After")), attempt + 1);
-				return parseResponse(text);
+				responseText = text;
 			} catch (error) {
 				lastError = error instanceof Error ? error : new Error(String(error));
 				if (signal?.aborted) throw error;
 				if (error instanceof MailerooApiError && !isRetryable(error)) throw error;
 				if (attempt === this.config.retries) throw withAttempts(lastError, attempt + 1);
 				await sleep(calculateRetryDelay(attempt, lastError), signal);
+				continue;
 			}
+			return parseResponse(responseText);
 		}
 		throw lastError ?? /* @__PURE__ */ new Error("Request failed after all retry attempts.");
 	}
@@ -219,20 +222,20 @@ function parseResponse(text) {
 function truncateErrorMessage(message) {
 	return message.length > maxErrorMessageLength ? `${message.slice(0, maxErrorMessageLength)}...` : message;
 }
-function abortReason(signal) {
+function abortReason$1(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(signal));
+			reject(abortReason$1(signal));
 			return;
 		}
 		const timeoutState = {};
 		const onAbort = () => {
 			if (timeoutState.id !== void 0) clearTimeout(timeoutState.id);
 			signal?.removeEventListener("abort", onAbort);
-			reject(abortReason(signal));
+			reject(abortReason$1(signal));
 		};
 		signal?.addEventListener("abort", onAbort, { once: true });
 		if (signal?.aborted) {
@@ -331,7 +334,7 @@ function convertHeaders(message) {
 }
 async function convertAttachment(attachment, signal) {
 	signal?.throwIfAborted();
-	const content = await attachment.content;
+	const content = await waitForAttachmentContent(attachment.content, signal);
 	signal?.throwIfAborted();
 	return {
 		file_name: getAttachmentFileName(attachment),
@@ -340,14 +343,35 @@ async function convertAttachment(attachment, signal) {
 		inline: attachment.inline || void 0
 	};
 }
+function waitForAttachmentContent(content, signal) {
+	if (signal == null) return Promise.resolve(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;
 }
 function uint8ArrayToBase64(bytes) {
 	const nativeToBase64 = getNativeToBase64(bytes);
 	if (nativeToBase64 != null) return nativeToBase64();
-	const bufferConverter = getBufferBase64Converter();
-	if (bufferConverter != null) return bufferConverter.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString("base64");
+	const bufferBase64 = getBufferBase64(bytes);
+	if (bufferBase64 != null) return bufferBase64;
 	const chunkSize = 4096;
 	const chunks = [];
 	for (let offset = 0; offset < bytes.length; offset += chunkSize) chunks.push(String.fromCharCode(...bytes.subarray(offset, offset + chunkSize)));
@@ -359,9 +383,17 @@ function getNativeToBase64(bytes) {
 	if (typeof toBase64 !== "function") return void 0;
 	return () => toBase64.call(bytes);
 }
-function getBufferBase64Converter() {
+function getBufferBase64(bytes) {
 	const candidate = globalThis.Buffer;
-	return typeof candidate?.from === "function" ? candidate : void 0;
+	if (typeof candidate?.from !== "function") return void 0;
+	try {
+		const buffer = candidate.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+		if (buffer == null || typeof buffer.toString !== "function") return void 0;
+		const base64 = buffer.toString("base64");
+		return typeof base64 === "string" ? base64 : void 0;
+	} catch {
+		return void 0;
+	}
 }
 function isStandardHeader(headerName) {
 	return STANDARD_HEADERS.has(headerName.toLowerCase());

package/dist/index.js

@@ -111,20 +111,23 @@ var MailerooHttpClient = class {
 		return this.makeRequest(url, messageData, signal);
 	}
 	async makeRequest(url, body, signal) {
-		let lastError = null;
+		let lastError;
 		for (let attempt = 0; attempt <= this.config.retries; attempt++) {
 			signal?.throwIfAborted();
+			let responseText;
 			try {
 				const { response, text } = await this.fetchWithAuth(url, body, signal);
 				if (!response.ok) throw new MailerooApiError(parseErrorMessage(text, response.status), response.status, parseRetryAfter(response.headers.get("Retry-After")), attempt + 1);
-				return parseResponse(text);
+				responseText = text;
 			} catch (error) {
 				lastError = error instanceof Error ? error : new Error(String(error));
 				if (signal?.aborted) throw error;
 				if (error instanceof MailerooApiError && !isRetryable(error)) throw error;
 				if (attempt === this.config.retries) throw withAttempts(lastError, attempt + 1);
 				await sleep(calculateRetryDelay(attempt, lastError), signal);
+				continue;
 			}
+			return parseResponse(responseText);
 		}
 		throw lastError ?? /* @__PURE__ */ new Error("Request failed after all retry attempts.");
 	}
@@ -196,20 +199,20 @@ function parseResponse(text) {
 function truncateErrorMessage(message) {
 	return message.length > maxErrorMessageLength ? `${message.slice(0, maxErrorMessageLength)}...` : message;
 }
-function abortReason(signal) {
+function abortReason$1(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(signal));
+			reject(abortReason$1(signal));
 			return;
 		}
 		const timeoutState = {};
 		const onAbort = () => {
 			if (timeoutState.id !== void 0) clearTimeout(timeoutState.id);
 			signal?.removeEventListener("abort", onAbort);
-			reject(abortReason(signal));
+			reject(abortReason$1(signal));
 		};
 		signal?.addEventListener("abort", onAbort, { once: true });
 		if (signal?.aborted) {
@@ -308,7 +311,7 @@ function convertHeaders(message) {
 }
 async function convertAttachment(attachment, signal) {
 	signal?.throwIfAborted();
-	const content = await attachment.content;
+	const content = await waitForAttachmentContent(attachment.content, signal);
 	signal?.throwIfAborted();
 	return {
 		file_name: getAttachmentFileName(attachment),
@@ -317,14 +320,35 @@ async function convertAttachment(attachment, signal) {
 		inline: attachment.inline || void 0
 	};
 }
+function waitForAttachmentContent(content, signal) {
+	if (signal == null) return Promise.resolve(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;
 }
 function uint8ArrayToBase64(bytes) {
 	const nativeToBase64 = getNativeToBase64(bytes);
 	if (nativeToBase64 != null) return nativeToBase64();
-	const bufferConverter = getBufferBase64Converter();
-	if (bufferConverter != null) return bufferConverter.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString("base64");
+	const bufferBase64 = getBufferBase64(bytes);
+	if (bufferBase64 != null) return bufferBase64;
 	const chunkSize = 4096;
 	const chunks = [];
 	for (let offset = 0; offset < bytes.length; offset += chunkSize) chunks.push(String.fromCharCode(...bytes.subarray(offset, offset + chunkSize)));
@@ -336,9 +360,17 @@ function getNativeToBase64(bytes) {
 	if (typeof toBase64 !== "function") return void 0;
 	return () => toBase64.call(bytes);
 }
-function getBufferBase64Converter() {
+function getBufferBase64(bytes) {
 	const candidate = globalThis.Buffer;
-	return typeof candidate?.from === "function" ? candidate : void 0;
+	if (typeof candidate?.from !== "function") return void 0;
+	try {
+		const buffer = candidate.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+		if (buffer == null || typeof buffer.toString !== "function") return void 0;
+		const base64 = buffer.toString("base64");
+		return typeof base64 === "string" ? base64 : void 0;
+	} catch {
+		return void 0;
+	}
 }
 function isStandardHeader(headerName) {
 	return STANDARD_HEADERS.has(headerName.toLowerCase());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/maileroo",
-  "version": "0.6.0-dev.223",
+  "version": "0.6.0-dev.227",
   "description": "Maileroo transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.6.0-dev.223+8fde224e"
+    "@upyo/core": "0.6.0-dev.227+4166cf34"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",