testdriverai 5.0.9 → 5.1.1

package/agent.js

@@ -691,6 +691,26 @@ const actOnMarkdown = async (content, depth, pushToHistory = false, dry = false)
   }
 };
 
+const ensureMacScreenPerms = async () => {
+
+  // if os is mac, check for screen capture permissions
+  if (
+    !config.TD_VM &&
+    process.platform === "darwin" &&
+    !macScreenPerms.hasScreenCapturePermission()
+  ) {
+    logger.info(chalk.red("Screen capture permissions not enabled."));
+    logger.info(
+      "You must enable screen capture permissions for the application calling `testdriverai`.",
+    );
+    logger.info(
+      "Read More: https://docs.testdriver.ai/faq/screen-recording-permissions-mac-only",
+    );
+    analytics.track("noMacPermissions");
+    return exit();
+  }
+}
+
 const newSession = async () => {
   // should be start of new session
   const sessionRes = await sdk.req("session/start", {
@@ -1122,6 +1142,13 @@ const embed = async (file, depth) => {
   logger.info(`${file} (end)`);
 };
 
+const buildEnv = async () => {
+  let win = await system.activeWin();
+  setTerminalApp(win);
+  await ensureMacScreenPerms();
+  await makeSandbox();
+}
+
 const start = async () => {
   // logger.info(await  system.getPrimaryDisplay());
 
@@ -1135,28 +1162,12 @@ const start = async () => {
 
   // await sdk.auth();
 
-  // if os is mac, check for screen capture permissions
-  if (
-    process.platform === "darwin" &&
-    !macScreenPerms.hasScreenCapturePermission()
-  ) {
-    logger.info(chalk.red("Screen capture permissions not enabled."));
-    logger.info(
-      "You must enable screen capture permissions for the application calling `testdriverai`.",
-    );
-    logger.info(
-      "Read More: https://docs.testdriver.ai/faq/screen-recording-permissions-mac-only",
-    );
-    analytics.track("noMacPermissions");
-    return exit();
-  }
-
   if (thisCommand !== "run") {
     speak("Howdy! I am TestDriver version " + package.version);
 
     if (!config.TD_VM) {
       logger.info(
-        chalk.red("Warning!") +
+        chalk.red("Warning!" ) +
           chalk.dim("Local mode sends screenshots of the desktop to our API."),
       );
       logger.info(
@@ -1170,11 +1181,11 @@ const start = async () => {
   analytics.track("command", { command: thisCommand, file: thisFile });
 
   if (thisCommand == "edit") {
-    await makeSandbox();
+    await buildEnv();
     firstPrompt();
   } else if (thisCommand == "run") {
+    await buildEnv();
     errorLimit = 100;
-    await makeSandbox();
     run(thisFile);
   } else if (thisCommand == "init") {
     await init();

package/index.js

@@ -4,16 +4,17 @@ 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);
+}
 
-  let win = await system.activeWin();
+(async () => {
 
   if (!config.TD_OVERLAY) {
     let agent = require("./agent.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 +25,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 +35,7 @@ const { logger } = require("./lib/logger.js");
       );
       originalStderrWrite(...args);
     };
-  
+
     require("./lib/overlay.js")
       .electronProcessPromise.then(async () => {
         let agent = require("./agent.js");
@@ -45,6 +46,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;
+    
   }
 };
 

package/lib/logger.js

@@ -19,6 +19,13 @@ const logFormat = printf(({ message }) => {
 
 let interpolationVars = JSON.parse(process.env.TD_INTERPOLATION_VARS || '{}');
 
+// this handles local `TD_*` variables
+for (const [key, value] of Object.entries(process.env)) {
+  if (key.startsWith("TD_") && key !== "TD_INTERPOLATION_VARS") {
+    interpolationVars[key] = value;
+  }
+}
+
 const censorSensitiveData = (message) => {
   for (let value of Object.values(interpolationVars)) {
 

package/lib/system.js

@@ -171,19 +171,10 @@ const initializeActiveWindow = async () => {
 const activeWin = async () => {
   
   if (config.TD_VM) { 
-    
-  return "error getting active window, proceed normally";
-
+    return "error getting active window, proceed normally";
   } else {
-
-    try {
-      const activeWindow = await initializeActiveWindow();
-      return await activeWindow();
-    } catch (error) {
-      logger.error('Error getting active window: %s', error);
-      return null;
-    }
-
+    const activeWindow = await initializeActiveWindow();
+    return await activeWindow();
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "5.0.9",
+  "version": "5.1.1",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "index.js",
   "bin": {
@@ -44,6 +44,7 @@
     "sharp": "^0.33.5",
     "systeminformation": "^5.23.5",
     "tmp": "^0.2.3",
+    "totp-generator": "^1.0.0",
     "uuid": "^10.0.0",
     "winston": "^3.13.0",
     "ws": "^8.18.1"