testdriverai 4.1.9 → 4.1.11

package/agent.js

@@ -646,6 +646,8 @@ const firstPrompt = async () => {
   // notice that the AI is only called if the input is not a command
   rl.on("line", async (input) => {
     if (!isInteractive) return;
+    if (!input.trim().length) return promptUser();
+
     emitter.emit(events.interactive, false);
     await setTerminalApp();
     // setTerminalWindowTransparency(true);
@@ -936,6 +938,7 @@ const promptUser = () => {
 };
 
 const setTerminalApp = async () => {
+  if (terminalApp) return;
   let win = await system.activeWin();
   if (process.platform === "win32") {
     terminalApp = win?.title || "";

package/electron/overlay.html

@@ -151,10 +151,10 @@
 
     #terminal-wrapper {
       position: absolute;
-      left: calc(100vw - 800px);
+      left: calc(100vw - 700px);
       top: 0px;
       height: 100vh;
-      width: 800px;
+      width: 700px;
       background: black;
       opacity: 0;
       z-index: -1;
@@ -228,12 +228,18 @@
 
 
     ipcRenderer.on(events.screenCapture.start, (event, data) => {
+      if (data?.silent) return
       // Hide everything whlie the app takes the screenshot
-
       container.style.opacity = 0;
     });
 
+    ipcRenderer.on(events.screenCapture.error, (event, data) => {
+      if (data?.silent) return
+      container.style.opacity = 1
+    });
+
     ipcRenderer.on(events.screenCapture.end, (event, data) => {
+      if (data?.silent) return
       screenshotElement.classList.remove('screenshot');
       // Force reflow
       void screenshotElement.offsetWidth;
@@ -299,4 +305,4 @@
   </script>
 </body>
 
-</html>
+</html>

package/lib/redraw.js

@@ -7,14 +7,17 @@ const { compare } = require("odiff-bin");
 const si = require('systeminformation');
 const chalk = require('chalk');
 
-const networkCooldownMs = 5000;
 const redrawThresholdPercent = 3;
+const networkUpdateInterval = 2000;
 
 let lastTxBytes = null;
 let lastRxBytes = null;
+
+let diffRxBytes = 0;
+let diffTxBytes = 0;
+
 let measurements = [];
 let networkSettled = true;
-let lastUnsettled = null;
 let screenHasRedrawn = null;
 
 async function resetState() {
@@ -22,7 +25,6 @@ async function resetState() {
   lastRxBytes = null;
   measurements = [];
   networkSettled = true;
-  lastUnsettled = null;
   screenHasRedrawn = false;
 }
 
@@ -31,8 +33,8 @@ async function updateNetwork() {
       let thisRxBytes = data[0].rx_bytes;
       let thisTxBytes = data[0].tx_bytes;
   
-      let diffRxBytes = lastRxBytes !== null ? thisRxBytes - lastRxBytes : 0;
-      let diffTxBytes = lastTxBytes !== null ? thisTxBytes - lastTxBytes : 0;
+      diffRxBytes = lastRxBytes !== null ? thisRxBytes - lastRxBytes : 0;
+      diffTxBytes = lastTxBytes !== null ? thisTxBytes - lastTxBytes : 0;
   
       lastRxBytes = thisRxBytes;
       lastTxBytes = thisTxBytes;
@@ -52,20 +54,11 @@ async function updateNetwork() {
       let zIndexRx = stdDevRx !== 0 ? (diffRxBytes - avgRx) / stdDevRx : 0;
       let zIndexTx = stdDevTx !== 0 ? (diffTxBytes - avgTx) / stdDevTx : 0;
   
-      // log time since unsettlement
-  
-      if ((new Date().getTime() - lastUnsettled) < networkCooldownMs) {
-        networkSettled = false;
+      // log time since unsettlement 
+      if ((zIndexRx < 0 && zIndexTx < 0) ) {
+        networkSettled = true;
       } else {
-        
-        if ((zIndexRx < 0 && zIndexTx < 0) ) {
-          lastUnsettled = null;
-          networkSettled = true;
-        } else {
-          lastUnsettled = new Date().getTime();
-          networkSettled = false;
-        }
-  
+        networkSettled = false;
       }
     
       if (process.env["DEV"]) {
@@ -125,11 +118,11 @@ async function checkCondition(resolve, startTime, timeoutMs) {
   if (!screenHasRedrawn) {
     diffPercent = await imageDiffPercent(startImage, nowImage);
     screenHasRedrawn = diffPercent > redrawThresholdPercent;
-  }
-
+  };
+  
   // // log redraw as output
   let redrawText = screenHasRedrawn ? chalk.green(`y`) : chalk.dim(`${diffPercent}/${redrawThresholdPercent}%`);
-  let networkText = networkSettled ? chalk.green(`y`) : chalk.dim(`${Math.floor((networkCooldownMs - (Date.now() - lastUnsettled)) / 1000)}/${Math.floor(networkCooldownMs/1000)}s`);
+  let networkText = networkSettled ? chalk.green(`y`) : chalk.dim(`${Math.trunc((diffRxBytes + diffTxBytes) / networkUpdateInterval)}b/s`);
   let timeoutText = isTimeout ?  chalk.green(`y`) : chalk.dim(`${Math.floor((timeElapsed)/1000)}/${(timeoutMs / 1000)}s`);
 
   console.log(`   `, chalk.dim('redraw='), redrawText, chalk.dim('network='), networkText, chalk.dim('timeout='), timeoutText);
@@ -150,6 +143,6 @@ function wait(timeoutMs) {
   });
 }
 
-setInterval(updateNetwork, 2000);
+setInterval(updateNetwork, networkUpdateInterval);
 
 module.exports = { start, wait };

package/lib/sdk.js

@@ -128,9 +128,12 @@ const req = async (path, data, onChunk) => {
     if (onChunk) {
       result = "";
       let lastLineIndex = -1;
-      const reader = response.body.getReader();
+      const reader = response.clone().body.getReader();
       while (true) {
-        const { done, value } = await reader.read();
+        const { done, value } = await reader.read().catch((err) => {
+          console.error("Body read failed with error:", err);
+          return { done: true };
+        });
         if (done) {
           break;
         }
@@ -165,7 +168,14 @@ const req = async (path, data, onChunk) => {
       }
     }
 
-    return parseBody(response, result);
+    const value = await parseBody(response, result);
+    if (!value) {
+      throw new Error("Unexpected empty response body");
+    }
+    if (!path.includes("analytics") && !("data" in value)) {
+      throw new Error("Missing data property in response body");
+    }
+    return value;
   } catch (error) {
     await outputError(error);
   }

package/lib/system.js

@@ -38,6 +38,7 @@ const captureAndResize = async (scale = 1, silent = false) => {
     if (!silent) {
       emitter.emit(events.screenCapture.start, {
         scale,
+        silent,
         display: primaryDisplay,
       });
     }
@@ -66,21 +67,21 @@ const captureAndResize = async (scale = 1, silent = false) => {
       // composite the mouse image ontop
       .composite([{ input: cursorPath, left: mousePos.x, top: mousePos.y }])
       .toFile(step2);
-    if (!silent) {
-      emitter.emit(events.screenCapture.end, {
-        scale,
-        display: primaryDisplay,
-      });
-    }
+
+    emitter.emit(events.screenCapture.end, {
+      scale,
+      silent,
+      display: primaryDisplay,
+    });
+
     return step2;
   } catch (error) {
-    if (!silent) {
-      emitter.emit(events.screenCapture.error, {
-        error,
-        scale,
-        display: primaryDisplay,
-      });
-    }
+    emitter.emit(events.screenCapture.error, {
+      error,
+      scale,
+      silent,
+      display: primaryDisplay,
+    });
     throw error;
   }
 };

package/package.json

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