scrapebadger 0.47.0 → 0.47.1

package/dist/index.js

@@ -9,7 +9,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var WebSocket__default = /*#__PURE__*/_interopDefault(WebSocket);
 
 // src/internal/version.ts
-var SDK_VERSION = "0.47.0";
+var SDK_VERSION = "0.47.1";
 
 // src/internal/exceptions.ts
 var ScrapeBadgerError = class _ScrapeBadgerError extends Error {
@@ -211,8 +211,27 @@ var BaseClient = class _BaseClient {
   async executeWithRetry(url, options) {
     let lastError;
     for (let attempt = 0; attempt <= this.config.maxRetries; attempt++) {
+      let retryAfterMs = 0;
       try {
         const httpResponse = await this.fetchWithTimeout(url, options);
+        const retryAfter = httpResponse.headers.get("Retry-After")?.trim();
+        if (retryAfter) {
+          let requestedDelay = 0;
+          if (/^\d+$/.test(retryAfter)) {
+            requestedDelay = Number(retryAfter) * 1e3;
+          } else if (/^(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun), \d{2} [A-Z][a-z]{2} \d{4}|(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), \d{2}-[A-Z][a-z]{2}-\d{2}) \d{2}:\d{2}:\d{2} GMT$/.test(
+            retryAfter
+          )) {
+            requestedDelay = Date.parse(retryAfter) - Date.now();
+          } else if (/^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) [A-Z][a-z]{2} [ \d]\d \d{2}:\d{2}:\d{2} \d{4}$/.test(
+            retryAfter
+          )) {
+            requestedDelay = Date.parse(`${retryAfter} GMT`) - Date.now();
+          }
+          if (requestedDelay > 0 && requestedDelay <= 2147483647) {
+            retryAfterMs = requestedDelay;
+          }
+        }
         const data = await this.handleResponse(httpResponse);
         const rateLimit = this.parseRateLimitHeaders(httpResponse.headers);
         return { data, rateLimit };
@@ -224,7 +243,7 @@ var BaseClient = class _BaseClient {
         if (attempt === this.config.maxRetries) {
           break;
         }
-        const delay = this.config.retryDelay * Math.pow(2, attempt);
+        const delay = Math.max(this.config.retryDelay * Math.pow(2, attempt), retryAfterMs);
         const delaySec = Math.round(delay / 1e3);
         const attemptNum = attempt + 1;
         const maxRetries = this.config.maxRetries;
@@ -235,7 +254,7 @@ var BaseClient = class _BaseClient {
           if (error.retryAfter) {
             const retryDelay = (error.retryAfter - Date.now() / 1e3) * 1e3;
             if (retryDelay > 0 && retryDelay < 6e4) {
-              await this.sleep(retryDelay);
+              await this.sleep(Math.max(retryDelay, retryAfterMs));
               continue;
             }
           }