Retry algorithm tweaks

Author: bcomnes

src/open-api/index.js

@@ -119,27 +119,26 @@ exports.generateMethod = method => {
       // Adapted from:
       // https://github.com/netlify/open-api/blob/master/go/porcelain/http/http.go
 
-      const MAX_RETRY = 5
+      const MAX_RETRY = 10
       const DEFAULT_RETRY_DELAY = 5000 //ms
 
       for (let index = 0; index <= MAX_RETRY; index++) {
+        debug('Rate limit attempt ' + index + ' for ' + path)
         const response = await makeRequest()
-        if (http.STATUS_CODES[response.status] !== 'Too Many Requests' || index === MAX_RETRY) {
+        if (index === MAX_RETRY) throw new Error('Rate limit retry exhausted, aborting ')
+        if (http.STATUS_CODES[response.status] !== 'Too Many Requests') {
           return response
         } else {
           debug(`Rate limited, retrying`)
           try {
             const rateLimitReset = response.headers.get('X-RateLimit-Reset')
-            debug('rateLimitReset: %O', rateLimitReset)
             const resetTime = Number.parseInt(rateLimitReset)
             if (!existy(resetTime)) {
               debug('Issue getting resetTime: %O', resetTime)
               throw new Error('Header missing reset time')
             }
-            debug(`resetTime: ${resetTime}`)
             const now = unixNow()
-            debug(`unixNow(): ${now}`)
-            const sleepTime = (resetTime - now < 0 ? 0 : resetTime - now) * 1000
+            const sleepTime = ((resetTime - now < 0 ? 0 : resetTime - now) + 1) * 1000 // minimum 1 second
             debug(`sleeping for ${sleepTime}ms`)
             await sleep(sleepTime)
           } catch (e) {