async-fetch 0.2.4 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "async-fetch",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Use fetch asynchronously for requests within React components.",
   "main": "useAsyncFetch.js",
   "type": "module",

package/useAsyncFetch.js

@@ -11,9 +11,9 @@ function useAsyncFetch(url, props = {}) {
     ignoreCleanup,
     ignoreRequest,
     timeout = 30000,
+    data: data2,
     query,
     params,
-    data: data2,
     parser = "json",
     onStart,
     onSuccess,
@@ -24,6 +24,8 @@ function useAsyncFetch(url, props = {}) {
 
   const [pending, setPending] = useState(initialPending);
 
+  const [pending2, setPending2] = useState();
+
   const [data, setData] = useState(initialData);
 
   const [error, setError] = useState(initialError);
@@ -44,7 +46,7 @@ function useAsyncFetch(url, props = {}) {
     sendRequest();
   }, poll);
 
-  function cancelRequest(SOURCE) {
+  function cancelRequest() {
     if (cancelSource?.abort) cancelSource.abort();
   }
 
@@ -60,16 +62,16 @@ function useAsyncFetch(url, props = {}) {
 
     if (typeof url !== "string") throw new Error("URL must be of type string.");
 
-    const controller = new AbortController();
+    if (ignoreRequest !== true) {
+      const controller = new AbortController();
 
-    fetchProps.signal = controller.signal;
+      fetchProps.signal = controller.signal;
 
-    const requestTimeout = setTimeout(() => {
-      controller.abort();
-    }, timeout);
+      const requestTimeout = setTimeout(() => {
+        controller.abort();
+      }, timeout);
 
-    try {
-      if (ignoreRequest !== true) {
+      try {
         const contentType =
           fetchProps.headers?.["Content-Type"] ||
           fetchProps.headers?.["content-type"];
@@ -86,8 +88,10 @@ function useAsyncFetch(url, props = {}) {
 
         if (!unmounted) {
           if (onStart) onStart();
-          if (setPending) setPending(true);
-          if (setError) setError();
+          if (pending) {
+            setPending2(true);
+          } else setPending(true);
+          setError();
           cancelRequest();
           setCancelSource(controller);
         }
@@ -106,31 +110,40 @@ function useAsyncFetch(url, props = {}) {
         const parsedResponse = await response[parser]();
 
         if (!unmounted) {
-          setCancelSource();
-          setData(parsedResponse);
           if (onSuccess) onSuccess(parsedResponse);
+          setData(parsedResponse);
+        }
+      } catch (e) {
+        if (!unmounted && e.name !== "AbortError") {
+          let error;
+          try {
+            error = e.toString().replace("Error:", "");
+            error = JSON.parse(error.trim());
+          } catch {
+            error = { response: e.toString(), text: e.toString() };
+          }
+          if (onFail) onFail(error);
+          setError(error);
+        }
+      } finally {
+        clearTimeout(requestTimeout);
+        if (!unmounted) {
+          if (onFinish) onFinish();
+          if (pending) {
+            setPending2();
+          } else setPending();
         }
-      }
-    } catch (error) {
-      if (!unmounted && error.name !== "AbortError") {
-        let errorJson;
-        try {
-          errorJson = error.toString().replace("Error:", "");
-          errorJson = JSON.parse(errorJson.trim());
-        } catch {}
-        setError(errorJson || error);
-        if (onFail) onFail(errorJson || error);
-      }
-    } finally {
-      clearTimeout(requestTimeout);
-      if (!unmounted) {
-        if (setPending) setPending();
-        if (onFinish) onFinish();
       }
     }
   }
 
-  return { pending, data, error, sendRequest, cancelRequest };
+  return {
+    pending: pending || pending2,
+    data,
+    error,
+    sendRequest,
+    cancelRequest,
+  };
 }
 
 export default useAsyncFetch;