underpost 2.8.886 → 2.81.0

package/.vscode/zed.keymap.json

@@ -0,0 +1,17 @@
+[
+  {
+    "context": "Editor && edit_prediction",
+    "bindings": {
+      "tab": "editor::AcceptEditPrediction",
+      "alt-tab": "editor::AcceptEditPrediction",
+      "alt-l": null
+    }
+  },
+  {
+    "context": "Editor && edit_prediction_conflict",
+    "bindings": {
+      "alt-l": "editor::AcceptEditPrediction",
+      "tab": "editor::ComposeCompletion"
+    }
+  }
+]

package/.vscode/zed.settings.json

@@ -0,0 +1,20 @@
+{
+  "ui_font_size": 16,
+  "buffer_font_size": 15,
+  "theme": {
+    "mode": "system",
+    "light": "One Dark",
+    "dark": "One Dark"
+  },
+
+  "features": {
+    "edit_prediction_provider": "copilot",
+    "copilot": true // https://github.com/login/device
+  },
+
+  "show_edit_predictions": true,
+
+  "edit_predictions": {
+    "mode": "eager"
+  }
+}

package/Dockerfile

@@ -1,7 +1,24 @@
 FROM rockylinux:9
 
-RUN dnf install -y --allowerasing bzip2
-RUN dnf clean all
+# --- Update and install required packages
+RUN dnf -y update && \
+    dnf -y install epel-release && \
+    dnf -y install --allowerasing \
+        bzip2 \
+        sudo \
+        curl \
+        net-tools \
+        openssh-server \
+        nano \
+        vim-enhanced \
+        less \
+        openssl-devel \
+        wget \
+        git \
+        gnupg2 \
+        libnsl \
+        perl && \
+    dnf clean all
 
 
 # Install Node.js

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.8.886)](https://socket.dev/npm/package/underpost/overview/2.8.886) [![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.81.0)](https://socket.dev/npm/package/underpost/overview/2.81.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.8.886
+## underpost ci/cd cli v2.81.0
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -79,7 +79,7 @@ Commands:
   start [options] <deploy-id> [env]                          Initiates application servers, build pipelines, or other defined services based on the deployment ID.
   clone [options] <uri>                                      Clones a specified GitHub repository into the current directory.
   pull [options] <path> <uri>                                Pulls the latest changes from a specified GitHub repository.
-  cmt [options] <path> <commit-type> [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
+  cmt [options] [path] [commit-type] [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
   push [options] <path> <uri>                                Pushes committed changes from a local repository to a remote GitHub repository.
   env [deploy-id] [env] [subConf]                            Sets environment variables and configurations related to a specific deployment ID.
   config [options] <operator> [key] [value]                  Manages Underpost configurations using various operators.
@@ -104,6 +104,6 @@ Commands:
   help [command]                                             display help for command
  
 ```
-      
+
 <a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
-      
+

package/bin/deploy.js

@@ -27,7 +27,7 @@ import { buildClient } from '../src/server/client-build.js';
 import { DefaultConf } from '../conf.js';
 import colors from 'colors';
 import { program } from '../src/cli/index.js';
-import { getLocalIPv4Address, ip } from '../src/server/dns.js';
+import Dns, { getLocalIPv4Address } from '../src/server/dns.js';
 import { timer } from '../src/client/components/core/CommonJs.js';
 
 colors.enable();
@@ -124,8 +124,12 @@ try {
     case 'conf': {
       let subConf = process.argv[5] ?? '';
 
-      if (!['current', 'clean'].includes(process.argv[3]))
-        dotenv.config({ path: `./engine-private/conf/${process.argv[3]}/.env.${process.argv[4]}`, override: true });
+      if (!['current', 'clean', 'root'].includes(process.argv[3])) {
+        const path = fs.existsSync(`./engine-private/replica/${process.argv[3]}`)
+          ? `./engine-private/replica/${process.argv[3]}/.env.${process.argv[4]}`
+          : `./engine-private/conf/${process.argv[3]}/.env.${process.argv[4]}`;
+        dotenv.config({ path, override: true });
+      }
 
       loadConf(process.argv[3], subConf);
       break;
@@ -267,6 +271,7 @@ try {
           writeEnv(envPath, envObj);
         }
         const serverConf = loadReplicas(
+          deployId,
           JSON.parse(fs.readFileSync(`${baseConfPath}/${deployId}/conf.server.json`, 'utf8')),
         );
         for (const host of Object.keys(serverConf)) {
@@ -287,6 +292,7 @@ try {
       const host = process.argv[4];
       const path = process.argv[5];
       const serverConf = loadReplicas(
+        deployId,
         JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
       );
 
@@ -479,10 +485,19 @@ try {
       break;
     }
 
+    case 'private': {
+      shellExec(`node bin/deploy sync-deploy-envs`);
+      shellExec(`node bin/build dd conf`);
+      shellExec(`cd ./engine-private && git add . && node ../bin cmt . build`);
+      shellExec(`cd ./engine-private && node ../bin push . ${process.env.GITHUB_USERNAME}/engine-private`);
+      break;
+    }
+
     case 'version-deploy': {
       shellExec(
         `underpost secret underpost --create-from-file /home/dd/engine/engine-private/conf/dd-cron/.env.production`,
       );
+      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`);
@@ -564,10 +579,10 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
             `${key}`.toUpperCase().match('MAC')
               ? 'changethis'
               : isNaN(parseFloat(privateEnv[key]))
-              ? `${privateEnv[key]}`.match(`@`)
-                ? 'admin@default.net'
-                : 'changethis'
-              : privateEnv[key];
+                ? `${privateEnv[key]}`.match(`@`)
+                  ? 'admin@default.net'
+                  : 'changethis'
+                : privateEnv[key];
         }
         return env;
       };
@@ -654,7 +669,7 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       // generate + import + start
       // node bin/deploy ssh root@<host> <password>
 
-      const host = process.argv[3] ?? `root@${await ip.public.ipv4()}`;
+      const host = process.argv[3] ?? `root@${await Dns.getPublicIp()}`;
       const domain = host.split('@')[1];
       const user = 'root'; // host.split('@')[0];
       const password = process.argv[4] ?? '';
@@ -1294,6 +1309,20 @@ nvidia/gpu-operator \
       shellExec(`./scripts/ssl.sh ${targetDir} "${domains.join(' ')}"`);
       break;
     }
+
+    case 'sync-deploy-envs': {
+      const envObj = dotenv.parse(fs.readFileSync(`./engine-private/conf/dd-cron/.env.production`));
+      for (const deployId of ['dd-cron'].concat(
+        fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(','),
+      )) {
+        for (const env of ['production', 'development', 'test']) {
+          const _envObj = dotenv.parse(fs.readFileSync(`./engine-private/conf/${deployId}/.env.${env}`, 'utf8'));
+          _envObj.GITHUB_TOKEN = envObj.GITHUB_TOKEN;
+          writeEnv(`./engine-private/conf/${deployId}/.env.${env}`, _envObj);
+        }
+      }
+      break;
+    }
   }
 } catch (error) {
   logger.error(error, error.stack);

package/bin/zed.js

@@ -0,0 +1,20 @@
+import { shellExec } from '../src/server/process.js';
+import fs from 'fs-extra';
+import { loggerFactory } from '../src/server/logger.js';
+
+const logger = loggerFactory(import.meta);
+
+fs.copyFileSync(`./.vscode/zed.settings.json`, `/root/.config/zed/settings.json`);
+fs.copyFileSync(`./.vscode/zed.keymap.json`, `/root/.config/zed/keymap.json`);
+
+shellExec(`ZED_ALLOW_ROOT=true zed ${process.argv[2] ? process.argv[2] : '.'}`);
+
+logger.info('Connect copilot device', 'https://github.com/login/device');
+logger.info('Comments', 'Ctrl shift 7');
+logger.info('Unfold', 'Ctrl K + Ctrl J');
+logger.info('Fold', 'Ctrl K + Ctrl 0');
+logger.info('Command Palette', 'Ctrl Shift P');
+logger.info('Open File', 'Ctrl P');
+logger.info('Find in Files', 'Ctrl Shift F');
+logger.info('Go to Line', 'Ctrl G');
+logger.info('New file', 'Ctrl N');

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.886
+## underpost ci/cd cli v2.81.0
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -11,7 +11,7 @@ Commands:
   start [options] <deploy-id> [env]                          Initiates application servers, build pipelines, or other defined services based on the deployment ID.
   clone [options] <uri>                                      Clones a specified GitHub repository into the current directory.
   pull [options] <path> <uri>                                Pulls the latest changes from a specified GitHub repository.
-  cmt [options] <path> <commit-type> [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
+  cmt [options] [path] [commit-type] [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
   push [options] <path> <uri>                                Pushes committed changes from a local repository to a remote GitHub repository.
   env [deploy-id] [env] [subConf]                            Sets environment variables and configurations related to a specific deployment ID.
   config [options] <operator> [key] [value]                  Manages Underpost configurations using various operators.
@@ -117,7 +117,7 @@ Options:
 
 ### `cmt` :
 ```
- Usage: underpost cmt [options] <path> <commit-type> [module-tag] [message]
+ Usage: underpost cmt [options] [path] [commit-type] [module-tag] [message]
 
 Manages commits to a GitHub repository, supporting various commit types and
 options.
@@ -131,6 +131,8 @@ Arguments:
   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.
@@ -166,7 +168,7 @@ ID.
 
 Arguments:
   deploy-id   The deployment configuration ID. Use 'clean' to restore default
-              environment settings. User 'root' to load root env. User
+              environment settings. Use 'root' to load underpost root env. Use
               'current' to get plain current deploy Id.
   env         Optional: The environment to set (e.g., "production",
               "development"). Defaults to "production".
@@ -311,8 +313,10 @@ Options:
   --traffic <traffic-versions>      A comma-separated list of custom deployment
                                     traffic weights.
   --disable-update-deployment       Disables updates to deployments.
-  --info-traffic                    Retrieves traffic configuration from
-                                    current resource deployments.
+  --disable-update-proxy            Disables updates to proxies.
+  --status                          Retrieves current network traffic data from
+                                    resource deployments and the host machine
+                                    network configuration.
   --kubeadm                         Enables the kubeadm context for deployment
                                     operations.
   --etc-hosts                       Enables the etc-hosts context for
@@ -370,6 +374,7 @@ Options:
                                        environment secrets.
   --reset                              Performs a build without using the
                                        cache.
+  --dev                                Use development mode.
   --k3s-load                           Loads the image into a K3s cluster.
   -h, --help                           display help for command
  
@@ -389,6 +394,7 @@ Options:
   --kubeadm-load  Imports the pulled image into a Kubeadm cluster.
   --version       Sets a custom version for the base images.
   --k3s-load      Loads the image into a K3s cluster.
+  --dev           Use development mode.
   -h, --help      display help for command
  
 ```
@@ -607,7 +613,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, 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, clean, pull, release-deploy, ssh-deploy, ide, sync, ls-deployments, monitor, db-client, promote, metrics, cluster, deploy, sync-replica, tf-vae-test, deploy-job.
   path                                     The absolute or relative directory path where the script is located.
 
 Options:

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.8.886
+          image: localhost/rockylinux9-underpost:v2.81.0
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.886
+          image: localhost/rockylinux9-underpost:v2.81.0
           #          resources:
           #            requests:
           #              memory: "124Ki"

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

@@ -17,13 +17,13 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.886
+          image: localhost/rockylinux9-underpost:v2.81.0
 #          resources:
 #            requests:
-#              memory: "94Ki"
+#              memory: "96294Ki"
 #              cpu: "75m"
 #            limits:
-#              memory: "1504Ki"
+#              memory: "1540709Ki"
 #              cpu: "1200m"
           command:
             - /bin/sh
@@ -104,13 +104,13 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.8.886
+          image: localhost/rockylinux9-underpost:v2.81.0
 #          resources:
 #            requests:
-#              memory: "94Ki"
+#              memory: "96294Ki"
 #              cpu: "75m"
 #            limits:
-#              memory: "1504Ki"
+#              memory: "1540709Ki"
 #              cpu: "1200m"
           command:
             - /bin/sh

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.886",
+    "version": "2.81.0",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -93,7 +93,6 @@
         "peer": "^1.0.2",
         "peerjs": "^1.5.2",
         "prom-client": "^15.1.2",
-        "public-ip": "^6.0.1",
         "read": "^2.1.0",
         "rrule": "^2.8.1",
         "sharp": "^0.32.5",

package/scripts/ssh-cluster-info.sh

@@ -9,6 +9,6 @@ chmod 600 "$SSH_KEY"
 
 ssh -i "$SSH_KEY" -o BatchMode=yes "${REMOTE_USER}@${REMOTE_HOST}" sh <<EOF
 cd /home/dd/engine
-node bin deploy dd production --info-traffic
+node bin deploy dd production --status
 kubectl get pods -A
 EOF

package/src/cli/baremetal.js

@@ -952,7 +952,7 @@ EOF`);
      */
     getHostArch() {
       // `uname -m` returns e.g. 'x86_64' or 'aarch64'
-      const machine = shellExec('uname -m', { stdout: true }).trim();
+      const machine = shellExec('uname -m', { stdout: true, silent: true }).trim();
       if (machine === 'x86_64') return { alias: 'amd64', name: 'x86_64' };
       if (machine === 'aarch64') return { alias: 'arm64', name: 'aarch64' };
       throw new Error(`Unsupported host architecture: ${machine}`);

package/src/cli/cluster.js

@@ -698,7 +698,11 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
      */
     getResourcesCapacity(node) {
       const resources = {};
-      const nodeName = node ?? os.hostname();
+      const nodeName = node
+        ? node
+        : UnderpostDeploy.API.get('kind-control-plane', 'node').length > 0
+          ? 'kind-control-plane'
+          : os.hostname();
       const info = shellExec(`kubectl describe node ${nodeName} | grep -E '(Allocatable:|Capacity:)' -A 6`, {
         stdout: true,
         silent: true,

package/src/cli/db.js

@@ -271,6 +271,7 @@ class UnderpostDB {
           const deployId = _deployId.trim();
           if (!deployId) continue;
           const confServer = loadReplicas(
+            deployId,
             JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
           );
           const router = await UnderpostDeploy.API.routerFactory(deployId, env);

package/src/cli/deploy.js

@@ -21,6 +21,9 @@ import dotenv from 'dotenv';
 import UnderpostRootEnv from './env.js';
 import UnderpostCluster from './cluster.js';
 import { timer } from '../client/components/core/CommonJs.js';
+import os from 'node:os';
+import Dns, { getLocalIPv4Address } from '../server/dns.js';
+import UnderpostBaremetal from './baremetal.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -184,6 +187,7 @@ spec:
         const deployId = _deployId.trim();
         if (!deployId) continue;
         const confServer = loadReplicas(
+          deployId,
           JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
         );
         const router = await UnderpostDeploy.API.routerFactory(deployId, env);
@@ -227,12 +231,12 @@ metadata:
 spec:
   virtualhost:
     fqdn: ${host}${
-            env === 'development'
-              ? ''
-              : `
+      env === 'development'
+        ? ''
+        : `
     tls:
       secretName: ${host}`
-          }
+    }
   routes:`;
           for (const conditionObj of pathPortAssignment) {
             const { path, port } = conditionObj;
@@ -325,7 +329,8 @@ spec:
      * @param {string} options.node - Node name for resource allocation.
      * @param {string} options.restoreHosts - Whether to restore hosts.
      * @param {string} options.disableUpdateDeployment - Whether to disable updating the deployment.
-     * @param {string} options.infoTraffic - Whether to display traffic information.
+     * @param {string} options.disableUpdateProxy - Whether to disable updating the proxy.
+     * @param {string} options.status - Whether to display status host machine server and traffic information.
      * @param {string} options.etcHosts - Whether to update /etc/hosts.
      * @returns {Promise<void>} - Promise that resolves when the callback is complete.
      * @memberof UnderpostDeploy
@@ -349,7 +354,8 @@ spec:
         node: '',
         restoreHosts: false,
         disableUpdateDeployment: false,
-        infoTraffic: false,
+        disableUpdateProxy: false,
+        status: false,
         etcHosts: false,
       },
     ) {
@@ -415,7 +421,7 @@ EOF`);
       } else if (!deployList) deployList = 'dd-default';
       if (deployList === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`))
         deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
-      if (options.infoTraffic === true) {
+      if (options.status === true) {
         for (const _deployId of deployList.split(',')) {
           const deployId = _deployId.trim();
           logger.info('', {
@@ -426,6 +432,16 @@ EOF`);
             pods: await UnderpostDeploy.API.get(deployId),
           });
         }
+        const interfaceName = Dns.getDefaultNetworkInterface();
+        logger.info('Machine', {
+          node: os.hostname(),
+          arch: UnderpostBaremetal.API.getHostArch(),
+          ipv4Public: await Dns.getPublicIp(),
+          ipv4Local: getLocalIPv4Address(),
+          resources: UnderpostCluster.API.getResourcesCapacity(),
+          defaultInterfaceName: interfaceName,
+          defaultInterfaceInfo: os.networkInterfaces()[interfaceName],
+        });
         return;
       }
       if (!(options.versions && typeof options.versions === 'string')) options.versions = 'blue,green';
@@ -467,11 +483,14 @@ EOF`);
           }
 
         const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
+
         for (const host of Object.keys(confServer)) {
-          shellExec(`sudo kubectl delete HTTPProxy ${host}`);
-          if (UnderpostDeploy.API.isValidTLSContext({ host, env, options }))
-            shellExec(`sudo kubectl delete Certificate ${host}`);
-          if (!options.remove === true && env === 'development') etcHosts.push(host);
+          if (!options.disableUpdateProxy) {
+            shellExec(`sudo kubectl delete HTTPProxy ${host}`);
+            if (UnderpostDeploy.API.isValidTLSContext({ host, env, options }))
+              shellExec(`sudo kubectl delete Certificate ${host}`);
+          }
+          if (!options.remove) etcHosts.push(host);
         }
 
         const manifestsPath =
@@ -479,9 +498,9 @@ EOF`);
             ? `engine-private/conf/${deployId}/build/production`
             : `manifests/deployment/${deployId}-${env}`;
 
-        if (!options.remove === true) {
+        if (!options.remove) {
           if (!options.disableUpdateDeployment) shellExec(`sudo kubectl apply -f ./${manifestsPath}/deployment.yaml`);
-          shellExec(`sudo kubectl apply -f ./${manifestsPath}/proxy.yaml`);
+          if (!options.disableUpdateProxy) shellExec(`sudo kubectl apply -f ./${manifestsPath}/proxy.yaml`);
 
           if (UnderpostDeploy.API.isValidTLSContext({ host: Object.keys(confServer)[0], env, options }))
             shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml`);

package/src/cli/image.js

@@ -34,6 +34,7 @@ class UnderpostImage {
        * @param {boolean} [options.kubeadmLoad=false] - If true, load image into Kubeadm cluster.
        * @param {boolean} [options.k3sLoad=false] - If true, load image into K3s cluster.
        * @param {string} [options.path=false] - Path to the Dockerfile context.
+       * @param {boolean} [options.dev=false] - If true, use development mode.
        * @param {string} [options.version=''] - Version tag for the image.
        * @memberof UnderpostImage
        */
@@ -43,11 +44,14 @@ class UnderpostImage {
           kubeadmLoad: false,
           k3sLoad: false,
           path: false,
+          dev: false,
           version: '',
         },
       ) {
         // shellExec(`sudo podman pull docker.io/library/debian:buster`);
         shellExec(`sudo podman pull docker.io/library/rockylinux:9`);
+        const baseCommand = options.dev ? 'node bin' : 'underpost';
+        const baseCommandOption = options.dev ? ' --dev' : '';
         const IMAGE_NAME = `rockylinux9-underpost`;
         const IMAGE_NAME_FULL = `${IMAGE_NAME}:${options.version ?? Underpost.version}`;
         let LOAD_TYPE = '';
@@ -61,7 +65,7 @@ class UnderpostImage {
         }
 
         shellExec(
-          `underpost dockerfile-image-build --podman-save --reset --image-path=. --path ${
+          `${baseCommand} dockerfile-image-build${baseCommandOption} --podman-save --reset --image-path=. --path ${
             options.path ?? getUnderpostRootPath()
           } --image-name=${IMAGE_NAME_FULL} ${LOAD_TYPE}`,
         );
@@ -82,6 +86,7 @@ class UnderpostImage {
        * @param {boolean} [options.secrets=false] - If true, load secrets from the .env file for the build.
        * @param {string} [options.secretsPath=''] - Custom path to the .env file for secrets.
        * @param {boolean} [options.reset=false] - If true, perform a no-cache build.
+       * @param {boolean} [options.dev=false] - If true, use development mode.
        * @memberof UnderpostImage
        */
       build(
@@ -97,6 +102,7 @@ class UnderpostImage {
           secrets: false,
           secretsPath: '',
           reset: false,
+          dev: false,
         },
       ) {
         const {
@@ -111,6 +117,7 @@ class UnderpostImage {
           kubeadmLoad,
           k3sLoad,
           reset,
+          dev,
         } = options;
         const podManImg = `localhost/${imageName}`;
         if (imagePath && typeof imagePath === 'string' && !fs.existsSync(imagePath))
@@ -139,7 +146,10 @@ class UnderpostImage {
             } -t ${imageName} --pull=never --cap-add=CAP_AUDIT_WRITE${cache}${secretDockerInput} --network host`,
           );
 
-        if (podmanSave === true) shellExec(`podman save -o ${tarFile} ${podManImg}`);
+        if (podmanSave === true) {
+          if (fs.existsSync(tarFile)) fs.removeSync(tarFile);
+          shellExec(`podman save -o ${tarFile} ${podManImg}`);
+        }
         if (kindLoad === true) shellExec(`sudo kind load image-archive ${tarFile}`);
         if (kubeadmLoad === true) {
           // Use 'ctr' for Kubeadm

package/src/cli/index.js

@@ -64,10 +64,11 @@ program
 // 'cmt' command: Commit changes to a GitHub repository
 program
   .command('cmt')
-  .argument('<path>', 'The absolute or relative directory path of the repository.')
-  .argument(`<commit-type>`, `The type of commit to perform. Options: ${Object.keys(commitData).join(', ')}.`)
+  .argument('[path]', 'The absolute or relative directory path of the repository.')
+  .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('--empty', 'Allows committing with empty files.')
   .option('--copy', 'Copies the generated commit message to the clipboard.')
   .option('--info', 'Displays information about available commit types.')
@@ -89,7 +90,7 @@ program
   .command('env')
   .argument(
     '[deploy-id]',
-    `The deployment configuration ID. Use 'clean' to restore default environment settings. User 'root' to load root env. User 'current' to get plain current deploy Id.`,
+    `The deployment configuration ID. Use 'clean' to restore default environment settings. Use 'root' to load underpost root env. Use 'current' to get plain current deploy Id.`,
   )
   .argument('[env]', 'Optional: The environment to set (e.g., "production", "development"). Defaults to "production".')
   .argument('[subConf]', 'Optional: The sub configuration to set.')
@@ -183,7 +184,11 @@ program
   .option('--versions <deployment-versions>', 'A comma-separated list of custom deployment versions.')
   .option('--traffic <traffic-versions>', 'A comma-separated list of custom deployment traffic weights.')
   .option('--disable-update-deployment', 'Disables updates to deployments.')
-  .option('--info-traffic', 'Retrieves traffic configuration from current resource deployments.')
+  .option('--disable-update-proxy', 'Disables updates to proxies.')
+  .option(
+    '--status',
+    'Retrieves current network traffic data from resource deployments and the host machine network configuration.',
+  )
   .option('--kubeadm', 'Enables the kubeadm context for deployment operations.')
   .option('--etc-hosts', 'Enables the etc-hosts context for deployment operations.')
   .option('--restore-hosts', 'Restores default `/etc/hosts` entries.')
@@ -217,6 +222,7 @@ program
   .option('--secrets', 'Includes Dockerfile environment secrets during the build.')
   .option('--secrets-path [secrets-path]', 'Specifies a custom path for Dockerfile environment secrets.')
   .option('--reset', 'Performs a build without using the cache.')
+  .option('--dev', 'Use development mode.')
   .option('--k3s-load', 'Loads the image into a K3s cluster.')
   .description(
     'Builds a Docker image from a specified Dockerfile with various options for naming, saving, and loading.',
@@ -231,6 +237,7 @@ program
   .option('--kubeadm-load', 'Imports the pulled image into a Kubeadm cluster.')
   .option('--version', 'Sets a custom version for the base images.')
   .option('--k3s-load', 'Loads the image into a K3s cluster.')
+  .option('--dev', 'Use development mode.')
   .description('Pulls required Underpost Dockerfile base images and optionally loads them into clusters.')
   .action(Underpost.image.dockerfile.pullBaseImages);
 

package/src/cli/monitor.js

@@ -65,6 +65,7 @@ class UnderpostMonitor {
       const router = auxRouter ?? (await UnderpostDeploy.API.routerFactory(deployId, env));
 
       const confServer = loadReplicas(
+        deployId,
         JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
       );
 

package/src/cli/repository.js

@@ -83,7 +83,7 @@ class UnderpostRepository {
      * @memberof UnderpostRepository
      */
     commit(
-      repoPath = './',
+      repoPath = undefined,
       commitType = 'feat',
       subModule = '',
       message = '',
@@ -91,8 +91,31 @@ class UnderpostRepository {
         copy: false,
         info: false,
         empty: false,
+        log: false,
       },
     ) {
+      if (options.log) {
+        const history = UnderpostRepository.API.getHistory(repoPath);
+        if (history[0]) {
+          pbcopy(
+            history
+              .reverse()
+              .map((commitData, i) => `${i === 0 ? '' : ' && '}git --no-pager show ${commitData.hash}`)
+              .join(''),
+          );
+          for (const commit of history) {
+            console.log(commit.hash.yellow, commit.message);
+            console.log(
+              shellExec(`git show --name-status --pretty="" ${commit.hash}`, {
+                stdout: true,
+                silent: true,
+                disableLog: true,
+              }).red,
+            );
+          }
+        } else logger.warn('No commits found');
+        return;
+      }
       if (commitType === 'reset') {
         if (options.copy) pbcopy(shellExec(`git --no-pager log -1 --pretty=%B`, { stdout: true }));
         shellExec(`cd ${repoPath} && git reset --soft HEAD~${isNaN(parseInt(subModule)) ? 1 : parseInt(subModule)}`);
@@ -268,6 +291,24 @@ Prevent build private config repo.`,
         deployVersion: packageJsonDeploy.version,
       };
     },
+    getHistory(sinceCommit = 5) {
+      return shellExec(`git log --oneline --graph --decorate -n ${sinceCommit}`, { stdout: true, silent: true })
+        .split(`\n`)
+        .map((line) => {
+          return {
+            hash: line.slice(2, 10),
+            message: line.slice(11),
+          };
+        })
+        .filter((line) => line.hash)
+        .map((line) => {
+          line.files = shellExec(`git show --name-status --pretty="" ${line.hash}`, {
+            stdout: true,
+            silent: true,
+          });
+          return line;
+        });
+    },
   };
 }
 

package/src/cli/run.js

@@ -169,15 +169,18 @@ class UnderpostRun {
      */
     'dev-cluster': (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const baseCommand = options.dev ? 'node bin' : 'underpost';
-      shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''} --reset`);
-      shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''}`);
       const mongoHosts = ['mongodb-0.mongodb-service'];
-      shellExec(
-        `${baseCommand} cluster${options.dev ? ' --dev' : ''} --mongodb --mongo-db-host ${mongoHosts.join(
-          ',',
-        )} --pull-image`,
-      );
-      shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''} --valkey --pull-image`);
+      if (path !== 'expose') {
+        shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''} --reset`);
+        shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''}`);
+
+        shellExec(
+          `${baseCommand} cluster${options.dev ? ' --dev' : ''} --mongodb --mongo-db-host ${mongoHosts.join(
+            ',',
+          )} --pull-image`,
+        );
+        shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''} --valkey --pull-image`);
+      }
       shellExec(`${baseCommand} deploy --expose mongo`, { async: true });
       shellExec(`${baseCommand} deploy --expose valkey`, { async: true });
       {
@@ -197,6 +200,31 @@ class UnderpostRun {
       shellExec(`chmod +x ${underpostRoot}/scripts/ssh-cluster-info.sh`);
       shellExec(`${underpostRoot}/scripts/ssh-cluster-info.sh`);
     },
+
+    /**
+     * @method dev-hosts-expose
+     * @description Deploys a specified service in development mode with `/etc/hosts` modification for local access.
+     * @param {string} path - The input value, identifier, or path for the operation (used as the deployment ID to deploy).
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    'dev-hosts-expose': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellExec(
+        `node bin deploy ${path} development --disable-update-deployment --disable-update-proxy --kubeadm --etc-hosts`,
+      );
+    },
+
+    /**
+     * @method dev-hosts-restore
+     * @description Restores the `/etc/hosts` file to its original state after modifications made during development deployments.
+     * @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
+     */
+    'dev-hosts-restore': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellExec(`node bin deploy --restore-hosts`);
+    },
+
     /**
      * @method cyberia-ide
      * @description Starts the development environment (IDE) for both `cyberia-server` and `cyberia-client` repositories.
@@ -244,7 +272,7 @@ class UnderpostRun {
      * @memberof UnderpostRun
      */
     'template-deploy': (path, options = UnderpostRun.DEFAULT_OPTION) => {
-      const baseCommand = options.dev || true ? 'node bin' : 'underpost';
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
       shellExec(`${baseCommand} run clean`);
       shellExec(`${baseCommand} push ./engine-private ${process.env.GITHUB_USERNAME}/engine-private`);
       shellCd('/home/dd/engine');
@@ -301,7 +329,7 @@ class UnderpostRun {
      */
     'ssh-deploy': (path, options = UnderpostRun.DEFAULT_OPTION) => {
       actionInitLog();
-      const baseCommand = options.dev || true ? 'node bin' : 'underpost';
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
       shellCd('/home/dd/engine');
       shellExec(`git reset`);
       shellExec(`${baseCommand} cmt . --empty cd ssh-${path}`);
@@ -309,14 +337,14 @@ class UnderpostRun {
     },
     /**
      * @method ide
-     * @description Opens a Visual Studio Code (VS Code) session for the specified path using `node ${underpostRoot}/bin/vs ${path}`.
+     * @description Opens a Visual Studio Code (VS Code) session for the specified path using `node ${underpostRoot}/bin/zed ${path}`.
      * @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/vs ${path}`);
+      shellExec(`node ${underpostRoot}/bin/zed ${path}`);
     },
     /**
      * @method sync
@@ -328,7 +356,7 @@ class UnderpostRun {
     sync: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       // Dev usage: node bin run --dev --build sync dd-default
       const env = options.dev ? 'development' : 'production';
-      const baseCommand = options.dev || true ? 'node bin' : 'underpost';
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
       const defaultPath = [
         'dd-default',
         1,
@@ -337,11 +365,11 @@ class UnderpostRun {
         options.dev || !isDeployRunnerContext(path, options) ? 'kind-control-plane' : os.hostname(),
       ];
       let [deployId, replicas, versions, image, node] = path ? path.split(',') : defaultPath;
-      deployId = deployId ?? defaultPath[0];
-      replicas = replicas ?? defaultPath[1];
-      versions = versions ?? defaultPath[2];
-      image = image ?? defaultPath[3];
-      node = node ?? defaultPath[4];
+      deployId = deployId ? deployId : defaultPath[0];
+      replicas = replicas ? replicas : defaultPath[1];
+      versions = versions ? versions.replaceAll('+', ',') : defaultPath[2];
+      image = image ? image : defaultPath[3];
+      node = node ? node : defaultPath[4];
 
       if (isDeployRunnerContext(path, options)) {
         const { validVersion } = UnderpostRepository.API.privateConfUpdate(deployId);
@@ -357,13 +385,11 @@ class UnderpostRun {
       shellExec(
         `${baseCommand} deploy --kubeadm --build-manifest --sync --info-router --replicas ${
           replicas ?? 1
-        } --node ${node}${image ? ` --image ${image}` : ''}${
-          versions ? ` --versions ${versions.replaceAll('+', ',')}` : ''
-        } dd ${env}`,
+        } --node ${node}${image ? ` --image ${image}` : ''}${versions ? ` --versions ${versions}` : ''} dd ${env}`,
       );
 
       if (isDeployRunnerContext(path, options)) {
-        shellExec(`${baseCommand} deploy --kubeadm ${deployId} ${env}`);
+        shellExec(`${baseCommand} deploy --kubeadm --disable-update-proxy ${deployId} ${env} --versions ${versions}`);
         if (!targetTraffic) targetTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId);
         await UnderpostDeploy.API.monitorReadyRunner(deployId, env, targetTraffic);
         UnderpostDeploy.API.switchTraffic(deployId, env, targetTraffic);
@@ -529,36 +555,56 @@ class UnderpostRun {
     },
     /**
      * @method cluster
-     * @description Deploys a full production-ready Kubernetes cluster environment including MongoDB, MariaDB, Valkey, Contour (Ingress), and Cert-Manager, and deploys all services.
+     * @description Deploys a full production/development ready Kubernetes cluster environment including MongoDB, MariaDB, Valkey, Contour (Ingress), and Cert-Manager, and deploys all services.
      * @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
      */
-    cluster: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
-      const deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',');
-      const env = 'production';
+    cluster: async (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
+      const env = options.dev ? 'development' : 'production';
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
+      const baseClusterCommand = options.dev ? ' --dev' : '';
       shellCd(`/home/dd/engine`);
-      shellExec(`underpost cluster --reset`);
-      await timer(5000);
-      shellExec(`underpost cluster --kubeadm`);
+      shellExec(`${baseCommand} cluster${baseClusterCommand} --reset`);
       await timer(5000);
-      shellExec(`underpost dockerfile-pull-base-images --path /home/dd/engine/src/runtime/lampp --kubeadm-load`);
+      shellExec(`${baseCommand} cluster${baseClusterCommand} --kubeadm`);
       await timer(5000);
-      shellExec(`underpost cluster --kubeadm --pull-image --mongodb`);
+      let [runtimeImage, deployList] = path.split(',')
+        ? path.split(',')
+        : ['lampp', fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').replaceAll(',', '+')];
+      shellExec(
+        `${baseCommand} dockerfile-pull-base-images${baseClusterCommand}${
+          runtimeImage ? ` --path /home/dd/engine/src/runtime/${runtimeImage}` : ''
+        } --kubeadm-load`,
+      );
+      if (!deployList) {
+        deployList = [];
+        logger.warn('No deploy list provided');
+      } else deployList = deployList.split('+');
       await timer(5000);
-      shellExec(`underpost cluster --kubeadm --pull-image --mariadb`);
+      shellExec(`${baseCommand} cluster${baseClusterCommand} --kubeadm --pull-image --mongodb`);
+      if (runtimeImage === 'lampp') {
+        await timer(5000);
+        shellExec(`${baseCommand} cluster${baseClusterCommand} --kubeadm --pull-image --mariadb`);
+      }
       await timer(5000);
       for (const deployId of deployList) {
-        shellExec(`underpost db ${deployId} --import --git`);
+        shellExec(`${baseCommand} db ${deployId} --import --git`);
       }
       await timer(5000);
-      shellExec(`underpost cluster --kubeadm --pull-image --valkey`);
-      await timer(5000);
-      shellExec(`underpost cluster --kubeadm --contour`);
+      shellExec(`${baseCommand} cluster${baseClusterCommand} --kubeadm --pull-image --valkey`);
       await timer(5000);
-      shellExec(`underpost cluster --kubeadm --cert-manager`);
+      shellExec(`${baseCommand} cluster${baseClusterCommand} --kubeadm --contour`);
+      if (env === 'production') {
+        await timer(5000);
+        shellExec(`${baseCommand} cluster${baseClusterCommand} --kubeadm --cert-manager`);
+      }
       for (const deployId of deployList) {
-        shellExec(`underpost deploy ${deployId} ${env} --kubeadm --cert`);
+        shellExec(
+          `${baseCommand} deploy ${deployId} ${env} --kubeadm${env === 'production' ? ' --cert' : ''}${
+            env === 'development' ? ' --etc-hosts' : ''
+          }`,
+        );
       }
     },
     /**
@@ -593,7 +639,7 @@ class UnderpostRun {
      */
     'sync-replica': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const env = options.dev ? 'development' : 'production';
-      const baseCommand = options.dev || true ? 'node bin' : 'underpost';
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
 
       for (let deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',')) {
         deployId = deployId.trim();

package/src/index.js

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

package/src/runtime/express/Dockerfile

@@ -0,0 +1,41 @@
+FROM rockylinux:9
+
+# --- Update and install required packages
+RUN dnf -y update && \
+    dnf -y install epel-release && \
+    dnf -y install --allowerasing \
+        bzip2 \
+        sudo \
+        curl \
+        net-tools \
+        openssh-server \
+        nano \
+        vim-enhanced \
+        less \
+        openssl-devel \
+        wget \
+        git \
+        gnupg2 \
+        libnsl \
+        perl && \
+    dnf clean all
+
+
+# Install Node.js
+RUN curl -fsSL https://rpm.nodesource.com/setup_24.x | bash -
+RUN dnf install nodejs -y
+RUN dnf clean all
+
+# Verify Node.js and npm versions
+RUN node --version
+RUN npm --version
+
+# Set working directory
+WORKDIR /home/dd
+
+# Expose necessary ports
+EXPOSE 22
+EXPOSE 80
+EXPOSE 443
+EXPOSE 3000-3100
+EXPOSE 4000-4100

package/src/server/conf.js

@@ -11,6 +11,7 @@ import {
   capFirst,
   getCapVariableName,
   newInstance,
+  orderAbc,
   orderArrayFromAttrInt,
   range,
   timer,
@@ -154,18 +155,20 @@ const Config = {
    * @memberof ServerConfBuilder
    */
   buildProxyByDeployId: function (deployId = 'dd-default', subConf = '') {
-    let confPath = `./engine-private/conf/${deployId}/conf.server.json`;
-    const privateConfDevPath = fs.existsSync(`./engine-private/replica/${deployId}/conf.server.json`)
+    let confPath = fs.existsSync(`./engine-private/replica/${deployId}/conf.server.json`)
       ? `./engine-private/replica/${deployId}/conf.server.json`
-      : `./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`;
-    const confDevPath = fs.existsSync(privateConfDevPath)
-      ? privateConfDevPath
-      : `./engine-private/conf/${deployId}/conf.server.dev.json`;
+      : `./engine-private/conf/${deployId}/conf.server.json`;
+
+    if (
+      process.env.NODE_ENV === 'development' &&
+      subConf &&
+      fs.existsSync(`./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`)
+    )
+      confPath = `./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`;
 
-    if (fs.existsSync(confDevPath)) confPath = confDevPath;
     const serverConf = JSON.parse(fs.readFileSync(confPath, 'utf8'));
 
-    for (const host of Object.keys(loadReplicas(serverConf)))
+    for (const host of Object.keys(loadReplicas(deployId, serverConf)))
       this.default.server[host] = {
         ...this.default.server[host],
         ...serverConf[host],
@@ -231,7 +234,7 @@ const loadConf = (deployId = 'dd-default', subConf) => {
       const devConfPath = `${folder}/conf.${typeConf}.dev${subConf ? `.${subConf}` : ''}.json`;
       if (fs.existsSync(devConfPath)) srcConf = fs.readFileSync(devConfPath, 'utf8');
     }
-    if (typeConf === 'server') srcConf = JSON.stringify(loadReplicas(JSON.parse(srcConf)), null, 4);
+    if (typeConf === 'server') srcConf = JSON.stringify(loadReplicas(deployId, JSON.parse(srcConf)), null, 4);
     fs.writeFileSync(`./conf/conf.${typeConf}.json`, srcConf, 'utf8');
   }
   fs.writeFileSync(`./.env.production`, fs.readFileSync(`${folder}/.env.production`, 'utf8'), 'utf8');
@@ -263,19 +266,30 @@ const loadConf = (deployId = 'dd-default', subConf) => {
  * @param {object} confServer - The server configuration.
  * @memberof ServerConfBuilder
  */
-const loadReplicas = (confServer) => {
+const loadReplicas = (deployId, confServer) => {
+  const confServerOrigin = newInstance(confServer);
   for (const host of Object.keys(confServer)) {
     for (const path of Object.keys(confServer[host])) {
       const { replicas, singleReplica } = confServer[host][path];
-      if (replicas && !singleReplica)
-        for (const replicaPath of replicas) {
-          {
-            confServer[host][replicaPath] = newInstance(confServer[host][path]);
-            delete confServer[host][replicaPath].replicas;
+      if (replicas) {
+        if (!singleReplica)
+          for (const replicaPath of replicas) {
+            {
+              confServer[host][replicaPath] = newInstance(confServer[host][path]);
+              delete confServer[host][replicaPath].replicas;
+            }
           }
+        else {
+          const orderReplica = orderAbc(confServerOrigin[host][path].replicas);
+          confServerOrigin[host][path].replicas = orderReplica;
+          confServer[host][path].replicas = orderReplica;
         }
+      }
     }
   }
+  const serverPath = `./engine-private/conf/${deployId}/conf.server${process.env.NODE_ENV === 'production' ? '' : '.dev'}.json`;
+  if (fs.existsSync(serverPath)) fs.writeFileSync(serverPath, JSON.stringify(confServerOrigin, null, 4), 'utf8');
+
   return confServer;
 };
 
@@ -866,6 +880,7 @@ const getDataDeploy = (
   let buildDataDeploy = [];
   for (const deployObj of dataDeploy) {
     const serverConf = loadReplicas(
+      deployObj.deployId,
       JSON.parse(fs.readFileSync(`./engine-private/conf/${deployObj.deployId}/conf.server.json`, 'utf8')),
     );
     let replicaDataDeploy = [];
@@ -1039,6 +1054,7 @@ const mergeFile = async (parts = [], outputFilePath) => {
  */
 const rebuildConfFactory = ({ deployId, valkey, mongo }) => {
   const confServer = loadReplicas(
+    deployId,
     JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
   );
   const hosts = {};
@@ -1306,9 +1322,9 @@ const buildCliDoc = (program, oldVersion, newVersion) => {
 ` +
       baseOptions +
       `
-      
+
 <a target="_top" href="https://github.com/${process.env.GITHUB_USERNAME}/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
-      
+
 `
     ).replaceAll(oldVersion, newVersion),
     'utf8',

package/src/server/dns.js

@@ -8,7 +8,6 @@ import axios from 'axios';
 import dotenv from 'dotenv';
 import fs from 'fs';
 import validator from 'validator';
-import { publicIp, publicIpv4, publicIpv6 } from 'public-ip';
 import { loggerFactory } from './logger.js';
 import UnderpostRootEnv from '../cli/env.js';
 import dns from 'node:dns';
@@ -35,40 +34,41 @@ class Dns {
    * @returns {Promise<string>} The public IP address.
    */
   static async getPublicIp() {
-    return await publicIp();
+    return await new Promise(async (resolve) => {
+      try {
+        return axios.get('https://api.ipify.org').then((response) => resolve(response.data));
+      } catch (error) {
+        logger.error('Error fetching public IP:', { error: error.message, stack: error.stack });
+        return resolve(null);
+      }
+    });
   }
 
   /**
-   * Retrieves the current public IPv4 address.
-   * @async
+   * Checks for active internet connection by performing a DNS lookup on a specified domain.
    * @static
    * @memberof DnsManager
-   * @returns {Promise<string>} The public IPv4 address.
+   * @param {string} [domain='google.com'] The domain to check the connection against.
+   * @returns {Promise<boolean>} True if connected, false otherwise.
    */
-  static async getPublicIpv4() {
-    return await publicIpv4();
+  static isInternetConnection(domain = 'google.com') {
+    return new Promise((resolve) => dns.lookup(domain, {}, (err) => resolve(err ? false : true)));
   }
 
   /**
-   * Retrieves the current public IPv6 address.
-   * @async
+   * Determines the default network interface name using shell command.
+   * This method is primarily intended for Linux environments.
    * @static
    * @memberof DnsManager
-   * @returns {Promise<string>} The public IPv6 address.
-   */
-  static async getPublicIpv6() {
-    return await publicIpv6();
-  }
-
-  /**
-   * Checks for active internet connection by performing a DNS lookup on a specified domain.
-   * @static
+   * @returns {string} The default network interface name.
    * @memberof DnsManager
-   * @param {string} [domain='google.com'] The domain to check the connection against.
-   * @returns {Promise<boolean>} True if connected, false otherwise.
    */
-  static isInternetConnection(domain = 'google.com') {
-    return new Promise((resolve) => dns.lookup(domain, {}, (err) => resolve(err ? false : true)));
+  static getDefaultNetworkInterface() {
+    return shellExec(`ip route | grep default | cut -d ' ' -f 5`, {
+      stdout: true,
+      silent: true,
+      disableLog: true,
+    }).trim();
   }
 
   /**
@@ -80,11 +80,7 @@ class Dns {
    */
   static getLocalIPv4Address() {
     // Determine the default network interface name using shell command
-    const interfaceName = shellExec(`ip route | grep default | cut -d ' ' -f 5`, {
-      stdout: true,
-      silent: true,
-      disableLog: true,
-    }).trim();
+    const interfaceName = Dns.getDefaultNetworkInterface();
 
     // Find the IPv4 address associated with the determined interface
     const networkInfo = os.networkInterfaces()[interfaceName];
@@ -121,7 +117,7 @@ class Dns {
     let testIp;
 
     try {
-      testIp = await Dns.getPublicIpv4();
+      testIp = await Dns.getPublicIp();
     } catch (error) {
       logger.error(error, { testIp, stack: error.stack });
     }
@@ -238,21 +234,6 @@ class Dns {
   };
 }
 
-/**
- * @namespace Dns
- * @description Exported IP object for backward compatibility, mapping to Dns static methods.
- */
-const ip = {
-  public: {
-    /** @type {function(): Promise<string>} */
-    get: Dns.getPublicIp,
-    /** @type {function(): Promise<string>} */
-    ipv4: Dns.getPublicIpv4,
-    /** @type {function(): Promise<string>} */
-    ipv6: Dns.getPublicIpv6,
-  },
-};
-
 /**
  * @function isInternetConnection
  * @memberof DnsManager
@@ -273,4 +254,4 @@ const getLocalIPv4Address = Dns.getLocalIPv4Address;
 // Export the class as default and all original identifiers for backward compatibility.
 export default Dns;
 
-export { Dns, ip, isInternetConnection, getLocalIPv4Address };
+export { Dns, isInternetConnection, getLocalIPv4Address };