testdriverai 4.0.66 → 4.0.67

package/.github/workflows/format.yml

@@ -9,7 +9,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 20
-      - name: npm install 
+      - name: npm install
         run: npm install --only=dev --ignore-scripts
       - name: Run ESLint
         run: npx eslint

package/.github/workflows/npm-publish.yml

@@ -6,7 +6,7 @@ on:
 name: Publish to NPM
 jobs:
   bump_version:
-    name: 'Bump Version'
+    name: "Bump Version"
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
     steps:
@@ -23,10 +23,10 @@ jobs:
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
-      - name: 'Bump version'
+      - name: "Bump version"
         run: npm version patch -m "Bump version to %s [skip ci]"
-      
-      - name: Push changes to main 
+
+      - name: Push changes to main
         run: |
           git push https://${{ secrets.GH_TOKEN }}@github.com/testdriverai/testdriverai.git HEAD:main --force
 
@@ -43,4 +43,4 @@ jobs:
           node-version: "20"
       - uses: JS-DevTools/npm-publish@v3
         with:
-          token: ${{ secrets.NPM_AUTH_TOKEN }}
+          token: ${{ secrets.NPM_AUTH_TOKEN }}

package/index.js

@@ -1,20 +1,15 @@
 #!/usr/bin/env node
-const os = require('os');
+const os = require("os");
 
 // Get the current process ID
 const pid = process.pid;
 
 try {
-  // Display the current priority
-  console.log('Current priority:', os.getPriority(pid));
-
   // Set the priority to the highest value
   os.setPriority(pid, -20);
-
-  // Display the updated priority
-  console.log('Updated priority:', os.getPriority(pid));
+  // eslint-disable-next-line no-unused-vars
 } catch (error) {
-  console.error('Failed to set process priority:', error);
+  // console.error('Failed to set process priority:', error);
 }
 
 // disable depreciation warnings
@@ -28,7 +23,7 @@ require("./lib/profiler");
 
 const fs = require("fs");
 const readline = require("readline");
-const http = require('http');
+const http = require("http");
 
 // third party modules
 const path = require("path");
@@ -272,7 +267,6 @@ const haveAIResolveError = async (error, markdown, depth = 0, undo = false) => {
 // this checks that the task is "really done" using a screenshot of the desktop state
 // it's likely that the task will not be complete and the AI will respond with more codeblocks to execute
 const check = async () => {
-  
   checkCount++;
 
   if (checkCount >= checkLimit) {
@@ -451,7 +445,6 @@ commands:
 // this function responds to the result of `promptUser()` which is the user input
 // it kicks off the exploratory loop, which is the main function that interacts with the AI
 const humanInput = async (currentTask, validateAndLoop = false) => {
-
   lastPrompt = currentTask;
   checkCount = 0;
 
@@ -498,7 +491,7 @@ const generate = async (type, count) => {
     image,
     mousePosition: await system.getMousePosition(),
     activeWindow: await system.activeWin(),
-    count
+    count,
   });
 
   log.prettyMarkdown(message);
@@ -507,7 +500,6 @@ const generate = async (type, count) => {
 
   // for each testPrompt
   for (const testPrompt of testPrompts) {
-
     // with the contents of the testPrompt
     let fileName =
       sanitizeFilename(testPrompt.headings[0])
@@ -515,7 +507,7 @@ const generate = async (type, count) => {
         .replace(/ /g, "-")
         .toLowerCase() + ".md";
     let path1 = path.join(process.cwd(), "testdriver", "generate", fileName);
-    
+
     // create generate directory if it doesn't exist
     if (!fs.existsSync(path.join(process.cwd(), "testdriver", "generate"))) {
       fs.mkdirSync(path.join(process.cwd(), "testdriver", "generate"));
@@ -694,29 +686,31 @@ New commands will be appended.
 };
 
 let setTerminalWindowTransparency = async (hide) => {
-
   if (hide) {
-
     try {
-      http.get('http://localhost:60305/hide').on('error',function(){}).end();
+      http
+        .get("http://localhost:60305/hide")
+        .on("error", function () {})
+        .end();
     } catch (e) {
-    // Suppress error
-    console.error('Caught exception:', e);
+      // Suppress error
+      console.error("Caught exception:", e);
     }
   } else {
-
     try {
-      http.get('http://localhost:60305/hide').on('error',function(){}).end();
+      http
+        .get("http://localhost:60305/hide")
+        .on("error", function () {})
+        .end();
     } catch (e) {
-    // Suppress error
-    console.error('Caught exception:', e);
+      // Suppress error
+      console.error("Caught exception:", e);
     }
-
   }
 
   if (!config.TD_MINIMIZE) {
-    return
-  };
+    return;
+  }
 
   try {
     if (hide) {

package/lib/commander.js

@@ -6,7 +6,7 @@ const yaml = require("js-yaml");
 const speak = require("./speak");
 const notify = require("./notify");
 const analytics = require("./analytics");
-const marky = require('marky');
+const marky = require("marky");
 
 // object is a json representation of the individual yml command
 // the process turns markdown -> yml -> json -> js function execution
@@ -178,7 +178,7 @@ commands:
   }
 
   let timing = marky.stop(object.command);
-  await analytics.track("command", { data: object, depth, timing});
+  await analytics.track("command", { data: object, depth, timing });
 
   return response;
 };

package/lib/commands.js

@@ -122,7 +122,6 @@ const assert = async (assertion, shouldThrow = false, async = false) => {
   }
 
   const handleAssertResponse = (response) => {
-
     logger.prettyMarkdown(response);
 
     if (response.indexOf("The task passed") > -1) {

package/lib/focus-application.js

@@ -40,7 +40,6 @@ async function focusApplication(appName) {
 }
 
 async function hideTerminal(appName) {
-
   try {
     if (platform() == "mac") {
       return await execSync(`osascript -e '${appleScriptMin(appName)}'`);
@@ -53,7 +52,6 @@ async function hideTerminal(appName) {
 }
 
 async function showTerminal(appName) {
-
   try {
     if (platform() == "mac") {
       return await execSync(`osascript -e '${appleScriptMax(appName)}'`);
@@ -70,4 +68,3 @@ module.exports = {
   hideTerminal,
   showTerminal,
 };
-

package/lib/init.js

@@ -67,7 +67,7 @@ module.exports = async () => {
   console.log("");
   console.log("Beginning setup...");
   console.log("");
- 
+
   const response = await prompts([
     // {
     //   type: 'password',

package/lib/redraw.js

@@ -1,18 +1,30 @@
 const { captureScreenPNG } = require("./system");
 
-const Jimp = require("jimp");
-
-async function compareImages(image1Url, image2Url) {
-  const image1 = await Jimp.read(image1Url);
-  const image2 = await Jimp.read(image2Url);
-
-  // Pixel difference
-  const diff = Jimp.diff(image1, image2);
-
-  if (diff.percent < 0.15) {
+const { compare } = require("odiff-bin");
+
+async function imageIsDifferent(image1Url, image2Url) {
+  const { reason, diffPercentage, match } = await compare(
+    image1Url,
+    image2Url,
+    "/tmp/diff.png",
+    {
+      failOnLayoutDiff: false,
+      outputDiffMask: false,
+    },
+  );
+
+  if (match) {
     return false;
   } else {
-    return true;
+    if (reason === "pixel-diff") {
+      if (diffPercentage > 15) {
+        return true;
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
   }
 }
 
@@ -23,26 +35,25 @@ async function start() {
   return startImage;
 }
 
+async function checkCondition(resolve, startTime, timeoutMs) {
+  let nowImage = await captureScreenPNG();
+  let result = await imageIsDifferent(startImage, nowImage);
+
+  if (result) {
+    resolve("Condition met");
+  } else if (Date.now() - startTime >= timeoutMs) {
+    resolve("Timeout reached");
+  } else {
+    setTimeout(() => {
+      checkCondition(resolve, startTime, timeoutMs);
+    }, 250);
+  }
+}
+
 function wait(timeoutMs) {
   return new Promise((resolve) => {
     const startTime = Date.now();
-
-    async function checkCondition() {
-      let nowImage = await captureScreenPNG();
-      let result = await compareImages(startImage, nowImage);
-
-      if (result) {
-        resolve("Condition met");
-      } else if (Date.now() - startTime >= timeoutMs) {
-        resolve("Timeout reached");
-      } else {
-        setTimeout(() => {
-          checkCondition();
-        }, 200);
-      }
-    }
-
-    checkCondition();
+    checkCondition(resolve, startTime, timeoutMs);
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "4.0.66",
+  "version": "4.0.67",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "index.js",
   "bin": {
@@ -31,6 +31,7 @@
     "marked-terminal": "^7.0.0",
     "marky": "^1.2.5",
     "node-notifier": "^10.0.1",
+    "odiff-bin": "^3.1.2",
     "prompts": "^2.4.2",
     "remark-parse": "^11.0.0",
     "rimraf": "^5.0.5",