graceful-playwright 1.3.0 → 1.4.0

package/core.d.ts

@@ -55,3 +55,4 @@ export declare class GracefulPage {
     /** @description proxy method to (await this.getPage()).innerText */
     innerText: Page['innerText'];
 }
+export declare function parseRetryAfter(headerValue: string | null): number | null;

package/core.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GracefulPage = void 0;
+exports.parseRetryAfter = parseRetryAfter;
 class GracefulPage {
     options;
     constructor(options) {
@@ -50,24 +51,14 @@ class GracefulPage {
                     ...options,
                 });
                 if (response && response.status() === 429) {
-                    let retryAfter = await response.headerValue('Retry-After');
-                    if (retryAfter && +retryAfter) {
-                        // e.g. 120 (seconds)
-                        await sleep(+retryAfter * 1000);
+                    let headerValue = await response.headerValue('Retry-After');
+                    let interval = parseRetryAfter(headerValue);
+                    if (interval) {
+                        await sleep(interval);
                         continue;
                     }
-                    else if (retryAfter && new Date(retryAfter).getTime()) {
-                        // e.g. "Wed, 21 Oct 2015 07:28:00 GMT"
-                        let target = new Date(retryAfter).getTime();
-                        let now = Date.now();
-                        let diff = target - now;
-                        await sleep(diff);
-                        continue;
-                    }
-                    else {
-                        let statusText = response.statusText() || 'Too Many Requests';
-                        throw new Error(statusText);
-                    }
+                    let statusText = response.statusText() || 'Too Many Requests';
+                    throw new Error(statusText);
                 }
                 return response;
             }
@@ -159,3 +150,19 @@ exports.GracefulPage = GracefulPage;
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
+function parseRetryAfter(headerValue) {
+    if (!headerValue)
+        return null;
+    // e.g. 120 (seconds)
+    let seconds = +headerValue;
+    if (seconds) {
+        return seconds * 1000;
+    }
+    // e.g. "Wed, 21 Oct 2015 07:28:00 GMT"
+    let target = new Date(headerValue).getTime();
+    if (target) {
+        let diff = target - Date.now();
+        return diff;
+    }
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graceful-playwright",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Gracefully handle timeout and network error with auto retry.",
   "keywords": [
     "graceful",