underpost 2.8.79 → 2.8.82

package/src/runtime/lampp/Dockerfile

@@ -1,65 +1,59 @@
-ARG BASE_DEBIAN=buster
-
-# USER root
-
-FROM debian:${BASE_DEBIAN}
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Set root password to root, format is 'user:password'.
-RUN echo 'root:root' | chpasswd
-
-RUN apt-get update --fix-missing
-RUN apt-get upgrade -y
-# install sudo
-RUN apt-get -y install sudo
-# net-tools provides netstat commands
-RUN apt-get -y install curl net-tools
-RUN apt-get -yq install openssh-server supervisor
-# Few handy utilities which are nice to have
-RUN apt-get -y install nano vim less --no-install-recommends
-RUN apt-get clean
-
-# install ssh
-RUN mkdir -p /var/run/sshd
-# Allow root login via password
-RUN sed -ri 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
-
-# install open ssl git and others tools
-RUN apt-get install -yq --no-install-recommends libssl-dev curl wget git gnupg
-
-# install lampp
+FROM rockylinux:9
+
+RUN dnf install -y --allowerasing bzip2
+
+RUN dnf update -y
+RUN dnf install -y epel-release
+RUN dnf install -y --allowerasing sudo
+RUN dnf install -y --allowerasing curl
+RUN dnf install -y --allowerasing net-tools
+RUN dnf install -y --allowerasing openssh-server
+RUN dnf install -y --allowerasing nano
+RUN dnf install -y --allowerasing vim-enhanced
+RUN dnf install -y --allowerasing less
+RUN dnf install -y --allowerasing openssl-devel
+RUN dnf install -y --allowerasing wget
+RUN dnf install -y --allowerasing git
+RUN dnf install -y --allowerasing gnupg2
+RUN dnf clean all
+
+# Install LAMPP (XAMPP)
+# Download the XAMPP installer for Linux
 RUN curl -Lo xampp-linux-installer.run https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/7.4.33/xampp-linux-x64-7.4.33-0-installer.run?from_af=true
 RUN chmod +x xampp-linux-installer.run
-RUN bash -c './xampp-linux-installer.run'
+# Run the XAMPP installer in silent mode
+RUN bash -c './xampp-linux-installer.run --mode unattended'
+# Create a symbolic link for easy access to lampp command
 RUN ln -sf /opt/lampp/lampp /usr/bin/lampp
-# Enable XAMPP web interface(remove security checks)
-RUN sed -i.bak s'/Require local/Require all granted/g' /opt/lampp/etc/extra/httpd-xampp.conf
+
+# Configure XAMPP
+# Enable XAMPP web interface (remove security checks)
+RUN sed -i.bak 's/Require local/Require all granted/g' /opt/lampp/etc/extra/httpd-xampp.conf
 # Enable error display in php
-RUN sed -i.bak s'/display_errors=Off/display_errors=On/g' /opt/lampp/etc/php.ini
-# Enable includes of several configuration files
-RUN mkdir /opt/lampp/apache2/conf.d
+RUN sed -i.bak 's/display_errors=Off/display_errors=On/g' /opt/lampp/etc/php.ini
+# Enable includes of several configuration files for Apache
+RUN mkdir -p /opt/lampp/apache2/conf.d
 RUN echo "IncludeOptional /opt/lampp/apache2/conf.d/*.conf" >>/opt/lampp/etc/httpd.conf
-# Create a /www folder and a symbolic link to it in /opt/lampp/htdocs. It'll be accessible via http://localhost:[port]/www/
-# This is convenient because it doesn't interfere with xampp, phpmyadmin or other tools in /opt/lampp/htdocs
-# /opt/lampp/etc/httpd.conf
+# Create a /www folder and a symbolic link to it in /opt/lampp/htdocs
+# This is convenient because it doesn't interfere with xampp, phpmyadmin or other tools
 RUN mkdir /www
 RUN ln -s /www /opt/lampp/htdocs
 
-# install nodejs https://github.com/nodesource/distributions/blob/master/README.md#deb
-RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash -
-RUN apt-get install -y nodejs build-essential
+# Install Node.js
+RUN curl -fsSL https://rpm.nodesource.com/setup_23.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/server/conf.js

@@ -1171,6 +1171,63 @@ const writeEnv = (envPath, envObj) =>
     'utf8',
   );
 
+const buildCliDoc = (program) => {
+  let md = shellExec(`node bin help`, { silent: true, stdout: true }).split('Options:');
+  const baseOptions =
+    `## ${md[0].split(`\n`)[2]}
+
+### Usage: ` +
+    '`' +
+    md[0].split(`\n`)[0].split('Usage: ')[1] +
+    '`' +
+    `
+  ` +
+    '```\n Options:' +
+    md[1] +
+    ' \n```';
+  md =
+    baseOptions +
+    `
+
+## Commands:
+    `;
+  program.commands.map((o) => {
+    md +=
+      `
+
+` +
+      '### `' +
+      o._name +
+      '` :' +
+      `
+` +
+      '```\n ' +
+      shellExec(`node bin help ${o._name}`, { silent: true, stdout: true }) +
+      ' \n```' +
+      `
+  `;
+  });
+  fs.writeFileSync(`./src/client/public/nexodev/docs/references/Command Line Interface.md`, md, 'utf8');
+  fs.writeFileSync(`./cli.md`, md, 'utf8');
+  const readmeSplit = `pwa-microservices-template</a>`;
+  const readme = fs.readFileSync(`./README.md`, 'utf8').split(readmeSplit);
+  fs.writeFileSync(
+    './README.md',
+    readme[0] +
+      readmeSplit +
+      `
+
+` +
+      baseOptions +
+      `
+      
+<a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
+      
+`,
+    'utf8',
+  );
+};
+
 export {
   Cmd,
   Config,
@@ -1214,4 +1271,5 @@ export {
   deployRangePortFactory,
   awaitDeployMonitor,
   rebuildConfFactory,
+  buildCliDoc,
 };

package/src/server/logger.js

@@ -176,7 +176,7 @@ const loggerMiddleware = (meta = { url: '' }) => {
   );
 };
 
-const underpostASCI = () => `
+const underpostASCII = () => `
 
 ██╗░░░██╗███╗░░██╗██████╗░███████╗██████╗░██████╗░░█████╗░░██████╗████████╗
 ██║░░░██║████╗░██║██╔══██╗██╔════╝██╔══██╗██╔══██╗██╔══██╗██╔════╝╚══██╔══╝
@@ -188,10 +188,10 @@ const underpostASCI = () => `
 
 const actionInitLog = () =>
   console.log(
-    underpostASCI() +
+    underpostASCII() +
       `
     https://www.nexodev.org/docs
 `,
   );
 
-export { loggerFactory, loggerMiddleware, setUpInfo, underpostASCI, actionInitLog };
+export { loggerFactory, loggerMiddleware, setUpInfo, underpostASCII, actionInitLog };

package/src/server/runtime.js

@@ -251,11 +251,6 @@ const buildRuntime = async () => {
             return next();
           });
 
-          // https://github.com/prometheus/prometheus/blob/main/documentation/examples/prometheus.yml
-          // https://github.com/grafana/grafana/tree/main/conf
-          // https://medium.com/@diego.coder/monitoreo-de-aplicaciones-con-node-js-grafana-y-prometheus-afd2b33e3f91
-          // for grafana prometheus server: host.docker.internal:9090
-
           app.use((req, res, next) => {
             requestCounter.inc({
               instance: `${host}:${port}${path}`,
@@ -366,7 +361,7 @@ const buildRuntime = async () => {
           if (db && apis) await DataBaseProvider.load({ apis, host, path, db });
 
           // valkey server
-          await createValkeyConnection({ host, path }, valkey);
+          if (valkey) await createValkeyConnection({ host, path }, valkey);
 
           if (mailer) {
             const mailerSsrConf = confSSR[getCapVariableName(client)];

package/src/server/ssl.js

@@ -106,15 +106,4 @@ const sslRedirectMiddleware = (req, res, port, proxyRouter) => {
     return res.status(302).redirect(sslRedirectUrl);
 };
 
-const installCertbot = () => {
-  switch (process.platform) {
-    case 'win32':
-      break;
-    case 'linux':
-      break;
-    default:
-      break;
-  }
-};
-
-export { buildSSL, buildSecureContext, validateSecureContext, createSslServer, sslRedirectMiddleware, installCertbot };
+export { buildSSL, buildSecureContext, validateSecureContext, createSslServer, sslRedirectMiddleware };

package/src/server/valkey.js

@@ -34,14 +34,14 @@ const selectDtoFactory = (payload, select) => {
 const valkeyClientFactory = async (options) => {
   const valkey = new Valkey({
     // port: 6379,
-    // host: 'service-valkey.default.svc.cluster.local',
+    // host: 'valkey-service.default.svc.cluster.local',
     port: options?.port ? options.port : undefined,
-    host: options?.port ? options.host : undefined,
+    host: options?.host ? options.host : undefined,
     retryStrategy: (attempt) => {
       if (attempt === 1) {
         valkey.disconnect();
         valkeyEnabled = false;
-        logger.warn('Valkey service not enabled', { valkeyEnabled });
+        logger.warn('Valkey service not enabled', { ...options, valkeyEnabled });
         return;
       }
       return 1000; // 1 second interval attempt

package/supervisord-openssh-server.conf

@@ -1,5 +0,0 @@
-[program:openssh-server]
-command=/usr/sbin/sshd -D
-numprocs=1
-autostart=true
-autorestart=true