underpost 3.2.90 → 3.3.0

package/src/client-builder/client-build.js

@@ -525,6 +525,7 @@ const defaultSitemapXsl = `<?xml version="1.0" encoding="UTF-8"?>
  * @param {string|number} options.split - Optional zip split size in MB.
  * @param {boolean} options.fullBuild - Whether to perform a full build.
  * @param {boolean} options.iconsBuild - Whether to build icons.
+ * @param {boolean} options.ssrOnly - Whether to rebuild only views defined in `conf.ssr.json`.
  * @returns {Promise<void>} - Promise that resolves when the build is complete.
  * @throws {Error} - If the build fails.
  * @memberof clientBuild
@@ -548,6 +549,7 @@ const buildClient = async (
   const packageData = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
   const acmeChallengePath = `/.well-known/acme-challenge`;
   const publicPath = `./public`;
+  const ssrOnly = options.ssrOnly === true;
 
   /**
    * @async
@@ -691,11 +693,11 @@ const buildClient = async (
         ? `${directory}${acmeChallengePath}`
         : `${publicPath}/${host}${acmeChallengePath}`;
 
-      if (!enableLiveRebuild) buildAcmeChallengePath(acmeChallengeFullPath);
+      if (!enableLiveRebuild && !ssrOnly) buildAcmeChallengePath(acmeChallengeFullPath);
 
       if (redirect || disabledRebuild) continue;
 
-      if (fullBuildEnabled)
+      if (fullBuildEnabled && !ssrOnly)
         await fullBuild({
           path,
           logger,
@@ -710,7 +712,7 @@ const buildClient = async (
           publicCopyNonExistingFiles,
         });
 
-      if (components)
+      if (!ssrOnly && components)
         for (const module of Object.keys(components)) {
           if (!fs.existsSync(`${rootClientPath}/components/${module}`))
             fs.mkdirSync(`${rootClientPath}/components/${module}`, { recursive: true });
@@ -733,7 +735,7 @@ const buildClient = async (
           }
         }
 
-      if (services) {
+      if (!ssrOnly && services) {
         for (const module of services) {
           if (!fs.existsSync(`${rootClientPath}/services/${module}`))
             fs.mkdirSync(`${rootClientPath}/services/${module}`, { recursive: true });
@@ -796,7 +798,9 @@ const buildClient = async (
       const swSrcPath = `./src/client/sw/core.sw.js`;
       const swPublicPath = `${rootClientPath}/sw.js`;
       const swShouldRebuild =
-        views && !(enableLiveRebuild && !options.liveClientBuildPaths.find((p) => p.srcBuildPath === swSrcPath));
+        !ssrOnly &&
+        views &&
+        !(enableLiveRebuild && !options.liveClientBuildPaths.find((p) => p.srcBuildPath === swSrcPath));
       // Transformed SW JS is held in memory; it gets prepended with renderPayload
       // and written once below, after PRE_CACHED_RESOURCES are known.
       let swTransformedJs = '';
@@ -810,13 +814,15 @@ const buildClient = async (
         });
       }
 
-      if (views) {
-        if (!(
-          enableLiveRebuild &&
-          !options.liveClientBuildPaths.find(
-            (p) => p.srcBuildPath.startsWith(`./src/client/ssr`) || p.srcBuildPath.slice(-9) === '.index.js',
+      if (!ssrOnly && views) {
+        if (
+          !(
+            enableLiveRebuild &&
+            !options.liveClientBuildPaths.find(
+              (p) => p.srcBuildPath.startsWith(`./src/client/ssr`) || p.srcBuildPath.slice(-9) === '.index.js',
+            )
           )
-        ))
+        )
           for (const view of views) {
             const buildPath = `${
               rootClientPath[rootClientPath.length - 1] === '/' ? rootClientPath.slice(0, -1) : rootClientPath
@@ -983,7 +989,7 @@ const buildClient = async (
             );
           }
       }
-      if (!enableLiveRebuild && siteMapLinks.length > 0) {
+      if (!ssrOnly && !enableLiveRebuild && siteMapLinks.length > 0) {
         const hasSitemapTemplate = fs.existsSync(`${rootClientPath}/sitemap`);
         const sitemapBaseUrl = `https://${host}${path === '/' ? '' : path}`;
         // Create a stream to write to — omit xslUrl so we can inject a relative href below
@@ -1020,7 +1026,7 @@ Sitemap: ${sitemapBaseUrl}/sitemap.xml`,
         );
       }
 
-      if (fullBuildEnabled && docs) {
+      if (!ssrOnly && fullBuildEnabled && docs) {
         await buildDocs({
           host,
           path,
@@ -1128,7 +1134,7 @@ ${swTransformedJs}`,
           );
         }
       }
-      if (!enableLiveRebuild && options.buildZip) {
+      if (!ssrOnly && !enableLiveRebuild && options.buildZip) {
         logger.warn('build zip', rootClientPath);
 
         if (!fs.existsSync('./build')) fs.mkdirSync('./build');

package/src/db/mongo/MongooseDB.js

@@ -186,6 +186,10 @@ class MongooseDBService {
       const { ProviderSchema } = await import(`../../api/${api}/${api}.model.js`);
       const keyModel = getCapVariableName(api); // Assuming this returns a capitalized model name
       models[keyModel] = conn.model(keyModel, ProviderSchema);
+      // Mongoose emits 'error' on the model when an autoIndex build fails; with no
+      // listener attached EventEmitter rethrows and takes the whole process down.
+      // A stale or conflicting index must degrade to a log, not kill startup.
+      models[keyModel].on('error', (error) => logger.error(`${keyModel} index build failed: ${error.message}`));
     }
 
     return models;

package/src/index.js

@@ -26,6 +26,8 @@ import UnderpostStatic from './cli/static.js';
 import UnderpostTest from './cli/test.js';
 import UnderpostRelease from './cli/release.js';
 import UnderpostSystemProvisionig from './cli/system.js';
+import UnderpostVultr from './cli/vultr.js';
+import UnderpostWireguard from './cli/wireguard.js';
 
 import UnderpostDns from './server/dns.js';
 import UnderpostBackup from './server/backup.js';
@@ -45,7 +47,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v3.2.90';
+  static version = 'v3.3.0';
 
   /**
    * Required Node.js major version
@@ -252,6 +254,26 @@ class Underpost {
     return UnderpostSystemProvisionig.API;
   }
 
+  /**
+   * Edge hub WireGuard/HAProxy cli API
+   * @static
+   * @type {UnderpostWireguard.API}
+   * @memberof Underpost
+   */
+  static get wireguard() {
+    return UnderpostWireguard.API;
+  }
+
+  /**
+   * Vultr bandwidth guard cli API
+   * @static
+   * @type {UnderpostVultr.API}
+   * @memberof Underpost
+   */
+  static get vultr() {
+    return UnderpostVultr.API;
+  }
+
   /**
    * Dns server API
    * @static
@@ -352,6 +374,8 @@ export {
   UnderpostStartUp,
   UnderpostRelease,
   UnderpostTLS,
+  UnderpostVultr,
+  UnderpostWireguard,
 };
 
 export default Underpost;

package/src/projects/underpost/catalog-underpost.js

@@ -18,7 +18,10 @@ const TEMPLATE_RESTORE_PATHS = [
   `./.github/workflows/gitlab.ci.yml`,
   `./.github/workflows/publish.ci.yml`,
   `./.github/workflows/release.cd.yml`,
-  `./src/client/services/user/guest.service.js`,
+  `./deploy/lib`,
+  './deploy/release',
+  './deploy/pwa-microservices-template',
+  './src/client/services/user/guest.service.js',
   './src/api/user/guest.service.js',
   './src/ws/IoInterface.js',
   './src/ws/IoServer.js',

package/src/server/backup.js

@@ -7,7 +7,7 @@
 import fs from 'fs-extra';
 import { loggerFactory } from './logger.js';
 import Underpost from '../index.js';
-import { loadCronDeployEnv } from './conf.js';
+import { loadCronDeployEnv } from './cron.js';
 
 const logger = loggerFactory(import.meta);
 

package/src/server/conf.js

@@ -22,6 +22,7 @@ import net from 'net';
 import crypto from 'crypto';
 import colors from 'colors';
 import { loggerFactory } from './logger.js';
+import { writeEnv } from './environment.js';
 import { shellExec } from './process.js';
 import { UNDERPOST_GATEWAY, statusPageAssetPathFactory } from './underpost-gateway.js';
 import { DefaultConf } from '../../conf.js';
@@ -45,6 +46,13 @@ const logger = loggerFactory(import.meta);
  */
 const ENV_REF_PREFIX = 'env:';
 
+/**
+ * Default deploy ID used when no deploy ID is specified.
+ * @constant {string}
+ * @memberof ServerConfBuilder
+ */
+const DEFAULT_DEPLOY_ID = 'dd-default';
+
 /**
  * Resolves a standardized context key from host/path descriptors.
  * The key is used across DB, WS, mailer, and cache registries.
@@ -166,63 +174,6 @@ const getConfFolder = (deployId) => {
     : `./engine-private/conf/${deployId}`;
 };
 
-/**
- * Reads `engine-private/deploy/dd.cron` and returns the deploy-id string,
- * or `null` if the file does not exist or is empty.
- *
- * @method cronDeployIdResolve
- * @returns {string|null} The deploy-id from dd.cron, or null.
- * @memberof ServerConfBuilder
- */
-const cronDeployIdResolve = () => {
-  const cronDeployFile = './engine-private/deploy/dd.cron';
-  if (fs.existsSync(cronDeployFile)) {
-    const id = fs.readFileSync(cronDeployFile, 'utf8').trim();
-    return id || null;
-  }
-  return null;
-};
-
-/**
- * Loads the deployment-specific `.env` file referenced by `engine-private/deploy/dd.cron`
- * into `process.env`. Uses `NODE_ENV` to select the environment variant
- * (defaults to `production`).
- *
- * Safe to call multiple times; subsequent calls are no-ops once the env is loaded.
- *
- * @method loadCronDeployEnv
- * @memberof ServerConfBuilder
- */
-function loadCronDeployEnv() {
-  const envName = process.env.NODE_ENV || 'production';
-
-  // 1) Load dd.cron env (takes full precedence)
-  const cronDeployId = cronDeployIdResolve();
-  if (cronDeployId) {
-    const cronEnvPath = `./engine-private/conf/${cronDeployId}/.env.${envName}`;
-    if (fs.existsSync(cronEnvPath)) {
-      const cronEnv = dotenv.parse(fs.readFileSync(cronEnvPath, 'utf8'));
-      process.env = { ...process.env, ...cronEnv };
-    }
-  }
-
-  // 2) Load dd.router envs — only keys not already present
-  const routerDeployFile = './engine-private/deploy/dd.router';
-  if (fs.existsSync(routerDeployFile)) {
-    const routerIds = fs.readFileSync(routerDeployFile, 'utf8').trim().split(',');
-    for (const deployId of routerIds) {
-      const id = deployId.trim();
-      if (!id) continue;
-      const envPath = `./engine-private/conf/${id}/.env.${envName}`;
-      if (!fs.existsSync(envPath)) continue;
-      const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-      for (const key of Object.keys(env)) {
-        if (!(key in process.env)) process.env[key] = env[key];
-      }
-    }
-  }
-}
-
 /**
  * Resolves the full path to a specific configuration JSON file for a deploy ID.
  * For `server` configs in development mode with a subConf, it will prefer the
@@ -280,13 +231,6 @@ const readConfJson = (deployId, confType, options = {}) => {
   return parsed;
 };
 
-/**
- * Default deploy ID used when no deploy ID is specified.
- * @constant {string}
- * @memberof ServerConfBuilder
- */
-const DEFAULT_DEPLOY_ID = 'dd-default';
-
 /**
  * @class Config
  * @description Manages the configuration of the server.
@@ -1431,43 +1375,6 @@ const generateSecurePassword = (length = 16) => {
   return chars.join('');
 };
 
-/**
- * @method getNpmRootPath
- * @description Gets the npm root path.
- * @returns {string} - The npm root path.
- * @memberof ServerConfBuilder
- */
-const getNpmRootPath = () =>
-  shellExec(`npm root -g`, {
-    stdout: true,
-    disableLog: true,
-    silent: true,
-  }).trim();
-
-/**
- * @method getUnderpostRootPath
- * @description Gets the underpost root path.
- * @returns {string} - The underpost root path.
- * @memberof ServerConfBuilder
- */
-const getUnderpostRootPath = () => `${getNpmRootPath()}/underpost`;
-
-/**
- * @method writeEnv
- * @description Writes the environment variables.
- * @param {string} envPath - The environment path.
- * @param {object} envObj - The environment object.
- * @memberof ServerConfBuilder
- */
-const writeEnv = (envPath, envObj) =>
-  fs.writeFileSync(
-    envPath,
-    Object.keys(envObj)
-      .map((key) => `${key}=${envObj[key]}`)
-      .join(`\n`),
-    'utf8',
-  );
-
 /**
  * @method buildCliDoc
  * @description Scrapes `node bin help` (and `node bin help <command>` for every
@@ -3028,7 +2935,9 @@ ${renderHosts}`,
  * Resolves the concrete deploy ids a build or conf-sync run should iterate over.
  *
  * The meta deploy id `dd` fans out to the comma separated ids declared in
- * `engine-private/deploy/dd.router`; any other value is parsed as a comma separated list.
+ * `engine-private/deploy/dd.router`; when that file is absent (e.g. the private
+ * repository is not checked out) it falls back to {@link ServerConfBuilder.DEFAULT_DEPLOY_ID}.
+ * Any other value is parsed as a comma separated list.
  * Entries are trimmed and empties dropped.
  *
  * @method resolveDeployList
@@ -3037,7 +2946,12 @@ ${renderHosts}`,
  * @memberof ServerConfBuilder
  */
 const resolveDeployList = (deployId) =>
-  (deployId === 'dd' ? fs.readFileSync('./engine-private/deploy/dd.router', 'utf8') : deployId)
+  (deployId === 'dd'
+    ? fs.existsSync('./engine-private/deploy/dd.router')
+      ? fs.readFileSync('./engine-private/deploy/dd.router', 'utf8')
+      : DEFAULT_DEPLOY_ID
+    : deployId
+  )
     .split(',')
     .map((id) => id.trim())
     .filter(Boolean);
@@ -3186,6 +3100,7 @@ const buildTemplate = async ({ srcPath = './', toPath = '../pwa-microservices-te
   }
   shellExec(`rm -rf ${toPath}/.github`);
   shellExec(`rm -rf ${toPath}/manifests/deployment/dd-*`);
+  shellExec(`rm -rf ${toPath}/deploy`);
 
   fs.mkdirSync(`${toPath}/.github/workflows`, { recursive: true });
   for (const restorePath of TEMPLATE_RESTORE_PATHS) {
@@ -3388,9 +3303,6 @@ export {
   splitFileFactory,
   generateSecurePassword,
   resolveReplicaCount,
-  getNpmRootPath,
-  getUnderpostRootPath,
-  writeEnv,
   pathPortAssignmentFactory,
   deployRangePortFactory,
   awaitDeployMonitor,
@@ -3410,8 +3322,6 @@ export {
   getConfFilePath,
   readConfJson,
   DEFAULT_DEPLOY_ID,
-  loadCronDeployEnv,
-  cronDeployIdResolve,
   clusterContextFactory,
   clusterTypeFactory,
   exposeTcpPortsFactory,