@superutils/fetch 1.2.3 → 1.4.1

package/dist/index.js

@@ -1,21 +1,24 @@
 // src/createClient.ts
-import PromisE3 from "@superutils/promise";
+import { deferredCallback } from "@superutils/promise";
 
 // src/fetch.ts
 import {
   fallbackIfFails as fallbackIfFails3,
+  isError,
   isFn as isFn2,
-  isPositiveNumber,
   isPromise,
   isUrlValid
 } from "@superutils/core";
-import PromisE2 from "@superutils/promise";
+import {
+  timeout as PromisE_timeout
+} from "@superutils/promise";
 
 // src/executeInterceptors.ts
 import { fallbackIfFails, isFn } from "@superutils/core";
-var executeInterceptors = async (value, interceptors, ...args) => {
+var executeInterceptors = async (value, signal, interceptors, ...args) => {
   var _a;
   for (const interceptor of [...interceptors != null ? interceptors : []].filter(isFn)) {
+    if (signal == null ? void 0 : signal.aborted) return value;
     value = (_a = await fallbackIfFails(
       interceptor,
       [value, ...args],
@@ -26,33 +29,15 @@ var executeInterceptors = async (value, interceptors, ...args) => {
 };
 var executeInterceptors_default = executeInterceptors;
 
-// src/getAbortCtrl.ts
-var getAbortCtrl = (options) => {
-  options != null ? options : options = {};
-  if (!(options.abortCtrl instanceof AbortController))
-    options.abortCtrl = new AbortController();
-  const { abortCtrl, signal } = options;
-  if (signal instanceof AbortSignal && !signal.aborted) {
-    const handleAbort = () => abortCtrl.abort();
-    signal.addEventListener("abort", handleAbort, { once: true });
-    abortCtrl.signal.addEventListener(
-      "abort",
-      () => signal.removeEventListener("abort", handleAbort),
-      { once: true }
-    );
-  }
-  return abortCtrl;
-};
-
 // src/getResponse.ts
 import { fallbackIfFails as fallbackIfFails2, isPositiveInteger } from "@superutils/core";
-import PromisE from "@superutils/promise";
-var getResponse = async (url, options = {}) => {
-  const fetchFunc = globalThis.fetch;
-  if (!isPositiveInteger(options.retry))
-    return fetchFunc(url, options);
+import { retry } from "@superutils/promise";
+var getResponse = (url, options = {}) => {
+  var _a;
+  const fetchFunc = (_a = options.fetchFunc) != null ? _a : globalThis.fetch;
+  if (!isPositiveInteger(options.retry)) return fetchFunc(url, options);
   let attemptCount = 0;
-  const response = PromisE.retry(
+  const response = retry(
     () => {
       attemptCount++;
       return fetchFunc(url, options);
@@ -60,13 +45,14 @@ var getResponse = async (url, options = {}) => {
     {
       ...options,
       retryIf: async (res, count, error) => {
-        var _a, _b;
-        const failed = !!error || !(res == null ? void 0 : res.ok);
-        return !!((_b = await fallbackIfFails2(
-          (_a = options == null ? void 0 : options.retryIf) != null ? _a : failed,
+        var _a2;
+        const { abortCtrl, retryIf, signal } = options;
+        if ((abortCtrl == null ? void 0 : abortCtrl.signal.aborted) || (signal == null ? void 0 : signal.aborted)) return false;
+        return !!((_a2 = await fallbackIfFails2(
+          retryIf,
           [res, count, error],
-          failed
-        )) != null ? _b : failed);
+          void 0
+        )) != null ? _a2 : !!error || !(res == null ? void 0 : res.ok));
       }
     }
   ).catch(
@@ -84,7 +70,7 @@ var getResponse_default = getResponse;
 import { isEmpty, isObj, objKeys } from "@superutils/core";
 var mergeFetchOptions = (...allOptions) => allOptions.reduce(
   (merged, next) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     next = isObj(next) ? next : {};
     const { errMsgs = {}, headers, interceptors: ints1 = {} } = merged;
     const { errMsgs: msgs2 = {}, interceptors: ints2 = {} } = next;
@@ -114,7 +100,7 @@ var mergeFetchOptions = (...allOptions) => allOptions.reduce(
           ...(_h = ints2 == null ? void 0 : ints2.result) != null ? _h : []
         ]
       },
-      timeout: (_j = (_i = next.timeout) != null ? _i : merged.timeout) != null ? _j : 0
+      timeout: (_i = next.timeout) != null ? _i : merged.timeout
     };
   },
   { headers: new Headers() }
@@ -125,11 +111,7 @@ var mergePartialOptions = (...optionsAr) => {
   return optionsAr.length <= 1 ? optionsAr[0] : mergeFetchOptions(...optionsAr);
 };
 
-// src/types.ts
-import {
-  ResolveError,
-  ResolveIgnored
-} from "@superutils/promise";
+// src/types/constants.ts
 var ContentType = {
   APPLICATION_JAVASCRIPT: "application/javascript",
   APPLICATION_JSON: "application/json",
@@ -155,54 +137,97 @@ var FetchAs = /* @__PURE__ */ ((FetchAs2) => {
   FetchAs2["text"] = "text";
   return FetchAs2;
 })(FetchAs || {});
+
+// src/types/FetchError.ts
 var FetchError = class _FetchError extends Error {
   constructor(message, options) {
     super(message, { cause: options.cause });
-    this.clone = (newMessage) => new _FetchError(newMessage, {
-      cause: this.cause,
-      options: this.options,
-      response: this.response,
-      url: this.url
-    });
     this.name = "FetchError";
-    this.options = options.options;
-    this.response = options.response;
-    this.url = options.url;
+    Object.defineProperties(this, {
+      clone: {
+        get() {
+          return (newMessage) => new _FetchError(newMessage, {
+            cause: options.cause,
+            options: options.options,
+            response: options.response,
+            url: options.url
+          });
+        }
+      },
+      options: {
+        get() {
+          return options.options;
+        }
+      },
+      response: {
+        get() {
+          return options.response;
+        }
+      },
+      url: {
+        get() {
+          return options.url;
+        }
+      }
+    });
   }
 };
 
+// src/types/options.ts
+import {
+  ResolveError,
+  ResolveIgnored
+} from "@superutils/promise";
+
 // src/fetch.ts
+var MAX_TIMEOUT = 2147483647;
 var fetch = (url, options = {}) => {
-  let timeoutId;
-  const abortCtrl = getAbortCtrl(options);
-  const promise = new PromisE2(async (resolve, reject) => {
-    var _a, _b, _c;
-    let errResponse;
-    const _options = mergeFetchOptions_default(fetch.defaults, options);
-    (_a = _options.as) != null ? _a : _options.as = "json" /* json */;
-    (_b = _options.method) != null ? _b : _options.method = "get";
-    let contentType = _options.headers.get("content-type");
-    if (!contentType) {
-      _options.headers.set("content-type", ContentType.APPLICATION_JSON);
-      contentType = ContentType.APPLICATION_JSON;
+  var _a, _b, _c;
+  let response;
+  const opts = mergeFetchOptions_default(fetch.defaults, options);
+  opts.abortCtrl = opts.abortCtrl instanceof AbortController ? opts.abortCtrl : new AbortController();
+  (_a = opts.as) != null ? _a : opts.as = "json" /* json */;
+  (_b = opts.method) != null ? _b : opts.method = "get";
+  (_c = opts.signal) != null ? _c : opts.signal = opts.abortCtrl.signal;
+  const { abortCtrl, as: parseAs, headers, onAbort, onTimeout } = opts;
+  opts.onAbort = async () => {
+    var _a2, _b2, _c2, _d, _e, _f;
+    const err = (_f = (_e = (_c2 = await fallbackIfFails3(onAbort, [], void 0)) != null ? _c2 : (_b2 = (_a2 = opts.abortCtrl) == null ? void 0 : _a2.signal) == null ? void 0 : _b2.reason) != null ? _e : (_d = opts.signal) == null ? void 0 : _d.reason) != null ? _f : opts.errMsgs.aborted;
+    if (isError(err) && err.name === "AbortError") {
+      err.message = ["This operation was aborted"].includes(err.message) ? opts.errMsgs.aborted : err.message;
     }
-    url = await executeInterceptors_default(
+    return await interceptErr(
+      isError(err) ? err : new Error(err),
       url,
-      _options.interceptors.request,
-      _options
+      opts,
+      response
     );
-    const {
-      as: parseAs,
-      body,
-      errMsgs,
-      timeout,
-      validateUrl = true
-    } = _options;
-    if (isPositiveNumber(timeout)) {
-      timeoutId = setTimeout(() => abortCtrl.abort(), timeout);
-    }
-    if (_options.abortCtrl) _options.signal = _options.abortCtrl.signal;
+  };
+  opts.onTimeout = async () => {
+    const err = await fallbackIfFails3(onTimeout, [], void 0);
+    return await interceptErr(
+      err != null ? err : new Error(opts.errMsgs.timedout),
+      url,
+      opts,
+      response
+    );
+  };
+  return PromisE_timeout(opts, async () => {
+    var _a2, _b2, _c2, _d;
     try {
+      let contentType = headers.get("content-type");
+      if (!contentType) {
+        headers.set("content-type", ContentType.APPLICATION_JSON);
+        contentType = ContentType.APPLICATION_JSON;
+      }
+      url = await executeInterceptors_default(
+        url,
+        abortCtrl.signal,
+        (_a2 = opts.interceptors) == null ? void 0 : _a2.request,
+        opts
+      );
+      const { body, errMsgs, validateUrl = true } = opts;
+      (_b2 = opts.signal) != null ? _b2 : opts.signal = abortCtrl.signal;
       if (validateUrl && !isUrlValid(url, false))
         throw new Error(errMsgs.invalidUrl);
       const shouldStringifyBody = [
@@ -210,99 +235,94 @@ var fetch = (url, options = {}) => {
         ContentType.APPLICATION_X_WWW_FORM_URLENCODED
       ].find((x) => contentType.includes(x)) && !["undefined", "string"].includes(typeof body);
       if (shouldStringifyBody)
-        _options.body = JSON.stringify(
+        opts.body = JSON.stringify(
           isFn2(body) ? fallbackIfFails3(body, [], void 0) : body
         );
-      let response = await getResponse_default(url, _options);
+      response = await getResponse_default(url, opts);
       response = await executeInterceptors_default(
         response,
-        _options.interceptors.response,
+        abortCtrl.signal,
+        (_c2 = opts.interceptors) == null ? void 0 : _c2.response,
         url,
-        _options
+        opts
       );
-      errResponse = response;
       const { status = 0 } = response;
       const isSuccess = status >= 200 && status < 300;
       if (!isSuccess) {
-        const fallbackMsg = `${errMsgs.requestFailed} ${status}`;
         const jsonError = await fallbackIfFails3(
           // try to parse error response as json first
           () => response.json(),
           [],
           void 0
         );
-        const message = (jsonError == null ? void 0 : jsonError.message) || fallbackMsg;
-        throw new Error(`${message}`.replace("Error: ", ""), {
-          cause: jsonError
-        });
+        throw new Error(
+          (jsonError == null ? void 0 : jsonError.message) || `${errMsgs.requestFailed} ${status}`,
+          { cause: jsonError }
+        );
       }
-      let result = response;
       const parseFunc = response[parseAs];
-      if (isFn2(parseFunc)) {
-        const handleErr = (err) => {
-          err = new Error(
-            `${errMsgs.parseFailed} ${parseAs}. ${err == null ? void 0 : err.message}`,
-            { cause: err }
-          );
-          return Promise.reject(err);
-        };
-        result = parseFunc.bind(response)();
-        if (isPromise(result)) result = result.catch(handleErr);
-      }
+      let result = !isFn2(parseFunc) ? response : parseFunc.bind(response)();
+      if (isPromise(result))
+        result = await result.catch(
+          (err) => Promise.reject(
+            new Error(
+              `${errMsgs.parseFailed} ${parseAs}. ${err == null ? void 0 : err.message}`,
+              { cause: err }
+            )
+          )
+        );
       result = await executeInterceptors_default(
         result,
-        _options.interceptors.result,
+        abortCtrl.signal,
+        (_d = opts.interceptors) == null ? void 0 : _d.result,
         url,
-        _options
+        opts
       );
-      resolve(result);
-    } catch (err) {
-      const errX = err;
-      const msg = (errX == null ? void 0 : errX.name) === "AbortError" ? errMsgs.reqTimedout : err == null ? void 0 : err.message;
-      let error = new FetchError(msg, {
-        cause: (_c = errX == null ? void 0 : errX.cause) != null ? _c : err,
-        response: errResponse,
-        options: _options,
-        url
-      });
-      error = await executeInterceptors_default(
-        error,
-        _options.interceptors.error,
-        url,
-        _options
-      );
-      reject(error);
+      return result;
+    } catch (_err) {
+      let err = _err;
+      err = await interceptErr(_err, url, opts, response);
+      return Promise.reject(err);
     }
-    timeoutId && clearTimeout(timeoutId);
   });
-  promise.onEarlyFinalize.push(() => abortCtrl.abort());
-  return promise;
 };
 fetch.defaults = {
+  abortOnEarlyFinalize: true,
   errMsgs: {
+    aborted: "Request aborted",
     invalidUrl: "Invalid URL",
     parseFailed: "Failed to parse response as",
-    reqTimedout: "Request timed out",
+    timedout: "Request timed out",
     requestFailed: "Request failed with status code:"
   },
   // all error messages must be defined here
   headers: new Headers(),
-  /** Global interceptors for fetch requests */
   interceptors: {
-    /**
-     * Global error interceptors to be invoked whenever an exception occurs
-     * Returning an
-     */
     error: [],
-    /** Interceptors to be invoked before making fetch requests */
     request: [],
     response: [],
     result: []
   },
-  /** Request timeout duration in milliseconds. Default: `0` */
-  timeout: 0,
+  timeout: 3e4,
   validateUrl: true
 };
+var interceptErr = async (err, url, options, response) => {
+  var _a, _b, _c;
+  const fErr = await executeInterceptors_default(
+    new FetchError((_a = err == null ? void 0 : err.message) != null ? _a : err, {
+      cause: (_b = err == null ? void 0 : err.cause) != null ? _b : err,
+      response,
+      options,
+      url
+    }),
+    void 0,
+    // should execute regardless of abort status
+    (_c = options.interceptors) == null ? void 0 : _c.error,
+    url,
+    options
+  );
+  return fErr;
+};
 var fetch_default = fetch;
 
 // src/createClient.ts
@@ -320,23 +340,22 @@ var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
   func.deferred = (deferOptions = {}, defaultUrl, defaultOptions) => {
     let _abortCtrl;
     const fetchCb = (...args) => {
-      var _a, _b;
-      const options = mergePartialOptions(
+      var _a, _b, _c;
+      const options = (_a = mergePartialOptions(
         commonOptions,
         defaultOptions,
         defaultUrl === void 0 ? args[1] : args[0],
         fixedOptions
-      );
-      ((_a = _abortCtrl == null ? void 0 : _abortCtrl.signal) == null ? void 0 : _a.aborted) === false && ((_b = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _b.call(_abortCtrl));
-      _abortCtrl = getAbortCtrl(options);
+      )) != null ? _a : {};
+      ((_b = _abortCtrl == null ? void 0 : _abortCtrl.signal) == null ? void 0 : _b.aborted) === false && ((_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl));
+      _abortCtrl = new AbortController();
       const promise = fetch_default(
         defaultUrl != null ? defaultUrl : args[0],
         options
       );
-      promise.onEarlyFinalize.push(() => _abortCtrl == null ? void 0 : _abortCtrl.abort());
       return promise;
     };
-    return PromisE3.deferredCallback(fetchCb, {
+    return deferredCallback(fetchCb, {
       ...commonDeferOptions,
       ...deferOptions
     });
@@ -346,9 +365,9 @@ var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
 var createClient_default = createClient;
 
 // src/createPostClient.ts
-import PromisE4 from "@superutils/promise";
+import { deferredCallback as deferredCallback2 } from "@superutils/promise";
 var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
-  const client2 = (url, data, options) => {
+  const client = (url, data, options) => {
     var _a;
     const _options = mergePartialOptions(
       commonOptions,
@@ -359,36 +378,33 @@ var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
     (_a = _options.method) != null ? _a : _options.method = "post";
     return fetch_default(url, _options);
   };
-  client2.deferred = (deferOptions = {}, defaultUrl, defaultData, defaultOptions) => {
+  client.deferred = (deferOptions = {}, defaultUrl, defaultData, defaultOptions) => {
     let _abortCtrl;
     const postCb = (...args) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       if (defaultUrl !== void 0) args.splice(0, 0, defaultUrl);
       if (defaultData !== void 0) args.splice(1, 0, defaultData);
-      const options = mergePartialOptions(
+      const options = (_a = mergePartialOptions(
         commonOptions,
         defaultOptions,
         args[2],
         fixedOptions
-      );
-      ((_a = _abortCtrl == null ? void 0 : _abortCtrl.signal) == null ? void 0 : _a.aborted) === false && ((_b = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _b.call(_abortCtrl));
-      _abortCtrl = getAbortCtrl(options);
-      options.body = (_c = args[1]) != null ? _c : options.body;
-      (_d = options.method) != null ? _d : options.method = "post";
+      )) != null ? _a : {};
+      ((_b = _abortCtrl == null ? void 0 : _abortCtrl.signal) == null ? void 0 : _b.aborted) === false && ((_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl));
+      _abortCtrl = new AbortController();
+      options.body = (_d = args[1]) != null ? _d : options.body;
+      (_e = options.method) != null ? _e : options.method = "post";
       const promise = fetch_default(args[0], options);
-      promise.onEarlyFinalize.push(() => _abortCtrl == null ? void 0 : _abortCtrl.abort());
       return promise;
     };
-    return PromisE4.deferredCallback(postCb, {
+    return deferredCallback2(postCb, {
       ...commonDeferOptions,
       ...deferOptions
     });
   };
-  return client2;
+  return client;
 };
 var createPostClient_default = createPostClient;
-var client = createPostClient();
-client.deferred();
 
 // src/fetchResponse.ts
 var fetchResponse = (url, options) => {
@@ -397,9 +413,18 @@ var fetchResponse = (url, options) => {
   (_a = options.as) != null ? _a : options.as = "response" /* response */;
   return fetch_default(url, options);
 };
+fetchResponse.defaults = fetch_default.defaults;
+Object.defineProperty(fetchResponse, "defaults", {
+  get() {
+    return fetch_default.defaults;
+  },
+  set(newDefaults) {
+    fetch_default.defaults = newDefaults;
+  }
+});
 var fetchResponse_default = fetchResponse;
 
-// src/fetchDefault.ts
+// src/defaultFetch.ts
 var methods = {
   /** Make HTTP requests with method GET */
   get: createClient_default({ method: "get" }),
@@ -416,31 +441,23 @@ var methods = {
   /** Make HTTP requests with method PUT */
   put: createPostClient_default({ method: "put" })
 };
-var fetchDefault = fetchResponse_default;
-Object.defineProperty(fetchDefault, "defaults", {
-  get() {
-    return fetch_default.defaults;
-  },
-  set(newDefaults) {
-    fetch_default.defaults = newDefaults;
-  }
-});
-fetchDefault.delete = methods.delete;
-fetchDefault.get = methods.get;
-fetchDefault.head = methods.head;
-fetchDefault.options = methods.options;
-fetchDefault.patch = methods.patch;
-fetchDefault.post = methods.post;
-fetchDefault.put = methods.put;
-var fetchDefault_default = fetchDefault;
+var defaultFetch = fetchResponse_default;
+defaultFetch.delete = methods.delete;
+defaultFetch.get = methods.get;
+defaultFetch.head = methods.head;
+defaultFetch.options = methods.options;
+defaultFetch.patch = methods.patch;
+defaultFetch.post = methods.post;
+defaultFetch.put = methods.put;
+var defaultFetch_default = defaultFetch;
 
 // src/index.ts
-var index_default = fetchDefault_default;
-fetchDefault_default.get;
+var index_default = defaultFetch_default;
 export {
   ContentType,
   FetchAs,
   FetchError,
+  MAX_TIMEOUT,
   ResolveError,
   ResolveIgnored,
   createClient,
@@ -449,7 +466,6 @@ export {
   executeInterceptors,
   fetch,
   fetchResponse,
-  getAbortCtrl,
   getResponse,
   mergeFetchOptions,
   mergePartialOptions

package/package.json

@@ -5,8 +5,8 @@
 	},
 	"description": "A lightweight `fetch` wrapper for browsers and Node.js, designed to simplify data fetching and reduce boilerplate.",
 	"dependencies": {
-		"@superutils/core": "^1.1.6",
-		"@superutils/promise": "^1.1.6"
+		"@superutils/core": "^1.2.1",
+		"@superutils/promise": "^1.2.1"
 	},
 	"files": [
 		"dist",
@@ -24,8 +24,8 @@
 	"main": "dist/index.js",
 	"name": "@superutils/fetch",
 	"peerDependencies": {
-		"@superutils/core": "^1.1.6",
-		"@superutils/promise": "^1.1.6"
+		"@superutils/core": "^1.2.0",
+		"@superutils/promise": "^1.2.0"
 	},
 	"publishConfig": {
 		"access": "public"
@@ -45,5 +45,6 @@
 	"sideEffects": false,
 	"type": "module",
 	"types": "dist/index.d.ts",
-	"version": "1.2.3"
+	"version": "1.4.1",
+	"gitHead": "a26f4b1bb701d99d4cb71443e18680ee3ea52974"
 }