testeranto 0.79.69 → 0.81.0

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,41 +122,53 @@ 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> {
-    this.browser = await puppeteer.launch(options);
+    this.browser = (await puppeteer.launch(options)) as any;
     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();
+            // page.close();
+            // console.log("\t GOODBYE");
+            // whyIsNodeRunning();
           });
 
           // globalThis["writeFileSync"](
@@ -740,9 +741,18 @@ export class PM_Main extends PM {
         );
         await page.goto(`file://${`${dest}.html`}`, {});
 
-        page.evaluate(evaluation).finally(() => {
-          console.log("evaluation failed.", dest);
-        });
+        page
+          .evaluate(evaluation)
+          .catch((e) => {
+            console.log("evaluation failed.", dest);
+            console.log(e);
+          })
+          .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,

package/src/Project.ts

@@ -9,58 +9,30 @@ import esbuildWebConfiger from "./esbuildConfigs/web.js";
 import webHtmlFrame from "./web.html.js";
 import { ITestTypes, IBaseConfig, IRunTime } from "./lib/types.js";
 
-var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
+// var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
 
 readline.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY) process.stdin.setRawMode(true);
 
-process.stdin.on("keypress", (str, key) => {
-  if (key.name === "q") {
-    console.log("Testeranto-EsBuild is shutting down...");
-    mode = "PROD";
-    onDone();
-  }
-});
-
-let nodeDone,
-  webDone = false;
-
-const onNodeDone = () => {
-  nodeDone = true;
-  onDone();
-};
-const onWebDone = () => {
-  webDone = true;
-  onDone();
-};
-
-const onDone = () => {
-  console.log(
-    JSON.stringify(
-      {
-        nodeDone,
-        webDone,
-        mode,
-      },
-      null,
-      2
-    )
-  );
-  if (nodeDone && webDone && mode === "PROD") {
-    console.log("Testeranto-EsBuild is all done. Goodbye!");
-    process.exit();
-  } else {
-    console.log("Testeranto-EsBuild is still working...");
-  }
-};
-
 export class ITProject {
   config: IBaseConfig;
-  mode: `up` | `down` = `up`;
+  mode: `DEV` | `PROD`;
+  nodeDone: boolean = false;
+  webDone: boolean = false;
 
   constructor(configs: IBaseConfig) {
     this.config = configs;
 
+    this.mode = this.config.devMode ? "DEV" : "PROD";
+
+    process.stdin.on("keypress", (str, key) => {
+      if (key.name === "q") {
+        console.log("Testeranto-EsBuild is shutting down...");
+        this.mode = "PROD";
+        this.onDone();
+      }
+    });
+
     fs.writeFileSync(
       `${this.config.outdir}/testeranto.json`,
       JSON.stringify(
@@ -124,13 +96,13 @@ export class ITProject {
       esbuild
         .context(esbuildNodeConfiger(this.config, nodeEntryPoints))
         .then(async (nodeContext) => {
-          if (mode == "DEV") {
+          if (this.config.devMode) {
             await nodeContext.watch().then((v) => {
-              onNodeDone();
+              this.onNodeDone();
             });
           } else {
             nodeContext.rebuild().then((v) => {
-              onNodeDone();
+              this.onNodeDone();
             });
           }
 
@@ -139,13 +111,13 @@ export class ITProject {
       esbuild
         .context(esbuildWebConfiger(this.config, webEntryPoints))
         .then(async (webContext) => {
-          if (mode == "DEV") {
+          if (this.config.devMode) {
             await webContext.watch().then((v) => {
-              onWebDone();
+              this.onWebDone();
             });
           } else {
             webContext.rebuild().then((v) => {
-              onWebDone();
+              this.onWebDone();
             });
           }
           return webContext;
@@ -153,6 +125,41 @@ export class ITProject {
     ]);
   }
 
+  onNodeDone = () => {
+    this.nodeDone = true;
+    this.onDone();
+  };
+  onWebDone = () => {
+    this.webDone = true;
+    this.onDone();
+  };
+
+  onDone = () => {
+    // console.log(this.nodeDone && this.webDone && this.mode === "PROD");
+    if (this.nodeDone && this.webDone && this.mode === "PROD") {
+      console.log("Testeranto-EsBuild is all done. Goodbye!");
+      process.exit();
+    } else {
+      if (this.mode === "PROD") {
+        console.log("waiting for tests to finish");
+        console.log(
+          JSON.stringify(
+            {
+              nodeDone: this.nodeDone,
+              webDone: this.webDone,
+              mode: this.mode,
+            },
+            null,
+            2
+          )
+        );
+      } else {
+        console.log("waiting for tests to change");
+      }
+      console.log("press 'q' to quit");
+    }
+  };
+
   public getSecondaryEndpointsPoints(runtime?: IRunTime): string[] {
     const meta = (ts: ITestTypes[], st: Set<string>): Set<string> => {
       ts.forEach((t) => {

package/src/Puppeteer.ts

@@ -4,27 +4,22 @@ import watch from "recursive-watch";
 
 import { PM_Main } from "./PM/main.js";
 import { destinationOfRuntime } from "./utils.js";
+import { timeout } from "puppeteer-core/lib/esm/puppeteer/index.js";
+import { IBaseConfig, IBuiltConfig } from "./lib/types.js";
 
-var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
+// var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
 
-const node2web: Record<string, string[]> = {};
-const web2node: Record<string, string[]> = {};
-const childProcesses: Record<string, "loaded" | "running" | "done"> = {};
+// const node2web: Record<string, string[]> = {};
+// const web2node: Record<string, string[]> = {};
+// const childProcesses: Record<string, "loaded" | "running" | "done"> = {};
 
 readline.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY) process.stdin.setRawMode(true);
 
-console.log("hello Puppeteer", process.env);
-
-console.log("\n Puppeteer is running. Press 'q' to quit\n");
-process.stdin.on("keypress", (str, key) => {
-  if (key.name === "q") {
-    process.exit();
-  }
-});
+// let shutDownMode = false;
 
 export default async (partialConfig) => {
-  const config = {
+  const config: IBuiltConfig = {
     ...partialConfig,
     buildDir: process.cwd() + "/" + partialConfig.outdir,
   };
@@ -45,17 +40,23 @@ export default async (partialConfig) => {
 
   await pm.startPuppeteer(
     {
+      // timeout: 1,
       waitForInitialPage: false,
-      executablePath: process.env.CHROMIUM_PATH || "/opt/homebrew/bin/chromium", //"/opt/homebrew/bin/chromium",
+      executablePath:
+        // process.env.CHROMIUM_PATH || "/opt/homebrew/bin/chromium",
+        "/opt/homebrew/bin/chromium",
       headless: true,
-      // dumpio: true,
+      dumpio: true,
+      // timeout: 0,
       args: [
+        // "--auto-open-devtools-for-tabs",
+
         "--disable-features=IsolateOrigins,site-per-process",
         "--disable-site-isolation-trials",
         "--allow-insecure-localhost",
         "--allow-file-access-from-files",
         "--allow-running-insecure-content",
-        // "--auto-open-devtools-for-tabs",
+
         "--disable-dev-shm-usage",
         "--disable-extensions",
         "--disable-gpu",
@@ -84,6 +85,14 @@ export default async (partialConfig) => {
     "."
   );
 
+  console.log("\n Puppeteer is running. Press 'q' to quit\n");
+  process.stdin.on("keypress", (str, key) => {
+    if (key.name === "q") {
+      pm.shutDown();
+      // process.exit();
+    }
+  });
+
   config.tests.forEach(([test, runtime, tr, sidecars]) => {
     if (runtime === "node") {
       pm.launchNode(test, destinationOfRuntime(test, "node", config));
@@ -94,43 +103,48 @@ export default async (partialConfig) => {
     }
   });
 
-  console.log("ready and watching for changes...", config.buildDir);
-
-  watch(config.buildDir, (eventType, changedFile) => {
-    if (changedFile) {
-      config.tests.forEach(([test, runtime, tr, sidecars]) => {
-        if (eventType === "change" || eventType === "rename") {
-          if (
-            changedFile ===
-            test
-              .replace("./", "node/")
-              .split(".")
-              .slice(0, -1)
-              .concat("mjs")
-              .join(".")
-          ) {
-            pm.launchNode(test, destinationOfRuntime(test, "node", config));
-          }
-
-          if (
-            changedFile ===
-            test
-              .replace("./", "web/")
-              .split(".")
-              .slice(0, -1)
-              .concat("mjs")
-              .join(".")
-          ) {
-            pm.launchWeb(
-              test,
-              destinationOfRuntime(test, "web", config),
-              sidecars
-            );
+  if (config.devMode) {
+    console.log("ready and watching for changes...", config.buildDir);
+
+    watch(config.buildDir, (eventType, changedFile) => {
+      if (changedFile) {
+        config.tests.forEach(([test, runtime, tr, sidecars]) => {
+          if (eventType === "change" || eventType === "rename") {
+            if (
+              changedFile ===
+              test
+                .replace("./", "node/")
+                .split(".")
+                .slice(0, -1)
+                .concat("mjs")
+                .join(".")
+            ) {
+              pm.launchNode(test, destinationOfRuntime(test, "node", config));
+            }
+
+            if (
+              changedFile ===
+              test
+                .replace("./", "web/")
+                .split(".")
+                .slice(0, -1)
+                .concat("mjs")
+                .join(".")
+            ) {
+              pm.launchWeb(
+                test,
+                destinationOfRuntime(test, "web", config),
+                sidecars
+              );
+            }
           }
-        }
-      });
-    }
-  });
+        });
+      }
+    });
+  } else {
+    pm.shutDown();
+  }
+  // pm.browser.close();
 
   // does not work on linux
   // fs.watch(