testilo 7.0.1 → 7.0.3

package/aim.js

@@ -5,7 +5,9 @@
 
 // ########## FUNCTIONS
 
-// Returns a script, aimed at a host.
+// Returns a string representing the date and time.
+const nowString = () => (new Date()).toISOString().slice(0, 19);
+// Returns a script, aimed at a host, as a job.
 exports.aim = (script, host, requester) => {
   // Make all url commands in the script visit the host.
   script.commands.forEach(command => {
@@ -16,15 +18,17 @@ exports.aim = (script, host, requester) => {
     }
   });
   // Add source information to the script.
-  script.source = {
+  script.sources = {
     script: script.id,
     host,
     requester
   }
   // Create a job-creation time stamp.
   const timeStamp = Math.floor((Date.now() - Date.UTC(2022, 1)) / 2000).toString(36);
-  // Add a job-ID property to the script, including the time stamp, the script ID, and the host ID.
-  script.jobID = `${timeStamp}-${script.id}-${host.id}`;
-  // Return the host-specific script.
+  // Change the script ID to a job ID.
+  script.id = `${timeStamp}-${script.id}-${host.id}`;
+  // Add the job-creation time to the script.
+  script.jobCreationTime = nowString();
+  // Return the job.
   return script;
 };

package/call.js

@@ -65,9 +65,10 @@ const callAim = async (scriptName, hostURL, hostName, hostID, requester) => {
     }, 
     requester
   );
-  const aimedScriptID = aimedScript.id;
-  await fs.writeFile(`${jobDir}/${aimedScriptID}.json`, JSON.stringify(aimedScript, null, 2));
-  console.log(`Script ${aimedScriptID}.json has been aimed at ${hostName} and saved in ${jobDir}`);
+  const scriptID = script.sources.script;
+  const jobID = aimedScript.id;
+  await fs.writeFile(`${jobDir}/${jobID}.json`, `${JSON.stringify(aimedScript, null, 2)}\n`);
+  console.log(`Script ${scriptID} aimed at ${hostName} saved as ${jobID}.json in ${jobDir}`);
 };
 // Fulfills a merger request.
 const callMerge = async (scriptName, batchName) => {
@@ -75,7 +76,7 @@ const callMerge = async (scriptName, batchName) => {
   console.log(`Batch ${batchName}.json merged into script ${scriptName} in ${jobDir}`);
 };
 // Fulfills a scoring request.
-const callScore = async (scoreProcID, reportIDStart) => {
+const callScore = async (scoreProcID, reportIDStart = '') => {
   // Identify the raw reports.
   const rawFileNames = await fs.readdir(rawDir);
   const rawReportNames = rawFileNames.filter(fileName => fileName.endsWith('.json'));
@@ -157,9 +158,19 @@ const digestPrep = async digestProcID => {
     digestTemplate,
     scoredReportNames
   };
-}
+};
+// Digests and saves a report.
+const digestReport = async (scoredReportName, prepData) => {
+  // Digest the specified report.
+  const scoredReportJSON = await fs.readFile(`${scoredDir}/${scoredReportName}.json`, 'utf8');
+  const scoredReport = JSON.parse(scoredReportJSON);
+  const digestedReport = digest(prepData.digestTemplate, prepData.makeQuery, scoredReport);
+  // Save it, digested.
+  await fs.writeFile(`${digestedDir}/${digestedReport.id}.html`, digestedReport);
+  console.log(`Report ${scoredReport.id} digested and saved in ${digestedDir}`);
+};
 // Fulfills a digesting request.
-const callDigest = async (digestProcID, reportIDStart) => {
+const callDigest = async (digestProcID, reportIDStart = '') => {
   const prepData = await digestPrep(digestProcID);
   // If any scored reports exist:
   if (prepData.anyScoredReports) {
@@ -175,13 +186,8 @@ const callDigest = async (digestProcID, reportIDStart) => {
     }
     // If it exists:
     if (scoredReportName) {
-      // Digest it.
-      const scoredReportJSON = await fs.readFile(`${scoredDir}/${scoredReportName}.json`, 'utf8');
-      const scoredReport = JSON.parse(scoredReportJSON);
-      const digestedReport = digest(prepData.digestTemplate, makeQuery, scoredReport);
-      // Save it, digested.
-      await fs.writeFile(`${digestedDir}/${digestedReport.id}.html`, digestedReport);
-      console.log(`Report ${scoredReport.id} digested and saved in ${digestedDir}`);
+      // Digest and save it.
+      await digestReport(scoredReportName, prepData);
     }
     // Otherwise, i.e. if it does not exist:
     else {
@@ -202,13 +208,8 @@ const callMultiDigest = async digestProcID => {
   if (prepData.anyScoredReports) {
     // For each of them:
     for (const scoredReportName of prepData.scoredReportNames) {
-      // Digest it.
-      const scoredReportJSON = await fs.readFile(`${scoredDir}/${scoredReportName}.json`, 'utf8');
-      const scoredReport = JSON.parse(scoredReportJSON);
-      const digestedReport = digest(prepData.digestTemplate, makeQuery, scoredReport);
-      // Save it, digested.
-      await fs.writeFile(`${digestedDir}/${digestedReport.id}.html`, digestedReport);
-      console.log(`Report ${scoredReport.id} digested and saved in ${digestedDir}`);
+      // Digest and save it.
+      await digestReport(scoredReportName, prepData);
     }
   }
   // Otherwise, i.e. if no raw report exists:
@@ -249,12 +250,24 @@ else if (fn === 'score' && fnArgs.length > 0 && fnArgs.length < 3) {
     console.log('Execution completed');
   });
 }
+else if (fn === 'multiScore' && fnArgs.length === 1) {
+  callMultiScore(... fnArgs)
+  .then(() => {
+    console.log('Execution completed');
+  });
+}
 else if (fn === 'digest' && fnArgs.length > 0 && fnArgs.length < 3) {
   callDigest(... fnArgs)
   .then(() => {
     console.log('Execution completed');
   });
 }
+else if (fn === 'multiDigest' && fnArgs.length === 1) {
+  callMultiDigest(... fnArgs)
+  .then(() => {
+    console.log('Execution completed');
+  });
+}
 else if (fn === 'compare' && fnArgs.length === 2) {
   callCompare(... fnArgs)
   .then(() => {

package/merge.js

@@ -56,7 +56,7 @@ exports.merge = async (scriptName, batchName) => {
     }
     // Add the job-creation time to the script.
     newScript.jobCreationTime = nowString();
-    // Change the script id property to include the time stamp and the host ID.
+    // Change the script ID to a job ID.
     newScript.id = `${timeStamp}-${newScript.id}-${host.id}`;
     // Return the host-specific script.
     return newScript;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "Client that scores and digests Testaro reports",
   "main": "aim.js",
   "scripts": {