testdriverai 4.0.70 → 4.0.72

package/README.md

@@ -1,4 +1,4 @@
-![TestDriver.ai](https://github.com/dashcamio/testdriver/assets/318295/2a0ad981-8504-46f0-ad97-60cb6c26f1e7)
+<a href="https://testdriver.ai"><img src="https://github.com/dashcamio/testdriver/assets/318295/2a0ad981-8504-46f0-ad97-60cb6c26f1e7"/></a>
 
 # TestDriver.ai
 
@@ -8,6 +8,10 @@ Next generation autonomous AI agent for end-to-end testing of web & desktop
 
 ---
 
+```sh
+npm install testdriverai -g
+```
+
 TestDriver isn't like any test framework you've used before. TestDriver is an OS Agent for QA. TestDriver uses AI vision along with mouse and keyboard emulation to control the entire desktop. It's more like a QA employee than a test framework. This kind of black-box testing has some major advantages:
 
 - **Easier set up:** No need to add test IDs or craft complex selectors

package/index.js

@@ -459,14 +459,18 @@ const humanInput = async (currentTask, validateAndLoop = false) => {
   log.log("info", "");
 
   let image = await system.captureScreenBase64();
-  let message = await sdk.req("input", {
-    input: currentTask,
-    mousePosition: await system.getMousePosition(),
-    activeWindow: await system.activeWin(),
-    image,
-  });
-
-  log.prettyMarkdown(message);
+  const mdStream = log.createMarkdownStreamLogger();
+  let message = await sdk.req(
+    "input",
+    {
+      input: currentTask,
+      mousePosition: await system.getMousePosition(),
+      activeWindow: await system.activeWin(),
+      image,
+    },
+    (chunk) => mdStream.log(chunk),
+  );
+  mdStream.end();
 
   await aiExecute(message, validateAndLoop);
 
@@ -486,15 +490,19 @@ const generate = async (type, count) => {
   log.log("info", "");
 
   let image = await system.captureScreenBase64();
-  let message = await sdk.req("generate", {
-    type,
-    image,
-    mousePosition: await system.getMousePosition(),
-    activeWindow: await system.activeWin(),
-    count,
-  });
-
-  log.prettyMarkdown(message);
+  const mdStream = log.createMarkdownStreamLogger();
+  let message = await sdk.req(
+    "generate",
+    {
+      type,
+      image,
+      mousePosition: await system.getMousePosition(),
+      activeWindow: await system.activeWin(),
+      count,
+    },
+    (chunk) => mdStream.log(chunk),
+  );
+  mdStream.end();
 
   let testPrompts = await parser.findGenerativePrompts(message);
 
@@ -743,11 +751,17 @@ let summarize = async (error = null) => {
 
   log.log("info", chalk.dim("summarizing..."), true);
 
-  let reply = await sdk.req("summarize", {
-    image,
-    error: error?.toString(),
-    tasks,
-  });
+  const mdStream = log.createMarkdownStreamLogger();
+  let reply = await sdk.req(
+    "summarize",
+    {
+      image,
+      error: error?.toString(),
+      tasks,
+    },
+    (chunk) => mdStream.log(chunk),
+  );
+  mdStream.end();
 
   let resultFile = "/tmp/oiResult.log.log";
   if (process.platform === "win32") {
@@ -755,8 +769,6 @@ let summarize = async (error = null) => {
   }
   // write reply to /tmp/oiResult.log.log
   fs.writeFileSync(resultFile, reply);
-
-  log.prettyMarkdown(reply);
 };
 
 // this function is responsible for saving the regression test script to a file
@@ -801,7 +813,6 @@ ${regression}
 // it parses the markdown file and executes the codeblocks exactly as if they were
 // generated by the AI in a single prompt
 let run = async (file, overwrite = false, shouldExit = true) => {
-
   // parse potential string value for exit
   shouldExit = shouldExit === "false" ? false : true;
   overwrite = overwrite === "false" ? false : true;
@@ -883,7 +894,6 @@ ${yaml.dump(step)}
     await summarize();
     await exit(false);
   }
-
 };
 
 const promptUser = () => {

package/lib/commands.js

@@ -237,23 +237,27 @@ let commands = {
     log("info", "");
     log("info", chalk.dim("thinking..."), true);
 
-    let response = await sdk.req("hover/text", {
-      needle: text,
-      method,
-      image: await captureScreenBase64(),
-      intent: action,
-      button,
-      clickType,
-      description,
-      displayMultiple: 1,
-    });
+    const mdStream = logger.createMarkdownStreamLogger();
+    let response = await sdk.req(
+      "hover/text",
+      {
+        needle: text,
+        method,
+        image: await captureScreenBase64(),
+        intent: action,
+        button,
+        clickType,
+        description,
+        displayMultiple: 1,
+      },
+      (chunk) => mdStream.log(chunk),
+    );
+    mdStream.end();
 
-    if (!response.data) {
+    if (!response) {
       throw new AiError("No text on screen matches description", true);
     } else {
-      log("info", "");
-      logger.prettyMarkdown(response.data);
-      return response.data;
+      return response;
     }
   },
   // uses our api to find all images on screen

package/lib/init.js

@@ -1,18 +1,18 @@
 const decompress = require("decompress");
 const prompts = require("prompts");
 const path = require("path");
-const axios = require("axios");
 const fs = require("fs");
 const isValidVersion = require("./valid-version");
 const os = require("os");
 const chalk = require("chalk");
+const { Readable } = require("stream");
 
 async function getLatestRelease(owner, repo) {
   try {
-    const response = await axios.get(
+    const response = await fetch(
       `https://api.github.com/repos/${owner}/${repo}/releases`,
     );
-    const releases = response.data;
+    const releases = await response.json();
 
     // Filter releases that are less than or equal to the version in package.json
     const validReleases = releases.filter((release) => {
@@ -25,11 +25,7 @@ async function getLatestRelease(owner, repo) {
 
       // Download the source code
       const sourceUrl = latestRelease.tarball_url;
-      const downloadResponse = await axios({
-        url: sourceUrl,
-        method: "GET",
-        responseType: "stream",
-      });
+      const downloadResponse = await fetch(sourceUrl);
 
       const tmpDir = os.tmpdir();
       const path2 = path.join(
@@ -37,9 +33,12 @@ async function getLatestRelease(owner, repo) {
         `${repo}-${latestRelease.tag_name}.tar.gz`,
       );
       const dest = fs.createWriteStream(path2);
-      downloadResponse.data.pipe(dest);
 
       return new Promise((resolve, reject) => {
+        Readable.fromWeb(downloadResponse.body).pipe(dest, {
+          end: true,
+        });
+
         dest.on("finish", () => {
           resolve(path2);
         });

package/lib/logger.js

@@ -32,6 +32,50 @@ marked.use(
 
 const spaceChar = "    ";
 
+const markedParsePartial = (markdown, start = 0, end = 0) => {
+  let result = marked
+    .parse(markdown)
+    .replace(/^/gm, spaceChar)
+    .trimEnd()
+    .split("\n");
+
+  if (end <= 0) {
+    end = result.length + end;
+  }
+  return result.slice(start, end).join("\n");
+};
+
+const createMarkdownStreamLogger = () => {
+  let buffer = "";
+  return {
+    log: (chunk) => {
+      if (typeof chunk !== "string") {
+        log("error", "markdownStreamLogger's log method requires a string");
+        log("error", chunk);
+        return;
+      }
+
+      const previousConsoleOutput = markedParsePartial(buffer, 0, -1);
+
+      buffer += chunk;
+
+      const consoleOutput = markedParsePartial(buffer, 0, -1);
+
+      process.stdout.write(consoleOutput.replace(previousConsoleOutput, ""));
+    },
+    end() {
+      const previousConsoleOutput = markedParsePartial(buffer, 0, -1);
+
+      const consoleOutput = markedParsePartial(buffer);
+
+      process.stdout.write(consoleOutput.replace(previousConsoleOutput, ""));
+      process.stdout.write("\n\n");
+      buffer = "";
+      log("silly", consoleOutput);
+    },
+  };
+};
+
 const prettyMarkdown = (markdown) => {
   if (typeof markdown !== "string") {
     log("error", "prettyMarkdown requires a string");
@@ -100,6 +144,7 @@ let loggy = {
   log,
   setDepth,
   prettyMarkdown,
+  createMarkdownStreamLogger,
 };
 
 module.exports = loggy;

package/lib/sdk.js

@@ -1,32 +1,44 @@
 const config = require("./config");
 const chalk = require("chalk");
-const axios = require("axios");
 const session = require("./session");
 const package = require("../package.json");
 const version = package.version;
 
 const root = config["TD_API_ROOT"];
+const shouldStream = config["TD_STREAM_RESPONSES"];
 
 // let token = null;
 
-let outputError = (e) => {
-  console.log(chalk.red(e.code || e.response.data.code));
+const outputError = async (error) => {
+  if (error instanceof Response) {
+    console.log(chalk.red(error.status), chalk.red(error.statusText));
+    await parseBody(error)
+      .then((body) => console.log(chalk.red(body)))
+      .catch(() => {});
+  } else {
+    console.error("Error:", error);
+  }
+};
 
-  if (e.response) {
-    console.log(
-      chalk.red(e.response?.status),
-      chalk.red(e.response?.statusText),
-    );
-    if (e.response.data) {
-      console.log(e.response.data);
-    }
-    if (e.response.data.message) {
-      console.log(e.response.data.message);
+const parseBody = async (response, body) => {
+  const contentType = response.headers.get("Content-Type")?.toLowerCase();
+  try {
+    if (body === null || body === undefined) {
+      if (!contentType.includes("json") && !contentType.includes("text")) {
+        return await response.arrayBuffer();
+      }
+      if (contentType.includes("json")) {
+        return await response.json();
+      }
+      return await response.text();
     }
-    if (e.response.data.problems) {
-      console.log("-----");
-      console.log(e.response.data.problems.join("\n"));
+    if (typeof body === "string" && contentType.includes("json")) {
+      return JSON.parse(body);
     }
+    return body;
+  } catch (err) {
+    console.log(chalk.red("Parsing Error", err));
+    throw err;
   }
 };
 
@@ -38,10 +50,9 @@ let auth = async () => {
   //   process.exit(1);
   // }
 
-  let config = {
+  const url = [root, "auth/exchange-api-key"].join("/");
+  const config = {
     method: "post",
-    maxBodyLength: Infinity,
-    url: [root, "auth/exchange-api-key"].join("/"),
     headers: {
       "Content-Type": "application/json",
     },
@@ -49,15 +60,15 @@ let auth = async () => {
   };
 
   try {
-    await axios.request(config);
+    await fetch(url, config);
     // token = res.data.token;
-  } catch (e) {
-    outputError(e);
+  } catch (error) {
+    await outputError(error);
     process.exit(1);
   }
 };
 
-let req = async (path, data) => {
+const req = async (path, data, onChunk) => {
   // for each value of data, if it is empty remove it
   for (let key in data) {
     if (!data[key]) {
@@ -65,48 +76,54 @@ let req = async (path, data) => {
     }
   }
 
-  data.session = session.get()?.id;
-  data = JSON.stringify(data);
-
-  let dataCopy = JSON.parse(data);
-  delete dataCopy.image;
+  const url = path.startsWith("/api")
+    ? [root, path].join("")
+    : [root, "api", "v" + version, "testdriver", path].join("/");
 
-  let url = [root, "api", "v" + version, "testdriver", path].join("/");
-
-  let config = {
+  const config = {
     method: "post",
-    maxBodyLength: Infinity,
-    url,
-    headers: {
-      "Content-Type": "application/json",
-      // 'Authorization': 'Bearer ' + token @todo add-auth
-    },
-    data,
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      ...data,
+      session: session.get()?.id,
+      stream: typeof onChunk === "function",
+    }),
   };
 
-  let response;
-  let redirect = null;
   try {
-    response = await axios.request(config);
-  } catch (e) {
-    if (e.response?.status === 301) {
-      config.url = root + e.response.data;
-      redirect = config;
-    } else {
-      outputError(e);
+    const response = await fetch(url, config);
+    if (response.status === 301) {
+      const redirectUrl = await response.text();
+      return req(redirectUrl, data, onChunk);
+    }
+    if (response.status >= 300) {
+      throw response;
     }
-  }
 
-  if (redirect) {
-    response = await axios.request(redirect).catch((e) => {
-      outputError(e);
-    });
-  }
+    let result;
+    if (onChunk) {
+      result = "";
+      const reader = response.body.getReader();
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) {
+          break;
+        }
+
+        const chunk = new TextDecoder().decode(value);
+        result += chunk;
+        if (shouldStream) {
+          await onChunk(chunk);
+        }
+      }
+      if (!shouldStream) {
+        await onChunk(result);
+      }
+    }
 
-  if (!response) {
-    return;
-  } else {
-    return response.data;
+    return parseBody(response, result);
+  } catch (error) {
+    await outputError(error);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "4.0.70",
+  "version": "4.0.72",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "index.js",
   "bin": {
@@ -17,7 +17,6 @@
   "dependencies": {
     "@electerm/strip-ansi": "^1.0.0",
     "active-win": "^8.2.1",
-    "axios": "^1.6.8",
     "chalk": "^4.1.2",
     "cli-progress": "^3.12.0",
     "datadog-winston": "^1.6.0",