testdriverai 4.1.24 → 4.1.26

package/lib/commander.js

@@ -72,14 +72,13 @@ commands:
         response = await commands.wait(object.timeout);
         break;
       case "click":
-        speak(`${object.button} ${object.click} click`);
+        speak(`${object.action}`);
         log("info", generator.jsonToManual(object));
         notify(generator.jsonToManual(object, false));
         response = await commands["click"](
           object.x,
           object.y,
-          object.button,
-          object.click,
+          object.action,
         );
         break;
       case "hover":
@@ -112,9 +111,7 @@ commands:
         notify(generator.jsonToManual(object, false));
         response = await commands["match-image"](
           object.path,
-          object.action,
-          object.button,
-          object.click,
+          object.action
         );
         break;
       case "wait-for-image":

package/lib/commands.js

@@ -188,19 +188,43 @@ const scroll = async (direction = "down", amount = 300) => {
 };
 
 // perform a mouse click
-const click = async (x, y, button = "left", click = "single") => {
+// click, right-click, double-click, hover
+const click = async (x, y, action = "click") => {
   await redraw.start();
 
+  let button = 'left';
+  let double = false;
+
+  if (action === "right-click" && process.platform !== "darwin" ) {
+    button = "right";
+  }
+  if (action === "double-click") {
+    double = true;
+  }
+
   log("debug", chalk.dim(`${click} ${button} clicking at ${x}, ${y}...`), true);
 
   x = parseInt(x);
   y = parseInt(y);
 
-  let double = click == "double" ? true : false;
   robot.moveMouseSmooth(x, y, 0.1);
+  
   await delay(1000); // wait for the mouse to move
-  robot.mouseClick(button, double);
-  emitter.emit(events.mouseClick, { x, y, button, click });
+
+  if (process.platform === "darwin" && action === "right-click") {
+    robot.keyToggle('control', 'down', 'control');
+    await delay(250);
+  }
+
+  if (action !== "hover") {
+    robot.mouseClick(button, double);
+    emitter.emit(events.mouseClick, { x, y, button, click });
+  }
+
+  if (process.platform === "darwin" && action === "right-click") {
+    await delay(250);
+    robot.keyToggle('control', 'up', 'control');
+  }
 
   await redraw.wait(5000);
   return;
@@ -231,8 +255,6 @@ let commands = {
     text,
     description = null,
     action = "click",
-    button = "left",
-    clickType = "single",
     method = "turbo",
   ) => {
     text = text ? text.toString() : null;
@@ -250,8 +272,6 @@ let commands = {
         method,
         image: await captureScreenBase64(),
         intent: action,
-        button,
-        clickType,
         description,
         displayMultiple: 1,
       },
@@ -275,8 +295,6 @@ let commands = {
   "hover-image": async (
     description,
     action = "click",
-    button = "left",
-    clickType = "single",
   ) => {
     // take a screenshot
     log("info", "");
@@ -290,8 +308,6 @@ let commands = {
         needle: description,
         image: await captureScreenBase64(),
         intent: action,
-        button,
-        clickType,
         displayMultiple: 1,
       },
       (chunk) => {
@@ -312,9 +328,7 @@ let commands = {
   },
   "match-image": async (
     relativePath,
-    action = "click",
-    button = "left",
-    clickType = "single",
+    action = "click"
   ) => {
     let image = await captureScreenPNG();
 
@@ -324,7 +338,7 @@ let commands = {
       throw new AiError(`Image not found: ${relativePath}`);
     } else {
       if (action === "click") {
-        await click(result.centerX, result.centerY, button, clickType);
+        await click(result.centerX, result.centerY, action);
       } else if (action === "hover") {
         await hover(result.centerX, result.centerY);
       }

package/package.json

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