testdriverai 5.0.9 → 5.1.0

package/index.js

@@ -4,8 +4,12 @@ const system = require("./lib/system.js");
 const { emitter, events } = require("./lib/events.js");
 const { logger } = require("./lib/logger.js");
 
-(async () => {
+if (process.argv[2] === "--help" || process.argv[2] === "-h") {
+  console.log("Command: testdriverai [init, run, edit] [yaml filepath]");
+  process.exit(0);
+}
 
+(async () => {
   let win = await system.activeWin();
 
   if (!config.TD_OVERLAY) {
@@ -13,7 +17,6 @@ const { logger } = require("./lib/logger.js");
     agent.setTerminalApp(win);
     agent.start();
   } else {
-
     // Intercept all stdout and stderr calls (works with console as well)
     const originalStdoutWrite = process.stdout.write.bind(process.stdout);
     process.stdout.write = (...args) => {
@@ -24,7 +27,7 @@ const { logger } = require("./lib/logger.js");
       );
       originalStdoutWrite(...args);
     };
-  
+
     const originalStderrWrite = process.stderr.write.bind(process.stderr);
     process.stderr.write = (...args) => {
       const [data, encoding] = args;
@@ -34,7 +37,7 @@ const { logger } = require("./lib/logger.js");
       );
       originalStderrWrite(...args);
     };
-  
+
     require("./lib/overlay.js")
       .electronProcessPromise.then(async () => {
         let agent = require("./agent.js");
@@ -45,6 +48,4 @@ const { logger } = require("./lib/logger.js");
         process.exit(1);
       });
   }
-
-  
-})()
+})();

package/lib/commander.js

@@ -200,10 +200,10 @@ commands:
         response = await commands.assert(object.expect, object.async);
         break;
       case "exec":
-        speak(`exec ${object.cli}`);
+        speak(`exec`);
         logger.info(generator.jsonToManual(object));
         notify(generator.jsonToManual(object, false));
-        response = await commands.exec(object.cli, object.stderr, object.silent);
+        response = await commands.exec(object.js);
         outputs.set(object.output, response);
         break;
       default:

package/lib/commands.js

@@ -1,5 +1,6 @@
 // the actual commands to interact with the system
 const sdk = require("./sdk");
+const vm = require('vm');
 const chalk = require("chalk");
 const {
   captureScreenBase64,
@@ -35,8 +36,6 @@ const {
   createMarkdownStreamLogger,
 } = require("./logger");
 const { emitter, events } = require("./events.js");
-const util = require('util');
-const exec = util.promisify(require('child_process').exec);
 
 const niceSeconds = (ms) => {
   return Math.round(ms / 1000);
@@ -704,42 +703,26 @@ let commands = {
   assert: async (assertion, async = false) => {
     return await assert(assertion, true, async);
   },
-  exec: async (cli_command, use_stderr = false, silent = false) => {
+  exec: async (nodejs_code) => {
 
-    if (config.TD_VM) {
-      let result = await sandbox.send({type: "commands.run", command: cli_command });
-      if (!silent) {
-        if (use_stderr) {
-          logger.info(chalk.dim(result.out.stderr), true);
-        } else {
-          logger.info(chalk.dim(result.out.stdout), true);
-        }
-        
-      } 
-      
-      let rtnr = use_stderr ? result.out.stderr : result.out.stdout;
-      return rtnr;
-      
-    } else {
+    // must be assigned to `result`
+    // do not overwrite `result`
+    // must install locally via npm install
 
-      let args = {};
-      if (silent) {
-        args = { stdio: [] };
-      }
+    const context = vm.createContext({ require, console, fs, process });
+    const script = new vm.Script(`
+      (async () => {
+        ${nodejs_code}
+      })();
+    `);
 
-      const { stdout, stderr } = await exec(cli_command, args);
+    await script.runInContext(context);
 
-      if (!silent) {
-        logger.info(chalk.dim(stdout), true);
-      }
+    // wait for context.result to resolve
+    const stepResult = await context.result;
 
-      if (use_stderr) {
-        return stderr;
-      } else {
-        return stdout;
-      }
-
-    }
+    return stepResult;
+    
   }
 };