testdriverai 4.2.0-test.1 → 4.2.0-test.2

package/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

package/.github/workflows/test_interp.yml

@@ -3,7 +3,7 @@ name: Example Todo App
 
 on:
   push:
-    branches: ["main", "alexrowe/test-interp"]
+    branches: ["main"]
   pull_request:
   workflow_dispatch:
 

package/agent.js

@@ -898,10 +898,10 @@ let run = async (file, shouldSave = false, shouldExit = true) => {
     await exit(true);
   }
 
-  console.log(yml)
-  console.log(process.env)
+  let interpolationVars = JSON.parse(process.env["TD_INTERPOLATION_VARS"] || '{}');
+
   // Inject environment variables into any ${VAR} strings
-  yml = parser.interpolate(yml, process.env);
+  yml = parser.interpolate(yml, interpolationVars);
 
   console.log(yml)
   let ymlObj = null;

package/electron/overlay.html

@@ -246,7 +246,7 @@
       screenshotElement.classList.add('screenshot');
       setTimeout(() => {
         container.style.opacity = 1
-      }, 300)
+      }, 2000)
     });
 
     ipcRenderer.on(events.mouseClick,
@@ -305,4 +305,4 @@
   </script>
 </body>
 
-</html>
+</html>

package/lib/system.js

@@ -2,12 +2,11 @@
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-const screenshot = require("screenshot-desktop");
 const si = require("systeminformation");
-const activeWindow = require("active-win");
 const robot = require("robotjs");
 const sharp = require("sharp");
 const { emitter, events } = require("./events.js");
+const { Monitor } = require("node-screenshots");
 
 let primaryDisplay = null;
 
@@ -48,7 +47,11 @@ const captureAndResize = async (scale = 1, silent = false, mouse = false) => {
     let step1 = tmpFilename();
     let step2 = tmpFilename();
 
-    await screenshot({ filename: step1, format: "png" });
+    const monitors = Monitor.all();
+    const primaryMonitor = monitors.find(monitor => monitor.isPrimary);
+    const image = await primaryMonitor.captureImage(); // Capture the image asynchronously
+    const buffer = await image.toPng(); // Convert the image to PNG format
+    fs.writeFileSync(step1, buffer); // Save the image to a file
 
     // Fetch the mouse position
     const mousePos = robot.getMousePos();
@@ -111,9 +114,25 @@ const platform = () => {
   return platform;
 };
 
+// Import get-windows using dynamic import for ES module compatibility
+let activeWindowFn = null;
+const initializeActiveWindow = async () => {
+  if (!activeWindowFn) {
+    const { activeWindow } = await import('get-windows');
+    activeWindowFn = activeWindow;
+  }
+  return activeWindowFn;
+};
+
 // this is the focused window
 const activeWin = async () => {
-  return await activeWindow();
+  try {
+    const activeWindow = await initializeActiveWindow();
+    return await activeWindow();
+  } catch (error) {
+    console.error('Error getting active window:', error);
+    return null;
+  }
 };
 
 const getMousePosition = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "4.2.0-test.1",
+  "version": "4.2.0-test.2",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "index.js",
   "bin": {
@@ -17,7 +17,6 @@
   "license": "ISC",
   "dependencies": {
     "@electerm/strip-ansi": "^1.0.0",
-    "active-win": "^8.2.1",
     "axios": "^1.7.7",
     "chalk": "^4.1.2",
     "cli-progress": "^3.12.0",
@@ -25,6 +24,7 @@
     "decompress": "^4.2.1",
     "dotenv": "^16.4.5",
     "electron": "^33.0.2",
+    "get-windows": "^9.2.0",
     "jimp": "^0.22.12",
     "js-yaml": "^4.1.0",
     "mac-screen-capture-permissions": "^2.1.0",
@@ -34,14 +34,13 @@
     "marky": "^1.2.5",
     "node-ipc": "^12.0.0",
     "node-notifier": "^10.0.1",
+    "node-screenshots": "0.2.1",
     "odiff-bin": "^3.1.2",
     "prompts": "^2.4.2",
     "remark-parse": "^11.0.0",
-    "rimraf": "^5.0.5",
     "robotjs": "^0.6.0",
     "sanitize-filename": "^1.6.3",
     "say": "^0.16.0",
-    "screenshot-desktop": "^1.15.0",
     "semver": "^7.6.2",
     "sharp": "^0.33.5",
     "systeminformation": "^5.23.5",
@@ -49,16 +48,19 @@
     "uuid": "^10.0.0",
     "winston": "^3.13.0"
   },
+  "overrides": {
+    "glob": "^11.0.1",
+    "rimraf": "^5.0.10"
+  },
   "devDependencies": {
     "@eslint/js": "^9.10.0",
+    "chai": "^5.1.2",
     "esbuild": "0.20.2",
     "esbuild-plugin-fileloc": "^0.0.6",
     "eslint": "^9.10.0",
     "globals": "^15.9.0",
-    "node-addon-api": "^8.0.0",
-    "node-gyp": "^10.1.0",
     "mocha": "^10.8.2",
-    "chai": "^5.1.2",
+    "node-addon-api": "^8.0.0",
     "prettier": "3.3.3"
   },
   "optionalDependencies": {