@nu-art/build-and-install 0.204.33 → 0.204.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/build-and-install",
-  "version": "0.204.33",
+  "version": "0.204.34",
   "description": "",
   "keywords": [
     "TacB0sS",

package/phases/phases.js

@@ -611,9 +611,11 @@ exports.Phase_Launch = {
         ts_common_1.BeLogged.addClient(logClient);
         projectScreen.updateOrCreatePackage(pkg.name, 'Launching...');
         if (pkg.type === 'firebase-functions-app') {
+            //Stagger app initialization
             await (0, ts_common_1.sleep)(1000 * counter++);
-            const allPorts = Array.from({ length: 10 }, (_, i) => `${pkg.envConfig.basePort + i}`);
             runningAppsLogs.registerApp(pkg.name, logClient);
+            //Make sure app ports are released
+            const allPorts = Array.from({ length: 10 }, (_, i) => `${pkg.envConfig.basePort + i}`);
             await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
                 .setUID(pkg.name).debug()
                 .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
@@ -622,42 +624,27 @@ exports.Phase_Launch = {
                 .execute();
             const KILL_CONFIRM_LOG = `KILL PROCESS`;
             const PROXY_PID_PROCESS = 'PROXY_PID_PROCESS';
-            let proxyPid;
-            const proxyPidProcessor = (stdout) => {
-                var _a;
-                if (stdout.includes(KILL_CONFIRM_LOG))
-                    return proxyCommando.close();
-                const pid = (_a = stdout.match(new RegExp(`${PROXY_PID_PROCESS}=(\\d+)`))) === null || _a === void 0 ? void 0 : _a[1];
-                if (!(0, ts_common_1.exists)(pid))
-                    return;
-                proxyPid = +pid;
-                // proxyCommando.removeStdoutProcessor(proxyPidProcessor);
-            };
-            const proxyCommando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+            const EMULATOR_PID_PROCESS = 'EMULATOR_PID_PROCESS';
+            const proxyCommando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic);
+            //Listen on proxy kill command & proxy pid
+            const proxyPIDListener = new cli_1.CommandoCLIKeyValueListener(new RegExp(`${PROXY_PID_PROCESS}=(\\d+)`));
+            new cli_1.CommandoCLIListener(() => proxyCommando.close(), KILL_CONFIRM_LOG).listen(proxyCommando);
+            proxyPIDListener.listen(proxyCommando)
                 .setUID(pkg.name)
                 .cd(pkg.path)
-                .addStdoutProcessor(proxyPidProcessor)
                 .append('echo ZE ZEVEL1')
                 .append('ts-node src/main/proxy.ts &')
                 .append('pid=$!')
                 .append(`echo "${PROXY_PID_PROCESS}=\${pid}"`)
                 .append(`wait \$pid`)
                 .append(`echo "${KILL_CONFIRM_LOG} \${pid}"`);
-            const EMULATOR_PID_PROCESS = 'EMULATOR_PID_PROCESS';
-            let emulatorPid;
-            const emulatorPidProcessor = (stdout) => {
-                var _a;
-                if (stdout.includes(KILL_CONFIRM_LOG))
-                    return emulatorCommando.close();
-                const pid = (_a = stdout.match(new RegExp(`${EMULATOR_PID_PROCESS}=(\\d+)`))) === null || _a === void 0 ? void 0 : _a[1];
-                if (!(0, ts_common_1.exists)(pid))
-                    return;
-                emulatorPid = +pid;
-            };
-            const emulatorCommando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+            const emulatorCommando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic);
+            //Listen on emulator kill command & emulator pid
+            const emulatorPIDListener = new cli_1.CommandoCLIKeyValueListener(new RegExp(`${EMULATOR_PID_PROCESS}=(\\d+)`));
+            new cli_1.CommandoCLIListener(() => emulatorCommando.close(), KILL_CONFIRM_LOG).listen(emulatorCommando);
+            emulatorPIDListener.listen(emulatorCommando)
                 .setUID(pkg.name)
                 .cd(pkg.path)
-                .addStdoutProcessor(emulatorPidProcessor)
                 .append('echo ZE ZEVEL2')
                 .append(`firebase emulators:start --export-on-exit --import=.trash/data ${runInDebug ? `--inspect-functions ${pkg.envConfig.ssl}` : ''} &`)
                 .append('pid=$!')
@@ -667,9 +654,10 @@ exports.Phase_Launch = {
             await proxyCommando.execute();
             await emulatorCommando.execute();
             runningAppsLogs.addOnTerminateCallback(async () => {
-                console.log('HERE');
-                await emulatorCommando.gracefullyKill(emulatorPid);
-                await proxyCommando.gracefullyKill(proxyPid);
+                const emulatorPid = Number(emulatorPIDListener.getValue());
+                const proxyPid = Number(proxyPIDListener.getValue());
+                await emulatorCommando.gracefullyKill(isNaN(emulatorPid) ? undefined : emulatorPid);
+                await proxyCommando.gracefullyKill(isNaN(proxyPid) ? undefined : proxyPid);
                 runningAppsLogs.unregisterApp(pkg.name);
             });
             return;

package/screen/ProjectScreen.js

@@ -76,7 +76,7 @@ class ProjectScreen extends ConsoleScreen_1.ConsoleScreen {
             tags: true,
             style: {
                 border: { fg: 'green' },
-                fg: 'black',
+                fg: 'green',
             },
             align: 'center'
         });
@@ -114,9 +114,9 @@ class ProjectScreen extends ConsoleScreen_1.ConsoleScreen {
             tags: true,
             style: {
                 border: { fg: 'green' },
-                fg: 'black',
+                fg: 'green',
             },
-            align: 'center'
+            align: 'center',
         });
         this.logger = this.createWidget('log', {
             top: 3,

package/screen/RunningProcessLogs.js

@@ -17,10 +17,6 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
                             return;
                         killed = true;
                         // this.dispose();
-                        console.log('exiting1');
-                        await (0, ts_common_1.sleep)(2000);
-                        console.log('exiting2');
-                        await (0, ts_common_1.sleep)(2000);
                         await Promise.all(this.onTerminateCallbacks.map(callback => callback()));
                         process.exit(0);
                     }