testdriverai 5.1.0 → 5.1.2

package/agent.js

@@ -31,7 +31,7 @@ const sanitizeFilename = require("sanitize-filename");
 const macScreenPerms = require("mac-screen-capture-permissions");
 
 // local modules
-const wss = require("./lib/websockets.js");
+const websocketserver = require("./lib/websockets.js");
 const speak = require("./lib/speak.js");
 const analytics = require("./lib/analytics.js");
 const log = require("./lib/logger.js");
@@ -63,6 +63,7 @@ let checkCount = 0;
 let checkLimit = 7;
 let lastScreenshot = null;
 let rl;
+let wss; 
 
 // list of prompts that the user has given us
 let tasks = [];
@@ -691,6 +692,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", {
@@ -817,7 +838,7 @@ const firstPrompt = async () => {
 
   rl.on("line", handleInput);
 
-  wss.addEventListener("input", async (message) => {
+  config.TD_VM && wss.addEventListener("input", async (message) => {
     handleInput(message.data);
   });
 
@@ -1061,7 +1082,7 @@ ${yaml.dump(step)}
 };
 
 const promptUser = () => {
-  wss.sendToClients("done");
+  config.TD_VM && wss.sendToClients("done");
   emitter.emit(events.interactive, true);
   rl.prompt(true);
 };
@@ -1122,6 +1143,16 @@ const embed = async (file, depth) => {
   logger.info(`${file} (end)`);
 };
 
+const buildEnv = async () => {
+  let win = await system.activeWin();
+  if (config.TD_VM) {
+    wss = websocketserver.create();
+  }
+  setTerminalApp(win);
+  await ensureMacScreenPerms();
+  await makeSandbox();
+}
+
 const start = async () => {
   // logger.info(await  system.getPrimaryDisplay());
 
@@ -1135,28 +1166,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 +1185,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

@@ -10,11 +10,9 @@ if (process.argv[2] === "--help" || process.argv[2] === "-h") {
 }
 
 (async () => {
-  let win = await system.activeWin();
 
   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)

package/lib/logger.js

@@ -10,6 +10,7 @@ const shouldLog =
 // responsible for rendering ai markdown output
 const { marked } = require("marked");
 const { markedTerminal } = require("marked-terminal");
+const { config } = require("dotenv");
 
 const { printf } = winston.format;
 
@@ -19,6 +20,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)) {
 
@@ -77,7 +85,9 @@ const createMarkdownStreamLogger = () => {
         return;
       }        
       
-      websockets.sendToClients("output", chunk);
+      if (config.TD_VM) {
+        websockets.sendToClients("output", chunk);
+      }
 
       const previousConsoleOutput = markedParsePartial(buffer, 0, -1);
 

package/lib/speak.js

@@ -6,7 +6,6 @@ const websockets = require("./websockets");
 module.exports = (message) => {
   if (config["TD_SPEAK"]) {
     say.stop();
-    // websockets.sendToClients("output", message);  
     if (process.platform === "darwin") {
       say.speak(message, "Fred", 1.2);
     } else {

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/lib/websockets.js

@@ -1,7 +1,10 @@
 const WebSocket = require('ws');
+const config = require('./config');
 
+let instance;
 class WebSocketServerSingleton {
   constructor() {
+
     if (!WebSocketServerSingleton.instance) {
       this.wss = new WebSocket.Server({ port: 8080 }, () => {
       });
@@ -72,7 +75,11 @@ class WebSocketServerSingleton {
   }
 }
 
-const instance = new WebSocketServerSingleton();
-Object.freeze(instance);
 
-module.exports = instance;
+module.exports = {
+  create: () => {
+    instance = new WebSocketServerSingleton();
+    Object.freeze(instance);  
+    return instance;
+  }
+};

package/package.json

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