Add retry logic to querier (#678)

Author: nkshah2

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [14.1.4] - 2023-08-28
+
+-   Adds logic to retry network calls if the core returns status 429
+
 ## [14.1.3] - 2023-07-03
 
 ### Changes

lib/build/constants.d.ts

@@ -15,3 +15,4 @@
 
 export const HEADER_RID = "rid";
 export const HEADER_FDI = "fdi-version";
+export const RATE_LIMIT_STATUS_CODE = 429;

lib/build/constants.js

@@ -19,6 +19,7 @@ import { cdiSupported } from "./version";
 import NormalisedURLDomain from "./normalisedURLDomain";
 import NormalisedURLPath from "./normalisedURLPath";
 import { PROCESS_STATE, ProcessState } from "./processState";
+import { RATE_LIMIT_STATUS_CODE } from "./constants";
 
 export class Querier {
     private static initCalled = false;
@@ -263,7 +264,8 @@ export class Querier {
         path: NormalisedURLPath,
         method: string,
         requestFunc: (url: string) => Promise<Response>,
-        numberOfTries: number
+        numberOfTries: number,
+        retryInfoMap?: Record<string, number>
     ): Promise<any> => {
         if (this.__hosts === undefined) {
             throw Error(
@@ -276,6 +278,17 @@ export class Querier {
         let currentDomain: string = this.__hosts[Querier.lastTriedIndex].domain.getAsStringDangerous();
         let currentBasePath: string = this.__hosts[Querier.lastTriedIndex].basePath.getAsStringDangerous();
         const url = currentDomain + currentBasePath + path.getAsStringDangerous();
+
+        const maxRetries = 5;
+
+        if (retryInfoMap === undefined) {
+            retryInfoMap = {};
+        }
+
+        if (retryInfoMap[url] === undefined) {
+            retryInfoMap[url] = maxRetries;
+        }
+
         Querier.lastTriedIndex++;
         Querier.lastTriedIndex = Querier.lastTriedIndex % this.__hosts.length;
         try {
@@ -296,9 +309,24 @@ export class Querier {
                 err.message !== undefined &&
                 (err.message.includes("Failed to fetch") || err.message.includes("ECONNREFUSED"))
             ) {
-                return await this.sendRequestHelper(path, method, requestFunc, numberOfTries - 1);
+                return await this.sendRequestHelper(path, method, requestFunc, numberOfTries - 1, retryInfoMap);
             }
             if (err instanceof Response) {
+                if (err.status === RATE_LIMIT_STATUS_CODE) {
+                    const retriesLeft = retryInfoMap[url];
+
+                    if (retriesLeft > 0) {
+                        retryInfoMap[url] = retriesLeft - 1;
+
+                        const attemptsMade = maxRetries - retriesLeft;
+                        const delay = 10 + 250 * attemptsMade;
+
+                        await new Promise((resolve) => setTimeout(resolve, delay));
+
+                        return await this.sendRequestHelper(path, method, requestFunc, numberOfTries, retryInfoMap);
+                    }
+                }
+
                 throw new Error(
                     "SuperTokens core threw an error for a " +
                         method +
@@ -309,9 +337,9 @@ export class Querier {
                         " and message: " +
                         (await err.text())
                 );
-            } else {
-                throw err;
             }
+
+            throw err;
         }
     };
 }

lib/build/querier.js

@@ -12,7 +12,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-export const version = "14.1.3";
+export const version = "14.1.4";
 
 export const cdiSupported = ["2.21"];