testdriverai 6.1.10 → 6.2.1

package/agent/index.js

@@ -1776,15 +1776,24 @@ ${regression}
       return this.createNewSandbox();
     });
 
-    this.saveLastSandboxId(newSandbox.sandbox.instanceId);
-    let instance = await this.connectToSandboxDirect(
-      newSandbox.sandbox.instanceId,
-      true, // always persist by default
-    );
-    this.instance = instance;
-    await this.renderSandbox(instance, headless);
+    console.log("New sandbox created:", newSandbox);
+
+    let data = {
+      resolution: this.config.TD_RESOLUTION,
+      url: newSandbox.url,
+    };
+
+    const encodedData = Buffer.from(JSON.stringify(data)).toString('base64');
+
+    // Use the debugger URL instead of the VNC URL
+    const urlToOpen = `${this.debuggerUrl}?data=${encodedData}`;
+
+    this.emitter.emit(events.showWindow, urlToOpen);
+
     await this.newSession();
     await this.runLifecycle("provision");
+
+    console.log("provision run");
   }
 
   async start() {
@@ -1963,6 +1972,7 @@ Please check your network connection, TD_API_KEY, or the service status.`,
   async createNewSandbox() {
     const sandboxConfig = {
       type: "create",
+      os: "linux",
       resolution: this.config.TD_RESOLUTION,
       ci: this.config.CI,
     };
@@ -1975,7 +1985,12 @@ Please check your network connection, TD_API_KEY, or the service status.`,
       sandboxConfig.instanceType = this.sandboxInstance;
     }
 
+    console.log("sending create");
+
     let instance = await this.sandbox.send(sandboxConfig);
+
+    console.log("instance created", instance);
+
     return instance;
   }
 

package/agent/lib/commands.js

@@ -241,17 +241,31 @@ const createCommands = (
     switch (direction) {
       case "up":
         if (method === "mouse") {
-          await sandbox.send({ type: "scroll", amount, direction });
+          await sandbox.send({
+            os: "linux",
+            type: "scroll",
+            amount,
+            direction,
+          });
         } else {
-          await sandbox.send({ type: "press", keys: ["pageup"] });
+          await sandbox.send({ os: "linux", type: "press", keys: ["pageup"] });
         }
         await redraw.wait(2500);
         break;
       case "down":
         if (method === "mouse") {
-          await sandbox.send({ type: "scroll", amount, direction });
+          await sandbox.send({
+            os: "linux",
+            type: "scroll",
+            amount,
+            direction,
+          });
         } else {
-          await sandbox.send({ type: "press", keys: ["pagedown"] });
+          await sandbox.send({
+            os: "linux",
+            type: "press",
+            keys: ["pagedown"],
+          });
         }
         await redraw.wait(2500);
         break;
@@ -298,7 +312,7 @@ const createCommands = (
     x = parseInt(x);
     y = parseInt(y);
 
-    await sandbox.send({ type: "moveMouse", x, y });
+    await sandbox.send({ os: "linux", type: "moveMouse", x, y });
 
     emitter.emit(events.mouseMove, { x, y });
 
@@ -306,17 +320,21 @@ const createCommands = (
 
     if (action !== "hover") {
       if (action === "click" || action === "left-click") {
-        await sandbox.send({ type: "leftClick" });
+        await sandbox.send({ os: "linux", type: "leftClick" });
       } else if (action === "right-click") {
-        await sandbox.send({ type: "rightClick" });
+        await sandbox.send({ os: "linux", type: "rightClick" });
       } else if (action === "middle-click") {
-        await sandbox.send({ type: "middleClick" });
+        await sandbox.send({ os: "linux", type: "middleClick" });
       } else if (action === "double-click") {
-        await sandbox.send({ type: "doubleClick" });
+        await sandbox.send({ os: "linux", type: "doubleClick" });
       } else if (action === "drag-start") {
-        await sandbox.send({ type: "mousePress", button: "left" });
+        await sandbox.send({ os: "linux", type: "mousePress", button: "left" });
       } else if (action === "drag-end") {
-        await sandbox.send({ type: "mouseRelease", button: "left" });
+        await sandbox.send({
+          os: "linux",
+          type: "mouseRelease",
+          button: "left",
+        });
       }
 
       emitter.emit(events.mouseClick, { x, y, button, click, double });
@@ -333,7 +351,7 @@ const createCommands = (
     x = parseInt(x);
     y = parseInt(y);
 
-    await sandbox.send({ type: "moveMouse", x, y });
+    await sandbox.send({ os: "linux", type: "moveMouse", x, y });
 
     await redraw.wait(2500);
 
@@ -438,12 +456,13 @@ const createCommands = (
       return true;
     },
     // type a string
+    os: "linux",
     type: async (string, delay = 250) => {
       await redraw.start();
 
       string = string.toString();
 
-      await sandbox.send({ type: "write", text: string, delay });
+      await sandbox.send({ os: "linux", type: "write", text: string, delay });
       await redraw.wait(5000);
       return;
     },
@@ -453,7 +472,7 @@ const createCommands = (
       await redraw.start();
 
       // finally, press the keys
-      await sandbox.send({ type: "press", keys: inputKeys });
+      await sandbox.send({ os: "linux", type: "press", keys: inputKeys });
 
       await redraw.wait(5000);
 
@@ -592,11 +611,15 @@ const createCommands = (
 
       if (method === "keyboard") {
         try {
-          await sandbox.send({ type: "press", keys: ["f", "ctrl"] });
+          await sandbox.send({
+            os: "linux",
+            type: "press",
+            keys: ["f", "ctrl"],
+          });
           await delay(1000);
-          await sandbox.send({ type: "write", text });
+          await sandbox.send({ os: "linux", type: "write", text });
           await redraw.wait(5000);
-          await sandbox.send({ type: "press", keys: ["escape"] });
+          await sandbox.send({ os: "linux", type: "press", keys: ["escape"] });
         } catch {
           throw new MatchError(
             "Could not find element using browser text search",
@@ -727,6 +750,7 @@ const createCommands = (
       await redraw.start();
 
       await sandbox.send({
+        os: "linux",
         type: "commands.focus-application",
         name,
       });
@@ -745,22 +769,25 @@ const createCommands = (
 
       return response;
     },
-    exec: async (language, code, timeout, silent = false) => {
+    exec: async (language = "pwsh", code, timeout, silent = false) => {
       emitter.emit(events.log.narration, theme.dim(`calling exec...`), true);
 
       emitter.emit(events.log.log, code);
 
       let plat = system.platform();
 
-      if (language == "pwsh") {
+      if (language == "pwsh" || language == "sh") {
         let result = null;
 
         result = await sandbox.send({
+          os: "linux",
           type: "commands.run",
           command: code,
           timeout,
         });
 
+        console.log("Exec result:", result);
+
         if (result.out && result.out.returncode !== 0) {
           throw new MatchError(
             `Command failed with exit code ${result.out.returncode}: ${result.out.stderr}`,

package/agent/lib/redraw.js

@@ -69,6 +69,7 @@ const createRedraw = (emitter, system, sandbox) => {
   async function updateNetwork() {
     if (sandbox && sandbox.instanceSocketConnected) {
       let network = await sandbox.send({
+        os: "linux",
         type: "system.network",
       });
       parseNetworkStats(

package/agent/lib/sandbox.js

@@ -51,6 +51,7 @@ const createSandbox = (emitter, analytics) => {
     async auth(apiKey) {
       let reply = await this.send({
         type: "authenticate",
+        os: "linux",
         apiKey,
       });
 
@@ -64,6 +65,7 @@ const createSandbox = (emitter, analytics) => {
     async connect(sandboxId, persist = false) {
       let reply = await this.send({
         type: "connect",
+        os: "linux",
         persist,
         sandboxId,
       });

package/agent/lib/system.js

@@ -7,7 +7,10 @@ const { events } = require("../events.js");
 
 const createSystem = (emitter, sandbox, config) => {
   const screenshot = async (options) => {
-    let { base64 } = await sandbox.send({ type: "system.screenshot" });
+    let { base64 } = await sandbox.send({
+      os: "linux",
+      type: "system.screenshot",
+    });
 
     if (!base64) {
       console.error("Failed to take screenshot");
@@ -110,6 +113,7 @@ const createSystem = (emitter, sandbox, config) => {
   const activeWin = async () => {
     // Get Mouse Position from command line
     let result = await sandbox.send({
+      os: "linux",
       type: "system.get-active-window",
     });
 
@@ -119,6 +123,7 @@ const createSystem = (emitter, sandbox, config) => {
   const getMousePosition = async () => {
     // Get Mouse Position from command line
     let result = await sandbox.send({
+      os: "linux",
       type: "system.get-mouse-position",
     });
 

package/debugger/index.html

@@ -340,7 +340,7 @@
       let parsedData;
       if (data) {
         try {
-          parsedData = JSON.parse(decodeURIComponent(data));
+          parsedData = JSON.parse(atob(data));
           console.log("Data from URL:", parsedData);
           // You can use parsedData here if needed
         } catch (error) {

package/interfaces/cli/lib/base.js

@@ -42,6 +42,7 @@ class BaseCommand extends Command {
       message = JSON.stringify(message);
     }
     this.agent.sandbox.send({
+      os: "linux",
       type: "output",
       output: Buffer.from(message).toString("base64"),
     });

package/interfaces/logger.js

@@ -29,6 +29,7 @@ class CustomTransport extends Transport {
         }
 
         this.sandbox.send({
+          os: "linux",
           type: "output",
           output: Buffer.from(message).toString("base64"),
         });

package/package.json

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

package/schema.json

@@ -697,7 +697,8 @@
             "type": "string",
             "enum": [
               "js",
-              "pwsh"
+              "pwsh",
+              "sh"
             ]
           },
           "code": {

package/testdriver/lifecycle/provision.yaml

@@ -0,0 +1,20 @@
+version: 5.1.1
+session: 67f00511acbd9ccac373edf7
+steps:
+  - prompt: launch chrome
+    commands:
+      - command: exec
+        lang: sh
+        code: |
+          google-chrome \
+            --start-maximized \
+            --disable-infobars \
+            --disable-fre \
+            --no-default-browser-check \
+            --no-first-run \
+            --guest \
+            "${TD_WEBSITE}" \
+            >/dev/null 2>&1 &
+      - command: wait-for-text
+        text: ${TD_WEBSITE}
+        timeout: 60000