underpost 2.8.885 → 2.81.0

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/runtime/express/Express.js

@@ -21,6 +21,8 @@ import { createPeerServer } from '../../server/peer.js';
 import { createValkeyConnection } from '../../server/valkey.js';
 import { applySecurity, authMiddlewareFactory } from '../../server/auth.js';
 import { ssrMiddlewareFactory } from '../../server/ssr.js';
+import { TLS } from '../../server/tls.js';
+import { shellExec } from '../../server/process.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -43,6 +45,7 @@ class ExpressService {
    * @param {string[]} [config.apis] - A list of API names to load and attach routers for.
    * @param {string[]} config.origins - Allowed origins for CORS.
    * @param {string} [config.directory] - The directory for static files (if overriding default).
+   * @param {boolean} [config.useLocalSsl] - Whether to use local SSL for the instance.
    * @param {string} [config.ws] - The WebSocket server name to use.
    * @param {object} [config.mailer] - Mailer configuration.
    * @param {object} [config.db] - Database configuration.
@@ -65,6 +68,7 @@ class ExpressService {
     apis,
     origins,
     directory,
+    useLocalSsl,
     ws,
     mailer,
     db,
@@ -111,7 +115,6 @@ class ExpressService {
 
     // Logging, Compression, and Body Parsers
     app.use(loggerMiddleware(import.meta));
-    // Compression filter logic is correctly inlined here
     app.use(compression({ filter: (req, res) => !req.headers['x-no-compression'] && compression.filter(req, res) }));
     app.use(express.json({ limit: '100MB' }));
     app.use(express.urlencoded({ extended: true, limit: '20MB' }));
@@ -165,6 +168,9 @@ class ExpressService {
       }
 
       // Security and CORS
+      if (process.env.NODE_ENV === 'development' && useLocalSsl)
+        origins = origins.map((origin) => origin.replace('http', 'https'));
+
       applySecurity(app, {
         origin: origins,
       });
@@ -219,9 +225,7 @@ class ExpressService {
         const peerPort = newInstance(port + portsUsed); // portsUsed is 1 here
         const { options, meta, peerServer } = await createPeerServer({
           port: peerPort,
-          devPort: port,
           origins,
-          host,
           path,
         });
         await UnderpostStartUp.API.listenPortController(peerServer, peerPort, {
@@ -239,7 +243,11 @@ class ExpressService {
     for (const [_, ssrMiddleware] of Object.entries(ssr)) app.use(ssrMiddleware);
 
     // Start listening on the main port
-    await UnderpostStartUp.API.listenPortController(server, port, runningData);
+    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);
 
     return { portsUsed };
   }

package/src/runtime/lampp/Dockerfile

@@ -32,7 +32,7 @@ RUN mkdir -p /opt/lampp/htdocs && \
     chmod -R a+rX /opt/lampp/htdocs
 
 # Install Node.js
-RUN curl -fsSL https://rpm.nodesource.com/setup_23.x | bash -
+RUN curl -fsSL https://rpm.nodesource.com/setup_24.x | bash -
 RUN dnf install nodejs -y
 RUN dnf clean all
 

package/src/server/backup.js

@@ -1,3 +1,9 @@
+/**
+ * Manages backup operations for deployments.
+ * @module src/server/backup.js
+ * @namespace BackUp
+ */
+
 import fs from 'fs-extra';
 import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
@@ -8,7 +14,21 @@ dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
+/**
+ * @class BackUp
+ * @description Manages backup operations for deployments.
+ * @memberof BackUp
+ */
 class BackUp {
+  /**
+   * @method callback
+   * @description Initiates a backup operation for the specified deployment list.
+   * @param {string} deployList - The list of deployments to backup.
+   * @param {Object} options - The options for the backup operation.
+   * @param {boolean} options.itc - Whether to backup inside container data.
+   * @param {boolean} options.git - Whether to backup data using Git.
+   * @memberof BackUp
+   */
   static callback = async function (deployList, options = { itc: false, git: false }) {
     if ((!deployList || deployList === 'dd') && fs.existsSync(`./engine-private/deploy/dd.router`))
       deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');

package/src/server/client-build-live.js

@@ -1,3 +1,9 @@
+/**
+ * Module for live building client-side code
+ * @module src/server/client-build-live.js
+ * @namespace clientLiveBuild
+ */
+
 import fs from 'fs-extra';
 import { Config, loadConf } from './conf.js';
 import { loggerFactory } from './logger.js';
@@ -5,6 +11,11 @@ import { buildClient } from './client-build.js';
 
 const logger = loggerFactory(import.meta);
 
+/**
+ * @function clientLiveBuild
+ * @description Initiates a live build of client-side code.
+ * @memberof clientLiveBuild
+ */
 const clientLiveBuild = async () => {
   if (fs.existsSync(`./tmp/client.build.json`)) {
     const deployId = process.argv[2];
@@ -33,16 +44,7 @@ const clientLiveBuild = async () => {
         ),
       );
       const confServer = JSON.parse(
-        fs.readFileSync(
-          fs.existsSync(`./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`)
-            ? `./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`
-            : fs.existsSync(`./engine-private/replica/${deployId}`)
-            ? `./engine-private/replica/${deployId}/conf.server.json`
-            : fs.existsSync(`./engine-private/conf/${deployId}/conf.server.json`)
-            ? `./engine-private/conf/${deployId}/conf.server.json`
-            : `./conf/conf.server.json`,
-          'utf8',
-        ),
+        fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`, 'utf8'),
       );
       host = process.argv[4];
       path = process.argv[5];

package/src/server/client-build.js

@@ -1,3 +1,9 @@
+/**
+ * Manages the client-side build process, including full builds and incremental builds.
+ * @module server/client-build.js
+ * @namespace clientBuild
+ */
+
 'use strict';
 
 import fs from 'fs-extra';
@@ -26,97 +32,17 @@ dotenv.config();
 
 // Static Site Generation (SSG)
 
-const buildAcmeChallengePath = (acmeChallengeFullPath = '') => {
-  fs.mkdirSync(acmeChallengeFullPath, {
-    recursive: true,
-  });
-  fs.writeFileSync(`${acmeChallengeFullPath}/.gitkeep`, '', 'utf8');
-};
-
-const fullBuild = async ({
-  path,
-  logger,
-  client,
-  db,
-  dists,
-  rootClientPath,
-  acmeChallengeFullPath,
-  publicClientId,
-  iconsBuild,
-  metadata,
-}) => {
-  logger.warn('Full build', rootClientPath);
-
-  buildAcmeChallengePath(acmeChallengeFullPath);
-
-  if (publicClientId && publicClientId.startsWith('html-website-templates')) {
-    if (!fs.existsSync(`/home/dd/html-website-templates/`))
-      shellExec(`cd /home/dd && git clone https://github.com/designmodo/html-website-templates.git`);
-    if (!fs.existsSync(`${rootClientPath}/index.php`)) {
-      fs.copySync(`/home/dd/html-website-templates/${publicClientId.split('-publicClientId-')[1]}`, rootClientPath);
-      shellExec(`cd ${rootClientPath} && git init && git add . && git commit -m "Base template implementation"`);
-      // git remote add origin git@github.com:<username>/<repo>.git
-      fs.writeFileSync(`${rootClientPath}/.git/.htaccess`, `Deny from all`, 'utf8');
-    }
-    return;
-  }
-
-  fs.removeSync(rootClientPath);
-
-  if (fs.existsSync(`./src/client/public/${publicClientId}`)) {
-    if (iconsBuild === true) await buildIcons({ publicClientId, metadata });
-
-    fs.copySync(
-      `./src/client/public/${publicClientId}`,
-      rootClientPath /* {
-          filter: function (name) {
-            console.log(name);
-            return true;
-          },
-        } */,
-    );
-  } else if (fs.existsSync(`./engine-private/src/client/public/${publicClientId}`)) {
-    switch (publicClientId) {
-      case 'mysql_test':
-        if (db) {
-          fs.copySync(`./engine-private/src/client/public/${publicClientId}`, rootClientPath);
-          fs.writeFileSync(
-            `${rootClientPath}/index.php`,
-            fs
-              .readFileSync(`${rootClientPath}/index.php`, 'utf8')
-              .replace('test_servername', 'localhost')
-              .replace('test_username', db.user)
-              .replace('test_password', db.password)
-              .replace('test_dbname', db.name),
-            'utf8',
-          );
-        } else logger.error('not provided db config');
-        break;
-
-      default:
-        break;
-    }
-  }
-  if (dists)
-    for (const dist of dists) {
-      if ('folder' in dist) {
-        if (fs.statSync(dist.folder).isDirectory()) {
-          fs.mkdirSync(`${rootClientPath}${dist.public_folder}`, { recursive: true });
-          fs.copySync(dist.folder, `${rootClientPath}${dist.public_folder}`);
-        } else {
-          const folder = dist.public_folder.split('/');
-          folder.pop();
-          fs.mkdirSync(`${rootClientPath}${folder.join('/')}`, { recursive: true });
-          fs.copyFileSync(dist.folder, `${rootClientPath}${dist.public_folder}`);
-        }
-      }
-      if ('styles' in dist) {
-        fs.mkdirSync(`${rootClientPath}${dist.public_styles_folder}`, { recursive: true });
-        fs.copySync(dist.styles, `${rootClientPath}${dist.public_styles_folder}`);
-      }
-    }
-};
-
+/**
+ * @async
+ * @function buildClient
+ * @memberof clientBuild
+ * @param {Object} options - Options for the build process.
+ * @param {Array} options.liveClientBuildPaths - List of paths to build incrementally.
+ * @param {Array} options.instances - List of instances to build.
+ * @returns {Promise<void>} - Promise that resolves when the build is complete.
+ * @throws {Error} - If the build fails.
+ * @memberof clientBuild
+ */
 const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }) => {
   const logger = loggerFactory(import.meta);
   const confClient = JSON.parse(fs.readFileSync(`./conf/conf.client.json`, 'utf8'));
@@ -126,6 +52,125 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
   const acmeChallengePath = `/.well-known/acme-challenge`;
   const publicPath = `./public`;
 
+  /**
+   * @async
+   * @function buildAcmeChallengePath
+   * @memberof clientBuild
+   * @param {string} acmeChallengeFullPath - Full path to the acme-challenge directory.
+   * @returns {void}
+   * @throws {Error} - If the directory cannot be created.
+   * @memberof clientBuild
+   */
+  const buildAcmeChallengePath = (acmeChallengeFullPath = '') => {
+    fs.mkdirSync(acmeChallengeFullPath, {
+      recursive: true,
+    });
+    fs.writeFileSync(`${acmeChallengeFullPath}/.gitkeep`, '', 'utf8');
+  };
+
+  /**
+   * @async
+   * @function fullBuild
+   * @memberof clientBuild
+   * @param {Object} options - Options for the full build process.
+   * @param {string} options.path - Path to the client directory.
+   * @param {Object} options.logger - Logger instance.
+   * @param {string} options.client - Client name.
+   * @param {Object} options.db - Database configuration.
+   * @param {Array} options.dists - List of distributions to build.
+   * @param {string} options.rootClientPath - Full path to the client directory.
+   * @param {string} options.acmeChallengeFullPath - Full path to the acme-challenge directory.
+   * @param {string} options.publicClientId - Public client ID.
+   * @param {boolean} options.iconsBuild - Whether to build icons.
+   * @param {Object} options.metadata - Metadata for the client.
+   * @returns {Promise<void>} - Promise that resolves when the full build is complete.
+   * @throws {Error} - If the full build fails.
+   * @memberof clientBuild
+   */
+  const fullBuild = async ({
+    path,
+    logger,
+    client,
+    db,
+    dists,
+    rootClientPath,
+    acmeChallengeFullPath,
+    publicClientId,
+    iconsBuild,
+    metadata,
+  }) => {
+    logger.warn('Full build', rootClientPath);
+
+    buildAcmeChallengePath(acmeChallengeFullPath);
+
+    if (publicClientId && publicClientId.startsWith('html-website-templates')) {
+      if (!fs.existsSync(`/home/dd/html-website-templates/`))
+        shellExec(`cd /home/dd && git clone https://github.com/designmodo/html-website-templates.git`);
+      if (!fs.existsSync(`${rootClientPath}/index.php`)) {
+        fs.copySync(`/home/dd/html-website-templates/${publicClientId.split('-publicClientId-')[1]}`, rootClientPath);
+        shellExec(`cd ${rootClientPath} && git init && git add . && git commit -m "Base template implementation"`);
+        // git remote add origin git@github.com:<username>/<repo>.git
+        fs.writeFileSync(`${rootClientPath}/.git/.htaccess`, `Deny from all`, 'utf8');
+      }
+      return;
+    }
+
+    fs.removeSync(rootClientPath);
+
+    if (fs.existsSync(`./src/client/public/${publicClientId}`)) {
+      if (iconsBuild === true) await buildIcons({ publicClientId, metadata });
+
+      fs.copySync(
+        `./src/client/public/${publicClientId}`,
+        rootClientPath /* {
+            filter: function (name) {
+              console.log(name);
+              return true;
+            },
+          } */,
+      );
+    } else if (fs.existsSync(`./engine-private/src/client/public/${publicClientId}`)) {
+      switch (publicClientId) {
+        case 'mysql_test':
+          if (db) {
+            fs.copySync(`./engine-private/src/client/public/${publicClientId}`, rootClientPath);
+            fs.writeFileSync(
+              `${rootClientPath}/index.php`,
+              fs
+                .readFileSync(`${rootClientPath}/index.php`, 'utf8')
+                .replace('test_servername', 'localhost')
+                .replace('test_username', db.user)
+                .replace('test_password', db.password)
+                .replace('test_dbname', db.name),
+              'utf8',
+            );
+          } else logger.error('not provided db config');
+          break;
+
+        default:
+          break;
+      }
+    }
+    if (dists)
+      for (const dist of dists) {
+        if ('folder' in dist) {
+          if (fs.statSync(dist.folder).isDirectory()) {
+            fs.mkdirSync(`${rootClientPath}${dist.public_folder}`, { recursive: true });
+            fs.copySync(dist.folder, `${rootClientPath}${dist.public_folder}`);
+          } else {
+            const folder = dist.public_folder.split('/');
+            folder.pop();
+            fs.mkdirSync(`${rootClientPath}${folder.join('/')}`, { recursive: true });
+            fs.copyFileSync(dist.folder, `${rootClientPath}${dist.public_folder}`);
+          }
+        }
+        if ('styles' in dist) {
+          fs.mkdirSync(`${rootClientPath}${dist.public_styles_folder}`, { recursive: true });
+          fs.copySync(dist.styles, `${rootClientPath}${dist.public_styles_folder}`);
+        }
+      }
+  };
+
   // { srcBuildPath, publicBuildPath }
   const enableLiveRebuild =
     options && options.liveClientBuildPaths && options.liveClientBuildPaths.length > 0 ? true : false;

package/src/server/client-dev-server.js

@@ -1,12 +1,26 @@
+/**
+ * Module for creating a client-side development server
+ * @module src/server/client-dev-server.js
+ * @namespace clientDevServer
+ */
 import fs from 'fs-extra';
 import nodemon from 'nodemon';
 import { shellExec } from './process.js';
 import { loggerFactory } from './logger.js';
-import { writeEnv } from './conf.js';
-import dotenv from 'dotenv';
 
 const logger = loggerFactory(import.meta);
 
+/**
+ * @function createClientDevServer
+ * @description Creates a client-side development server.
+ * @memberof clientDevServer
+ * @param {string} deployId - The deployment ID.
+ * @param {string} subConf - The sub-configuration.
+ * @param {string} host - The host.
+ * @param {string} path - The path.
+ * @returns {void}
+ * @memberof clientDevServer
+ */
 const createClientDevServer = (
   deployId = process.argv[2] || 'dd-default',
   subConf = process.argv[3] || '',

package/src/server/client-icons.js

@@ -1,3 +1,8 @@
+/**
+ * Module for building client-side icons
+ * @module src/server/client-icons.js
+ * @namespace clientIcons
+ */
 import { favicons } from 'favicons';
 import { loggerFactory } from './logger.js';
 import fs from 'fs-extra';
@@ -5,6 +10,20 @@ import { getCapVariableName } from '../client/components/core/CommonJs.js';
 
 const logger = loggerFactory(import.meta);
 
+/**
+ * @function buildIcons
+ * @description Builds icons for a client-side application.
+ * @memberof clientIcons
+ * @param {Object} metadata - The metadata for the client-side application.
+ * @param {string} metadata.title - The title of the client-side application.
+ * @param {string} metadata.description - The description of the client-side application.
+ * @param {string} metadata.keywords - The keywords for the client-side application.
+ * @param {string} metadata.author - The author of the client-side application.
+ * @param {string} metadata.thumbnail - The thumbnail of the client-side application.
+ * @param {string} metadata.themeColor - The theme color of the client-side application.
+ * @param {string} metadata.baseBuildIconReference - The base build icon reference for the client-side application.
+ * @returns {Promise<void>}
+ */
 const buildIcons = async ({
   publicClientId,
   metadata: { title, description, keywords, author, thumbnail, themeColor, baseBuildIconReference },