@nu-art/build-and-install 0.204.18 → 0.204.20

package/logic/ProjectManager.d.ts

@@ -35,6 +35,7 @@ export declare class ProjectManager extends Logger {
     private readonly projectScreen;
     private logger?;
     constructor();
+    clearLogger(): void;
     showAllLogs(): void;
     showPrettyLogs(): void;
     private loadPackage;

package/logic/ProjectManager.js

@@ -67,16 +67,18 @@ class ProjectManager extends ts_common_1.Logger {
         this.setMinLevel(ts_common_1.LogLevel.Verbose);
         this.logInfo('Runtime params:', params_1.RuntimeParams);
     }
-    showAllLogs() {
-        var _a;
+    clearLogger() {
         if (this.logger)
             ts_common_1.BeLogged.removeConsole(this.logger);
+    }
+    showAllLogs() {
+        var _a;
+        this.clearLogger();
         (_a = this.projectScreen) === null || _a === void 0 ? void 0 : _a.disable();
         ts_common_1.BeLogged.addClient(this.logger = ts_common_1.LogClient_Terminal);
     }
     showPrettyLogs() {
-        if (this.logger)
-            ts_common_1.BeLogged.removeConsole(this.logger);
+        this.clearLogger();
         this.projectScreen.enable();
         ts_common_1.BeLogged.addClient(this.logger = this.projectScreen.logClient);
     }

package/package.json

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

package/phases/phases.js

@@ -42,6 +42,7 @@ 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 CONST_ThunderstormVersionKey = 'THUNDERSTORM_SDK_VERSION';
 const CONST_ThunderstormDependencyKey = 'THUNDERSTORM_DEPENDENCY_VERSION';
 const CONST_ProjectVersionKey = 'APP_VERSION';
@@ -585,6 +586,7 @@ exports.Phase_CompileWatch = {
         });
     }
 };
+let runningAppsLogs;
 let counter = 0;
 exports.Phase_Launch = {
     type: 'package',
@@ -593,28 +595,51 @@ exports.Phase_Launch = {
     mandatoryPhases: [exports.Phase_ResolveEnv],
     filter: async (pkg) => { var _a; return !!((_a = pkg.name.match(new RegExp(params_1.RuntimeParams.launch))) === null || _a === void 0 ? void 0 : _a[0]) && (pkg.type === 'firebase-functions-app' || pkg.type === 'firebase-hosting-app'); },
     action: async (pkg) => {
+        const projectManager = project_manager_1.MemKey_ProjectManager.get();
         const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
+        if (!runningAppsLogs) {
+            projectScreen.disable();
+            projectManager.clearLogger();
+            runningAppsLogs = new RunningProcessLogs_1.RunningProcessLogs();
+            runningAppsLogs.enable();
+        }
+        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];
+            return `${date} ${(0, ts_common_1._logger_getPrefix)(level)}:  `;
+        });
+        logClient.setFilter((level, tag) => {
+            return tag === pkg.name;
+        });
+        ts_common_1.BeLogged.addClient(logClient);
         projectScreen.updateOrCreatePackage(pkg.name, 'Launching...');
         if (pkg.type === 'firebase-functions-app') {
             await (0, ts_common_1.sleep)(1000 * counter++);
             const allPorts = Array.from({ length: 10 }, (_, i) => `${pkg.envConfig.basePort + i}`);
             const command = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+                .setUID(pkg.name)
                 .cd(pkg.path)
                 .append(`nvm use`)
                 .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
                 .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`);
             command.append(`firebase emulators:start --export-on-exit --import=.trash/data ${runInDebug ? `--inspect-functions ${pkg.envConfig.ssl}` : ''}`);
+            runningAppsLogs.registerApp(pkg.name, logClient);
             return command
                 .execute();
         }
-        if (pkg.type === 'firebase-hosting-app')
+        if (pkg.type === 'firebase-hosting-app') {
+            runningAppsLogs.registerApp(pkg.name, logClient);
             return nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+                .setUID(pkg.name)
                 .cd(pkg.path)
                 .append(`array=($(lsof -ti:${[pkg.envConfig.basePort - 1].join(',')}))`)
                 .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
                 .append(`nvm use`)
                 .append(`npm run start`)
                 .execute();
+        }
         projectScreen.updateOrCreatePackage(pkg.name, 'Died');
     }
 };

package/screen/ProjectScreen.d.ts

@@ -17,6 +17,7 @@ export declare class ProjectScreen {
     private enabled;
     constructor(initialData: PackageStatus[]);
     enable(): void;
+    isEnabled(): boolean;
     disable(): void;
     renderScreen: () => void;
     endRun: () => void;

package/screen/ProjectScreen.js

@@ -1,8 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemKey_ProjectScreen = exports.ProjectScreen = void 0;
 // @ts-ignore
-const neo_blessed_1 = require("neo-blessed");
+const blessed = __importStar(require("neo-blessed"));
 const MemStorage_1 = require("@nu-art/ts-common/mem-storage/MemStorage");
 const ts_common_1 = require("@nu-art/ts-common");
 class ProjectScreen {
@@ -64,7 +87,7 @@ class ProjectScreen {
     }
     enable() {
         this.enabled = true;
-        this.screen = neo_blessed_1.blessed.screen({
+        this.screen = blessed.screen({
             smartCSR: true,
             title: 'Build and install',
         });
@@ -72,7 +95,7 @@ class ProjectScreen {
             return process.exit(1); // Quit on q, esc, or ctrl-c
         });
         // Create the UI components
-        this.phaseBox = neo_blessed_1.blessed.text({
+        this.phaseBox = blessed.text({
             parent: this.screen,
             top: 0,
             left: 0,
@@ -87,7 +110,7 @@ class ProjectScreen {
             },
             align: 'center'
         });
-        this.packageTable = neo_blessed_1.blessed.listtable({
+        this.packageTable = blessed.listtable({
             parent: this.screen,
             top: 3,
             left: 0,
@@ -111,7 +134,7 @@ class ProjectScreen {
                 },
             }
         });
-        this.titleElement = neo_blessed_1.blessed.text({
+        this.titleElement = blessed.text({
             parent: this.screen,
             top: 0,
             right: 0,
@@ -126,7 +149,7 @@ class ProjectScreen {
             },
             align: 'center'
         });
-        this.logger = neo_blessed_1.blessed.log({
+        this.logger = blessed.log({
             parent: this.screen,
             top: 3,
             right: 0,
@@ -144,6 +167,9 @@ class ProjectScreen {
             align: 'left'
         });
     }
+    isEnabled() {
+        return this.enabled;
+    }
     disable() {
         this.enabled = false;
         if (!this.screen)

package/screen/RunningProcessLogs.d.ts

@@ -1,10 +1,5 @@
 import { LogClient_MemBuffer } from '@nu-art/ts-common';
 import { ConsoleScreen } from '@nu-art/commando/console/ConsoleScreen';
-export type PackageStatus = {
-    packageName: string;
-    status: string;
-    error?: string;
-};
 export declare class RunningProcessLogs extends ConsoleScreen<{
     logs: {
         key: string;

package/screen/RunningProcessLogs.js

@@ -5,7 +5,17 @@ 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() {
-        super();
+        super({
+            smartCSR: true,
+            title: 'Runtime-Logs',
+            keyBinding: [
+                {
+                    keys: ['C-c'],
+                    callback: () => process.exit(0)
+                }
+            ]
+        });
+        this.state = { logs: [] };
     }
     registerApp(appKey, logClient) {
         const logs = this.state.logs;
@@ -14,6 +24,10 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
             throw new ts_common_1.BadImplementationException(`already have log for appkey: ${appKey}`);
         logs.push({ key: appKey, logClient });
         this.recalculateWidgets(logs);
+        logClient.setLogAppendedListener(() => {
+            this.render();
+            // might have a leak.. need to remove the listener at some point
+        });
         this.setState({ logs });
     }
     unregisterApp(appKey) {
@@ -26,31 +40,42 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
         this.setState({ logs });
     }
     recalculateWidgets(logs) {
-        this.clearScreen(true);
-        const totalApps = logs.length;
-        const fraction = 100 / totalApps;
-        logs.forEach((log, index) => {
-            const top = `${(index * fraction).toFixed(0)}%`;
-            const height = `${fraction.toFixed(0)}%`;
-            this.createWidget('log', {
-                top: top,
-                left: 0,
-                width: '100%',
-                height: height,
-                label: ` Log for ${log.key} `,
-                border: { type: 'line' },
-                scrollable: true,
-                scrollbar: {
-                    ch: ' ',
-                    track: {
-                        bg: 'grey'
+        this.clearScreen(false);
+        const fittingGrid = gridPreset[logs.length - 1];
+        if (!(0, ts_common_1.exists)(fittingGrid))
+            return;
+        if (!fittingGrid)
+            throw new Error(`No preset available for this number of cells ${logs.length}`);
+        let index = 0;
+        let xPos = 0;
+        fittingGrid.forEach(column => {
+            let yPos = 0;
+            column.forEach(cell => {
+                const [fracWidth, fracHeight] = cell;
+                const width = 100 * fracWidth;
+                const height = 100 * fracHeight;
+                this.createWidget('log', {
+                    top: `${yPos}%`,
+                    left: `${xPos}%`,
+                    width: `${width}%`,
+                    height: `${height}%`,
+                    label: ` Log for ${logs[index++].key} `,
+                    border: { type: 'line' },
+                    scrollable: true,
+                    scrollbar: {
+                        ch: ' ',
+                        track: {
+                            bg: 'grey'
+                        },
+                        style: {
+                            inverse: true
+                        }
                     },
-                    style: {
-                        inverse: true
-                    }
-                },
-                mouse: true
+                    mouse: true
+                });
+                yPos += height; // Assumes all cells in a column have the same height
             });
+            xPos += column[0][0] * 100;
         });
     }
     render() {
@@ -60,3 +85,19 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
     }
 }
 exports.RunningProcessLogs = RunningProcessLogs;
+const columnOf1_halfWidth = [[0.5, 1]];
+const columnOf2_halfWidth = [[0.5, 0.5], [0.5, 0.5]];
+const columnOf3_halfWidth = [[0.5, 1 / 3], [0.5, 1 / 3], [0.5, 1 / 3]];
+const columnOf2_3rdWidth = [[1 / 3, 0.5], [1 / 3, 0.5]];
+const columnOf3_3rdWidth = [[1 / 3, 1 / 3], [1 / 3, 1 / 3], [1 / 3, 1 / 3]];
+const gridPreset = [
+    [[[1, 1]]],
+    [columnOf1_halfWidth, columnOf1_halfWidth],
+    [columnOf2_halfWidth, columnOf1_halfWidth],
+    [columnOf2_halfWidth, columnOf2_halfWidth],
+    [columnOf3_halfWidth, columnOf2_halfWidth],
+    [columnOf3_halfWidth, columnOf3_halfWidth],
+    [columnOf3_3rdWidth, columnOf2_3rdWidth, columnOf2_3rdWidth],
+    [columnOf3_3rdWidth, columnOf3_3rdWidth, columnOf2_3rdWidth],
+    [columnOf3_3rdWidth, columnOf3_3rdWidth, columnOf3_3rdWidth],
+];