testaro 60.1.0 → 60.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "60.1.0",
+  "version": "60.2.0",
   "description": "Run 1000 web accessibility tests from 11 tools and get a standardized report",
   "main": "index.js",
   "scripts": {

package/run.js

@@ -204,11 +204,20 @@ const goTo = async (report, page, url, timeout, waitUntil) => {
     }
     // Otherwise, if the response status was rejection of excessive requests:
     else if (httpStatus === 429) {
+      const retryHeader = response.headers()['retry-after'];
+      let waitSeconds = 5;
+      if (retryHeader) {
+        waitSeconds = Number.isNaN(Number(retryHeader))
+        ? Math.ceil((new Date(retryHeader) - new Date()) / 1000)
+        : Number(retryHeader);
+      }
       // Return this.
-      console.log(`ERROR: Visit to ${url} prevented by request frequency limit (status 429)`);
+      console.log(
+        `ERROR: Visit to ${url} rate-limited (status 429); retry after ${waitSeconds} sec.`
+      );
       return {
         success: false,
-        error: 'status429'
+        error: `status429/retryAfterSeconds=${waitSeconds}`
       };
     }
     // Otherwise, i.e. if the response status was otherwise abnormal:
@@ -423,11 +432,6 @@ const launch = exports.launch = async (
           report.jobData.lastScriptNonce = scriptNonce;
         }
       }
-      // Otherwise, i.e. if the navigation was prevented by a request frequency restriction:
-      else if (navResult.error === 'status429') {
-        // Report this.
-        addError(true, false, report, actIndex, 'status429');
-      }
       // Otherwise, i.e. if the launch or navigation failed for another reason:
       else {
         // Cause another attempt to launch and navigate, if retries remain.
@@ -438,8 +442,21 @@ const launch = exports.launch = async (
     catch(error) {
       // If retries remain:
       if (retries > 0) {
-        console.log(`WARNING: Retrying launch (${retries} retries left)`);
-        await wait(2000);
+        // Prepare to wait 1 second before a retry.
+        let waitSeconds = 1;
+        // If the error was a visit failure due to rate limiting:
+        if (error.message.includes('status429/retryAfterSeconds=')) {
+          // Change the wait to the requested time, if less than 10 seconds.
+          const waitSecondsRequest = Number(error.message.replace(/^.+=|\)$/g, ''));
+          if (! Number.isNaN(waitSecondsRequest) && waitSecondsRequest < 10) {
+            waitSeconds = waitSecondsRequest;
+          }
+        }
+        console.log(
+          `WARNING: Waiting ${waitSeconds} sec. before retrying (retries left: ${retries})`
+        );
+        await wait(1000 * waitSeconds + 100);
+        // Then retry the launch and navigation.
         return launch(report, debug, waits, tempBrowserID, tempURL, retries - 1);
       }
       // Otherwise, i.e. if no retries remain:
@@ -804,6 +821,7 @@ const doActs = async (report, opts = {}) => {
           if (act.data && ! act.data.prevented) {
             // If standardization is required:
             if (['also', 'only'].includes(standard)) {
+              console.log('>>>>>> Standardizing');
               // Initialize the standard result.
               act.standardResult = {
                 totals: [0, 0, 0, 0],