updated the delay logic

Author: naman-contentstack

lib/core/concurrency-queue.js

@@ -14,7 +14,8 @@ const defaultConfig = {
   retryOnHttpServerError: true,
   maxNetworkRetries: 3,
   networkRetryDelay: 100, // Base delay for network retries (ms)
-  networkBackoffStrategy: 'exponential' // 'exponential' or 'fixed'
+  networkBackoffStrategy: 'exponential', // 'exponential' or 'fixed'
+  delayMs: null // Delay in milliseconds before making each request
 }
 
 export function ConcurrencyQueue ({ axios, config }) {
@@ -175,16 +176,22 @@ export function ConcurrencyQueue ({ axios, config }) {
 
   // Initial shift will check running request,
   // and adds request to running queue if max requests are not running
-  this.initialShift = () => {
+  this.initialShift = async () => {
     if (this.running.length < this.config.maxRequests && !this.paused) {
-      shift()
+      await shift()
     }
   }
 
   // INTERNAL: Shift the queued item to running queue
-  const shift = () => {
+  const shift = async () => {
     if (this.queue.length && !this.paused) {
       const queueItem = this.queue.shift()
+      
+      // Add configurable delay before making the request if specified
+      if (this.config.delayMs && this.config.delayMs > 0) {
+        await new Promise(resolve => setTimeout(resolve, this.config.delayMs))
+      }
+      
       queueItem.resolve(queueItem.request)
       this.running.push(queueItem)
     }
@@ -197,7 +204,7 @@ export function ConcurrencyQueue ({ axios, config }) {
 
   this.push = requestPromise => {
     this.queue.push(requestPromise)
-    this.initialShift()
+    this.initialShift().catch(console.error)
   }
 
   this.clear = () => {
@@ -312,7 +319,7 @@ export function ConcurrencyQueue ({ axios, config }) {
           return refreshToken()
         } else {
           for (let i = 0; i < this.config.maxRequests; i++) {
-            this.initialShift()
+            this.initialShift().catch(console.error)
           }
         }
       }, time))
@@ -360,7 +367,7 @@ export function ConcurrencyQueue ({ axios, config }) {
         }
       })
       for (let i = 0; i < this.config.maxRequests; i++) {
-        this.initialShift()
+        this.initialShift().catch(console.error)
       }
     })
   }

lib/core/contentstackHTTPClient.js

@@ -109,12 +109,7 @@ export default function contentstackHttpClient (options) {
   const instance = axios.create(axiosOptions)
   instance.httpClientParams = options
   instance.concurrencyQueue = new ConcurrencyQueue({ axios: instance, config })
-  instance.interceptors.request.use(async (request) => {
-    // Add configurable delay before making the request if specified
-    if (config?.delayMs > 0) {
-      await new Promise(resolve => setTimeout(resolve, config.delayMs))
-    }
-
+  instance.interceptors.request.use((request) => {
     if (request.versioningStrategy && request.versioningStrategy === 'path') {
       request.baseURL = request.baseURL.replace('{api-version}', version)
     } else {