Merge pull request #17 from contentstack/bug/timeout-retry

fix: 🐛 Request time out retry bug resolved

Author: uttamukkoji

.talismanrc

@@ -0,0 +1,13 @@
+fileignoreconfig:
+- filename: jsdocs/stack_environment_index.js.html
+  checksum: e70125d5038c16be4c974b75780b252d2ba680f63a791dc788941996d6e2b2bc
+- filename: .talisman
+  checksum: ef29fbb058801114e565011d7b292a00e86dd385ff2e77a06ddf62b253339d99
+- filename: dist/node/contentstack-management.js
+  checksum: d0a2881a9f533cb24cd909792548617f70aea637d6f7ca0ff932ede72e5e57ee
+- filename: dist/react-native/contentstack-management.js
+  checksum: 3f611ee5cc82bf3cf4135de830208ce448184c99364538435f35c6c67aaf2d9e
+- filename: dist/web/contentstack-management.js
+  checksum: 8bf55c1cf4b9f59d2c47ae16e7b6b6476eab8b7aefb817a560a41f9c3c76b337
+- filename: dist/nativescript/contentstack-management.js
+  checksum: b514e4144664db6b107c412655a36028e102e25b901ede0ee782be03e2380d14

lib/core/concurrency-queue.js

@@ -69,7 +69,7 @@ export function ConcurrencyQueue ({ axios, config }) {
     }
   }
 
-  // Request interseptor to queue the request
+  // Request interceptor to queue the request
   const requestHandler = request => {
     request.retryCount = request.retryCount || 0
     if (request.headers.authorization && request.headers.authorization !== undefined) {
@@ -130,15 +130,16 @@ export function ConcurrencyQueue ({ axios, config }) {
     }
 
     // Error handling
-    let wait = this.config.retryDelay
-    const response = error.response
+    const wait = this.config.retryDelay
+    var response = error.response
     if (!response) {
       if (error.code === 'ECONNABORTED') {
         error.response = {
           ...error.response,
           status: 408,
           statusText: `timeout of ${this.config.timeout}ms exceeded`
         }
+        response = error.response
       } else {
         return Promise.reject(responseHandler(error))
       }
@@ -150,38 +151,43 @@ export function ConcurrencyQueue ({ axios, config }) {
         return Promise.reject(responseHandler(error))
       }
       this.running.shift()
-      wait = 1000
-      // Cooldown the running requests
+      // Cool down the running requests
       delay(wait)
       error.config.retryCount = networkError
 
       return axios(updateRequestConfig(error, retryErrorType, wait))
-    } else if (this.config.retryCondition && this.config.retryCondition(error)) {
-      retryErrorType = `Error with status: ${response.status}`
+    }
+    if (this.config.retryCondition && this.config.retryCondition(error)) {
+      retryErrorType = error.response ? `Error with status: ${response.status}` : `Error Code:${error.code}`
       networkError++
-      if (networkError > this.config.retryLimit) {
-        return Promise.reject(responseHandler(error))
-      }
-      if (this.config.retryDelayOptions) {
-        if (this.config.retryDelayOptions.customBackoff) {
-          wait = this.config.retryDelayOptions.customBackoff(networkError, error)
-          if (wait && wait <= 0) {
-            return Promise.reject(responseHandler(error))
-          }
-        } else if (this.config.retryDelayOptions.base) {
-          wait = this.config.retryDelayOptions.base * networkError
+      return this.retry(error, retryErrorType, networkError, wait)
+    }
+    return Promise.reject(responseHandler(error))
+  }
+
+  this.retry = (error, retryErrorType, retryCount, waittime) => {
+    let delaytime = waittime
+    if (retryCount > this.config.retryLimit) {
+      return Promise.reject(responseHandler(error))
+    }
+    if (this.config.retryDelayOptions) {
+      if (this.config.retryDelayOptions.customBackoff) {
+        delaytime = this.config.retryDelayOptions.customBackoff(retryCount, error)
+        if (delaytime && delaytime <= 0) {
+          return Promise.reject(responseHandler(error))
         }
-      } else {
-        wait = this.config.retryDelay
+      } else if (this.config.retryDelayOptions.base) {
+        delaytime = this.config.retryDelayOptions.base * retryCount
       }
-      error.config.retryCount = networkError
-      return new Promise(function (resolve) {
-        return setTimeout(function () {
-          return resolve(axios(updateRequestConfig(error, retryErrorType, wait)))
-        }, wait)
-      })
+    } else {
+      delaytime = this.config.retryDelay
     }
-    return Promise.reject(responseHandler(error))
+    error.config.retryCount = retryCount
+    return new Promise(function (resolve) {
+      return setTimeout(function () {
+        return resolve(axios(updateRequestConfig(error, retryErrorType, delaytime)))
+      }, delaytime)
+    })
   }
 
   this.interceptors = {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/management",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The Content Management API is used to manage the content of your Contentstack account",
   "main": "dist/node/contentstack-management.js",
   "browser": "dist/web/contentstack-management.js",