npm - testdriverai - Versions diffs - 5.7.43 → 5.7.44 - Mend

testdriverai 5.7.43 → 5.7.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/agent.js +44 -44
package/index.js +0 -2
package/lib/commander.js +199 -203
package/lib/commands.js +63 -35
package/lib/config.js +1 -3
package/lib/events.js +1 -1
package/lib/focus-application.js +14 -8
package/lib/generator.js +3 -4
package/lib/init.js +10 -10
package/lib/logger.js +226 -5
package/lib/network.js +0 -3
package/lib/outputs.js +1 -1
package/lib/parser.js +22 -23
package/lib/redraw.js +47 -27
package/lib/resources/prerun.yaml +2 -2
package/lib/sandbox.js +20 -20
package/lib/sdk.js +4 -4
package/lib/session.js +0 -2
package/lib/system.js +1 -1
package/lib/theme.js +13 -0
package/lib/upload-secrets.js +1 -1
package/package.json +1 -1
package/testdriver/type-repeated.yaml +21 -0

package/lib/commander.js CHANGED Viewed

@@ -11,16 +11,16 @@ const sdk = require("./sdk");
 const outputs = require("./outputs");
 const server = require("./ipc");
-// replace all occurances of ${OUTPUT.ls} with outputs.get("ls") in every possible property of the `object`
+// replace all occurances of ${OUTPUT.ls} with outputs.get("ls") in every possible property of the `object`
 // this is a recursive function that will go through all the properties of the object
 const replaceOutputs = (obj) => {
   for (let key in obj) {
     if (typeof obj[key] === "object") {
       replaceOutputs(obj[key]);
     } else if (typeof obj[key] === "string") {
-      obj[key] = obj[key].replace(/\${OUTPUT\.(.*?)}/g, (_, match) => outputs.get(match));
+      obj[key] = obj[key].replace(/\${OUTPUT\.(.*?)}/g, (_, match) =>
+        outputs.get(match),
+      );
     }
   }
 };
@@ -28,17 +28,15 @@ const replaceOutputs = (obj) => {
 // object is a json representation of the individual yml command
 // the process turns markdown -> yml -> json -> js function execution
 const run = async (object, depth) => {
+  try {
+    logger.debug("%j", { object, depth });
-try {
-  logger.debug("%j", { object, depth });
+    // success returns null
+    // if this is set, it means that we need to take more action and a new thread is spawned
+    let response = null;
-  // success returns null
-  // if this is set, it means that we need to take more action and a new thread is spawned
-  let response = null;
-  if (!object?.command) {
-    throw `YML is formatted improperly.
+    if (!object?.command) {
+      throw `YML is formatted improperly.
 The input YML is:
 ${yaml.dump(object)}
@@ -55,206 +53,204 @@ commands:
   - command: press-keys
     keys: [command, space]
 \`\`\``;
-  } else {
+    } else {
+      replaceOutputs(object);
+      let copy = JSON.parse(JSON.stringify(object));
-    replaceOutputs(object);
+      marky.mark(object.command);
-    let copy = JSON.parse(JSON.stringify(object));
+      // we speak, log, and take images here because we want to be careful not to render a notification containing the text we're looking for
+      // or to cover the screen of some item we might want
-    marky.mark(object.command);
+      // this will actually interpret the command and execute it
+      switch (object.command) {
+        case "type":
+          speak(`typing ${object.text}`);
+          server.broadcast("status", `typing ${object.text}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands.type(object.text, object.delay);
+          break;
+        case "press-keys":
+          speak(`pressing keys ${object.keys.join(",")}`);
+          server.broadcast("status", `pressing keys ${object.keys.join(",")}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands["press-keys"](object.keys);
+          break;
+        case "scroll":
+          speak(`scrolling ${object.direction}`);
+          server.broadcast("status", `scrolling ${object.direction}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands.scroll(
+            object.direction,
+            object.amount,
+            object.method,
+          );
+          break;
+        case "wait":
+          speak(`waiting ${object.timeout} seconds`);
+          server.broadcast("status", `waiting ${object.timeout} seconds`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands.wait(object.timeout);
+          break;
+        case "click":
+          speak(`${object.action}`);
+          server.broadcast("status", `${object.action}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands["click"](object.x, object.y, object.action);
+          break;
+        case "hover":
+          speak(`moving mouse`);
+          server.broadcast("status", `moving mouse`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands["hover"](object.x, object.y);
+          break;
+        case "drag":
+          speak(`dragging mouse`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands["drag"](object.x, object.y);
+          break;
+        case "hover-text":
+          speak(`searching for ${object.description}`);
+          server.broadcast("status", `searching for ${object.description}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands["hover-text"](
+            object.text,
+            object.description,
+            object.action,
+            object.method,
+          );
+          break;
+        case "hover-image":
+          speak(`searching for image of ${object.description}`);
+          server.broadcast(
+            "status",
+            `searching for image of ${object.description}`,
+          );
+          logger.info(generator.jsonToManual(object));
+          response = await commands["hover-image"](
+            object.description,
+            object.action,
+          );
+          break;
+        case "match-image":
+          logger.info(generator.jsonToManual(object));
+          server.broadcast("status", `${object.action} image ${object.path}`);
+          notify(generator.jsonToManual(object, false));
+          response = await commands["match-image"](object.path, object.action);
+          break;
+        case "wait-for-image":
+          speak(`waiting for ${object.description}`);
+          server.broadcast("status", `waiting for ${object.description}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands["wait-for-image"](
+            object.description,
+            object.timeout,
+          );
+          break;
+        case "wait-for-text":
+          speak(`waiting for ${object.text}`);
+          server.broadcast("status", `waiting for ${object.text}`);
+          logger.info(generator.jsonToManual(object));
+          copy.text = "*****";
+          notify(generator.jsonToManual(copy, false));
+          response = await commands["wait-for-text"](
+            object.text,
+            object.timeout,
+            object.method,
+          );
+          break;
+        case "scroll-until-text":
+          speak(`scrolling until ${object.text}`);
+          server.broadcast("status", `scrolling until ${object.text}`);
+          logger.info(generator.jsonToManual(object));
+          copy.text = "*****";
+          notify(generator.jsonToManual(copy, false));
+          response = await commands["scroll-until-text"](
+            object.text,
+            object.direction,
+            object.distance,
+            object.textMatchMethod,
+            object.method,
+          );
+          break;
+        case "scroll-until-image":
+          speak(`scrolling until ${object.description}`);
+          server.broadcast("status", `scrolling until ${object.description}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands["scroll-until-image"](
+            object.description,
+            object.direction,
+            object.distance,
+            object.method,
+          );
+          break;
+        case "focus-application":
+          speak(`focusing ${object.name}`);
+          server.broadcast("status", `focusing ${object.name}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands["focus-application"](object.name);
+          break;
+        case "remember": {
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          let value = await commands["remember"](object.description);
+          console.log(value);
+          outputs.set(object.output, value);
+          break;
+        }
+        case "assert":
+          speak(`asserting ${object.expect}`);
+          server.broadcast("status", `asserting ${object.expect}`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
+          response = await commands.assert(object.expect, object.async);
+          break;
+        case "exec":
+          speak(`exec`);
+          server.broadcast("status", `exec`);
+          logger.info(generator.jsonToManual(object));
+          notify(generator.jsonToManual(object, false));
-    // we speak, log, and take images here because we want to be careful not to render a notification containing the text we're looking for
-    // or to cover the screen of some item we might want
+          response = await commands.exec(
+            object.lang,
+            object.mac,
+            object.windows,
+            object.linux,
+            object.silent,
+          );
-    // this will actually interpret the command and execute it
-    switch (object.command) {
-      case "type":
-        speak(`typing ${object.text}`);
-        server.broadcast("status", `typing ${object.text}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands.type(object.text, object.delay);
-        break;
-      case "press-keys":
-        speak(`pressing keys ${object.keys.join(",")}`);
-        server.broadcast("status", `pressing keys ${object.keys.join(",")}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands["press-keys"](object.keys);
-        break;
-      case "scroll":
-        speak(`scrolling ${object.direction}`);
-        server.broadcast("status", `scrolling ${object.direction}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands.scroll(
-          object.direction,
-          object.amount,
-          object.method,
-        );
-        break;
-      case "wait":
-        speak(`waiting ${object.timeout} seconds`);
-        server.broadcast("status", `waiting ${object.timeout} seconds`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands.wait(object.timeout);
-        break;
-      case "click":
-        speak(`${object.action}`);
-        server.broadcast("status", `${object.action}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands["click"](
-          object.x,
-          object.y,
-          object.action,
-        );
-        break;
-      case "hover":
-        speak(`moving mouse`);
-        server.broadcast("status", `moving mouse`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands["hover"](object.x, object.y);
-        break;
-      case "drag":
-        speak(`dragging mouse`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands["drag"](object.x, object.y);
-        break;
-      case "hover-text":
-        speak(`searching for ${object.description}`);
-        server.broadcast("status", `searching for ${object.description}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands["hover-text"](
-          object.text,
-          object.description,
-          object.action,
-          object.method,
-        );
-        break;
-      case "hover-image":
-        speak(`searching for image of ${object.description}`);
-        server.broadcast("status", `searching for image of ${object.description}`);
-        logger.info(generator.jsonToManual(object));
-        response = await commands["hover-image"](
-          object.description,
-          object.action,
-        );
-        break;
-      case "match-image":
-        logger.info(generator.jsonToManual(object));
-        server.broadcast("status", `${object.action} image ${object.path}`);
-        notify(generator.jsonToManual(object, false));
-        response = await commands["match-image"](
-          object.path,
-          object.action
-        );
-        break;
-      case "wait-for-image":
-        speak(`waiting for ${object.description}`);
-        server.broadcast("status", `waiting for ${object.description}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands["wait-for-image"](
-          object.description,
-          object.timeout,
-        );
-        break;
-      case "wait-for-text":
-        speak(`waiting for ${object.text}`);
-        server.broadcast("status", `waiting for ${object.text}`);
-        logger.info(generator.jsonToManual(object));
-        copy.text = "*****";
-        notify(generator.jsonToManual(copy, false));
-        response = await commands["wait-for-text"](
-          object.text,
-          object.timeout,
-          object.method,
-        );
-        break;
-      case "scroll-until-text":
-        speak(`scrolling until ${object.text}`);
-        server.broadcast("status", `scrolling until ${object.text}`);
-        logger.info(generator.jsonToManual(object));
-        copy.text = "*****";
-        notify(generator.jsonToManual(copy, false));
-        response = await commands["scroll-until-text"](
-          object.text,
-          object.direction,
-          object.distance,
-          object.textMatchMethod,
-          object.method,
-        );
-        break;
-      case "scroll-until-image":
-        speak(`scrolling until ${object.description}`);
-        server.broadcast("status", `scrolling until ${object.description}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands["scroll-until-image"](
-          object.description,
-          object.direction,
-          object.distance,
-          object.method,
-        );
-        break;
-      case "focus-application":
-        speak(`focusing ${object.name}`);
-        server.broadcast("status", `focusing ${object.name}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands["focus-application"](object.name);
-        break;
-      case "remember":
-        { logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        let value = await commands["remember"](object.description);
-        console.log(value);
-        outputs.set(object.output, value);
-        break; }
-      case "assert":
-        speak(`asserting ${object.expect}`);
-        server.broadcast("status", `asserting ${object.expect}`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
-        response = await commands.assert(object.expect, object.async);
-        break;
-      case "exec":
-        speak(`exec`);
-        server.broadcast("status", `exec`);
-        logger.info(generator.jsonToManual(object));
-        notify(generator.jsonToManual(object, false));
+          outputs.set(object.output, response);
-        response = await commands.exec(object.lang, object.mac, object.windows, object.linux, object.silent);
-        outputs.set(object.output, response);
-        break;
-      default:
-        throw new Error(`Command not found: ${object.command}`);
+          break;
+        default:
+          throw new Error(`Command not found: ${object.command}`);
+      }
     }
-  }
-  let timing = marky.stop(object.command);
-  await Promise.all([
-    sdk.req("ran", { command: object.command, data: object }),
-    analytics.track("command", { data: object, depth, timing }),
-  ]);
+    let timing = marky.stop(object.command);
-  return response;
+    await Promise.all([
+      sdk.req("ran", { command: object.command, data: object }),
+      analytics.track("command", { data: object, depth, timing }),
+    ]);
-} catch (error) {
-  logger.debug(error);
-  throw error;
-}
-}
+    return response;
+  } catch (error) {
+    logger.debug(error);
+    throw error;
+  }
+};
 module.exports = { run };