@upyo/jmap 0.4.0-dev.75 → 0.4.0-dev.77

package/dist/index.cjs

@@ -114,10 +114,10 @@ function createJmapConfig(config) {
 		basicAuth: config.basicAuth ?? null,
 		accountId: config.accountId ?? null,
 		identityId: config.identityId ?? null,
-		timeout: config.timeout || 3e4,
-		retries: config.retries || 3,
+		timeout: config.timeout ?? 3e4,
+		retries: config.retries ?? 3,
 		headers: config.headers ?? {},
-		sessionCacheTtl: config.sessionCacheTtl || 3e5,
+		sessionCacheTtl: config.sessionCacheTtl ?? 3e5,
 		baseUrl: config.baseUrl ?? null
 	};
 }
@@ -207,12 +207,18 @@ var JmapHttpClient = class {
 		const timeoutId = setTimeout(() => controller.abort(), this.config.timeout);
 		let combinedSignal = controller.signal;
 		if (signal) {
-			if (signal.aborted) {
-				clearTimeout(timeoutId);
-				signal.throwIfAborted();
+			const AbortSignalAny = AbortSignal.any;
+			if (typeof AbortSignalAny === "function") combinedSignal = AbortSignalAny([signal, controller.signal]);
+			else {
+				if (signal.aborted) {
+					clearTimeout(timeoutId);
+					signal.throwIfAborted();
+				}
+				signal.addEventListener("abort", () => {
+					controller.abort(signal.reason);
+				});
+				combinedSignal = controller.signal;
 			}
-			signal.addEventListener("abort", () => controller.abort());
-			combinedSignal = controller.signal;
 		}
 		try {
 			return await globalThis.fetch(url, {
@@ -527,10 +533,14 @@ var JmapTransport = class {
 		const messageArray = [];
 		for await (const message of messages) messageArray.push(message);
 		if (messageArray.length === 0) return;
+		let processingStage = "initialization";
+		let attachmentsUploadedCount = 0;
 		try {
 			signal?.throwIfAborted();
+			processingStage = "session fetch";
 			const session = await this.getSession(signal);
 			signal?.throwIfAborted();
+			processingStage = "account discovery";
 			const accountId = this.config.accountId ?? findMailAccount(session);
 			if (!accountId) {
 				for (let i = 0; i < messageArray.length; i++) yield {
@@ -539,17 +549,22 @@ var JmapTransport = class {
 				};
 				return;
 			}
+			processingStage = "mailbox discovery";
 			const draftsMailboxId = await this.getDraftsMailboxId(session, accountId, signal);
 			signal?.throwIfAborted();
+			processingStage = "identity resolution";
 			const identityMap = await this.getIdentityMap(session, accountId, signal);
 			signal?.throwIfAborted();
+			processingStage = "attachment upload";
 			const allUploadedBlobs = /* @__PURE__ */ new Map();
 			for (let i = 0; i < messageArray.length; i++) {
 				const message = messageArray[i];
 				const uploadedBlobs = await this.uploadAttachments(session, accountId, message.attachments, signal);
 				allUploadedBlobs.set(i, uploadedBlobs);
+				attachmentsUploadedCount = i + 1;
 				signal?.throwIfAborted();
 			}
+			processingStage = "message conversion";
 			const emailCreates = {};
 			const submissionCreates = {};
 			for (let i = 0; i < messageArray.length; i++) {
@@ -564,6 +579,7 @@ var JmapTransport = class {
 					emailId: `#draft${i}`
 				};
 			}
+			processingStage = "batch request execution";
 			const response = await this.httpClient.executeRequest(session.apiUrl, {
 				using: [
 					JMAP_CAPABILITIES.core,
@@ -588,10 +604,12 @@ var JmapTransport = class {
 			}, signal);
 			for (let i = 0; i < messageArray.length; i++) yield this.parseBatchResponseForIndex(response, i);
 		} catch (error) {
-			const errorMessage = error instanceof Error && error.name === "AbortError" ? `Request aborted: ${error.message}` : error instanceof JmapApiError ? error.message : error instanceof Error ? error.message : String(error);
+			const baseMessage = error instanceof Error && error.name === "AbortError" ? `Request aborted: ${error.message}` : error instanceof JmapApiError ? error.message : error instanceof Error ? error.message : String(error);
+			let detailedMessage = `Failed during ${processingStage}: ${baseMessage}`;
+			if (processingStage === "attachment upload" && attachmentsUploadedCount > 0) detailedMessage += ` (${attachmentsUploadedCount}/${messageArray.length} messages had attachments uploaded before failure)`;
 			for (let i = 0; i < messageArray.length; i++) yield {
 				successful: false,
-				errorMessages: [errorMessage]
+				errorMessages: [detailedMessage]
 			};
 		}
 	}

package/dist/index.js

@@ -113,10 +113,10 @@ function createJmapConfig(config) {
 		basicAuth: config.basicAuth ?? null,
 		accountId: config.accountId ?? null,
 		identityId: config.identityId ?? null,
-		timeout: config.timeout || 3e4,
-		retries: config.retries || 3,
+		timeout: config.timeout ?? 3e4,
+		retries: config.retries ?? 3,
 		headers: config.headers ?? {},
-		sessionCacheTtl: config.sessionCacheTtl || 3e5,
+		sessionCacheTtl: config.sessionCacheTtl ?? 3e5,
 		baseUrl: config.baseUrl ?? null
 	};
 }
@@ -206,12 +206,18 @@ var JmapHttpClient = class {
 		const timeoutId = setTimeout(() => controller.abort(), this.config.timeout);
 		let combinedSignal = controller.signal;
 		if (signal) {
-			if (signal.aborted) {
-				clearTimeout(timeoutId);
-				signal.throwIfAborted();
+			const AbortSignalAny = AbortSignal.any;
+			if (typeof AbortSignalAny === "function") combinedSignal = AbortSignalAny([signal, controller.signal]);
+			else {
+				if (signal.aborted) {
+					clearTimeout(timeoutId);
+					signal.throwIfAborted();
+				}
+				signal.addEventListener("abort", () => {
+					controller.abort(signal.reason);
+				});
+				combinedSignal = controller.signal;
 			}
-			signal.addEventListener("abort", () => controller.abort());
-			combinedSignal = controller.signal;
 		}
 		try {
 			return await globalThis.fetch(url, {
@@ -526,10 +532,14 @@ var JmapTransport = class {
 		const messageArray = [];
 		for await (const message of messages) messageArray.push(message);
 		if (messageArray.length === 0) return;
+		let processingStage = "initialization";
+		let attachmentsUploadedCount = 0;
 		try {
 			signal?.throwIfAborted();
+			processingStage = "session fetch";
 			const session = await this.getSession(signal);
 			signal?.throwIfAborted();
+			processingStage = "account discovery";
 			const accountId = this.config.accountId ?? findMailAccount(session);
 			if (!accountId) {
 				for (let i = 0; i < messageArray.length; i++) yield {
@@ -538,17 +548,22 @@ var JmapTransport = class {
 				};
 				return;
 			}
+			processingStage = "mailbox discovery";
 			const draftsMailboxId = await this.getDraftsMailboxId(session, accountId, signal);
 			signal?.throwIfAborted();
+			processingStage = "identity resolution";
 			const identityMap = await this.getIdentityMap(session, accountId, signal);
 			signal?.throwIfAborted();
+			processingStage = "attachment upload";
 			const allUploadedBlobs = /* @__PURE__ */ new Map();
 			for (let i = 0; i < messageArray.length; i++) {
 				const message = messageArray[i];
 				const uploadedBlobs = await this.uploadAttachments(session, accountId, message.attachments, signal);
 				allUploadedBlobs.set(i, uploadedBlobs);
+				attachmentsUploadedCount = i + 1;
 				signal?.throwIfAborted();
 			}
+			processingStage = "message conversion";
 			const emailCreates = {};
 			const submissionCreates = {};
 			for (let i = 0; i < messageArray.length; i++) {
@@ -563,6 +578,7 @@ var JmapTransport = class {
 					emailId: `#draft${i}`
 				};
 			}
+			processingStage = "batch request execution";
 			const response = await this.httpClient.executeRequest(session.apiUrl, {
 				using: [
 					JMAP_CAPABILITIES.core,
@@ -587,10 +603,12 @@ var JmapTransport = class {
 			}, signal);
 			for (let i = 0; i < messageArray.length; i++) yield this.parseBatchResponseForIndex(response, i);
 		} catch (error) {
-			const errorMessage = error instanceof Error && error.name === "AbortError" ? `Request aborted: ${error.message}` : error instanceof JmapApiError ? error.message : error instanceof Error ? error.message : String(error);
+			const baseMessage = error instanceof Error && error.name === "AbortError" ? `Request aborted: ${error.message}` : error instanceof JmapApiError ? error.message : error instanceof Error ? error.message : String(error);
+			let detailedMessage = `Failed during ${processingStage}: ${baseMessage}`;
+			if (processingStage === "attachment upload" && attachmentsUploadedCount > 0) detailedMessage += ` (${attachmentsUploadedCount}/${messageArray.length} messages had attachments uploaded before failure)`;
 			for (let i = 0; i < messageArray.length; i++) yield {
 				successful: false,
-				errorMessages: [errorMessage]
+				errorMessages: [detailedMessage]
 			};
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/jmap",
-  "version": "0.4.0-dev.75+4fff8d51",
+  "version": "0.4.0-dev.77+40049302",
   "description": "JMAP transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.4.0-dev.75+4fff8d51"
+    "@upyo/core": "0.4.0-dev.77+40049302"
   },
   "devDependencies": {
     "@dotenvx/dotenvx": "^1.47.3",