@nu-art/build-and-install 0.204.27 → 0.204.28

package/package.json

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

package/phases/phases.js

@@ -593,7 +593,7 @@ exports.Phase_Launch = {
         const projectManager = project_manager_1.MemKey_ProjectManager.get();
         const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
         if (!runningAppsLogs) {
-            projectScreen.dispose();
+            projectScreen.dispose().releaseScreen();
             projectManager.clearLogger();
             runningAppsLogs = new RunningProcessLogs_1.RunningProcessLogs();
             runningAppsLogs.create();
@@ -619,16 +619,21 @@ exports.Phase_Launch = {
                 .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
                 .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
                 .execute();
-            await nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+            const proxyCommando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
                 .setUID(pkg.name)
                 .cd(pkg.path)
-                .append(`ts-node src/main/proxy.ts`)
-                .execute();
-            await nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+                .append(`ts-node src/main/proxy.ts`);
+            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}` : ''}`)
-                .execute();
+                .append(`firebase emulators:start --export-on-exit --import=.trash/data ${runInDebug ? `--inspect-functions ${pkg.envConfig.ssl}` : ''}`);
+            await proxyCommando.execute();
+            await emulatorCommando.execute();
+            runningAppsLogs.addOnTerminateCallback(async () => {
+                console.log('HERE');
+                await proxyCommando.gracefullyKill();
+                await emulatorCommando.gracefullyKill();
+            });
             return;
         }
         if (pkg.type === 'firebase-hosting-app') {

package/screen/RunningProcessLogs.d.ts

@@ -1,4 +1,4 @@
-import { LogClient_MemBuffer } from '@nu-art/ts-common';
+import { AsyncVoidFunction, LogClient_MemBuffer } from '@nu-art/ts-common';
 import { ConsoleScreen } from '@nu-art/commando/console/ConsoleScreen';
 export declare class RunningProcessLogs extends ConsoleScreen<{
     logs: {
@@ -6,9 +6,11 @@ export declare class RunningProcessLogs extends ConsoleScreen<{
         logClient: LogClient_MemBuffer;
     }[];
 }> {
+    private onTerminateCallbacks;
     constructor();
     protected createWidgets(): void;
     registerApp(appKey: string, logClient: LogClient_MemBuffer): void;
     unregisterApp(appKey: string): void;
     protected render(): void;
+    addOnTerminateCallback: (callback: AsyncVoidFunction) => void;
 }

package/screen/RunningProcessLogs.js

@@ -11,10 +11,17 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
             keyBinding: [
                 {
                     keys: ['C-c'],
-                    callback: () => process.exit(0)
+                    callback: async () => {
+                        await Promise.all(this.onTerminateCallbacks.map(callback => callback()));
+                        process.exit(0);
+                    }
                 }
             ]
         });
+        this.onTerminateCallbacks = [];
+        this.addOnTerminateCallback = (callback) => {
+            this.onTerminateCallbacks.push(callback);
+        };
         this.state = { logs: [] };
     }
     createWidgets() {