testdriverai 5.4.2 → 5.5.0

package/agent.js

@@ -30,7 +30,7 @@ const yaml = require("js-yaml");
 const sanitizeFilename = require("sanitize-filename");
 
 // local modules
-const { server } = require("./lib/ipc.js");
+const server = require("./lib/ipc.js");
 const speak = require("./lib/speak.js");
 const analytics = require("./lib/analytics.js");
 const log = require("./lib/logger.js");
@@ -753,8 +753,10 @@ const actOnMarkdown = async (
 };
 
 const ensureMacScreenPerms = async () => {
+
   // if os is mac, check for screen capture permissions
   if (
+    !config.TD_OVERLAY_ID && 
     !config.TD_VM &&
     process.platform === "darwin"
   ) {
@@ -889,7 +891,7 @@ const firstPrompt = async () => {
   };
 
   rl.on("line", handleInput);
-  server.on("input", handleInput);
+  server.emitter.on("input", handleInput);
 
   // if file exists, load it
   if (fs.existsSync(thisFile)) {
@@ -1054,6 +1056,7 @@ let runRawYML = async (yml) => {
   // add the root key steps: with array of commands:
   if (ymlObj && !ymlObj.steps) {
     ymlObj = {
+      version: package.version,
       steps: [ymlObj],
     };
   }
@@ -1062,7 +1065,7 @@ let runRawYML = async (yml) => {
   fs.writeFileSync(tmpobj.name, yaml.dump(ymlObj));
 
   // and run it with run()
-  await run(tmpobj.name, false, true);
+  await run(tmpobj.name, false, false);
 };
 
 // this will load a regression test from a file location
@@ -1223,8 +1226,6 @@ const start = async () => {
   let testdriverFolder = path.join(workingDir, "testdriver");
   if (!fs.existsSync(testdriverFolder)) {
 
-    console.log('does not exist')
-
     fs.mkdirSync(testdriverFolder);
     // log
     logger.info(chalk.dim(`Created testdriver directory`));

package/index.js

@@ -9,7 +9,9 @@ if (process.argv[2] === "--help" || process.argv[2] === "-h") {
   console.log("Command: testdriverai [init, run, edit] [yaml filepath]");
   process.exit(0);
 }
+
 if (process.argv[2] === "--renderer") {
+
   const {
     // connectToOverlay,
     createOverlayProcess,
@@ -38,6 +40,7 @@ if (process.argv[2] === "--renderer") {
   })();
 } else {
   (async () => {
+
     if (!config.TD_OVERLAY) {
       let agent = require("./agent.js");
       await agent.start();

package/lib/commander.js

@@ -9,7 +9,7 @@ const analytics = require("./analytics");
 const marky = require("marky");
 const sdk = require("./sdk");
 const outputs = require("./outputs");
-const {server} = require("./ipc");
+const server = require("./ipc");
 
 // 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

package/lib/commands.js

@@ -2,7 +2,7 @@
 const sdk = require("./sdk");
 const vm = require("vm");
 const chalk = require("chalk");
-const server = require("./ipc").server;
+const server = require("./ipc");
 const {
   captureScreenBase64,
   captureScreenPNG,

package/lib/config.js

@@ -34,7 +34,8 @@ const config = {
   TD_SECRET: null,
   TD_VM: false,
   TD_OVERLAY_ID: null,
-  TD_VM_RESOLUTION: [1024, 768]
+  TD_VM_RESOLUTION: [1024, 768],
+  TD_IPC_ID: `testdriverai_${process.pid}`,
 };
 
 // Find all env vars starting with TD_

package/lib/ipc.js

@@ -1,50 +1,17 @@
-const { EventEmitter } = require("events");
-const { default: nodeIPC } = require("node-ipc");
-const { IPC } = nodeIPC;
+let { emitter } = require("./events");
 
-class IPCServerSingleton extends EventEmitter {
-  ipc = new IPC();
-  interactive = false;
+process.on("connect", () => {
+  broadcast("connect", {});
+});
 
-  /**
-   * @type {Map<string, Function[]>}
-   */
-  eventListeners;
+process.on("message", (raw) => {
+  let { event, data } = JSON.parse(raw);
+  emitter.emit(event, data);
+});
 
-  constructor() {
-    if (!IPCServerSingleton.instance) {
-      super();
-      this.ipc = new IPC();
-      this.eventListeners = new Map();
-
-      this.ipc.config.id = `testdriverai_${process.pid}`;
-      this.ipc.config.retry = 50;
-      this.ipc.config.silent = true;
-
-      this.ipc.serve(() => {
-        this.ipc.server.on("connect", (socket) => {
-          this.ipc.server.emit(socket, "interactive", this.interactive);
-        });
-
-        this.ipc.server.on("message", ({ event, data }) => {
-          this.emit(event, data);
-        });
-      });
-
-      this.ipc.server.start();
-
-      IPCServerSingleton.instance = this;
-    }
-    return IPCServerSingleton.instance;
-  }
-
-  broadcast(event, data) {
-    if (event === "interactive") {
-      this.interactive = data;
-    }
-    this.ipc.server.broadcast("message", { event, data });
-  }
+let broadcast = (event, data) => {
+  let d = {event, data};
+  process.send(d);
 }
 
-const server = new IPCServerSingleton();
-module.exports = { server };
+module.exports = { broadcast, emitter };

package/lib/logger.js

@@ -1,7 +1,7 @@
 // central logger for the bot
 const winston = require("winston");
 const os = require("os");
-const { server } = require("./ipc");
+const server = require("./ipc");
 
 // simple match for aws instance i-*
 const shouldLog =

package/package.json

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