@nu-art/build-and-install 0.204.61 → 0.204.63
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/params/params.d.ts +3 -2
- package/core/params/params.js +10 -2
- package/package.json +1 -1
- package/phases/phases.js +30 -22
- package/screen/RunningProcessLogs.d.ts +1 -0
- package/screen/RunningProcessLogs.js +17 -2
package/core/params/params.d.ts
CHANGED
|
@@ -34,5 +34,6 @@ export declare const BaiParam_QuickDeploy: BaseCliParam<'quickDeploy', boolean>;
|
|
|
34
34
|
export declare const BaiParam_Publish: BaseCliParam<'publish', string>;
|
|
35
35
|
export declare const BaiParam_AllLogs: BaseCliParam<'allLogs', boolean>;
|
|
36
36
|
export declare const BaiParam_EncounterManager: BaseCliParam<'encounterManager', boolean>;
|
|
37
|
-
export declare const
|
|
38
|
-
export declare const
|
|
37
|
+
export declare const BaiParam_EncounterManagerListen: BaseCliParam<'encounterManagerListen', boolean>;
|
|
38
|
+
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", boolean> | BaseCliParam<"deployFrontend", boolean> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean>)[];
|
|
39
|
+
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", boolean> | BaseCliParam<"deployFrontend", boolean> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean>)[]>;
|
package/core/params/params.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RuntimeParams = exports.AllBaiParams = exports.BaiParam_EncounterManager = 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;
|
|
3
|
+
exports.RuntimeParams = exports.AllBaiParams = exports.BaiParam_EncounterManagerListen = exports.BaiParam_EncounterManager = 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;
|
|
4
4
|
const cli_params_1 = require("@nu-art/commando/cli/cli-params");
|
|
5
5
|
exports.BaiParam_Help = {
|
|
6
6
|
keys: ['--help', '-h'],
|
|
@@ -253,6 +253,13 @@ exports.BaiParam_EncounterManager = {
|
|
|
253
253
|
group: 'Other',
|
|
254
254
|
description: 'Will install encounter manager shit',
|
|
255
255
|
};
|
|
256
|
+
exports.BaiParam_EncounterManagerListen = {
|
|
257
|
+
keys: ['-eml', '--encounter-manager-listen'],
|
|
258
|
+
keyName: 'encounterManagerListen',
|
|
259
|
+
type: 'boolean',
|
|
260
|
+
group: 'Other',
|
|
261
|
+
description: 'Will install encounter manager shit and launch after advisor and km',
|
|
262
|
+
};
|
|
256
263
|
exports.AllBaiParams = [
|
|
257
264
|
exports.BaiParam_Help,
|
|
258
265
|
exports.BaiParam_DependencyTree,
|
|
@@ -287,7 +294,8 @@ exports.AllBaiParams = [
|
|
|
287
294
|
exports.BaiParam_Debug,
|
|
288
295
|
exports.BaiParam_Publish,
|
|
289
296
|
exports.BaiParam_AllLogs,
|
|
290
|
-
exports.BaiParam_EncounterManager
|
|
297
|
+
exports.BaiParam_EncounterManager,
|
|
298
|
+
exports.BaiParam_EncounterManagerListen
|
|
291
299
|
];
|
|
292
300
|
const params = cli_params_1.CLIParams_Resolver.create(...exports.AllBaiParams).resolveParamValue();
|
|
293
301
|
exports.RuntimeParams = params;
|
package/package.json
CHANGED
package/phases/phases.js
CHANGED
|
@@ -331,7 +331,7 @@ exports.Phase_InstallPackages = {
|
|
|
331
331
|
exports.Phase_InstallPythonPackages = {
|
|
332
332
|
type: 'package',
|
|
333
333
|
name: 'install-python-packages',
|
|
334
|
-
filter: async (pkg) => params_1.RuntimeParams.encounterManager && pkg.type === types_1.PackageType_Python,
|
|
334
|
+
filter: async (pkg) => (params_1.RuntimeParams.encounterManager || params_1.RuntimeParams.encounterManagerListen) && (params_1.RuntimeParams.installPackages || params_1.RuntimeParams.install) && pkg.type === types_1.PackageType_Python,
|
|
335
335
|
action: async (pkg) => {
|
|
336
336
|
if (pkg.type !== types_1.PackageType_Python)
|
|
337
337
|
return;
|
|
@@ -656,17 +656,7 @@ exports.Phase_Launch = {
|
|
|
656
656
|
}
|
|
657
657
|
if (pkg.type === types_1.PackageType_Python) {
|
|
658
658
|
runningAppsLogs === null || runningAppsLogs === void 0 ? void 0 : runningAppsLogs.registerApp(pkg.name, logClient);
|
|
659
|
-
logClient.log(pkg.name, ts_common_1.LogLevel.Info, true, ['Awaiting Advisor & KM BE launch']);
|
|
660
|
-
const advisorExecutor = executorMap['advisor-backend'];
|
|
661
|
-
const kmExecutor = executorMap['km-backend'];
|
|
662
|
-
if (!advisorExecutor)
|
|
663
|
-
logClient.log(pkg.name, ts_common_1.LogLevel.Error, true, ['Advisor BE executor not registered yet']);
|
|
664
|
-
if (!kmExecutor)
|
|
665
|
-
logClient.log(pkg.name, ts_common_1.LogLevel.Error, true, ['KM BE executor not registered yet']);
|
|
666
|
-
let advisorUp = false;
|
|
667
|
-
let kmUp = false;
|
|
668
659
|
const startPython = async () => {
|
|
669
|
-
logClient.log(pkg.name, ts_common_1.LogLevel.Info, true, ['Advisor & KM BE launched, Starting!']);
|
|
670
660
|
const executor = new CommandExecutor_Python_1.CommandExecutor_Python(pkg);
|
|
671
661
|
runningAppsLogs === null || runningAppsLogs === void 0 ? void 0 : runningAppsLogs.addOnTerminateCallback(async () => {
|
|
672
662
|
await executor.kill();
|
|
@@ -674,18 +664,36 @@ exports.Phase_Launch = {
|
|
|
674
664
|
});
|
|
675
665
|
await executor.execute();
|
|
676
666
|
};
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
667
|
+
// will listen to advisor and km be execution and then launch em
|
|
668
|
+
if (params_1.RuntimeParams.encounterManagerListen) {
|
|
669
|
+
logClient.log(pkg.name, ts_common_1.LogLevel.Info, true, ['Awaiting Advisor & KM BE launch']);
|
|
670
|
+
const advisorExecutor = executorMap['advisor-backend'];
|
|
671
|
+
const kmExecutor = executorMap['km-backend'];
|
|
672
|
+
if (!advisorExecutor)
|
|
673
|
+
logClient.log(pkg.name, ts_common_1.LogLevel.Error, true, ['Advisor BE executor not registered yet']);
|
|
674
|
+
if (!kmExecutor)
|
|
675
|
+
logClient.log(pkg.name, ts_common_1.LogLevel.Error, true, ['KM BE executor not registered yet']);
|
|
676
|
+
let advisorUp = false;
|
|
677
|
+
let kmUp = false;
|
|
678
|
+
advisorExecutor === null || advisorExecutor === void 0 ? void 0 : advisorExecutor.addOnReadyCallback(async () => {
|
|
679
|
+
advisorUp = true;
|
|
680
|
+
if (!kmUp)
|
|
681
|
+
return logClient.log(pkg.name, ts_common_1.LogLevel.Info, true, ['Advisor launched, waiting for KM']);
|
|
682
|
+
logClient.log(pkg.name, ts_common_1.LogLevel.Info, true, ['Advisor & KM BE launched, Starting!']);
|
|
683
|
+
await startPython();
|
|
684
|
+
});
|
|
685
|
+
kmExecutor === null || kmExecutor === void 0 ? void 0 : kmExecutor.addOnReadyCallback(async () => {
|
|
686
|
+
kmUp = true;
|
|
687
|
+
if (!advisorUp)
|
|
688
|
+
return logClient.log(pkg.name, ts_common_1.LogLevel.Info, true, ['KM launched, waiting for Advisor']);
|
|
689
|
+
logClient.log(pkg.name, ts_common_1.LogLevel.Info, true, ['Advisor & KM BE launched, Starting!']);
|
|
690
|
+
await startPython();
|
|
691
|
+
});
|
|
692
|
+
}
|
|
693
|
+
else if (params_1.RuntimeParams.encounterManager) {
|
|
694
|
+
// will launch em without waiting
|
|
687
695
|
await startPython();
|
|
688
|
-
}
|
|
696
|
+
}
|
|
689
697
|
}
|
|
690
698
|
projectScreen.updateOrCreatePackage(pkg.name, 'Died');
|
|
691
699
|
}
|
|
@@ -8,6 +8,7 @@ export declare class RunningProcessLogs extends ConsoleScreen<{
|
|
|
8
8
|
}> {
|
|
9
9
|
private onTerminateCallbacks;
|
|
10
10
|
constructor();
|
|
11
|
+
scrollFocusedLog(direction: number): void;
|
|
11
12
|
protected createContent(): void;
|
|
12
13
|
registerApp(appKey: string, logClient: LogClient_MemBuffer): void;
|
|
13
14
|
unregisterApp(appKey: string): void;
|
|
@@ -20,7 +20,15 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
|
|
|
20
20
|
await Promise.all(this.onTerminateCallbacks.map(callback => callback()));
|
|
21
21
|
process.exit(0);
|
|
22
22
|
}
|
|
23
|
-
}
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
keys: ['up'],
|
|
26
|
+
callback: () => this.scrollFocusedLog(-1),
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
keys: ['down'],
|
|
30
|
+
callback: () => this.scrollFocusedLog(1),
|
|
31
|
+
},
|
|
24
32
|
]);
|
|
25
33
|
this.onTerminateCallbacks = [];
|
|
26
34
|
this.addOnTerminateCallback = (callback) => {
|
|
@@ -28,6 +36,11 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
|
|
|
28
36
|
};
|
|
29
37
|
this.state = { logs: [] };
|
|
30
38
|
}
|
|
39
|
+
scrollFocusedLog(direction) {
|
|
40
|
+
const focusedWidget = this.getFocusedWidget();
|
|
41
|
+
focusedWidget.scroll(direction);
|
|
42
|
+
focusedWidget.setLabel(`scroll pos: ${focusedWidget.getScroll()}`);
|
|
43
|
+
}
|
|
31
44
|
createContent() {
|
|
32
45
|
const logs = this.state.logs;
|
|
33
46
|
const fittingGrid = gridPreset[logs.length - 1];
|
|
@@ -50,6 +63,9 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
|
|
|
50
63
|
height: `${height}%`,
|
|
51
64
|
label: ` Log for ${logs[index++].key} `,
|
|
52
65
|
border: { type: 'line' },
|
|
66
|
+
style: {
|
|
67
|
+
focus: { border: { fg: 'blue' } }, border: { fg: 'green' }, hover: { border: { fg: 'red' } }
|
|
68
|
+
},
|
|
53
69
|
scrollable: true,
|
|
54
70
|
scrollbar: {
|
|
55
71
|
ch: ' ',
|
|
@@ -60,7 +76,6 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
|
|
|
60
76
|
inverse: true
|
|
61
77
|
}
|
|
62
78
|
},
|
|
63
|
-
mouse: true
|
|
64
79
|
});
|
|
65
80
|
yPos += height; // Assumes all cells in a column have the same height
|
|
66
81
|
});
|