underpost 2.81.1 → 2.85.0

package/.env.production

@@ -10,6 +10,7 @@ GITHUB_TOKEN=changethis
 GITHUB_USERNAME=changethis
 GITHUB_BACKUP_REPO=changethis
 GITHUB_DNS_REPO=changethis
+GITHUB_EMAIL=admin@default.net
 DEFAULT_DEPLOY_ID=dd-default
 DEFAULT_DEPLOY_HOST=default.net
 DEFAULT_DEPLOY_PATH=/

package/.github/workflows/npmpkg.ci.yml

@@ -10,7 +10,9 @@ permissions:
   id-token: write
 jobs:
   pwa-microservices-template:
-    if: github.repository == 'underpostnet/engine' && startsWith(github.event.head_commit.message, 'ci(package-pwa-microservices-template)')
+    if: |
+      github.repository == 'underpostnet/engine'
+      && startsWith(github.event.head_commit.message, 'ci(package-pwa-microservices-template')
     name: Update npm repo package Jobs
     runs-on: ubuntu-latest
     container:
@@ -56,17 +58,3 @@ jobs:
           git config user.email 'fcoverdugoa@underpost.net'
           underpost cmt . ci package-pwa-microservices-template-ghpkg 'Update npm repo package'
           underpost push . underpostnet/pwa-microservices-template
-  # cd ../engine
-  # git commit --allow-empty -m "ci(engine-core-repo-build): ⚙️ Update engine core repository"
-  # git commit --allow-empty -m "ci(engine-cyberia-repo-build): ⚙️ Update engine cyberia repository"
-  # git commit --allow-empty -m "ci(engine-lampp-repo-build): ⚙️ Update engine lampp repository"
-  # git push https://${{ secrets.GIT_AUTH_TOKEN }}@github.com/underpostnet/engine.git
-
-# git clone --bare https://github.com/underpostnet/engine.git
-# mkdir engine
-# mv ./engine.git ./engine/.git
-# cd engine
-# git init
-
-# git push -u origin https://${{ secrets.GIT_AUTH_TOKEN }}@github.com/underpostnet/pwa-microservices-template-ghpkg.git
-# git push -u origin master

package/.github/workflows/release.cd.yml

@@ -33,5 +33,13 @@ jobs:
             underpost run secret
             underpost run pull
             underpost run secret
-            underpost cmt . --empty ci docker-image-engine
-            underpost run ssh-deploy sync-engine-test
+            node bin run git-conf
+            node bin run template-deploy-image
+            underpost config set GITHUB_USERNAME underpostnet
+            mkdir -p /home/dd
+            sudo rm -rf /home/dd/engine
+            cd /home/dd
+            underpost clone underpostnet/engine
+            cd engine
+            npm install
+            node bin run ssh-deploy sync-engine-test

package/README.md

@@ -18,7 +18,7 @@
 
 <!-- badges -->
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.81.1)](https://socket.dev/npm/package/underpost/overview/2.81.1) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.85.0)](https://socket.dev/npm/package/underpost/overview/2.85.0) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 <!-- end-badges -->
 
@@ -66,7 +66,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.81.1
+## underpost ci/cd cli v2.85.0
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -499,7 +499,7 @@ try {
       shellExec(`node bin/deploy sync-deploy-envs`);
       shellExec(`node bin/build dd conf`);
       shellExec(`git add . && cd ./engine-private && git add .`);
-      shellExec(`node bin cmt . ci package-pwa-microservices-template`);
+      shellExec(`node bin cmt . ci package-pwa-microservices-template 'New release v:${process.argv[3]}'`);
       shellExec(`node bin cmt ./engine-private ci package-pwa-microservices-template`);
       shellExec(`node bin push . ${process.env.GITHUB_USERNAME}/engine`);
       shellExec(`cd ./engine-private && node ../bin push . ${process.env.GITHUB_USERNAME}/engine-private`);

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.81.1
+## underpost ci/cd cli v2.85.0
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -123,20 +123,30 @@ Manages commits to a GitHub repository, supporting various commit types and
 options.
 
 Arguments:
-  path         The absolute or relative directory path of the repository.
-  commit-type  The type of commit to perform. Options: feat, fix, docs, style,
-               refactor, perf, ci, cd, infra, build, test, chore, revert,
-               backup.
-  module-tag   Optional: Sets a specific module tag for the commit.
-  message      Optional: Provides an additional custom message for the commit.
+  path                     The absolute or relative directory path of the
+                           repository.
+  commit-type              The type of commit to perform. Options: feat, fix,
+                           docs, style, refactor, perf, ci, cd, infra, build,
+                           test, chore, revert, backup.
+  module-tag               Optional: Sets a specific module tag for the commit.
+  message                  Optional: Provides an additional custom message for
+                           the commit.
 
 Options:
-  --log        Shows commit history from the specified number of latest n path
-               commits.
-  --empty      Allows committing with empty files.
-  --copy       Copies the generated commit message to the clipboard.
-  --info       Displays information about available commit types.
-  -h, --help   display help for command
+  --log <latest-n>         Shows commit history from the specified number of
+                           latest n path commits.
+  --last-msg <latest-n>    Displays the last n commit message.
+  --empty                  Allows committing with empty files.
+  --copy                   Copies the generated commit message to the
+                           clipboard.
+  --info                   Displays information about available commit types.
+  --diff                   Shows the current git diff changes.
+  --edit                   Edit last commit.
+  --msg <msg>              Sets a custom commit message.
+  --deploy-id <deploy-id>  Sets the deployment configuration ID for the commit
+                           context.
+  --cached                 Commit staged changes only or context.
+  -h, --help               display help for command
  
 ```
   
@@ -613,7 +623,7 @@ Options:
 Runs a script from the specified path.
 
 Arguments:
-  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, underpost-config, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, dev-hosts-expose, dev-hosts-restore, cyberia-ide, engine-ide, cluster-build, template-deploy, clean, pull, release-deploy, ssh-deploy, ide, sync, ls-deployments, monitor, db-client, promote, metrics, cluster, deploy, sync-replica, tf-vae-test, deploy-job.
+  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, underpost-config, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, dev-hosts-expose, dev-hosts-restore, cyberia-ide, engine-ide, cluster-build, template-deploy, template-deploy-image, clean, pull, release-deploy, ssh-deploy, ide, sync, ls-deployments, host-update, monitor, db-client, git-conf, promote, metrics, cluster, deploy, sync-replica, tf-vae-test, deploy-job.
   path                                     The absolute or relative directory path where the script is located.
 
 Options:
@@ -631,6 +641,7 @@ Options:
   --namespace <namespace>                  Optional: Specifies the namespace for test execution.
   --kubeadm                                Flag to indicate Kubeadm cluster type context
   --k3s                                    Flag to indicate K3s cluster type context
+  --force                                  Forces operation, overriding any warnings or conflicts.
   -h, --help                               display help for command
  
 ```

package/manifests/deployment/dd-default-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-blue
-          image: localhost/rockylinux9-underpost:v2.81.1
+          image: localhost/rockylinux9-underpost:v2.85.0
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.81.1
+          image: localhost/rockylinux9-underpost:v2.85.0
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/deployment/dd-test-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.81.1
+          image: localhost/rockylinux9-underpost:v2.85.0
 #          resources:
 #            requests:
 #              memory: "96294Ki"
@@ -104,7 +104,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.81.1
+          image: localhost/rockylinux9-underpost:v2.85.0
 #          resources:
 #            requests:
 #              memory: "96294Ki"

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.81.1",
+    "version": "2.85.0",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -18,7 +18,7 @@
         "proxy": "node src/proxy proxy",
         "docs": "jsdoc -c jsdoc.json",
         "install-global": "npm install -g pm2 && npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd",
-        "install-test": "npm install -g mocha && npm install -g c8 && npm install -g nyc && npm install -g coveralls",
+        "install-test": "npm install -g mocha && npm install -g c8 && npm install -g coveralls",
         "install-underpost": "cp -a $(npm root -g)/underpost/node_modules ./node_modules && npm install --only=dev --ignore-scripts",
         "install": "npm run install-global && npm run install-test",
         "prettier": "prettier --write .",

package/scripts/rocky-setup.sh

@@ -0,0 +1,144 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+
+# Script to install a recommended base package set on Rocky Linux.
+# Usage examples:
+#   sudo ./scripts/rocky-setup.sh                # interactive (will prompt about Development Tools)
+#   sudo ./scripts/rocky-setup.sh --install-dev  # non-interactive: install Development Tools
+#   INSTALL_DEV=1 sudo ./scripts/rocky-setup.sh  # same as --install-dev
+#   sudo ./scripts/rocky-setup.sh --yes          # skip prompts and assume defaults
+
+PACKAGES=(
+  dnf-plugins-core
+  epel-release
+  vim
+  nano
+  bash-completion
+  curl
+  wget
+  unzip
+  zip
+  tar
+  gzip
+  bzip2
+  rsync
+  git
+  python3
+  python3-pip
+  openssh-server
+  openssh-clients
+  firewalld
+  chrony
+  NetworkManager
+  which
+  net-tools
+  bind-utils
+)
+
+# Defaults
+INSTALL_DEV=0
+ASSUME_YES=0
+
+# Parse CLI args (simple)
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --install-dev|--yes-dev)
+      INSTALL_DEV=1
+      shift
+      ;;
+    --no-install-dev)
+      INSTALL_DEV=0
+      shift
+      ;;
+    --yes|-y|--assume-yes)
+      ASSUME_YES=1
+      shift
+      ;;
+    --help|-h)
+      cat <<EOF
+Usage: sudo ./scripts/rocky-setup.sh [options]
+
+Options:
+  --install-dev, --yes-dev    Install Development Tools group (gcc, make, etc.)
+  --no-install-dev            Explicitly skip Development Tools
+  --yes, -y, --assume-yes     Assume defaults / non-interactive
+  --help, -h                  Show this help and exit
+
+You can also set the environment variable INSTALL_DEV=1 to enable development tools.
+EOF
+      exit 0
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      exit 1
+      ;;
+  esac
+done
+
+# Environment variable overrides (if set)
+if [[ "${INSTALL_DEV:-}" =~ ^(1|y|yes|true)$ ]]; then
+  INSTALL_DEV=1
+fi
+
+# Helper: prompt unless ASSUME_YES
+prompt_install_dev() {
+  if [[ $ASSUME_YES -eq 1 ]]; then
+    return 1  # means do NOT prompt (we treat ASSUME_YES as 'no' for optional install unless INSTALL_DEV set)
+  fi
+
+  read -r -p "Do you want to install the 'Development Tools' group (gcc, make, etc.)? [y/N]: " answer
+  if [[ "${answer,,}" == "y" || "${answer,,}" == "yes" ]]; then
+    return 0
+  fi
+  return 1
+}
+
+# Refresh cache and install basic packages
+echo "[+] Refreshing DNF cache..."
+sudo dnf makecache --refresh
+
+echo "[+] Installing dnf-plugins-core and epel-release (if not present)..."
+sudo dnf -y install dnf-plugins-core epel-release
+
+echo "[+] Refreshing DNF cache after enabling repositories..."
+sudo dnf makecache --refresh
+
+echo "[+] Installing base packages: ${#PACKAGES[@]} packages"
+sudo dnf -y install "${PACKAGES[@]}"
+
+# Decide on Development Tools
+if [[ $INSTALL_DEV -eq 1 ]]; then
+  echo "[+] Installing Development Tools (requested)..."
+  sudo dnf -y groupinstall "Development Tools"
+else
+  if prompt_install_dev; then
+    echo "[+] Installing Development Tools (prompt confirmed)..."
+    sudo dnf -y groupinstall "Development Tools"
+  else
+    echo "[+] Skipping Development Tools. To auto-enable, run with --install-dev or set INSTALL_DEV=1"
+  fi
+fi
+
+echo "[+] Updating all packages to latest versions..."
+sudo dnf -y update
+
+# Cleanup
+echo "[+] Cleanup: remove unnecessary packages and old metadata"
+sudo dnf -y autoremove || true
+sudo dnf clean all || true
+
+cat <<EOF
+
+Installation complete.
+- To allow SSH access (if this is a VM or server), open port 22 in firewalld:
+  sudo firewall-cmd --add-service=ssh --permanent && sudo firewall-cmd --reload
+- If you installed Development Tools, you will have gcc, make, etc.
+
+Examples:
+  sudo ./scripts/rocky-setup.sh --install-dev
+  INSTALL_DEV=1 sudo ./scripts/rocky-setup.sh
+  sudo ./scripts/rocky-setup.sh --yes
+
+Customize PACKAGES=(...) inside this script according to your needs (docker, podman, kube, mssql-tools, etc.).
+EOF

package/src/cli/cluster.js

@@ -735,8 +735,11 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
     initHost() {
       const archData = UnderpostBaremetal.API.getHostArch();
       logger.info('Installing essential host-level prerequisites for Kubernetes...', archData);
+
+      // Install base rocky setup and updates
+      shellExec(`node bin run host-update`);
+
       // Install Docker and its dependencies
-      shellExec(`sudo dnf -y install dnf-plugins-core dbus-x11`);
       shellExec(`sudo dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo`);
       shellExec(`sudo dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin`);
 

package/src/cli/env.js

@@ -56,9 +56,10 @@ class UnderpostRootEnv {
      * @param {string} value - The value of the environment variable to get.
      * @param {object} options - Options for getting the environment variable.
      * @param {boolean} [options.plain=false] - If true, returns the environment variable value as a string.
+     * @param {boolean} [options.disableLog=false] - If true, disables logging of the environment variable value.
      * @memberof UnderpostEnv
      */
-    get(key, value, options = { plain: false }) {
+    get(key, value, options = { plain: false, disableLog: false }) {
       const exeRootPath = `${getNpmRootPath()}/underpost`;
       const envPath = `${exeRootPath}/.env`;
       if (!fs.existsSync(envPath)) {
@@ -66,7 +67,8 @@ class UnderpostRootEnv {
         return undefined;
       }
       const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-      options?.plain === true ? console.log(env[key]) : logger.info(`${key}(${typeof env[key]})`, env[key]);
+      if (!options.disableLog)
+        options?.plain === true ? console.log(env[key]) : logger.info(`${key}(${typeof env[key]})`, env[key]);
       return env[key];
     },
     /**

package/src/cli/index.js

@@ -68,10 +68,16 @@ program
   .argument(`[commit-type]`, `The type of commit to perform. Options: ${Object.keys(commitData).join(', ')}.`)
   .argument(`[module-tag]`, 'Optional: Sets a specific module tag for the commit.')
   .argument(`[message]`, 'Optional: Provides an additional custom message for the commit.')
-  .option(`--log`, 'Shows commit history from the specified number of latest n path commits.')
+  .option(`--log <latest-n>`, 'Shows commit history from the specified number of latest n path commits.')
+  .option('--last-msg <latest-n>', 'Displays the last n commit message.')
   .option('--empty', 'Allows committing with empty files.')
   .option('--copy', 'Copies the generated commit message to the clipboard.')
   .option('--info', 'Displays information about available commit types.')
+  .option('--diff', 'Shows the current git diff changes.')
+  .option('--edit', 'Edit last commit.')
+  .option('--msg <msg>', 'Sets a custom commit message.')
+  .option('--deploy-id <deploy-id>', 'Sets the deployment configuration ID for the commit context.')
+  .option('--cached', 'Commit staged changes only or context.')
   .description('Manages commits to a GitHub repository, supporting various commit types and options.')
   .action(Underpost.repo.commit);
 
@@ -382,6 +388,7 @@ program
   .option('--namespace <namespace>', 'Optional: Specifies the namespace for test execution.')
   .option('--kubeadm', 'Flag to indicate Kubeadm cluster type context')
   .option('--k3s', 'Flag to indicate K3s cluster type context')
+  .option('--force', 'Forces operation, overriding any warnings or conflicts.')
   .description('Runs a script from the specified path.')
   .action(UnderpostRun.API.callback);
 

package/src/cli/repository.js

@@ -17,6 +17,8 @@ dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
+const diffCmd = `--no-pager show -U0 -w --word-diff=color --word-diff-regex='[^[:space:]]' --color=always`;
+
 /**
  * @class UnderpostRepository
  * @description Manages Git operations and configurations.
@@ -80,6 +82,13 @@ class UnderpostRepository {
      * @param {boolean} [options.copy=false] - If true, copies the commit message to the clipboard.
      * @param {boolean} [options.info=false] - If true, displays information about commit types.
      * @param {boolean} [options.empty=false] - If true, allows an empty commit.
+     * @param {boolean} [options.diff=false] - If true, shows the diff of the last commit.
+     * @param {boolean} [options.edit=false] - If true, amends the last commit without changing the message.
+     * @param {boolean} [options.cached=false] - If true, commits only staged changes.
+     * @param {number} [options.log=0] - If greater than 0, shows the last N commits with diffs.
+     * @param {boolean} [options.lastMsg=0] - If greater than 0, copies or show the last last single n commit message to clipboard.
+     * @param {string} [options.msg=''] - If provided, outputs this message instead of committing.
+     * @param {string} [options.deployId=''] - An optional deploy ID to include in the commit message.
      * @memberof UnderpostRepository
      */
     commit(
@@ -91,14 +100,41 @@ class UnderpostRepository {
         copy: false,
         info: false,
         empty: false,
-        log: false,
+        diff: false,
+        edit: false,
+        cached: false,
+        lastMsg: 0,
+        log: 0,
+        msg: '',
+        deployId: '',
       },
     ) {
+      if (!repoPath) repoPath = '.';
+      if (options.msg) {
+        let key = Object.keys(commitData).find((k) => k && options.msg.toLocaleLowerCase().match(k));
+        if (!key) key == 'chore';
+        shellExec(
+          `underpost cmt ${repoPath} ${key} ${options.deployId ? options.deployId : `''`} '${options.msg.replaceAll(`${key}(${key}`, '')}'`,
+        );
+        return;
+      }
+      if (options.lastMsg) {
+        if (options.copy) {
+          pbcopy(UnderpostRepository.API.getLastCommitMsg(options.lastMsg - 1));
+        } else console.log(UnderpostRepository.API.getLastCommitMsg(options.lastMsg - 1));
+        return;
+      }
+      if (options.diff) {
+        const _diffCmd = `git ${diffCmd.replace('show', `diff${options.cached ? ` --cached` : ''}`)}`;
+        if (options.copy) pbcopy(_diffCmd);
+        else console.log('Diff command:', _diffCmd);
+        return;
+      }
       if (options.log) {
-        const history = UnderpostRepository.API.getHistory(repoPath);
+        const history = UnderpostRepository.API.getHistory(options.log);
         const chainCmd = history
           .reverse()
-          .map((commitData, i) => `${i === 0 ? '' : ' && '}git --no-pager show ${commitData.hash}`)
+          .map((commitData, i) => `${i === 0 ? '' : ' && '}git ${diffCmd} ${commitData.hash}`)
           .join('');
         if (history[0]) {
           for (const commit of history) {
@@ -117,7 +153,7 @@ class UnderpostRepository {
         return;
       }
       if (commitType === 'reset') {
-        if (options.copy) pbcopy(shellExec(`git --no-pager log -1 --pretty=%B`, { stdout: true }));
+        if (options.copy) pbcopy(UnderpostRepository.API.getLastCommitMsg());
         shellExec(`cd ${repoPath} && git reset --soft HEAD~${isNaN(parseInt(subModule)) ? 1 : parseInt(subModule)}`);
         return;
       }
@@ -126,7 +162,18 @@ class UnderpostRepository {
         commitData[commitType].emoji
       } ${message ? message : commitData[commitType].description}`;
       if (options.copy) return pbcopy(_message);
-      shellExec(`cd ${repoPath} && git commit ${options?.empty ? `--allow-empty ` : ''}-m "${_message}"`);
+      shellExec(
+        `cd ${repoPath} && git commit ${options?.empty ? `--allow-empty ` : ''}${options.edit ? `--amend  --no-edit ` : `-m "${_message}"`}`,
+      );
+    },
+
+    /**
+     * Retrieves the message of the last Git commit.
+     * @returns {string} The last commit message.
+     * @memberof UnderpostRepository
+     */
+    getLastCommitMsg(skip = 0) {
+      return shellExec(`git --no-pager log -1 --skip=${skip} --pretty=%B`, { stdout: true });
     },
 
     /**
@@ -291,17 +338,25 @@ Prevent build private config repo.`,
         deployVersion: packageJsonDeploy.version,
       };
     },
-    getHistory(sinceCommit = 5) {
-      return shellExec(`git log --oneline --graph --decorate -n ${sinceCommit}`, {
+
+    /**
+     * Retrieves the Git commit history.
+     * @param {number} [sinceCommit=1] - The number of recent commits to retrieve.
+     * @returns {Array<{hash: string, message: string, files: string}>} An array of commit objects with hash, message, and files.
+     * @memberof UnderpostRepository
+     */
+    getHistory(sinceCommit = 1) {
+      return shellExec(`git log -1 --pretty=format:"%h %s" -n ${sinceCommit}`, {
         stdout: true,
         silent: true,
         disableLog: true,
       })
         .split(`\n`)
         .map((line) => {
+          const hash = line.split(' ')[0];
           return {
-            hash: line.slice(2, 10),
-            message: line.slice(11),
+            hash,
+            message: line.split(`${hash} `)[1],
           };
         })
         .filter((line) => line.hash)

package/src/cli/run.js

@@ -5,7 +5,7 @@
  */
 
 import { daemonProcess, getTerminalPid, openTerminal, pbcopy, shellCd, shellExec } from '../server/process.js';
-import { getNpmRootPath, isDeployRunnerContext } from '../server/conf.js';
+import { getNpmRootPath, getUnderpostRootPath, isDeployRunnerContext } from '../server/conf.js';
 import { actionInitLog, loggerFactory } from '../server/logger.js';
 import UnderpostTest from './test.js';
 import fs from 'fs-extra';
@@ -14,6 +14,7 @@ import UnderpostDeploy from './deploy.js';
 import UnderpostRootEnv from './env.js';
 import UnderpostRepository from './repository.js';
 import os from 'os';
+import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -42,6 +43,7 @@ class UnderpostRun {
    * @property {number} replicas - The number of replicas to run.
    * @property {boolean} k3s - Whether to run in k3s mode.
    * @property {boolean} kubeadm - Whether to run in kubeadm mode.
+   * @property {boolean} force - Whether to force the operation.
    * @memberof UnderpostRun
    */
   static DEFAULT_OPTION = {
@@ -56,6 +58,7 @@ class UnderpostRun {
     replicas: 1,
     k3s: false,
     kubeadm: false,
+    force: false,
   };
   /**
    * @static
@@ -274,11 +277,29 @@ class UnderpostRun {
     'template-deploy': (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const baseCommand = options.dev ? 'node bin' : 'underpost';
       shellExec(`${baseCommand} run clean`);
-      shellExec(`${baseCommand} push ./engine-private ${process.env.GITHUB_USERNAME}/engine-private`);
+      shellExec(
+        `${baseCommand} push ./engine-private ${options.force ? '-f ' : ''}${process.env.GITHUB_USERNAME}/engine-private`,
+      );
       shellCd('/home/dd/engine');
       shellExec(`git reset`);
-      shellExec(`${baseCommand} cmt . --empty ci package-pwa-microservices-template`);
-      shellExec(`${baseCommand} push . ${process.env.GITHUB_USERNAME}/engine`);
+      shellExec(
+        `${baseCommand} cmt . --empty ci package-pwa-microservices-template${path.startsWith('sync') ? `-${path}` : ''}`,
+      );
+      shellExec(`${baseCommand} push . ${options.force ? '-f ' : ''}${process.env.GITHUB_USERNAME}/engine`);
+    },
+
+    /**
+     * @method template-deploy-image
+     * @description Commits and pushes a Docker image deployment for the `engine` repository.
+     * @param {string} path - The input value, identifier, or path for the operation.
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    'template-deploy-image': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      // const baseCommand = options.dev ? 'node bin' : 'underpost';
+      shellExec(
+        `cd /home/dd/engine && git reset && underpost cmt . --empty ci docker-image 'underpost-engine:${Underpost.version}' && underpost push . ${options.force ? '-f ' : ''}${process.env.GITHUB_USERNAME}/engine`,
+      );
     },
     /**
      * @method clean
@@ -333,18 +354,25 @@ class UnderpostRun {
       shellCd('/home/dd/engine');
       shellExec(`git reset`);
       shellExec(`${baseCommand} cmt . --empty cd ssh-${path}`);
-      shellExec(`${baseCommand} push . ${process.env.GITHUB_USERNAME}/engine`);
+      shellExec(`${baseCommand} push . ${options.force ? '-f ' : ''}${process.env.GITHUB_USERNAME}/engine`);
     },
     /**
      * @method ide
-     * @description Opens a Visual Studio Code (VS Code) session for the specified path using `node ${underpostRoot}/bin/zed ${path}`.
+     * @description Opens a Visual Studio Code (VS Code) session for the specified path using `node ${underpostRoot}/bin/zed ${path}`,
+     * or installs Zed and sublime-text IDE if `path` is 'install'.
      * @param {string} path - The input value, identifier, or path for the operation (used as the path to the directory to open in the IDE).
      * @param {Object} options - The default underpost runner options for customizing workflow
      * @memberof UnderpostRun
      */
     ide: (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const { underpostRoot } = options;
-      shellExec(`node ${underpostRoot}/bin/zed ${path}`);
+      if (path === 'install') {
+        shellExec(`sudo curl -f https://zed.dev/install.sh | sh`);
+        shellExec(
+          `sudo dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/x86_64/sublime-text.repo`,
+        );
+        shellExec(`sudo dnf install -y sublime-text`);
+      } else shellExec(`node ${underpostRoot}/bin/zed ${path}`);
     },
     /**
      * @method sync
@@ -405,6 +433,20 @@ class UnderpostRun {
     'ls-deployments': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       console.table(await UnderpostDeploy.API.get(path, 'deployments'));
     },
+
+    /**
+     * @method host-update
+     * @description Executes the `rocky-setup.sh` script to update the host system configuration.
+     * @param {string} path - The input value, identifier, or path for the operation.
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    'host-update': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      // const baseCommand = options.dev ? 'node bin' : 'underpost';
+      shellExec(`chmod +x ${options.underpostRoot}/scripts/rocky-setup.sh`);
+      shellExec(`${options.underpostRoot}/scripts/rocky-setup.sh --yes${options.dev ? ' --install-dev' : ``}`);
+    },
+
     /**
      * @method monitor
      * @description Monitors a specific pod (identified by `path`) for the existence of a file (`/await`), and performs conditional actions (like file copying and opening Firefox) when the file is removed.
@@ -513,6 +555,40 @@ class UnderpostRun {
         shellExec(`underpost deploy --expose adminer`);
       }
     },
+
+    /**
+     * @method git-conf
+     * @description Configures Git global and local user name and email settings based on the provided `path` (formatted as `username,email`), or defaults to environment variables.
+     * @param {string} path - The input value, identifier, or path for the operation (used as a comma-separated string: `username,email`).
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    'git-conf': (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
+      const defaultUsername = UnderpostRootEnv.API.get('GITHUB_USERNAME', '', { disableLog: true });
+      const defaultEmail = UnderpostRootEnv.API.get('GITHUB_EMAIL', '', { disableLog: true });
+      const [username, email] = path && path.split(',').length > 0 ? path.split(',') : [defaultUsername, defaultEmail];
+
+      shellExec(
+        `git config --global credential.helper "" && ` +
+          `git config credential.helper "" && ` +
+          `git config --global user.name '${username}' && ` +
+          `git config --global user.email '${email}' && ` +
+          `git config --global credential.interactive always && ` +
+          `git config user.name '${username}' && ` +
+          `git config user.email '${email}' && ` +
+          `git config credential.interactive always &&` +
+          `git config pull.rebase false`,
+      );
+
+      console.log(
+        shellExec(`git config list`, { silent: true, stdout: true })
+          .replaceAll('user.email', 'user.email'.yellow)
+          .replaceAll(username, username.green)
+          .replaceAll('user.name', 'user.name'.yellow)
+          .replaceAll(email, email.green),
+      );
+    },
+
     /**
      * @method promote
      * @description Switches traffic between blue/green deployments for a specified deployment ID(s) (uses `dd.router` for 'dd', or a specific ID).
@@ -797,15 +873,22 @@ EOF`;
      * @returns {Promise<any>} The result of the callback execution.
      */
     async callback(runner, path, options = UnderpostRun.DEFAULT_OPTION) {
-      const npmRoot = getNpmRootPath();
-      const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
-      if (options.command) options.command = options.command.split(',');
-      if (options.args) options.args = options.args.split(',');
-      options.underpostRoot = underpostRoot;
-      options.npmRoot = npmRoot;
-      logger.info('callback', { path, options });
-      const result = await UnderpostRun.RUNNERS[runner](path, options);
-      return result;
+      try {
+        const npmRoot = getNpmRootPath();
+        const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
+        if (options.command) options.command = options.command.split(',');
+        if (options.args) options.args = options.args.split(',');
+        options.underpostRoot = underpostRoot;
+        options.npmRoot = npmRoot;
+        logger.info('callback', { path, options });
+        if (!(runner in UnderpostRun.RUNNERS)) throw new Error(`Runner not found: ${runner}`);
+        const result = await UnderpostRun.RUNNERS[runner](path, options);
+        return result;
+      } catch (error) {
+        console.log(error);
+        logger.error(error);
+        return null;
+      }
     },
   };
 }

package/src/client/components/core/Router.js

@@ -118,7 +118,12 @@ const getQueryParams = () => {
 const sanitizeRoute = (route) =>
   !route || route === '/' || route === `\\`
     ? 'home'
-    : route.toLowerCase().replaceAll('/', '').replaceAll(`\\`, '').replaceAll(' ', '-');
+    : route
+        .toLowerCase()
+        .replaceAll('/', '')
+        .replaceAll(`\\`, '')
+        .replaceAll(' ', '-')
+        .replaceAll(getProxyPath().replaceAll('/', ''), '');
 
 /**
  * Sets the document title and updates the active state of the main menu button corresponding to the route.

package/src/client/services/core/core.service.js

@@ -16,8 +16,10 @@ const getApiBasePath = (options) =>
     options?.proxyPath
       ? `/${options.proxyPath}/`
       : window.renderPayload?.apiBaseProxyPath
-      ? window.renderPayload.apiBaseProxyPath
-      : getProxyPath()
+        ? window.renderPayload.apiBaseProxyPath == '/'
+          ? window.renderPayload.apiBaseProxyPath
+          : `${window.renderPayload.apiBaseProxyPath}/`
+        : getProxyPath()
   }${window.renderPayload?.apiBasePath ? window.renderPayload.apiBasePath : 'api'}/`;
 
 const getApiBaseUrl = (options = { id: '', endpoint: '', proxyPath: '' }) =>

package/src/index.js

@@ -35,7 +35,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.81.1';
+  static version = 'v2.85.0';
   /**
    * Repository cli API
    * @static