@nu-art/build-and-install 0.204.87 → 0.204.89

package/build-and-install.js

@@ -12,9 +12,13 @@ runner
     .execute()
     .then(() => {
     ts_common_1.StaticLogger.logInfo('completed');
+    process.on('SIGINT', () => {
+        console.log('DEADEDAEDAEDAEDAEDAD');
+        return process.exit(0);
+    });
     //TODO: make it an array of non exit params
     if (!params_1.RuntimeParams.launch && !params_1.RuntimeParams.watch)
-        process.exit(0);
+        return process.exit(0);
 })
     .catch(err => {
     ts_common_1.StaticLogger.logError('Failed with error: ', err);

package/core/params/params.d.ts

@@ -1,4 +1,4 @@
-import { BaseCliParam } from '@nu-art/commando/cli/cli-params';
+import { BaseCliParam } from '@nu-art/commando/cli-params/types';
 export declare const BaiParam_Help: BaseCliParam<'help', boolean>;
 export declare const BaiParam_DependencyTree: BaseCliParam<'dependencyTree', boolean>;
 export declare const BaiParam_CheckCyclicImports: BaseCliParam<'checkCyclicImports', boolean>;
@@ -30,6 +30,7 @@ export declare const BaiParam_DeployBackend: BaseCliParam<'deployBackend', strin
 export declare const BaiParam_DeployFrontend: BaseCliParam<'deployFrontend', string>;
 export declare const BaiParam_NoGit: BaseCliParam<'noGit', boolean>;
 export declare const BaiParam_Debug: BaseCliParam<'debug', boolean>;
+export declare const BaiParam_Verbose: BaseCliParam<'verbose', boolean>;
 export declare const BaiParam_QuickDeploy: BaseCliParam<'quickDeploy', boolean>;
 export declare const BaiParam_Publish: BaseCliParam<'publish', string>;
 export declare const BaiParam_AllLogs: BaseCliParam<'allLogs', boolean>;
@@ -37,5 +38,5 @@ export declare const BaiParam_CloseScreenOnExit: BaseCliParam<'closeOnExit', boo
 export declare const BaiParam_EncounterManager: BaseCliParam<'encounterManager', boolean>;
 export declare const BaiParam_EncounterManagerListen: BaseCliParam<'encounterManagerListen', boolean>;
 export declare const BaiParam_UsePackage: BaseCliParam<'usePackage', string[]>;
-export declare const AllBaiParams: (BaseCliParam<"help", boolean> | BaseCliParam<"dependencyTree", boolean> | BaseCliParam<"checkCyclicImports", boolean> | BaseCliParam<"printEnv", boolean> | BaseCliParam<"continue", boolean> | BaseCliParam<"environment", string> | BaseCliParam<"setup", boolean> | BaseCliParam<"install", boolean> | BaseCliParam<"installPackages", boolean> | BaseCliParam<"installGlobals", boolean> | BaseCliParam<"clean", boolean> | BaseCliParam<"purge", boolean> | BaseCliParam<"generate", boolean> | BaseCliParam<"generateDocs", boolean> | BaseCliParam<"noBuild", boolean> | BaseCliParam<"dryRun", boolean> | BaseCliParam<"runWithThunderstorm", boolean> | BaseCliParam<"withCommando", boolean> | BaseCliParam<"noThunderstorm", boolean> | BaseCliParam<"lint", boolean> | BaseCliParam<"watch", boolean> | BaseCliParam<"test", string> | BaseCliParam<"launch", string> | BaseCliParam<"launchFrontend", boolean> | BaseCliParam<"launchBackend", boolean> | BaseCliParam<"debugBackend", boolean> | BaseCliParam<"deploy", string> | BaseCliParam<"deployBackend", string> | BaseCliParam<"deployFrontend", string> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"closeOnExit", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean> | BaseCliParam<"usePackage", string[]>)[];
-export declare const RuntimeParams: import("@nu-art/commando/cli/cli-params").CliParams<(BaseCliParam<"help", boolean> | BaseCliParam<"dependencyTree", boolean> | BaseCliParam<"checkCyclicImports", boolean> | BaseCliParam<"printEnv", boolean> | BaseCliParam<"continue", boolean> | BaseCliParam<"environment", string> | BaseCliParam<"setup", boolean> | BaseCliParam<"install", boolean> | BaseCliParam<"installPackages", boolean> | BaseCliParam<"installGlobals", boolean> | BaseCliParam<"clean", boolean> | BaseCliParam<"purge", boolean> | BaseCliParam<"generate", boolean> | BaseCliParam<"generateDocs", boolean> | BaseCliParam<"noBuild", boolean> | BaseCliParam<"dryRun", boolean> | BaseCliParam<"runWithThunderstorm", boolean> | BaseCliParam<"withCommando", boolean> | BaseCliParam<"noThunderstorm", boolean> | BaseCliParam<"lint", boolean> | BaseCliParam<"watch", boolean> | BaseCliParam<"test", string> | BaseCliParam<"launch", string> | BaseCliParam<"launchFrontend", boolean> | BaseCliParam<"launchBackend", boolean> | BaseCliParam<"debugBackend", boolean> | BaseCliParam<"deploy", string> | BaseCliParam<"deployBackend", string> | BaseCliParam<"deployFrontend", string> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"closeOnExit", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean> | BaseCliParam<"usePackage", string[]>)[]>;
+export declare const AllBaiParams: (BaseCliParam<"help", boolean> | BaseCliParam<"dependencyTree", boolean> | BaseCliParam<"checkCyclicImports", boolean> | BaseCliParam<"printEnv", boolean> | BaseCliParam<"continue", boolean> | BaseCliParam<"environment", string> | BaseCliParam<"setup", boolean> | BaseCliParam<"install", boolean> | BaseCliParam<"installPackages", boolean> | BaseCliParam<"installGlobals", boolean> | BaseCliParam<"clean", boolean> | BaseCliParam<"purge", boolean> | BaseCliParam<"generate", boolean> | BaseCliParam<"generateDocs", boolean> | BaseCliParam<"noBuild", boolean> | BaseCliParam<"dryRun", boolean> | BaseCliParam<"runWithThunderstorm", boolean> | BaseCliParam<"withCommando", boolean> | BaseCliParam<"noThunderstorm", boolean> | BaseCliParam<"lint", boolean> | BaseCliParam<"watch", boolean> | BaseCliParam<"test", string> | BaseCliParam<"launch", string> | BaseCliParam<"launchFrontend", boolean> | BaseCliParam<"launchBackend", boolean> | BaseCliParam<"debugBackend", boolean> | BaseCliParam<"deploy", string> | BaseCliParam<"deployBackend", string> | BaseCliParam<"deployFrontend", string> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"verbose", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"closeOnExit", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean> | BaseCliParam<"usePackage", string[]>)[];
+export declare const RuntimeParams: import("@nu-art/commando/cli-params/types").CliParams<(BaseCliParam<"help", boolean> | BaseCliParam<"dependencyTree", boolean> | BaseCliParam<"checkCyclicImports", boolean> | BaseCliParam<"printEnv", boolean> | BaseCliParam<"continue", boolean> | BaseCliParam<"environment", string> | BaseCliParam<"setup", boolean> | BaseCliParam<"install", boolean> | BaseCliParam<"installPackages", boolean> | BaseCliParam<"installGlobals", boolean> | BaseCliParam<"clean", boolean> | BaseCliParam<"purge", boolean> | BaseCliParam<"generate", boolean> | BaseCliParam<"generateDocs", boolean> | BaseCliParam<"noBuild", boolean> | BaseCliParam<"dryRun", boolean> | BaseCliParam<"runWithThunderstorm", boolean> | BaseCliParam<"withCommando", boolean> | BaseCliParam<"noThunderstorm", boolean> | BaseCliParam<"lint", boolean> | BaseCliParam<"watch", boolean> | BaseCliParam<"test", string> | BaseCliParam<"launch", string> | BaseCliParam<"launchFrontend", boolean> | BaseCliParam<"launchBackend", boolean> | BaseCliParam<"debugBackend", boolean> | BaseCliParam<"deploy", string> | BaseCliParam<"deployBackend", string> | BaseCliParam<"deployFrontend", string> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"verbose", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"closeOnExit", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean> | BaseCliParam<"usePackage", string[]>)[]>;

package/core/params/params.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RuntimeParams = exports.AllBaiParams = exports.BaiParam_UsePackage = exports.BaiParam_EncounterManagerListen = exports.BaiParam_EncounterManager = exports.BaiParam_CloseScreenOnExit = exports.BaiParam_AllLogs = exports.BaiParam_Publish = exports.BaiParam_QuickDeploy = exports.BaiParam_Debug = exports.BaiParam_NoGit = exports.BaiParam_DeployFrontend = exports.BaiParam_DeployBackend = exports.BaiParam_Deploy = exports.BaiParam_DebugBackend = exports.BaiParam_LaunchBackend = exports.BaiParam_LaunchFrontend = exports.BaiParam_Launch = exports.BaiParam_Test = exports.BaiParam_Watch = exports.BaiParam_Lint = exports.BaiParam_NoThunderstorm = exports.BaiParam_WithCommando = exports.BaiParam_RunWithThunderstorm = exports.BaiParam_DryRun = exports.BaiParam_NoBuild = exports.BaiParam_GenerateDocs = exports.BaiParam_Generate = exports.BaiParam_Purge = exports.BaiParam_Clean = exports.BaiParam_InstallGlobals = exports.BaiParam_InstallPackages = exports.BaiParam_Install = exports.BaiParam_Setup = exports.BaiParam_SetEnv = exports.BaiParam_continue = exports.BaiParam_PrintEnv = exports.BaiParam_CheckCyclicImports = exports.BaiParam_DependencyTree = exports.BaiParam_Help = void 0;
-const cli_params_1 = require("@nu-art/commando/cli/cli-params");
+exports.RuntimeParams = exports.AllBaiParams = exports.BaiParam_UsePackage = exports.BaiParam_EncounterManagerListen = exports.BaiParam_EncounterManager = exports.BaiParam_CloseScreenOnExit = exports.BaiParam_AllLogs = exports.BaiParam_Publish = exports.BaiParam_QuickDeploy = exports.BaiParam_Verbose = exports.BaiParam_Debug = exports.BaiParam_NoGit = exports.BaiParam_DeployFrontend = exports.BaiParam_DeployBackend = exports.BaiParam_Deploy = exports.BaiParam_DebugBackend = exports.BaiParam_LaunchBackend = exports.BaiParam_LaunchFrontend = exports.BaiParam_Launch = exports.BaiParam_Test = exports.BaiParam_Watch = exports.BaiParam_Lint = exports.BaiParam_NoThunderstorm = exports.BaiParam_WithCommando = exports.BaiParam_RunWithThunderstorm = exports.BaiParam_DryRun = exports.BaiParam_NoBuild = exports.BaiParam_GenerateDocs = exports.BaiParam_Generate = exports.BaiParam_Purge = exports.BaiParam_Clean = exports.BaiParam_InstallGlobals = exports.BaiParam_InstallPackages = exports.BaiParam_Install = exports.BaiParam_Setup = exports.BaiParam_SetEnv = exports.BaiParam_continue = exports.BaiParam_PrintEnv = exports.BaiParam_CheckCyclicImports = exports.BaiParam_DependencyTree = exports.BaiParam_Help = void 0;
+const CLIParamsResolver_1 = require("@nu-art/commando/cli-params/CLIParamsResolver");
 const ts_common_1 = require("@nu-art/ts-common");
 //util regex function
 const regexTemplate = (regexp) => (0, ts_common_1.exists)(regexp) ? `.*${regexp}.*` : '.*';
@@ -229,6 +229,13 @@ exports.BaiParam_Debug = {
     type: 'boolean',
     description: 'Will print the parameters the script is running with'
 };
+exports.BaiParam_Verbose = {
+    keys: ['--verbose', '-d'],
+    keyName: 'verbose',
+    group: 'Other',
+    type: 'boolean',
+    description: 'Set log level to verbose'
+};
 exports.BaiParam_QuickDeploy = {
     keys: ['--quick-deploy', '-qd'],
     keyName: 'quickDeploy',
@@ -316,11 +323,12 @@ exports.AllBaiParams = [
     exports.BaiParam_DeployFrontend,
     exports.BaiParam_NoGit,
     exports.BaiParam_Debug,
+    exports.BaiParam_Verbose,
     exports.BaiParam_Publish,
     exports.BaiParam_AllLogs,
     exports.BaiParam_CloseScreenOnExit,
     exports.BaiParam_EncounterManager,
     exports.BaiParam_EncounterManagerListen, exports.BaiParam_UsePackage
 ];
-const params = cli_params_1.CLIParams_Resolver.create(...exports.AllBaiParams).resolveParamValue();
+const params = CLIParamsResolver_1.CLIParamsResolver.create(...exports.AllBaiParams).resolveParamValue();
 exports.RuntimeParams = params;

package/logic/ProjectManager.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectManager = exports.PackageBuildPhaseType_Project = exports.PackageBuildPhaseType_PackageWithOutput = exports.PackageBuildPhaseType_Package = void 0;
 const ts_common_1 = require("@nu-art/ts-common");
 const params_1 = require("../core/params/params");
-const tools_1 = require("@nu-art/commando/core/tools");
+const tools_1 = require("@nu-art/commando/shell/tools");
 const map_project_packages_1 = require("./map-project-packages");
 const consts_1 = require("../core/consts");
 const fs = __importStar(require("fs"));

package/logic/command-executors/CommandExecutor_FirebaseFunction.d.ts

@@ -8,15 +8,12 @@ export declare class CommandExecutor_FirebaseFunction {
     private readonly EMULATOR_KILL_LOG;
     private readonly pkg;
     private readonly commandos;
-    private listeners;
     private onReadyCallbacks;
     constructor(pkg: Package_FirebaseFunctionsApp);
     private initListeners;
     private clearPorts;
     private runProxy;
     private runEmulator;
-    private getPID;
-    private onReady;
     execute(): Promise<this>;
     kill(): Promise<void>;
     addOnReadyCallback(cb: OnReadyCallback): void;

package/logic/command-executors/CommandExecutor_FirebaseFunction.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandExecutor_FirebaseFunction = void 0;
 const nvm_1 = require("@nu-art/commando/cli/nvm");
 const basic_1 = require("@nu-art/commando/cli/basic");
-const cli_1 = require("@nu-art/commando/core/cli");
 const ts_common_1 = require("@nu-art/ts-common");
 const params_1 = require("../../core/params/params");
 class CommandExecutor_FirebaseFunction {
@@ -22,28 +21,11 @@ class CommandExecutor_FirebaseFunction {
     }
     //######################### Inner Logic #########################
     initListeners() {
-        this.listeners = {
-            proxy: {
-                pid: new cli_1.CommandoCLIKeyValueListener(new RegExp(`${this.PROXY_PID_LOG}=(\\d+)`)),
-                kill: new cli_1.CommandoCLIListener(() => this.commandos.proxy.close(), this.PROXY_KILL_LOG),
-            },
-            emulator: {
-                pid: new cli_1.CommandoCLIKeyValueListener(new RegExp(`${this.EMULATOR_PID_LOG}=(\\d+)`)),
-                kill: new cli_1.CommandoCLIListener(() => this.commandos.emulator.close(), this.EMULATOR_KILL_LOG),
-            },
-            onReady: new cli_1.CommandoCLIListener(() => this.onReady(), new RegExp('.*Emulator Hub running.*')),
-        };
-        this.listeners.proxy.kill.listen(this.commandos.proxy);
-        this.listeners.proxy.pid.listen(this.commandos.proxy);
-        this.listeners.emulator.kill.listen(this.commandos.emulator);
-        this.listeners.emulator.pid.listen(this.commandos.emulator);
-        this.listeners.onReady.listen(this.commandos.emulator);
     }
     async clearPorts() {
         const allPorts = Array.from({ length: 10 }, (_, i) => `${this.pkg.envConfig.basePort + i}`);
         await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
             .setUID(this.pkg.name)
-            .debug()
             .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
             .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
             .append('echo ')
@@ -71,13 +53,6 @@ class CommandExecutor_FirebaseFunction {
             .append(`echo "${this.EMULATOR_KILL_LOG} \${pid}"`)
             .execute();
     }
-    getPID(listener) {
-        const pid = Number(listener.getValue());
-        return isNaN(pid) ? undefined : pid;
-    }
-    async onReady() {
-        await Promise.all(this.onReadyCallbacks.map(cb => cb(this.pkg)));
-    }
     //######################### Functions #########################
     async execute() {
         await (0, ts_common_1.sleep)(2 * ts_common_1.Second * CommandExecutor_FirebaseFunction.staggerCount++);
@@ -87,10 +62,6 @@ class CommandExecutor_FirebaseFunction {
         return this;
     }
     async kill() {
-        const emulatorPid = this.getPID(this.listeners.emulator.pid);
-        const proxyPid = this.getPID(this.listeners.proxy.pid);
-        await this.commandos.emulator.gracefullyKill(emulatorPid);
-        await this.commandos.proxy.gracefullyKill(proxyPid);
     }
     addOnReadyCallback(cb) {
         this.onReadyCallbacks.push(cb);

package/logic/command-executors/CommandExecutor_FirebaseHosting.d.ts

@@ -4,10 +4,8 @@ export declare class CommandExecutor_FirebaseHosting {
     private readonly APP_KILL_LOG;
     private readonly pkg;
     private readonly commando;
-    private listeners;
     constructor(pkg: Package_FirebaseHostingApp);
     private initListeners;
-    private getPID;
     private clearPorts;
     private runApp;
     execute(): Promise<this>;

package/logic/command-executors/CommandExecutor_FirebaseHosting.js

@@ -4,7 +4,6 @@ exports.CommandExecutor_FirebaseHosting = void 0;
 const nvm_1 = require("@nu-art/commando/cli/nvm");
 const ts_common_1 = require("@nu-art/ts-common");
 const basic_1 = require("@nu-art/commando/cli/basic");
-const cli_1 = require("@nu-art/commando/core/cli");
 class CommandExecutor_FirebaseHosting {
     constructor(pkg) {
         this.APP_PID_LOG = '_APP_PID_';
@@ -17,21 +16,10 @@ class CommandExecutor_FirebaseHosting {
     }
     //######################### Inner Logic #########################
     initListeners() {
-        this.listeners = {
-            pid: new cli_1.CommandoCLIKeyValueListener(new RegExp(`${this.APP_PID_LOG}=(\\d+)`)),
-            kill: new cli_1.CommandoCLIListener(() => this.commando.close(), this.APP_KILL_LOG),
-        };
-        this.listeners.pid.listen(this.commando);
-        this.listeners.kill.listen(this.commando);
-    }
-    getPID() {
-        const pid = Number(this.listeners.pid.getValue());
-        return isNaN(pid) ? undefined : pid;
     }
     async clearPorts() {
         await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
             .setUID(this.pkg.name)
-            .debug()
             .append(`array=($(lsof -ti:${[this.pkg.envConfig.hostingPort].join(',')}))`)
             .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
             .append('echo ')
@@ -55,8 +43,6 @@ class CommandExecutor_FirebaseHosting {
         return this;
     }
     async kill() {
-        const appPid = this.getPID();
-        await this.commando.gracefullyKill(appPid);
     }
 }
 exports.CommandExecutor_FirebaseHosting = CommandExecutor_FirebaseHosting;

package/logic/command-executors/CommandExecutor_Python.d.ts

@@ -4,10 +4,8 @@ export declare class CommandExecutor_Python {
     private readonly APP_KILL_LOG;
     private readonly pkg;
     private readonly commando;
-    private listeners;
     constructor(pkg: Package_Python);
     private initListeners;
-    private getPID;
     private enterVenv;
     private setPythonPath;
     private runApp;

package/logic/command-executors/CommandExecutor_Python.js

@@ -1,32 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandExecutor_Python = void 0;
-const cli_1 = require("@nu-art/commando/core/cli");
 const basic_1 = require("@nu-art/commando/cli/basic");
-const tools_1 = require("@nu-art/commando/core/tools");
+const tools_1 = require("@nu-art/commando/shell/tools");
+const shell_1 = require("@nu-art/commando/shell");
 class CommandExecutor_Python {
     constructor(pkg) {
         this.APP_PID_LOG = '_APP_PID_';
         this.APP_KILL_LOG = '_APP_KILLED_';
         this.pkg = pkg;
-        this.commando = cli_1.CommandoInteractive.create(basic_1.Cli_Basic)
+        this.commando = shell_1.CommandoInteractive.create(basic_1.Cli_Basic)
             .setUID(this.pkg.name)
-            .cd((0, tools_1.convertToFullPath)(this.pkg.path))
-            .debug();
+            .cd((0, tools_1.convertToFullPath)(this.pkg.path));
         this.initListeners();
     }
     //######################### Inner Logic #########################
     initListeners() {
-        this.listeners = {
-            pid: new cli_1.CommandoCLIKeyValueListener(new RegExp(`${this.APP_PID_LOG}=(\\d+)`)),
-            kill: new cli_1.CommandoCLIListener(() => this.commando.close(), this.APP_KILL_LOG),
-        };
-        this.listeners.pid.listen(this.commando);
-        this.listeners.kill.listen(this.commando);
-    }
-    getPID() {
-        const pid = Number(this.listeners.pid.getValue());
-        return isNaN(pid) ? undefined : pid;
     }
     async enterVenv() {
         await this.commando.append('source venv/bin/activate').execute();
@@ -59,8 +48,6 @@ class CommandExecutor_Python {
         await this.runApp();
     }
     async kill() {
-        const appPid = this.getPID();
-        await this.commando.gracefullyKill(appPid);
     }
 }
 exports.CommandExecutor_Python = CommandExecutor_Python;

package/logic/map-project-packages.js

@@ -5,7 +5,7 @@ const consts_1 = require("../core/consts");
 const fs_1 = require("fs");
 const types_1 = require("../core/types");
 const ts_common_1 = require("@nu-art/ts-common");
-const tools_1 = require("@nu-art/commando/core/tools");
+const tools_1 = require("@nu-art/commando/shell/tools");
 function getRuntimePackageBaseDetails_Sourceless(basePackage) {
     return {
         name: basePackage.name,

package/package.json

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

package/phases/phases.js

@@ -29,7 +29,7 @@ const map_project_packages_1 = require("../logic/map-project-packages");
 const fs = __importStar(require("fs"));
 const fs_1 = require("fs");
 const consts_1 = require("../core/consts");
-const tools_1 = require("@nu-art/commando/core/tools");
+const tools_1 = require("@nu-art/commando/shell/tools");
 const ts_common_1 = require("@nu-art/ts-common");
 const types_1 = require("../core/types");
 const generate_1 = require("../core/package/generate");
@@ -41,10 +41,10 @@ const chokidar = __importStar(require("chokidar"));
 const consts_2 = require("../defaults/consts");
 const project_manager_1 = require("../project-manager");
 const ProjectScreen_1 = require("../screen/ProjectScreen");
-const cli_1 = require("@nu-art/commando/core/cli");
 const RunningProcessLogs_1 = require("../screen/RunningProcessLogs");
 const command_executors_1 = require("../logic/command-executors");
 const CommandExecutor_Python_1 = require("../logic/command-executors/CommandExecutor_Python");
+const shell_1 = require("@nu-art/commando/shell");
 const CONST_ThunderstormVersionKey = 'THUNDERSTORM_SDK_VERSION';
 const CONST_ThunderstormDependencyKey = 'THUNDERSTORM_DEPENDENCY_VERSION';
 const CONST_ProjectVersionKey = 'APP_VERSION';
@@ -421,7 +421,7 @@ exports.Phase_PrepareCompile = {
                         '_ts',
                     ];
                     const command = `find . \\( -name ${otherFiles.map(suffix => `'*.${suffix}'`).join(' -o -name ')} \\) | cpio -pdm "${pkg.output}" > /dev/null`;
-                    await cli_1.Commando.create(basic_1.Cli_Basic)
+                    await shell_1.Commando.create(basic_1.Cli_Basic)
                         .cd(`${pkg.path}/src/main`)
                         .append(command)
                         .execute();
@@ -629,7 +629,6 @@ exports.Phase_Launch = {
             runningAppsLogs.create();
         }
         const logClient = new ts_common_1.LogClient_MemBuffer(pkg.name);
-        logClient.setForTerminal();
         logClient.setComposer((tag, level) => {
             ts_common_1._logger_finalDate.setTime(Date.now() - ts_common_1._logger_timezoneOffset);
             const date = ts_common_1._logger_finalDate.toISOString().replace(/T/, '_').replace(/Z/, '').substring(0, 23).split('_')[1];

package/screen/ProjectScreen.js

@@ -49,7 +49,6 @@ class ProjectScreen extends ConsoleScreen_1.ConsoleScreen {
         this.setState({
             packageData: initialData
         });
-        this.logClient.setForTerminal();
         this.logClient.setComposer((tag, level) => {
             ts_common_1._logger_finalDate.setTime(Date.now() - ts_common_1._logger_timezoneOffset);
             const date = ts_common_1._logger_finalDate.toISOString().replace(/T/, '_').replace(/Z/, '').substring(0, 23).split('_')[1];

package/v2/phase/consts.d.ts

@@ -13,7 +13,7 @@ export declare const phaseKey_PrintEnv = "print-env";
 export declare const phase_PrintEnv: Phase<'printEnv'>;
 export type Phase_Debug = typeof phase_Debug;
 export declare const phaseKey_Debug = "debug";
-export declare const phase_Debug: Phase<'debug'>;
+export declare const phase_Debug: Phase<'printDebug'>;
 export declare const phases_Terminating: Phase<string>[];
 export type Phase_Purge = typeof phase_Purge;
 export declare const phaseKey_Purge = "purge";

package/v2/phase/consts.js

@@ -38,8 +38,7 @@ exports.phaseKey_Debug = 'debug';
 exports.phase_Debug = {
     key: exports.phaseKey_Debug,
     name: 'Debug',
-    method: 'debug',
-    terminateAfterPhase: true,
+    method: 'printDebug',
     filter: () => params_1.RuntimeParams.debug,
 };
 exports.phases_Terminating = [
@@ -47,7 +46,7 @@ exports.phases_Terminating = [
     exports.phase_PrintDependencyTree,
     exports.phase_CheckCyclicImports,
     exports.phase_PrintEnv,
-    // phase_Debug
+    exports.phase_Debug
 ];
 exports.phaseKey_Purge = 'purge';
 exports.phase_Purge = {
@@ -123,6 +122,7 @@ exports.phase_Launch = {
     name: 'Launch',
     method: 'launch',
     filter: () => !!params_1.RuntimeParams.launch,
+    dependencyPhaseKeys: [exports.phaseKey_ResolveConfigs],
 };
 exports.phases_Launch = [
     exports.phase_Launch,

package/v2/phase-runner/PhaseRunner.d.ts

@@ -7,6 +7,7 @@ export declare class PhaseRunner extends BaseUnit implements UnitPhaseImplemento
     private readonly units;
     private unitDependencyTree;
     private readonly project;
+    private killed?;
     private runningStatus;
     private phaseFilter;
     constructor(projectPath: RelativePath);
@@ -16,7 +17,6 @@ export declare class PhaseRunner extends BaseUnit implements UnitPhaseImplemento
     private prepareProjectParams;
     private prepareDefaultFileRouts;
     private buildUnitDependencyTree;
-    private printInit;
     private phaseFilters;
     private executeImpl;
     registerUnits(units: BaseUnit | BaseUnit[]): void;
@@ -60,5 +60,5 @@ export declare class PhaseRunner extends BaseUnit implements UnitPhaseImplemento
     killRunner(): Promise<void>;
     printHelp(): Promise<void>;
     printEnv(): Promise<void>;
-    debug(): Promise<void>;
+    printDebug(): Promise<void>;
 }

package/v2/phase-runner/PhaseRunner.js

@@ -30,15 +30,19 @@ const core_1 = require("../unit/core");
 const params_1 = require("../../core/params/params");
 const MemStorage_1 = require("@nu-art/ts-common/mem-storage/MemStorage");
 const fs_1 = __importStar(require("fs"));
-const tools_1 = require("@nu-art/commando/core/tools");
 const thunderstorm_1 = require("../unit/thunderstorm");
 const consts_1 = require("../../defaults/consts");
 const nvm_1 = require("@nu-art/commando/cli/nvm");
 const basic_1 = require("@nu-art/commando/cli/basic");
 const PhaseRunnerDispatcher_1 = require("./PhaseRunnerDispatcher");
-const consts_2 = require("./consts");
+const tools_1 = require("@nu-art/commando/shell/tools");
 const types_1 = require("./types");
 const BAIScreenManager_1 = require("../screens/BAIScreenManager");
+const consts_2 = require("./consts");
+const CONST_ThunderstormVersionKey = 'THUNDERSTORM_SDK_VERSION';
+const CONST_ThunderstormDependencyKey = 'THUNDERSTORM_DEPENDENCY_VERSION';
+const CONST_ProjectVersionKey = 'APP_VERSION';
+const CONST_ProjectDependencyKey = 'APP_VERSION_DEPENDENCY';
 class PhaseRunner extends core_1.BaseUnit {
     constructor(projectPath) {
         super({ label: 'Phase Runner', key: 'phase-runner' });
@@ -70,7 +74,12 @@ class PhaseRunner extends core_1.BaseUnit {
         this.units = [this];
         this.project = { path: (0, tools_1.convertToFullPath)(projectPath), config: {} };
         this.phaseFilter = this.phaseFilters[types_1.PhaseRunnerMode_Normal];
-        this.setMinLevel(ts_common_1.LogLevel.Verbose);
+        this.setMinLevel(ts_common_1.LogLevel.Info);
+        console.log('RuntimeParams.debug', params_1.RuntimeParams.debug);
+        if (params_1.RuntimeParams.debug)
+            this.setMinLevel(ts_common_1.LogLevel.Debug);
+        if (params_1.RuntimeParams.verbose)
+            this.setMinLevel(ts_common_1.LogLevel.Debug);
     }
     //######################### Initialization #########################
     async init() {
@@ -99,7 +108,6 @@ class PhaseRunner extends core_1.BaseUnit {
         //Load running status
         await this.loadRunningStatus();
         //Print init results
-        this.printInit();
         this.setStatus('Initialized');
         const units = this.units.filter(unit => unit !== this);
         await Promise.all(units.map(unit => {
@@ -134,10 +142,10 @@ class PhaseRunner extends core_1.BaseUnit {
     prepareProjectParams() {
         var _a;
         const params = (_a = this.project.config.params) !== null && _a !== void 0 ? _a : {};
-        params[consts_2.CONST_ThunderstormVersionKey] = this.project.config.thunderstormVersion;
-        params[consts_2.CONST_ThunderstormDependencyKey] = this.project.config.thunderstormVersion;
-        params[consts_2.CONST_ProjectVersionKey] = this.project.config.projectVersion;
-        params[consts_2.CONST_ProjectDependencyKey] = this.project.config.projectVersion;
+        params[CONST_ThunderstormVersionKey] = this.project.config.thunderstormVersion;
+        params[CONST_ThunderstormDependencyKey] = this.project.config.thunderstormVersion;
+        params[CONST_ProjectVersionKey] = this.project.config.projectVersion;
+        params[CONST_ProjectDependencyKey] = this.project.config.projectVersion;
         return params;
     }
     prepareDefaultFileRouts() {
@@ -189,11 +197,6 @@ class PhaseRunner extends core_1.BaseUnit {
         const toPrint = dependencyTree.map(row => row.map(unit => unit.config.label));
         this.logDebug('Unit Dependency Tree:', toPrint);
     }
-    printInit() {
-        this.logDebug('Runner Params:', RunnerParams_1.MemKey_RunnerParams.get());
-        this.logDebug('Project Config:', RunnerParams_1.MemKey_ProjectConfig.get());
-        this.logDebug('Default File Routes:', consts_1.MemKey_DefaultFiles.get());
-    }
     async executeImpl() {
         for (const phase of this.phases) {
             const phaseDidRun = await this.executePhase(phase);
@@ -201,6 +204,7 @@ class PhaseRunner extends core_1.BaseUnit {
             if (phaseDidRun && phase.terminateAfterPhase)
                 break;
         }
+        this.killed = false;
     }
     //######################### Unit Logic #########################
     registerUnits(units) {
@@ -273,17 +277,21 @@ class PhaseRunner extends core_1.BaseUnit {
             }
             const unitsToRun = (0, ts_common_1.flatArray)(units);
             await Promise.all(unitsToRun.map(unit => unit[phase.method]()));
+            if (this.killed)
+                return true;
             return true;
         }
         //Run units according to dependency tree
         for (const row of units) {
+            if (this.killed)
+                break;
             const index = units.indexOf(row);
             const runningStatusRowIndex = (_a = this.runningStatus.packageDependencyIndex) !== null && _a !== void 0 ? _a : 0;
             //Skip running status holds a larger index for the same phase
             if ((phaseIndex === runningPhaseIndex) && index < runningStatusRowIndex)
                 continue;
-            this.logWarning(`Phase Index ${phaseIndex}, Row Index ${index}`);
-            this.logWarning(`RunningStatus Phase Index: ${runningPhaseIndex}, RunningStatus Row Index: ${runningStatusRowIndex}`);
+            // this.logDebug(`Phase Index ${phaseIndex}, Row Index ${index}`);
+            // this.logDebug(`RunningStatus Phase Index: ${runningPhaseIndex}, RunningStatus Row Index: ${runningStatusRowIndex}`);
             if (phaseIndex > runningPhaseIndex) {
                 //Index of the current phase is larger, update the running status
                 this.runningStatus = { phaseKey: phase.key, packageDependencyIndex: 0 };
@@ -329,7 +337,7 @@ class PhaseRunner extends core_1.BaseUnit {
     }
     //######################### Running Status #########################
     async setRunningStatus() {
-        this.logDebug('Setting Running Status', this.runningStatus);
+        this.logVerbose('Setting Running Status', this.runningStatus);
         if (!fs_1.default.existsSync(consts_1.Default_OutputFiles.output))
             await fs_1.promises.mkdir(consts_1.Default_OutputFiles.output, { recursive: true });
         await fs_1.promises.writeFile(consts_1.Default_OutputFiles.runningStatus, (0, ts_common_1.__stringify)(this.runningStatus, true));
@@ -370,10 +378,11 @@ class PhaseRunner extends core_1.BaseUnit {
         });
     }
     async killRunner() {
+        this.killed = true;
+        await this.setRunningStatus();
         this.logDebug('Killing units');
         await Promise.all(this.units.map(unit => unit.kill()));
         this.logDebug('Units killed');
-        await this.setRunningStatus();
     }
     //######################### Phase Implementation #########################
     async printHelp() {
@@ -404,11 +413,12 @@ class PhaseRunner extends core_1.BaseUnit {
             .append('echo "base version:"; bash --version')
             .execute();
     }
-    async debug() {
-        // const configs = this.units.map(unit => unit.config);
-        // this.logInfo(JSON.stringify(configs, null, 2));
+    async printDebug() {
+        this.logDebug('Runner Params:', RunnerParams_1.MemKey_RunnerParams.get());
+        this.logDebug('Project Config:', RunnerParams_1.MemKey_ProjectConfig.get());
+        this.logDebug('Default File Routes:', consts_1.MemKey_DefaultFiles.get());
         const dependencyTree = this.unitDependencyTree.map(row => row.map(unit => unit.config.label));
-        this.logInfo(dependencyTree);
+        this.logInfo('Unit Dependencies Tree:', dependencyTree);
     }
 }
 exports.PhaseRunner = PhaseRunner;

package/v2/screens/BAIScreen.js

@@ -45,7 +45,7 @@ class BAIScreen extends ConsoleContainer_1.ConsoleContainer {
         //Create the log client
         this.logClient = new ts_common_1.LogClient_MemBuffer(`${logClientKey}.txt`);
         //Set for terminal flag
-        this.logClient.setForTerminal();
+        this.logClient.keepLogsNaturalColors();
         //Set log composer to print logs with timestamps
         this.logClient.setComposer((tag, level) => {
             ts_common_1._logger_finalDate.setTime(Date.now() - ts_common_1._logger_timezoneOffset);

package/v2/unit/core/BaseUnit.js

@@ -4,6 +4,7 @@ exports.BaseUnit = void 0;
 const ts_common_1 = require("@nu-art/ts-common");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
 const PhaseRunnerDispatcher_1 = require("../../phase-runner/PhaseRunnerDispatcher");
+const params_1 = require("../../../core/params/params");
 class BaseUnit extends ts_common_1.Logger {
     constructor(config) {
         super(config.key);
@@ -37,7 +38,6 @@ class BaseUnit extends ts_common_1.Logger {
     }
     initLogClient() {
         this.logger = new ts_common_1.LogClient_MemBuffer(this.tag);
-        this.logger.setForTerminal();
         this.logger.setComposer((tag, level) => {
             ts_common_1._logger_finalDate.setTime(Date.now() - ts_common_1._logger_timezoneOffset);
             const date = ts_common_1._logger_finalDate.toISOString().replace(/T/, '_').replace(/Z/, '').substring(0, 23).split('_')[1];
@@ -50,6 +50,8 @@ class BaseUnit extends ts_common_1.Logger {
     }
     setStatus(status) {
         this.unitStatus = status;
+        if (params_1.RuntimeParams.allLogs)
+            this.logInfo(`Unit status update: ${status}`);
         PhaseRunnerDispatcher_1.dispatcher_UnitStatusChange.dispatch(this);
     }
     //######################### Public Functions #########################

package/v2/unit/core/Unit_Python.d.ts

@@ -1,8 +1,8 @@
 import { Phase_Install } from '../../phase';
 import { UnitPhaseImplementor } from '../types';
 import { BaseUnit, BaseUnit_Config, BaseUnit_RuntimeConfig } from './BaseUnit';
-import { Commando, CommandoInteractive } from '@nu-art/commando/core/cli';
 import { Cli_Basic } from '@nu-art/commando/cli/basic';
+import { CommandoInteractive } from '@nu-art/commando/shell';
 export type Unit_Python_Config = BaseUnit_Config & {
     pathToPackage: string;
 };
@@ -12,7 +12,7 @@ export type Unit_Python_RuntimeConfig = BaseUnit_RuntimeConfig & {
     };
 };
 export declare class Unit_Python<C extends Unit_Python_Config = Unit_Python_Config, RTC extends Unit_Python_RuntimeConfig = Unit_Python_RuntimeConfig> extends BaseUnit<C, RTC> implements UnitPhaseImplementor<[Phase_Install]> {
-    protected commando: CommandoInteractive & Commando & Cli_Basic;
+    protected commando: CommandoInteractive & Cli_Basic;
     constructor(config: Unit_Python<C, RTC>['config']);
     protected init(): Promise<void>;
     private initCommando;

package/v2/unit/core/Unit_Python.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Unit_Python = void 0;
 const BaseUnit_1 = require("./BaseUnit");
-const cli_1 = require("@nu-art/commando/core/cli");
-const tools_1 = require("@nu-art/commando/core/tools");
+const tools_1 = require("@nu-art/commando/shell/tools");
 const basic_1 = require("@nu-art/commando/cli/basic");
+const shell_1 = require("@nu-art/commando/shell");
 class Unit_Python extends BaseUnit_1.BaseUnit {
     constructor(config) {
         super(config);
         this.addToClassStack(Unit_Python);
-        this.commando = cli_1.CommandoInteractive.create(basic_1.Cli_Basic);
+        this.commando = shell_1.CommandoInteractive.create(basic_1.Cli_Basic);
     }
     async init() {
         await super.init();

package/v2/unit/core/Unit_Typescript.js

@@ -25,13 +25,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Unit_Typescript = void 0;
 const BaseUnit_1 = require("./BaseUnit");
-const tools_1 = require("@nu-art/commando/core/tools");
 const consts_1 = require("../../../core/consts");
 const ts_common_1 = require("@nu-art/ts-common");
 const map_project_packages_1 = require("../../../logic/map-project-packages");
 const fs = __importStar(require("fs"));
 const fs_1 = require("fs");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
+const tools_1 = require("@nu-art/commando/shell/tools");
 const PackageJsonTargetKey_Template = 'template';
 const PackageJsonTargetKey_Root = 'root';
 const PackageJsonTargetKey_Dist = 'dist';

package/v2/unit/core/Unit_TypescriptLib.js

@@ -31,11 +31,12 @@ const fs_1 = require("fs");
 const basic_1 = require("@nu-art/commando/cli/basic");
 const ts_common_1 = require("@nu-art/ts-common");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
-const cli_1 = require("@nu-art/commando/core/cli");
 const consts_1 = require("../../../core/consts");
 const params_1 = require("../../../core/params/params");
 const runner_dispatchers_1 = require("../runner-dispatchers");
 const consts_2 = require("../consts");
+const shell_1 = require("@nu-art/commando/shell");
+const CliError_1 = require("@nu-art/commando/shell/core/CliError");
 const extensionsToLint = ['.ts', '.tsx'];
 const assetExtensions = [
     'json',
@@ -101,11 +102,15 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         const pathToTSConfig = `${pathToCompile}/tsconfig.json`;
         try {
             await nvm_1.NVM
-                .createCommando(basic_1.Cli_Basic)
+                .createInteractiveCommando(basic_1.Cli_Basic)
                 .setUID(this.config.key)
                 .cd(this.runtime.pathTo.pkg)
                 .append(`tsc -p "${pathToTSConfig}" --rootDir "${pathToCompile}" --outDir "${this.runtime.pathTo.output}"`)
-                .execute();
+                .addLogProcessor((log) => !log.includes('Now using node') && !log.includes('.nvmrc\' with version'))
+                .execute((stdout, stderr, exitCode) => {
+                if (exitCode > 0)
+                    throw new CliError_1.CommandoException(`Error compiling`, stdout, stderr, exitCode);
+            });
             // set compilation error status on success
             this.compilationError = false;
         }
@@ -120,13 +125,14 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         }
     }
     async copyAssetsToOutput() {
-        const command = `find . \\( -name ${assetExtensions.map(suffix => `'*.${suffix}'`).join(' -o -name ')} \\) | cpio -pdmuv "${this.runtime.pathTo.output}" > /dev/null 2>&1`;
-        await cli_1.Commando
+        const command = `find . \\( -name ${assetExtensions.map(suffix => `'*.${suffix}'`)
+            .join(' -o -name ')} \\) | cpio -pdmuv "${this.runtime.pathTo.output}" > /dev/null 2>&1`;
+        await shell_1.Commando
             .create(basic_1.Cli_Basic)
             .cd(`${this.runtime.pathTo.pkg}/src/main`)
-            .setStdErrorValidator(stderr => {
-            return !stderr.match(/\d+\sblock/);
-        })
+            // .setStdErrorValidator(stderr => {
+            // 	return !stderr.match(/\d+\sblock/);
+            // })
             .append(command)
             .execute();
     }
@@ -207,9 +213,9 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         this.logDebug(`Checking Cyclic Imports - ${this.config.label}`);
         await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
             .cd(this.runtime.pathTo.pkg)
-            .setStdErrorValidator(stderr => {
-            return !stderr.includes('Finding files') && !stderr.includes('Image created');
-        })
+            // .setStdErrorValidator(stderr => {
+            // 	return !stderr.includes('Finding files') && !stderr.includes('Image created');
+            // })
             .append(`npx madge --no-spinner --image "./imports-${this.config.key}.svg" --circular ${this.runtime.pathTo.output}`)
             .append('echo $?')
             .execute();

package/v2/unit/firebase-units/Unit_FirebaseFunctionsApp.d.ts

@@ -9,12 +9,9 @@ export type Unit_FirebaseFunctionsApp_Config = Unit_TypescriptLib_Config & {
 };
 export declare class Unit_FirebaseFunctionsApp<C extends Unit_FirebaseFunctionsApp_Config = Unit_FirebaseFunctionsApp_Config> extends Unit_TypescriptLib<C> implements UnitPhaseImplementor<[Phase_ResolveConfigs, Phase_Launch, Phase_DeployBackend]>, OnUnitWatchCompiled {
     static staggerCount: number;
-    private readonly PROXY_PID_LOG;
-    private readonly PROXY_KILL_LOG;
-    private readonly EMULATOR_PID_LOG;
-    private readonly EMULATOR_KILL_LOG;
+    private emulatorPid?;
+    private proxyPid?;
     private launchCommandos;
-    private listeners;
     __onUnitWatchCompiled(unit: BaseUnit): Promise<void>;
     constructor(config: Unit_FirebaseFunctionsApp<C>['config']);
     resolveConfigs(): Promise<void>;
@@ -29,13 +26,12 @@ export declare class Unit_FirebaseFunctionsApp<C extends Unit_FirebaseFunctionsA
     private resolveFunctionsRuntimeConfig;
     private createAppVersionFile;
     private createDependenciesDir;
+    private clearPorts;
+    private onLaunched;
     private initLaunch;
     private initLaunchListeners;
-    private clearPorts;
     private runProxy;
     private runEmulator;
-    private onLaunched;
-    private getPID;
     kill(): Promise<void>;
     private printFiles;
     private deployImpl;

package/v2/unit/firebase-units/Unit_FirebaseFunctionsApp.js

@@ -8,9 +8,9 @@ const params_1 = require("../../../core/params/params");
 const ts_common_1 = require("@nu-art/ts-common");
 const consts_2 = require("../../../defaults/consts");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
-const cli_1 = require("@nu-art/commando/core/cli");
 const basic_1 = require("@nu-art/commando/cli/basic");
 const nvm_1 = require("@nu-art/commando/cli/nvm");
+const shell_1 = require("@nu-art/commando/shell");
 const consts_3 = require("../../phase-runner/consts");
 const runner_dispatchers_1 = require("../runner-dispatchers");
 const CONST_VersionApp = 'version-app.json';
@@ -26,10 +26,6 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
     }
     constructor(config) {
         super(config);
-        this.PROXY_PID_LOG = '_PROXY_PID_';
-        this.PROXY_KILL_LOG = '_PROXY_KILLED_';
-        this.EMULATOR_PID_LOG = '_EMULATOR_PID_';
-        this.EMULATOR_KILL_LOG = '_EMULATOR_KILLED_';
         this.addToClassStack(Unit_FirebaseFunctionsApp);
         runner_dispatchers_1.dispatcher_WatchEvent.removeListener(this);
         runner_dispatchers_1.dispatcher_UnitWatchCompile.addListener(this);
@@ -59,8 +55,10 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
         await this.initLaunch();
         await this.initLaunchListeners();
         await this.clearPorts();
-        await this.runProxy();
-        await this.runEmulator();
+        await Promise.all([
+            this.runProxy(),
+            this.runEmulator(),
+        ]);
     }
     async deployBackend() {
         await this.printFiles();
@@ -227,7 +225,7 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
             const dependencyOutputPath = `${unit.runtime.pathTo.output}/`;
             const targetPath = `${this.runtime.pathTo.output}/.dependencies/${unit.config.key}/`;
             const pjTargetPath = `${targetPath}/${consts_1.CONST_PackageJSON}`;
-            await cli_1.Commando.create()
+            await shell_1.Commando.create()
                 .append(`mkdir -p ${targetPath}`)
                 .append(`rsync -a --delete ${dependencyOutputPath} ${targetPath}`)
                 .execute();
@@ -239,6 +237,17 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
         this.packageJson.dist = packageJsonConverter(this.packageJson.dist);
     }
     //######################### Launch Logic #########################
+    async clearPorts() {
+        const allPorts = Array.from({ length: 10 }, (_, i) => `${this.config.firebaseConfig.basePort + i}`);
+        await shell_1.Commando.create(basic_1.Cli_Basic)
+            .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
+            .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
+            .append('echo ')
+            .execute();
+    }
+    onLaunched() {
+        this.setStatus('Launch Complete');
+    }
     async initLaunch() {
         this.launchCommandos = {
             emulator: nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic).setUID(this.config.key).cd(this.runtime.pathTo.pkg),
@@ -246,70 +255,29 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
         };
     }
     async initLaunchListeners() {
-        this.listeners = {
-            proxy: {
-                pid: new cli_1.CommandoCLIKeyValueListener(new RegExp(`${this.PROXY_PID_LOG}=(\\d+)`)),
-                kill: new cli_1.CommandoCLIListener(() => this.launchCommandos.proxy.close(), this.PROXY_KILL_LOG),
-            },
-            emulator: {
-                pid: new cli_1.CommandoCLIKeyValueListener(new RegExp(`${this.EMULATOR_PID_LOG}=(\\d+)`)),
-                kill: new cli_1.CommandoCLIListener(() => this.launchCommandos.emulator.close(), this.EMULATOR_KILL_LOG),
-            },
-            onReady: new cli_1.CommandoCLIListener(() => this.onLaunched(), new RegExp('.*Emulator Hub running.*')),
-        };
-        this.listeners.proxy.kill.listen(this.launchCommandos.proxy);
-        this.listeners.proxy.pid.listen(this.launchCommandos.proxy);
-        this.listeners.emulator.kill.listen(this.launchCommandos.emulator);
-        this.listeners.emulator.pid.listen(this.launchCommandos.emulator);
-        this.listeners.onReady.listen(this.launchCommandos.emulator);
-    }
-    async clearPorts() {
-        const allPorts = Array.from({ length: 10 }, (_, i) => `${this.config.firebaseConfig.basePort + i}`);
-        await cli_1.Commando.create(basic_1.Cli_Basic)
-            .debug()
-            .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
-            .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
-            .append('echo ')
-            .execute();
+        this.launchCommandos.emulator.onLog(/.*Emulator Hub running.*/, () => this.onLaunched());
     }
     async runProxy() {
         await this.launchCommandos.proxy
-            .append('ts-node src/main/proxy.ts &')
-            .append('pid=$!')
-            .append(`echo "${this.PROXY_PID_LOG}=\${pid}"`)
-            .append(`wait \$pid`)
-            .append(`echo "${this.PROXY_KILL_LOG} \${pid}"`)
-            .execute();
+            .append('ts-node src/main/proxy.ts')
+            .executeAsync(pid => this.proxyPid = pid);
     }
     async runEmulator() {
         await this.launchCommandos.emulator
-            .append(`firebase emulators:start --export-on-exit --import=.trash/data ${params_1.RuntimeParams.debugBackend ? `--inspect-functions ${this.config.firebaseConfig.debugPort}` : ''} &`)
-            .append('pid=$!')
-            .append(`echo "${this.EMULATOR_PID_LOG}=\${pid}"`)
-            .append(`wait \$pid`)
-            .append(`echo "${this.EMULATOR_KILL_LOG} \${pid}"`)
-            .execute();
-    }
-    onLaunched() {
-        this.setStatus('Launch Complete');
-    }
-    getPID(listener) {
-        const pid = Number(listener.getValue());
-        return isNaN(pid) ? undefined : pid;
+            .append(`firebase emulators:start --export-on-exit --import=.trash/data ${params_1.RuntimeParams.debugBackend ? `--inspect-functions ${this.config.firebaseConfig.debugPort}` : ''}`)
+            .executeAsync(pid => this.emulatorPid = pid);
     }
     async kill() {
         if (!this.launchCommandos)
             return;
         this.logWarning(`Killing unit - ${this.config.label}`);
-        const emulatorPid = this.getPID(this.listeners.emulator.pid);
-        const proxyPid = this.getPID(this.listeners.proxy.pid);
-        await this.launchCommandos.emulator.gracefullyKill(emulatorPid);
-        await this.launchCommandos.proxy.gracefullyKill(proxyPid);
+        await this.launchCommandos.emulator.gracefullyKill(this.emulatorPid);
+        await this.launchCommandos.proxy.gracefullyKill(this.proxyPid);
         this.logWarning(`Unit killed - ${this.config.label}`);
     }
     //######################### Deploy Logic #########################
     async printFiles() {
-        await cli_1.Commando.create(basic_1.Cli_Basic)
+        await shell_1.Commando.create(basic_1.Cli_Basic)
             .cd(this.runtime.pathTo.output)
             .ls()
             .cat('package.json')
@@ -325,3 +293,48 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
 }
 Unit_FirebaseFunctionsApp.staggerCount = 0;
 exports.Unit_FirebaseFunctionsApp = Unit_FirebaseFunctionsApp;
+// export class CommandoCLIListener {
+//
+// 	private cb: CommandoCLIListener_Callback;
+// 	protected filter?: RegExp;
+//
+// 	constructor(callback: CommandoCLIListener_Callback, filter?: string | RegExp) {
+// 		this.cb = callback;
+// 		if (!filter)
+// 			return;
+//
+// 		if (typeof filter === 'string')
+// 			this.filter = new RegExp(filter);
+// 		else
+// 			this.filter = filter as RegExp;
+// 	}
+//
+// 	//######################### Inner Logic #########################
+//
+// 	private _process(stdout: string) {
+// 		if (!this.stdoutPassesFilter(stdout))
+// 			return false;
+//
+// 		this.process(stdout);
+// 		return true;
+// 	}
+//
+// 	private stdoutPassesFilter = (stdout: string): boolean => {
+// 		if (!this.filter)
+// 			return true;
+//
+// 		return this.filter.test(stdout);
+// 	};
+//
+// 	//######################### Functions #########################
+//
+// 	public listen = <T extends Commando | CommandoInteractive>(commando: T): T => {
+// 		const process = this._process.bind(this);
+// 		commando.addLogProcessor(process);
+// 		return commando;
+// 	};
+//
+// 	protected process(stdout: string) {
+// 		this.cb(stdout);
+// 	}
+// }

package/v2/unit/firebase-units/Unit_FirebaseHostingApp.d.ts

@@ -7,10 +7,8 @@ export type Unit_FirebaseHostingApp_Config = Unit_TypescriptLib_Config & {
     sources?: string[];
 };
 export declare class Unit_FirebaseHostingApp<C extends Unit_FirebaseHostingApp_Config = Unit_FirebaseHostingApp_Config> extends Unit_TypescriptLib<C> implements UnitPhaseImplementor<[Phase_ResolveConfigs, Phase_Launch, Phase_DeployFrontend]> {
-    private readonly APP_PID_LOG;
-    private readonly APP_KILL_LOG;
     private launchCommando;
-    private listeners;
+    private hostingPid;
     constructor(config: Unit_FirebaseHostingApp<C>['config']);
     resolveConfigs(): Promise<void>;
     compile(): Promise<void>;
@@ -23,8 +21,6 @@ export declare class Unit_FirebaseHostingApp<C extends Unit_FirebaseHostingApp_C
     protected compileImpl(): Promise<void>;
     private createAppVersionFile;
     private initLaunch;
-    private initLaunchListeners;
-    private getPID;
     private clearPorts;
     private runApp;
     kill(): Promise<void>;

package/v2/unit/firebase-units/Unit_FirebaseHostingApp.js

@@ -6,18 +6,15 @@ const params_1 = require("../../../core/params/params");
 const ts_common_1 = require("@nu-art/ts-common");
 const fs_1 = require("fs");
 const consts_1 = require("../../../core/consts");
-const tools_1 = require("@nu-art/commando/core/tools");
 const nvm_1 = require("@nu-art/commando/cli/nvm");
 const basic_1 = require("@nu-art/commando/cli/basic");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
-const cli_1 = require("@nu-art/commando/core/cli");
+const tools_1 = require("@nu-art/commando/shell/tools");
 const runner_dispatchers_1 = require("../runner-dispatchers");
 const CONST_VersionApp = 'version-app.json';
 class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     constructor(config) {
         super(config);
-        this.APP_PID_LOG = '_APP_PID_';
-        this.APP_KILL_LOG = '_APP_KILLED_';
         this.addToClassStack(Unit_FirebaseHostingApp);
         runner_dispatchers_1.dispatcher_WatchEvent.removeListener(this);
     }
@@ -38,7 +35,6 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     async launch() {
         this.setStatus('Launching');
         await this.initLaunch();
-        await this.initLaunchListeners();
         await this.clearPorts();
         await this.runApp();
     }
@@ -61,9 +57,13 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     }
     async resolveHostingJSON() {
         const envConfig = this.getEnvConfig();
-        const fileContent = envConfig.isLocal ? {} : this.config.firebaseConfig.hosting;
         const targetPath = `${this.runtime.pathTo.pkg}/${consts_1.CONST_FirebaseJSON}`;
-        await fs_1.promises.writeFile(targetPath, JSON.stringify({ hosting: fileContent }, null, 2), { encoding: 'utf-8' });
+        let fileContent;
+        if (envConfig.isLocal)
+            fileContent = {};
+        else
+            fileContent = { hosting: this.config.firebaseConfig.hosting };
+        await fs_1.promises.writeFile(targetPath, JSON.stringify(fileContent, null, 2), { encoding: 'utf-8' });
     }
     async resolveHostingRuntimeConfig() {
         var _a;
@@ -115,21 +115,8 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
             .setUID(this.config.key)
             .cd(this.runtime.pathTo.pkg);
     }
-    async initLaunchListeners() {
-        this.listeners = {
-            pid: new cli_1.CommandoCLIKeyValueListener(new RegExp(`${this.APP_PID_LOG}=(\\d+)`)),
-            kill: new cli_1.CommandoCLIListener(() => this.launchCommando.close(), this.APP_KILL_LOG),
-        };
-        this.listeners.pid.listen(this.launchCommando);
-        this.listeners.kill.listen(this.launchCommando);
-    }
-    getPID() {
-        const pid = Number(this.listeners.pid.getValue());
-        return isNaN(pid) ? undefined : pid;
-    }
     async clearPorts() {
         await this.launchCommando
-            .debug()
             .append(`array=($(lsof -ti:${[this.config.firebaseConfig.hostingPort].join(',')}))`)
             .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
             .append('echo ')
@@ -137,20 +124,15 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     }
     async runApp() {
         await this.launchCommando
-            .append(`npm run start &`)
-            .append('pid=$!')
-            .append(`echo "${this.APP_PID_LOG}=\${pid}"`)
-            .append(`wait \$pid`)
-            .append(`echo "${this.APP_KILL_LOG} \${pid}"`)
-            .execute();
+            .append('npm run start')
+            .executeAsync(pid => this.hostingPid = pid);
     }
     async kill() {
         var _a;
         if (!this.launchCommando)
             return;
         this.logWarning(`Killing unit - ${this.config.label}`);
-        const appPid = this.getPID();
-        await ((_a = this.launchCommando) === null || _a === void 0 ? void 0 : _a.gracefullyKill(appPid));
+        await ((_a = this.launchCommando) === null || _a === void 0 ? void 0 : _a.gracefullyKill(this.hostingPid));
         this.logWarning(`Unit killed - ${this.config.label}`);
     }
     //######################### Deploy Logic #########################