feat: refactor retryable and refresh token retries

supabase · Aug 30, 2023 · 5aff2ed · 5aff2ed
1 parent 22923e7
commit 5aff2ed
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/GoTrueClient.ts b/src/GoTrueClient.ts
@@ -1530,12 +1530,20 @@ export default class GoTrueClient {
             xform: _sessionResponse,
           })
         },
-        (attempt, _, result) =>
-          result &&
-          result.error &&
-          isAuthRetryableFetchError(result.error) &&
-          // retryable only if the request can be sent before the backoff overflows the tick duration
-          Date.now() + (attempt + 1) * 200 - startedAt < AUTO_REFRESH_TICK_DURATION
+        (attempt, error, result) => {
+          if (error && !isAuthRetryableFetchError(error)) {
+            // not retryable
+            return false
+          }
+
+          return (
+            result &&
+            result.error &&
+            isAuthRetryableFetchError(result.error) &&
+            // retryable only if the request can be sent before the backoff overflows the tick duration
+            Date.now() + (attempt + 1) * 200 - startedAt < AUTO_REFRESH_TICK_DURATION
+          )
+        }
       )
     } catch (error) {
       this._debug(debugName, 'error', error)

diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
@@ -240,8 +240,17 @@ export function retryable<T>(
             return
           }
         } catch (e: any) {
-          if (!isRetryable(attempt, e)) {
-            reject(e)
+          let shouldRetry = false
+
+          try {
+            shouldRetry = isRetryable(attempt, e)
+          } catch (innerError: any) {
+            reject(innerError)
+            return
+          }
+
+          if (!shouldRetry) {
+            reject(error)
             return
           }
         }