testdriverai 4.1.19 → 4.1.21

package/agent.js

@@ -295,7 +295,7 @@ const check = async () => {
   log.log("info", chalk.dim("checking..."), "testdriver");
   log.log("info", "");
 
-  let thisScreenshot = await system.captureScreenBase64();
+  let thisScreenshot = await system.captureScreenBase64(1, false, true);
   let images = [lastScreenshot, thisScreenshot];
   let mousePosition = await system.getMousePosition();
   let activeWindow = await system.activeWin();

package/lib/network.ps1

@@ -0,0 +1,18 @@
+# Get cumulative total bytes sent and received for each network interface
+$networkInterfaces = Get-WmiObject -Query "SELECT Name, BytesReceivedPerSec, BytesSentPerSec FROM Win32_PerfRawData_Tcpip_NetworkInterface"
+
+# Initialize counters
+$totalBytesSent = 0
+$totalBytesReceived = 0
+
+# Sum up the cumulative bytes sent and received for all interfaces
+foreach ($interface in $networkInterfaces) {
+    $totalBytesSent += $interface.BytesSentPerSec
+    $totalBytesReceived += $interface.BytesReceivedPerSec
+}
+
+# Calculate the overall total bytes transferred
+$totalNetworkBytes = $totalBytesSent + $totalBytesReceived
+
+# Output results in JSON format for parsing in Node.js
+Write-Output "{`"totalBytesSent`": $totalBytesSent, `"totalBytesReceived`": $totalBytesReceived, `"totalNetworkBytes`": $totalNetworkBytes}"

package/lib/redraw.js

@@ -29,40 +29,64 @@ async function resetState() {
   screenHasRedrawn = false;
 }
 
+const parseNetworkStats = (thisRxBytes,thisTxBytes) => {
+
+  diffRxBytes = lastRxBytes !== null ? thisRxBytes - lastRxBytes : 0;
+  diffTxBytes = lastTxBytes !== null ? thisTxBytes - lastTxBytes : 0;
+
+  lastRxBytes = thisRxBytes;
+  lastTxBytes = thisTxBytes;
+
+  measurements.push({ rx: diffRxBytes, tx: diffTxBytes });
+
+  if (measurements.length > 60) {
+    measurements.shift();
+  }
+
+  let avgRx = measurements.reduce((acc, m) => acc + m.rx, 0) / measurements.length;
+  let avgTx = measurements.reduce((acc, m) => acc + m.tx, 0) / measurements.length;
+
+  let stdDevRx = Math.sqrt(measurements.reduce((acc, m) => acc + Math.pow(m.rx - avgRx, 2), 0) / measurements.length);
+  let stdDevTx = Math.sqrt(measurements.reduce((acc, m) => acc + Math.pow(m.tx - avgTx, 2), 0) / measurements.length);
+
+  let zIndexRx = stdDevRx !== 0 ? (diffRxBytes - avgRx) / stdDevRx : 0;
+  let zIndexTx = stdDevTx !== 0 ? (diffTxBytes - avgTx) / stdDevTx : 0;
+
+  if ((zIndexRx < 0 && zIndexTx < 0) ) {
+    networkSettled = true;
+  } else {
+    networkSettled = false;
+  }
+}
+
 async function updateNetwork() {
-    si.networkStats().then(data => {
-      let thisRxBytes = data[0].rx_bytes;
-      let thisTxBytes = data[0].tx_bytes;
-  
-      diffRxBytes = lastRxBytes !== null ? thisRxBytes - lastRxBytes : 0;
-      diffTxBytes = lastTxBytes !== null ? thisTxBytes - lastTxBytes : 0;
-  
-      lastRxBytes = thisRxBytes;
-      lastTxBytes = thisTxBytes;
-  
-      measurements.push({ rx: diffRxBytes, tx: diffTxBytes });
-  
-      if (measurements.length > 60) {
-        measurements.shift();
+
+  const { exec } = require('child_process');
+  const scriptPath = path.join(__dirname, "network.ps1");
+  if (os.platform() === 'win32') {
+    exec(`powershell -File ${scriptPath}`, (error, stdout, stderr) => {
+      if (error) {
+        console.error(`Error executing PowerShell script: ${error}`);
+        return;
       }
-  
-      let avgRx = measurements.reduce((acc, m) => acc + m.rx, 0) / measurements.length;
-      let avgTx = measurements.reduce((acc, m) => acc + m.tx, 0) / measurements.length;
-  
-      let stdDevRx = Math.sqrt(measurements.reduce((acc, m) => acc + Math.pow(m.rx - avgRx, 2), 0) / measurements.length);
-      let stdDevTx = Math.sqrt(measurements.reduce((acc, m) => acc + Math.pow(m.tx - avgTx, 2), 0) / measurements.length);
-  
-      let zIndexRx = stdDevRx !== 0 ? (diffRxBytes - avgRx) / stdDevRx : 0;
-      let zIndexTx = stdDevTx !== 0 ? (diffTxBytes - avgTx) / stdDevTx : 0;
-  
-      // log time since unsettlement 
-      if ((zIndexRx < 0 && zIndexTx < 0) ) {
-        networkSettled = true;
-      } else {
-        networkSettled = false;
+      if (stderr) {
+        console.error(`PowerShell error: ${stderr}`);
+        return;
       }
-  
+      
+      try {
+        // Parse the JSON output
+        const result = JSON.parse(stdout.trim());
+        parseNetworkStats(result.totalBytesReceived, result.totalBytesSent);
+      } catch (parseError) {
+        console.error(`Error parsing JSON: ${parseError}`);
+      }
+    });
+  } else if (os.platform() === 'darwin') {
+    si.networkStats().then(data => {
+      parseNetworkStats(data[0].rx_bytes, data[0].tx_bytes);
     });
+  }
 }
 
 async function imageDiffPercent(image1Url, image2Url) {
@@ -134,11 +158,6 @@ function wait(timeoutMs) {
   });
 }
 
-(async () => {
-  if (os.platform() === 'win32') {
-    si.powerShellStart();
-  }
-  setInterval(updateNetwork, networkUpdateInterval);
-})();
+setInterval(updateNetwork, networkUpdateInterval);
 
 module.exports = { start, wait };

package/lib/system.js

@@ -32,7 +32,7 @@ const tmpFilename = () => {
   return path.join(os.tmpdir(), `${new Date().getTime() + Math.random()}.png`);
 };
 
-const captureAndResize = async (scale = 1, silent = false) => {
+const captureAndResize = async (scale = 1, silent = false, mouse = false) => {
   try {
     const primaryDisplay = await getPrimaryDisplay();
     if (!silent) {
@@ -55,14 +55,17 @@ const captureAndResize = async (scale = 1, silent = false) => {
     const cursorPath = path.join(__dirname, "resources", "cursor.png");
 
     // resize to 1:1 px ratio
-    await sharp(step1)
-      .resize(
-        Math.floor(primaryDisplay.currentResX * scale),
-        Math.floor(primaryDisplay.currentResY * scale),
-      )
+    const sharpInstance = sharp(step1).resize(
+      Math.floor(primaryDisplay.currentResX * scale),
+      Math.floor(primaryDisplay.currentResY * scale),
+    );
+
+    if (mouse) {
       // composite the mouse image ontop
-      .composite([{ input: cursorPath, left: mousePos.x, top: mousePos.y }])
-      .toFile(step2);
+      sharpInstance.composite([{ input: cursorPath, left: mousePos.x, top: mousePos.y }]);
+    }
+
+    await sharpInstance.toFile(step2);
 
     emitter.emit(events.screenCapture.end, {
       scale,
@@ -83,13 +86,13 @@ const captureAndResize = async (scale = 1, silent = false) => {
 };
 
 // our handy screenshot function
-const captureScreenBase64 = async (scale = 1, silent = false) => {
-  let step2 = await captureAndResize(scale, silent);
+const captureScreenBase64 = async (scale = 1, silent = false, mouse = false) => {
+  let step2 = await captureAndResize(scale, silent, mouse);
   return fs.readFileSync(step2, "base64");
 };
 
-const captureScreenPNG = async (scale = 1, silent = false) => {
-  return await captureAndResize(scale, silent);
+const captureScreenPNG = async (scale = 1, silent = false, mouse = false) => {
+  return await captureAndResize(scale, silent, mouse);
 };
 
 const platform = () => {

package/package.json

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