@upyo/jmap 0.5.0-dev.136 → 0.5.0-dev.154

package/dist/index.cjs

@@ -1,3 +1,27 @@
+//#region rolldown:runtime
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+
+//#endregion
+const __upyo_core = __toESM(require("@upyo/core"));
 
 //#region src/errors.ts
 /**
@@ -8,12 +32,16 @@ var JmapApiError = class extends Error {
 	statusCode;
 	responseBody;
 	jmapErrorType;
-	constructor(message, statusCode, responseBody, jmapErrorType) {
+	retryAfterMilliseconds;
+	attempts;
+	constructor(message, statusCode, responseBody, jmapErrorType, retryAfterMilliseconds, attempts) {
 		super(message);
 		this.name = "JmapApiError";
 		this.statusCode = statusCode;
 		this.responseBody = responseBody;
 		this.jmapErrorType = jmapErrorType;
+		this.retryAfterMilliseconds = retryAfterMilliseconds;
+		this.attempts = attempts;
 	}
 };
 /**
@@ -144,7 +172,7 @@ var JmapHttpClient = class {
 		const response = await this.fetchWithAuth(this.config.sessionUrl, { method: "GET" }, signal);
 		if (!response.ok) {
 			const text = await response.text();
-			throw new JmapApiError(`Session fetch failed: ${response.status}`, response.status, text);
+			throw new JmapApiError(`Session fetch failed: ${response.status}`, response.status, text, void 0, (0, __upyo_core.parseRetryAfter)(response.headers.get("Retry-After")), 1);
 		}
 		return await response.json();
 	}
@@ -169,7 +197,7 @@ var JmapHttpClient = class {
 				}, signal);
 				if (!response.ok) {
 					const text = await response.text();
-					const error = new JmapApiError(`JMAP request failed: ${response.status}`, response.status, text);
+					const error = new JmapApiError(`JMAP request failed: ${response.status}`, response.status, text, void 0, (0, __upyo_core.parseRetryAfter)(response.headers.get("Retry-After")), attempt + 1);
 					if (response.status >= 400 && response.status < 500) throw error;
 					throw error;
 				}
@@ -443,6 +471,7 @@ const JMAP_CAPABILITIES = {
 * @since 0.4.0
 */
 var JmapTransport = class {
+	id = "jmap";
 	config;
 	httpClient;
 	cachedSession = null;
@@ -469,10 +498,11 @@ var JmapTransport = class {
 			const session = await this.getSession(signal);
 			signal?.throwIfAborted();
 			const accountId = this.config.accountId ?? findMailAccount(session);
-			if (!accountId) return {
-				successful: false,
-				errorMessages: ["No mail-capable account found in JMAP session"]
-			};
+			if (!accountId) return createJmapFailure("No mail-capable account found in JMAP session", void 0, {
+				category: "configuration",
+				code: "jmap.no_mail_account",
+				retryable: false
+			});
 			const draftsMailboxId = await this.getDraftsMailboxId(session, accountId, signal);
 			signal?.throwIfAborted();
 			const identityId = await this.getIdentityId(session, accountId, message.sender.address, signal);
@@ -507,18 +537,16 @@ var JmapTransport = class {
 			}, signal);
 			return this.parseResponse(response);
 		} catch (error) {
-			if (error instanceof Error && error.name === "AbortError") return {
-				successful: false,
-				errorMessages: [`Request aborted: ${error.message}`]
-			};
-			if (error instanceof JmapApiError) return {
-				successful: false,
-				errorMessages: [error.message]
-			};
-			return {
-				successful: false,
-				errorMessages: [error instanceof Error ? error.message : String(error)]
-			};
+			if (error instanceof Error && error.name === "AbortError") {
+				if (signal?.aborted) throw getAbortReason(signal, error);
+				return createJmapFailure(`Request aborted: ${error.message}`, error, {
+					category: "timeout",
+					code: "abort",
+					retryable: true
+				});
+			}
+			if (error instanceof JmapApiError) return createJmapFailure(error.message, error);
+			return createJmapFailure(error instanceof Error ? error.message : String(error), error);
 		}
 	}
 	/**
@@ -543,10 +571,11 @@ var JmapTransport = class {
 			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"]
-				};
+				for (let i = 0; i < messageArray.length; i++) yield createJmapFailure("No mail-capable account found in JMAP session", void 0, {
+					category: "configuration",
+					code: "jmap.no_mail_account",
+					retryable: false
+				});
 				return;
 			}
 			processingStage = "mailbox discovery";
@@ -604,13 +633,13 @@ var JmapTransport = class {
 			}, signal);
 			for (let i = 0; i < messageArray.length; i++) yield this.parseBatchResponseForIndex(response, i);
 		} catch (error) {
+			if (error instanceof Error && error.name === "AbortError") {
+				if (signal?.aborted) throw getAbortReason(signal, 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]
-			};
+			for (let i = 0; i < messageArray.length; i++) yield createJmapFailure(detailedMessage, error);
 		}
 	}
 	/**
@@ -768,14 +797,17 @@ var JmapTransport = class {
 			if (submissionResult.notCreated) for (const [key, error] of Object.entries(submissionResult.notCreated)) errors.push(`Email submission failed (${key}): ${error.type}${error.description ? ` - ${error.description}` : ""}`);
 			if (submissionResult.created?.submission) return {
 				successful: true,
-				messageId: submissionResult.created.submission.id
+				messageId: submissionResult.created.submission.id,
+				provider: "jmap"
 			};
 		}
 		if (errors.length === 0) errors.push("Unknown error: No submission result received");
-		return {
-			successful: false,
-			errorMessages: errors
-		};
+		return (0, __upyo_core.createFailedReceipt)(errors, {
+			provider: "jmap",
+			category: "rejected",
+			code: "jmap.submission_failed",
+			retryable: false
+		});
 	}
 	/**
 	* Parses the JMAP batch response to extract receipt for a specific index.
@@ -805,16 +837,50 @@ var JmapTransport = class {
 			}
 			if (submissionResult.created?.[subKey]) return {
 				successful: true,
-				messageId: submissionResult.created[subKey].id
+				messageId: submissionResult.created[subKey].id,
+				provider: "jmap"
 			};
 		}
 		if (errors.length === 0) errors.push("Unknown error: No submission result received");
-		return {
-			successful: false,
-			errorMessages: errors
-		};
+		return (0, __upyo_core.createFailedReceipt)(errors, {
+			provider: "jmap",
+			category: "rejected",
+			code: "jmap.submission_failed",
+			retryable: false
+		});
 	}
 };
+function createJmapFailure(message, error, override = {}) {
+	const attempts = getAttemptCount(error);
+	if (error instanceof JmapApiError) return (0, __upyo_core.createFailedReceipt)(message, {
+		provider: "jmap",
+		statusCode: error.statusCode,
+		retryAfterMilliseconds: error.retryAfterMilliseconds,
+		attempts,
+		providerDetails: {
+			responseBody: error.responseBody,
+			jmapErrorType: error.jmapErrorType
+		},
+		category: override.category,
+		code: override.code,
+		retryable: override.retryable
+	});
+	return (0, __upyo_core.createFailedReceipt)(message, {
+		provider: "jmap",
+		attempts,
+		category: override.category,
+		code: override.code,
+		retryable: override.retryable
+	});
+}
+function getAttemptCount(error) {
+	if (error instanceof JmapApiError) return error.attempts ?? 1;
+	if (typeof error === "object" && error !== null && "attempts" in error && typeof error.attempts === "number") return error.attempts;
+	return 1;
+}
+function getAbortReason(signal, fallback) {
+	return signal.reason ?? fallback;
+}
 
 //#endregion
 exports.JMAP_ERROR_TYPES = JMAP_ERROR_TYPES;

package/dist/index.d.cts

@@ -103,7 +103,8 @@ declare function createJmapConfig(config: JmapConfig): ResolvedJmapConfig;
  * JMAP transport for sending emails via JMAP protocol (RFC 8620/8621).
  * @since 0.4.0
  */
-declare class JmapTransport implements Transport {
+declare class JmapTransport implements Transport<"jmap"> {
+  readonly id = "jmap";
   readonly config: ResolvedJmapConfig;
   private readonly httpClient;
   private cachedSession;
@@ -120,7 +121,7 @@ declare class JmapTransport implements Transport {
    * @returns A receipt indicating success or failure.
    * @since 0.4.0
    */
-  send(message: Message, options?: TransportOptions): Promise<Receipt>;
+  send(message: Message, options?: TransportOptions): Promise<Receipt<"jmap">>;
   /**
    * Sends multiple messages in a single batched JMAP request.
    * @param messages The messages to send.
@@ -128,7 +129,7 @@ declare class JmapTransport implements Transport {
    * @yields Receipts for each message.
    * @since 0.4.0
    */
-  sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt>;
+  sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt<"jmap">>;
   /**
    * Gets or refreshes the JMAP session.
    * @param signal Optional abort signal.
@@ -207,7 +208,9 @@ declare class JmapApiError extends Error {
   readonly statusCode?: number;
   readonly responseBody?: string;
   readonly jmapErrorType?: string;
-  constructor(message: string, statusCode?: number, responseBody?: string, jmapErrorType?: string);
+  readonly retryAfterMilliseconds?: number;
+  readonly attempts?: number;
+  constructor(message: string, statusCode?: number, responseBody?: string, jmapErrorType?: string, retryAfterMilliseconds?: number, attempts?: number);
 }
 /**
  * JMAP-specific error types from RFC 8620.

package/dist/index.d.ts

@@ -103,7 +103,8 @@ declare function createJmapConfig(config: JmapConfig): ResolvedJmapConfig;
  * JMAP transport for sending emails via JMAP protocol (RFC 8620/8621).
  * @since 0.4.0
  */
-declare class JmapTransport implements Transport {
+declare class JmapTransport implements Transport<"jmap"> {
+  readonly id = "jmap";
   readonly config: ResolvedJmapConfig;
   private readonly httpClient;
   private cachedSession;
@@ -120,7 +121,7 @@ declare class JmapTransport implements Transport {
    * @returns A receipt indicating success or failure.
    * @since 0.4.0
    */
-  send(message: Message, options?: TransportOptions): Promise<Receipt>;
+  send(message: Message, options?: TransportOptions): Promise<Receipt<"jmap">>;
   /**
    * Sends multiple messages in a single batched JMAP request.
    * @param messages The messages to send.
@@ -128,7 +129,7 @@ declare class JmapTransport implements Transport {
    * @yields Receipts for each message.
    * @since 0.4.0
    */
-  sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt>;
+  sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt<"jmap">>;
   /**
    * Gets or refreshes the JMAP session.
    * @param signal Optional abort signal.
@@ -207,7 +208,9 @@ declare class JmapApiError extends Error {
   readonly statusCode?: number;
   readonly responseBody?: string;
   readonly jmapErrorType?: string;
-  constructor(message: string, statusCode?: number, responseBody?: string, jmapErrorType?: string);
+  readonly retryAfterMilliseconds?: number;
+  readonly attempts?: number;
+  constructor(message: string, statusCode?: number, responseBody?: string, jmapErrorType?: string, retryAfterMilliseconds?: number, attempts?: number);
 }
 /**
  * JMAP-specific error types from RFC 8620.

package/dist/index.js

@@ -1,3 +1,5 @@
+import { createFailedReceipt, parseRetryAfter } from "@upyo/core";
+
 //#region src/errors.ts
 /**
 * Error class for JMAP API errors.
@@ -7,12 +9,16 @@ var JmapApiError = class extends Error {
 	statusCode;
 	responseBody;
 	jmapErrorType;
-	constructor(message, statusCode, responseBody, jmapErrorType) {
+	retryAfterMilliseconds;
+	attempts;
+	constructor(message, statusCode, responseBody, jmapErrorType, retryAfterMilliseconds, attempts) {
 		super(message);
 		this.name = "JmapApiError";
 		this.statusCode = statusCode;
 		this.responseBody = responseBody;
 		this.jmapErrorType = jmapErrorType;
+		this.retryAfterMilliseconds = retryAfterMilliseconds;
+		this.attempts = attempts;
 	}
 };
 /**
@@ -143,7 +149,7 @@ var JmapHttpClient = class {
 		const response = await this.fetchWithAuth(this.config.sessionUrl, { method: "GET" }, signal);
 		if (!response.ok) {
 			const text = await response.text();
-			throw new JmapApiError(`Session fetch failed: ${response.status}`, response.status, text);
+			throw new JmapApiError(`Session fetch failed: ${response.status}`, response.status, text, void 0, parseRetryAfter(response.headers.get("Retry-After")), 1);
 		}
 		return await response.json();
 	}
@@ -168,7 +174,7 @@ var JmapHttpClient = class {
 				}, signal);
 				if (!response.ok) {
 					const text = await response.text();
-					const error = new JmapApiError(`JMAP request failed: ${response.status}`, response.status, text);
+					const error = new JmapApiError(`JMAP request failed: ${response.status}`, response.status, text, void 0, parseRetryAfter(response.headers.get("Retry-After")), attempt + 1);
 					if (response.status >= 400 && response.status < 500) throw error;
 					throw error;
 				}
@@ -442,6 +448,7 @@ const JMAP_CAPABILITIES = {
 * @since 0.4.0
 */
 var JmapTransport = class {
+	id = "jmap";
 	config;
 	httpClient;
 	cachedSession = null;
@@ -468,10 +475,11 @@ var JmapTransport = class {
 			const session = await this.getSession(signal);
 			signal?.throwIfAborted();
 			const accountId = this.config.accountId ?? findMailAccount(session);
-			if (!accountId) return {
-				successful: false,
-				errorMessages: ["No mail-capable account found in JMAP session"]
-			};
+			if (!accountId) return createJmapFailure("No mail-capable account found in JMAP session", void 0, {
+				category: "configuration",
+				code: "jmap.no_mail_account",
+				retryable: false
+			});
 			const draftsMailboxId = await this.getDraftsMailboxId(session, accountId, signal);
 			signal?.throwIfAborted();
 			const identityId = await this.getIdentityId(session, accountId, message.sender.address, signal);
@@ -506,18 +514,16 @@ var JmapTransport = class {
 			}, signal);
 			return this.parseResponse(response);
 		} catch (error) {
-			if (error instanceof Error && error.name === "AbortError") return {
-				successful: false,
-				errorMessages: [`Request aborted: ${error.message}`]
-			};
-			if (error instanceof JmapApiError) return {
-				successful: false,
-				errorMessages: [error.message]
-			};
-			return {
-				successful: false,
-				errorMessages: [error instanceof Error ? error.message : String(error)]
-			};
+			if (error instanceof Error && error.name === "AbortError") {
+				if (signal?.aborted) throw getAbortReason(signal, error);
+				return createJmapFailure(`Request aborted: ${error.message}`, error, {
+					category: "timeout",
+					code: "abort",
+					retryable: true
+				});
+			}
+			if (error instanceof JmapApiError) return createJmapFailure(error.message, error);
+			return createJmapFailure(error instanceof Error ? error.message : String(error), error);
 		}
 	}
 	/**
@@ -542,10 +548,11 @@ var JmapTransport = class {
 			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"]
-				};
+				for (let i = 0; i < messageArray.length; i++) yield createJmapFailure("No mail-capable account found in JMAP session", void 0, {
+					category: "configuration",
+					code: "jmap.no_mail_account",
+					retryable: false
+				});
 				return;
 			}
 			processingStage = "mailbox discovery";
@@ -603,13 +610,13 @@ var JmapTransport = class {
 			}, signal);
 			for (let i = 0; i < messageArray.length; i++) yield this.parseBatchResponseForIndex(response, i);
 		} catch (error) {
+			if (error instanceof Error && error.name === "AbortError") {
+				if (signal?.aborted) throw getAbortReason(signal, 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]
-			};
+			for (let i = 0; i < messageArray.length; i++) yield createJmapFailure(detailedMessage, error);
 		}
 	}
 	/**
@@ -767,14 +774,17 @@ var JmapTransport = class {
 			if (submissionResult.notCreated) for (const [key, error] of Object.entries(submissionResult.notCreated)) errors.push(`Email submission failed (${key}): ${error.type}${error.description ? ` - ${error.description}` : ""}`);
 			if (submissionResult.created?.submission) return {
 				successful: true,
-				messageId: submissionResult.created.submission.id
+				messageId: submissionResult.created.submission.id,
+				provider: "jmap"
 			};
 		}
 		if (errors.length === 0) errors.push("Unknown error: No submission result received");
-		return {
-			successful: false,
-			errorMessages: errors
-		};
+		return createFailedReceipt(errors, {
+			provider: "jmap",
+			category: "rejected",
+			code: "jmap.submission_failed",
+			retryable: false
+		});
 	}
 	/**
 	* Parses the JMAP batch response to extract receipt for a specific index.
@@ -804,16 +814,50 @@ var JmapTransport = class {
 			}
 			if (submissionResult.created?.[subKey]) return {
 				successful: true,
-				messageId: submissionResult.created[subKey].id
+				messageId: submissionResult.created[subKey].id,
+				provider: "jmap"
 			};
 		}
 		if (errors.length === 0) errors.push("Unknown error: No submission result received");
-		return {
-			successful: false,
-			errorMessages: errors
-		};
+		return createFailedReceipt(errors, {
+			provider: "jmap",
+			category: "rejected",
+			code: "jmap.submission_failed",
+			retryable: false
+		});
 	}
 };
+function createJmapFailure(message, error, override = {}) {
+	const attempts = getAttemptCount(error);
+	if (error instanceof JmapApiError) return createFailedReceipt(message, {
+		provider: "jmap",
+		statusCode: error.statusCode,
+		retryAfterMilliseconds: error.retryAfterMilliseconds,
+		attempts,
+		providerDetails: {
+			responseBody: error.responseBody,
+			jmapErrorType: error.jmapErrorType
+		},
+		category: override.category,
+		code: override.code,
+		retryable: override.retryable
+	});
+	return createFailedReceipt(message, {
+		provider: "jmap",
+		attempts,
+		category: override.category,
+		code: override.code,
+		retryable: override.retryable
+	});
+}
+function getAttemptCount(error) {
+	if (error instanceof JmapApiError) return error.attempts ?? 1;
+	if (typeof error === "object" && error !== null && "attempts" in error && typeof error.attempts === "number") return error.attempts;
+	return 1;
+}
+function getAbortReason(signal, fallback) {
+	return signal.reason ?? fallback;
+}
 
 //#endregion
 export { JMAP_ERROR_TYPES, JmapApiError, JmapTransport, createJmapConfig, isCapabilityError, uploadBlob };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/jmap",
-  "version": "0.5.0-dev.136",
+  "version": "0.5.0-dev.154",
   "description": "JMAP transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,19 +53,14 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.5.0-dev.136+adacf579"
+    "@upyo/core": "0.5.0-dev.154+2f72d353"
   },
   "devDependencies": {
-    "@dotenvx/dotenvx": "^1.47.3",
     "jmap-rfc-types": "^0.1.2",
     "tsdown": "^0.12.7",
     "typescript": "5.8.3"
   },
   "scripts": {
-    "build": "tsdown",
-    "prepublish": "tsdown",
-    "test": "tsdown && dotenvx run --ignore=MISSING_ENV_FILE -- node --experimental-transform-types --test",
-    "test:bun": "tsdown && bun test --timeout=30000 --env-file=.env",
-    "test:deno": "DENO_JOBS=1 deno test --allow-env --allow-net --env-file=.env"
+    "prepublish": "mise run --no-deps :build"
   }
 }