@underpostnet/underpost 2.98.3 → 2.99.0

package/src/cli/index.js

@@ -1,16 +1,14 @@
 import dotenv from 'dotenv';
+import fs from 'fs-extra';
+
 import { Command } from 'commander';
-import Underpost, { UnderpostRootEnv } from '../index.js';
 import { getNpmRootPath, getUnderpostRootPath, loadConf } from '../server/conf.js';
-import fs from 'fs-extra';
 import { commitData } from '../client/components/core/CommonJs.js';
-import UnderpostLxd from './lxd.js';
-import UnderpostBaremetal from './baremetal.js';
-import UnderpostRun from './run.js';
-import Dns from '../server/dns.js';
-import UnderpostStatic from './static.js';
+
+import Underpost from '../index.js';
 
 const underpostRootPath = getUnderpostRootPath();
+
 fs.existsSync(`${underpostRootPath}/.env`)
   ? dotenv.config({ path: `${underpostRootPath}/.env`, override: true })
   : dotenv.config();
@@ -108,9 +106,8 @@ program
     if (fs.existsSync(`./engine-private/conf/${deployId}/.env.${env}`))
       dotenv.config({ path: `./engine-private/conf/${deployId}/.env.${env}`, override: true });
     else if (deployId === 'root') {
-      deployId = UnderpostRootEnv.API.get('DEPLOY_ID');
+      deployId = Underpost.env.get('DEPLOY_ID');
     } else dotenv.config({ path: `./.env`, override: true });
-
     loadConf(deployId, subConf);
   });
 
@@ -157,7 +154,7 @@ program
   .option('--dev', 'Sets the development cli context')
 
   .description(`Manages static build of page, bundles, and documentation with comprehensive customization options.`)
-  .action(UnderpostStatic.API.callback);
+  .action(Underpost.static.callback);
 
 program
   .command('config')
@@ -166,6 +163,8 @@ program
   .argument('[value]', 'Optional: The value to set for the configuration key.')
   .option('--plain', 'Prints the configuration value in plain text.')
   .option('--filter <keyword>', 'Filters the list by matching key or value (only for list operation).')
+  .option('--deploy-id <deploy-id>', 'Sets the deployment configuration ID for the operation context.')
+  .option('--build', 'Sets the build context for the operation.')
   .description(`Manages Underpost configurations using various operators.`)
   .action((...args) => Underpost.env[args[0]](args[1], args[2], args[3]));
 
@@ -190,7 +189,7 @@ program
   .option('--ban-both-add', 'Adds IP addresses to both banned ingress and egress lists.')
   .option('--ban-both-remove', 'Removes IP addresses from both banned ingress and egress lists.')
   .description('Displays the current public machine IP addresses.')
-  .action(Dns.ipDispatcher);
+  .action(Underpost.dns.ipDispatcher);
 
 program
   .command('cluster')
@@ -262,6 +261,13 @@ program
   .option('--image <image>', 'Sets a custom image for deployments.')
   .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(
+    '--timeout-response <duration>',
+    'Sets HTTPProxy per-route response timeout (e.g., "1s", "300ms", "infinity").',
+  )
+  .option('--timeout-idle <duration>', 'Sets HTTPProxy per-route idle timeout (e.g., "10s", "infinity").')
+  .option('--retry-count <count>', 'Sets HTTPProxy per-route retry count (e.g., 3).')
+  .option('--retry-per-try-timeout <duration>', 'Sets HTTPProxy retry per-try timeout (e.g., "150ms").')
   .option('--disable-update-deployment', 'Disables updates to deployments.')
   .option('--disable-update-proxy', 'Disables updates to proxies.')
   .option('--disable-deployment-proxy', 'Disables proxies of deployments.')
@@ -393,28 +399,12 @@ program
   .description('Manages cluster metadata operations, including import and export.')
   .action(Underpost.db.clusterMetadataBackupCallback);
 
-program
-  .command('script')
-  .argument('operator', `The script operation to perform. Options: ${Object.keys(Underpost.script).join(', ')}.`)
-  .argument('<script-name>', 'The name of the script to execute.')
-  .argument('[script-value]', 'Optional: A literal command or a path to a script file.')
-  .option('--itc', 'Executes the script within the container execution context.')
-  .option('--itc-path', 'Specifies container path options for script execution.')
-  .option('--ns <ns-name>', 'Optional: Specifies the namespace context for script execution.')
-  .option('--pod-name <pod-name>', 'Optional: Specifies the pod name for script execution.')
-  .description(
-    'Supports a variety of built-in Underpost global scripts, their preset lifecycle events, and arbitrary custom scripts.',
-  )
-  .action((...args) => Underpost.script[args[0]](args[1], args[2], args[3]));
-
 program
   .command('cron')
   .argument('[deploy-list]', 'A comma-separated list of deployment IDs (e.g., "default-a,default-b").')
   .argument(
     '[job-list]',
-    `A comma-separated list of job IDs. Options: ${Object.keys(Underpost.cron).join(
-      ', ',
-    )}. Defaults to all available jobs.`,
+    `A comma-separated list of job IDs. Options: ${Underpost.cron.getJobsIDs()}. Defaults to all available jobs.`,
   )
   .option('--init-pm2-cronjobs', 'Initializes PM2 cron jobs from configuration for the specified deployment IDs.')
   .option('--git', 'Uploads cron job configurations to GitHub.')
@@ -461,6 +451,11 @@ program
   .option('--type <type>', 'Sets a custom monitor type.')
   .option('--sync', 'Synchronizes with current proxy deployments and traffic configurations.')
   .option('--namespace <namespace>', 'Sets the Kubernetes namespace for the deployment. Defaults to "default".')
+  .option('--timeout-response <duration>', 'Sets HTTPProxy per-route response timeout (e.g., "5s").')
+  .option('--timeout-idle <duration>', 'Sets HTTPProxy per-route idle timeout (e.g., "10s", "infinity").')
+  .option('--retry-count <count>', 'Sets HTTPProxy per-route retry count (e.g., 3).')
+  .option('--retry-per-try-timeout <duration>', 'Sets HTTPProxy retry per-try timeout (e.g., "150ms").')
+  .option('--disable-private-conf-update', 'Disables updates to private configuration during execution.')
   .description('Manages health server monitoring for specified deployments.')
   .action(Underpost.monitor.callback);
 
@@ -491,7 +486,7 @@ program
 
 program
   .command('run')
-  .argument('<runner-id>', `The runner ID to run. Options: ${Object.keys(UnderpostRun.RUNNERS).join(', ')}.`)
+  .argument('<runner-id>', `The runner ID to run. Options: ${Underpost.run.RUNNERS}.`)
   .argument('[path]', 'The input value, identifier, or path for the operation.')
   .option('--cmd <command-list>', 'Comma-separated list of commands to execute.')
   .option('--args <args-array>', 'Array of arguments to pass to the command.')
@@ -551,8 +546,16 @@ program
   .option('--hosts <hosts>', 'Comma-separated list of hosts for the runner execution.')
   .option('--instance-id <instance-id>', 'Sets instance id context for the runner execution.')
   .option('--pid <process-id>', 'Sets process id context for the runner execution.')
+  .option(
+    '--timeout-response <duration>',
+    'Sets HTTPProxy per-route response timeout (e.g., "1s", "300ms", "infinity").',
+  )
+  .option('--timeout-idle <duration>', 'Sets HTTPProxy per-route idle timeout (e.g., "10s", "infinity").')
+  .option('--retry-count <count>', 'Sets HTTPProxy per-route retry count (e.g., 3).')
+  .option('--retry-per-try-timeout <duration>', 'Sets HTTPProxy retry per-try timeout (e.g., "150ms").')
+  .option('--disable-private-conf-update', 'Disables updates to private configuration during execution.')
   .description('Runs specified scripts using various runners.')
-  .action(UnderpostRun.API.callback);
+  .action(Underpost.run.callback);
 
 program
   .command('lxd')
@@ -587,7 +590,7 @@ program
   .option('--deploy-id <deploy-id>', 'Sets the deployment ID context for LXD operations.')
   .option('--namespace <namespace>', 'Kubernetes namespace for LXD operations (defaults to "default").')
   .description('Manages LXD containers and virtual machines.')
-  .action(UnderpostLxd.API.callback);
+  .action(Underpost.lxd.callback);
 
 program
   .command('baremetal [workflow-id] [ip-address] [hostname] [ip-file-server] [ip-config] [netmask] [dns-server]')
@@ -652,6 +655,6 @@ program
   .description(
     'Manages baremetal server operations, including installation, database setup, commissioning, and user management.',
   )
-  .action(UnderpostBaremetal.API.callback);
+  .action(Underpost.baremetal.callback);
 
 export { program };

package/src/cli/lxd.js

@@ -5,10 +5,10 @@
  */
 
 import { getNpmRootPath } from '../server/conf.js';
-import { getLocalIPv4Address } from '../server/dns.js';
 import { pbcopy, shellExec } from '../server/process.js';
 import fs from 'fs-extra';
 import { loggerFactory } from '../server/logger.js';
+import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -83,7 +83,7 @@ class UnderpostLxd {
         shellExec(`sudo systemctl status snap.lxd.daemon`);
         const lxdPressedContent = fs
           .readFileSync(`${underpostRoot}/manifests/lxd/lxd-preseed.yaml`, 'utf8')
-          .replaceAll(`127.0.0.1`, getLocalIPv4Address());
+          .replaceAll(`127.0.0.1`, Underpost.dns.getLocalIPv4Address());
         shellExec(`echo "${lxdPressedContent}" | lxd init --preseed`);
         shellExec(`lxc cluster list`);
       }
@@ -129,7 +129,7 @@ ipv6.address=none`);
             // Default to kubeadm if not K3s
             flag = ' -s -- --kubeadm';
           }
-          await UnderpostLxd.API.runWorkflow({
+          await Underpost.lxd.runWorkflow({
             workflowId: 'engine',
             vmName: options.initVm,
           });
@@ -147,7 +147,7 @@ ipv6.address=none`);
       }
 
       if (options.workflowId) {
-        await UnderpostLxd.API.runWorkflow({
+        await Underpost.lxd.runWorkflow({
           workflowId: options.workflowId,
           vmName: options.vmId,
           deployId: options.deployId,
@@ -201,7 +201,7 @@ ipv6.address=none`);
         const [vmName, ports] = options.expose.split(':');
         console.log({ vmName, ports });
         const protocols = ['tcp']; // udp
-        const hostIp = getLocalIPv4Address();
+        const hostIp = Underpost.dns.getLocalIPv4Address();
         const vmIp = shellExec(
           `lxc list ${vmName} --format json | jq -r '.[0].state.network.enp5s0.addresses[] | select(.family=="inet") | .address'`,
           { stdout: true },

package/src/cli/monitor.js

@@ -6,12 +6,10 @@
 
 import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
-import UnderpostDeploy from './deploy.js';
 import axios from 'axios';
-import UnderpostRootEnv from './env.js';
 import fs from 'fs-extra';
 import { shellExec } from '../server/process.js';
-import { isInternetConnection } from '../server/dns.js';
+import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -40,6 +38,10 @@ class UnderpostMonitor {
      * @param {string} [options.replicas='1'] - Number of replicas for the deployment. Defaults to 1.
      * @param {boolean} [options.sync=false] - Synchronize traffic switching with the deployment.
      * @param {string} [options.namespace='default'] - Kubernetes namespace for the deployment. Defaults to 'default'.
+     * @param {string} [options.timeoutResponse=''] - Timeout for server response checks.
+     * @param {string} [options.timeoutIdle=''] - Timeout for idle connections.
+     * @param {string} [options.retryCount=''] - Number of retry attempts for health checks.
+     * @param {string} [options.retryPerTryTimeout=''] - Timeout per retry attempt.
      * @param {object} [commanderOptions] - Options passed from the command line interface.
      * @param {object} [auxRouter] - Optional router configuration for the deployment.
      * @memberof UnderpostMonitor
@@ -55,6 +57,10 @@ class UnderpostMonitor {
         replicas: '1',
         sync: false,
         namespace: 'default',
+        timeoutResponse: '',
+        timeoutIdle: '',
+        retryCount: '',
+        retryPerTryTimeout: '',
       },
       commanderOptions,
       auxRouter,
@@ -63,17 +69,17 @@ class UnderpostMonitor {
       if (!options.replicas) options.replicas = '1';
       if (deployId === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`)) {
         for (const _deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(','))
-          UnderpostMonitor.API.callback(
+          Underpost.monitor.callback(
             _deployId.trim(),
             env,
             options,
             commanderOptions,
-            await UnderpostDeploy.API.routerFactory(_deployId, env),
+            await Underpost.deploy.routerFactory(_deployId, env),
           );
         return;
       }
 
-      const router = auxRouter ?? (await UnderpostDeploy.API.routerFactory(deployId, env));
+      const router = auxRouter ?? (await Underpost.deploy.routerFactory(deployId, env));
 
       const confServer = loadReplicas(
         deployId,
@@ -84,10 +90,10 @@ class UnderpostMonitor {
 
       let errorPayloads = [];
       if (options.sync === true) {
-        const currentTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId, { namespace: options.namespace });
-        if (currentTraffic) UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, currentTraffic);
+        const currentTraffic = Underpost.deploy.getCurrentTraffic(deployId, { namespace: options.namespace });
+        if (currentTraffic) Underpost.env.set(`${deployId}-${env}-traffic`, currentTraffic);
       }
-      let traffic = UnderpostRootEnv.API.get(`${deployId}-${env}-traffic`) ?? 'blue';
+      let traffic = Underpost.env.get(`${deployId}-${env}-traffic`) ?? 'blue';
       const maxAttempts = parseInt(
         Object.keys(pathPortAssignmentData)
           .map((host) => pathPortAssignmentData[host].length)
@@ -102,22 +108,15 @@ class UnderpostMonitor {
         traffic,
       });
 
-      const switchTraffic = () => {
-        if (traffic === 'blue') traffic = 'green';
-        else traffic = 'blue';
-        UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, traffic);
-        const namespace = options.namespace;
-        shellExec(
-          `node bin deploy --info-router --build-manifest --traffic ${traffic} --replicas ${
-            options.replicas
-          } --namespace ${namespace} ${deployId} ${env}`,
-        );
-        shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml -n ${namespace}`);
+      const switchTraffic = (targetTraffic) => {
+        const nextTraffic = targetTraffic ?? (traffic === 'blue' ? 'green' : 'blue');
+        // Delegate traffic switching to centralized deploy implementation so behavior is consistent
+        Underpost.deploy.switchTraffic(deployId, env, nextTraffic, options.replicas, options.namespace, options);
+        // Keep local traffic in sync with the environment
+        traffic = nextTraffic;
       };
 
       const monitor = async (reject) => {
-        if (UnderpostRootEnv.API.get(`monitor-init-callback-script`))
-          shellExec(UnderpostRootEnv.API.get(`monitor-init-callback-script`));
         const currentTimestamp = new Date().getTime();
         errorPayloads = errorPayloads.filter((e) => currentTimestamp - e.timestamp < 60 * 1000 * 5);
         logger.info(`[${deployId}-${env}] Check server health`);
@@ -125,19 +124,12 @@ class UnderpostMonitor {
           for (const instance of pathPortAssignmentData[host]) {
             const { port, path } = instance;
             if (path.match('peer') || path.match('socket')) continue;
-            let urlTest = `http://localhost:${port}${path}`;
-            switch (options.type) {
-              case 'remote':
-              case 'blue-green':
-                urlTest = `https://${host}${path}`;
-                break;
-
-              default:
-                break;
+            const urlTest = `http${env === 'development' ? '' : 's'}://${host}${path}`;
+            if (env === 'development') {
+              const { renderHosts } = Underpost.deploy.etcHostFactory([host]);
+              logger.info('renderHosts', renderHosts);
             }
-            // logger.info('Test instance', urlTest);
             await axios.get(urlTest, { timeout: 10000 }).catch((error) => {
-              // console.log(error);
               const errorPayload = {
                 urlTest,
                 host,
@@ -152,39 +144,29 @@ class UnderpostMonitor {
               if (errorPayload.status !== 404) {
                 errorPayloads.push(errorPayload);
                 if (errorPayloads.length >= maxAttempts) {
-                  const message = JSON.stringify(errorPayloads, null, 4);
                   logger.error(
                     `Deployment ${deployId} ${env} has been reached max attempts error payloads`,
                     errorPayloads,
                   );
                   switch (options.type) {
                     case 'blue-green':
-                      {
-                        const confServer = JSON.parse(
-                          fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
-                        );
-
-                        const namespace = options.namespace;
-                        UnderpostDeploy.API.configMap(env, namespace);
+                    default: {
+                      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} -n ${namespace} --ignore-not-found`);
-                        }
-                        shellExec(
-                          `sudo kubectl rollout restart deployment/${deployId}-${env}-${traffic} -n ${namespace}`,
-                        );
+                      const namespace = options.namespace;
+                      Underpost.deploy.configMap(env, namespace);
 
-                        switchTraffic();
+                      for (const host of Object.keys(confServer)) {
+                        shellExec(`sudo kubectl delete HTTPProxy ${host} -n ${namespace} --ignore-not-found`);
                       }
+                      shellExec(
+                        `sudo kubectl rollout restart deployment/${deployId}-${env}-${traffic} -n ${namespace}`,
+                      );
 
-                      break;
-
-                    case 'remote':
-                      break;
-
-                    default:
-                      if (reject) reject(message);
-                      else throw new Error(message);
+                      switchTraffic();
+                    }
                   }
                   errorPayloads = [];
                 }
@@ -201,24 +183,29 @@ class UnderpostMonitor {
       let monitorTrafficName;
       let monitorPodName;
       const monitorCallBack = (resolve, reject) => {
-        const envMsTimeout = UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-ms`);
+        if (env === 'development') {
+          const { renderHosts } = Underpost.deploy.etcHostFactory([]);
+          logger.info('renderHosts', renderHosts);
+        }
+        const envMsTimeout = Underpost.env.get(`${deployId}-${env}-monitor-ms`);
         setTimeout(
           async () => {
-            const isOnline = await isInternetConnection();
+            const isOnline = await Underpost.dns.isInternetConnection();
             if (!isOnline) {
               logger.warn('No internet connection');
               monitorCallBack(resolve, reject);
               return;
             }
-            switch (options.type) {
-              case 'blue-green':
-                {
+            if (!options.now)
+              switch (options.type) {
+                case 'blue-green':
+                default: {
                   if (monitorTrafficName !== traffic) {
                     monitorTrafficName = undefined;
                     monitorPodName = undefined;
                   }
                   const checkDeploymentReadyStatus = async () => {
-                    const { ready, notReadyPods, readyPods } = await UnderpostDeploy.API.checkDeploymentReadyStatus(
+                    const { ready, notReadyPods, readyPods } = await Underpost.deploy.checkDeploymentReadyStatus(
                       deployId,
                       env,
                       traffic,
@@ -236,33 +223,24 @@ class UnderpostMonitor {
                     return;
                   }
                 }
-
-                break;
-
-              default:
-                break;
-            }
-            for (const monitorStatus of [
-              { key: `monitor-input`, value: UnderpostRootEnv.API.get(`monitor-input`) },
-              {
-                key: `${deployId}-${env}-monitor-input`,
-                value: UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-input`),
-              },
-            ])
-              switch (monitorStatus.value) {
-                case 'pause':
-                  monitorCallBack(resolve, reject);
-                  return;
-                case 'restart':
-                  UnderpostRootEnv.API.delete(monitorStatus.key);
-                  return reject();
-                case 'stop':
-                  UnderpostRootEnv.API.delete(monitorStatus.key);
-                  return resolve();
-                case 'blue-green-switch':
-                  UnderpostRootEnv.API.delete(monitorStatus.key);
-                  switchTraffic();
               }
+            const monitorKey = `${deployId}-${env}-monitor-input`;
+            const monitorValue = Underpost.env.get(monitorKey);
+            switch (monitorValue) {
+              case 'pause':
+                monitorCallBack(resolve, reject);
+                return;
+              case 'restart':
+              case 'stop':
+              case 'blue-green-switch':
+                Underpost.env.delete(monitorKey);
+              case 'restart':
+                return reject();
+              case 'stop':
+                return resolve();
+              case 'blue-green-switch':
+                switchTraffic();
+            }
             await monitor(reject);
             monitorCallBack(resolve, reject);
             return;

package/src/cli/repository.js

@@ -12,6 +12,7 @@ import fs from 'fs-extra';
 import { getNpmRootPath } from '../server/conf.js';
 import { Config } from '../server/conf.js';
 import { DefaultConf } from '../../conf.js';
+import Underpost from '../index.js';
 
 dotenv.config();
 
@@ -134,8 +135,8 @@ class UnderpostRepository {
       }
       if (options.lastMsg) {
         if (options.copy) {
-          pbcopy(UnderpostRepository.API.getLastCommitMsg(options.lastMsg - 1));
-        } else console.log(UnderpostRepository.API.getLastCommitMsg(options.lastMsg - 1));
+          pbcopy(Underpost.repo.getLastCommitMsg(options.lastMsg - 1));
+        } else console.log(Underpost.repo.getLastCommitMsg(options.lastMsg - 1));
         return;
       }
       if (options.diff) {
@@ -145,7 +146,7 @@ class UnderpostRepository {
         return;
       }
       if (options.log) {
-        const history = UnderpostRepository.API.getHistory(options.log);
+        const history = Underpost.repo.getHistory(options.log);
         const chainCmd = history
           .reverse()
           .map((commitData, i) => `${i === 0 ? '' : ' && '}git ${diffCmd} ${commitData.hash}`)
@@ -174,7 +175,7 @@ class UnderpostRepository {
         return;
       }
       if (commitType === 'reset') {
-        if (options.copy) pbcopy(UnderpostRepository.API.getLastCommitMsg());
+        if (options.copy) pbcopy(Underpost.repo.getLastCommitMsg());
         shellExec(`cd ${repoPath} && git reset --soft HEAD~${isNaN(parseInt(subModule)) ? 1 : parseInt(subModule)}`);
         return;
       }
@@ -283,7 +284,7 @@ class UnderpostRepository {
 
           // Handle defaultConf operation
           if (options.defaultConf) {
-            UnderpostRepository.API.updateDefaultConf(options);
+            Underpost.repo.updateDefaultConf(options);
             return resolve(true);
           }
 
@@ -439,7 +440,7 @@ class UnderpostRepository {
       const commandUntrack = `cd ${path} && git ls-files --others --exclude-standard`;
       const diffOutput = shellExec(command, { stdout: true, silent: true });
       const diffUntrackOutput = shellExec(commandUntrack, { stdout: true, silent: true });
-      const deleteFiles = UnderpostRepository.API.getDeleteFiles(path);
+      const deleteFiles = Underpost.repo.getDeleteFiles(path);
       return diffOutput
         .toString()
         .split('\n')