tnp-helpers 19.0.40 → 19.0.42

package/browser/lib/base/classes/base-java-jdk.d.ts

@@ -0,0 +1,9 @@
+// @ts-nocheck
+import { BaseFeatureForProject } from './base-feature-for-project';
+import { BaseProject } from './base-project';
+export declare class BaseJavaJdk<PROJECT extends BaseProject = any> extends BaseFeatureForProject<PROJECT> {
+    selectJdkVersion(): Promise<string>;
+    updateJavaHomePath(selectedPath: string): void;
+    selectTomcatVersion(): Promise<string>;
+    updateTomcatHomePath(selectedPath: string): void;
+}

package/browser/lib/base/classes/base-project.d.ts

@@ -3,6 +3,7 @@ import { CoreModels } from 'tnp-core/browser';
 import { CoreProject } from '../../index';
 import { BaseProjectType } from '../../models';
 import { BaseGit } from './base-git';
+import { BaseJavaJdk } from './base-java-jdk';
 import type { BaseLibraryBuild } from './base-library-build';
 import { BaseLinkedProjects } from './base-linked-projects';
 import { BaseNpmHelpers } from './base-npm-helpers';
@@ -36,6 +37,7 @@ export declare abstract class BaseProject<PROJECT extends BaseProject<any, any>
     git?: BaseGit;
     quickFixes?: BaseQuickFixes;
     staticPages?: BaseStaticPages;
+    javaJdk?: BaseJavaJdk;
     private __location;
     get location(): string;
     set location(v: string);

package/browser/lib/base/core-project.d.ts

@@ -72,12 +72,25 @@ export declare class CoreProject<PROJECT extends BaseProject = BaseProject> {
      * project environments
      */
     environments?: CoreProjectEnvironment[];
+    cleanCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
+    initCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
+    /**
+     * Build whatever is needed to run project
+     * buildCommand includes initCommand
+     */
+    buildCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
+    /**
+     * startCommand includes initCommand, buildCommand and launchCommand
+     */
     startCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
+    /**
+     * launch already built project
+     */
+    launchCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
     releaseCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
     publishCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
     deployCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
     testCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
-    buildCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
     docsCommand?: (options: CoreCommandArgOptions<PROJECT>) => Promise<void>;
     /**
      * function to recognize project

package/browser/lib/build-info._auto-generated_.d.ts

@@ -1,5 +1,21 @@
 // @ts-nocheck
+/**
+ *  Autogenerated by current cli tool
+ */
 export declare const BUILD_FRAMEWORK_CLI_NAME = "tnp";
+/**
+ *  This value can be change in taon.jsonc (appId)
+ */
 export declare const APP_ID = "com.domain.example.tnp-helpers";
+/**
+ *  Autogenerated by current cli tool
+ */
+export declare const BUILD_BASE_HREF = "";
+/**
+ *  This value can be change in taon.jsonc (overrideNpmName)
+ */
 export declare const PROJECT_NPM_NAME = "tnp-helpers";
-export declare const CURRENT_PACKAGE_VERSION = "19.0.40";
+/**
+ *  Autogenerated by current cli tool. Use *tnp release* to bump version.
+ */
+export declare const CURRENT_PACKAGE_VERSION = "19.0.42";

package/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tnp-helpers/browser",
-  "version": "19.0.40",
+  "version": "19.0.42",
   "module": "fesm2022/tnp-helpers.mjs",
   "typings": "index.d.ts",
   "exports": {

package/lib/base/classes/base-cli-worker/base-cli-worker-controller.js

@@ -48,7 +48,7 @@ let BaseCliWorkerController = class BaseCliWorkerController extends lib_1.Taon.B
         //#region @backendFunc
         return async () => {
             return (`Service "${this.cliWorkerServiceId}" is ` +
-                `running healthy on port ${this.ctx.uri.port},
+                `running healthy on port ${this.ctx.uriPort},
       version: ${this.cliWorkerServiceVersion},
       pid: ${process.pid}
       `);
@@ -64,7 +64,7 @@ let BaseCliWorkerController = class BaseCliWorkerController extends lib_1.Taon.B
             const currentConfig = base_cli_worker_config_1.BaseCliWorkerConfig.from({
                 pid: process.pid,
                 serviceID: this.cliWorkerServiceId,
-                port: Number(this.ctx.uri.port),
+                port: Number(this.ctx.uriPort),
                 version: this.cliWorkerServiceVersion,
             });
             // console.log('configWorker', configWorker);
@@ -82,7 +82,7 @@ let BaseCliWorkerController = class BaseCliWorkerController extends lib_1.Taon.B
             const currentWorkerConfig = base_cli_worker_config_1.BaseCliWorkerConfig.from({
                 pid: process.pid,
                 serviceID: this.cliWorkerServiceId,
-                port: Number(this.ctx.uri.port),
+                port: Number(this.ctx.uriPort),
                 version: this.cliWorkerServiceVersion,
             });
             // console.log('checkingProcessConfig', checkingProcessConfig);

package/lib/base/classes/base-cli-worker/base-cli-worker-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-cli-worker-controller.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
+{"version":3,"file":"base-cli-worker-controller.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}

package/lib/base/classes/base-cli-worker/base-cli-worker-terminal-ui.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCliWorkerTerminalUI = void 0;
 //#region imports
-const lib_1 = require("tnp-core/lib");
+const lib_1 = require("tnp-config/lib");
 const lib_2 = require("tnp-core/lib");
+const lib_3 = require("tnp-core/lib");
 //#endregion
 class BaseCliWorkerTerminalUI {
     worker;
@@ -12,7 +13,7 @@ class BaseCliWorkerTerminalUI {
     }
     //#region protected methods / text for header
     async headerText() {
-        return lib_2._.startCase(this.worker.serviceID);
+        return lib_3._.startCase(this.worker.serviceID);
     }
     //#endregion
     //#region protected methods / text header style
@@ -53,11 +54,12 @@ class BaseCliWorkerTerminalUI {
     //#region protected methods / info message below header
     async infoMessageBelowHeader() {
         //#region @backendFunc
-        lib_1.Helpers.info(`
+        lib_2.Helpers.info(`
 
-      Service ${lib_2.chalk.bold.red(this.worker.serviceID)}` +
+      Service ${lib_3.chalk.bold.red(this.worker.serviceID)}` +
             ` (version: ${this.worker.serviceVersion}) started..
-      Check info here http://localhost:${lib_2.chalk.bold(this.worker.processLocalInfoObj?.port?.toString())}/${'info'}
+      Check info here http://localhost:${lib_3.chalk.bold(this.worker.processLocalInfoObj?.port?.toString())}/${'info'}
+      Worker started by ${lib_3.chalk.bold(lib_1.config.frameworkName)}
 
         `);
         //#endregion
@@ -86,7 +88,7 @@ class BaseCliWorkerTerminalUI {
     getWorkerTerminalActions(options) {
         //#region @backendFunc
         options = options || {};
-        options.chooseAction = lib_2._.isBoolean(options.chooseAction)
+        options.chooseAction = lib_3._.isBoolean(options.chooseAction)
             ? options.chooseAction
             : true;
         return {
@@ -106,7 +108,7 @@ class BaseCliWorkerTerminalUI {
                     if (options.exitIsOnlyReturn) {
                         return true; // false will keep loop running
                     }
-                    if (await lib_1.UtilsTerminal.confirm({
+                    if (await lib_2.UtilsTerminal.confirm({
                         defaultValue: false,
                         message: 'Are you sure you want to shut down service?',
                     })) {
@@ -123,11 +125,11 @@ class BaseCliWorkerTerminalUI {
     async infoScreen(options) {
         options = options || {};
         while (true) {
-            lib_1.Helpers.clearConsole();
+            lib_2.Helpers.clearConsole();
             await this.header();
             await this.infoMessageBelowHeader();
             const choices = this.getWorkerTerminalActions(options);
-            const choice = await lib_1.UtilsTerminal.select({
+            const choice = await lib_2.UtilsTerminal.select({
                 choices,
                 question: 'Choose action',
             });

package/lib/base/classes/base-cli-worker/base-cli-worker-terminal-ui.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-cli-worker-terminal-ui.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
+{"version":3,"file":"base-cli-worker-terminal-ui.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}

package/lib/base/classes/base-cli-worker/base-cli-worker.js

@@ -218,6 +218,7 @@ class BaseCliWorker {
         lib_1.chokidar.watch(this.pathToProcessLocalInfoJson).on('change', () => {
             index_1.Helpers.log(`Service data changed...`);
             if (!this.processLocalInfoObj.isEquals(currentConfig)) {
+                lib_1.UtilsTerminal.clearConsole();
                 index_1.Helpers.error(`Service config data externally changed... killing service`, false, true);
             }
         });
@@ -257,7 +258,7 @@ class BaseCliWorker {
                 await this.kill({
                     dontRemoveConfigFile: true,
                 });
-                await lib_1.UtilsTerminal.waitMiliseconds(500);
+                await lib_1.UtilsTerminal.wait(1);
             }
         }
         catch (error) { }
@@ -288,7 +289,7 @@ class BaseCliWorker {
                 return false;
             }
             index_1.Helpers.log('[timestamp-checking] Waiting 500 miliseonds for service to start...');
-            await lib_1.UtilsTerminal.waitMiliseconds(500);
+            await lib_1.UtilsTerminal.wait(1);
         }
         i = 0;
         const isWaitingNotCheckingWhen = 10;
@@ -322,7 +323,7 @@ class BaseCliWorker {
                 }
                 else {
                     index_1.Helpers.log('Trying again...');
-                    await lib_1.UtilsTerminal.waitMiliseconds(500);
+                    await lib_1.UtilsTerminal.wait(1);
                     continue;
                 }
             }
@@ -336,7 +337,7 @@ class BaseCliWorker {
                 }
                 else {
                     index_1.Helpers.log('Trying again...');
-                    await lib_1.UtilsTerminal.waitMiliseconds(500);
+                    await lib_1.UtilsTerminal.wait(1);
                     continue;
                 }
             }
@@ -351,8 +352,8 @@ class BaseCliWorker {
     async startDetached(options) {
         //#region @backendFunc
         options = options || {};
-        index_1.Helpers.logInfo(`[${this.serviceID}][detached] Starting detached command in new terminal "${lib_1.chalk.bold(this.startCommand)}"...`);
         if (options.useCurrentWindowForDetach) {
+            index_1.Helpers.logInfo(`[${this.serviceID}][startDetached] Starting in new terminal "${lib_1.chalk.bold(this.startCommand)}"...`);
             await lib_1.UtilsProcess.startAsyncChildProcessCommandUntil(this.startCommand, {
                 untilOptions: {
                     stdout: [this.SPECIAL_WORKER_READY_MESSAGE],
@@ -362,9 +363,10 @@ class BaseCliWorker {
             });
         }
         else {
+            index_1.Helpers.logInfo(`[${this.serviceID}][startDetached] Starting in current terminal "${lib_1.chalk.bold(this.startCommand)}"...`);
             await lib_1.UtilsProcess.startInNewTerminalWindow(this.startCommand);
         }
-        index_1.Helpers.logInfo(`Starting detached service "${lib_1.chalk.bold(this.serviceID)}" - waiting until healthy...`);
+        index_1.Helpers.logInfo(`"${lib_1.chalk.bold(this.serviceID)}" - waiting until healthy (Infinite health check trys )...`);
         const isServiceHealthy = await this.isServiceHealthy({
             healthCheckRequestTrys: Infinity, // wait infinity until started
         });
@@ -372,7 +374,7 @@ class BaseCliWorker {
             index_1.Helpers.throw(`Not able to start service "${this.serviceID}"...`);
             return;
         }
-        index_1.Helpers.logInfo(`Healthy detached service "${lib_1.chalk.bold(this.serviceID)}" started.`);
+        index_1.Helpers.logInfo(`Healthy service "${lib_1.chalk.bold(this.serviceID)}" started.`);
         //#endregion
     }
     //#endregion
@@ -410,7 +412,7 @@ class BaseCliWorker {
                     startTimestamp: null,
                 });
                 index_1.Helpers.info(`[${this.serviceID}][${this.serviceVersion}] Retrying to initialize worker metadata...`);
-                await lib_1.UtilsTerminal.waitMiliseconds(500);
+                await lib_1.UtilsTerminal.wait(1);
             }
         }
         // process.on('SIGINT', () => {
@@ -441,7 +443,7 @@ class BaseCliWorker {
                         index_1.Helpers.throw(`Can't get port for remote connection..` +
                             ` worker process did not start correctly`);
                     }
-                    await lib_1.UtilsTerminal.waitMiliseconds(500);
+                    await lib_1.UtilsTerminal.wait(1);
                 }
             }
         }

package/lib/base/classes/base-cli-worker/base-cli-worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-cli-worker.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
+{"version":3,"file":"base-cli-worker.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}

package/lib/base/classes/base-global-command-line.backend.d.ts

@@ -204,4 +204,5 @@ export declare class BaseGlobalCommandLine<PARAMS = any, PROJECT extends BasePro
     checkPorts(): Promise<void>;
     removeSymlinksDryRun(): void;
     selectJava(): Promise<void>;
+    selectTomcat(): Promise<void>;
 }

package/lib/base/classes/base-global-command-line.backend.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseGlobalCommandLine = void 0;
-const child_process_1 = require("child_process"); // @backend
 const lib_1 = require("tnp-config/lib");
 const lib_2 = require("tnp-config/lib");
 const lib_3 = require("tnp-core/lib");
@@ -1453,159 +1452,13 @@ Would you like to update current project configuration?`)) {
         });
     }
     async selectJava() {
-        //#region @backendFunc
-        const platform = lib_3.os.platform();
-        let currentJava = '';
-        let currentJavaLocation = '';
-        try {
-            currentJava = (0, child_process_1.execSync)('java -version 2>&1').toString().split('\n')[0];
-            currentJavaLocation = (0, child_process_1.execSync)('which java').toString().trim();
-        }
-        catch {
-            currentJava = '-- no selected --';
-            currentJavaLocation = '--';
-        }
-        console.log(`\nCURRENT JAVA GLOBAL VERSION: ${currentJava}`);
-        if (currentJavaLocation && currentJavaLocation !== '--') {
-            console.log(`FROM: ${currentJavaLocation}\n`);
-        }
-        let javaVersions = [];
-        if (platform === 'darwin') {
-            try {
-                const result = (0, child_process_1.execSync)('/usr/libexec/java_home -V 2>&1')
-                    .toString()
-                    .split('\n')
-                    .filter(l => l.trim().startsWith('/Library'))
-                    .map(l => {
-                    const match = l.match(/(\/Library\/.*\/Contents\/Home)/);
-                    if (match) {
-                        const version = l.match(/(?:jdk-|JDK )([\d._]+)/)?.[1] ?? 'unknown';
-                        return { version, path: match[1] };
-                    }
-                })
-                    .filter(Boolean);
-                javaVersions = result;
-            }
-            catch (err) {
-                console.warn('No Java versions found via /usr/libexec/java_home');
-            }
-        }
-        else if (platform === 'linux') {
-            try {
-                const output = (0, child_process_1.execSync)('update-java-alternatives -l || ls /usr/lib/jvm', { shell: '/bin/bash' }).toString();
-                javaVersions = output
-                    .split('\n')
-                    .filter(Boolean)
-                    .map(line => {
-                    const segments = line.trim().split(/\s+/);
-                    const version = segments[0];
-                    const pathGuess = segments[2] || `/usr/lib/jvm/${segments[0]}`;
-                    return { version, path: pathGuess };
-                });
-            }
-            catch {
-                // Fallback using /usr/lib/jvm
-                javaVersions = (0, child_process_1.execSync)('ls /usr/lib/jvm')
-                    .toString()
-                    .split('\n')
-                    .filter(Boolean)
-                    .map(dir => ({
-                    version: dir,
-                    path: `/usr/lib/jvm/${dir}`,
-                }));
-            }
-        }
-        else if (platform === 'win32') {
-            try {
-                const output = (0, child_process_1.execSync)('reg query "HKLM\\SOFTWARE\\JavaSoft\\Java Development Kit"', {
-                    encoding: 'utf8',
-                });
-                const lines = output
-                    .split('\n')
-                    .filter(line => line.trim().length > 0 && line.includes('HKLM'));
-                javaVersions = lines.map(l => {
-                    const version = l.split('\\').pop();
-                    const pathOutput = (0, child_process_1.execSync)(`reg query "${l.trim()}" /v JavaHome`, {
-                        encoding: 'utf8',
-                    });
-                    const match = pathOutput.match(/JavaHome\s+REG_SZ\s+(.+)/);
-                    return {
-                        version,
-                        path: match?.[1].trim() ?? '',
-                    };
-                });
-            }
-            catch {
-                javaVersions = [];
-            }
-            // ✅ Fallback to checking typical install folders
-            const fallbackDirs = [
-                'C:\\Program Files\\Amazon Corretto',
-                'C:\\Program Files\\Java',
-            ];
-            for (const baseDir of fallbackDirs) {
-                try {
-                    const subdirs = lib_3.fse.readdirSync(baseDir, { withFileTypes: true });
-                    for (const dir of subdirs) {
-                        if (dir.isDirectory() &&
-                            (dir.name.startsWith('jdk') ||
-                                dir.name.toLowerCase().includes('corretto'))) {
-                            javaVersions.push({
-                                version: dir.name,
-                                path: lib_3.path.join(baseDir, dir.name),
-                            });
-                        }
-                    }
-                }
-                catch {
-                    // ignore
-                }
-            }
-        }
-        if (javaVersions.length === 0) {
-            console.log('❌ No installed Java versions found.');
-            return;
-        }
-        const selected = await lib_5.UtilsTerminal.select({
-            question: 'Select Java version to use globally:',
-            choices: javaVersions.map(j => ({
-                name: `${j.version}  —  ${j.path}`,
-                value: j,
-            })),
-        });
-        const selectedPath = selected.path;
-        if (platform === 'darwin') {
-            try {
-                const shellPath = lib_3.path.resolve(lib_3.os.homedir(), '.zshrc'); // or .bash_profile
-                (0, child_process_1.execSync)(`export JAVA_HOME="${selectedPath}"`);
-                console.log(`✅ JAVA_HOME set to ${selectedPath} (only in current session).`);
-                console.log(`To make permanent, add to your shell profile:\n\nexport JAVA_HOME="${selectedPath}"\n`);
-            }
-            catch (err) {
-                console.error('❌ Failed to set JAVA_HOME on macOS.');
-            }
-        }
-        else if (platform === 'linux') {
-            try {
-                (0, child_process_1.execSync)(`export JAVA_HOME="${selectedPath}"`);
-                (0, child_process_1.execSync)(`sudo update-alternatives --set java "${selectedPath}/bin/java"`);
-                console.log(`✅ Set global Java to ${selectedPath}`);
-            }
-            catch {
-                console.log(`⚠️ Could not update alternatives. Try manually:\nexport JAVA_HOME="${selectedPath}"`);
-            }
-        }
-        else if (platform === 'win32') {
-            try {
-                (0, child_process_1.execSync)(`setx JAVA_HOME "${selectedPath}"`);
-                console.log(`✅ JAVA_HOME set globally to ${selectedPath}`);
-                console.log(`⚠️ Restart your terminal or computer to apply changes.`);
-            }
-            catch {
-                console.error('❌ Failed to set JAVA_HOME on Windows.');
-            }
-        }
-        //#endregion
+        const selectedJava = await this.project.javaJdk.selectJdkVersion();
+        this.project.javaJdk.updateJavaHomePath(selectedJava);
+    }
+    async selectTomcat() {
+        const selectedTomcat = await this.project.javaJdk.selectTomcatVersion();
+        this.project.javaJdk.updateTomcatHomePath(selectedTomcat);
+        this._exit();
     }
 }
 exports.BaseGlobalCommandLine = BaseGlobalCommandLine;