@underpostnet/underpost 2.98.3 → 2.99.1

package/src/cli/secrets.js

@@ -7,7 +7,7 @@
 import dotenv from 'dotenv';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
-import UnderpostRootEnv from './env.js';
+import Underpost from '../index.js';
 
 dotenv.config();
 
@@ -41,7 +41,7 @@ class UnderpostSecret {
       createFromEnvFile(envPath) {
         const envObj = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
         for (const key of Object.keys(envObj)) {
-          UnderpostSecret.API.docker.set(key, envObj[key]);
+          Underpost.secret.docker.set(key, envObj[key]);
         }
       },
       set(key, value) {
@@ -61,7 +61,7 @@ class UnderpostSecret {
       createFromEnvFile(envPath) {
         const envObj = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
         for (const key of Object.keys(envObj)) {
-          UnderpostRootEnv.API.set(key, envObj[key]);
+          Underpost.env.set(key, envObj[key]);
         }
       },
     },

package/src/cli/ssh.js

@@ -5,11 +5,10 @@
  */
 
 import { generateRandomPasswordSelection } from '../client/components/core/CommonJs.js';
-import Dns from '../server/dns.js';
 import { pbcopy, shellExec } from '../server/process.js';
 import { loggerFactory } from '../server/logger.js';
 import fs from 'fs-extra';
-import UnderpostRootEnv from './env.js';
+import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -252,17 +251,17 @@ EOF`);
 
       // Set defaults
       if (!options.user) options.user = 'root';
-      if (!options.host) options.host = await Dns.getPublicIp();
+      if (!options.host) options.host = await Underpost.dns.getPublicIp();
       if (!options.password) options.password = options.disablePassword ? '' : generateRandomPasswordSelection(16);
       if (!options.groups) options.groups = 'wheel';
       if (!options.port) options.port = 22; // Handle connect uri
 
-      const userHome = UnderpostSSH.API.getUserHome(options.user);
+      const userHome = Underpost.ssh.getUserHome(options.user);
       options.userHome = userHome;
 
       // Load config and override password and host if user exists in config
       if (options.deployId) {
-        const config = UnderpostSSH.API.loadConfigNode(options.deployId);
+        const config = Underpost.ssh.loadConfigNode(options.deployId);
         confNode = config.confNode;
         confNodePath = config.confNodePath;
 
@@ -335,7 +334,7 @@ EOF`);
         // Remove the private key copy folder and update config only if deployId is provided
         if (options.deployId) {
           if (!confNode) {
-            const config = UnderpostSSH.API.loadConfigNode(options.deployId);
+            const config = Underpost.ssh.loadConfigNode(options.deployId);
             confNode = config.confNode;
             confNodePath = config.confNodePath;
           }
@@ -347,7 +346,7 @@ EOF`);
           }
 
           delete confNode.users[options.user];
-          UnderpostSSH.API.saveConfigNode(confNodePath, confNode);
+          Underpost.ssh.saveConfigNode(confNodePath, confNode);
         }
 
         logger.info(`User removed`);
@@ -362,7 +361,7 @@ EOF`);
         // If deployId is provided, check for existing config and backup keys
         if (options.deployId) {
           if (!confNode) {
-            const config = UnderpostSSH.API.loadConfigNode(options.deployId);
+            const config = Underpost.ssh.loadConfigNode(options.deployId);
             confNode = config.confNode;
             confNodePath = config.confNodePath;
           }
@@ -378,14 +377,14 @@ EOF`);
             logger.info(`User ${options.user} already exists in config. Importing existing keys...`);
 
             // Create system user if it doesn't exist
-            const userExists = UnderpostSSH.API.checkUserExists(options.user);
+            const userExists = Underpost.ssh.checkUserExists(options.user);
             if (!userExists) {
-              UnderpostSSH.API.createSystemUser(options.user, options.password, options.groups);
+              Underpost.ssh.createSystemUser(options.user, options.password, options.groups);
             }
 
-            const userHome = UnderpostSSH.API.getUserHome(options.user);
+            const userHome = Underpost.ssh.getUserHome(options.user);
             const sshDir = `${userHome}/.ssh`;
-            UnderpostSSH.API.ensureSSHDirectory(sshDir);
+            Underpost.ssh.ensureSSHDirectory(sshDir);
 
             const userKeyPath = `${sshDir}/id_rsa`;
             const userPubKeyPath = `${sshDir}/id_rsa.pub`;
@@ -394,10 +393,10 @@ EOF`);
             fs.copyFileSync(privateKeyPath, userKeyPath);
             fs.copyFileSync(publicKeyPath, userPubKeyPath);
 
-            UnderpostSSH.API.configureAuthorizedKeys(sshDir, userPubKeyPath, options.disablePassword);
-            UnderpostSSH.API.configureSudoAccess(options.user, options.password, options.disablePassword);
-            UnderpostSSH.API.configureKnownHosts(sshDir, options.port, options.host);
-            UnderpostSSH.API.setSSHFilePermissions(sshDir, options.user, userKeyPath, userPubKeyPath);
+            Underpost.ssh.configureAuthorizedKeys(sshDir, userPubKeyPath, options.disablePassword);
+            Underpost.ssh.configureSudoAccess(options.user, options.password, options.disablePassword);
+            Underpost.ssh.configureKnownHosts(sshDir, options.port, options.host);
+            Underpost.ssh.setSSHFilePermissions(sshDir, options.user, userKeyPath, userPubKeyPath);
 
             logger.info(`Keys imported from ${privateCopyDir} to ${sshDir}`);
             logger.info(`User added with existing keys`);
@@ -406,11 +405,11 @@ EOF`);
         }
 
         // New user or no existing keys - create new user and generate keys
-        UnderpostSSH.API.createSystemUser(options.user, options.password, options.groups);
+        Underpost.ssh.createSystemUser(options.user, options.password, options.groups);
 
-        const userHome = UnderpostSSH.API.getUserHome(options.user);
+        const userHome = Underpost.ssh.getUserHome(options.user);
         const sshDir = `${userHome}/.ssh`;
-        UnderpostSSH.API.ensureSSHDirectory(sshDir);
+        Underpost.ssh.ensureSSHDirectory(sshDir);
 
         const keyPath = `${sshDir}/id_rsa`;
         const pubKeyPath = `${sshDir}/id_rsa.pub`;
@@ -421,10 +420,10 @@ EOF`);
           );
         }
 
-        UnderpostSSH.API.configureAuthorizedKeys(sshDir, pubKeyPath, options.disablePassword);
-        UnderpostSSH.API.configureSudoAccess(options.user, options.password, options.disablePassword);
-        UnderpostSSH.API.configureKnownHosts(sshDir, options.port, options.host);
-        UnderpostSSH.API.setSSHFilePermissions(sshDir, options.user, keyPath, pubKeyPath);
+        Underpost.ssh.configureAuthorizedKeys(sshDir, pubKeyPath, options.disablePassword);
+        Underpost.ssh.configureSudoAccess(options.user, options.password, options.disablePassword);
+        Underpost.ssh.configureKnownHosts(sshDir, options.port, options.host);
+        Underpost.ssh.setSSHFilePermissions(sshDir, options.user, keyPath, pubKeyPath);
 
         // Save a copy of the keys to the private folder only if deployId is provided
         if (options.deployId) {
@@ -447,7 +446,7 @@ EOF`);
             privateKeyCopyPath,
             publicKeyCopyPath,
           };
-          UnderpostSSH.API.saveConfigNode(confNodePath, confNode);
+          Underpost.ssh.saveConfigNode(confNodePath, confNode);
         }
 
         logger.info(`User added`);
@@ -457,7 +456,7 @@ EOF`);
       // Handle config user listing (only with deployId)
       if (options.deployId) {
         if (!confNode) {
-          const config = UnderpostSSH.API.loadConfigNode(options.deployId);
+          const config = Underpost.ssh.loadConfigNode(options.deployId);
           confNode = config.confNode;
           confNodePath = config.confNodePath;
         }
@@ -472,7 +471,7 @@ EOF`);
 
       // Handle generate root keys
       if (options.generate)
-        UnderpostSSH.API.generateKeys({ user: options.user, password: options.password, host: options.host });
+        Underpost.ssh.generateKeys({ user: options.user, password: options.password, host: options.host });
 
       // Handle list operations
       if (options.keysList) shellExec(`cat ${userHome}/.ssh/authorized_keys`);
@@ -489,14 +488,63 @@ EOF`);
 
       // Handle start server
       if (options.start) {
-        UnderpostSSH.API.chmod({ user: options.user });
-        UnderpostSSH.API.initService({ port: options.port });
+        Underpost.ssh.chmod({ user: options.user });
+        Underpost.ssh.initService({ port: options.port });
       }
 
       // Handle status server
       if (options.status) shellExec('service sshd status');
     },
 
+    /**
+     * Generic SSH remote command runner that centralizes SSH execution logic.
+     * Executes arbitrary shell commands on a remote server via SSH with proper credential handling.
+     * @async
+     * @function sshRemoteRunner
+     * @param {string} remoteCommand - The command to execute on the remote server
+     * @param {Object} options - Configuration options for SSH execution
+     * @param {string} [options.deployId] - Deployment ID for credential lookup
+     * @param {string} [options.user] - SSH user for credential lookup
+     * @param {boolean} [options.dev=false] - Development mode flag
+     * @param {string} [options.cd='/home/dd/engine'] - Working directory on remote server
+     * @param {boolean} [options.useSudo=true] - Whether to use sudo for command execution
+     * @param {boolean} [options.remote=true] - Whether to execute as remote command (if false, runs locally)
+     * @returns {Promise<string>} Output from the shell execution
+     * @memberof UnderpostSSH
+     */
+    sshRemoteRunner: async (remoteCommand, options = {}) => {
+      const { deployId = '', user = '', dev = false, cd = '/home/dd/engine', useSudo = true, remote = true } = options;
+
+      // If not executing remotely, just run locally
+      if (!remote) {
+        return shellExec(remoteCommand);
+      }
+
+      // Set up SSH credentials from config
+      if (deployId && user) {
+        await Underpost.ssh.setDefautlSshCredentials({ deployId, user });
+      }
+
+      // Build the complete SSH command
+      const sshScript = `#!/usr/bin/env bash
+set -euo pipefail
+
+REMOTE_USER=$(node bin config get --plain DEFAULT_SSH_USER)
+REMOTE_HOST=$(node bin config get --plain DEFAULT_SSH_HOST)
+REMOTE_PORT=$(node bin config get --plain DEFAULT_SSH_PORT)
+SSH_KEY=$(node bin config get --plain DEFAULT_SSH_KEY_PATH)
+
+chmod 600 "$SSH_KEY"
+
+ssh -i "$SSH_KEY" -o BatchMode=yes "$REMOTE_USER@$REMOTE_HOST" -p $REMOTE_PORT sh <<EOF
+${cd ? `cd ${cd}` : ''}
+${useSudo ? `sudo -n -- /bin/bash -lc "${remoteCommand}"` : remoteCommand}
+EOF
+`;
+
+      return shellExec(sshScript, { stdout: true });
+    },
+
     /**
      * Loads saved SSH credentials from config and sets them in the UnderpostRootEnv API.
      * @async
@@ -512,10 +560,10 @@ EOF`);
       if (fs.existsSync(confNodePath)) {
         const { users } = JSON.parse(fs.readFileSync(confNodePath, 'utf8'));
         const { user, host, keyPath, port } = users[options.user];
-        UnderpostRootEnv.API.set('DEFAULT_SSH_USER', user);
-        UnderpostRootEnv.API.set('DEFAULT_SSH_HOST', host);
-        UnderpostRootEnv.API.set('DEFAULT_SSH_KEY_PATH', keyPath);
-        UnderpostRootEnv.API.set('DEFAULT_SSH_PORT', port);
+        Underpost.env.set('DEFAULT_SSH_USER', user);
+        Underpost.env.set('DEFAULT_SSH_HOST', host);
+        Underpost.env.set('DEFAULT_SSH_KEY_PATH', keyPath);
+        Underpost.env.set('DEFAULT_SSH_PORT', port);
       } else logger.warn(`No SSH config found at ${confNodePath}`);
     },
 

package/src/cli/static.js

@@ -412,7 +412,7 @@ class UnderpostStatic {
       // Handle config template generation
       if (options.generateConfig) {
         const configPath = typeof options.generateConfig === 'string' ? options.generateConfig : './static-config.json';
-        return UnderpostStatic.API.generateConfigTemplate(configPath);
+        return Underpost.static.generateConfigTemplate(configPath);
       }
 
       // Parse comma-separated options

package/src/cli/test.js

@@ -9,8 +9,7 @@ import { MariaDB } from '../db/mariadb/MariaDB.js';
 import { getNpmRootPath } from '../server/conf.js';
 import { actionInitLog, loggerFactory, setUpInfo } from '../server/logger.js';
 import { pbcopy, shellExec } from '../server/process.js';
-import UnderpostDeploy from './deploy.js';
-
+import Underpost from '../index.js';
 const logger = loggerFactory(import.meta);
 
 /**
@@ -67,10 +66,10 @@ class UnderpostTest {
         options.podStatus &&
         typeof options.podStatus === 'string'
       )
-        return await UnderpostTest.API.statusMonitor(options.podName, options.podStatus, options.kindType);
+        return await Underpost.test.statusMonitor(options.podName, options.podStatus, options.kindType);
 
       if (options.sh === true || options.logs === true) {
-        const [pod] = UnderpostDeploy.API.get(deployList);
+        const [pod] = Underpost.deploy.get(deployList);
         if (pod) {
           if (options.sh) return pbcopy(`sudo kubectl exec -it ${pod.NAME} -- sh`);
           if (options.logs) return shellExec(`sudo kubectl logs -f ${pod.NAME}`);
@@ -104,7 +103,7 @@ class UnderpostTest {
                 break;
             }
           else {
-            const pods = UnderpostDeploy.API.get(deployId);
+            const pods = Underpost.deploy.get(deployId);
             if (pods.length > 0)
               for (const deployData of pods) {
                 const { NAME } = deployData;
@@ -115,7 +114,7 @@ class UnderpostTest {
             else logger.warn(`Couldn't find pods in deployment`, { deployId });
           }
         }
-      } else return UnderpostTest.API.run();
+      } else return Underpost.test.run();
     },
     /**
      * @method statusMonitor
@@ -134,7 +133,7 @@ class UnderpostTest {
         logger.info(`Loading instance`, { podName, status, kindType, deltaMs, maxAttempts });
         const _monitor = async () => {
           await timer(deltaMs);
-          const pods = UnderpostDeploy.API.get(podName, kindType);
+          const pods = Underpost.deploy.get(podName, kindType);
           let result = pods.find((p) => p.STATUS === status || (status === 'Running' && p.STATUS === 'Completed'));
           logger.info(
             `Testing pod ${podName}... ${result ? 1 : 0}/1 - elapsed time ${deltaMs * (index + 1)}s - attempt ${

package/src/index.js

@@ -7,7 +7,6 @@
 import UnderpostBaremetal from './cli/baremetal.js';
 import UnderpostCloudInit from './cli/cloud-init.js';
 import UnderpostCluster from './cli/cluster.js';
-import UnderpostCron from './cli/cron.js';
 import UnderpostDB from './cli/db.js';
 import UnderpostDeploy from './cli/deploy.js';
 import UnderpostRootEnv from './cli/env.js';
@@ -17,11 +16,14 @@ import UnderpostLxd from './cli/lxd.js';
 import UnderpostMonitor from './cli/monitor.js';
 import UnderpostRepository from './cli/repository.js';
 import UnderpostRun from './cli/run.js';
-import UnderpostScript from './cli/script.js';
 import UnderpostSecret from './cli/secrets.js';
 import UnderpostSSH from './cli/ssh.js';
 import UnderpostStatic from './cli/static.js';
 import UnderpostTest from './cli/test.js';
+
+import UnderpostDns from './server/dns.js';
+import UnderpostBackup from './server/backup.js';
+import UnderpostCron from './server/cron.js';
 import UnderpostStartUp from './server/start.js';
 
 /**
@@ -36,7 +38,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.98.3';
+  static version = 'v2.99.1';
   /**
    * Repository cli API
    * @static
@@ -64,15 +66,7 @@ class Underpost {
   static get test() {
     return UnderpostTest.API;
   }
-  /**
-   * Underpost Start Up cli API
-   * @static
-   * @type {UnderpostStartUp.API}
-   * @memberof Underpost
-   */
-  static get start() {
-    return UnderpostStartUp.API;
-  }
+
   /**
    * Static cli API
    * @static
@@ -110,15 +104,6 @@ class Underpost {
   static get secret() {
     return UnderpostSecret.API;
   }
-  /**
-   * Scripts cli API
-   * @static
-   * @type {UnderpostScript.API}
-   * @memberof Underpost
-   */
-  static get script() {
-    return UnderpostScript.API;
-  }
   /**
    * Database cli API
    * @static
@@ -137,15 +122,6 @@ class Underpost {
   static get deploy() {
     return UnderpostDeploy.API;
   }
-  /**
-   * Cron cli API
-   * @static
-   * @type {UnderpostCron.API}
-   * @memberof Underpost
-   */
-  static get cron() {
-    return UnderpostCron.API;
-  }
   /**
    * File Storage cli API
    * @static
@@ -212,6 +188,46 @@ class Underpost {
   static get baremetal() {
     return UnderpostBaremetal.API;
   }
+
+  /**
+   * Dns cli API
+   * @static
+   * @type {UnderpostDns.API}
+   * @memberof Underpost
+   */
+  static get dns() {
+    return UnderpostDns.API;
+  }
+
+  /**
+   * BackUp cli API
+   * @static
+   * @type {UnderpostBackup.API}
+   * @memberof Underpost
+   */
+  static get backup() {
+    return UnderpostBackup.API;
+  }
+
+  /**
+   * Cron cli API
+   * @static
+   * @type {UnderpostCron.API}
+   * @memberof Underpost
+   */
+  static get cron() {
+    return UnderpostCron.API;
+  }
+
+  /**
+   * Start Up cli API
+   * @static
+   * @type {UnderpostStartUp.API}
+   * @memberof Underpost
+   */
+  static get start() {
+    return UnderpostStartUp.API;
+  }
 }
 
 const up = Underpost;
@@ -225,7 +241,6 @@ export {
   UnderpostBaremetal,
   UnderpostCloudInit,
   UnderpostCluster,
-  UnderpostCron,
   UnderpostDB,
   UnderpostDeploy,
   UnderpostRootEnv,
@@ -236,10 +251,12 @@ export {
   UnderpostMonitor,
   UnderpostRepository,
   UnderpostRun,
-  UnderpostScript,
   UnderpostSecret,
   UnderpostSSH,
   UnderpostTest,
+  UnderpostDns,
+  UnderpostBackup,
+  UnderpostCron,
   UnderpostStartUp,
 };
 

package/src/runtime/express/Express.js

@@ -12,7 +12,6 @@ import swaggerUi from 'swagger-ui-express';
 import compression from 'compression';
 import { createServer } from 'http';
 
-import UnderpostStartUp from '../../server/start.js';
 import { loggerFactory, loggerMiddleware } from '../../server/logger.js';
 import { getCapVariableName, newInstance } from '../../client/components/core/CommonJs.js';
 import { MailerProvider } from '../../mailer/MailerProvider.js';
@@ -25,6 +24,8 @@ import { TLS } from '../../server/tls.js';
 import { shellExec } from '../../server/process.js';
 import { devProxyHostFactory, isDevProxyContext, isTlsDevProxy } from '../../server/conf.js';
 
+import Underpost from '../../index.js';
+
 const logger = loggerFactory(import.meta);
 
 /**
@@ -143,7 +144,7 @@ class ExpressService {
         }
         return next();
       });
-      await UnderpostStartUp.API.listenPortController(app, port, runningData);
+      await Underpost.start.listenPortController(app, port, runningData);
       return { portsUsed };
     }
 
@@ -214,7 +215,7 @@ class ExpressService {
         const { options, meta, ioServer } = await createIoServer(server, { host, path, db, port, origins });
 
         // Listen on the main port for the WS server
-        await UnderpostStartUp.API.listenPortController(ioServer, port, {
+        await Underpost.start.listenPortController(ioServer, port, {
           runtime: 'nodejs',
           client: null,
           host,
@@ -232,7 +233,7 @@ class ExpressService {
           origins,
           path,
         });
-        await UnderpostStartUp.API.listenPortController(peerServer, peerPort, {
+        await Underpost.start.listenPortController(peerServer, peerPort, {
           runtime: 'nodejs',
           client: null,
           host,
@@ -250,8 +251,8 @@ class ExpressService {
     if (useLocalSsl && process.env.NODE_ENV === 'development') {
       if (!TLS.validateSecureContext()) shellExec(`node bin/deploy tls`);
       const { ServerSSL } = await TLS.createSslServer(app);
-      await UnderpostStartUp.API.listenPortController(ServerSSL, port, runningData);
-    } else await UnderpostStartUp.API.listenPortController(server, port, runningData);
+      await Underpost.start.listenPortController(ServerSSL, port, runningData);
+    } else await Underpost.start.listenPortController(server, port, runningData);
 
     return { portsUsed };
   }

package/src/server/auth.js

@@ -349,7 +349,12 @@ const cookieOptionsFactory = (req, host) => {
     secure,
     sameSite,
     path: '/',
-    domain: process.env.NODE_ENV === 'production' || isDevProxyContext() ? host : 'localhost',
+    domain:
+      process.env.NODE_ENV === 'production' ||
+      isDevProxyContext() ||
+      (req.headers.host && req.headers.host.toLocaleLowerCase().match(host))
+        ? host
+        : 'localhost',
     maxAge,
   };
 

package/src/server/backup.js

@@ -43,5 +43,15 @@ class BackUp {
     }
   };
 }
+/**
+ * Main UnderpostBakcup class for backup operations.
+ * @class UnderpostBakcup
+ * @memberof UnderpostBakcup
+ */
+class UnderpostBakcUp {
+  static API = BackUp;
+}
+
+export default UnderpostBakcUp;
 
-export default BackUp;
+export { BackUp, UnderpostBakcUp };

package/src/server/conf.js

@@ -22,7 +22,7 @@ import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
 import { DefaultConf } from '../../conf.js';
 import splitFile from 'split-file';
-import UnderpostRootEnv from '../cli/env.js';
+import Underpost from '../index.js';
 
 colors.enable();
 
@@ -59,7 +59,7 @@ const Config = {
     if (!subConf && process.argv[3] && typeof process.argv[3] === 'string') subConf = process.argv[3];
     if (!fs.existsSync(`./tmp`)) fs.mkdirSync(`./tmp`);
     if (!fs.existsSync(`./conf`)) fs.mkdirSync(`./conf`);
-    UnderpostRootEnv.API.set('await-deploy', new Date().toISOString());
+    Underpost.env.set('await-deploy', new Date().toISOString());
     if (deployContext.startsWith('dd-')) loadConf(deployContext, subConf);
     if (deployContext === 'proxy') await Config.buildProxy(deployList, subConf);
   },
@@ -1050,9 +1050,9 @@ const validateTemplatePath = (absolutePath = '') => {
  * @memberof ServerConfBuilder
  */
 const awaitDeployMonitor = async (init = false, deltaMs = 1000) => {
-  if (init) UnderpostRootEnv.API.set('await-deploy', new Date().toISOString());
+  if (init) Underpost.env.set('await-deploy', new Date().toISOString());
   await timer(deltaMs);
-  if (UnderpostRootEnv.API.get('await-deploy')) return await awaitDeployMonitor();
+  if (Underpost.env.get('await-deploy')) return await awaitDeployMonitor();
 };
 
 /**