testdriverai 4.0.28 → 4.0.30

package/lib/commands.js

@@ -33,8 +33,8 @@ const commandOrControl = process.platform === 'darwin' ? 'command' : 'control';
 const findImageOnScreen = async (relativePath, haystack, restrictToWindow) => {
   let displayMultiple = await getDisplayMultiple();
 
-  // move the file from filePath to `.testdriver/screenshots`
-  let rootpath = path.join(cwd(), `.testdriver`, `screenshots`, platform());
+  // move the file from filePath to `testdriver/screenshots`
+  let rootpath = path.join(cwd(), `testdriver`, `screenshots`, platform());
   // add .png to relative path if not already there
   if (!relativePath.endsWith('.png')) {
     relativePath = relativePath + '.png';
@@ -46,7 +46,6 @@ const findImageOnScreen = async (relativePath, haystack, restrictToWindow) => {
   }
 
   let needle = path.join(rootpath, relativePath);
-  let foundWriteLocation = path.join(cwd(), '.testdriver', '.matches', `${new Date().getTime()}-${relativePath}`);
 
   const bar1 = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
 
@@ -114,15 +113,6 @@ const findImageOnScreen = async (relativePath, haystack, restrictToWindow) => {
 
   bar1.stop();
   
-  if (foundWriteLocation) {
-    // Crop the haystack at the coordinates found in result
-    const imageHaystack = await Jimp.read(haystack);
-    const croppedImage = imageHaystack.crop(result.x, result.y, result.width, result.height);
-
-    await croppedImage.writeAsync(foundWriteLocation);
-
-    result.foundWriteLocation = foundWriteLocation;
-  }
   return result;
 
 }
@@ -200,6 +190,37 @@ const scroll = async(direction = 'down', amount = 300) => {
   }
 }
 
+// perform a mouse click
+const click = async(x, y, button = 'left', click = 'single') => {
+
+  await redraw.start();
+
+  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, .1);
+  await delay(1000); // wait for the mouse to move
+  robot.mouseClick(button, double);
+  await redraw.wait(2000);
+  return;
+};
+
+const hover = async(x, y) => {
+
+  await redraw.start();
+
+  x = parseInt(x);
+  y = parseInt(y);
+
+  await robot.moveMouseSmooth(x, y, .1);
+  await redraw.wait(2000);
+
+  return;
+}
+
 let commands = {
     // method, levenshein, dice, or combined
     // leven = this is turbo, all around good for text similarity
@@ -258,35 +279,6 @@ let commands = {
     }
 
   },
-  // perform a mouse click
-  click: async(x, y, button = 'left', click = 'single') => {
-
-    await redraw.start();
-  
-    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, .1);
-    await delay(1000); // wait for the mouse to move
-    robot.mouseClick(button, double);
-    await redraw.wait(2000);
-    return;
-  },
-  hover: async(x, y) => {
-
-    await redraw.start();
-  
-    x = parseInt(x);
-    y = parseInt(y);
-  
-    await robot.moveMouseSmooth(x, y, .1);
-    await redraw.wait(2000);
-  
-    return;
-  },
   "match-image": async(relativePath, action = 'click', button = 'left', clickType = 'single') => {
 
     let image = await captureScreenPNG()
@@ -299,7 +291,11 @@ let commands = {
       throw new AiError(`Image not found: ${relativePath}`)
     } else {
 
-      await routeClick(result.centerX * displayMultiple, result.centerY * displayMultiple, action, button, clickType);
+      if (action === 'click') {
+        await click(result.centerX * displayMultiple, result.centerY * displayMultiple, button, clickType);
+      } else if (action === 'hover') {
+        await hover(result.centerX * displayMultiple, result.centerY * displayMultiple);
+      }
     }
     
   },

package/package.json

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