Merge pull request #187 from atomic-state/features/attempts-fn

Features/attempts fn
atomic-state · Jun 29, 2024 · 9073a5e · 9073a5e
2 parents a63c74b + 73d95fd
commit 9073a5e
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "http-react",
-  "version": "3.5.4",
+  "version": "3.5.6",
   "description": "React hooks for data fetching",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/hooks/use-fetch.ts b/src/hooks/use-fetch.ts
@@ -8,6 +8,7 @@ import {
   fetcherDefaults,
   hasErrors,
   isPending,
+  gettingAttempts,
   lastResponses,
   previousConfig,
   previousProps,
@@ -126,7 +127,7 @@ export function useFetch<FetchDataType = any, BodyType = any>(
     onSubmit,
     onAbort,
     refresh = isDefined(ctx.refresh) ? ctx.refresh : 0,
-    attempts = ctx.attempts,
+    attempts: $attempts = ctx.attempts,
     attemptInterval = ctx.attemptInterval,
     revalidateOnFocus = ctx.revalidateOnFocus,
     suspense: $suspense,
@@ -205,6 +206,10 @@ export function useFetch<FetchDataType = any, BodyType = any>(
 
   const resolvedKey = serialize({ idString })
 
+  if (!statusCodes.has(resolvedKey)) {
+    statusCodes.set(resolvedKey, null)
+  }
+
   const resolvedDataKey = serialize({ idString, reqQuery, reqParams })
 
   const ageKey = ['max-age', resolvedDataKey].join('-')
@@ -645,6 +650,8 @@ export function useFetch<FetchDataType = any, BodyType = any>(
               : incoming
 
             if (code >= 200 && code < 400) {
+              gettingAttempts.set(resolvedKey, true)
+
               hasData.set(resolvedDataKey, true)
               hasData.set(resolvedKey, true)
 
@@ -859,6 +866,9 @@ export function useFetch<FetchDataType = any, BodyType = any>(
               }
             }
           } finally {
+            if (rpc.error) {
+              gettingAttempts.set(resolvedKey, false)
+            }
             temporaryFormData.delete(resolvedKey)
             runningRequests.set(resolvedKey, false)
             suspenseInitialized.set(resolvedKey, true)
@@ -1156,11 +1166,33 @@ export function useFetch<FetchDataType = any, BodyType = any>(
     }
   }, [requestCallId, resolvedKey, revalidateOnMount, suspense])
 
+  if (!gettingAttempts.has(resolvedKey)) {
+    gettingAttempts.set(resolvedKey, false)
+  }
+
   useEffect(() => {
     // Attempts will be made after a request fails
-    if ((attempts as number) > 0) {
-      const tm = setTimeout(() => {
-        if (error) {
+
+    // if ((attempts as number) > 0) {
+    const tm = setTimeout(() => {
+      if (!gettingAttempts.get(resolvedKey)) {
+        gettingAttempts.set(resolvedKey, true)
+        const attempts =
+          typeof $attempts === 'function'
+            ? $attempts({
+                status:
+                  statusCodes.get(resolvedKey) ||
+                  statusCodes.get(resolvedDataKey),
+                res: lastResponses.get(resolvedKey),
+                error:
+                  hasErrors.get(resolvedKey) ||
+                  hasErrors.get(resolvedDataKey) ||
+                  (error as any),
+                completedAttempts
+              })
+            : $attempts
+
+        if ((attempts as number) > 0) {
           if (completedAttempts < (attempts as number)) {
             reValidate()
             setCompletedAttempts((previousAttempts: number) => {
@@ -1182,14 +1214,23 @@ export function useFetch<FetchDataType = any, BodyType = any>(
             if (inDeps('online')) setOnline(false)
           }
         }
-      }, getMiliseconds(attemptInterval as TimeSpan))
-
-      return () => {
-        clearTimeout(tm)
       }
+    }, getMiliseconds(attemptInterval as TimeSpan))
+    // }
+    return () => {
+      clearTimeout(tm)
     }
-    return () => {}
-  }, [error, attempts, rawJSON, attemptInterval, completedAttempts])
+  }, [
+    error,
+    $attempts,
+    reValidate,
+    // loading,
+    // rawJSON,
+    fetchState,
+    attemptInterval,
+    resolvedKey,
+    completedAttempts
+  ])
 
   useEffect(() => {
     const refreshAmount = getMiliseconds(refresh as TimeSpan)

diff --git a/src/internal/index.ts b/src/internal/index.ts
@@ -94,6 +94,11 @@ export const maxPaginationAges = new Map()
  */
 export const hasErrors = new Map()
 
+/**
+ * Keep track of initialized attempts
+ */
+export const gettingAttempts = new Map()
+
 /**
  * Suspense calls that resolved
  */

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -256,7 +256,14 @@ export type FetchConfigType<FetchDataType = any, BodyType = any> = Omit<
    * The ammount of attempts if request fails
    * @default 1
    */
-  attempts?: number
+  attempts?:
+    | number
+    | ((q: {
+        status: number
+        res: Response
+        error: Error
+        completedAttempts: number
+      }) => number | undefined | void)
   /**
    * The interval at which to run attempts on request fail
    * @default 0