Retry async calls if they fail

package.json

@@ -68,7 +68,7 @@
         "madge": "^5.0.2",
         "material-ui-popup-state": "^5.0.9",
         "monaco-editor": "^0.34.1",
-        "notistack": "^2.0.8",
+        "notistack": "^3.0.1",
         "p-limit": "^4.0.0",
         "path-list-to-tree": "^1.1.1",
         "pretty-bytes": "^6.1.0",
@@ -89,6 +89,7 @@
         "react-virtualized-auto-sizer": "^1.0.20",
         "react-window": "^1.8.9",
         "readable-numbers": "^1.0.7",
+        "retry": "^0.13.1",
         "safe-stable-stringify": "^2.4.3",
         "serve": "^14.2.0",
         "stripe": "^12.1.1",
@@ -111,6 +112,7 @@
         "@types/react-gtm-module": "^2.0.1",
         "@types/react-lazylog": "^4.5.1",
         "@types/react-window": "^1.8.5",
+        "@types/retry": "^0.12.5",
         "compress-create-react-app": "^1.4.1",
         "eslint-config-kentcdodds": "^20.3.1",
         "eslint-plugin-jest-dom": "^4.0.3",

src/api/combinedGrantsExt.ts

@@ -1,8 +1,10 @@
+import { PostgrestResponse } from '@supabase/postgrest-js';
 import {
     defaultTableFilter,
     RPCS,
     SortingProps,
     supabaseClient,
+    supabaseRetry,
     TABLES,
 } from 'services/supabase';
 import { AuthRoles } from 'types';
@@ -76,11 +78,13 @@ const getGrants_Users = (
 };
 
 export const getAuthRoles = async (capability: string) => {
-    return supabaseClient
-        .rpc<AuthRoles>(RPCS.AUTH_ROLES, {
-            min_capability: capability,
-        })
-        .throwOnError();
+    return supabaseRetry<PostgrestResponse<AuthRoles>>(
+        () =>
+            supabaseClient.rpc<AuthRoles>(RPCS.AUTH_ROLES, {
+                min_capability: capability,
+            }),
+        'getAuthRoles'
+    );
 };
 
 export { getGrants, getGrants_Users };

src/api/connectors.ts

@@ -9,6 +9,7 @@ import {
     handleSuccess,
     SortingProps,
     supabaseClient,
+    supabaseRetry,
     TABLES,
 } from 'services/supabase';
 
@@ -59,12 +60,15 @@ const DETAILS_FORM_QUERY = `
 `;
 
 const getConnectors_detailsForm = async (connectorId: string) => {
-    const data = await supabaseClient
-        .from(TABLES.CONNECTORS)
-        .select(DETAILS_FORM_QUERY)
-        .eq('id', connectorId)
-        .eq('connector_tags.connector_id', connectorId)
-        .then(handleSuccess<ConnectorsQuery_DetailsForm[]>, handleFailure);
+    const data = await supabaseRetry(
+        () =>
+            supabaseClient
+                .from(TABLES.CONNECTORS)
+                .select(DETAILS_FORM_QUERY)
+                .eq('id', connectorId)
+                .eq('connector_tags.connector_id', connectorId),
+        'getConnectors_detailsForm'
+    ).then(handleSuccess<ConnectorsQuery_DetailsForm[]>, handleFailure);
 
     return data;
 };

src/api/directives.ts

@@ -1,3 +1,4 @@
+import { PostgrestSingleResponse } from '@supabase/postgrest-js';
 import { DIRECTIVES } from 'directives/shared';
 import { UserClaims } from 'directives/types';
 import {
@@ -9,6 +10,7 @@ import {
     RPCS,
     SortingProps,
     supabaseClient,
+    supabaseRetry,
     TABLES,
     updateSupabase,
 } from 'services/supabase';
@@ -56,12 +58,15 @@ const callUpdate = (
 };
 
 const exchangeBearerToken = async (token: string) => {
-    return supabaseClient
-        .rpc<ExchangeResponse>(RPCS.EXCHANGE_DIRECTIVES, {
-            bearer_token: token,
-        })
-        .throwOnError()
-        .single();
+    return supabaseRetry<PostgrestSingleResponse<ExchangeResponse>>(
+        () =>
+            supabaseClient
+                .rpc(RPCS.EXCHANGE_DIRECTIVES, {
+                    bearer_token: token,
+                })
+                .single(),
+        'exchangeBearerToken'
+    );
 };
 
 const submitDirective = async (
@@ -146,18 +151,22 @@ const generateGrantDirective = (
 };
 
 const getDirectiveByToken = async (token: string) => {
-    const data = await supabaseClient
-        .from(TABLES.DIRECTIVES)
-        .select(`spec,token`)
-        .eq('token', token)
-        .then(
-            handleSuccess<Pick<GrantDirective, 'spec' | 'token'>[]>,
-            handleFailure
-        );
+    const data = await supabaseRetry(
+        () =>
+            supabaseClient
+                .from(TABLES.DIRECTIVES)
+                .select(`spec,token`)
+                .eq('token', token),
+        'getDirectiveByToken'
+    ).then(
+        handleSuccess<Pick<GrantDirective, 'spec' | 'token'>[]>,
+        handleFailure
+    );
 
     return data;
 };
 
+// Used in table hydrator which handles the retrying
 const getDirectivesByType = (
     directiveType: keyof typeof DIRECTIVES,
     pagination: any,