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

package/dist/index.cjs

@@ -92,13 +92,13 @@ async function uploadBlob(config, uploadUrl, accountId, blob, signal) {
 	for (const [key, value] of Object.entries(config.headers)) headers[key] = value;
 	const controller = new AbortController();
 	const timeoutId = setTimeout(() => controller.abort(), config.timeout);
-	const combinedSignal = signal ? combineSignals(signal, controller.signal) : controller.signal;
+	const combinedSignal = (0, __upyo_core.combineSignals)(controller.signal, signal);
 	try {
 		const response = await fetch(url, {
 			method: "POST",
 			headers,
 			body: blob,
-			signal: combinedSignal
+			signal: combinedSignal.signal
 		});
 		if (!response.ok) {
 			const body = await response.text();
@@ -107,23 +107,10 @@ async function uploadBlob(config, uploadUrl, accountId, blob, signal) {
 		const result = await response.json();
 		return result;
 	} finally {
+		combinedSignal.cleanup();
 		clearTimeout(timeoutId);
 	}
 }
-/**
-* Combine multiple abort signals into one.
-*/
-function combineSignals(...signals) {
-	const controller = new AbortController();
-	for (const signal of signals) {
-		if (signal.aborted) {
-			controller.abort(signal.reason);
-			break;
-		}
-		signal.addEventListener("abort", () => controller.abort(signal.reason), { once: true });
-	}
-	return controller.signal;
-}
 
 //#endregion
 //#region src/config.ts
@@ -203,7 +190,7 @@ var JmapHttpClient = class {
 				}
 				return await response.json();
 			} catch (error) {
-				if (error instanceof Error && error.name === "AbortError") throw error;
+				if (isCallerAbort(error, signal)) throw error;
 				if (error instanceof JmapApiError && error.statusCode !== void 0) {
 					if (error.statusCode >= 400 && error.statusCode < 500) throw error;
 				}
@@ -263,6 +250,12 @@ var JmapHttpClient = class {
 		}
 	}
 };
+function isCallerAbort(error, signal) {
+	return signal?.aborted === true && (isAbortError(error) || error === signal.reason);
+}
+function isAbortError(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
 
 //#endregion
 //#region src/message-converter.ts

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createFailedReceipt, parseRetryAfter } from "@upyo/core";
+import { combineSignals, createFailedReceipt, parseRetryAfter } from "@upyo/core";
 
 //#region src/errors.ts
 /**
@@ -69,13 +69,13 @@ async function uploadBlob(config, uploadUrl, accountId, blob, signal) {
 	for (const [key, value] of Object.entries(config.headers)) headers[key] = value;
 	const controller = new AbortController();
 	const timeoutId = setTimeout(() => controller.abort(), config.timeout);
-	const combinedSignal = signal ? combineSignals(signal, controller.signal) : controller.signal;
+	const combinedSignal = combineSignals(controller.signal, signal);
 	try {
 		const response = await fetch(url, {
 			method: "POST",
 			headers,
 			body: blob,
-			signal: combinedSignal
+			signal: combinedSignal.signal
 		});
 		if (!response.ok) {
 			const body = await response.text();
@@ -84,23 +84,10 @@ async function uploadBlob(config, uploadUrl, accountId, blob, signal) {
 		const result = await response.json();
 		return result;
 	} finally {
+		combinedSignal.cleanup();
 		clearTimeout(timeoutId);
 	}
 }
-/**
-* Combine multiple abort signals into one.
-*/
-function combineSignals(...signals) {
-	const controller = new AbortController();
-	for (const signal of signals) {
-		if (signal.aborted) {
-			controller.abort(signal.reason);
-			break;
-		}
-		signal.addEventListener("abort", () => controller.abort(signal.reason), { once: true });
-	}
-	return controller.signal;
-}
 
 //#endregion
 //#region src/config.ts
@@ -180,7 +167,7 @@ var JmapHttpClient = class {
 				}
 				return await response.json();
 			} catch (error) {
-				if (error instanceof Error && error.name === "AbortError") throw error;
+				if (isCallerAbort(error, signal)) throw error;
 				if (error instanceof JmapApiError && error.statusCode !== void 0) {
 					if (error.statusCode >= 400 && error.statusCode < 500) throw error;
 				}
@@ -240,6 +227,12 @@ var JmapHttpClient = class {
 		}
 	}
 };
+function isCallerAbort(error, signal) {
+	return signal?.aborted === true && (isAbortError(error) || error === signal.reason);
+}
+function isAbortError(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
 
 //#endregion
 //#region src/message-converter.ts

package/package.json

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