@upyo/jmap 0.4.0-dev.73 → 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, {
@@ -516,14 +522,96 @@ var JmapTransport = class {
 		}
 	}
 	/**
-	* Sends multiple messages sequentially.
+	* Sends multiple messages in a single batched JMAP request.
 	* @param messages The messages to send.
 	* @param options Optional transport options.
 	* @yields Receipts for each message.
 	* @since 0.4.0
 	*/
 	async *sendMany(messages, options) {
-		for await (const message of messages) yield await this.send(message, options);
+		const signal = options?.signal;
+		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 {
+					successful: false,
+					errorMessages: ["No mail-capable account found in JMAP session"]
+				};
+				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++) {
+				const message = messageArray[i];
+				const uploadedBlobs = allUploadedBlobs.get(i);
+				const emailCreate = convertMessage(message, draftsMailboxId, uploadedBlobs);
+				const senderEmail = message.sender.address.toLowerCase();
+				const identityId = identityMap.get(senderEmail) ?? identityMap.values().next().value;
+				emailCreates[`draft${i}`] = emailCreate;
+				submissionCreates[`sub${i}`] = {
+					identityId,
+					emailId: `#draft${i}`
+				};
+			}
+			processingStage = "batch request execution";
+			const response = await this.httpClient.executeRequest(session.apiUrl, {
+				using: [
+					JMAP_CAPABILITIES.core,
+					JMAP_CAPABILITIES.mail,
+					JMAP_CAPABILITIES.submission
+				],
+				methodCalls: [[
+					"Email/set",
+					{
+						accountId,
+						create: emailCreates
+					},
+					"c0"
+				], [
+					"EmailSubmission/set",
+					{
+						accountId,
+						create: submissionCreates
+					},
+					"c1"
+				]]
+			}, signal);
+			for (let i = 0; i < messageArray.length; i++) yield this.parseBatchResponseForIndex(response, i);
+		} catch (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: [detailedMessage]
+			};
+		}
 	}
 	/**
 	* Gets or refreshes the JMAP session.
@@ -609,6 +697,21 @@ var JmapTransport = class {
 	*/
 	async getIdentityId(session, accountId, senderEmail, signal) {
 		if (this.config.identityId) return this.config.identityId;
+		const identityMap = await this.getIdentityMap(session, accountId, signal);
+		const matching = identityMap.get(senderEmail.toLowerCase());
+		if (matching) return matching;
+		return identityMap.values().next().value;
+	}
+	/**
+	* Gets all identities and builds a map of email to identity ID.
+	* @param session The JMAP session.
+	* @param accountId The account ID.
+	* @param signal Optional abort signal.
+	* @returns Map of lowercase email to identity ID.
+	* @since 0.4.0
+	*/
+	async getIdentityMap(session, accountId, signal) {
+		if (this.config.identityId) return new Map([["*", this.config.identityId]]);
 		const response = await this.httpClient.executeRequest(session.apiUrl, {
 			using: [JMAP_CAPABILITIES.core, JMAP_CAPABILITIES.submission],
 			methodCalls: [[
@@ -621,9 +724,9 @@ var JmapTransport = class {
 		if (!identityResponse) throw new JmapApiError("No Identity/get response received");
 		const identities = identityResponse[1].list;
 		if (!identities || identities.length === 0) throw new JmapApiError("No identities found");
-		const matching = identities.find((i) => i.email.toLowerCase() === senderEmail.toLowerCase());
-		if (matching) return matching.id;
-		return identities[0].id;
+		const identityMap = /* @__PURE__ */ new Map();
+		for (const identity of identities) identityMap.set(identity.email.toLowerCase(), identity.id);
+		return identityMap;
 	}
 	/**
 	* Uploads all attachments and returns a map of contentId to blobId.
@@ -674,6 +777,43 @@ var JmapTransport = class {
 			errorMessages: errors
 		};
 	}
+	/**
+	* Parses the JMAP batch response to extract receipt for a specific index.
+	* @param response The JMAP response.
+	* @param index The message index in the batch.
+	* @returns A receipt indicating success or failure for that message.
+	* @since 0.4.0
+	*/
+	parseBatchResponseForIndex(response, index) {
+		const errors = [];
+		const draftKey = `draft${index}`;
+		const subKey = `sub${index}`;
+		const emailResponse = response.methodResponses.find((r) => r[0] === "Email/set");
+		if (emailResponse) {
+			const emailResult = emailResponse[1];
+			if (emailResult.notCreated?.[draftKey]) {
+				const error = emailResult.notCreated[draftKey];
+				errors.push(`Email creation failed: ${error.type}${error.description ? ` - ${error.description}` : ""}`);
+			}
+		}
+		const submissionResponse = response.methodResponses.find((r) => r[0] === "EmailSubmission/set");
+		if (submissionResponse) {
+			const submissionResult = submissionResponse[1];
+			if (submissionResult.notCreated?.[subKey]) {
+				const error = submissionResult.notCreated[subKey];
+				errors.push(`Email submission failed: ${error.type}${error.description ? ` - ${error.description}` : ""}`);
+			}
+			if (submissionResult.created?.[subKey]) return {
+				successful: true,
+				messageId: submissionResult.created[subKey].id
+			};
+		}
+		if (errors.length === 0) errors.push("Unknown error: No submission result received");
+		return {
+			successful: false,
+			errorMessages: errors
+		};
+	}
 };
 
 //#endregion

package/dist/index.d.cts

@@ -122,7 +122,7 @@ declare class JmapTransport implements Transport {
    */
   send(message: Message, options?: TransportOptions): Promise<Receipt>;
   /**
-   * Sends multiple messages sequentially.
+   * Sends multiple messages in a single batched JMAP request.
    * @param messages The messages to send.
    * @param options Optional transport options.
    * @yields Receipts for each message.
@@ -162,6 +162,15 @@ declare class JmapTransport implements Transport {
    * @since 0.4.0
    */
   private getIdentityId;
+  /**
+   * Gets all identities and builds a map of email to identity ID.
+   * @param session The JMAP session.
+   * @param accountId The account ID.
+   * @param signal Optional abort signal.
+   * @returns Map of lowercase email to identity ID.
+   * @since 0.4.0
+   */
+  private getIdentityMap;
   /**
    * Uploads all attachments and returns a map of contentId to blobId.
    * @param session The JMAP session.
@@ -179,6 +188,14 @@ declare class JmapTransport implements Transport {
    * @since 0.4.0
    */
   private parseResponse;
+  /**
+   * Parses the JMAP batch response to extract receipt for a specific index.
+   * @param response The JMAP response.
+   * @param index The message index in the batch.
+   * @returns A receipt indicating success or failure for that message.
+   * @since 0.4.0
+   */
+  private parseBatchResponseForIndex;
 }
 //#endregion
 //#region src/errors.d.ts

package/dist/index.d.ts

@@ -122,7 +122,7 @@ declare class JmapTransport implements Transport {
    */
   send(message: Message, options?: TransportOptions): Promise<Receipt>;
   /**
-   * Sends multiple messages sequentially.
+   * Sends multiple messages in a single batched JMAP request.
    * @param messages The messages to send.
    * @param options Optional transport options.
    * @yields Receipts for each message.
@@ -162,6 +162,15 @@ declare class JmapTransport implements Transport {
    * @since 0.4.0
    */
   private getIdentityId;
+  /**
+   * Gets all identities and builds a map of email to identity ID.
+   * @param session The JMAP session.
+   * @param accountId The account ID.
+   * @param signal Optional abort signal.
+   * @returns Map of lowercase email to identity ID.
+   * @since 0.4.0
+   */
+  private getIdentityMap;
   /**
    * Uploads all attachments and returns a map of contentId to blobId.
    * @param session The JMAP session.
@@ -179,6 +188,14 @@ declare class JmapTransport implements Transport {
    * @since 0.4.0
    */
   private parseResponse;
+  /**
+   * Parses the JMAP batch response to extract receipt for a specific index.
+   * @param response The JMAP response.
+   * @param index The message index in the batch.
+   * @returns A receipt indicating success or failure for that message.
+   * @since 0.4.0
+   */
+  private parseBatchResponseForIndex;
 }
 //#endregion
 //#region src/errors.d.ts

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, {
@@ -515,14 +521,96 @@ var JmapTransport = class {
 		}
 	}
 	/**
-	* Sends multiple messages sequentially.
+	* Sends multiple messages in a single batched JMAP request.
 	* @param messages The messages to send.
 	* @param options Optional transport options.
 	* @yields Receipts for each message.
 	* @since 0.4.0
 	*/
 	async *sendMany(messages, options) {
-		for await (const message of messages) yield await this.send(message, options);
+		const signal = options?.signal;
+		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 {
+					successful: false,
+					errorMessages: ["No mail-capable account found in JMAP session"]
+				};
+				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++) {
+				const message = messageArray[i];
+				const uploadedBlobs = allUploadedBlobs.get(i);
+				const emailCreate = convertMessage(message, draftsMailboxId, uploadedBlobs);
+				const senderEmail = message.sender.address.toLowerCase();
+				const identityId = identityMap.get(senderEmail) ?? identityMap.values().next().value;
+				emailCreates[`draft${i}`] = emailCreate;
+				submissionCreates[`sub${i}`] = {
+					identityId,
+					emailId: `#draft${i}`
+				};
+			}
+			processingStage = "batch request execution";
+			const response = await this.httpClient.executeRequest(session.apiUrl, {
+				using: [
+					JMAP_CAPABILITIES.core,
+					JMAP_CAPABILITIES.mail,
+					JMAP_CAPABILITIES.submission
+				],
+				methodCalls: [[
+					"Email/set",
+					{
+						accountId,
+						create: emailCreates
+					},
+					"c0"
+				], [
+					"EmailSubmission/set",
+					{
+						accountId,
+						create: submissionCreates
+					},
+					"c1"
+				]]
+			}, signal);
+			for (let i = 0; i < messageArray.length; i++) yield this.parseBatchResponseForIndex(response, i);
+		} catch (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: [detailedMessage]
+			};
+		}
 	}
 	/**
 	* Gets or refreshes the JMAP session.
@@ -608,6 +696,21 @@ var JmapTransport = class {
 	*/
 	async getIdentityId(session, accountId, senderEmail, signal) {
 		if (this.config.identityId) return this.config.identityId;
+		const identityMap = await this.getIdentityMap(session, accountId, signal);
+		const matching = identityMap.get(senderEmail.toLowerCase());
+		if (matching) return matching;
+		return identityMap.values().next().value;
+	}
+	/**
+	* Gets all identities and builds a map of email to identity ID.
+	* @param session The JMAP session.
+	* @param accountId The account ID.
+	* @param signal Optional abort signal.
+	* @returns Map of lowercase email to identity ID.
+	* @since 0.4.0
+	*/
+	async getIdentityMap(session, accountId, signal) {
+		if (this.config.identityId) return new Map([["*", this.config.identityId]]);
 		const response = await this.httpClient.executeRequest(session.apiUrl, {
 			using: [JMAP_CAPABILITIES.core, JMAP_CAPABILITIES.submission],
 			methodCalls: [[
@@ -620,9 +723,9 @@ var JmapTransport = class {
 		if (!identityResponse) throw new JmapApiError("No Identity/get response received");
 		const identities = identityResponse[1].list;
 		if (!identities || identities.length === 0) throw new JmapApiError("No identities found");
-		const matching = identities.find((i) => i.email.toLowerCase() === senderEmail.toLowerCase());
-		if (matching) return matching.id;
-		return identities[0].id;
+		const identityMap = /* @__PURE__ */ new Map();
+		for (const identity of identities) identityMap.set(identity.email.toLowerCase(), identity.id);
+		return identityMap;
 	}
 	/**
 	* Uploads all attachments and returns a map of contentId to blobId.
@@ -673,6 +776,43 @@ var JmapTransport = class {
 			errorMessages: errors
 		};
 	}
+	/**
+	* Parses the JMAP batch response to extract receipt for a specific index.
+	* @param response The JMAP response.
+	* @param index The message index in the batch.
+	* @returns A receipt indicating success or failure for that message.
+	* @since 0.4.0
+	*/
+	parseBatchResponseForIndex(response, index) {
+		const errors = [];
+		const draftKey = `draft${index}`;
+		const subKey = `sub${index}`;
+		const emailResponse = response.methodResponses.find((r) => r[0] === "Email/set");
+		if (emailResponse) {
+			const emailResult = emailResponse[1];
+			if (emailResult.notCreated?.[draftKey]) {
+				const error = emailResult.notCreated[draftKey];
+				errors.push(`Email creation failed: ${error.type}${error.description ? ` - ${error.description}` : ""}`);
+			}
+		}
+		const submissionResponse = response.methodResponses.find((r) => r[0] === "EmailSubmission/set");
+		if (submissionResponse) {
+			const submissionResult = submissionResponse[1];
+			if (submissionResult.notCreated?.[subKey]) {
+				const error = submissionResult.notCreated[subKey];
+				errors.push(`Email submission failed: ${error.type}${error.description ? ` - ${error.description}` : ""}`);
+			}
+			if (submissionResult.created?.[subKey]) return {
+				successful: true,
+				messageId: submissionResult.created[subKey].id
+			};
+		}
+		if (errors.length === 0) errors.push("Unknown error: No submission result received");
+		return {
+			successful: false,
+			errorMessages: errors
+		};
+	}
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/jmap",
-  "version": "0.4.0-dev.73+8cd7bd3d",
+  "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.73+8cd7bd3d"
+    "@upyo/core": "0.4.0-dev.77+40049302"
   },
   "devDependencies": {
     "@dotenvx/dotenvx": "^1.47.3",