testaro 28.1.8 → 28.2.0

package/README.md

@@ -826,13 +826,12 @@ You may store environment variables in an untracked `.env` file if you wish, and
 ```conf
 URL_INJECT=yes
 WAVE_KEY=yourwavekey
-PROTOCOL=https
-JOB_URL=yourserver.tld/job
-REPORT_URL=yourserver.tld/report
+JOB_URLs=https://yourserver.tld/job+http://localhost:3004/testapp
 JOBDIR=../testing/jobs/ThisWorkstation
 REPORTDIR=../testing/reports
 AGENT=ThisWorkstation
 DEBUG=false
+WAITS=0
 ```
 
 ## Validation

package/call.js

@@ -70,14 +70,14 @@ const callWatch = async (isDirWatch, isForever, interval, watchee = null) => {
 if (fn === 'run' && fnArgs.length === 1) {
   callRun(fnArgs)
   .then(() => {
-    console.log('Execution completed');
+    console.log('Execution completed\n');
     process.exit(0);
   });
 }
 else if (fn === 'watch' && fnArgs.length === 3) {
   callWatch(... fnArgs)
   .then(() => {
-    console.log('Execution completed');
+    console.log('Execution completed\n');
     process.exit(0);
   });
 }

package/package.json

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

package/procs/nav.js

@@ -127,7 +127,6 @@ const browserClose = async () => {
     }
     await browser.close();
     browser = null;
-    console.log(`${browserType} browser closed`);
   }
 };
 // Launches a browser, navigates to a URL, and returns the status.

package/procs/standardize.js

@@ -41,91 +41,91 @@ const getIdentifiers = code => {
 };
 // Specifies conversions of rule IDs of aslint based on what substrings.
 const aslintData = {
-  'misused-required-attribute': [
-    ['not needed', 'misused-required-attributeR']
+  'misused_required_attribute': [
+    ['not needed', 'misused_required_attributeR']
   ],
-  'accessible-svg': [
-    ['associated', 'accessible-svgI'],
-    ['tabindex', 'accessible-svgT']
+  'accessible_svg': [
+    ['associated', 'accessible_svgI'],
+    ['tabindex', 'accessible_svgT']
   ],
-  'audio-alternative': [
-    ['track', 'audio-alternativeT'],
-    ['alternative', 'audio-alternativeA'],
-    ['bgsound', 'audio-alternativeB']
+  'audio_alternative': [
+    ['track', 'audio_alternativeT'],
+    ['alternative', 'audio_alternativeA'],
+    ['bgsound', 'audio_alternativeB']
   ],
-  'table-missing-description': [
-    ['describedby', 'associated', 'table-missing-descriptionDM'],
-    ['labeledby', 'associated', 'table-missing-descriptionLM'],
-    ['caption', 'not been defined', 'table-missing-descriptionC'],
-    ['summary', 'empty', 'table-missing-descriptionS'],
-    ['describedby', 'empty', 'table-missing-descriptionDE'],
-    ['labeledby', 'empty', 'table-missing-descriptionLE'],
-    ['caption', 'no content', 'table-missing-descriptionE']
+  'table_missing_description': [
+    ['describedby', 'associated', 'table_missing_descriptionDM'],
+    ['labeledby', 'associated', 'table_missing_descriptionLM'],
+    ['caption', 'not been defined', 'table_missing_descriptionC'],
+    ['summary', 'empty', 'table_missing_descriptionS'],
+    ['describedby', 'empty', 'table_missing_descriptionDE'],
+    ['labeledby', 'empty', 'table_missing_descriptionLE'],
+    ['caption', 'no content', 'table_missing_descriptionE']
   ],
-  'label-implicitly-associated': [
-    ['only whice spaces', 'label-implicitly-associatedW'],
-    ['more than one', 'label-implicitly-associatedM']
+  'label_implicitly_associated': [
+    ['only whice spaces', 'label_implicitly_associatedW'],
+    ['more than one', 'label_implicitly_associatedM']
   ],
-  'label-inappropriate-association': [
-    ['Missing', 'label-inappropriate-associationM'],
-    ['non-form', 'label-inappropriate-associationN']
+  'label_inappropriate_association': [
+    ['Missing', 'label_inappropriate_associationM'],
+    ['non-form', 'label_inappropriate_associationN']
   ],
-  'table-row-and-column-headers': [
-    ['headers', 'table-row-and-column-headersRC'],
-    ['Content', 'table-row-and-column-headersB'],
-    ['head of the columns', 'table-row-and-column-headersH']
+  'table_row_and_column_headers': [
+    ['headers', 'table_row_and_column_headersRC'],
+    ['Content', 'table_row_and_column_headersB'],
+    ['head of the columns', 'table_row_and_column_headersH']
   ],
-  'color-contrast-state-pseudo-classes-abstract': [
-    ['position: fixed', 'color-contrast-state-pseudo-classes-abstractF'],
-    ['transparent', 'color-contrast-state-pseudo-classes-abstractB'],
-    ['least 3:1', 'color-contrast-state-pseudo-classes-abstract3'],
-    ['least 4.5:1', 'color-contrast-state-pseudo-classes-abstract4']
+  'color_contrast_state_pseudo_classes_abstract': [
+    ['position: fixed', 'color_contrast_state_pseudo_classes_abstractF'],
+    ['transparent', 'color_contrast_state_pseudo_classes_abstractB'],
+    ['least 3:1', 'color_contrast_state_pseudo_classes_abstract3'],
+    ['least 4.5:1', 'color_contrast_state_pseudo_classes_abstract4']
   ],
-  'color-contrast-state-pseudo-classes-active': [
-    ['position: fixed', 'color-contrast-state-pseudo-classes-abstractF'],
-    ['transparent', 'color-contrast-state-pseudo-classes-abstractB'],
-    ['least 3:1', 'color-contrast-state-pseudo-classes-abstract3'],
-    ['least 4.5:1', 'color-contrast-state-pseudo-classes-abstract4']
+  'color_contrast_state_pseudo_classes_active': [
+    ['position: fixed', 'color_contrast_state_pseudo_classes_abstractF'],
+    ['transparent', 'color_contrast_state_pseudo_classes_abstractB'],
+    ['least 3:1', 'color_contrast_state_pseudo_classes_abstract3'],
+    ['least 4.5:1', 'color_contrast_state_pseudo_classes_abstract4']
   ],
-  'color-contrast-state-pseudo-classes-focus': [
-    ['position: fixed', 'color-contrast-state-pseudo-classes-abstractF'],
-    ['transparent', 'color-contrast-state-pseudo-classes-abstractB'],
-    ['least 3:1', 'color-contrast-state-pseudo-classes-abstract3'],
-    ['least 4.5:1', 'color-contrast-state-pseudo-classes-abstract4']
+  'color_contrast_state_pseudo_classes_focus': [
+    ['position: fixed', 'color_contrast_state_pseudo_classes_abstractF'],
+    ['transparent', 'color_contrast_state_pseudo_classes_abstractB'],
+    ['least 3:1', 'color_contrast_state_pseudo_classes_abstract3'],
+    ['least 4.5:1', 'color_contrast_state_pseudo_classes_abstract4']
   ],
-  'color-contrast-state-pseudo-classes-hover': [
-    ['position: fixed', 'color-contrast-state-pseudo-classes-abstractF'],
-    ['transparent', 'color-contrast-state-pseudo-classes-abstractB'],
-    ['least 3:1', 'color-contrast-state-pseudo-classes-abstract3'],
-    ['least 4.5:1', 'color-contrast-state-pseudo-classes-abstract4']
+  'color_contrast_state_pseudo_classes_hover': [
+    ['position: fixed', 'color_contrast_state_pseudo_classes_abstractF'],
+    ['transparent', 'color_contrast_state_pseudo_classes_abstractB'],
+    ['least 3:1', 'color_contrast_state_pseudo_classes_abstract3'],
+    ['least 4.5:1', 'color_contrast_state_pseudo_classes_abstract4']
   ],
-  'color-contrast-aaa': [
-    ['transparent', 'color-contrast-aaaB'],
-    ['least 4.5:1', 'color-contrast-aaa4'],
-    ['least 7:1', 'color-contrast-aaa7']
+  'color_contrast_aaa': [
+    ['transparent', 'color_contrast_aaaB'],
+    ['least 4.5:1', 'color_contrast_aaa4'],
+    ['least 7:1', 'color_contrast_aaa7']
   ],
   'animation': [
     ['duration', 'animationD'],
     ['iteration', 'animationI'],
     ['mechanism', 'animationM']
   ],
-  'page-title': [
-    ['empty', 'page-titleN'],
-    ['not identify', 'page-titleU']
+  'page_title': [
+    ['empty', 'page_titleN'],
+    ['not identify', 'page_titleU']
   ],
-  'aria-labelledby-association': [
-    ['exist', 'aria-labelledby-associationN'],
-    ['empty', 'aria-labelledby-associationE']
+  'aria_labelledby_association': [
+    ['exist', 'aria_labelledby_associationN'],
+    ['empty', 'aria_labelledby_associationE']
   ],
-  'html-lang-attr': [
-    ['parameters', 'html-lang-attrP'],
-    ['nothing', 'html-lang-attrN'],
-    ['empty', 'html-lang-attrE']
+  'html_lang_attr': [
+    ['parameters', 'html_lang_attrP'],
+    ['nothing', 'html_lang_attrN'],
+    ['empty', 'html_lang_attrE']
   ],
-  'missing-label': [
-    ['associated', 'missing-labelI'],
-    ['defined', 'missing-labelN'],
-    ['multiple labels', 'missing-labelM']
+  'missing_label': [
+    ['associated', 'missing_labelI'],
+    ['defined', 'missing_labelN'],
+    ['multiple labels', 'missing_labelM']
   ],
   'orientation': [
     ['loaded', 'orientationT']
@@ -353,47 +353,65 @@ const convert = (toolName, result, standardResult) => {
   }
   // aslint
   else if (toolName === 'aslint' && result.summary && result.summary.byIssueType) {
+    // Get the totals.
     standardResult.totals = [
       result.summary.byIssueType.warning, 0, 0, result.summary.byIssueType.error
     ];
+    // For each rule:
     Object.keys(result.rules).forEach(ruleID => {
-      const ruleResults = result.rules[ruleID].results;
-      if (ruleResults && ruleResults.length) {
-        ruleResults.forEach(ruleResult => {
-          const what = ruleResult.message.actual.description;
-          const {issueType} = result.rules[ruleID];
-          const xpath = ruleResult.element && ruleResult.element.xpath || '';
-          const tagName = xpath && xpath.replace(/^.*\//, '').replace(/[^-\w].*$/, '').toUpperCase()
-          || '';
-          const excerpt = ruleResult.element && ruleResult.element.html || '';
-          const idDraft = excerpt && excerpt.replace(/^[^[>]+id="/, 'id=').replace(/".*$/, '');
-          const id = idDraft && idDraft.length > 3 && idDraft.startsWith('id=')
-            ? idDraft.slice(3)
-            : '';
-          const ruleData = aslintData[ruleID];
-          if (ruleData) {
-            const changer = ruleData.find(
-              specs => specs.slice(0, -1).every(matcher => what.includes(matcher))
-            );
-            if (changer) {
-              ruleID = changer[1];
+      // If it has a valid issue type:
+      const {issueType} = result.rules[ruleID];
+      if (issueType && ['warning', 'error'].includes(issueType)) {
+        // If there are any violations:
+        const ruleResults = result.rules[ruleID].results;
+        if (ruleResults && ruleResults.length) {
+          // For each violation:
+          ruleResults.forEach(ruleResult => {
+            // If it has a description:
+            if (
+              ruleResult.message
+              && ruleResult.message.actual
+              && ruleResult.message.actual.description
+            ) {
+
+              const what = ruleResult.message.actual.description;
+              // Get its differentiated ID if any.
+              const ruleData = aslintData[ruleID];
+              let finalRuleID = ruleID;
+              if (ruleData) {
+                const changer = ruleData.find(
+                  specs => specs.slice(0, -1).every(matcher => what.includes(matcher))
+                );
+                if (changer) {
+                  finalRuleID = changer[changer.length - 1];
+                }
+              }
+              const xpath = ruleResult.element && ruleResult.element.xpath || '';
+              const tagName = xpath
+              && xpath.replace(/^.*\//, '').replace(/[^-\w].*$/, '').toUpperCase()
+              || '';
+              const excerpt = ruleResult.element && ruleResult.element.html || '';
+              const idDraft = excerpt && excerpt.replace(/^[^[>]+id="/, 'id=').replace(/".*$/, '');
+              const id = idDraft && idDraft.length > 3 && idDraft.startsWith('id=')
+                ? idDraft.slice(3)
+                : '';
+              const instance = {
+                ruleID: finalRuleID,
+                what,
+                ordinalSeverity: ['warning', 0, 0, 'error'].indexOf(issueType),
+                tagName,
+                id,
+                location: {
+                  doc: 'dom',
+                  type: 'xpath',
+                  spec: xpath
+                },
+                excerpt
+              };
+              standardResult.instances.push(instance);
             }
-          }
-          const instance = {
-            ruleID,
-            what,
-            ordinalSeverity: ['warning', 0, 0, 'error'].indexOf(issueType),
-            tagName,
-            id,
-            location: {
-              doc: 'dom',
-              type: 'xpath',
-              spec: xpath
-            },
-            excerpt
-          };
-          standardResult.instances.push(instance);
-        });
+          });
+        }
       }
     });
   }

package/run.js

@@ -13,6 +13,9 @@ const {actSpecs} = require('./actSpecs');
 const {browserClose, getNonce, goTo, launch} = require('./procs/nav');
 // Module to standardize report formats.
 const {standardize} = require('./procs/standardize');
+// HTTP and HTTPS clients.
+const http = require('http');
+const https = require('https');
 
 // ########## CONSTANTS
 
@@ -45,8 +48,10 @@ const tests = {
   testaro: 'Testaro',
   wave: 'WAVE',
 };
-// Items that may be waited for.
-const waitables = ['url', 'title', 'body'];
+// Observation items.
+const httpClient = require('http');
+const httpsClient = require('https');
+const agent = process.env.AGENT;
 
 // ########## VARIABLES
 
@@ -448,12 +453,6 @@ const doActs = async (report, actIndex, page) => {
     // Report this.
     console.log('ERROR: Job aborted');
   };
-  process.on('message', message => {
-    if (message === 'interrupt') {
-      console.log('ERROR: Terminal interrupted doActs');
-      process.exit();
-    }
-  });
   const {acts} = report;
   // If any more acts are to be performed:
   if (actIndex > -1 && actIndex < acts.length) {
@@ -471,7 +470,26 @@ const doActs = async (report, actIndex, page) => {
         }
       }
       const whichSuffix = actInfo ? ` (${actInfo})` : '';
-      console.log(`>>>> ${act.type}${whichSuffix}`);
+      // If granular reporting has been specified:
+      let granularSuffix = '';
+      if (report.observe) {
+        // Notify the server of the act.
+        const observer = report.sources.sendReportTo.replace(/report$/, 'granular');
+        const whoParams = `agent=${agent}&jobID=${report.id || ''}`;
+        const actParams = `act=${act.type}&which=${act.which || ''}`;
+        const wholeURL = `${observer}?${whoParams}&${actParams}`;
+        const client = wholeURL.startsWith('https://') ? httpsClient : httpClient;
+        const request = client.request(wholeURL);
+        // If the notification threw an error:
+        request.on('error', error => {
+          // Report the error.
+          const errorMessage = `ERROR notifying the server of an act`;
+          console.log(`${errorMessage} (${error.message})`);
+        });
+        request.end();
+        granularSuffix = ' with notice to server';
+        console.log(`>>>> ${act.type}${whichSuffix}${granularSuffix}`);
+      }
       // Increment the count of acts performed.
       actCount++;
       act.startTime = Date.now();
@@ -1266,6 +1284,12 @@ exports.doJob = async report => {
     report.jobData.presses = 0;
     report.jobData.amountRead = 0;
     report.jobData.toolTimes = {};
+    process.on('message', message => {
+      if (message === 'interrupt') {
+        console.log('ERROR: Terminal interrupted the job');
+        process.exit();
+      }
+    });
     // Recursively perform the acts.
     await doActs(report, 0, null);
     // Add the end time and duration to the report.

package/tests/testaro.js

@@ -12,17 +12,25 @@ const fs = require('fs/promises');
 
 // ######## CONSTANTS
 
-const evalRules = {
+const futureEvalRules = {
   adbID: 'elements with ambiguous or missing referenced descriptions',
+  altScheme: 'img elements with alt attributes having URLs as their entire values',
+  captionLoc: 'caption elements that are not first children of table elements',
+  datalistRef: 'elements with ambiguous or missing referenced datalist elements',
+  imageLink: 'links with image files as their destinations',
+  legendLoc: 'legend elements that are not first children of fieldset elements',
+  optRoleSel: 'Non-option elements with option roles that have no aria-selected attributes',
+  phOnly: 'input elements with placeholders but no accessible names',
+  secHeading: 'headings that violate the logical level order in their sectioning containers',
+  textSem: 'semantically vague elements i, b, and/or small',
+};
+const evalRules = {
   allCaps: 'leaf elements with entirely upper-case text longer than 7 characters',
   allHidden: 'page that is entirely or mostly hidden',
   allSlanted: 'leaf elements with entirely italic or oblique text longer than 39 characters',
-  altScheme: 'img elements with alt attributes having URLs as their entire values',
   autocomplete: 'name and email inputs without autocomplete attributes',
   bulk: 'large count of visible elements',
   buttonMenu: 'nonstandard keyboard navigation between items of button-controlled menus',
-  captionLoc: 'caption elements that are not first children of table elements',
-  datalistRef: 'elements with ambiguous or missing referenced datalist elements',
   distortion: 'distorted text',
   docType: 'document without a doctype property',
   dupAtt: 'elements with duplicate attributes',
@@ -37,9 +45,7 @@ const evalRules = {
   hover: 'hover-caused content changes',
   hovInd: 'hover indication nonstandard',
   hr: 'hr element instead of styles used for vertical segmentation',
-  imageLink: 'links with image files as their destinations',
   labClash: 'labeling inconsistencies',
-  legendLoc: 'legend elements that are not first children of fieldset elements',
   lineHeight: 'text with a line height less than 1.5 times its font size',
   linkExt: 'links that automatically open new windows',
   linkAmb: 'links with identical texts but different destinations',
@@ -51,16 +57,12 @@ const evalRules = {
   motion: 'motion without user request',
   nonTable: 'table elements used for layout',
   opFoc: 'Operable elements that are not Tab-focusable',
-  optRoleSel: 'Non-option elements with option roles that have no aria-selected attributes',
-  phOnly: 'input elements with placeholders but no accessible names',
   pseudoP: 'adjacent br elements suspected of nonsemantically simulating p elements',
   radioSet: 'radio buttons not grouped into standard field sets',
   role: 'invalid and native-replacing explicit roles',
-  secHeading: 'headings that violate the logical level order in their sectioning containers',
   styleDiff: 'style inconsistencies',
   tabNav: 'nonstandard keyboard navigation between elements with the tab role',
   targetSize: 'buttons, inputs, and non-inline links smaller than 44 pixels wide and high',
-  textSem: 'semantically vague elements i, b, and/or small',
   titledEl: 'title attributes on inappropriate elements',
   zIndex: 'non-default Z indexes'
 };

package/validation/executors/watchDir.js

@@ -8,7 +8,6 @@ const fs = require('fs/promises');
 // CONSTANTS
 
 // Override cycle environment variables with validation-specific ones.
-process.env.PROTOCOL = 'http';
 process.env.JOBDIR = `${__dirname}/../watch`;
 process.env.REPORTDIR = `${__dirname}/../../temp`;
 const jobID = '00000-simple-example';

package/validation/executors/watchNet.js

@@ -8,13 +8,11 @@ const fs = require('fs/promises');
 // CONSTANTS
 
 // Override cycle environment variables with validation-specific ones.
-process.env.PROTOCOL = 'http';
 const jobDir = `${__dirname}/../jobs/todo`;
-process.env.JOB_URL = 'localhost:3007/api/job';
-process.env.REPORT_URL = 'localhost:3007/api';
+process.env.JOB_URL = 'http://localhost:3007/api/job';
 process.env.AGENT = 'testarauth';
 const {cycle} = require('../../watch');
-const client = require(process.env.PROTOCOL);
+const client = require('http');
 const jobID = '00000-simple-example';
 
 // OPERATION

package/watch.js

@@ -11,15 +11,17 @@ require('dotenv').config();
 const fs = require('fs/promises');
 // Module to perform tests.
 const {doJob} = require('./run');
+// HTTP and HTTPS clients.
+const http = require('http');
+const https = require('https');
 
 // ########## CONSTANTS
 
-const protocol = process.env.PROTOCOL || 'https';
-const client = require(protocol);
-const jobURL = process.env.JOB_URL;
+const httpClient = require('http');
+const httpsClient = require('https');
+const jobURLs = process.env.JOB_URLs;
 const agent = process.env.AGENT;
 const jobDir = process.env.JOBDIR;
-const reportURL = process.env.REPORT_URL;
 const reportDir = process.env.REPORTDIR;
 
 // ########## FUNCTIONS
@@ -55,48 +57,94 @@ const checkDirJob = async watchee => {
     return {};
   }
 };
-// Checks for and returns a network job.
+// Checks for and, if obtained, returns a network job.
 const checkNetJob = async watchee => {
-  const watchJobURL = watchee || jobURL;
-  const job = await new Promise(resolve => {
-    const wholeURL = `${protocol}://${watchJobURL}?agent=${agent}`;
-    const request = client.request(wholeURL, response => {
-      const chunks = [];
-      response.on('data', chunk => {
-        chunks.push(chunk);
-      });
-      response.on('end', () => {
-        try {
-          const jobJSON = chunks.join('');
-          const job = JSON.parse(jobJSON);
-          // Return it.
-          resolve(job);
-        }
-        catch(error) {
-          resolve({
-            error: 'ERROR: Response was not JSON',
+  let watchJobURLs = [watchee];
+  if (! watchJobURLs[0]) {
+    watchJobURLs = jobURLs
+    .split('+')
+    .map(url => [Math.random(), url])
+    .sort((a, b) => a[0] - b[0])
+    .map(pair => pair[1]);
+  }
+  // For each watchee:
+  for (const watchJobURL of watchJobURLs) {
+    const job = await new Promise(resolve => {
+      // Request a job from it.
+      const wholeURL = `${watchJobURL}?agent=${agent}`;
+      const client = wholeURL.startsWith('https://') ? httpsClient : httpClient;
+      const request = client.request(wholeURL, {timeout: 1000}, response => {
+        const chunks = [];
+        response.on('data', chunk => {
+          chunks.push(chunk);
+        })
+        // When response arrives:
+        .on('end', () => {
+          // If the response was JSON-formatted:
+          try {
+            const jobJSON = chunks.join('');
+            const job = JSON.parse(jobJSON);
+            // Make it the response of the watchee.
+            return resolve(job);
+          }
+          // Otherwise, i.e. if the response was not JSON-formatted:
+          catch(error) {
+            // Make an error report the response of the watchee.
+            const errorMessage = `ERROR: Response of ${watchJobURL} was not JSON`;
+            console.log(errorMessage);
+            return resolve({
+              error: errorMessage,
+              message: error.message,
+              status: response.statusCode
+            });
+          }
+        })
+        .on('error', error => {
+          return resolve({
+            error: 'ERROR getting network job',
             message: error.message,
             status: response.statusCode
           });
-        }
+        });
       });
+      // If the check threw an error:
+      request.on('error', error => {
+        // Make an error report the response of the watchee.
+        const errorMessage = `ERROR checking ${watchJobURL} for a network job`;
+        console.log(`${errorMessage} (${error.message})`);
+        return resolve({
+          error: errorMessage,
+          message: error.message
+        });
+      })
+      .on('timeout', () => {
+        const errorMessage = `ERROR: Request to ${watchJobURL} timed out`;
+        console.log(errorMessage);
+        return resolve({
+          error: errorMessage
+        });
+      });
+      request.end();
     });
-    request.on('error', error => {
-      console.log(`ERROR checking for a network job (${error.message})`);
-      resolve({});
-    });
-    request.end();
-  });
-  if (job.id) {
-    console.log(`Network job ${job.id} received (${nowString()})`);
-  }
-  else if (job.message) {
-    console.log(job.message);
-  }
-  else {
-    console.log(`No network job to do (${nowString()})`);
+    // If the watchee sent a job:
+    if (job.id) {
+      // Stop checking and return it.
+      console.log(`Network job ${job.id} received from ${watchJobURL} (${nowString()})`);
+      return job;
+    }
+    // Otherwise, if the watchee sent a message:
+    else if (job.message) {
+      // Report it and continue checking.
+      console.log(job.message);
+    }
+    // Otherwise, i.e. if the watchee sent neither a job nor a message:
+    else {
+      // Report this and continue checking.
+      console.log(`No network job at ${watchJobURL} to do (${nowString()})`);
+    }
   }
-  return job;
+  // If no watchee sent a job, return this.
+  return {};
 };
 // Writes a directory report.
 const writeDirReport = async report => {
@@ -121,49 +169,60 @@ const writeDirReport = async report => {
 const writeNetReport = async report => {
   const ack = await new Promise(resolve => {
     if (report.sources) {
-      // Get the report destination from the report or the environment.
+      // If the report specifies where to send it:
       const destination = report.sources.sendReportTo;
-      const wholeURL = destination || `${process.env.PROTOCOL}://${reportURL}`;
-      // Contact the server.
-      const request = client.request(wholeURL, {method: 'POST'}, response => {
-        const chunks = [];
-        response.on('data', chunk => {
-          chunks.push(chunk);
-        });
-        response.on('end', () => {
-          const content = chunks.join('');
-          try {
-            resolve(JSON.parse(content));
-          }
-          catch(error) {
-            resolve({
-              error: 'ERROR: Response was not JSON',
-              message: error.message,
-              status: response.statusCode,
-              content: content.slice(0, 3000)
-            });
-          }
+      if (destination) {
+        // Send it.
+        const client = destination.startsWith('https://') ? https : http;
+        const request = client.request(destination, {method: 'POST'}, response => {
+          const chunks = [];
+          response.on('data', chunk => {
+            chunks.push(chunk);
+          });
+          response.on('end', () => {
+            const content = chunks.join('');
+            try {
+              resolve(JSON.parse(content));
+            }
+            catch(error) {
+              resolve({
+                error: 'ERROR: Response was not JSON',
+                message: error.message,
+                status: response.statusCode,
+                content: content.slice(0, 3000)
+              });
+            }
+          });
         });
-      });
-      report.jobData.agent = agent;
-      request.on('error', error => {
-        console.log(`ERROR submitting job report (${error.message})`);
-        resolve({
-          error: 'ERROR: Job report submission failed',
-          message: error.message
+        report.jobData.agent = agent;
+        request.on('error', error => {
+          console.log(`ERROR submitting job report (${error.message})`);
+          resolve({
+            error: 'ERROR: Job report submission failed',
+            message: error.message
+          });
         });
-      });
-      // Send the report to the server.
-      const reportJSON = JSON.stringify(report, null, 2);
-      request.write(reportJSON);
-      request.end();
-      console.log(`Report ${report.id} submitted (${nowString()})`);
+        const reportJSON = JSON.stringify(report, null, 2);
+        request.end(reportJSON);
+        console.log(`Report ${report.id} submitted (${nowString()})`);
+      }
+      // Otherwise, i.e. if the report does not specify where to send it:
+      else {
+        // Report this.
+        console.log('ERROR: Report specifies no submission destination');
+      }
     }
     else {
       console.log('ERROR: Report has no sources property');
     }
   });
   // Return the server response.
+  if (ack) {
+    return ack.message || ack;
+  }
+  else {
+    return '';
+  }
   return ack;
 };
 // Archives a job.
@@ -198,7 +257,7 @@ const runJob = async (job, isDirWatch) => {
       else {
         // Send the report to the server.
         const ack = await writeNetReport(job);
-        console.log(JSON.stringify(ack, null, 2));
+        console.log(ack);
       }
     }
     // If the job failed: