testaro 30.0.3 → 30.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "30.0.3",
+  "version": "30.0.5",
   "description": "Run 960 web accessibility tests from 9 tools and get a standardized report",
   "main": "index.js",
   "scripts": {

package/watch.js

@@ -119,7 +119,6 @@ const checkDirJob = async (isForever, interval) => {
 };
 // Checks servers for a network job.
 const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount) => {
-  console.log('');
   // If all servers are jobless:
   if (noJobCount === servers.length) {
     // Wait for the specified interval.
@@ -132,8 +131,13 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
     // Wait 2 seconds.
     await wait(2000);
   }
-  // Check the next server.
+  // If the last server has been checked:
   serverIndex = serverIndex % servers.length;
+  if (serverIndex === 0) {
+    // Report this.
+    console.log('--');
+  }
+  // Check the next server.
   const server = servers[serverIndex];
   const client = server.startsWith('https://') ? httpsClient : httpClient;
   const fullURL = `${server}?agent=${agent}`;
@@ -156,7 +160,7 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
       const content = chunks.join('');
       // If there was no job to do:
       try {
-        const contentObj = JSON.parse(content);
+        let contentObj = JSON.parse(content);
         if (! Object.keys(contentObj).length) {
           // Report this.
           console.log(`No job to do at ${server}`);
@@ -174,16 +178,19 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
             await checkNetJob(servers, serverIndex + 1, isForever, interval, noJobCount + 1);
           }
           // Otherwise, if the server sent a valid job:
-          else if (id && sources) {
+          else if (id && sources && sources.target && sources.target.which) {
             // Add the agent to it.
             sources.agent = agent;
             // If the job specifies a report destination:
             const {sendReportTo} = sources;
             if (sendReportTo) {
               // Perform the job, adding result data to it.
-              console.log(`${logStart}job ${id} for ${sendReportTo} (${nowString()})`);
+              const testee = sources.target.which;
+              console.log(
+                `${logStart}job ${id} (${nowString()})\n>> It will test ${testee}\n>> It will send report to ${sendReportTo}`
+              );
               await doJob(contentObj);
-              const reportJSON = JSON.stringify(contentObj, null, 2);
+              let reportJSON = JSON.stringify(contentObj, null, 2);
               console.log(`Job ${id} finished (${nowString()})`);
               // Send the report to the specified server.
               console.log(`Sending report ${id} to ${sendReportTo}`);
@@ -212,9 +219,9 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
                     if (message) {
                       // Report it.
                       console.log(`${reportLogStart}${message}`);
-                      // Archive the job.
-                      await archiveJob(contentObj, false);
-                      console.log(`Job ${id} archived (${nowString()})`);
+                      // Free the memory used by the report.
+                      reportJSON = '';
+                      contentObj = {};
                       // Check the next server.
                       await checkNetJob(servers, serverIndex + 1, isForever, interval, 0);
                     }