testeranto 0.47.7 → 0.47.8

package/dist/common/Node.js

@@ -6,6 +6,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_js_1 = require("./core.js");
 const core_js_2 = __importDefault(require("./core.js"));
 const NodeWriter_js_1 = require("./NodeWriter.js");
+const receiveTestResourceConfig = async (t, testresource) => {
+    const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(testresource);
+    /* @ts-ignore:next-line */
+    process.send({
+        type: "testeranto:adios",
+        data: {
+            failed,
+            testResourceConfiguration: t.test.testResourceConfiguration,
+            results: t.toObj(),
+        },
+    }, async (err) => {
+        if (!err) {
+            Promise.all([...artifacts, logPromise]).then(async () => {
+                process.exit(await failed ? 1 : 0);
+            });
+        }
+        else {
+            console.error(err);
+            process.exit(1);
+        }
+    });
+};
 exports.default = async (input, testSpecification, testImplementation, testInterface, testResourceRequirement = core_js_1.defaultTestResourceRequirement) => {
     const mrt = new core_js_2.default(input, testSpecification, testImplementation, testInterface, testResourceRequirement, testInterface.assertioner || (async (t) => t), testInterface.beforeEach || async function (subject, initialValues, testResource) {
         return subject;
@@ -13,63 +35,32 @@ exports.default = async (input, testSpecification, testImplementation, testInter
         function (b) {
             return b;
         }, NodeWriter_js_1.NodeWriter);
-    const t = mrt.testJobs[0];
+    const tl2 = mrt;
+    const t = tl2.testJobs[0];
     const testResourceArg = process.argv[2] || `{}`;
     try {
         const partialTestResource = JSON.parse(testResourceArg);
         if (testResourceRequirement.ports == 0) {
-            const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource);
-            Promise.all([...artifacts, logPromise]).then(async () => {
-                process.exit(await failed ? 1 : 0);
-            });
+            receiveTestResourceConfig(t, partialTestResource);
         }
         else {
             console.log("test configuration is incomplete", partialTestResource);
-            if (process.send) {
-                console.log("requesting test resources via IPC ...", testResourceRequirement);
-                /* @ts-ignore:next-line */
-                process.send({
-                    type: "testeranto:hola",
-                    data: {
-                        requirement: Object.assign(Object.assign({}, testResourceRequirement), { name: partialTestResource.name })
-                    },
-                });
-                console.log("awaiting test resources via IPC...");
-                process.on("message", async function (packet) {
-                    console.log("message: ", packet);
-                    const resourcesFromPm2 = packet.data.testResourceConfiguration;
-                    const secondTestResource = Object.assign(Object.assign({ fs: "." }, JSON.parse(JSON.stringify(partialTestResource))), JSON.parse(JSON.stringify(resourcesFromPm2)));
-                    console.log("secondTestResource", secondTestResource);
-                    const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource);
-                    /* @ts-ignore:next-line */
-                    process.send({
-                        type: "testeranto:adios",
-                        data: {
-                            testResourceConfiguration: t.test.testResourceConfiguration,
-                            results: t.toObj(),
-                        },
-                    }, async (err) => {
-                        if (!err) {
-                            Promise.all([...artifacts, logPromise]).then(async () => {
-                                process.exit(await failed ? 1 : 0);
-                            });
-                        }
-                        else {
-                            console.error(err);
-                            process.exit(1);
-                        }
-                    });
-                });
-            }
-            else {
-                console.log("Pass run-time test resources by STDIN", process.stdin);
-                process.stdin.on("data", async (data) => {
-                    console.log("data: ", data);
-                    const resourcesFromStdin = JSON.parse(data.toString());
-                    const secondTestResource = Object.assign(Object.assign({}, JSON.parse(JSON.stringify(resourcesFromStdin))), JSON.parse(JSON.stringify(partialTestResource)));
-                    await t.receiveTestResourceConfig(secondTestResource);
-                });
-            }
+            console.log("requesting test resources via IPC ...", testResourceRequirement);
+            /* @ts-ignore:next-line */
+            process.send({
+                type: "testeranto:hola",
+                data: {
+                    requirement: Object.assign(Object.assign({}, testResourceRequirement), { name: partialTestResource.name })
+                },
+            });
+            console.log("awaiting test resources via IPC...");
+            process.on("message", async function (packet) {
+                console.log("message: ", packet);
+                const resourcesFromPm2 = packet.data.testResourceConfiguration;
+                const secondTestResource = Object.assign(Object.assign({ fs: "." }, JSON.parse(JSON.stringify(partialTestResource))), JSON.parse(JSON.stringify(resourcesFromPm2)));
+                console.log("secondTestResource", secondTestResource);
+                receiveTestResourceConfig(t, secondTestResource);
+            });
         }
     }
     catch (e) {
@@ -77,3 +68,15 @@ exports.default = async (input, testSpecification, testImplementation, testInter
         process.exit(-1);
     }
 };
+// else {
+//   console.log("Pass run-time test resources by STDIN", process.stdin);
+//   process.stdin.on("data", async (data) => {
+//     console.log("data: ", data);
+//     const resourcesFromStdin = JSON.parse(data.toString());
+//     const secondTestResource = {
+//       ...JSON.parse(JSON.stringify(resourcesFromStdin)),
+//       ...JSON.parse(JSON.stringify(partialTestResource)),
+//     } as ITTestResourceConfiguration;
+//     await t.receiveTestResourceConfig(secondTestResource);
+//   });
+// }

package/dist/common/Project.js

@@ -71,7 +71,14 @@ class ITProject {
             pm2_1.default.list((err, procs) => {
                 procs.forEach((proc) => {
                     var _a, _b;
-                    procsTable.push({ name: proc.name, pid: proc.pid, pm_id: proc.pm_id, mem: (_a = proc.monit) === null || _a === void 0 ? void 0 : _a.memory, cpu: (_b = proc.monit) === null || _b === void 0 ? void 0 : _b.cpu });
+                    procsTable.push({
+                        name: proc.name,
+                        pid: proc.pid,
+                        pm_id: proc.pm_id,
+                        mem: (_a = proc.monit) === null || _a === void 0 ? void 0 : _a.memory,
+                        cpu: (_b = proc.monit) === null || _b === void 0 ? void 0 : _b.cpu,
+                        "exit code": this.exitCodes[proc.name]
+                    });
                 });
                 console.table(procsTable);
                 console.table(this.resourceQueue);
@@ -203,6 +210,7 @@ class ITProject {
                             setup(build) {
                                 build.onEnd(result => {
                                     console.log(`node build ended with ${result.errors.length} errors`);
+                                    result.errors.length !== 0 && process.exit(-1);
                                     // HERE: somehow restart the server from here, e.g., by sending a signal that you trap and react to inside the server.
                                 });
                             }
@@ -219,7 +227,8 @@ class ITProject {
                         react: path_1.default.resolve("./node_modules/react")
                     },
                     external: [
-                        // "url", "path", "fs",
+                        // "url", 
+                        "path", "fs",
                         // "react",
                         "stream",
                         "tests.test.js", "features.test.js"
@@ -248,6 +257,7 @@ class ITProject {
                             setup(build) {
                                 build.onEnd(result => {
                                     console.log(`web build ended with ${result.errors.length} errors`);
+                                    result.errors.length !== 0 && process.exit(-1);
                                     // HERE: somehow restart the server from here, e.g., by sending a signal that you trap and react to inside the server.
                                 });
                             }
@@ -345,7 +355,7 @@ class ITProject {
                             }
                             else if (messageType === "testeranto:adios") {
                                 console.log("adios WS", name);
-                                this.releaseTestResources(name);
+                                this.releaseTestResources(payload);
                             }
                         });
                     });
@@ -375,9 +385,9 @@ class ITProject {
                                     console.log("hola IPC", packet);
                                     this.requestResource(packet.data.requirement, 'ipc');
                                 });
-                                pm2_bus.on("testeranto:adios", (packet) => {
-                                    console.log("adios IPC", packet);
-                                    this.releaseTestResources(packet.data.name);
+                                pm2_bus.on("testeranto:adios", (payload) => {
+                                    console.log("adios IPC", payload);
+                                    this.releaseTestResources(payload.data);
                                 });
                             });
                             this
@@ -432,6 +442,7 @@ class ITProject {
                                         }
                                     });
                                 }
+                                this.exitCodes[inputFilePath] = null;
                                 return [inputFilePath, ...m];
                             }, []);
                             setInterval(this.mainLoop, TIMEOUT).unref();
@@ -470,7 +481,11 @@ class ITProject {
         this.spinCycle = (this.spinCycle + 1) % this.spinAnimation.length;
         return this.spinAnimation[this.spinCycle];
     }
-    async releaseTestResources(name) {
+    async releaseTestResources(payload) {
+        const name = payload.testResourceConfiguration.name;
+        const failed = payload.failed;
+        console.log("releaseTestResources", name, failed);
+        // reset ports
         pm2_1.default.list((err, processes) => {
             processes.forEach((proc) => {
                 if (proc.name === name) {
@@ -482,6 +497,7 @@ class ITProject {
                 }
             });
         });
+        this.exitCodes[name] = failed;
     }
     allocateViaWs(resourceRequest) {
         const pName = resourceRequest.requirement.name;

package/dist/common/Web.js

@@ -5,7 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("./core");
 const core_2 = __importDefault(require("./core"));
+const electron_1 = require("electron");
 const webSocket = new WebSocket("ws://localhost:8080");
+const receiveTestResourceConfig = async (t, testresource) => {
+    const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(testresource);
+    webSocket.send(JSON.stringify({
+        type: "testeranto:adios",
+        failed,
+        data: {
+            testResourceConfiguration: t.test.testResourceConfiguration,
+            results: t.toObj(),
+        },
+    }));
+    Promise.all([...artifacts, logPromise]).then(async () => {
+        electron_1.ipcRenderer.invoke('quit-app', failed);
+    });
+};
 exports.default = async (input, testSpecification, testImplementation, testInterface, testResourceRequirement = core_1.defaultTestResourceRequirement) => {
     const mrt = new core_2.default(input, testSpecification, testImplementation, testInterface, testResourceRequirement, testInterface.assertioner || (async (t) => t), testInterface.beforeEach ||
         async function (subject, initialValues, testResource) {
@@ -20,13 +35,7 @@ exports.default = async (input, testSpecification, testImplementation, testInter
     try {
         const partialTestResource = JSON.parse(testResourceArg);
         if (partialTestResource.fs && partialTestResource.ports) {
-            // const failed = await t.receiveTestResourceConfig(partialTestResource);
-            // (window as any).exit(failed)
-            const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource);
-            Promise.all([...artifacts, logPromise]).then(async () => {
-                // process.exit(await failed ? 1 : 0);
-                window.exit(failed);
-            });
+            receiveTestResourceConfig(t, partialTestResource);
         }
         else {
             console.log("test configuration is incomplete", partialTestResource);
@@ -48,21 +57,7 @@ exports.default = async (input, testSpecification, testImplementation, testInter
                     const resourcesFromPm2 = msg.data.testResourceConfiguration;
                     const secondTestResource = Object.assign(Object.assign({ fs: "." }, JSON.parse(JSON.stringify(partialTestResource))), JSON.parse(JSON.stringify(resourcesFromPm2)));
                     console.log("secondTestResource", secondTestResource);
-                    const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource);
-                    Promise.all([...artifacts, logPromise]).then(async () => {
-                        // process.exit(await failed ? 1 : 0);
-                        window.exit(failed);
-                    });
-                    webSocket.send(JSON.stringify({
-                        type: "testeranto:adios",
-                        data: {
-                            testResourceConfiguration: t.test.testResourceConfiguration,
-                            results: t.toObj(),
-                        },
-                    }));
-                    document.write("all done");
-                    // app.exit(failed ? 1 : 0);
-                    // process.exit(failed ? 1 : 0);
+                    receiveTestResourceConfig(t, secondTestResource);
                 });
             });
         }