@scirexs/fetchy 0.2.2 → 0.4.0

package/README.md

@@ -15,9 +15,10 @@ A lightweight, type-safe fetch wrapper with built-in retry logic, timeout handli
 - **Type-Safe** - Full TypeScript support with generic type inference
 - **Bearer Token Helper** - Built-in Authorization header management
 - **Jitter Support** - Prevent thundering herd with randomized delays
-- **Auto Body Parsing** - Automatic JSON serialization and Content-Type detection
+- **Automatic Body Parsing** - Automatic JSON serialization and Content-Type detection
 
 ## Installation
+
 ```bash
 # npm
 npm install @scirexs/fetchy
@@ -27,6 +28,7 @@ deno add jsr:@scirexs/fetchy
 ```
 
 ## Quick Start
+
 ```ts
 import { fetchy, fetchyb } from "@scirexs/fetchy";
 
@@ -52,20 +54,23 @@ console.log(user?.name);
 Performs an HTTP request and returns the raw Response object.
 
 #### Parameters
-- `url`: `string | URL | Request` - The request URL
+
+- `url`: `string | URL | Request | null` - The request URL
 - `options`: `FetchyOptions` (optional) - Configuration options
 
 #### Returns
-`Promise<Response>`; If configure `throwError.onError`, `Promise<Response | null>`
+
+`Promise<Response>`; If `onError.onNative` is configured as `false`, returns `Promise<Response | null>`
 
 #### Example
+
 ```ts
 const response = await fetchy("https://api.example.com/data", {
   method: "POST",
   body: { key: "value" },
   timeout: 10,
-  retry: { max: 3, interval: 2 },
-  bearerToken: "your-token-here"
+  retry: { maxAttempts: 3, interval: 2 },
+  bearer: "your-token-here"
 });
 
 if (response?.ok) {
@@ -78,14 +83,17 @@ if (response?.ok) {
 Performs an HTTP request and automatically parses the response body.
 
 #### Parameters
-- `url`: `string | URL | Request` - The request URL
+
+- `url`: `string | URL | Request | null` - The request URL
 - `type`: `"text" | "json" | "bytes" | "auto"` (default: `"auto"`) - Response parsing type
 - `options`: `FetchyOptions` (optional) - Configuration options
 
 #### Returns
-`Promise<T | string | Uint8Array>`; If configure `throwError.onError`, `Promise<T | string | Uint8Array | null>`
+
+`Promise<T | string | Uint8Array>`; If `onError.onNative` is configured as `false`, returns `Promise<T | string | Uint8Array | null>`
 
 #### Example
+
 ```ts
 // Automatic type detection from Content-Type header
 const data = await fetchyb("https://api.example.com/data");
@@ -105,50 +113,47 @@ const html = await fetchyb("https://example.com", "text");
 const image = await fetchyb("https://example.com/image.png", "bytes");
 ```
 
-## Configurations
+## Configuration
 
 ### API Options
 
 #### `FetchyOptions`
 
 ```ts
-interface FetchyOptions {
+interface FetchyOptions extends RequestInit {
   // Standard fetch options (method, headers, etc.)
   method?: string;
   headers?: HeadersInit;
   
-  // Request body (auto-serializes JSON, ReadableStream is NOT supported)
+  // Request body (auto-serializes JSON; ReadableStream is NOT supported)
   // type JSONValue = string | number | boolean | null | JSONValue[] | { [key: string]: JSONValue };
   body?: JSONValue | FormData | URLSearchParams | Blob | ArrayBuffer | string;
   
   // Timeout in seconds (default: 15)
-  timeout?: number;
+  timeout?: number;  // Set to 0 to disable timeout
   
   // Retry configuration
   retry?: {
-    max?: number;           // Max retry attempts (default: 3)
-    interval?: number;      // Base interval in seconds (default: 3)
-    maxInterval?: number;   // Max interval cap (default: 30)
-    byHeader?: boolean;     // Respect Retry-After header (default: true)
+    maxAttempts?: number;  // Maximum retry attempts (default: 3)
+    interval?: number;     // Base interval in seconds (default: 3)
+    maxInterval?: number;  // Maximum interval cap in seconds (default: 30)
+    retryAfter?: boolean;  // Respect Retry-After header (default: true)
   } | false;  // Set to false to disable retry
   
-  // Bearer token (auto-adds "Bearer " prefix)
-  bearerToken?: string;
+  // Bearer token (automatically adds "Bearer " prefix)
+  bearer?: string;
   
   // Error throwing behavior
-  throwError?: {
-    onError?: boolean;        // Throw on native errors (default: true)
-    onErrorStatus?: boolean;  // Throw on 4xx/5xx status (default: false)
-  } | boolean;  // Set to true to throw all errors
+  onError?: {
+    onNative?: boolean;  // Throw on native errors (default: true)
+    onStatus?: boolean;  // Throw on 4xx/5xx status (default: false)
+  } | boolean;  // Set to true to throw on all errors
   
   // Initial jitter delay in seconds
-  jitter?: number;
-  
-  // Manual abort controller (if timeout occur, reason is set to "timeout")
-  abort?: AbortController;
-  
-  // Redirect behavior
-  redirect?: "follow" | "error" | "manual";
+  delay?: number;
+
+  // URL for fetch (allows reusing FetchyOptions as preset configuration)
+  url?: string | URL;
 }
 ```
 
@@ -156,63 +161,65 @@ interface FetchyOptions {
 
 ```ts
 {
-  timeout: 15,           // 15 seconds
-  jitter: 0,             // No jitter
+  timeout: 15,        // 15 seconds
+  delay: 0,           // No jitter delay
   retry: {
-    max: 3,              // 3 retry attempts
-    interval: 3,         // 3 seconds base interval
-    maxInterval: 30,     // 30 seconds max interval
-    byHeader: true       // Respect Retry-After header
+    maxAttempts: 3,   // 3 retry attempts
+    interval: 3,      // 3 seconds base interval
+    maxInterval: 30,  // 30 seconds maximum interval
+    retryAfter: true  // Respect Retry-After header
   },
-  throwError: {
-    onError: true,       // Throw parsing errors
-    onErrorStatus: false // Don't throw on HTTP errors
+  onError: {
+    onNative: true,   // Throw native errors
+    onStatus: false   // Don't throw on HTTP errors
   },
-  redirect: "follow"     // Follow redirects
 }
 ```
 
-### Auto-Configurations
+### Automatic Configuration
 
 #### Method
 
-If a body is passed as an option without specifying a method, the method will default to "POST".
+If a body is provided without specifying a method, the method defaults to `"POST"`. When a Request object is passed as the `url` argument, its method is used.
 
 #### Headers
 
-If the following headers are not specified, they will be automatically set:
+The following headers are automatically set if not specified:
 
-- Accept: `application/json, text/plain`
-- Content-Type: Automatically determined based on the body type:
+- **Accept**: `application/json, text/plain`
+- **Content-Type**: Automatically determined based on the body type:
   - `string`, `URLSearchParams`, `FormData`, `Blob` with type: Not set by this package; [`fetch` will set it automatically](https://fetch.spec.whatwg.org/#concept-bodyinit-extract).
   - `JSONValue`: `application/json`
   - `Blob` without type: `application/octet-stream`
   - `ArrayBuffer`: `application/octet-stream` 
-- Authorization: Set to `Bearer ${options.bearerToken}` if `options.bearerToken` is provided.
+- **Authorization**: Set to `Bearer ${options.bearer}` if `options.bearer` is provided.
+
+**Note 1:** If you pass serialized JSON as the body (i.e., a string), Content-Type will be set to `text/plain;charset=UTF-8`. To ensure Content-Type is set to `application/json`, pass the JSON object directly instead of a serialized string.
 
-**Note:** If you pass serialized JSON as the body (i.e., a string), Content-Type will be set to `text/plain;charset=UTF-8`. To ensure Content-Type is set to `application/json`, pass the JSON object directly instead of a serialized string.
+**Note 2:** If you pass a body through a Request object, Content-Type will NOT be set automatically by this package.
 
-## Error Behavior
+## Error Handling
 
 ### Timeout
 
-If the timeout duration specified in the `timeout` option is exceeded, `abort("timeout")` will be called on the provided AbortController. Note that there is no specific error class for timeout errors; they will be thrown as standard `AbortError`s.
+If the timeout duration specified in the `timeout` option is exceeded, the request is aborted using the standard `AbortSignal.timeout()` method. Note that there is no specific error class for timeout errors; they will be thrown as standard `AbortError`s.
 
 ### HTTPStatusError
 
-If `onErrorStatus` is set to `true`, an `HTTPStatusError` will be thrown when the response status is outside the 200 range. You can access its status and body through this error object. The error message format is: `404 Not Found: (no response body)`.
+If `onStatus` is set to `true`, an `HTTPStatusError` will be thrown when the response status is outside the 2xx range. You can access the status and body through this error object. The error message format is: `404 Not Found: (no response body)`.
 
 ### RedirectError
 
-If `redirect` is set to `"error"`, a `RedirectError` will be thrown when the response status is in the 300 range. You can access its status through this error object. The error message format is: `301 Moved Permanently`.
+If `redirect` is set to `"error"`, a `RedirectError` will be thrown when the response status is in the 3xx range. You can access the status through this error object. The error message format is: `301 Moved Permanently`.
 
-### Others
+### Other Errors
 
-If the `onError` option is set to `true`, any other errors that occur will be thrown directly.
+If the `onNative` option is set to `true`, any other errors that occur will be thrown directly.
 
 ## Usage Examples
 
 ### Basic Requests
+
 ```ts
 import { fetchy, fetchyb } from "@scirexs/fetchy";
 
@@ -230,13 +237,19 @@ const response = await fetchy("https://api.example.com/data", {
     "X-Custom-Header": "value"
   }
 });
+
+// Reuse options as preset configuration (avoids Request object limitations)
+const options = { url: "https://api.example.com/data", retry: false };
+await fetchy(null, options);
+await fetchy(null, options);
 ```
 
 ### Authentication
+
 ```ts
 // Bearer token authentication
 const user = await fetchyb<User>("https://api.example.com/me", "json", {
-  bearerToken: "your-access-token"
+  bearer: "your-access-token"
 });
 
 // Custom authorization
@@ -248,6 +261,7 @@ const data = await fetchyb("https://api.example.com/data", "json", {
 ```
 
 ### Timeout and Retry
+
 ```ts
 // Custom timeout
 const response = await fetchy("https://slow-api.example.com", {
@@ -255,12 +269,13 @@ const response = await fetchy("https://slow-api.example.com", {
 });
 
 // Retry with exponential backoff
+// Retry intervals: 1s, 3s (3^1), 9s (3^2), 27s (3^3), 60s (capped at maxInterval)
 const data = await fetchyb("https://api.example.com/data", "json", {
   retry: {
-    max: 5,           // Retry up to 5 times
-    interval: 2,      // Start with 2 seconds
+    maxAttempts: 5,   // Retry up to 5 times
+    interval: 3,      // Base interval for exponential backoff (interval^n)
     maxInterval: 60,  // Cap at 60 seconds
-    byHeader: true    // Respect Retry-After header
+    retryAfter: true  // Respect Retry-After header
   }
 });
 
@@ -271,10 +286,11 @@ const response = await fetchy("https://api.example.com/data", {
 ```
 
 ### Error Handling
+
 ```ts
 import { fetchy, HTTPStatusError, RedirectError } from "@scirexs/fetchy";
 
-// Throw on error (default is same with `fetch`)
+// Throw on error (default behavior, same as native fetch)
 try {
   const response = await fetchy("https://api.example.com/data");
 } catch (error) {
@@ -283,7 +299,7 @@ try {
 
 // Return null on error
 const response = await fetchy("https://api.example.com/data", {
-  throwError: false,
+  onError: false,
 });
 if (response === null) {
   console.log("Request failed");
@@ -292,12 +308,13 @@ if (response === null) {
 // Throw only on HTTP errors
 try {
   const response = await fetchy("https://api.example.com/data", {
-    throwError: { onError: false, onErrorStatus: true }
+    onError: { onNative: false, onStatus: true }
   });
 } catch (error) {
   if (error instanceof HTTPStatusError) {
-    // You can also use error.status and error.body.
     console.error("HTTP error:", error.message);  // e.g., "404 Not Found: (no response body)"
+    console.error("Status:", error.status);
+    console.error("Body:", error.body);
   }
 }
 
@@ -309,28 +326,34 @@ try {
 } catch (error) {
   if (error instanceof RedirectError) {
     console.error("Unexpected redirect:", error.message);
+    console.error("Status:", error.status);
   }
 }
 ```
 
 ### Advanced Usage
+
 ```ts
 // Jitter to prevent thundering herd
 const response = await fetchy("https://api.example.com/data", {
-  jitter: 2,  // Random delay up to 2 seconds before request
-  retry: { max: 3 }
+  delay: 2,  // Random delay up to 2 seconds before request
+  retry: { maxAttempts: 3 }
 });
 
-// Manual abort control
-const controller = new AbortController();
+// Combined abort signals
+const controller1 = new AbortController();
+const controller2 = new AbortController();
+const request = new Request("https://api.example.com/data", {
+  signal: controller1.signal
+});
 
-setTimeout(() => controller.abort(), 5000);  // Abort after 5 seconds
+setTimeout(() => controller1.abort(), 5000);  // Abort after 5 seconds
 
-const response = await fetchy("https://api.example.com/data", {
-  abort: controller
+const response = await fetchy(request, {
+  signal: controller2.signal
 });
 
-// Form data
+// Form data upload
 const formData = new FormData();
 formData.append("file", blob);
 formData.append("name", "example");
@@ -349,12 +372,14 @@ const response = await fetchy("https://api.example.com/form", {
 ```
 
 ### Type-Safe API Responses
+
 ```ts
 interface ApiResponse<T> {
   success: boolean;
   data: T;
   error?: string;
 }
+
 interface Todo {
   id: number;
   title: string;
@@ -371,19 +396,37 @@ if (response.success) {
 }
 ```
 
-#### Restricting the Return Type
+## Limitations
+
+### Return Type Inference
+
+When setting the `onError` property in `FetchyOptions`, the return type will include `null` even if you set it to `true` or `{ onNative: true }`. To prevent this and ensure a non-nullable return type, add `as const` to the `onError` property value:
 
-When setting the `throwError` property in `FetchyOptions`, the return type will include `null` even if you set it to `true` or `{ onError: true }`. To prevent this and ensure a non-nullable return type, add `as const` to the `throwError` property value:
 ```ts
 interface User {
   id: number;
   name: string;
 }
 
-const options = { timeout: 5, throwError: true as const };  // Add `as const`
-const response = await fetchy("https://api.example.com/todos/1", "json", options); // `response` is User (not User | null)
+const options = { timeout: 5, onError: true as const };  // Add `as const`
+const response = await fetchy("https://api.example.com/todos/1", "json", options);
+// `response` is User (not User | null)
 ```
 
+### Content-Type Header with Request Objects
+
+When a body is set in a Request object, the Content-Type header is NOT set automatically by this package. Therefore, when using Request objects, you must explicitly set the Content-Type header for any body types other than those automatically handled by the native `fetch` API.
+
+This limitation can be avoided by using the `url` property in `FetchyOptions` instead of Request objects. This approach allows you to benefit from all automatic header configuration features while still maintaining reusable preset configurations. See the "Reuse options as preset configuration" example in the [Basic Requests](#basic-requests) section.
+
+### ReadableStream as Body
+
+`FetchyOptions` does not accept ReadableStream as a body. If you need to use ReadableStream, create a Request object with the stream and pass it to `fetchy()`.
+
+### Redirect Error Handling
+
+When `redirect` is set to `"error"`, this package throws a custom `RedirectError` (instead of the native TypeError) to enable proper retry handling for redirect responses.
+
 ## License
 
 MIT

package/esm/main.js

@@ -1,19 +1,19 @@
-export { _correctNumber, _fetchWithJitter, _fetchWithRetry, _fetchWithTimeout, _getBody, _getContentType, _getHeaders, _getNextInterval, _getOptions, _getRequestInit, _getRetryOption, _handleRedirectResponse, _isBool, _isJSONObject, _isNumber, _isPlainObject, _isString, _parseRetryAfter, _shouldNotRetry, _shouldRedirect, _throwError, _wait, DEFAULT, fetchy, fetchyb, HTTPStatusError, RedirectError, };
+export { _cloneInput, _combineSignal, _correctNumber, _DEFAULT, _fetchWithJitter, _fetchWithRetry, _getBody, _getContentType, _getHeaders, _getNextInterval, _getOptions, _getRequestInit, _getRetryOption, _handleRedirectResponse, _isBool, _isJSONObject, _isNumber, _isPlainObject, _isString, _parseRetryAfter, _shouldNotRetry, _shouldRedirect, _throwError, _wait, fetchy, fetchyb, HTTPStatusError, RedirectError, };
 /*=============== Constant Values ===============*/
 /**
  * Default configuration values for fetchy.
  * These values are used when corresponding options are not specified.
  */
-const DEFAULT = {
+const _DEFAULT = {
     timeout: 15,
-    jitter: 0,
+    delay: 0,
     interval: 3,
     maxInterval: 30,
-    max: 3,
-    byHeader: true,
-    onError: true,
-    onErrorStatus: false,
-    userRedirect: "follow",
+    maxAttempts: 3,
+    retryAfter: true,
+    onNative: true,
+    onStatus: false,
+    redirect: "follow",
 };
 /*=============== Main Code =====================*/
 /**
@@ -93,22 +93,24 @@ async function fetchyb(url, type = "auto", options) {
         return await resp.bytes();
     }
     catch (e) {
-        if (_throwError("onError", options?.throwError))
+        if (_throwError("onNative", options?.onError))
             throw e;
         return null;
     }
 }
 async function fetchy(url, options) {
     try {
+        if (!url)
+            url = options?.url ?? new URL("");
         const opts = _getOptions(options);
-        const init = _getRequestInit(options, opts.abort);
+        const init = _getRequestInit(url, opts, options);
         const resp = await _fetchWithRetry(url, init, opts);
-        if (!resp.ok && opts.onErrorStatus)
+        if (!resp.ok && opts.onStatus)
             throw await HTTPStatusError.fromResponse(resp);
         return resp;
     }
     catch (e) {
-        if (_throwError("onError", options?.throwError))
+        if (_throwError("onNative", options?.onError))
             throw e;
         return null;
     }
@@ -161,9 +163,9 @@ function _isPlainObject(v) {
  * @returns True if error should be thrown.
  */
 function _throwError(prop, options) {
-    return Boolean((options === void 0 && DEFAULT[prop]) ||
+    return Boolean((options === void 0 && _DEFAULT[prop]) ||
         (typeof options === "boolean" && options) ||
-        (typeof options === "object" && (options[prop] ?? DEFAULT[prop])));
+        (typeof options === "object" && (options[prop] ?? _DEFAULT[prop])));
 }
 /**
  * Corrects a number to be non-negative, using default if invalid.
@@ -182,9 +184,9 @@ function _getRetryOption(prop, off, options) {
     if (_isBool(options))
         return off;
     if (options === void 0 || options[prop] === void 0)
-        return DEFAULT[prop];
+        return _DEFAULT[prop];
     if (_isNumber(options[prop]))
-        return _correctNumber(DEFAULT[prop], options[prop], prop === "max");
+        return _correctNumber(_DEFAULT[prop], options[prop], prop === "maxAttempts");
     return options[prop];
 }
 /**
@@ -194,33 +196,32 @@ function _getRetryOption(prop, off, options) {
  * @returns Normalized internal options.
  */
 function _getOptions(options) {
-    const timeout = _correctNumber(DEFAULT.timeout, options?.timeout);
     return {
-        timeout,
-        jitter: _correctNumber(DEFAULT.jitter, options?.jitter),
+        timeout: _correctNumber(_DEFAULT.timeout, options?.timeout),
+        delay: _correctNumber(_DEFAULT.delay, options?.delay),
         interval: _getRetryOption("interval", 0, options?.retry),
         maxInterval: _getRetryOption("maxInterval", 0, options?.retry),
-        max: _getRetryOption("max", 0, options?.retry),
-        byHeader: _getRetryOption("byHeader", false, options?.retry),
-        onErrorStatus: _throwError("onErrorStatus", options?.throwError),
-        abort: options?.abort ?? (timeout ? new AbortController() : undefined),
-        userRedirect: options?.redirect ?? DEFAULT.userRedirect,
+        maxAttempts: _getRetryOption("maxAttempts", 0, options?.retry),
+        retryAfter: _getRetryOption("retryAfter", false, options?.retry),
+        onStatus: _throwError("onStatus", options?.onError),
+        redirect: options?.redirect ?? _DEFAULT.redirect,
     };
 }
 /**
  * Converts FetchyOptions to standard RequestInit format.
  * @internal
+ * @param url - Original request URL.
+ * @param opts - Internal options.
  * @param options - User-provided options.
- * @param optsAbort - AbortController for timeout handling.
  * @returns Standard RequestInit object.
  */
-function _getRequestInit(options, optsAbort) {
-    const { body, timeout, retry, bearerToken, throwError, jitter, abort, redirect, ...rest } = options ?? {};
+function _getRequestInit(url, opts, options) {
+    const { method, body, timeout, retry, bearer, onError, delay, redirect, signal, ...rest } = options ?? {};
     return {
-        method: body === void 0 ? "GET" : "POST",
         headers: _getHeaders(options),
+        method: method ? method : url instanceof Request ? url.method : body === void 0 ? "GET" : "POST",
+        signal: _combineSignal(url, opts.timeout, options?.signal),
         ...(redirect && { redirect: redirect === "error" ? "manual" : redirect }),
-        ...(optsAbort && { signal: optsAbort.signal }),
         ...(body && { body: _getBody(body) }),
         ...rest,
     };
@@ -254,7 +255,7 @@ function _getHeaders(options) {
     return {
         "Accept": "application/json, text/plain",
         ...(type && { "Content-Type": type }),
-        ...(options?.bearerToken && { "Authorization": `Bearer ${options.bearerToken}` }),
+        ...(options?.bearer && { "Authorization": `Bearer ${options.bearer}` }),
         ...options?.headers,
     };
 }
@@ -273,6 +274,24 @@ function _getContentType(body) {
         return "application/json";
     return "application/octet-stream";
 }
+/**
+ * Combine abort signals.
+ * @internal
+ * @param url - Original request URL.
+ * @param timeout - Request timeout in seconds.
+ * @param signal - AbortSignal in User-provided options.
+ * @returns Combined AbortSignal or undefined.
+ */
+function _combineSignal(url, timeout, signal) {
+    const signals = [];
+    if (url instanceof Request && url.signal)
+        signals.push(url.signal);
+    if (signal)
+        signals.push(signal);
+    if (timeout > 0)
+        signals.push(AbortSignal.timeout(timeout * 1000 + 1));
+    return signals.length ? AbortSignal.any(signals) : undefined;
+}
 /**
  * Waits for specified seconds with optional randomization.
  * @internal
@@ -298,18 +317,19 @@ function _shouldRedirect(resp) {
  * Determines if retry should stop based on conditions and waits if continuing.
  * @internal
  * @param count - Current retry attempt number.
+ * @param init - Request initialization object.
  * @param opts - Internal options.
  * @param resp - Response from previous attempt.
  * @returns True if retry should stop.
  */
-async function _shouldNotRetry(count, opts, resp) {
-    if (count >= opts.max || resp?.ok)
+async function _shouldNotRetry(count, init, opts, resp) {
+    if (count >= opts.maxAttempts - 1 || init.signal?.aborted || resp?.ok)
         return true;
     if (resp && _shouldRedirect(resp)) {
-        if (opts.userRedirect === "manual")
+        if (opts.redirect === "manual")
             return true;
-        if (opts.userRedirect === "error") {
-            opts.max = 0;
+        if (opts.redirect === "error") {
+            opts.maxAttempts = 0;
             throw RedirectError.fromResponse(resp);
         }
     }
@@ -328,7 +348,7 @@ async function _shouldNotRetry(count, opts, resp) {
  * @returns Next retry interval in seconds.
  */
 function _getNextInterval(count, opts, resp) {
-    return opts.byHeader && resp
+    return opts.retryAfter && resp
         ? Math.max(_parseRetryAfter(resp.headers.get("Retry-After")?.trim() ?? ""), opts.interval)
         : Math.min(Math.pow(Math.max(1, opts.interval), count), opts.maxInterval);
 }
@@ -364,6 +384,16 @@ function _handleRedirectResponse(url, init, resp) {
         init.method = "GET";
     return url instanceof Request ? new Request(resp.url, url) : resp.url;
 }
+/**
+ * Clone input if required.
+ * @internal
+ * @param url - Original request URL.
+ * @param required - Switch to clone or not.
+ * @returns Cloned input for fetch.
+ */
+function _cloneInput(url, required) {
+    return url instanceof Request && required ? url.clone() : url;
+}
 /**
  * Executes fetch with retry logic and exponential backoff.
  * @internal
@@ -373,23 +403,22 @@ function _handleRedirectResponse(url, init, resp) {
  * @returns Response from successful request.
  */
 async function _fetchWithRetry(url, init, opts) {
-    if (!opts.max)
-        return await _fetchWithTimeout(url, init, opts);
-    for (let i = 1; i <= opts.max; i++) {
+    for (let i = 0; i < opts.maxAttempts; i++) {
         try {
-            const resp = await (opts.jitter ? _fetchWithJitter(url, init, opts) : _fetchWithTimeout(url, init, opts));
-            if (await _shouldNotRetry(i, opts, resp))
+            const input = _cloneInput(url, i < opts.maxAttempts - 1); // no clone if end of retry
+            const resp = await _fetchWithJitter(input, init, opts);
+            if (await _shouldNotRetry(i, init, opts, resp))
                 return resp;
             url = _handleRedirectResponse(url, init, resp);
             continue;
         }
         catch (e) {
-            if (await _shouldNotRetry(i, opts))
+            if (await _shouldNotRetry(i, init, opts))
                 throw e;
             continue;
         }
     }
-    throw new Error("never reach");
+    return await _fetchWithJitter(url, init, opts);
 }
 /**
  * Executes fetch with initial jitter delay.
@@ -400,27 +429,6 @@ async function _fetchWithRetry(url, init, opts) {
  * @returns Response from request.
  */
 async function _fetchWithJitter(url, init, opts) {
-    await _wait(opts.jitter);
-    return await _fetchWithTimeout(url, init, opts);
-}
-/**
- * Executes fetch with timeout handling.
- * @internal
- * @param url - Request URL.
- * @param init - Request initialization object.
- * @param opts - Internal options.
- * @returns Response from request.
- */
-async function _fetchWithTimeout(url, init, opts) {
-    const req = url instanceof Request ? url.clone() : url;
-    const id = opts.abort ? setTimeout(() => opts.abort?.abort("timeout"), opts.timeout * 1000) : 0;
-    try {
-        return await fetch(req, init);
-    }
-    catch (e) {
-        throw e;
-    }
-    finally {
-        clearTimeout(id);
-    }
+    await _wait(opts.delay);
+    return await fetch(url, init);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scirexs/fetchy",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "description": "A lightweight fetch wrapper.",
   "keywords": [
     "fetch",

package/types/main.d.ts

@@ -1,10 +1,10 @@
-export { _correctNumber, _fetchWithJitter, _fetchWithRetry, _fetchWithTimeout, _getBody, _getContentType, _getHeaders, _getNextInterval, _getOptions, _getRequestInit, _getRetryOption, _handleRedirectResponse, _isBool, _isJSONObject, _isNumber, _isPlainObject, _isString, _parseRetryAfter, _shouldNotRetry, _shouldRedirect, _throwError, _wait, DEFAULT, fetchy, fetchyb, HTTPStatusError, RedirectError, };
+export { _cloneInput, _combineSignal, _correctNumber, _DEFAULT, _fetchWithJitter, _fetchWithRetry, _getBody, _getContentType, _getHeaders, _getNextInterval, _getOptions, _getRequestInit, _getRetryOption, _handleRedirectResponse, _isBool, _isJSONObject, _isNumber, _isPlainObject, _isString, _parseRetryAfter, _shouldNotRetry, _shouldRedirect, _throwError, _wait, fetchy, fetchyb, HTTPStatusError, RedirectError, };
 import type { ErrorOptions, FetchyBody, FetchyOptions, RetryOptions } from "./types.js";
 /**
  * Default configuration values for fetchy.
  * These values are used when corresponding options are not specified.
  */
-declare const DEFAULT: Options;
+declare const _DEFAULT: Options;
 /**
  * Valid input types for fetch requests.
  * @internal
@@ -16,15 +16,14 @@ type Input = string | URL | Request;
  */
 interface Options {
     timeout: number;
-    jitter: number;
+    delay: number;
     interval: number;
     maxInterval: number;
-    max: number;
-    byHeader: boolean;
-    onError?: boolean;
-    onErrorStatus: boolean;
-    abort?: AbortController;
-    userRedirect: "follow" | "error" | "manual";
+    maxAttempts: number;
+    retryAfter: boolean;
+    onNative?: boolean;
+    onStatus: boolean;
+    redirect: "follow" | "error" | "manual";
 }
 /**
  * Infer helper type for response type overload.
@@ -109,18 +108,18 @@ declare class RedirectError extends Error {
  * const bytes = await fetchyb("https://example.com/image.png", "bytes");
  * ```
  */
-declare function fetchyb(url: Input, type: "text", options?: undefined): Promise<string>;
-declare function fetchyb(url: Input, type: "text", options: FetchyOptions & ThrowError): Promise<string>;
-declare function fetchyb(url: Input, type: "text", options?: FetchyOptions): Promise<string | null>;
-declare function fetchyb<T>(url: Input, type: "json", options?: undefined): Promise<T>;
-declare function fetchyb<T>(url: Input, type: "json", options: FetchyOptions & ThrowError): Promise<T>;
-declare function fetchyb<T>(url: Input, type: "json", options?: FetchyOptions): Promise<T | null>;
-declare function fetchyb(url: Input, type: "bytes", options?: undefined): Promise<Uint8Array>;
-declare function fetchyb(url: Input, type: "bytes", options: FetchyOptions & ThrowError): Promise<Uint8Array>;
-declare function fetchyb(url: Input, type: "bytes", options?: FetchyOptions): Promise<Uint8Array | null>;
-declare function fetchyb<T>(url: Input, type?: "auto", options?: undefined): Promise<T | string | Uint8Array>;
-declare function fetchyb<T>(url: Input, type?: "auto", options?: FetchyOptions & ThrowError): Promise<T | string | Uint8Array>;
-declare function fetchyb<T>(url: Input, type?: "auto", options?: FetchyOptions): Promise<T | string | Uint8Array | null>;
+declare function fetchyb(url: Input | null, type: "text", options?: undefined): Promise<string>;
+declare function fetchyb(url: Input | null, type: "text", options: FetchyOptions & ThrowError): Promise<string>;
+declare function fetchyb(url: Input | null, type: "text", options?: FetchyOptions): Promise<string | null>;
+declare function fetchyb<T>(url: Input | null, type: "json", options?: undefined): Promise<T>;
+declare function fetchyb<T>(url: Input | null, type: "json", options: FetchyOptions & ThrowError): Promise<T>;
+declare function fetchyb<T>(url: Input | null, type: "json", options?: FetchyOptions): Promise<T | null>;
+declare function fetchyb(url: Input | null, type: "bytes", options?: undefined): Promise<Uint8Array>;
+declare function fetchyb(url: Input | null, type: "bytes", options: FetchyOptions & ThrowError): Promise<Uint8Array>;
+declare function fetchyb(url: Input | null, type: "bytes", options?: FetchyOptions): Promise<Uint8Array | null>;
+declare function fetchyb<T>(url: Input | null, type?: "auto", options?: undefined): Promise<T | string | Uint8Array>;
+declare function fetchyb<T>(url: Input | null, type?: "auto", options?: FetchyOptions & ThrowError): Promise<T | string | Uint8Array>;
+declare function fetchyb<T>(url: Input | null, type?: "auto", options?: FetchyOptions): Promise<T | string | Uint8Array | null>;
 /**
  * Performs an HTTP request with enhanced features like timeout, retry, and automatic header management.
  * Returns the raw Response object or null on failure, unless throwError is configured.
@@ -153,9 +152,9 @@ declare function fetchyb<T>(url: Input, type?: "auto", options?: FetchyOptions):
  * });
  * ```
  */
-declare function fetchy(url: Input, options?: undefined): Promise<Response>;
-declare function fetchy(url: Input, options: FetchyOptions & ThrowError): Promise<Response>;
-declare function fetchy(url: Input, options?: FetchyOptions): Promise<Response | null>;
+declare function fetchy(url: Input | null, options?: undefined): Promise<Response>;
+declare function fetchy(url: Input | null, options: FetchyOptions & ThrowError): Promise<Response>;
+declare function fetchy(url: Input | null, options?: FetchyOptions): Promise<Response | null>;
 /**
  * Checks if a value is a string.
  * @internal
@@ -221,11 +220,12 @@ declare function _getOptions(options?: FetchyOptions): Options;
 /**
  * Converts FetchyOptions to standard RequestInit format.
  * @internal
+ * @param url - Original request URL.
+ * @param opts - Internal options.
  * @param options - User-provided options.
- * @param optsAbort - AbortController for timeout handling.
  * @returns Standard RequestInit object.
  */
-declare function _getRequestInit(options?: FetchyOptions, optsAbort?: AbortController): RequestInit;
+declare function _getRequestInit(url: Input, opts: Options, options?: FetchyOptions): RequestInit;
 /**
  * Converts FetchyBody to standard BodyInit format.
  * @internal
@@ -254,6 +254,15 @@ declare function _getHeaders(options?: FetchyOptions): HeadersInit;
  * @returns Content-Type string or undefined.
  */
 declare function _getContentType(body?: FetchyBody): string | undefined;
+/**
+ * Combine abort signals.
+ * @internal
+ * @param url - Original request URL.
+ * @param timeout - Request timeout in seconds.
+ * @param signal - AbortSignal in User-provided options.
+ * @returns Combined AbortSignal or undefined.
+ */
+declare function _combineSignal(url: Input, timeout: number, signal?: AbortSignal | null): AbortSignal | undefined;
 /**
  * Waits for specified seconds with optional randomization.
  * @internal
@@ -272,11 +281,12 @@ declare function _shouldRedirect(resp: Response): boolean;
  * Determines if retry should stop based on conditions and waits if continuing.
  * @internal
  * @param count - Current retry attempt number.
+ * @param init - Request initialization object.
  * @param opts - Internal options.
  * @param resp - Response from previous attempt.
  * @returns True if retry should stop.
  */
-declare function _shouldNotRetry(count: number, opts: Options, resp?: Response): Promise<boolean>;
+declare function _shouldNotRetry(count: number, init: RequestInit, opts: Options, resp?: Response): Promise<boolean>;
 /**
  * Calculates next retry interval using exponential backoff or Retry-After header.
  * @internal
@@ -302,6 +312,14 @@ declare function _parseRetryAfter(value: string): number;
  * @returns Updated URL for next request.
  */
 declare function _handleRedirectResponse(url: Input, init: RequestInit, resp: Response): Input;
+/**
+ * Clone input if required.
+ * @internal
+ * @param url - Original request URL.
+ * @param required - Switch to clone or not.
+ * @returns Cloned input for fetch.
+ */
+declare function _cloneInput(url: Input, required: boolean): Input;
 /**
  * Executes fetch with retry logic and exponential backoff.
  * @internal
@@ -320,13 +338,4 @@ declare function _fetchWithRetry(url: Input, init: RequestInit, opts: Options):
  * @returns Response from request.
  */
 declare function _fetchWithJitter(url: Input, init: RequestInit, opts: Options): Promise<Response>;
-/**
- * Executes fetch with timeout handling.
- * @internal
- * @param url - Request URL.
- * @param init - Request initialization object.
- * @param opts - Internal options.
- * @returns Response from request.
- */
-declare function _fetchWithTimeout(url: Input, init: RequestInit, opts: Options): Promise<Response>;
 //# sourceMappingURL=main.d.ts.map

package/types/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}

package/types/types.d.ts

@@ -27,7 +27,9 @@ export type FetchyBody = JSONValue | Exclude<BodyInit, ReadableStream>;
  * });
  * ```
  */
-export interface FetchyOptions extends Omit<RequestInit, "body" | "signal"> {
+export interface FetchyOptions extends Omit<RequestInit, "body"> {
+    /** Request URL. Used if call fetchy with null. */
+    url?: string | URL;
     /** Request body content. Automatically serializes JSON objects. */
     body?: FetchyBody;
     /** Request timeout in seconds. Default is 15 seconds. */
@@ -35,13 +37,11 @@ export interface FetchyOptions extends Omit<RequestInit, "body" | "signal"> {
     /** Retry configuration. Set to false to disable retry functionality. */
     retry?: RetryOptions | false;
     /** Bearer token for Authorization header. Automatically adds "Bearer " prefix. */
-    bearerToken?: string;
+    bearer?: string;
     /** Error throwing behavior configuration. Set to true to throw all errors. */
-    throwError?: ErrorOptions | boolean;
+    onError?: ErrorOptions | boolean;
     /** Initial jitter delay in seconds before sending the request. Adds randomness to prevent thundering herd. */
-    jitter?: number;
-    /** AbortController for manual request cancellation. If not provided, an internal controller is created for timeout. */
-    abort?: AbortController;
+    delay?: number;
 }
 /**
  * Configuration options for retry behavior.
@@ -63,18 +63,18 @@ export interface RetryOptions {
     /** Maximum interval in seconds between retries. Caps the exponential backoff. Default is 30 seconds. */
     maxInterval?: number;
     /** Maximum number of retry attempts. Default is 3. */
-    max?: number;
+    maxAttempts?: number;
     /** Whether to respect Retry-After header from response. Default is true. */
-    byHeader?: boolean;
+    retryAfter?: boolean;
 }
 /**
  * Configuration options for error throwing behavior.
  * Allows fine-grained control over which errors should be thrown vs. returned as null.
  */
 export interface ErrorOptions {
-    /** Whether to throw errors during response parsing (e.g., JSON parsing errors). Default is true. */
-    onError?: boolean;
-    /** Whether to throw HTTPStatusError for non-OK status codes (4xx, 5xx). Default is false. */
-    onErrorStatus?: boolean;
+    /** Whether to throw native errors (network errors, parsing errors, etc.). If false, returns null instead. Default is true. */
+    onNative?: boolean;
+    /** Whether to throw HTTPStatusError for non-OK status codes (4xx, 5xx, ...). Default is false. */
+    onStatus?: boolean;
 }
 //# sourceMappingURL=types.d.ts.map

package/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAAE,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEtG;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;AAEvE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,QAAQ,CAAC;IACzE,mEAAmE;IACnE,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,yDAAyD;IACzD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,KAAK,CAAC,EAAE,YAAY,GAAG,KAAK,CAAC;IAC7B,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC;IACpC,8GAA8G;IAC9G,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uHAAuH;IACvH,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,YAAY;IAC3B,gHAAgH;IAChH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wGAAwG;IACxG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,oGAAoG;IACpG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,6FAA6F;IAC7F,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAAE,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEtG;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;AAEvE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC;IAC9D,kDAAkD;IAClD,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,mEAAmE;IACnE,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,yDAAyD;IACzD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,KAAK,CAAC,EAAE,YAAY,GAAG,KAAK,CAAC;IAC7B,kFAAkF;IAClF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC;IACjC,8GAA8G;IAC9G,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,YAAY;IAC3B,gHAAgH;IAChH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wGAAwG;IACxG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,8HAA8H;IAC9H,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,kGAAkG;IAClG,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}