testilo 4.1.0 → 5.0.0

package/aim.js

@@ -21,24 +21,18 @@ const fs = require('fs/promises');
 // ########## CONSTANTS
 
 const scriptDir = process.env.SCRIPTDIR || 'scripts';
-const scriptName = process.argv[2];
-const host = {
-  id: process.argv[3],
-  which: process.argv[4],
-  what: process.argv[5]
-};
-const requester = process.argv[6];
 
 // ########## FUNCTIONS
 
+// Returns a string representing the date and time.
+const nowString = () => (new Date()).toISOString().slice(0, 19);
 // Returns a script, aimed at a host.
-exports.aim = async () => {
+exports.aim = async (scriptName, host, requester) => {
   // Copy the script.
   const scriptFile = await fs.readFile(`${scriptDir}/${scriptName}.json`, 'utf8');
   const script = JSON.parse(scriptFile);
-  const newScript = JSON.parse(JSON.stringify(script));
   // In the copy, make all url commands visit the host.
-  newScript.commands.forEach(command => {
+  script.commands.forEach(command => {
     if (command.type === 'url') {
       command.id = host.id;
       command.which = host.which;
@@ -46,12 +40,17 @@ exports.aim = async () => {
     }
   });
   // Add source information to the script.
-  newScript.source = {
+  script.source = {
     script: script.id,
+    host,
     requester
   }
-  // Change the script id property to include the host ID.
-  newScript.id += `-${host.id}`;
+  // Create a job-creation time stamp.
+  const timeStamp = Math.floor((Date.now() - Date.UTC(2022, 1)) / 2000).toString(36);
+  // Change the script id property to include the time stamp and the host ID.
+  script.id = `${timeStamp}-${script.id}-${host.id}`;
+  // Add the job-creation time to the script.
+  script.jobCreationTime = nowString();
   // Return the host-specific script.
-  return newScript;
+  return script;
 };

package/merge.js

@@ -26,10 +26,14 @@ const batchName = process.argv[3];
 
 // ########## FUNCTIONS
 
+// Returns a string representing the date and time.
+const nowString = () => (new Date()).toISOString().slice(0, 19);
 // Merges a batch into a script and writes host-specific scripts.
 const merge = async (script, batch) => {
   // Create the watch directory if it does not exist.
   await fs.mkdir(watchDir, {recursive: true});
+  // Create a job-creation time stamp.
+  const timeStamp = Math.floor((Date.now() - Date.UTC(2022, 1)) / 2000).toString(36);
   // For each host in the batch:
   const {hosts} = batch;
   const newScripts = hosts.map(host => {
@@ -48,8 +52,12 @@ const merge = async (script, batch) => {
       script: script.id,
       batch: batch.id
     }
-    // Change the script id property to include the host ID.
-    newScript.id += `-${host.id}`;
+    // Add a job-creation time stamp to the script.
+    newScript.timeStamp = timeStamp;
+    // 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.
+    newScript.id = `${timeStamp}-${newScript.id}-${host.id}`;
     // Return the host-specific script.
     return newScript;
   });
@@ -57,7 +65,7 @@ const merge = async (script, batch) => {
   for (const newScript of newScripts) {
     await fs.writeFile(`${watchDir}/${newScript.id}.json`, JSON.stringify(newScript, null, 2));
   };
-  console.log(`Merger completed. Count of scripts created: ${hosts.length}`);
+  console.log(`Merger completed. Script count: ${hosts.length}. Time stamp: ${timeStamp}`);
 };
 
 // ########## OPERATION

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "testilo",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "description": "Client that scores and digests Testaro reports",
-  "main": "index.js",
+  "main": "aim.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },