@upyo/jmap 0.5.0-dev.158 → 0.5.0-dev.168

package/dist/index.cjs

@@ -208,12 +208,16 @@ var JmapHttpClient = class {
 					if (error.statusCode >= 400 && error.statusCode < 500) throw error;
 				}
 				lastError = error instanceof Error ? error : new Error(String(error));
-				if (attempt === this.config.retries) throw error;
+				if (attempt === this.config.retries) {
+					if (error instanceof JmapApiError) throw error;
+					throw new JmapApiError(lastError.message, void 0, void 0, void 0, void 0, attempt + 1);
+				}
 				const delay = Math.pow(2, attempt) * 1e3;
 				await new Promise((resolve) => setTimeout(resolve, delay));
 			}
 		}
-		throw lastError || /* @__PURE__ */ new Error("Request failed after all retries");
+		if (lastError != null) throw lastError;
+		throw new Error("Request failed after all retries");
 	}
 	/**
 	* Makes an authenticated fetch request.
@@ -489,12 +493,14 @@ var JmapTransport = class {
 	* @param message The message to send.
 	* @param options Optional transport options.
 	* @returns A receipt indicating success or failure.
+	* @throws The abort reason or an `AbortError` when the caller aborts the
+	*         operation.
 	* @since 0.4.0
 	*/
 	async send(message, options) {
 		const signal = options?.signal;
+		signal?.throwIfAborted();
 		try {
-			signal?.throwIfAborted();
 			const session = await this.getSession(signal);
 			signal?.throwIfAborted();
 			const accountId = this.config.accountId ?? findMailAccount(session);
@@ -537,14 +543,12 @@ var JmapTransport = class {
 			}, signal);
 			return this.parseResponse(response);
 		} catch (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 (signal?.aborted) throw getAbortReason(signal, error);
+			if (error instanceof Error && error.name === "AbortError") 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);
 		}
@@ -554,6 +558,8 @@ var JmapTransport = class {
 	* @param messages The messages to send.
 	* @param options Optional transport options.
 	* @yields Receipts for each message.
+	* @throws The abort reason or an `AbortError` when the caller aborts the
+	*         operation.
 	* @since 0.4.0
 	*/
 	async *sendMany(messages, options) {
@@ -633,9 +639,7 @@ 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);
-			}
+			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)`;
@@ -879,7 +883,7 @@ function getAttemptCount(error) {
 	return 1;
 }
 function getAbortReason(signal, fallback) {
-	return signal.reason ?? fallback;
+	return signal.reason ?? fallback ?? new DOMException("The operation was aborted.", "AbortError");
 }
 
 //#endregion

package/dist/index.d.cts

@@ -119,6 +119,8 @@ declare class JmapTransport implements Transport<"jmap"> {
    * @param message The message to send.
    * @param options Optional transport options.
    * @returns A receipt indicating success or failure.
+   * @throws The abort reason or an `AbortError` when the caller aborts the
+   *         operation.
    * @since 0.4.0
    */
   send(message: Message, options?: TransportOptions): Promise<Receipt<"jmap">>;
@@ -127,6 +129,8 @@ declare class JmapTransport implements Transport<"jmap"> {
    * @param messages The messages to send.
    * @param options Optional transport options.
    * @yields Receipts for each message.
+   * @throws The abort reason or an `AbortError` when the caller aborts the
+   *         operation.
    * @since 0.4.0
    */
   sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt<"jmap">>;

package/dist/index.d.ts

@@ -119,6 +119,8 @@ declare class JmapTransport implements Transport<"jmap"> {
    * @param message The message to send.
    * @param options Optional transport options.
    * @returns A receipt indicating success or failure.
+   * @throws The abort reason or an `AbortError` when the caller aborts the
+   *         operation.
    * @since 0.4.0
    */
   send(message: Message, options?: TransportOptions): Promise<Receipt<"jmap">>;
@@ -127,6 +129,8 @@ declare class JmapTransport implements Transport<"jmap"> {
    * @param messages The messages to send.
    * @param options Optional transport options.
    * @yields Receipts for each message.
+   * @throws The abort reason or an `AbortError` when the caller aborts the
+   *         operation.
    * @since 0.4.0
    */
   sendMany(messages: Iterable<Message> | AsyncIterable<Message>, options?: TransportOptions): AsyncIterable<Receipt<"jmap">>;

package/dist/index.js

@@ -185,12 +185,16 @@ var JmapHttpClient = class {
 					if (error.statusCode >= 400 && error.statusCode < 500) throw error;
 				}
 				lastError = error instanceof Error ? error : new Error(String(error));
-				if (attempt === this.config.retries) throw error;
+				if (attempt === this.config.retries) {
+					if (error instanceof JmapApiError) throw error;
+					throw new JmapApiError(lastError.message, void 0, void 0, void 0, void 0, attempt + 1);
+				}
 				const delay = Math.pow(2, attempt) * 1e3;
 				await new Promise((resolve) => setTimeout(resolve, delay));
 			}
 		}
-		throw lastError || /* @__PURE__ */ new Error("Request failed after all retries");
+		if (lastError != null) throw lastError;
+		throw new Error("Request failed after all retries");
 	}
 	/**
 	* Makes an authenticated fetch request.
@@ -466,12 +470,14 @@ var JmapTransport = class {
 	* @param message The message to send.
 	* @param options Optional transport options.
 	* @returns A receipt indicating success or failure.
+	* @throws The abort reason or an `AbortError` when the caller aborts the
+	*         operation.
 	* @since 0.4.0
 	*/
 	async send(message, options) {
 		const signal = options?.signal;
+		signal?.throwIfAborted();
 		try {
-			signal?.throwIfAborted();
 			const session = await this.getSession(signal);
 			signal?.throwIfAborted();
 			const accountId = this.config.accountId ?? findMailAccount(session);
@@ -514,14 +520,12 @@ var JmapTransport = class {
 			}, signal);
 			return this.parseResponse(response);
 		} catch (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 (signal?.aborted) throw getAbortReason(signal, error);
+			if (error instanceof Error && error.name === "AbortError") 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);
 		}
@@ -531,6 +535,8 @@ var JmapTransport = class {
 	* @param messages The messages to send.
 	* @param options Optional transport options.
 	* @yields Receipts for each message.
+	* @throws The abort reason or an `AbortError` when the caller aborts the
+	*         operation.
 	* @since 0.4.0
 	*/
 	async *sendMany(messages, options) {
@@ -610,9 +616,7 @@ 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);
-			}
+			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)`;
@@ -856,7 +860,7 @@ function getAttemptCount(error) {
 	return 1;
 }
 function getAbortReason(signal, fallback) {
-	return signal.reason ?? fallback;
+	return signal.reason ?? fallback ?? new DOMException("The operation was aborted.", "AbortError");
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/jmap",
-  "version": "0.5.0-dev.158",
+  "version": "0.5.0-dev.168",
   "description": "JMAP transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.5.0-dev.158+468b767c"
+    "@upyo/core": "0.5.0-dev.168+1e808a3a"
   },
   "devDependencies": {
     "jmap-rfc-types": "^0.1.2",