underpost 2.8.882 → 2.8.884

package/README.md

@@ -64,6 +64,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -72,7 +76,7 @@
 <!-- badges -->
 
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.882)](https://socket.dev/npm/package/underpost/overview/2.8.882) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.884)](https://socket.dev/npm/package/underpost/overview/2.8.884) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 
 <!-- end-badges -->
@@ -125,6 +129,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -174,7 +182,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.882
+## underpost ci/cd cli v2.8.884
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/db.js

@@ -2,7 +2,6 @@ import fs from 'fs-extra';
 import { shellExec } from '../src/server/process.js';
 import { loggerFactory } from '../src/server/logger.js';
 import { MariaDB } from '../src/db/mariadb/MariaDB.js';
-import { Xampp } from '../src/runtime/xampp/Xampp.js';
 import { Lampp } from '../src/runtime/lampp/Lampp.js';
 import { getCapVariableName, loadConf, splitFileFactory } from '../src/server/conf.js';
 import { DataBaseProvider } from '../src/db/DataBaseProvider.js';
@@ -105,9 +104,7 @@ try {
           break;
         case 'import':
           break;
-        case 'init-xampp-service':
-          await Xampp.initService();
-          break;
+
         case 'init-lampp-service':
           await Lampp.initService();
           break;

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.882
+## underpost ci/cd cli v2.8.884
 
 ### Usage: `underpost [options] [command]`
   ```

package/manifests/deployment/dd-default-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.882
+          image: localhost/rockylinux9-underpost:v2.8.884
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.882
+          image: localhost/rockylinux9-underpost:v2.8.884
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/deployment/dd-test-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.882
+          image: localhost/rockylinux9-underpost:v2.8.884
 #          resources:
 #            requests:
 #              memory: "96294Ki"
@@ -104,7 +104,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.8.882
+          image: localhost/rockylinux9-underpost:v2.8.884
 #          resources:
 #            requests:
 #              memory: "96294Ki"

package/manifests/maas/device-scan.sh

@@ -20,7 +20,7 @@ for iface_path in /sys/class/net/*; do
   if [ -f "$pci_dev/vendor" ] && [ -f "$pci_dev/device" ]; then
     vendor_id=$(< "$pci_dev/vendor")
     device_id=$(< "$pci_dev/device")
-    # pasamos de 0x8086 a 8086, etc.
+    # parse 0x8086 to 8086, etc.
     vendor_id=${vendor_id#0x}
     device_id=${device_id#0x}
     pci="${vendor_id}:${device_id}"

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.882",
+    "version": "2.8.884",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/api/user/user.service.js

@@ -6,7 +6,7 @@ import {
   createSessionAndUserToken,
   createUserAndSession,
   refreshSessionAndToken,
-  hashToken,
+  logoutSession,
   jwtSign,
   getBearerToken,
   validatePasswordMiddleware,
@@ -382,15 +382,8 @@ const UserService = {
     const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.User;
 
     if (req.params.id === 'logout') {
-      const refreshToken = req.cookies?.refreshToken;
-      if (refreshToken) {
-        const hashedToken = hashToken(refreshToken);
-        await User.updateOne(
-          { 'activeSessions.tokenHash': hashedToken },
-          { $pull: { activeSessions: { tokenHash: hashedToken } } },
-        );
-      }
-      res.clearCookie('refreshToken');
+      const result = await logoutSession(User, req, res);
+      if (!result) throw new Error('Logout failed');
       return { message: 'Logged out successfully' };
     }
 

package/src/client/components/core/Docs.js

@@ -156,7 +156,6 @@ const Docs = {
         id: options.idModal,
         routeId: 'docs',
         event: (path) => {
-          Modal.subMenuBtnClass['docs'].open = !Modal.subMenuBtnClass['docs'].open;
           if (s(`.btn-docs-${path}`)) s(`.btn-docs-${path}`).click();
           if (Modal.mobileModal()) {
             setTimeout(() => {

package/src/client/components/core/Modal.js

@@ -2191,14 +2191,13 @@ const Modal = {
       : { ...Modal.subMenuBtnClass, _: { btnSelector, labelSelector } };
 
     for (const keyDataBtn of Object.keys(_data)) {
-      const { btnSelector, labelSelector, open, top } = _data[keyDataBtn];
+      const { labelSelector, top } = _data[keyDataBtn];
       if (top)
         setTimeout(() => {
           top();
         });
-      if (open) continue;
       sa(labelSelector).forEach((el) => {
-        el.classList.add('hide');
+        if (!el.classList.contains('hide')) el.classList.add('hide');
         el.style.transition = null;
       });
 
@@ -2413,6 +2412,10 @@ const buildBadgeToolTipMenuOption = (id, sideKey = 'left') => {
   return option;
 };
 
+const isSubMenuOpen = (subMenuId) => {
+  return s(`.down-arrow-submenu-${subMenuId}`).style.rotate === '180deg';
+};
+
 const subMenuRender = async (subMenuId) => {
   const _hBtn = 51;
   const menuBtn = s(`.main-btn-${subMenuId}`);
@@ -2435,8 +2438,7 @@ const subMenuRender = async (subMenuId) => {
   menuBtn.style.transition = '.3s';
   arrow.style.transition = '.3s';
 
-  if (Modal.subMenuBtnClass[subMenuId].open) {
-    Modal.subMenuBtnClass[subMenuId].open = false;
+  if (isSubMenuOpen(subMenuId)) {
     // Close animation
     menuContainer.style.overflow = 'hidden';
     menuContainer.style.height = '0px';
@@ -2446,8 +2448,12 @@ const subMenuRender = async (subMenuId) => {
       arrow.style.rotate = '0deg';
     });
   } else {
-    Modal.menuTextLabelAnimation('modal-menu', subMenuId);
-    Modal.subMenuBtnClass[subMenuId].open = true;
+    sa(`.menu-label-text-${subMenuId}`).forEach((el) => {
+      if (!el.classList.contains('hide')) el.classList.add('hide');
+    });
+    setTimeout(() => {
+      Modal.menuTextLabelAnimation('modal-menu', subMenuId);
+    });
     // Open animation
     setTimeout(top, 360);
     menuContainer.style.width = '320px';
@@ -2466,4 +2472,4 @@ const subMenuRender = async (subMenuId) => {
   }, 500);
 };
 
-export { Modal, renderMenuLabel, renderViewTitle, buildBadgeToolTipMenuOption, subMenuRender };
+export { Modal, renderMenuLabel, renderViewTitle, buildBadgeToolTipMenuOption, subMenuRender, isSubMenuOpen };

package/src/index.js

@@ -35,7 +35,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.882';
+  static version = 'v2.8.884';
   /**
    * Repository cli API
    * @static

package/src/runtime/express/Express.js

@@ -0,0 +1,262 @@
+/**
+ * A service dedicated to creating and configuring an Express.js application
+ * instance based on server configuration data.
+ * @module src/runtime/express/Express.js
+ * @namespace ExpressService
+ */
+
+import fs from 'fs-extra';
+import express from 'express';
+import fileUpload from 'express-fileupload';
+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';
+import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+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';
+
+const logger = loggerFactory(import.meta);
+
+/**
+ * @class ExpressService
+ * @description A service dedicated to creating and configuring an Express.js application
+ * instance based on server configuration data.
+ * @memberof ExpressService
+ */
+class ExpressService {
+  /**
+   * Creates and configures a complete Express application instance for a specific host/path configuration.
+   *
+   * @method createApp
+   * @memberof ExpressService
+   * @param {string} config.host - The host name for the instance (e.g., 'www.example.com').
+   * @param {string} config.path - The URL path for the instance (e.g., '/', '/api/v1').
+   * @param {number} config.port - The primary listening port for the instance.
+   * @param {string} config.client - The client associated with the instance (used for SSR/Mailer configuration lookup).
+   * @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 {string} [config.ws] - The WebSocket server name to use.
+   * @param {object} [config.mailer] - Mailer configuration.
+   * @param {object} [config.db] - Database configuration.
+   * @param {string} [config.redirect] - URL or flag to indicate an HTTP redirect should be configured.
+   * @param {boolean} [config.peer] - Whether to enable the peer server.
+   * @param {object} [config.valkey] - Valkey connection configuration.
+   * @param {string} [config.apiBaseHost] - Base host for the API (if running separate API).
+   * @param {number} [config.devApiPort] - The dynamically calculated development API port used for CORS in dev mode.
+   * @param {string} config.redirectTarget - The full target URL for redirection (used if `redirect` is true).
+   * @param {string} config.rootHostPath - The root path for public host assets (e.g., `/public/hostname`).
+   * @param {object} config.confSSR - The SSR configuration object, used to look up Mailer templates.
+   * @param {import('prom-client').Counter<string>} config.promRequestCounter - Prometheus request counter instance.
+   * @param {import('prom-client').Registry} config.promRegister - Prometheus register instance for metrics.
+   * @returns {Promise<{portsUsed: number}>} An object indicating how many additional ports were used (e.g., for PeerServer).
+   */
+  async createApp({
+    host,
+    path,
+    port,
+    client,
+    apis,
+    origins,
+    directory,
+    ws,
+    mailer,
+    db,
+    redirect,
+    peer,
+    valkey,
+    apiBaseHost,
+    devApiPort, // New parameter for dev environment CORS
+    redirectTarget,
+    rootHostPath,
+    confSSR,
+    promRequestCounter,
+    promRegister,
+  }) {
+    let portsUsed = 0;
+    const runningData = {
+      host,
+      path,
+      runtime: 'nodejs',
+      client,
+      meta: import.meta,
+      apis,
+    };
+
+    const app = express();
+
+    if (process.env.NODE_ENV === 'production') app.set('trust proxy', true);
+
+    app.use((req, res, next) => {
+      res.on('finish', () => {
+        promRequestCounter.inc({
+          instance: `${host}:${port}${path}`,
+          method: req.method,
+          status_code: res.statusCode,
+        });
+      });
+      return next();
+    });
+
+    // Metrics endpoint
+    app.get(`${path === '/' ? '' : path}/metrics`, async (req, res) => {
+      res.set('Content-Type', promRegister.contentType);
+      return res.end(await promRegister.metrics());
+    });
+
+    // 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' }));
+    app.use(fileUpload());
+
+    if (process.env.NODE_ENV === 'development') app.set('json spaces', 2);
+
+    // Language handling middleware
+    app.use((req, res, next) => {
+      const lang = req.headers['accept-language'] || 'en';
+      req.lang = typeof lang === 'string' && lang.toLowerCase().match('es') ? 'es' : 'en';
+      return next();
+    });
+
+    // Static file serving
+    app.use('/', express.static(directory ? directory : `.${rootHostPath}`));
+
+    // Swagger path definition
+    const swaggerJsonPath = `./public/${host}${path === '/' ? path : `${path}/`}swagger-output.json`;
+    const swaggerPath = `${path === '/' ? `/api-docs` : `${path}/api-docs`}`;
+
+    // Flag swagger requests before security middleware
+    if (fs.existsSync(swaggerJsonPath)) {
+      app.use(swaggerPath, (req, res, next) => {
+        res.locals.isSwagger = true;
+        next();
+      });
+    }
+
+    // Security and CORS
+    applySecurity(app, {
+      origin: (origin, callback) => {
+        // Use devApiPort if provided to calculate the allowed development CORS origin
+        const devOrigin =
+          apis && process.env.NODE_ENV === 'development' && devApiPort ? [`http://localhost:${devApiPort}`] : [];
+
+        const allowedOrigins = origins.concat(devOrigin);
+
+        if (!origin || allowedOrigins.includes(origin)) {
+          callback(null, true);
+        } else {
+          callback(new Error('Not allowed by CORS'));
+        }
+      },
+    });
+
+    // Handle redirection-only instances
+    if (redirect) {
+      app.use((req, res, next) => {
+        if (process.env.NODE_ENV === 'production' && !req.url.startsWith(`/.well-known/acme-challenge`)) {
+          return res.status(302).redirect(redirectTarget + req.url);
+        }
+        return next();
+      });
+      await UnderpostStartUp.API.listenPortController(app, port, runningData);
+      return { portsUsed };
+    }
+
+    // Create HTTP server for regular instances (required for WebSockets)
+    const server = createServer({}, app);
+    if (peer) portsUsed++; // Peer server uses one additional port
+
+    if (!apiBaseHost) {
+      // Swagger UI setup
+      if (fs.existsSync(swaggerJsonPath)) {
+        const swaggerDoc = JSON.parse(fs.readFileSync(swaggerJsonPath, 'utf8'));
+        // Reusing swaggerPath defined outside, removing unnecessary redeclaration
+        app.use(swaggerPath, swaggerUi.serve, swaggerUi.setup(swaggerDoc));
+      }
+
+      // Database and Valkey connections
+      if (db && apis) await DataBaseProvider.load({ apis, host, path, db });
+      if (valkey) await createValkeyConnection({ host, path }, valkey);
+
+      // Mailer setup
+      if (mailer) {
+        const mailerSsrConf = confSSR[getCapVariableName(client)];
+        await MailerProvider.load({
+          id: `${host}${path}`,
+          meta: `mailer-${host}${path}`,
+          host,
+          path,
+          ...mailer,
+          templates: mailerSsrConf ? mailerSsrConf.mailer : {},
+        });
+      }
+
+      // API router loading
+      if (apis && apis.length > 0) {
+        const authMiddleware = authMiddlewareFactory({ host, path });
+        const apiPath = `${path === '/' ? '' : path}/${process.env.BASE_API}`;
+        for (const api of apis) {
+          logger.info(`Build api server`, `${host}${apiPath}/${api}`);
+          const { ApiRouter } = await import(`../../api/${api}/${api}.router.js`);
+          const router = ApiRouter({ host, path, apiPath, mailer, db, authMiddleware, origins });
+          app.use(`${apiPath}/${api}`, router);
+        }
+      }
+
+      // WebSocket server setup
+      if (ws) {
+        const { createIoServer } = await import(`../../ws/${ws}/${ws}.ws.server.js`);
+        const { options, meta } = await createIoServer(server, { host, path, db, port, origins });
+
+        // Listen on the main port for the WS server
+        await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), port, {
+          runtime: 'nodejs',
+          client: null,
+          host,
+          path: options.path,
+          meta,
+        });
+      }
+
+      // Peer server setup
+      if (peer) {
+        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, {
+          runtime: 'nodejs',
+          client: null,
+          host,
+          path: options.path,
+          meta,
+        });
+      }
+    }
+
+    // SSR middleware loading
+    const ssr = await ssrMiddlewareFactory({ app, directory, rootHostPath, path });
+    for (const [_, ssrMiddleware] of Object.entries(ssr)) app.use(ssrMiddleware);
+
+    // Start listening on the main port
+    await UnderpostStartUp.API.listenPortController(server, port, runningData);
+
+    return { portsUsed };
+  }
+}
+
+export default new ExpressService();