testeranto 0.75.0 → 0.79.0

package/dist/common/{PM → src/PM}/main.js

@@ -31,6 +31,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
 const index_js_1 = require("./index.js");
+const utils_js_1 = require("../utils.js");
 const fPaths = [];
 const fileStreams3 = [];
 const files = {}; // = new Set<string>();
@@ -62,6 +63,7 @@ class PM_Main extends index_js_1.PM {
             }
             else if (testConfigResource.ports > 0) {
                 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]);
@@ -72,7 +74,7 @@ class PM_Main extends index_js_1.PM {
                         name: src,
                         // ports: [3333],
                         ports: portsToUse,
-                        fs: ".",
+                        fs: destFolder,
                         browserWSEndpoint: this.browser.wsEndpoint(),
                     });
                 }
@@ -86,6 +88,14 @@ class PM_Main extends index_js_1.PM {
                 process.exit(-1);
             }
             const builtfile = dest + ".mjs";
+            await Promise.all(testConfig[3].map((sidecar) => {
+                if (sidecar[1] === "web") {
+                    return this.launchWebSideCar(sidecar[0], (0, utils_js_1.destinationOfRuntime)(sidecar[0], "web", this.configs), sidecar);
+                }
+                if (sidecar[1] === "node") {
+                    return this.launchNodeSideCar(sidecar[0], (0, utils_js_1.destinationOfRuntime)(sidecar[0], "node", this.configs), sidecar);
+                }
+            }));
             this.server[builtfile] = await Promise.resolve().then(() => __importStar(require(`${builtfile}?cacheBust=${Date.now()}`))).then((module) => {
                 return module.default.then((defaultModule) => {
                     defaultModule
@@ -99,12 +109,231 @@ class PM_Main extends index_js_1.PM {
                     });
                 });
             });
+            console.log("portsToUse", portsToUse);
+            for (let i = 0; i <= portsToUse.length; i++) {
+                if (portsToUse[i]) {
+                    this.ports[portsToUse[i]] = "true"; //port is open again
+                }
+            }
+        };
+        this.launchWebSideCar = async (src, dest, testConfig) => {
+            const d = dest + ".mjs";
+            console.log("launchWebSideCar", src, dest, d);
+            const destFolder = dest.replace(".mjs", "");
+            const webArgz = JSON.stringify({
+                name: dest,
+                ports: [].toString(),
+                fs: destFolder,
+                browserWSEndpoint: this.browser.wsEndpoint(),
+            });
+            const evaluation = `
+    console.log("importing ${dest}.mjs");
+    import('${dest}.mjs').then(async (x) => {
+      console.log("imported", x.default);
+    })`;
+            const fileStreams2 = [];
+            const doneFileStream2 = [];
+            return new Promise((res, rej) => {
+                this.browser
+                    .newPage()
+                    .then((page) => {
+                    page.on("console", (msg) => {
+                        console.log("web > ", msg.args(), msg.text());
+                        // for (let i = 0; i < msg._args.length; ++i)
+                        //   console.log(`${i}: ${msg._args[i]}`);
+                    });
+                    page.exposeFunction("custom-screenshot", async (ssOpts, testName) => {
+                        console.log("main.ts browser custom-screenshot", testName);
+                        const p = ssOpts.path;
+                        const dir = path_1.default.dirname(p);
+                        fs_1.default.mkdirSync(dir, {
+                            recursive: true,
+                        });
+                        files[testName].add(ssOpts.path);
+                        const sPromise = page.screenshot(Object.assign(Object.assign({}, ssOpts), { path: p }));
+                        if (!screenshots[testName]) {
+                            screenshots[testName] = [];
+                        }
+                        screenshots[testName].push(sPromise);
+                        // sPromise.then(())
+                        await sPromise;
+                        return sPromise;
+                        // page.evaluate(`window["screenshot done"]`);
+                    });
+                    page.exposeFunction("writeFileSync", (fp, contents, testName) => {
+                        const dir = path_1.default.dirname(fp);
+                        fs_1.default.mkdirSync(dir, {
+                            recursive: true,
+                        });
+                        const p = new Promise(async (res, rej) => {
+                            fs_1.default.writeFileSync(fp, contents);
+                            res(fp);
+                        });
+                        doneFileStream2.push(p);
+                        if (!files[testName]) {
+                            files[testName] = new Set();
+                        }
+                        files[testName].add(fp);
+                        return p;
+                    });
+                    page.exposeFunction("existsSync", (fp, contents) => {
+                        return fs_1.default.existsSync(fp);
+                    });
+                    page.exposeFunction("mkdirSync", (fp) => {
+                        if (!fs_1.default.existsSync(fp)) {
+                            return fs_1.default.mkdirSync(fp, {
+                                recursive: true,
+                            });
+                        }
+                        return false;
+                    });
+                    page.exposeFunction("createWriteStream", (fp, testName) => {
+                        const f = fs_1.default.createWriteStream(fp);
+                        if (!files[testName]) {
+                            files[testName] = new Set();
+                        }
+                        files[testName].add(fp);
+                        const p = new Promise((res, rej) => {
+                            res(fp);
+                        });
+                        doneFileStream2.push(p);
+                        f.on("close", async () => {
+                            await p;
+                        });
+                        fileStreams2.push(f);
+                        return Object.assign(Object.assign({}, JSON.parse(JSON.stringify(f))), { uid: fileStreams2.length - 1 });
+                    });
+                    page.exposeFunction("write", async (uid, contents) => {
+                        return fileStreams2[uid].write(contents);
+                    });
+                    page.exposeFunction("end", async (uid) => {
+                        return fileStreams2[uid].end();
+                    });
+                    page.exposeFunction("customclose", (p, testName) => {
+                        fs_1.default.writeFileSync(p + "/manifest.json", JSON.stringify(Array.from(files[testName])));
+                        delete files[testName];
+                        Promise.all(screenshots[testName] || []).then(() => {
+                            delete screenshots[testName];
+                            page.close();
+                        });
+                        // globalThis["writeFileSync"](
+                        //   p + "/manifest.json",
+                        //   // files.entries()
+                        //   JSON.stringify(Array.from(files[testName]))
+                        // );
+                        // console.log("closing doneFileStream2", doneFileStream2);
+                        // console.log("closing doneFileStream2", doneFileStream2);
+                        // Promise.all([...doneFileStream2, ...screenshots2]).then(() => {
+                        //   page.close();
+                        // });
+                        // Promise.all(screenshots).then(() => {
+                        //   page.close();
+                        // });
+                        // setTimeout(() => {
+                        //   console.log("Delayed for 1 second.");
+                        //   page.close();
+                        // }, 5000);
+                        // return page.close();
+                    });
+                    return page;
+                })
+                    .then(async (page) => {
+                    page.on("console", (log) => console.debug(`Log from client: [${log.text()}] `));
+                    await page.goto(`file://${`${dest}.html`}`, {});
+                    res(page);
+                    // page.evaluate(evaluation).finally(() => {
+                    //   console.log("evaluation failed.", dest);
+                    // });
+                    // return page;
+                });
+            });
+        };
+        // launchNodeSideCar = async (src: string, dest: string) => {};
+        this.launchNodeSideCar = async (src, dest, testConfig) => {
+            const d = dest + ".mjs";
+            console.log("launchNodeSideCar", src, dest, d);
+            const destFolder = dest.replace(".mjs", "");
+            let argz = "";
+            // const testConfig = this.configs.tests.find((t) => {
+            //   return t[0] === src;
+            // });
+            // if (!testConfig) {
+            //   console.error("missing test config");
+            //   process.exit(-1);
+            // }
+            const testConfigResource = testConfig[2];
+            let portsToUse = [];
+            if (testConfigResource.ports === 0) {
+                argz = JSON.stringify({
+                    scheduled: true,
+                    name: src,
+                    ports: portsToUse,
+                    fs: destFolder,
+                    browserWSEndpoint: this.browser.wsEndpoint(),
+                });
+            }
+            else if (testConfigResource.ports > 0) {
+                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]);
+                        this.ports[openPorts[i][0]] = false; // port is now closed
+                    }
+                    argz = JSON.stringify({
+                        scheduled: true,
+                        name: src,
+                        // ports: [3333],
+                        ports: portsToUse,
+                        fs: ".",
+                        browserWSEndpoint: this.browser.wsEndpoint(),
+                    });
+                }
+                else {
+                    this.queue.push(src);
+                    return;
+                }
+            }
+            else {
+                console.error("negative port makes no sense", src);
+                process.exit(-1);
+            }
+            const builtfile = dest + ".mjs";
+            // console.log(
+            //   "node builtfile",
+            //   (await import(`${builtfile}?cacheBust=${Date.now()}`)).default
+            // );
+            this.server[builtfile] = await Promise.resolve().then(() => __importStar(require(`${builtfile}?cacheBust=${Date.now()}`))).then((module) => {
+                return module.default.then((defaultModule) => {
+                    console.log("defaultModule", defaultModule);
+                    const s = new defaultModule();
+                    s.receiveTestResourceConfig(argz);
+                    // Object.create(defaultModule);
+                    // defaultModule
+                    //   .receiveTestResourceConfig(argz)
+                    //   .then((x) => {
+                    //     console.log("then", x);
+                    //     return x;
+                    //   })
+                    //   .catch((e) => {
+                    //     console.log("catch", e);
+                    //   });
+                });
+            });
+            console.log("portsToUse", portsToUse);
             for (let i = 0; i <= portsToUse.length; i++) {
-                this.ports[i] = true; //port is open again
+                if (portsToUse[i]) {
+                    this.ports[portsToUse[i]] = "true"; //port is open again
+                }
             }
         };
-        this.launchWeb = (t, dest) => {
+        this.launchWeb = (t, dest, sidecars) => {
             console.log("launchWeb", t, dest);
+            sidecars.map((sidecar) => {
+                if (sidecar[1] === "node") {
+                    return this.launchNodeSideCar(sidecar[0], (0, utils_js_1.destinationOfRuntime)(sidecar[0], "node", this.configs), sidecar);
+                }
+            });
             const destFolder = dest.replace(".mjs", "");
             const webArgz = JSON.stringify({
                 name: dest,
@@ -112,8 +341,10 @@ class PM_Main extends index_js_1.PM {
                 fs: destFolder,
                 browserWSEndpoint: this.browser.wsEndpoint(),
             });
-            const evaluation = `import('${dest}.mjs').then(async (x) => {
-      console.log("imported", x, (x.default));
+            const evaluation = `
+    console.log("importing ${dest}.mjs");
+    import('${dest}.mjs').then(async (x) => {
+      console.log("imported", x.default);
       try {
         await (await x.default).receiveTestResourceConfig(${webArgz})
       } catch (e) {
@@ -121,18 +352,25 @@ class PM_Main extends index_js_1.PM {
       }
     })`;
             const fileStreams2 = [];
-            // const screenshots2: Promise<any>[] = [];
             const doneFileStream2 = [];
             this.browser
                 .newPage()
                 .then((page) => {
-                page.exposeFunction("custom-screenshot", async (ssOpts, testName) => {
+                page.on("console", (msg) => {
+                    console.log("web > ", msg.args(), msg.text());
+                    // for (let i = 0; i < msg._args.length; ++i)
+                    //   console.log(`${i}: ${msg._args[i]}`);
+                });
+                page.exposeFunction("customScreenShot", async (ssOpts, testName) => {
                     console.log("main.ts browser custom-screenshot", testName);
                     const p = ssOpts.path;
                     const dir = path_1.default.dirname(p);
                     fs_1.default.mkdirSync(dir, {
                         recursive: true,
                     });
+                    if (!files[testName]) {
+                        files[testName] = new Set();
+                    }
                     files[testName].add(ssOpts.path);
                     const sPromise = page.screenshot(Object.assign(Object.assign({}, ssOpts), { path: p }));
                     if (!screenshots[testName]) {
@@ -194,11 +432,12 @@ class PM_Main extends index_js_1.PM {
                     return fileStreams2[uid].end();
                 });
                 page.exposeFunction("customclose", (p, testName) => {
+                    console.log("\t closing", p);
                     fs_1.default.writeFileSync(p + "/manifest.json", JSON.stringify(Array.from(files[testName])));
                     delete files[testName];
                     Promise.all(screenshots[testName] || []).then(() => {
                         delete screenshots[testName];
-                        page.close();
+                        // page.close();
                     });
                     // globalThis["writeFileSync"](
                     //   p + "/manifest.json",
@@ -222,9 +461,16 @@ class PM_Main extends index_js_1.PM {
                 return page;
             })
                 .then(async (page) => {
+                page.on("console", (log) => console.debug(`Log from client: [${log.text()}] `));
                 await page.goto(`file://${`${dest}.html`}`, {});
-                page.evaluate(evaluation).finally(() => {
+                page
+                    .evaluate(evaluation)
+                    .catch((e) => {
                     console.log("evaluation failed.", dest);
+                    console.log(e);
+                })
+                    .finally(() => {
+                    console.log("evaluation complete.", dest);
                 });
                 return page;
             });
@@ -244,6 +490,7 @@ class PM_Main extends index_js_1.PM {
             return false;
         };
         globalThis["writeFileSync"] = (filepath, contents, testName) => {
+            console.log("globalThis-writeFileSync", filepath);
             // Create directories if they don't exist
             const dir = path_1.default.dirname(filepath.split("/").slice(0, -1).join("/"));
             fs_1.default.mkdirSync(dir, {
@@ -271,6 +518,33 @@ class PM_Main extends index_js_1.PM {
         globalThis["end"] = (uid) => {
             fileStreams3[uid].end();
         };
+        globalThis["customScreenShot"] = async (opts, 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;
+            const dir = path_1.default.dirname(p);
+            fs_1.default.mkdirSync(dir, {
+                recursive: true,
+            });
+            if (!files[opts.path]) {
+                files[opts.path] = new Set();
+            }
+            files[opts.path].add(opts.path);
+            const sPromise = page.screenshot(Object.assign(Object.assign({}, opts), { path: p }));
+            if (!screenshots[opts.path]) {
+                screenshots[opts.path] = [];
+            }
+            screenshots[opts.path].push(sPromise);
+            await sPromise;
+            return sPromise;
+        };
         globalThis["customclose"] = (p, testName) => {
             if (!files[testName]) {
                 files[testName] = new Set();
@@ -301,8 +575,11 @@ class PM_Main extends index_js_1.PM {
         //   // return page.close();
         // });
     }
+    customScreenShot(opts) {
+        throw new Error("Method not implemented.");
+    }
     async startPuppeteer(options, destfolder) {
-        this.browser = await puppeteer_core_1.default.launch(options);
+        this.browser = (await puppeteer_core_1.default.launch(options));
         return this.browser;
     }
     end(accessObject) {

package/dist/common/{PM → src/PM}/node.js

@@ -15,6 +15,9 @@ class PM_Node extends index_js_1.PM {
         this.server = {};
         this.testResourceConfiguration = t;
     }
+    customScreenShot(opts, page) {
+        return globalThis["customScreenShot"](opts, page);
+    }
     existsSync(destFolder) {
         return globalThis["existsSync"](this.testResourceConfiguration.fs + "/" + destFolder);
     }
@@ -25,6 +28,7 @@ class PM_Node extends index_js_1.PM {
         return globalThis["write"](writeObject.uid, contents);
     }
     writeFileSync(filepath, contents) {
+        console.log("pm_node-writeFileSync", this.testResourceConfiguration);
         return globalThis["writeFileSync"](this.testResourceConfiguration.fs + "/" + filepath, contents, this.testResourceConfiguration.name);
     }
     createWriteStream(filepath) {

package/dist/common/{PM → src/PM}/web.js

@@ -12,6 +12,9 @@ class PM_Web extends index_js_1.PM {
         this.server = {};
         this.testResourceConfiguration = t;
     }
+    customScreenShot(opts) {
+        window["customScreenShot"](opts);
+    }
     existsSync(destFolder) {
         return window["existsSync"](destFolder);
     }

package/dist/common/{Project.js → src/Project.js}

@@ -11,9 +11,7 @@ const readline_1 = __importDefault(require("readline"));
 const glob_1 = require("glob");
 const node_js_1 = __importDefault(require("./esbuildConfigs/node.js"));
 const web_js_1 = __importDefault(require("./esbuildConfigs/web.js"));
-const features_js_1 = __importDefault(require("./esbuildConfigs/features.js"));
 const web_html_js_1 = __importDefault(require("./web.html.js"));
-const report_html_js_1 = __importDefault(require("./report.html.js"));
 var mode = process.argv[2] === "-dev" ? "DEV" : "PROD";
 readline_1.default.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY)
@@ -25,15 +23,7 @@ process.stdin.on("keypress", (str, key) => {
         onDone();
     }
 });
-// setInterval(() => {
-//   const memoryUsage = process.memoryUsage();
-//   console.log("Memory usage:", memoryUsage);
-// }, 10000); // Check every 10 seconds
-let featuresDone, nodeDone, webDone = false;
-const onFeaturesDone = () => {
-    featuresDone = true;
-    onDone();
-};
+let nodeDone, webDone = false;
 const onNodeDone = () => {
     nodeDone = true;
     onDone();
@@ -44,12 +34,11 @@ const onWebDone = () => {
 };
 const onDone = () => {
     console.log(JSON.stringify({
-        featuresDone,
         nodeDone,
         webDone,
         mode,
     }, null, 2));
-    if (featuresDone && nodeDone && webDone && mode === "PROD") {
+    if (nodeDone && webDone && mode === "PROD") {
         console.log("Testeranto-EsBuild is all done. Goodbye!");
         process.exit();
     }
@@ -58,9 +47,10 @@ const onDone = () => {
     }
 };
 class ITProject {
-    constructor(config) {
+    constructor(configs) {
         this.mode = `up`;
-        this.config = config;
+        this.config = configs;
+        fs_1.default.writeFileSync(`${this.config.outdir}/testeranto.json`, JSON.stringify(Object.assign(Object.assign({}, this.config), { buildDir: process.cwd() + "/" + this.config.outdir }), null, 2));
         Promise.resolve(Promise.all([...this.getSecondaryEndpointsPoints("web")].map(async (sourceFilePath) => {
             const sourceFileSplit = sourceFilePath.split("/");
             const sourceDir = sourceFileSplit.slice(0, -1);
@@ -69,57 +59,24 @@ class ITProject {
                 .split(".")
                 .slice(0, -1)
                 .join(".");
-            const htmlFilePath = path_1.default.normalize(`${process.cwd()}/${config.outdir}/web/${sourceDir.join("/")}/${sourceFileNameMinusJs}.html`);
+            const htmlFilePath = path_1.default.normalize(`${process.cwd()}/${this.config.outdir}/web/${sourceDir.join("/")}/${sourceFileNameMinusJs}.html`);
             const jsfilePath = `./${sourceFileNameMinusJs}.mjs`;
             return fs_1.default.promises
                 .mkdir(path_1.default.dirname(htmlFilePath), { recursive: true })
                 .then((x) => fs_1.default.writeFileSync(htmlFilePath, (0, web_html_js_1.default)(jsfilePath, htmlFilePath)));
         })));
         const [nodeEntryPoints, webEntryPoints] = getRunnables(this.config.tests);
-        // nodeEntryPoints.forEach((nep) => {
-        //   const f = `${process.cwd()}/${nep}`;
-        //   console.log("nep", f);
-        //   import(f).then((module) => {
-        //     return module.default.then((defaultModule) => {
-        //       console.log("defaultModule", defaultModule);
-        //       // defaultModule
-        //       //   .receiveTestResourceConfig(argz)
-        //       //   .then((x) => {
-        //       //     console.log("then", x);
-        //       //     return x;
-        //       //   })
-        //       //   .catch((e) => {
-        //       //     console.log("catch", e);
-        //       //   });
-        //     });
-        //   });
-        // });
-        (0, glob_1.glob)(`./${config.outdir}/chunk-*.mjs`, { ignore: "node_modules/**" }).then((chunks) => {
+        console.log(`this.getSecondaryEndpointsPoints("web")`, this.getSecondaryEndpointsPoints("web"));
+        (0, glob_1.glob)(`./${this.config.outdir}/chunk-*.mjs`, {
+            ignore: "node_modules/**",
+        }).then((chunks) => {
             chunks.forEach((chunk) => {
                 fs_1.default.unlinkSync(chunk);
             });
         });
-        fs_1.default.copyFileSync("./node_modules/testeranto/dist/prebuild/Report.js", "./docs/Report.js");
-        fs_1.default.copyFileSync("./node_modules/testeranto/dist/prebuild/Report.css", "./docs/Report.css");
-        fs_1.default.writeFileSync(`${config.outdir}/report.html`, (0, report_html_js_1.default)());
         Promise.all([
-            fs_1.default.promises.writeFile(`${config.outdir}/testeranto.json`, JSON.stringify(Object.assign(Object.assign({}, config), { buildDir: process.cwd() + "/" + config.outdir }), null, 2)),
-            esbuild_1.default
-                .context((0, features_js_1.default)(config))
-                .then(async (featuresContext) => {
-                if (mode == "DEV") {
-                    await featuresContext.watch();
-                    onFeaturesDone();
-                }
-                else {
-                    featuresContext.rebuild().then((v) => {
-                        onFeaturesDone();
-                    });
-                }
-                return featuresContext;
-            }),
             esbuild_1.default
-                .context((0, node_js_1.default)(config, nodeEntryPoints))
+                .context((0, node_js_1.default)(this.config, nodeEntryPoints))
                 .then(async (nodeContext) => {
                 if (mode == "DEV") {
                     await nodeContext.watch().then((v) => {
@@ -134,7 +91,7 @@ class ITProject {
                 return nodeContext;
             }),
             esbuild_1.default
-                .context((0, web_js_1.default)(config, webEntryPoints))
+                .context((0, web_js_1.default)(this.config, webEntryPoints))
                 .then(async (webContext) => {
                 if (mode == "DEV") {
                     await webContext.watch().then((v) => {
@@ -153,11 +110,12 @@ class ITProject {
     getSecondaryEndpointsPoints(runtime) {
         const meta = (ts, st) => {
             ts.forEach((t) => {
+                console.log("getSecondaryEndpointsPoints", t);
                 if (t[1] === runtime) {
                     st.add(t[0]);
                 }
-                if (Array.isArray(t[2])) {
-                    meta(t[2], st);
+                if (Array.isArray(t[3])) {
+                    meta(t[3], st);
                 }
             });
             return st;