testeranto 0.80.0 → 0.81.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testeranto",
   "description": "teeny tiny tightly-typed typescript tests",
-  "version": "0.80.0",
+  "version": "0.81.1",
   "engines": {
     "node": "18.18.0"
   },
@@ -145,10 +145,6 @@
       "import": "./dist/module/src/Puppeteer.js",
       "require": "./dist/common/src/Puppeteer.js"
     },
-    "./src/TaskMan": {
-      "import": "./dist/module/TaskMan.js",
-      "require": "./dist/common/TaskMan.js"
-    },
     "./src/Init": {
       "import": "./dist/module/src/Init.js",
       "require": "./dist/common/src/Init.js"
@@ -198,15 +194,16 @@
     "build-types": "tsc -p tsconfig.types.json",
     "build-tests": "ts-node-esm ./project.ts",
     "run-tests": "ts-node-esm ./run-tests.ts",
-    "init-docs": "ts-node-esm init-docs.ts"
+    "init-docs": "ts-node-esm init-docs.ts",
+    "test": "yarn build-tests & yarn run-tests"
   },
   "peerDependencies": {
     "@hello-pangea/dnd": ">=16",
-    "@types/react": "^18.2.66",
-    "@types/react-dom": "18.2.23",
-    "@types/react-test-renderer": "18.0.7",
+    "@types/react": "18.2.0",
+    "@types/react-dom": "18.2.0",
+    "@types/react-test-renderer": "19.0.0",
     "react": "18.2.0",
-    "react-dom": "^18.2.0",
+    "react-dom": "18.2.0",
     "ts-node": "^10.9.1",
     "typescript": "4.8.2"
   },
@@ -215,13 +212,11 @@
     "@types/node": "^22.7.5",
     "@types/react": "18.2.55",
     "@types/react-bootstrap": "^0.32.32",
-    "@types/react-dom": "18.2.23",
-    "@types/react-test-renderer": "18.0.7",
+    "@types/react-dom": "18.2.0",
+    "@types/react-test-renderer": "19.0.0",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^5.46.0",
     "@typescript-eslint/parser": "^5.46.0",
-    "react": "18.2.0",
-    "react-dom": "^18.2.0",
     "ts-node": "^10.9.1",
     "typescript": "4.8.2"
   },
@@ -280,7 +275,8 @@
     "selenium-webdriver": "4.27.0",
     "url": "^0.11.4",
     "uuid": "^10.0.0",
+    "why-is-node-running": "^3.2.2",
     "ws": "^8.16.0",
     "zod": "^3.24.2"
   }
-}
+}

package/secret

@@ -0,0 +1 @@
+fmG,.R,^TnN7rK3

package/secret.env

@@ -0,0 +1,2 @@
+DEEPSEEK=sk-34624e21a51541458044a2aa25c20789
+TASKMAN=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

package/src/Aider.ts

@@ -1,33 +1,44 @@
 import fs from "fs";
 import { exec, spawn } from "child_process";
-import { features } from "process";
-// import { octokit } from "./src/DELETEME";
-// const itermTab = require("iterm-tab");
-import itermTab from "iterm-tab";
-
-import { Octokit } from "octokit";
 
 export const execCommand = async (command) => {
-  return new Promise<void>((resolve, reject) => {
-    const [cmd, ...args] = command.split(" ");
-    const childProcess = spawn(cmd, args);
-    childProcess.stdout.on("data", (data) => {
-      process.stdout.write(data.toString());
-    });
-    childProcess.stderr.on("data", (data) => {
-      process.stderr.write(data.toString());
-    });
-    childProcess.on("error", (error) => {
-      reject(error);
-    });
-    childProcess.on("exit", (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(new Error(`Command exited with code ${code}.`));
-      }
-    });
+  const ls = spawn(command.split(" ")[0], command.split(" ").slice(1, -1));
+
+  process.stdin.pipe(ls.stdin);
+  ls.stdout.pipe(process.stdout);
+  ls.stderr.pipe(process.stdout);
+  // ls.stdout.on("data", function (data) {
+  //   console.log("stdout: " + data.toString());
+  // });
+
+  // ls.stderr.on("data", function (data) {
+  //   console.log("stderr: " + data.toString());
+  // });
+
+  ls.on("exit", function (code) {
+    console.log("child process exited with code " + code?.toString() || -1);
   });
+
+  // return new Promise<void>((resolve, reject) => {
+  //   const [cmd, ...args] = command.split(" ");
+  //   const childProcess = spawn(cmd, args);
+  //   childProcess.stdout.on("data", (data) => {
+  //     process.stdout.write(data.toString());
+  //   });
+  //   childProcess.stderr.on("data", (data) => {
+  //     process.stderr.write(data.toString());
+  //   });
+  //   childProcess.on("error", (error) => {
+  //     reject(error);
+  //   });
+  //   childProcess.on("exit", (code) => {
+  //     if (code === 0) {
+  //       resolve();
+  //     } else {
+  //       reject(new Error(`Command exited with code ${code}.`));
+  //     }
+  //   });
+  // });
 };
 
 const key = process.argv[2];
@@ -44,78 +55,110 @@ if (exitcode != "0") {
 
   inputFiles.push(`${key}/tests.json`);
 
-  const features = await (
-    await Promise.all(
-      Array.from(
-        new Set(
-          JSON.parse(fs.readFileSync(`${key}/tests.json`).toString())
-            .givens.reduce((mm: any[], lm: { features: any[] }) => {
-              mm.push(
-                lm.features.reduce((mm2: any[], lm2: any) => {
-                  mm2.push(lm2);
-                  return mm2;
-                }, [])
-              );
-              return mm;
-            }, [])
-            .flat()
-            .flat()
-        )
-      ) as string[]
-    )
-  )
-    .reduce(async (mm, feature) => {
-      const req = await octokit.request(
-        `GET /repos/adamwong246/kokomobay-taskman/contents/Task/${feature}.json`,
-        {
-          owner: "adamwong246",
-          repo: "kokomoBay-taskman",
-          path: `Task/${feature}.json`,
-          headers: {
-            "X-GitHub-Api-Version": "2022-11-28",
-          },
-        }
-      );
-
-      const j = JSON.parse(atob(req.data.content));
-      (await mm).push([
-        feature,
-        JSON.stringify({
-          name: j.name,
-          body: j.body,
-        }),
-      ]);
-
-      return mm;
-    }, Promise.resolve<[string, string][]>([]))
-    .then((z) => {
-      const final = z.reduce((mm, [k, v], ndx) => {
-        mm[k] = v;
-        return mm;
-      }, {});
-
-      const as = JSON.stringify(final);
-
-      fs.writeFile(`./${key}/features.json`, as, () => {
-        inputFiles.push(`./${key}/features.json`);
-
-        const scriptCommand = `aider --model deepseek --api-key deepseek=${
-          process.env.DEEPSEEK_KEY
-        } --message "Fix the failing tests" ${inputFiles.join(" ")}`;
-
-        console.log("scriptCommand", scriptCommand);
-
-        execCommand(scriptCommand);
-        // itermTab(scriptCommand).then(() => console.log("yay"));
-
-        // const child = spawn("xterm -e", scriptCommand.split(" "), {
-        //   detached: true,
-        //   stdio: "ignore",
-        // });
-        // runCommandInITerm(scriptCommand);
-      });
-      //
-    });
+  // const features = await await Promise.all(
+  //   Array.from(
+  //     new Set(
+  //       JSON.parse(fs.readFileSync(`${key}/tests.json`).toString())
+  //         .givens.reduce((mm: any[], lm: { features: any[] }) => {
+  //           mm.push(
+  //             lm.features.reduce((mm2: any[], lm2: any) => {
+  //               mm2.push(lm2);
+  //               return mm2;
+  //             }, [])
+  //           );
+  //           return mm;
+  //         }, [])
+  //         .flat()
+  //         .flat()
+  //     )
+  //   ) as string[]
+  // );
+
+  // const final = features.reduce((mm, [k, v], ndx) => {
+  //   mm[k] = v;
+  //   return mm;
+  // }, {});
+
+  // const as = JSON.stringify(final);
+
+  // const scriptCommand = `aider --model deepseek --api-key deepseek=${
+  //   process.env.DEEPSEEK_KEY
+  // } --message "Fix the failing tests" --read ${key}/inputFiles.json ${inputFiles
+  //   .map((i) => `--file ${i}`)
+  //   .join(" ")}`;
+
+  const scriptCommand = `aider --message "Fix the failing tests" --model deepseek --api-key deepseek=${
+    process.env.DEEPSEEK_KEY
+  } --file ./${inputFiles.join(" ./")}`;
+
+  console.log("scriptCommand", scriptCommand);
+
+  execCommand(scriptCommand);
+
+  // fs.writeFile(`./${key}/features.json`, as, () => {
+  //   inputFiles.push(`./${key}/features.json`);
+
+  //   // itermTab(scriptCommand).then(() => console.log("yay"));
+
+  //   // const child = spawn("xterm -e", scriptCommand.split(" "), {
+  //   //   detached: true,
+  //   //   stdio: "ignore",
+  //   // });
+  //   // runCommandInITerm(scriptCommand);
+  // });
+
+  // .reduce(async (mm, feature) => {
+  //   const req = await octokit.request(
+  //     `GET /repos/adamwong246/kokomobay-taskman/contents/Task/${feature}.json`,
+  //     {
+  //       owner: "adamwong246",
+  //       repo: "kokomoBay-taskman",
+  //       path: `Task/${feature}.json`,
+  //       headers: {
+  //         "X-GitHub-Api-Version": "2022-11-28",
+  //       },
+  //     }
+  //   );
+
+  //   const j = JSON.parse(atob(req.data.content));
+  //   (await mm).push([
+  //     feature,
+  //     JSON.stringify({
+  //       name: j.name,
+  //       body: j.body,
+  //     }),
+  //   ]);
+
+  //   return mm;
+  // }, Promise.resolve<[string, string][]>([]))
+  // .then((z) => {
+  //   const final = z.reduce((mm, [k, v], ndx) => {
+  //     mm[k] = v;
+  //     return mm;
+  //   }, {});
+
+  //   const as = JSON.stringify(final);
+
+  //   fs.writeFile(`./${key}/features.json`, as, () => {
+  //     inputFiles.push(`./${key}/features.json`);
+
+  //     const scriptCommand = `aider --model deepseek --api-key deepseek=${
+  //       process.env.DEEPSEEK_KEY
+  //     } --message "Fix the failing tests" ${inputFiles.join(" ")}`;
+
+  //     console.log("scriptCommand", scriptCommand);
+
+  //     execCommand(scriptCommand);
+  //     // itermTab(scriptCommand).then(() => console.log("yay"));
+
+  //     // const child = spawn("xterm -e", scriptCommand.split(" "), {
+  //     //   detached: true,
+  //     //   stdio: "ignore",
+  //     // });
+  //     // runCommandInITerm(scriptCommand);
+  //   });
+  //   //
+  // });
 
   // features.then((x) => {
   //   console.log("done", x);

package/src/PM/main.ts

@@ -17,18 +17,18 @@ const files: Record<string, Set<string>> = {}; // = new Set<string>();
 const screenshots: Record<string, Promise<Uint8Array>[]> = {};
 
 export class PM_Main extends PM {
-  customScreenShot(opts: object) {
-    throw new Error("Method not implemented.");
-  }
+  shutdownMode = false;
   configs: IBuiltConfig;
   ports: Record<number, boolean>;
   queue: any[];
+  registry: Record<string, boolean>;
 
   constructor(configs: IBuiltConfig) {
     super();
     this.server = {};
     this.configs = configs;
     this.ports = {};
+    this.registry = {};
     this.configs.ports.forEach((element) => {
       this.ports[element] = "true"; // set ports as open
     });
@@ -47,7 +47,7 @@ export class PM_Main extends PM {
       contents: string,
       testName: string
     ) => {
-      console.log("globalThis-writeFileSync", filepath);
+      // console.log("globalThis-writeFileSync", filepath);
 
       // Create directories if they don't exist
       const dir = path.dirname(filepath.split("/").slice(0, -1).join("/"));
@@ -88,18 +88,6 @@ export class PM_Main extends PM {
       opts: { path: string },
       page: Page
     ) => {
-      // // fileStreams3[uid].write(contents);
-      // // console.log("asd", opts.path.split("/").slice(0, -1).join("/"));
-
-      // // const dir = path.dirname(opts.path.split("/").slice(0, -1).join("/"));
-      // // console.log("dir", dir);
-      // fs.mkdirSync(opts.path.split("/").slice(0, -1).join("/"), {
-      //   recursive: true,
-      // });
-
-      // return page.screenshot(opts);
-
-      console.log("main.ts node custom-screenshot", page);
       const p = opts.path as string;
       const dir = path.dirname(p);
       fs.mkdirSync(dir, {
@@ -134,32 +122,17 @@ export class PM_Main extends PM {
         JSON.stringify(Array.from(files[testName]))
       );
       delete files[testName];
-      // globalThis["writeFileSync"](
-      //   p + "/manifest.json",
-      //   // files.entries()
-      //   JSON.stringify(Array.from(files[testName]))
-      // );
-
-      // fileStreams3[uid].end();
     };
-    // page.exposeFunction("customclose", () => {
-    //   console.log("closing doneFileStream2", doneFileStream2);
-    //   // console.log("closing doneFileStream2", doneFileStream2);
-    //   Promise.all([...doneFileStream2, ...screenshots2]).then(() => {
-    //     page.close();
-    //   });
-
-    //   // page.close();
-    //   // Promise.all(screenshots).then(() => {
-    //   //   page.close();
-    //   // });
-    //   // setTimeout(() => {
-    //   //   console.log("Delayed for 1 second.");
-    //   //   page.close();
-    //   // }, 5000);
-
-    //   // return page.close();
-    // });
+  }
+
+  shutDown() {
+    console.log("shutting down...");
+    this.shutdownMode = true;
+    this.checkForShutdown();
+  }
+
+  customScreenShot(opts: object) {
+    throw new Error("Method not implemented.");
   }
 
   async startPuppeteer(options: any, destfolder: string): Promise<any> {
@@ -167,8 +140,35 @@ export class PM_Main extends PM {
     return this.browser;
   }
 
+  checkForShutdown = () => {
+    const anyRunning: boolean =
+      Object.values(this.registry).filter((x) => x === false).length > 0;
+    if (anyRunning) {
+    } else {
+      this.browser.disconnect().then(() => {
+        console.log("Goodbye");
+        process.exit();
+      });
+    }
+  };
+
+  register = (src: string) => {
+    // console.log("register", src);
+    this.registry[src] = false;
+  };
+
+  deregister = (src: string) => {
+    // console.log("deregister", src, this.shutdownMode);
+    this.registry[src] = true;
+
+    if (this.shutdownMode) {
+      this.checkForShutdown();
+    }
+  };
+
   launchNode = async (src: string, dest: string) => {
     console.log("launchNode", src);
+    this.register(src);
 
     const destFolder = dest.replace(".mjs", "");
 
@@ -197,7 +197,7 @@ export class PM_Main extends PM {
       const openPorts = Object.entries(this.ports).filter(
         ([portnumber, portopen]) => portopen
       );
-      console.log("openPorts", openPorts);
+
       if (openPorts.length >= testConfigResource.ports) {
         for (let i = 0; i < testConfigResource.ports; i++) {
           portsToUse.push(openPorts[i][0]);
@@ -250,18 +250,16 @@ export class PM_Main extends PM {
       return module.default.then((defaultModule) => {
         defaultModule
           .receiveTestResourceConfig(argz)
-          .then((x) => {
-            console.log("then", x);
-
-            return x;
-          })
           .catch((e) => {
             console.log("catch", e);
+          })
+          .finally(() => {
+            this.deregister(src);
           });
       });
     });
 
-    console.log("portsToUse", portsToUse);
+    // console.log("portsToUse", portsToUse);
     for (let i = 0; i <= portsToUse.length; i++) {
       if (portsToUse[i]) {
         this.ports[portsToUse[i]] = "true"; //port is open again
@@ -306,7 +304,7 @@ export class PM_Main extends PM {
           page.exposeFunction(
             "custom-screenshot",
             async (ssOpts: ScreenshotOptions, testName: string) => {
-              console.log("main.ts browser custom-screenshot", testName);
+              // console.log("main.ts browser custom-screenshot", testName);
               const p = ssOpts.path as string;
               const dir = path.dirname(p);
               fs.mkdirSync(dir, {
@@ -411,7 +409,7 @@ export class PM_Main extends PM {
 
             Promise.all(screenshots[testName] || []).then(() => {
               delete screenshots[testName];
-              page.close();
+              // page.close();
             });
 
             // globalThis["writeFileSync"](
@@ -455,7 +453,6 @@ export class PM_Main extends PM {
     });
   };
 
-  // launchNodeSideCar = async (src: string, dest: string) => {};
   launchNodeSideCar = async (
     src: string,
     dest: string,
@@ -491,7 +488,7 @@ export class PM_Main extends PM {
       const openPorts = Object.entries(this.ports).filter(
         ([portnumber, portopen]) => portopen
       );
-      console.log("openPorts", openPorts);
+      // console.log("openPorts", openPorts);
       if (openPorts.length >= testConfigResource.ports) {
         for (let i = 0; i < testConfigResource.ports; i++) {
           portsToUse.push(openPorts[i][0]);
@@ -526,7 +523,7 @@ export class PM_Main extends PM {
       `${builtfile}?cacheBust=${Date.now()}`
     ).then((module) => {
       return module.default.then((defaultModule) => {
-        console.log("defaultModule", defaultModule);
+        // console.log("defaultModule", defaultModule);
         const s = new defaultModule();
         s.receiveTestResourceConfig(argz);
         // Object.create(defaultModule);
@@ -543,7 +540,7 @@ export class PM_Main extends PM {
       });
     });
 
-    console.log("portsToUse", portsToUse);
+    // console.log("portsToUse", portsToUse);
     for (let i = 0; i <= portsToUse.length; i++) {
       if (portsToUse[i]) {
         this.ports[portsToUse[i]] = "true"; //port is open again
@@ -553,6 +550,7 @@ export class PM_Main extends PM {
 
   launchWeb = (t: string, dest: string, sidecars: ITestTypes[]) => {
     console.log("launchWeb", t, dest);
+    this.register(t);
 
     sidecars.map((sidecar) => {
       if (sidecar[1] === "node") {
@@ -599,7 +597,7 @@ export class PM_Main extends PM {
         page.exposeFunction(
           "customScreenShot",
           async (ssOpts: ScreenshotOptions, testName: string) => {
-            console.log("main.ts browser custom-screenshot", testName);
+            // console.log("main.ts browser custom-screenshot", testName);
             const p = ssOpts.path as string;
             const dir = path.dirname(p);
             fs.mkdirSync(dir, {
@@ -696,7 +694,7 @@ export class PM_Main extends PM {
         });
 
         page.exposeFunction("customclose", (p: string, testName: string) => {
-          console.log("\t closing", p);
+          // console.log("closing", p);
 
           fs.writeFileSync(
             p + "/manifest.json",
@@ -704,9 +702,12 @@ export class PM_Main extends PM {
           );
           delete files[testName];
 
+          // console.log("screenshots[testName]", screenshots[testName]);
           Promise.all(screenshots[testName] || []).then(() => {
             delete screenshots[testName];
             // page.close();
+            // console.log("\t GOODBYE");
+            // whyIsNodeRunning();
           });
 
           // globalThis["writeFileSync"](
@@ -748,6 +749,9 @@ export class PM_Main extends PM {
           })
           .finally(() => {
             console.log("evaluation complete.", dest);
+            // page.close();
+            this.deregister(t);
+            // whyIsNodeRunning();
           });
 
         return page;

package/src/PM/node.ts

@@ -42,7 +42,7 @@ export class PM_Node extends PM {
   }
 
   writeFileSync(filepath: string, contents: string) {
-    console.log("pm_node-writeFileSync", this.testResourceConfiguration);
+    // console.log("pm_node-writeFileSync", this.testResourceConfiguration);
     return globalThis["writeFileSync"](
       this.testResourceConfiguration.fs + "/" + filepath,
       contents,