testdriverai 5.7.30 → 5.7.32

package/lib/commands.js

@@ -33,10 +33,7 @@ if (config.TD_VM) {
   keymap = require("./keymaps/robot.js");
 }
 
-const {
-  logger,
-  prettyMarkdown
-} = require("./logger");
+const { logger, prettyMarkdown } = require("./logger");
 const { emitter, events } = require("./events.js");
 
 const niceSeconds = (ms) => {
@@ -232,7 +229,6 @@ const scroll = async (direction = "down", amount = 300, method = "mouse") => {
 // perform a mouse click
 // click, right-click, double-click, hover
 const click = async (x, y, action = "click") => {
-
   emitter.emit(events.interactive, true);
 
   await redraw.start();
@@ -289,10 +285,8 @@ const click = async (x, y, action = "click") => {
       } else if (action === "drag-end") {
         robot.mouseToggle("up", button);
       } else {
-
         robot.mouseClick(button, double);
       }
-
     }
 
     emitter.emit(events.mouseClick, { x, y, button, click });
@@ -357,9 +351,7 @@ let commands = {
       },
       (chunk) => {
         if (chunk.type === "data" && chunk.data) {
-          
           // mdStream.log(chunk.data);
-
         } else if (chunk.type === "closeMatches") {
           emitter.emit(events.matches.show, chunk.data);
         }
@@ -421,7 +413,7 @@ let commands = {
     }
   },
   // type a string
-  type: async (string, delay = 500) => {
+  type: async (string, delay = 250) => {
     await redraw.start();
 
     string = string.toString();
@@ -442,7 +434,6 @@ let commands = {
   // press keys
   // different than `type`, becasue it can press multiple keys at once
   "press-keys": async (inputKeys) => {
-
     await redraw.start();
 
     // robotjs is finiky with key-up on modifier keys
@@ -495,10 +486,9 @@ let commands = {
 
       modsToPress.forEach((key) => {
         robot.keyToggle(key, "down");
-      })
+      });
 
       robot.keyTap(keysPressed[0], modsToPress);
-
     } else {
       await sandbox.send({ type: "press", keys: keysPressed });
     }
@@ -742,9 +732,9 @@ let commands = {
     return "The application was focused.";
   },
   remember: async (description) => {
-    let result = await sdk.req("remember", { 
+    let result = await sdk.req("remember", {
       image: await captureScreenBase64(),
-      description 
+      description,
     });
     return result.data;
   },
@@ -801,7 +791,10 @@ let commands = {
           chalk.dim(`running value of \`${plat}\` on this machine...`),
           true,
         );
-        result = await exec(windows_code, { cwd: cwd(), shell: "powershell.exe" });
+        result = await exec(windows_code, {
+          cwd: cwd(),
+          shell: "powershell.exe",
+        });
       } else if (plat == "mac") {
         logger.info(
           chalk.dim(`running value of \`${plat}\` on this machine...`),
@@ -816,15 +809,13 @@ let commands = {
           true,
         );
       } else {
-        
         if (!silent) {
           logger.info(chalk.dim(`Command output:`), true);
-          logger.info(`${result.stdout}`, true)
+          logger.info(`${result.stdout}`, true);
         }
 
         return result.stdout?.trim();
       }
-
     } else if (language == "js") {
       logger.info(chalk.dim(`running js...`), true);
 
@@ -833,23 +824,26 @@ let commands = {
         true,
       );
 
-      console.log('')
-      console.log('------');
-      
-      const context = vm.createContext({ require, console, fs, process, fetch });
+      console.log("");
+      console.log("------");
+
+      const context = vm.createContext({
+        require,
+        console,
+        fs,
+        process,
+        fetch,
+      });
+
+      scriptCode = "(async function() {\n" + scriptCode + "\n})();";
 
-      scriptCode = '(async function() {\n' + scriptCode + '\n})();';
-      
       const script = new vm.Script(scriptCode);
 
       try {
         await script.runInNewContext(context);
       } catch (e) {
         console.error(e);
-        throw new AiError(
-          `Error running script: ${e.message}`,
-          true,
-        );
+        throw new AiError(`Error running script: ${e.message}`, true);
       }
 
       // wait for context.result to resolve
@@ -862,8 +856,8 @@ let commands = {
         stepResult = stepResult.toString();
       }
 
-      console.log('------');
-      console.log('')
+      console.log("------");
+      console.log("");
 
       if (!stepResult) {
         logger.info(`No result returned from script`, true);

package/lib/sdk.js

@@ -5,14 +5,32 @@ const session = require("./session");
 // get the version from package.json
 const { version } = require("../package.json");
 const root = config["TD_API_ROOT"];
-const axios = require('axios');
+const axios = require("axios");
 
-const { logger } = require('./logger');
+const { logger } = require("./logger");
 
 let token = null;
 
-const outputError = async (error) => {
-  logger.info(chalk.red(error.status), chalk.red(error.statusText));
+const outputError = (error) => {
+  logger.error(
+    "API Error: %s (%s)",
+    chalk.red(
+      // HTTP status code from Axios
+      error.status ||
+        // ...or an explicit error `reason` set by Sails
+        error.reason ||
+        // ...or default to the error message
+        error.message,
+    ),
+    chalk.red(
+      // e.g. "teamNotExist" from Sails' exits
+      error.response?.data?.raw ||
+        // ...or the status text
+        error.statusText ||
+        // ...or the HTTP status code
+        error.code,
+    ),
+  );
 };
 
 const parseBody = async (response, body) => {
@@ -62,9 +80,7 @@ const parseBody = async (response, body) => {
 };
 
 let auth = async () => {
-
   if (config["TD_API_KEY"]) {
-
     const url = [root, "auth/exchange-api-key"].join("/");
     const c = {
       method: "post",
@@ -73,21 +89,20 @@ let auth = async () => {
       },
       data: {
         apiKey: config["TD_API_KEY"],
-        version
-      }
+        version,
+      },
     };
-  
+
     try {
       let res = await axios(url, c);
-  
+
       token = res.data.token;
       return token;
     } catch (error) {
-      await outputError(error);
+      outputError(error);
       process.exit(1);
     }
   }
-
 };
 
 const req = async (path, data, onChunk) => {
@@ -104,15 +119,15 @@ const req = async (path, data, onChunk) => {
 
   const c = {
     method: "post",
-    headers: { 
-    "Content-Type": "application/json",
-    ...(token && { "Authorization": `Bearer ${token}` }) // Add the authorization bearer token only if token is set
-    }, 
+    headers: {
+      "Content-Type": "application/json",
+      ...(token && { Authorization: `Bearer ${token}` }), // Add the authorization bearer token only if token is set
+    },
     responseType: typeof onChunk === "function" ? "stream" : "json",
     data: {
-    ...data,
-    session: session.get(),
-    stream: typeof onChunk === "function",
+      ...data,
+      session: session.get(),
+      stream: typeof onChunk === "function",
     },
   };
 
@@ -130,19 +145,17 @@ const req = async (path, data, onChunk) => {
       let lastLineIndex = -1;
 
       await new Promise((resolve, reject) => {
-
         // theres some kind of race condition here that makes things resolve
         // before the stream is done
-        
-        response.data.on('data', (chunk) => {
-      
+
+        response.data.on("data", (chunk) => {
           result += chunk.toString();
           const lines = result.split("\n");
 
           const events = lines
             .slice(lastLineIndex + 1, lines.length - 1)
             .filter((line) => line.length)
-            .map((line) => JSON.parse(line));  
+            .map((line) => JSON.parse(line));
 
           for (const event of events) {
             onChunk(event);
@@ -151,8 +164,7 @@ const req = async (path, data, onChunk) => {
           lastLineIndex = lines.length - 2;
         });
 
-        response.data.on('end', () => {
-
+        response.data.on("end", () => {
           if (isJsonl) {
             const events = result
               .split("\n")
@@ -164,11 +176,11 @@ const req = async (path, data, onChunk) => {
               onChunk(event);
             }
           }
-          
+
           resolve();
         });
 
-        response.data.on('error', (error) => {
+        response.data.on("error", (error) => {
           reject(error);
         });
       });
@@ -178,7 +190,7 @@ const req = async (path, data, onChunk) => {
 
     return value;
   } catch (error) {
-    await outputError(error);
+    outputError(error);
   }
 };
 

package/package.json

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