@nu-art/build-and-install 0.204.29 → 0.204.31

package/package.json

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

package/phases/phases.js

@@ -618,22 +618,59 @@ exports.Phase_Launch = {
                 .setUID(pkg.name).debug()
                 .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
                 .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
-                // .append(`echo ZE ZEVEL`)
+                .append('echo ')
                 .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)
                 .setUID(pkg.name)
                 .cd(pkg.path)
-                .append(`ts-node src/main/proxy.ts`);
+                .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)
                 .setUID(pkg.name)
                 .cd(pkg.path)
-                .append(`firebase emulators:start --export-on-exit --import=.trash/data ${runInDebug ? `--inspect-functions ${pkg.envConfig.ssl}` : ''}`);
+                .addStdoutProcessor(emulatorPidProcessor)
+                .append('echo ZE ZEVEL2')
+                .append(`firebase emulators:start --export-on-exit --import=.trash/data ${runInDebug ? `--inspect-functions ${pkg.envConfig.ssl}` : ''} &`)
+                .append('pid=$!')
+                .append(`echo "${EMULATOR_PID_PROCESS}=\${pid}"`)
+                .append(`wait \$pid`)
+                .append(`echo "${KILL_CONFIRM_LOG} \${pid}"`);
             await proxyCommando.execute();
             await emulatorCommando.execute();
             runningAppsLogs.addOnTerminateCallback(async () => {
                 console.log('HERE');
-                await proxyCommando.gracefullyKill();
-                await emulatorCommando.gracefullyKill();
+                await emulatorCommando.gracefullyKill(emulatorPid);
+                await proxyCommando.gracefullyKill(proxyPid);
+                runningAppsLogs.unregisterApp(pkg.name);
             });
             return;
         }
@@ -644,6 +681,7 @@ exports.Phase_Launch = {
             return nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
                 .setUID(pkg.name).debug()
                 .cd(pkg.path)
+                .append('echo ZE ZEVEL3')
                 .append(`array=($(lsof -ti:${[pkg.envConfig.hostingPort].join(',')}))`)
                 .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
                 .append(`nvm use`)

package/screen/ProjectScreen.js

@@ -11,7 +11,7 @@ class ProjectScreen extends ConsoleScreen_1.ConsoleScreen {
             title: 'Build and install',
             keyBinding: [{
                     keys: ['escape', 'q', 'C-c'],
-                    callback: () => {
+                    callback: async () => {
                         return process.exit(1); // Quit on q, esc, or ctrl-c
                     }
                 }]

package/screen/RunningProcessLogs.js

@@ -5,6 +5,7 @@ const ts_common_1 = require("@nu-art/ts-common");
 const ConsoleScreen_1 = require("@nu-art/commando/console/ConsoleScreen");
 class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
     constructor() {
+        let killed = false;
         super({
             smartCSR: true,
             title: 'Runtime-Logs',
@@ -12,6 +13,14 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
                 {
                     keys: ['C-c'],
                     callback: async () => {
+                        if (killed)
+                            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);
                     }