testaro 53.0.1 → 53.1.1

package/netWatch.js

@@ -31,6 +31,8 @@
 
 // Module to keep secrets.
 require('dotenv').config();
+// Module to perform file operations.
+const fs = require('fs/promises');
 // Module to validate jobs.
 const {isValidJob} = require('./procs/job');
 // Modules to make requests to servers.
@@ -63,8 +65,14 @@ const serveObject = (object, response) => {
   response.setHeader('Content-Type', 'application/json; charset=utf-8');
   response.end(JSON.stringify(object));
 };
-// Removes the query if any, or otherwise the final segment, from a URL.
+// Removes the query, if any, or otherwise the final segment, from a URL.
 const getURLBase = url => url.replace(/[?/][^?/.]+$/, '');
+// Saves a report.
+const rescueReport = async reportJSON => {
+  const reportDir = 'data/reports';
+  await fs.mkdir(reportDir, { recursive: true });
+  await fs.writeFile(reportDir, reportJSON);
+};
 /*
   Requests a network job and, when found, performs and reports it.
   Arguments:
@@ -128,7 +136,7 @@ exports.netWatch = async (isForever, intervalInSeconds, isCertTolerant = true) =
           if (auths[urlIndex]) {
             requestOptions.method = 'POST';
           }
-          client.request(jobURL, certOpt, response => {
+          client.request(jobURL, requestOptions, response => {
             const chunks = [];
             response
             // If the response throws an error:
@@ -197,6 +205,8 @@ exports.netWatch = async (isForever, intervalInSeconds, isCertTolerant = true) =
                       repResponse
                       // If the response to the report threw an error:
                       .on('error', async error => {
+                        // Rescue the report.
+                        await rescueReport(reportJSON);
                         // Report this.
                         console.log(`${reportLogStart}error message ${error.message}\n`);
                         resolve(true);
@@ -217,9 +227,9 @@ exports.netWatch = async (isForever, intervalInSeconds, isCertTolerant = true) =
                         }
                         // Otherwise, i.e. if it is not JSON:
                         catch(error) {
-                          // Abort the watch.
-                          abort = true;
-                          // Report it.
+                          // Rescue the report.
+                          await rescueReport(reportJSON);
+                          // Report this.
                           console.log(
                             `ERROR: ${reportLogStart}status ${repResponse.statusCode}, error message ${error.message}, and response ${content.slice(0, 1000)}\n`
                           );
@@ -232,8 +242,8 @@ exports.netWatch = async (isForever, intervalInSeconds, isCertTolerant = true) =
                     })
                     // If the report submission throws an error:
                     .on('error', async error => {
-                      // Abort the watch.
-                      abort = true;
+                      // Rescue the report.
+                      await rescueReport(reportJSON);
                       // Report this.
                       console.log(
                         `ERROR ${error.code} in report submission: ${reportLogStart}error message ${error.message}\n`
@@ -253,8 +263,6 @@ exports.netWatch = async (isForever, intervalInSeconds, isCertTolerant = true) =
               }
               // Otherwise, i.e. if it is not JSON:
               catch(error) {
-                // Abort the watch.
-                abort = true;
                 // Report this.
                 console.log(`ERROR: Job request got non-JSON response (${error.message})`);
                 resolve(true);
@@ -277,15 +285,11 @@ exports.netWatch = async (isForever, intervalInSeconds, isCertTolerant = true) =
             else if (error.message) {
               // Report this.
               console.log(`ERROR: ${logStart}got error message ${error.message.slice(0, 200)}`);
-              // Abort the watch.
-              abort = true;
             }
             // Otherwise, i.e. if it was any other error with no message:
             else {
               // Report this.
               console.log(`ERROR: ${logStart}got an error with no message`);
-              // Abort the watch.
-              abort = true;
             }
             resolve(true);
           })

package/package.json

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

package/procs/doTestAct.js

@@ -47,9 +47,11 @@ const actIndex = Number.parseInt(process.argv[2]);
 // FUNCTIONS
 
 const doTestAct = async () => {
-  const reportPath = `${__dirname}/../temp/report.json`;
+  const tempReportDir = `${__dirname}/../temp`;
+  const tempReportPath = `${tempReportDir}/report.json`;
+  await fs.mkdir(tempReportDir, {recursive: true});
   // Get the saved report.
-  const reportJSON = await fs.readFile(reportPath, 'utf8');
+  const reportJSON = await fs.readFile(tempReportPath, 'utf8');
   const report = JSON.parse(reportJSON);
   // Get the act.
   const act = report.acts[actIndex];
@@ -67,7 +69,7 @@ const doTestAct = async () => {
   if (report.jobData && report.jobData.aborted) {
     // Save the revised report.
     const reportJSON = JSON.stringify(report);
-    await fs.writeFile(reportPath, reportJSON);
+    await fs.writeFile(tempReportPath, `${reportJSON}\n`);
     // Report this.
     process.send('ERROR: Job aborted');
   }
@@ -97,7 +99,7 @@ const doTestAct = async () => {
           }
           const reportJSON = JSON.stringify(report);
           // Save the revised report.
-          await fs.writeFile(reportPath, reportJSON);
+          await fs.writeFile(tempReportPath, reportJSON);
           // Send a completion message.
           process.send('Act completed');
         }
@@ -106,7 +108,7 @@ const doTestAct = async () => {
       catch(error) {
         // Save the revised report.
         const reportJSON = JSON.stringify(report);
-        await fs.writeFile(reportPath, reportJSON);
+        await fs.writeFile(tempReportPath, reportJSON);
         // Report the failure.
         const message = error.message.slice(0, 400);
         console.log(`ERROR: Test act ${act.which} failed (${message})`);