aspi 2.4.0 → 2.5.0

package/dist/index.cjs

@@ -284,6 +284,8 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
       return bc(ab(a));
     case 4:
       return cd(bc(ab(a)));
+    case 5:
+      return de(cd(bc(ab(a))));
     case 6:
       return ef(de(cd(bc(ab(a)))));
     case 7:
@@ -312,6 +314,7 @@ var Request = class {
   #schema = null;
   #bodySchema = null;
   #retryConfig;
+  #timeoutMs;
   #shouldBeResult = false;
   #bodySchemaIssues = [];
   #throwOnError = false;
@@ -361,6 +364,24 @@ var Request = class {
     };
     return this;
   }
+  /**
+   * Sets a timeout for the request in milliseconds.
+   *
+   * When the timeout expires, the request is aborted with an `AbortError`.
+   * If a signal was already provided, the timeout is chained so that either
+   * the external signal or the timeout can abort the request.
+   *
+   * @param {number} ms - Timeout duration in milliseconds.
+   * @returns {this} The current {@link Request} instance for method chaining.
+   *
+   * @example
+   * const request = new Request('/slow-endpoint', config);
+   * request.timeout(5000); // abort after 5 seconds
+   */
+  timeout(ms) {
+    this.#timeoutMs = ms;
+    return this;
+  }
   /**
    * Merges the provided headers into the request configuration.
    *
@@ -944,6 +965,92 @@ var Request = class {
     const output = await this.#makeRequest((response) => response.blob());
     return this.#mapResponse(output);
   }
+  /**
+   * Executes the request and returns the response body as an {@link ArrayBuffer}.
+   *
+   * The shape of the returned {@link Promise} depends on the request mode:
+   *
+   * - **Result mode** (`withResult()`): resolves to a {@link Result.Result} containing
+   *   either an {@link AspiResultOk} with `ArrayBuffer` data or an error variant.
+   * - **Throwable mode** (`throwable()`): resolves directly to an {@link ArrayBuffer}
+   *   (wrapped in {@link AspiPlainResponse}) and throws on failure.
+   * - **Default mode**: resolves to a tuple `[value, error]` where exactly one element
+   *   is `null`.
+   *
+   * @returns {Promise<
+   *   Opts['withResult'] extends true
+   *     ? Result.Result<
+   *         AspiResultOk<TRequest, ArrayBuffer>,
+   *         | AspiError<TRequest>
+   *         | (Opts extends { error: any }
+   *             ? Opts['error'][keyof Opts['error']]
+   *             : never)
+   *       >
+   *     : Opts['throwable'] extends true
+   *       ? AspiPlainResponse<TRequest, ArrayBuffer>
+   *       : [
+   *           AspiResultOk<TRequest, ArrayBuffer> | null,
+   *           (
+   *             | (
+   *                 | AspiError<TRequest>
+   *                 | (Opts extends { error: any }
+   *                     ? Opts['error'][keyof Opts['error']]
+   *                     : never)
+   *               )
+   *             | null
+   *           ),
+   *         ]
+   * >}
+   */
+  async arrayBuffer() {
+    const output = await this.#makeRequest(
+      (response) => response.arrayBuffer()
+    );
+    return this.#mapResponse(output);
+  }
+  /**
+   * Executes the request and returns the response body as {@link FormData}.
+   *
+   * The shape of the returned {@link Promise} depends on the request mode:
+   *
+   * - **Result mode** (`withResult()`): resolves to a {@link Result.Result} containing
+   *   either an {@link AspiResultOk} with `FormData` or an error variant.
+   * - **Throwable mode** (`throwable()`): resolves directly to {@link FormData}
+   *   (wrapped in {@link AspiPlainResponse}) and throws on failure.
+   * - **Default mode**: resolves to a tuple `[value, error]` where exactly one element
+   *   is `null`.
+   *
+   * @returns {Promise<
+   *   Opts['withResult'] extends true
+   *     ? Result.Result<
+   *         AspiResultOk<TRequest, FormData>,
+   *         | AspiError<TRequest>
+   *         | (Opts extends { error: any }
+   *             ? Opts['error'][keyof Opts['error']]
+   *             : never)
+   *       >
+   *     : Opts['throwable'] extends true
+   *       ? AspiPlainResponse<TRequest, FormData>
+   *       : [
+   *           AspiResultOk<TRequest, FormData> | null,
+   *           (
+   *             | (
+   *                 | AspiError<TRequest>
+   *                 | (Opts extends { error: any }
+   *                     ? Opts['error'][keyof Opts['error']]
+   *                     : never)
+   *               )
+   *             | null
+   *           ),
+   *         ]
+   * >}
+   */
+  async formData() {
+    const output = await this.#makeRequest(
+      (response) => response.formData()
+    );
+    return this.#mapResponse(output);
+  }
   #url() {
     if (this.#path.startsWith("http://") || this.#path.startsWith("https://")) {
       const absolute = new URL(this.#path);
@@ -961,7 +1068,6 @@ var Request = class {
     let path = rawPath || "";
     path = path.replace(/^\/+/, "");
     path = path.replace(/\/{2,}/g, "/");
-    path = path.replace(/\/+$/, "");
     if (path) {
       path = "/" + path.replace(/^\/+/, "");
     }
@@ -979,7 +1085,6 @@ var Request = class {
     if (fragment) {
       url += `#${fragment}`;
     }
-    url = url.replace(/\/+$/, "");
     return url;
   }
   /**
@@ -1077,16 +1182,32 @@ var Request = class {
       });
       let responseData = null;
       while (attempts <= retries) {
+        let timeoutTimer;
         try {
-          if (this.#capabilities.length > 0) {
-            for (const capability of this.#capabilities) {
-              response = await capability({ request }).run(
-                () => fetch(url, requestInit)
+          const attemptInit = { ...requestInit };
+          if (this.#timeoutMs && this.#timeoutMs > 0) {
+            const timeoutController = new AbortController();
+            timeoutTimer = setTimeout(
+              () => timeoutController.abort(),
+              this.#timeoutMs
+            );
+            if (attemptInit.signal) {
+              attemptInit.signal.addEventListener(
+                "abort",
+                () => timeoutController.abort(),
+                { once: true }
               );
             }
-          } else {
-            response = await fetch(url, requestInit);
+            attemptInit.signal = timeoutController.signal;
+          }
+          let runner = () => fetch(url, attemptInit);
+          for (let i = this.#capabilities.length - 1; i >= 0; i--) {
+            const cap = this.#capabilities[i];
+            const next = runner;
+            runner = () => cap({ request }).run(next);
           }
+          response = await runner();
+          if (timeoutTimer) clearTimeout(timeoutTimer);
           responseData = await responseParser(response);
           if (responseData instanceof Error) {
             return err(responseData);
@@ -1098,7 +1219,7 @@ var Request = class {
           if (this.#isSuccessResponse(response) || !retryOn.includes(response.status) && !retryWhileCondition) {
             break;
           }
-          if (response.status in this.#customErrorCbs && attempts === retries) {
+          if (response.status in this.#customErrorCbs) {
             const result = this.#customErrorCbs[response.status].cb({
               request,
               response: this.#makeResponse(response, responseData)
@@ -1121,6 +1242,7 @@ var Request = class {
             await this.#abortDelay(delay, request);
           }
         } catch (e) {
+          if (timeoutTimer) clearTimeout(timeoutTimer);
           if (e instanceof Error && e.name === "AbortError") {
             if (500 in this.#customErrorCbs) {
               const result = this.#customErrorCbs[response.status].cb({
@@ -1389,7 +1511,8 @@ var Request = class {
    * ```
    */
   useCapability(capability) {
-    return this.#capabilities.push(capability);
+    this.#capabilities.push(capability);
+    return this;
   }
 };
 

package/dist/index.d.cts

@@ -858,6 +858,21 @@ declare class Request<Method extends HttpMethods, TRequest extends AspiRequestIn
      * });
      */
     setRetry(retry: AspiRetryConfig<TRequest>): this;
+    /**
+     * Sets a timeout for the request in milliseconds.
+     *
+     * When the timeout expires, the request is aborted with an `AbortError`.
+     * If a signal was already provided, the timeout is chained so that either
+     * the external signal or the timeout can abort the request.
+     *
+     * @param {number} ms - Timeout duration in milliseconds.
+     * @returns {this} The current {@link Request} instance for method chaining.
+     *
+     * @example
+     * const request = new Request('/slow-endpoint', config);
+     * request.timeout(5000); // abort after 5 seconds
+     */
+    timeout(ms: number): this;
     /**
      * Merges the provided headers into the request configuration.
      *
@@ -1390,6 +1405,96 @@ declare class Request<Method extends HttpMethods, TRequest extends AspiRequestIn
             error: any;
         } ? Opts['error'][keyof Opts['error']] : never)) | null)
     ]>;
+    /**
+     * Executes the request and returns the response body as an {@link ArrayBuffer}.
+     *
+     * The shape of the returned {@link Promise} depends on the request mode:
+     *
+     * - **Result mode** (`withResult()`): resolves to a {@link Result.Result} containing
+     *   either an {@link AspiResultOk} with `ArrayBuffer` data or an error variant.
+     * - **Throwable mode** (`throwable()`): resolves directly to an {@link ArrayBuffer}
+     *   (wrapped in {@link AspiPlainResponse}) and throws on failure.
+     * - **Default mode**: resolves to a tuple `[value, error]` where exactly one element
+     *   is `null`.
+     *
+     * @returns {Promise<
+     *   Opts['withResult'] extends true
+     *     ? Result.Result<
+     *         AspiResultOk<TRequest, ArrayBuffer>,
+     *         | AspiError<TRequest>
+     *         | (Opts extends { error: any }
+     *             ? Opts['error'][keyof Opts['error']]
+     *             : never)
+     *       >
+     *     : Opts['throwable'] extends true
+     *       ? AspiPlainResponse<TRequest, ArrayBuffer>
+     *       : [
+     *           AspiResultOk<TRequest, ArrayBuffer> | null,
+     *           (
+     *             | (
+     *                 | AspiError<TRequest>
+     *                 | (Opts extends { error: any }
+     *                     ? Opts['error'][keyof Opts['error']]
+     *                     : never)
+     *               )
+     *             | null
+     *           ),
+     *         ]
+     * >}
+     */
+    arrayBuffer(): Promise<Opts['withResult'] extends true ? Result<AspiResultOk<TRequest, ArrayBuffer>, AspiError<TRequest> | (Opts extends {
+        error: any;
+    } ? Opts['error'][keyof Opts['error']] : never)> : Opts['throwable'] extends true ? AspiPlainResponse<TRequest, ArrayBuffer> : [
+        AspiResultOk<TRequest, ArrayBuffer> | null,
+        ((AspiError<TRequest> | (Opts extends {
+            error: any;
+        } ? Opts['error'][keyof Opts['error']] : never)) | null)
+    ]>;
+    /**
+     * Executes the request and returns the response body as {@link FormData}.
+     *
+     * The shape of the returned {@link Promise} depends on the request mode:
+     *
+     * - **Result mode** (`withResult()`): resolves to a {@link Result.Result} containing
+     *   either an {@link AspiResultOk} with `FormData` or an error variant.
+     * - **Throwable mode** (`throwable()`): resolves directly to {@link FormData}
+     *   (wrapped in {@link AspiPlainResponse}) and throws on failure.
+     * - **Default mode**: resolves to a tuple `[value, error]` where exactly one element
+     *   is `null`.
+     *
+     * @returns {Promise<
+     *   Opts['withResult'] extends true
+     *     ? Result.Result<
+     *         AspiResultOk<TRequest, FormData>,
+     *         | AspiError<TRequest>
+     *         | (Opts extends { error: any }
+     *             ? Opts['error'][keyof Opts['error']]
+     *             : never)
+     *       >
+     *     : Opts['throwable'] extends true
+     *       ? AspiPlainResponse<TRequest, FormData>
+     *       : [
+     *           AspiResultOk<TRequest, FormData> | null,
+     *           (
+     *             | (
+     *                 | AspiError<TRequest>
+     *                 | (Opts extends { error: any }
+     *                     ? Opts['error'][keyof Opts['error']]
+     *                     : never)
+     *               )
+     *             | null
+     *           ),
+     *         ]
+     * >}
+     */
+    formData(): Promise<Opts['withResult'] extends true ? Result<AspiResultOk<TRequest, FormData>, AspiError<TRequest> | (Opts extends {
+        error: any;
+    } ? Opts['error'][keyof Opts['error']] : never)> : Opts['throwable'] extends true ? AspiPlainResponse<TRequest, FormData> : [
+        AspiResultOk<TRequest, FormData> | null,
+        ((AspiError<TRequest> | (Opts extends {
+            error: any;
+        } ? Opts['error'][keyof Opts['error']] : never)) | null)
+    ]>;
     /**
      * Returns the fully‑qualified URL that will be used for the request.
      *
@@ -1549,7 +1654,7 @@ declare class Request<Method extends HttpMethods, TRequest extends AspiRequestIn
      *   .json();
      * ```
      */
-    useCapability(capability: Capability<TRequest>): number;
+    useCapability(capability: Capability<TRequest>): this;
 }
 
 /**

package/dist/index.d.ts

@@ -858,6 +858,21 @@ declare class Request<Method extends HttpMethods, TRequest extends AspiRequestIn
      * });
      */
     setRetry(retry: AspiRetryConfig<TRequest>): this;
+    /**
+     * Sets a timeout for the request in milliseconds.
+     *
+     * When the timeout expires, the request is aborted with an `AbortError`.
+     * If a signal was already provided, the timeout is chained so that either
+     * the external signal or the timeout can abort the request.
+     *
+     * @param {number} ms - Timeout duration in milliseconds.
+     * @returns {this} The current {@link Request} instance for method chaining.
+     *
+     * @example
+     * const request = new Request('/slow-endpoint', config);
+     * request.timeout(5000); // abort after 5 seconds
+     */
+    timeout(ms: number): this;
     /**
      * Merges the provided headers into the request configuration.
      *
@@ -1390,6 +1405,96 @@ declare class Request<Method extends HttpMethods, TRequest extends AspiRequestIn
             error: any;
         } ? Opts['error'][keyof Opts['error']] : never)) | null)
     ]>;
+    /**
+     * Executes the request and returns the response body as an {@link ArrayBuffer}.
+     *
+     * The shape of the returned {@link Promise} depends on the request mode:
+     *
+     * - **Result mode** (`withResult()`): resolves to a {@link Result.Result} containing
+     *   either an {@link AspiResultOk} with `ArrayBuffer` data or an error variant.
+     * - **Throwable mode** (`throwable()`): resolves directly to an {@link ArrayBuffer}
+     *   (wrapped in {@link AspiPlainResponse}) and throws on failure.
+     * - **Default mode**: resolves to a tuple `[value, error]` where exactly one element
+     *   is `null`.
+     *
+     * @returns {Promise<
+     *   Opts['withResult'] extends true
+     *     ? Result.Result<
+     *         AspiResultOk<TRequest, ArrayBuffer>,
+     *         | AspiError<TRequest>
+     *         | (Opts extends { error: any }
+     *             ? Opts['error'][keyof Opts['error']]
+     *             : never)
+     *       >
+     *     : Opts['throwable'] extends true
+     *       ? AspiPlainResponse<TRequest, ArrayBuffer>
+     *       : [
+     *           AspiResultOk<TRequest, ArrayBuffer> | null,
+     *           (
+     *             | (
+     *                 | AspiError<TRequest>
+     *                 | (Opts extends { error: any }
+     *                     ? Opts['error'][keyof Opts['error']]
+     *                     : never)
+     *               )
+     *             | null
+     *           ),
+     *         ]
+     * >}
+     */
+    arrayBuffer(): Promise<Opts['withResult'] extends true ? Result<AspiResultOk<TRequest, ArrayBuffer>, AspiError<TRequest> | (Opts extends {
+        error: any;
+    } ? Opts['error'][keyof Opts['error']] : never)> : Opts['throwable'] extends true ? AspiPlainResponse<TRequest, ArrayBuffer> : [
+        AspiResultOk<TRequest, ArrayBuffer> | null,
+        ((AspiError<TRequest> | (Opts extends {
+            error: any;
+        } ? Opts['error'][keyof Opts['error']] : never)) | null)
+    ]>;
+    /**
+     * Executes the request and returns the response body as {@link FormData}.
+     *
+     * The shape of the returned {@link Promise} depends on the request mode:
+     *
+     * - **Result mode** (`withResult()`): resolves to a {@link Result.Result} containing
+     *   either an {@link AspiResultOk} with `FormData` or an error variant.
+     * - **Throwable mode** (`throwable()`): resolves directly to {@link FormData}
+     *   (wrapped in {@link AspiPlainResponse}) and throws on failure.
+     * - **Default mode**: resolves to a tuple `[value, error]` where exactly one element
+     *   is `null`.
+     *
+     * @returns {Promise<
+     *   Opts['withResult'] extends true
+     *     ? Result.Result<
+     *         AspiResultOk<TRequest, FormData>,
+     *         | AspiError<TRequest>
+     *         | (Opts extends { error: any }
+     *             ? Opts['error'][keyof Opts['error']]
+     *             : never)
+     *       >
+     *     : Opts['throwable'] extends true
+     *       ? AspiPlainResponse<TRequest, FormData>
+     *       : [
+     *           AspiResultOk<TRequest, FormData> | null,
+     *           (
+     *             | (
+     *                 | AspiError<TRequest>
+     *                 | (Opts extends { error: any }
+     *                     ? Opts['error'][keyof Opts['error']]
+     *                     : never)
+     *               )
+     *             | null
+     *           ),
+     *         ]
+     * >}
+     */
+    formData(): Promise<Opts['withResult'] extends true ? Result<AspiResultOk<TRequest, FormData>, AspiError<TRequest> | (Opts extends {
+        error: any;
+    } ? Opts['error'][keyof Opts['error']] : never)> : Opts['throwable'] extends true ? AspiPlainResponse<TRequest, FormData> : [
+        AspiResultOk<TRequest, FormData> | null,
+        ((AspiError<TRequest> | (Opts extends {
+            error: any;
+        } ? Opts['error'][keyof Opts['error']] : never)) | null)
+    ]>;
     /**
      * Returns the fully‑qualified URL that will be used for the request.
      *
@@ -1549,7 +1654,7 @@ declare class Request<Method extends HttpMethods, TRequest extends AspiRequestIn
      *   .json();
      * ```
      */
-    useCapability(capability: Capability<TRequest>): number;
+    useCapability(capability: Capability<TRequest>): this;
 }
 
 /**

package/dist/index.js

@@ -256,6 +256,8 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
       return bc(ab(a));
     case 4:
       return cd(bc(ab(a)));
+    case 5:
+      return de(cd(bc(ab(a))));
     case 6:
       return ef(de(cd(bc(ab(a)))));
     case 7:
@@ -284,6 +286,7 @@ var Request = class {
   #schema = null;
   #bodySchema = null;
   #retryConfig;
+  #timeoutMs;
   #shouldBeResult = false;
   #bodySchemaIssues = [];
   #throwOnError = false;
@@ -333,6 +336,24 @@ var Request = class {
     };
     return this;
   }
+  /**
+   * Sets a timeout for the request in milliseconds.
+   *
+   * When the timeout expires, the request is aborted with an `AbortError`.
+   * If a signal was already provided, the timeout is chained so that either
+   * the external signal or the timeout can abort the request.
+   *
+   * @param {number} ms - Timeout duration in milliseconds.
+   * @returns {this} The current {@link Request} instance for method chaining.
+   *
+   * @example
+   * const request = new Request('/slow-endpoint', config);
+   * request.timeout(5000); // abort after 5 seconds
+   */
+  timeout(ms) {
+    this.#timeoutMs = ms;
+    return this;
+  }
   /**
    * Merges the provided headers into the request configuration.
    *
@@ -916,6 +937,92 @@ var Request = class {
     const output = await this.#makeRequest((response) => response.blob());
     return this.#mapResponse(output);
   }
+  /**
+   * Executes the request and returns the response body as an {@link ArrayBuffer}.
+   *
+   * The shape of the returned {@link Promise} depends on the request mode:
+   *
+   * - **Result mode** (`withResult()`): resolves to a {@link Result.Result} containing
+   *   either an {@link AspiResultOk} with `ArrayBuffer` data or an error variant.
+   * - **Throwable mode** (`throwable()`): resolves directly to an {@link ArrayBuffer}
+   *   (wrapped in {@link AspiPlainResponse}) and throws on failure.
+   * - **Default mode**: resolves to a tuple `[value, error]` where exactly one element
+   *   is `null`.
+   *
+   * @returns {Promise<
+   *   Opts['withResult'] extends true
+   *     ? Result.Result<
+   *         AspiResultOk<TRequest, ArrayBuffer>,
+   *         | AspiError<TRequest>
+   *         | (Opts extends { error: any }
+   *             ? Opts['error'][keyof Opts['error']]
+   *             : never)
+   *       >
+   *     : Opts['throwable'] extends true
+   *       ? AspiPlainResponse<TRequest, ArrayBuffer>
+   *       : [
+   *           AspiResultOk<TRequest, ArrayBuffer> | null,
+   *           (
+   *             | (
+   *                 | AspiError<TRequest>
+   *                 | (Opts extends { error: any }
+   *                     ? Opts['error'][keyof Opts['error']]
+   *                     : never)
+   *               )
+   *             | null
+   *           ),
+   *         ]
+   * >}
+   */
+  async arrayBuffer() {
+    const output = await this.#makeRequest(
+      (response) => response.arrayBuffer()
+    );
+    return this.#mapResponse(output);
+  }
+  /**
+   * Executes the request and returns the response body as {@link FormData}.
+   *
+   * The shape of the returned {@link Promise} depends on the request mode:
+   *
+   * - **Result mode** (`withResult()`): resolves to a {@link Result.Result} containing
+   *   either an {@link AspiResultOk} with `FormData` or an error variant.
+   * - **Throwable mode** (`throwable()`): resolves directly to {@link FormData}
+   *   (wrapped in {@link AspiPlainResponse}) and throws on failure.
+   * - **Default mode**: resolves to a tuple `[value, error]` where exactly one element
+   *   is `null`.
+   *
+   * @returns {Promise<
+   *   Opts['withResult'] extends true
+   *     ? Result.Result<
+   *         AspiResultOk<TRequest, FormData>,
+   *         | AspiError<TRequest>
+   *         | (Opts extends { error: any }
+   *             ? Opts['error'][keyof Opts['error']]
+   *             : never)
+   *       >
+   *     : Opts['throwable'] extends true
+   *       ? AspiPlainResponse<TRequest, FormData>
+   *       : [
+   *           AspiResultOk<TRequest, FormData> | null,
+   *           (
+   *             | (
+   *                 | AspiError<TRequest>
+   *                 | (Opts extends { error: any }
+   *                     ? Opts['error'][keyof Opts['error']]
+   *                     : never)
+   *               )
+   *             | null
+   *           ),
+   *         ]
+   * >}
+   */
+  async formData() {
+    const output = await this.#makeRequest(
+      (response) => response.formData()
+    );
+    return this.#mapResponse(output);
+  }
   #url() {
     if (this.#path.startsWith("http://") || this.#path.startsWith("https://")) {
       const absolute = new URL(this.#path);
@@ -933,7 +1040,6 @@ var Request = class {
     let path = rawPath || "";
     path = path.replace(/^\/+/, "");
     path = path.replace(/\/{2,}/g, "/");
-    path = path.replace(/\/+$/, "");
     if (path) {
       path = "/" + path.replace(/^\/+/, "");
     }
@@ -951,7 +1057,6 @@ var Request = class {
     if (fragment) {
       url += `#${fragment}`;
     }
-    url = url.replace(/\/+$/, "");
     return url;
   }
   /**
@@ -1049,16 +1154,32 @@ var Request = class {
       });
       let responseData = null;
       while (attempts <= retries) {
+        let timeoutTimer;
         try {
-          if (this.#capabilities.length > 0) {
-            for (const capability of this.#capabilities) {
-              response = await capability({ request }).run(
-                () => fetch(url, requestInit)
+          const attemptInit = { ...requestInit };
+          if (this.#timeoutMs && this.#timeoutMs > 0) {
+            const timeoutController = new AbortController();
+            timeoutTimer = setTimeout(
+              () => timeoutController.abort(),
+              this.#timeoutMs
+            );
+            if (attemptInit.signal) {
+              attemptInit.signal.addEventListener(
+                "abort",
+                () => timeoutController.abort(),
+                { once: true }
               );
             }
-          } else {
-            response = await fetch(url, requestInit);
+            attemptInit.signal = timeoutController.signal;
+          }
+          let runner = () => fetch(url, attemptInit);
+          for (let i = this.#capabilities.length - 1; i >= 0; i--) {
+            const cap = this.#capabilities[i];
+            const next = runner;
+            runner = () => cap({ request }).run(next);
           }
+          response = await runner();
+          if (timeoutTimer) clearTimeout(timeoutTimer);
           responseData = await responseParser(response);
           if (responseData instanceof Error) {
             return err(responseData);
@@ -1070,7 +1191,7 @@ var Request = class {
           if (this.#isSuccessResponse(response) || !retryOn.includes(response.status) && !retryWhileCondition) {
             break;
           }
-          if (response.status in this.#customErrorCbs && attempts === retries) {
+          if (response.status in this.#customErrorCbs) {
             const result = this.#customErrorCbs[response.status].cb({
               request,
               response: this.#makeResponse(response, responseData)
@@ -1093,6 +1214,7 @@ var Request = class {
             await this.#abortDelay(delay, request);
           }
         } catch (e) {
+          if (timeoutTimer) clearTimeout(timeoutTimer);
           if (e instanceof Error && e.name === "AbortError") {
             if (500 in this.#customErrorCbs) {
               const result = this.#customErrorCbs[response.status].cb({
@@ -1361,7 +1483,8 @@ var Request = class {
    * ```
    */
   useCapability(capability) {
-    return this.#capabilities.push(capability);
+    this.#capabilities.push(capability);
+    return this;
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aspi",
   "description": "Rest API client for typescript projects with chain of responsibility design pattern.",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "module": "src/index.ts",
   "type": "module",
   "devDependencies": {