testdriverai 5.4.1 → 5.4.2

package/agent.js

@@ -53,6 +53,7 @@ const { emitter, events } = require("./lib/events.js");
 
 const logger = log.logger;
 
+let thisFile;
 let lastPrompt = "";
 let terminalApp = "";
 let commandHistory = [];
@@ -110,12 +111,6 @@ let getArgs = () => {
   }
 
   if (!args[file]) {
-    // make testdriver directory if it doesn't exist
-    let testdriverFolder = path.join(workingDir, "testdriver");
-    if (!fs.existsSync(testdriverFolder)) {
-      fs.mkdirSync(testdriverFolder);
-    }
-
     args[file] = "testdriver/testdriver.yaml";
   }
 
@@ -130,21 +125,6 @@ let getArgs = () => {
   return { command: args[command], file: args[file] };
 };
 
-let a = getArgs();
-
-let thisFile = a.file;
-const thisCommand = a.command;
-
-logger.info(chalk.green(`Howdy! I'm TestDriver v${package.version}`));
-logger.info(`This is beta software!`);
-logger.info("");
-logger.info(chalk.yellow(`Join our Discord for help`));
-logger.info(`https://discord.com/invite/cWDFW8DzPm`);
-logger.info("");
-
-// individual run ID for this session
-// let runID = new Date().getTime();
-
 function fileCompleter(line) {
   line = line.slice(5); // remove /run
   const lastSepIndex = line.lastIndexOf(path.sep);
@@ -407,14 +387,13 @@ const executeCommands = async (
         executionHistory[executionHistory.length - 1]?.commands.push(command);
       }
 
-      if (!dry) {
-        await runCommand(command, depth, shouldSave);
-      }
-
       if (shouldSave) {
         await save({ silent: true });
       }
 
+      if (!dry) {
+        await runCommand(command, depth, shouldSave);
+      }
       let timeToComplete = (new Date().getTime() - lastCommand) / 1000;
       // logger.info(timeToComplete, 'seconds')
 
@@ -526,6 +505,10 @@ const loadYML = async (file) => {
     process.env["TD_INTERPOLATION_VARS"] || "{}",
   );
 
+  if (!yml) {
+    return {};
+  }
+
   yml = await parser.validateYAML(yml);
 
   // Inject environment variables into any ${VAR} strings
@@ -781,10 +764,10 @@ const ensureMacScreenPerms = async () => {
 
       logger.info(chalk.red("Screen capture permissions not enabled."));
       logger.info(
-        "You must enable screen capture permissions for the application calling `testdriverai`.",
+        "You must enable screen capture permissions for this terminal application within System Settings.",
       );
       logger.info(
-        "Read More: https://docs.testdriver.ai/faq/screen-recording-permissions-mac-only",
+        "Navigate to System Settings > Privacy & Security > Screen Recording and enable screen recording permissions for the terminal you are using to run this command.",
       );
       analytics.track("noMacPermissions");
       return exit();
@@ -797,6 +780,7 @@ const ensureMacScreenPerms = async () => {
 // simple function to backfill the chat history with a prompt and
 // then call `promptUser()` to get the user input
 const firstPrompt = async () => {
+  
   // readline is what allows us to get user input
   rl = readline.createInterface({
     terminal: true,
@@ -807,8 +791,6 @@ const firstPrompt = async () => {
     completer,
   });
 
-  analytics.track("first prompt");
-
   rl.on("SIGINT", async () => {
     analytics.track("sigint");
     await exit(false);
@@ -902,6 +884,7 @@ const firstPrompt = async () => {
     }
 
     setTerminalWindowTransparency(false);
+
     promptUser();
   };
 
@@ -924,18 +907,17 @@ const firstPrompt = async () => {
 
     let yml = fs.readFileSync(thisFile, "utf-8");
 
-    let markdown = `\`\`\`yaml
-${yml}
-\`\`\``;
+    if (yml) {
 
-    logger.info(`Loaded test script ${thisFile}\n`);
-
-    log.prettyMarkdown(`
-
-${markdown}
+      let markdown = `\`\`\`yaml
+${yml}\`\`\``;
+      
+      logger.info(`Loaded test script ${thisFile}\n`);
+      log.prettyMarkdown(markdown);
+      logger.info("New commands will be appended.")
+      console.log('')
 
-New commands will be appended.
-`);
+    }
   }
 
   promptUser();
@@ -1156,7 +1138,7 @@ ${yaml.dump(step)}
 
 const promptUser = () => {
   emitter.emit(events.interactive, true);
-  rl.prompt(true);
+  process.nextTick(() => rl.prompt());
 };
 
 const setTerminalApp = async (win) => {
@@ -1235,6 +1217,45 @@ const start = async () => {
   //   process.exit();
   // }
 
+  let a = getArgs();
+
+  // make testdriver directory if it doesn't exist
+  let testdriverFolder = path.join(workingDir, "testdriver");
+  if (!fs.existsSync(testdriverFolder)) {
+
+    console.log('does not exist')
+
+    fs.mkdirSync(testdriverFolder);
+    // log
+    logger.info(chalk.dim(`Created testdriver directory`));
+    console.log(
+      chalk.dim(`Created testdriver directory: ${testdriverFolder}`),
+    );
+
+  }
+
+  // if testdriver.yaml doesn't exist, make it
+  let testdriverFile = path.join(testdriverFolder, "testdriver.yaml");
+  if (!fs.existsSync(testdriverFile)) {
+    fs.writeFileSync(testdriverFile, "");
+    logger.info(chalk.dim(`Created testdriver.yaml`));
+    console.log(chalk.dim(`Created testdriver.yaml: ${testdriverFile}`));
+  }
+
+  thisFile = a.file;
+  const thisCommand = a.command;
+
+  logger.info(chalk.green(`Howdy! I'm TestDriver v${package.version}`));
+  logger.info(`This is beta software!`);
+  logger.info("");
+  logger.info(chalk.yellow(`Join our Discord for help`));
+  logger.info(`https://discord.com/invite/cWDFW8DzPm`);
+  logger.info("");
+
+  // individual run ID for this session
+  // let runID = new Date().getTime();
+
+
   // await sdk.auth();
   if (thisCommand !== "run") {
     speak("Howdy! I am TestDriver version " + package.version);
@@ -1242,6 +1263,7 @@ const start = async () => {
 
   if (thisCommand !== "init" && thisCommand !== "upload-secrets") {
     logger.info(chalk.dim(`Working on ${thisFile}`));
+    console.log("");
 
     loadYML(thisFile)
 
@@ -1249,11 +1271,11 @@ const start = async () => {
       logger.info(
         chalk.red("Warning! ") +
           chalk.dim(
-            "Local mode sends screenshots of the desktop to our API. Set `TD_VM=true` to run in a secure VM.",
+            "Local mode sends screenshots of the desktop to our API. Set `TD_VM` to run in a secure VM.",
           ),
       );
       logger.info(
-        chalk.dim("https://docs.testdriver.ai/security-and-privacy/agent"),
+        chalk.dim("Read More: https://docs.testdriver.ai/security-and-privacy/agent"),
       );
       logger.info("");
     }

package/lib/system.js

@@ -162,7 +162,9 @@ const initializeActiveWindow = async () => {
     // For some reason, the import fails in certain situations
     const activeWindow = await import("get-windows")
       .then(({ activeWindow }) => activeWindow)
-      .catch(() => null);
+      .catch(() => {
+        return null;
+      });
     activeWindowFn = activeWindow;
   }
   return activeWindowFn;
@@ -174,7 +176,14 @@ const activeWin = async () => {
     return "error getting active window, proceed normally";
   } else {
     const activeWindow = await initializeActiveWindow();
-    return await activeWindow?.();
+    let windows;
+    try {
+      windows = await activeWindow?.();
+    } catch (e) {
+      console.error("Error getting active window", e);
+        return "error getting active window, proceed normally";
+    }
+    return windows;
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "index.js",
   "bin": {

package/schema.json

@@ -70,26 +70,26 @@
                       "keys": {
                         "type": "array",
                         "items": {
-                          "type": "string"
-                        },
-                        "enum": [
-                          [
-                            "backspace", "delete", "enter", "tab", "escape", "up", "down", "right", "left",
-                            "home", "end", "pageup", "pagedown", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
-                            "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19",
-                            "f20", "f21", "f22", "f23", "f24", "capslock", "command", "alt", "right_alt",
-                            "control", "left_control", "right_control", "shift", "right_shift", "space",
-                            "printscreen", "insert", "menu", "audio_mute", "audio_vol_down", "audio_vol_up",
-                            "audio_play", "audio_stop", "audio_pause", "audio_prev", "audio_next",
-                            "audio_rewind", "audio_forward", "audio_repeat", "audio_random", "numpad_lock",
-                            "numpad_0", "numpad_1", "numpad_2", "numpad_3", "numpad_4", "numpad_5",
-                            "numpad_6", "numpad_7", "numpad_8", "numpad_9", "numpad_+", "numpad_-",
-                            "numpad_*", "numpad_/", "numpad_.", "lights_mon_up", "lights_mon_down",
-                            "lights_kbd_toggle", "lights_kbd_up", "lights_kbd_down", "a", "b", "c", "d", "e",
-                            "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u",
-                            "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
+                          "type": "string",
+                          "enum": [
+                            [
+                              "backspace", "delete", "enter", "tab", "escape", "up", "down", "right", "left",
+                              "home", "end", "pageup", "pagedown", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
+                              "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19",
+                              "f20", "f21", "f22", "f23", "f24", "capslock", "command", "alt", "right_alt",
+                              "control", "left_control", "right_control", "shift", "right_shift", "space",
+                              "printscreen", "insert", "menu", "audio_mute", "audio_vol_down", "audio_vol_up",
+                              "audio_play", "audio_stop", "audio_pause", "audio_prev", "audio_next",
+                              "audio_rewind", "audio_forward", "audio_repeat", "audio_random", "numpad_lock",
+                              "numpad_0", "numpad_1", "numpad_2", "numpad_3", "numpad_4", "numpad_5",
+                              "numpad_6", "numpad_7", "numpad_8", "numpad_9", "numpad_+", "numpad_-",
+                              "numpad_*", "numpad_/", "numpad_.", "lights_mon_up", "lights_mon_down",
+                              "lights_kbd_toggle", "lights_kbd_up", "lights_kbd_down", "a", "b", "c", "d", "e",
+                              "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u",
+                              "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
+                            ]
                           ]
-                        ]
+                        }
                       }
                     },
                     "required": [