@doist/todoist-api-typescript 6.1.11 → 6.1.12

package/dist/cjs/utils/fetch-with-retry.js

@@ -45,7 +45,8 @@ function headersToObject(headers) {
     return result;
 }
 /**
- * Creates an AbortSignal that times out after the specified duration
+ * Creates an AbortSignal that aborts after timeoutMs. Returns the signal and a
+ * clear function to cancel the timeout early.
  */
 function createTimeoutSignal(timeoutMs, existingSignal) {
     const controller = new AbortController();
@@ -53,6 +54,9 @@ function createTimeoutSignal(timeoutMs, existingSignal) {
     const timeoutId = setTimeout(() => {
         controller.abort(new Error(`Request timeout after ${timeoutMs}ms`));
     }, timeoutMs);
+    function clear() {
+        clearTimeout(timeoutId);
+    }
     // If there's an existing signal, forward its abort
     if (existingSignal) {
         if (existingSignal.aborted) {
@@ -70,7 +74,7 @@ function createTimeoutSignal(timeoutMs, existingSignal) {
     controller.signal.addEventListener('abort', () => {
         clearTimeout(timeoutId);
     });
-    return controller.signal;
+    return { signal: controller.signal, clear };
 }
 /**
  * Converts native fetch Response to CustomFetchResponse for consistency
@@ -96,11 +100,15 @@ async function fetchWithRetry(args) {
     const { timeout, signal: userSignal } = options, fetchOptions = __rest(options, ["timeout", "signal"]);
     let lastError;
     for (let attempt = 0; attempt <= config.retries; attempt++) {
+        // Timeout clear function for this attempt (hoisted for catch scope)
+        let clearTimeoutFn;
         try {
             // Set up timeout and signal handling
             let requestSignal = userSignal || undefined;
             if (timeout && timeout > 0) {
-                requestSignal = createTimeoutSignal(timeout, requestSignal);
+                const timeoutResult = createTimeoutSignal(timeout, requestSignal);
+                requestSignal = timeoutResult.signal;
+                clearTimeoutFn = timeoutResult.clear;
             }
             // Use custom fetch or native fetch
             let fetchResponse;
@@ -153,6 +161,10 @@ async function fetchWithRetry(args) {
                 // If JSON parsing fails, return the raw text
                 data = responseText;
             }
+            // Success – clear pending timeout (if any) so Node can exit promptly
+            if (clearTimeoutFn) {
+                clearTimeoutFn();
+            }
             return {
                 data,
                 status: fetchResponse.status,
@@ -170,6 +182,9 @@ async function fetchWithRetry(args) {
                     const networkError = lastError;
                     networkError.isNetworkError = true;
                 }
+                if (clearTimeoutFn) {
+                    clearTimeoutFn();
+                }
                 throw lastError;
             }
             // Wait before retrying
@@ -177,6 +192,10 @@ async function fetchWithRetry(args) {
             if (delay > 0) {
                 await new Promise((resolve) => setTimeout(resolve, delay));
             }
+            // Retry path – ensure this attempt's timeout is cleared before looping
+            if (clearTimeoutFn) {
+                clearTimeoutFn();
+            }
         }
     }
     // This should never be reached, but just in case

package/dist/esm/utils/fetch-with-retry.js

@@ -42,7 +42,8 @@ function headersToObject(headers) {
     return result;
 }
 /**
- * Creates an AbortSignal that times out after the specified duration
+ * Creates an AbortSignal that aborts after timeoutMs. Returns the signal and a
+ * clear function to cancel the timeout early.
  */
 function createTimeoutSignal(timeoutMs, existingSignal) {
     const controller = new AbortController();
@@ -50,6 +51,9 @@ function createTimeoutSignal(timeoutMs, existingSignal) {
     const timeoutId = setTimeout(() => {
         controller.abort(new Error(`Request timeout after ${timeoutMs}ms`));
     }, timeoutMs);
+    function clear() {
+        clearTimeout(timeoutId);
+    }
     // If there's an existing signal, forward its abort
     if (existingSignal) {
         if (existingSignal.aborted) {
@@ -67,7 +71,7 @@ function createTimeoutSignal(timeoutMs, existingSignal) {
     controller.signal.addEventListener('abort', () => {
         clearTimeout(timeoutId);
     });
-    return controller.signal;
+    return { signal: controller.signal, clear };
 }
 /**
  * Converts native fetch Response to CustomFetchResponse for consistency
@@ -93,11 +97,15 @@ export async function fetchWithRetry(args) {
     const { timeout, signal: userSignal } = options, fetchOptions = __rest(options, ["timeout", "signal"]);
     let lastError;
     for (let attempt = 0; attempt <= config.retries; attempt++) {
+        // Timeout clear function for this attempt (hoisted for catch scope)
+        let clearTimeoutFn;
         try {
             // Set up timeout and signal handling
             let requestSignal = userSignal || undefined;
             if (timeout && timeout > 0) {
-                requestSignal = createTimeoutSignal(timeout, requestSignal);
+                const timeoutResult = createTimeoutSignal(timeout, requestSignal);
+                requestSignal = timeoutResult.signal;
+                clearTimeoutFn = timeoutResult.clear;
             }
             // Use custom fetch or native fetch
             let fetchResponse;
@@ -150,6 +158,10 @@ export async function fetchWithRetry(args) {
                 // If JSON parsing fails, return the raw text
                 data = responseText;
             }
+            // Success – clear pending timeout (if any) so Node can exit promptly
+            if (clearTimeoutFn) {
+                clearTimeoutFn();
+            }
             return {
                 data,
                 status: fetchResponse.status,
@@ -167,6 +179,9 @@ export async function fetchWithRetry(args) {
                     const networkError = lastError;
                     networkError.isNetworkError = true;
                 }
+                if (clearTimeoutFn) {
+                    clearTimeoutFn();
+                }
                 throw lastError;
             }
             // Wait before retrying
@@ -174,6 +189,10 @@ export async function fetchWithRetry(args) {
             if (delay > 0) {
                 await new Promise((resolve) => setTimeout(resolve, delay));
             }
+            // Retry path – ensure this attempt's timeout is cleared before looping
+            if (clearTimeoutFn) {
+                clearTimeoutFn();
+            }
         }
     }
     // This should never be reached, but just in case

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@doist/todoist-api-typescript",
-    "version": "6.1.11",
+    "version": "6.1.12",
     "description": "A typescript wrapper for the Todoist REST API.",
     "author": "Doist developers",
     "repository": "https://github.com/Doist/todoist-api-typescript",