underpost 3.0.3 → 3.1.1

package/src/server/cron.js

@@ -8,7 +8,7 @@ import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
 import fs from 'fs-extra';
 import Underpost from '../index.js';
-import { getUnderpostRootPath } from './conf.js';
+import { getUnderpostRootPath, loadCronDeployEnv } from './conf.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -191,6 +191,7 @@ class UnderpostCron {
       jobList = Object.keys(Underpost.cron.JOB).join(','),
       options = {},
     ) {
+      loadCronDeployEnv();
       if (options.setupStart) return await Underpost.cron.setupDeployStart(options.setupStart, options);
 
       if (options.generateK8sCronjobs) return await Underpost.cron.generateK8sCronJobs(options);

package/src/server/dns.js

@@ -5,7 +5,6 @@
  * @namespace UnderpostDns
  */
 import axios from 'axios';
-import dotenv from 'dotenv';
 import fs from 'fs';
 import validator from 'validator';
 import { loggerFactory } from './logger.js';
@@ -13,11 +12,9 @@ import dns from 'node:dns';
 import os from 'node:os';
 import { shellExec, pbcopy } from './process.js';
 import Underpost from '../index.js';
-import { writeEnv } from './conf.js';
+import { writeEnv, readConfJson, loadCronDeployEnv } from './conf.js';
 import { resolveDeployId } from './cron.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**
@@ -268,6 +265,7 @@ class Dns {
    * @returns {Promise<void>}
    */
   static async callback(deployList) {
+    loadCronDeployEnv();
     const isOnline = await Dns.isInternetConnection();
 
     if (!isOnline) return;
@@ -288,16 +286,15 @@ class Dns {
 
       for (const _deployId of deployList.split(',')) {
         const deployId = _deployId.trim();
-        const privateCronConfPath = `./engine-private/conf/${deployId}/conf.cron.json`;
-        const confCronPath = fs.existsSync(privateCronConfPath) ? privateCronConfPath : './conf/conf.cron.json';
 
-        if (!fs.existsSync(confCronPath)) {
-          logger.warn(`Cron config file not found for deployId: ${deployId} at ${confCronPath}`);
+        let confCronData;
+        try {
+          confCronData = readConfJson(deployId, 'cron', { resolve: true });
+        } catch (error) {
+          logger.warn(`Cron config file not found for deployId: ${deployId}`, { message: error.message });
           continue;
         }
 
-        const confCronData = JSON.parse(fs.readFileSync(confCronPath, 'utf8'));
-
         if (!confCronData.records) {
           logger.warn(`'records' field missing in cron config for deployId: ${deployId}`);
           continue;
@@ -365,8 +362,26 @@ class Dns {
        */
       dondominio: (options) => {
         const { user, api_key, host, dns, ip } = options;
+
+        // Validate that required credentials are present before making any request
+        if (!user || !api_key) {
+          logger.error(
+            `${dns} update aborted: missing credentials. ` +
+              `Ensure DDNS_USER and DDNS_API_KEY environment variables are set ` +
+              `or provide 'user' and 'api_key' in cron records configuration.`,
+            { host, hasUser: !!user, hasApiKey: !!api_key },
+          );
+          return Promise.resolve(false);
+        }
+
+        if (!host) {
+          logger.error(`${dns} update aborted: missing host. Set DDNS_HOST or provide 'host' in cron records.`);
+          return Promise.resolve(false);
+        }
+
         const url = `https://dondns.dondominio.com/json/?user=${user}&password=${api_key}&host=${host}&ip=${ip}`;
-        logger.info(`${dns} update ip url`, url);
+        // Log the update attempt without exposing the full URL containing credentials
+        logger.info(`${dns} update ip request`, { host, ip });
 
         // Prevent live IP update in non-production environments
         if (process.env.NODE_ENV !== 'production') {
@@ -382,7 +397,8 @@ class Dns {
               return resolve(true);
             })
             .catch((error) => {
-              logger.error(error, `${dns} update ip error: ${error.message}`);
+              // Only log the error message — the full error object contains the request URL with credentials
+              logger.error(`${dns} update ip error`, { message: error.message, host, ip });
               return resolve(false);
             });
         });

package/src/server/downloader.js

@@ -7,8 +7,6 @@
 import axios from 'axios';
 import fs from 'fs';
 import { loggerFactory } from './logger.js';
-import dotenv from 'dotenv';
-dotenv.config();
 
 const logger = loggerFactory(import.meta);
 

package/src/server/logger.js

@@ -6,16 +6,14 @@
 
 'use strict';
 
-import dotenv from 'dotenv';
 import winston from 'winston';
 import morgan from 'morgan';
-import colorize from 'json-colorizer';
+import { colorize, color } from 'json-colorizer';
 import colors from 'colors';
 import v8 from 'v8';
 import { clearTerminalStringColor, formatBytes } from '../client/components/core/CommonJs.js';
 
 colors.enable();
-dotenv.config();
 
 // Define your severity levels.
 // With them, You can create log files,
@@ -60,14 +58,34 @@ const format = (meta) =>
     winston.format.colorize({ all: true }),
     // Define the format of the message showing the timestamp, the level and the message
     winston.format.printf((info) => {
-      const symbols = Object.getOwnPropertySymbols(info);
+      const splatKey = Symbol.for('splat');
+      const splat = info[splatKey];
+      const hasSplat = Array.isArray(splat) && splat.length > 0 && splat[0] !== undefined;
+      let splatStr = '';
+      if (hasSplat) {
+        const seen = new WeakSet();
+        splatStr = JSON.stringify(
+          splat[0],
+          (key, value) => {
+            if (typeof value === 'function') return `[Function: ${value.name || 'anonymous'}]`;
+            if (typeof value === 'object' && value !== null) {
+              if (seen.has(value)) return '[Circular]';
+              seen.add(value);
+            }
+            return value;
+          },
+          4,
+        );
+      }
       return `${`[${meta}]`.green} ${info.timestamp} ${info.level} ${
-        symbols[1]
-          ? `${clearTerminalStringColor(info.message)}: ${colorize(JSON.stringify(info[symbols[1]][0], null, 4), {
+        hasSplat
+          ? `${clearTerminalStringColor(info.message)}: ${colorize(splatStr, {
               colors: {
-                STRING_KEY: 'green',
-                STRING_LITERAL: 'magenta.bold',
-                NUMBER_LITERAL: '#FF0000',
+                StringKey: color.green,
+                StringLiteral: color.magenta,
+                NumberLiteral: color.red,
+                BooleanLiteral: color.cyan,
+                NullLiteral: color.white,
               },
             })}`
           : info.message

package/src/server/peer.js

@@ -12,8 +12,6 @@ import dotenv from 'dotenv';
 import { loggerFactory } from './logger.js';
 import Underpost from '../index.js';
 
-dotenv.config();
-
 /**
  * Logger instance for this module, utilizing the framework's factory.
  * @type {function(*): void}

package/src/server/process.js

@@ -8,14 +8,11 @@
 // https://nodejs.org/api/process
 
 import shell from 'shelljs';
-import dotenv from 'dotenv';
 import { loggerFactory } from './logger.js';
 import clipboard from 'clipboardy';
 import Underpost from '../index.js';
 import { getNpmRootPath } from './conf.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**
@@ -122,52 +119,6 @@ const shellCd = (cd, options = { disableLog: false }) => {
   return shell.cd(cd);
 };
 
-/**
- * Opens a new GNOME terminal and executes a command.
- * Note: This function is environment-specific (GNOME/Linux).
- * @memberof Process
- * @param {string} cmd - The command to execute in the new terminal.
- * @param {Object} [options] - Options for the terminal opening.
- * @param {boolean} [options.single=false] - If true, execute as a single session process using `setsid`.
- * @param {string} [options.chown] - Path to change ownership to the target user.
- * @returns {void}
- */
-const openTerminal = (cmd, options = { single: false }) => {
-  // Find the graphical user's UID from /run/user (prefer non-root UID, usually 1000)
-  const IDS = shellExec(`ls -1 /run/user`, { stdout: true, silent: true })
-    .split('\n')
-    .map((v) => v.trim())
-    .filter(Boolean);
-
-  const nonRootIds = IDS.filter((id) => id !== '0');
-  const ID = nonRootIds.length > 0 ? nonRootIds[0] : IDS[0];
-
-  if (!options.chown) options.chown = `/home/dd ${getNpmRootPath()}/underpost`;
-
-  shellExec(`chown -R ${ID}:${ID} ${options.chown}`);
-
-  // Run the terminal as the graphical user and use THAT user's runtime dir/bus.
-  const confCmd = `USER_GRAPHICAL=$(getent passwd "${ID}" | cut -d: -f1); \
-sudo -u "$USER_GRAPHICAL" env DISPLAY="$DISPLAY" \
-XDG_RUNTIME_DIR="/run/user/${ID}" \
-DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/${ID}/bus" \
-PATH="$PATH" \
-`;
-
-  if (options.single === true) {
-    // Run as a single session process
-    shellExec(`${confCmd} setsid gnome-terminal -- bash -ic '${cmd}; exec bash' >/dev/null 2>&1 &`, {
-      async: true,
-    });
-    return;
-  }
-  // Run asynchronously and disown
-  shellExec(`${confCmd} gnome-terminal -- bash -c '${cmd}; exec bash' >/dev/null 2>&1 & disown`, {
-    async: true,
-    stdout: true,
-  });
-};
-
 /**
  * Wraps a command to run it as a daemon process in a shell (keeping the process alive/terminal open).
  * @memberof Process
@@ -198,4 +149,4 @@ function pbcopy(data) {
   logger.info(`copied to clipboard`, clipboard.readSync());
 }
 
-export { ProcessController, getRootDirectory, shellExec, shellCd, pbcopy, openTerminal, getTerminalPid, daemonProcess };
+export { ProcessController, getRootDirectory, shellExec, shellCd, pbcopy, getTerminalPid, daemonProcess };

package/src/server/proxy.js

@@ -7,8 +7,6 @@
 'use strict';
 
 import express from 'express';
-import dotenv from 'dotenv';
-
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { loggerFactory, loggerMiddleware } from './logger.js';
 import { buildPortProxyRouter, buildProxyRouter, getTlsHosts, isDevProxyContext, isTlsDevProxy } from './conf.js';
@@ -17,8 +15,6 @@ import { shellExec } from './process.js';
 import fs from 'fs-extra';
 import Underpost from '../index.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**
@@ -56,11 +52,12 @@ class ProxyService {
       // Proxy middleware options
       /** @type {import('http-proxy-middleware/dist/types').Options} */
       const options = {
+        pathFilter: proxyPath, // Use '/' as the general filter (v3 API)
         ws: true, // Enable websocket proxying
         target: `http://localhost:${parseInt(process.env.PORT - 1)}`, // Default target (should be overridden by router)
         router: {},
         // changeOrigin: true,
-        logLevel: 'debug',
+        logger: logger,
         xfwd: true, // Adds x-forward headers (Host, Proto, etc.)
         onProxyReq: (proxyReq, req, res, options) => {},
         pathRewrite: {},
@@ -74,8 +71,7 @@ class ProxyService {
         devProxyContext: process.env.NODE_ENV !== 'production',
       });
 
-      const filter = proxyPath; // Use '/' as the general filter
-      app.use(proxyPath, createProxyMiddleware(filter, options));
+      app.use(proxyPath, createProxyMiddleware(options));
 
       // Determine which server to start (HTTP or HTTPS) based on port and environment
       switch (process.env.NODE_ENV) {
@@ -115,7 +111,7 @@ class ProxyService {
               break;
           }
       }
-      logger.info('Proxy running', { port, options });
+      logger.info('Proxy running', { port, router: options.router });
       if (process.env.NODE_ENV === 'development')
         logger.info(
           Underpost.deploy.etcHostFactory(Object.keys(options.router), {

package/src/server/runtime.js

@@ -6,21 +6,17 @@
  * @namespace Runtime
  */
 
-import fs from 'fs-extra';
-import dotenv from 'dotenv';
 import * as promClient from 'prom-client';
 
 import { loggerFactory } from './logger.js';
 import { newInstance } from '../client/components/core/CommonJs.js';
 import { Lampp } from '../runtime/lampp/Lampp.js';
-import { getInstanceContext } from './conf.js';
+import { getInstanceContext, readConfJson } from './conf.js';
 
 import ExpressService from '../runtime/express/Express.js';
 
 import Underpost from '../index.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**
@@ -48,9 +44,9 @@ const buildRuntime = async () => {
   const initPort = parseInt(process.env.PORT) + 1;
   let currentPort = initPort;
 
-  // Load Configuration
-  const confServer = JSON.parse(fs.readFileSync(`./conf/conf.server.json`, 'utf8'));
-  const confSSR = JSON.parse(fs.readFileSync(`./conf/conf.ssr.json`, 'utf8'));
+  // Load Configuration — resolve env: secret references at actual server runtime
+  const confServer = readConfJson(deployId, 'server', { resolve: true, loadReplicas: true });
+  const confSSR = readConfJson(deployId, 'ssr');
 
   // Iterate through hosts and paths
   for (const host of Object.keys(confServer)) {
@@ -83,6 +79,7 @@ const buildRuntime = async () => {
         redirect,
         singleReplica,
         replicas,
+        peer,
       });
 
       if (singleReplicaOffsetPortSum > 0) {

package/src/server/ssr.js

@@ -5,7 +5,6 @@
  */
 
 import fs from 'fs-extra';
-import dotenv from 'dotenv';
 import vm from 'node:vm';
 
 import Underpost from '../index.js';
@@ -14,8 +13,6 @@ import { srcFormatted, JSONweb } from './client-formatted.js';
 import { loggerFactory } from './logger.js';
 import { getRootDirectory } from './process.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**

package/src/server/start.js

@@ -161,13 +161,13 @@ class UnderpostStartUp {
       shellExec(`cd ${buildBasePath}/engine && sudo mv ./${repoName}-private ./engine-private`);
       shellCd(`${buildBasePath}/engine`);
       shellExec(options?.underpostQuicklyInstall ? `underpost install` : `npm install`);
-      shellExec(`node bin/deploy conf ${deployId} ${env}`);
+      shellExec(`node bin env ${deployId} ${env}`);
       if (fs.existsSync('./engine-private/itc-scripts')) {
         const itcScripts = await fs.readdir('./engine-private/itc-scripts');
         for (const itcScript of itcScripts)
           if (itcScript.match(deployId)) shellExec(`node ./engine-private/itc-scripts/${itcScript}`);
       }
-      shellExec(`node bin/deploy build-full-client ${deployId}`);
+      await Underpost.repo.client(deployId);
     },
     /**
      * Runs a deployment.
@@ -177,17 +177,17 @@ class UnderpostStartUp {
      * @memberof UnderpostStartUp
      */
     async run(deployId = 'dd-default', env = 'development', options = {}) {
-      const runCmd = env === 'production' ? 'run prod-img' : 'run dev-img';
+      const runCmd = env === 'production' ? 'run prod:container' : 'run dev:container';
       if (fs.existsSync(`./engine-private/replica`)) {
         const replicas = await fs.readdir(`./engine-private/replica`);
         for (const replica of replicas) {
           if (!replica.match(deployId)) continue;
-          shellExec(`node bin/deploy conf ${replica} ${env}`);
+          shellExec(`node bin env ${replica} ${env}`);
           shellExec(`npm ${runCmd} ${replica}`, { async: true });
           await awaitDeployMonitor(true);
         }
       }
-      shellExec(`node bin/deploy conf ${deployId} ${env}`);
+      shellExec(`node bin env ${deployId} ${env}`);
       shellExec(`npm ${runCmd} ${deployId}`, { async: true });
       await awaitDeployMonitor(true);
       Underpost.env.set('container-status', `${deployId}-${env}-running-deployment`);

package/src/server/tls.js

@@ -7,10 +7,8 @@
 import fs from 'fs-extra';
 import https from 'https';
 import path from 'path';
-import dotenv from 'dotenv';
 import { loggerFactory } from './logger.js';
 
-dotenv.config();
 const logger = loggerFactory(import.meta);
 
 const DEFAULT_HOST = 'localhost';

package/src/server.js

@@ -3,15 +3,11 @@
 // https://nodejs.org/api
 // https://expressjs.com/en/4x/api.html
 
-import dotenv from 'dotenv';
 import { loggerFactory } from './server/logger.js';
 import { buildClient } from './server/client-build.js';
 import { buildRuntime } from './server/runtime.js';
 import { ProcessController } from './server/process.js';
 import { Config } from './server/conf.js';
-
-dotenv.config();
-
 await Config.build();
 
 const logger = loggerFactory(import.meta);

package/.env.development

@@ -1,43 +0,0 @@
-DEPLOY_ID=dd-default
-NODE_ENV=development
-PORT=4000
-JWT_SECRET=test
-REFRESH_EXPIRE_MINUTES=5
-ACCESS_EXPIRE_MINUTES=1440
-NODE_OPTIONS=--max-old-space-size=8192
-TIME_ZONE=changethis
-GITHUB_TOKEN=changethis
-GITHUB_USERNAME=changethis
-GITHUB_BACKUP_REPO=changethis
-GITHUB_DNS_REPO=changethis
-DEFAULT_DEPLOY_ID=dd-default
-DEFAULT_DEPLOY_HOST=default.net
-DEFAULT_DEPLOY_PATH=/
-MARIADB_HOST=changethis
-MARIADB_USER=changethis
-MARIADB_PASSWORD=changethis
-CLOUDINARY_CLOUD_NAME=changethis
-CLOUDINARY_API_KEY=changethis
-CLOUDINARY_API_SECRET=changethis
-CLOUDINARY_PASSWORD=changethis
-CLOUDINARY_EMAIL=admin@default.net
-DB_PG_MAAS_NAME=changethis
-DB_PG_MAAS_PASS=changethis
-DB_PG_MAAS_USER=changethis
-DB_PG_MAAS_HOST=127.0.0.1
-DB_PG_MAAS_PORT=5432
-MAAS_ADMIN_USERNAME=changethis
-MAAS_API_KEY=changethis
-MAAS_ADMIN_EMAIL=admin@default.net
-MAAS_ADMIN_PASS=changethis
-TFTP_ROOT=changethis
-NETMASK=255.255.255.0
-MAAS_DNS=8.8.8.8
-MAAS_NTP_SERVER=changethis
-NFS_EXPORT_PATH=changethis
-NVIDIA_API_KEY=changethis
-DEFAULT_ADMIN_EMAIL=admin@default.net
-DEFAULT_ADMIN_PASSWORD=changethis
-DEFAULT_SSH_PORT=22
-BASE_API=api
-DEV_PROXY_PORT_OFFSET=200

package/.env.test

@@ -1,43 +0,0 @@
-DEPLOY_ID=dd-default
-NODE_ENV=test
-PORT=5000
-JWT_SECRET=test
-REFRESH_EXPIRE_MINUTES=5
-ACCESS_EXPIRE_MINUTES=1440
-NODE_OPTIONS=--max-old-space-size=8192
-TIME_ZONE=changethis
-GITHUB_TOKEN=changethis
-GITHUB_USERNAME=changethis
-GITHUB_BACKUP_REPO=changethis
-GITHUB_DNS_REPO=changethis
-DEFAULT_DEPLOY_ID=dd-default
-DEFAULT_DEPLOY_HOST=default.net
-DEFAULT_DEPLOY_PATH=/
-MARIADB_HOST=changethis
-MARIADB_USER=changethis
-MARIADB_PASSWORD=changethis
-CLOUDINARY_CLOUD_NAME=changethis
-CLOUDINARY_API_KEY=changethis
-CLOUDINARY_API_SECRET=changethis
-CLOUDINARY_PASSWORD=changethis
-CLOUDINARY_EMAIL=admin@default.net
-DB_PG_MAAS_NAME=changethis
-DB_PG_MAAS_PASS=changethis
-DB_PG_MAAS_USER=changethis
-DB_PG_MAAS_HOST=127.0.0.1
-DB_PG_MAAS_PORT=5432
-MAAS_ADMIN_USERNAME=changethis
-MAAS_API_KEY=changethis
-MAAS_ADMIN_EMAIL=admin@default.net
-MAAS_ADMIN_PASS=changethis
-TFTP_ROOT=changethis
-NETMASK=255.255.255.0
-MAAS_DNS=8.8.8.8
-MAAS_NTP_SERVER=changethis
-NFS_EXPORT_PATH=changethis
-NVIDIA_API_KEY=changethis
-DEFAULT_ADMIN_EMAIL=admin@default.net
-DEFAULT_ADMIN_PASSWORD=changethis
-DEFAULT_SSH_PORT=22
-BASE_API=api
-DEV_PROXY_PORT_OFFSET=200