cob-cli 2.46.0-beta.5 → 2.46.0-beta.7

package/lib/commands/test.js

@@ -10,6 +10,7 @@ const { checkRepoVersion } = require("../commands/upgradeRepo");
 async function test (args) {    
     let restoreChanges, error = "";
     let cmdEnv
+    let spawned
     try {
         checkRepoVersion()
         console.log("Start testing… ")
@@ -22,8 +23,8 @@ async function test (args) {
         } else {
             await cmdEnv.applyCurrentCommandEnvironmentChanges()
         }
-        customUIsContinuosReload(cmdEnv, args.dashboard)
-        
+        spawned = await customUIsContinuosReload(cmdEnv, args.dashboard)
+
         let key;
         do {
             key = await getKeypress()
@@ -36,8 +37,8 @@ async function test (args) {
     } finally {
         restoreChanges && await restoreChanges()
         cmdEnv && await cmdEnv.unApplyCurrentCommandEnvironmentChanges() // Repõe as configurações
-        process.kill(process.pid, "SIGINT");
-        // Dá tempo aos subprocessos para morrer
+        await spawned.stop();
+        // Dá tempo aos subprocessos para morrer (acho que já não é preciso)
         setTimeout(() => {
             if(!error) {
                 console.log( "\n"
@@ -49,4 +50,4 @@ async function test (args) {
         }, 2000);
     }
 }
-module.exports = test
+module.exports = test

package/lib/task_lists/test_customUIsContinuosReload.js

@@ -2,12 +2,17 @@ const execa = require('execa');
 const path = require('path');
 const concurrently = require('concurrently');
 const fs= require('fs');
+const util  = require('util');
+const child_process = require('child_process');
+const exec = util.promisify(child_process.exec);
+
 
 async function customUIsContinuosReload(cmdEnv, dashboard) {
     process.env.dash_dir = dashboard
     process.env.server = "https://" + cmdEnv.server
 
     let commands = []
+    let isStopping = false;
 
     let dashboardPath = path.resolve(".") + "/recordm/customUI/" + dashboard;
     let dashboardPathIsDirectory = false;
@@ -47,14 +52,40 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
         prefixColor: "blue" 
     }) 
 
-    concurrently( commands, {
+    const conc = concurrently( commands, {
         prefix: 'name',
         inputStream: process.stdin,
         handleInput: false,
         killOthers: ['failure', 'success']
-    }).catch( err => { 
-        console.log("press any key " + "(except enter)".red + " to stop the tests... \n  ")
-        process.kill(process.pid, "SIGINT");
-    })
+    });
+
+    const stopEverything = async function(){
+        isStopping = true;
+        for(const spawn of conc.commands) {
+            // console.log("\n killing spawn [" + spawn.pid + "] " + spawn.command )
+        
+            // win32 seems to not kill child processes, and concurrently wraps executions with a cmd.exe shell
+            if (process.platform === 'win32') {
+                try {
+                    await exec(`taskkill /PID ${spawn.pid} /T /F`)
+                } catch (err) {
+                    console.error("error trying to taskkill process tree", err)
+                }
+
+            } else {
+                spawn.kill("SIGINT");
+            }
+        }
+    }
+
+    conc.result.catch( _err => { 
+        if(isStopping) return;
+
+        stopEverything();
+    });
+
+    return {
+        stop: stopEverything
+    };
 }
-exports.customUIsContinuosReload = customUIsContinuosReload;
+exports.customUIsContinuosReload = customUIsContinuosReload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.46.0-beta.5",
+  "version": "2.46.0-beta.7",
   "description": "A command line utility to help Cult of Bits partners develop with higher speed and reusing common code and best practices.",
   "preferGlobal": true,
   "repository": {
@@ -22,7 +22,7 @@
     "cmd-line-importer": "^1.0.0",
     "colors": "^1.4.0",
     "commander": "^5.1.0",
-    "concurrently": "^5.3.0",
+    "concurrently": "^8.0.0",
     "execa": "^4.0.3",
     "fast-glob": "^3.2.5",
     "file-cookie-store": "^0.2.1",

package/.tool-versions

@@ -1 +0,0 @@
-nodejs 16.20.2

package/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  compilerOptions": {
-    "module": "commonjs",
-    "target": "ESNext",
-    "checkJs": false
-  },
-  "exclude": [
-    "node_modules"
-  ]
-}