testeranto 0.47.34 → 0.48.0

package/src/Project.ts

@@ -1,19 +1,17 @@
-import WebSocket, { WebSocketServer } from 'ws';
 import esbuild, { BuildOptions } from "esbuild";
 import fs from "fs";
-import path from "path";
 import fsExists from "fs.promises.exists";
+import path from "path";
 import pm2 from "pm2";
 import readline from 'readline';
+import WebSocket, { WebSocketServer } from 'ws';
 
 import { TesterantoFeatures } from "./Features";
 import { IBaseConfig, IRunTime, ITestTypes } from "./Types";
 import { ITTestResourceRequirement } from './core';
 
 readline.emitKeypressEvents(process.stdin);
-
-if (process.stdin.isTTY)
-  process.stdin.setRawMode(true);
+if (process.stdin.isTTY) process.stdin.setRawMode(true);
 
 const TIMEOUT = 2000;
 const OPEN_PORT = "";
@@ -90,6 +88,7 @@ export class ITProject {
     this.clearScreen = config.clearScreen;
     this.devMode = config.devMode;
 
+    // mark each port as open
     Object.values(config.ports).forEach((port) => {
       this.ports[port] = OPEN_PORT;
     });
@@ -97,10 +96,7 @@ export class ITProject {
     const testPath = `${process.cwd()}/${config.tests}`;
     const featurePath = `${process.cwd()}/${config.features}`;
 
-    process.on('SIGINT', () => this.initiateShutdown("CTRL+C"));
-    process.on('SIGQUIT', () => this.initiateShutdown("Keyboard quit"));
-    process.on('SIGTERM', () => this.initiateShutdown("'kill' command"));
-
+    // q to quit, x to kill
     process.stdin.on('keypress', (str, key) => {
       if (key.name === 'q') {
         this.initiateShutdown("'q' command")
@@ -112,6 +108,9 @@ export class ITProject {
         process.exit(-1)
       }
     });
+    // process.on('SIGINT', () => this.initiateShutdown("CTRL+C"));
+    // process.on('SIGQUIT', () => this.initiateShutdown("Keyboard quit"));
+    // process.on('SIGTERM', () => this.initiateShutdown("'kill' command"));
 
     import(testPath).then((tests) => {
       this.tests = tests.default;
@@ -119,6 +118,7 @@ export class ITProject {
       import(featurePath).then((features) => {
         this.features = features.default;
 
+        // Make html files for webtests. Is this necessary?
         Promise.resolve(Promise.all(
           [
             ...this.getSecondaryEndpointsPoints("web")
@@ -162,14 +162,13 @@ export class ITProject {
             js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`
           },
           target: "esnext",
-
-          // packages: "external",
           format: "esm",
           splitting: true,
           outExtension: { '.js': '.mjs' },
           platform: "node",
-
-          external: ["tests.test.js", "features.test.js", "react"],
+          external: [
+            "tests.test.js",
+            "features.test.js", "react"],
 
           outbase: config.outbase,
           outdir: config.outdir,
@@ -184,22 +183,22 @@ export class ITProject {
             '.jpg': 'binary',
           },
           plugins: [
-            ...(config.plugins || []),
-            {
-              name: 'rebuild-notify',
-              setup(build) {
-                build.onEnd(result => {
-                  console.log(`node build ended with ${result.errors.length} errors`);
-                  console.log(result)
-                  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.
-                })
-              }
-            },
+            ...(config.nodePlugins || []),
+            // this should npt be necessary
+            // {
+            //   name: 'rebuild-notify',
+            //   setup(build) {
+            //     build.onEnd(result => {
+            //       console.log(`node build ended with ${result.errors.length} errors`);
+            //       console.log(result)
+            //       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.
+            //     })
+            //   }
+            // },
           ],
         };
         const esbuildConfigWeb: BuildOptions = {
-          // packages: "external",
           target: "esnext",
           format: "esm",
           splitting: true,
@@ -216,7 +215,8 @@ export class ITProject {
             "fs",
             // "react",
             "stream",
-            "tests.test.js", "features.test.js"],
+            "tests.test.js",
+            "features.test.js"],
           platform: "browser",
 
           outbase: config.outbase,
@@ -237,19 +237,20 @@ export class ITProject {
             '.jpg': 'binary',
           },
           plugins: [
-            ...(config.plugins || []),
-
-            {
-              name: 'rebuild-notify',
-              setup(build) {
-                build.onEnd(result => {
-                  console.log(`web build ended with ${result.errors.length} errors`);
-                  console.log(result)
-                  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.
-                })
-              }
-            },
+            ...(config.webPlugins || []),
+
+            // This should not be necessary
+            // {
+            //   name: 'rebuild-notify',
+            //   setup(build) {
+            //     build.onEnd(result => {
+            //       console.log(`web build ended with ${result.errors.length} errors`);
+            //       console.log(result)
+            //       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.
+            //     })
+            //   }
+            // },
           ],
         };
 
@@ -537,14 +538,12 @@ export class ITProject {
   }
 
   private shutdown() {
-
     let i = 0;
     new Promise((res, reh) => {
       console.log("final results: ");
       const procsTable: any[] = [];
       pm2.list((err, procs) => {
         procs.forEach((proc, ndx) => {
-
           const exitCode = this.exitCodes[proc.name as string]
           if (exitCode !== 0) {
             i++;
@@ -562,11 +561,8 @@ export class ITProject {
         })
       })
     }).then((failures: number) => {
-      console.log("Stopping PM2");
       pm2.stop("all", (e) => console.error(e));
-      // pm2.killDaemon((e) => console.error(e));
       pm2.disconnect();
-
       console.log(`gracefully exiting with ${failures} failures`)
       process.exit(failures);
     })

package/src/Types.ts

@@ -2,7 +2,8 @@ export type IBaseConfig = {
   clearScreen: boolean;
   devMode: boolean;
   features: string;
-  plugins: any[];
+  webPlugins: any[];
+  nodePlugins: any[];
   minify: boolean;
   outbase: string;
   outdir: string;