cyberia 3.2.5 → 3.2.12

package/src/server/client-formatted.js

@@ -27,6 +27,13 @@ const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
  */
 const srcFormatted = (src) => src.replace(/(?<=[\s({[,;=+!?:^])(html|css)`/g, '`');
 
+const resolveBrowserImportPath = (basePrefix, relativePath) => {
+  if (/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(basePrefix)) {
+    return new URL(relativePath, basePrefix.endsWith('/') ? basePrefix : `${basePrefix}/`).toString();
+  }
+  return path.posix.normalize(`${basePrefix}${relativePath}`);
+};
+
 /**
  * Converts a JavaScript object into a string that can be embedded in client-side code
  * and parsed back into an object (e.g., 'JSON.parse(`{...}`)').
@@ -52,7 +59,14 @@ const JSONweb = (data) => {
  * @returns {import('esbuild').Plugin}
  * @memberof clientFormatted
  */
-const importRewritePlugin = ({ dists = [], proxyPath, basePath = '', module = '', baseHost = '' }) => ({
+const importRewritePlugin = ({
+  dists = [],
+  proxyPath,
+  basePath = '',
+  module = '',
+  baseHost = '',
+  externalizeBareImports = true,
+}) => ({
   name: 'import-rewrite',
   setup(build) {
     const prefix = `${baseHost}${proxyPath !== '/' ? `${proxyPath}/` : '/'}`;
@@ -69,26 +83,35 @@ const importRewritePlugin = ({ dists = [], proxyPath, basePath = '', module = ''
       }
     }
 
-    // Rewrite relative imports to absolute paths based on proxy path and module
+    // Rewrite app-relative imports to absolute paths based on proxy path and module.
+    // Do not touch node_modules relative imports so esbuild can bundle package internals.
     build.onResolve({ filter: /^\.\.?\// }, (args) => {
-      const basePrefix = `${prefix}${basePath ? `${basePath}/` : ''}`;
-      if (args.path.startsWith('./')) {
-        return {
-          path: `${basePrefix}${module ? `${module}/` : ''}${args.path.slice(2)}`,
-          external: true,
-        };
+      const normalizedImporter = (args.importer || '').replace(/\\/g, '/');
+      if (!normalizedImporter.includes('/src/client/')) {
+        return;
       }
-      if (args.path.startsWith('../')) {
-        return {
-          path: `${basePrefix}${args.path.slice(3)}`,
-          external: true,
-        };
+
+      // Extract the path relative to /src/client/
+      // Handle cases where the path might have duplicates or be in various formats
+      const srcClientIndex = normalizedImporter.lastIndexOf('/src/client/');
+      if (srcClientIndex === -1) {
+        return;
       }
+      const importerFromClientRoot = normalizedImporter.substring(srcClientIndex + '/src/client/'.length);
+      const importerDir = path.posix.dirname(importerFromClientRoot);
+      const resolvedFromClientRoot = path.posix.normalize(path.posix.join(importerDir, args.path));
+      const result = resolveBrowserImportPath(prefix, resolvedFromClientRoot);
+
+      return {
+        path: result,
+        external: true,
+      };
     });
 
-    // Mark any remaining imports as external
+    // For client app modules we externalize bare imports; for SW builds we let esbuild bundle them.
     build.onResolve({ filter: /.*/ }, (args) => {
       if (args.kind === 'entry-point') return;
+      if (!externalizeBareImports) return;
       return { path: args.path, external: true };
     });
   },
@@ -111,7 +134,15 @@ const importRewritePlugin = ({ dists = [], proxyPath, basePath = '', module = ''
  */
 const transformClientJs = async (
   srcPath,
-  { dists = [], proxyPath, basePath = '', module = '', baseHost = '', minify: shouldMinify = false } = {},
+  {
+    dists = [],
+    proxyPath,
+    basePath = '',
+    module = '',
+    baseHost = '',
+    minify: shouldMinify = false,
+    externalizeBareImports = true,
+  } = {},
 ) => {
   const src = fs.readFileSync(srcPath, 'utf8');
   const stripped = srcFormatted(src);
@@ -130,7 +161,7 @@ const transformClientJs = async (
     target: 'esnext',
     minify: shouldMinify,
     logLevel: 'warning',
-    plugins: [importRewritePlugin({ dists, proxyPath, basePath, module, baseHost })],
+    plugins: [importRewritePlugin({ dists, proxyPath, basePath, module, baseHost, externalizeBareImports })],
   });
 
   return result.outputFiles[0].text;

package/src/server/conf.js

@@ -41,6 +41,20 @@ const logger = loggerFactory(import.meta);
  */
 const ENV_REF_PREFIX = 'env:';
 
+/**
+ * Resolves a standardized context key from host/path descriptors.
+ * The key is used across DB, WS, mailer, and cache registries.
+ *
+ * @method resolveHostKeyContext
+ * @param {{host?: string, path?: string}|string} [context={ host: '', path: '' }] - Context object or prebuilt key.
+ * @returns {string} Host key context string.
+ * @memberof ServerConfBuilder
+ */
+const resolveHostKeyContext = (context = { host: '', path: '' }) => {
+  if (typeof context === 'string') return context;
+  return `${context.host || ''}${context.path || ''}`;
+};
+
 /**
  * Recursively walks a configuration object and replaces every string value that
  * starts with {@link ENV_REF_PREFIX} (`"env:"`) with the corresponding
@@ -320,25 +334,29 @@ const Config = {
 
     if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
 
-    const envTemplate = fs.existsSync('./.env.example')
+    const sharedEnvTemplate = fs.existsSync('./.env.example')
       ? fs.readFileSync('./.env.example', 'utf8')
       : fs.existsSync('./.env.production')
         ? fs.readFileSync('./.env.production', 'utf8')
         : '';
 
-    if (envTemplate) {
-      const prodEnv = envTemplate.replaceAll('dd-default', deployId);
-      fs.writeFileSync(`${folder}/.env.production`, prodEnv, 'utf8');
-      fs.writeFileSync(
-        `${folder}/.env.development`,
-        prodEnv.replace('NODE_ENV=production', 'NODE_ENV=development').replace('PORT=3000', 'PORT=4000'),
-        'utf8',
-      );
-      fs.writeFileSync(
-        `${folder}/.env.test`,
-        prodEnv.replace('NODE_ENV=production', 'NODE_ENV=test').replace('PORT=3000', 'PORT=5000'),
-        'utf8',
-      );
+    const envTemplates = {
+      production: fs.existsSync('./.env.production') ? fs.readFileSync('./.env.production', 'utf8') : sharedEnvTemplate,
+      development: fs.existsSync('./.env.development')
+        ? fs.readFileSync('./.env.development', 'utf8')
+        : sharedEnvTemplate
+          ? sharedEnvTemplate.replace('NODE_ENV=production', 'NODE_ENV=development').replace('PORT=3000', 'PORT=4000')
+          : '',
+      test: fs.existsSync('./.env.test')
+        ? fs.readFileSync('./.env.test', 'utf8')
+        : sharedEnvTemplate
+          ? sharedEnvTemplate.replace('NODE_ENV=production', 'NODE_ENV=test').replace('PORT=3000', 'PORT=5000')
+          : '',
+    };
+
+    for (const [envName, envTemplate] of Object.entries(envTemplates)) {
+      if (!envTemplate) continue;
+      fs.writeFileSync(`${folder}/.env.${envName}`, envTemplate.replaceAll('dd-default', deployId), 'utf8');
     }
 
     fs.writeFileSync(
@@ -457,7 +475,7 @@ const loadConf = (deployId = DEFAULT_DEPLOY_ID, subConf) => {
     fs.removeSync(`${path}/.env.production`);
     fs.removeSync(`${path}/.env.development`);
     fs.removeSync(`${path}/.env.test`);
-    if (fs.existsSync(`${path}/jsdoc.json`)) shellExec(`git checkout ${path}/jsdoc.json`);
+    if (fs.existsSync(`${path}/typedoc.json`)) shellExec(`git checkout ${path}/typedoc.json`);
     shellExec(`git checkout ${path}/package.json`);
     shellExec(`git checkout ${path}/package-lock.json`);
     return;
@@ -1156,6 +1174,7 @@ const getDataDeploy = async (
 
   let buildDataDeploy = [];
   for (const deployObj of dataDeploy) {
+    const isReplicaDeploy = fs.existsSync(`./engine-private/replica/${deployObj.deployId}`);
     const serverConf = loadReplicas(
       deployObj.deployId,
       loadConfServerJson(`./engine-private/conf/${deployObj.deployId}/conf.server.json`),
@@ -1163,7 +1182,7 @@ const getDataDeploy = async (
     let replicaDataDeploy = [];
     for (const host of Object.keys(serverConf))
       for (const path of Object.keys(serverConf[host])) {
-        if (serverConf[host][path].replicas && serverConf[host][path].singleReplica) {
+        if (!isReplicaDeploy && serverConf[host][path].replicas && serverConf[host][path].singleReplica) {
           if (options && options.buildSingleReplica)
             await Underpost.repo.client(deployObj.deployId, '', host, path, {
               singleReplica: true,
@@ -1207,11 +1226,15 @@ const validateTemplatePath = (absolutePath = '') => {
   const confSsr = DefaultConf.ssr[ssr];
   const clients = DefaultConf.client.default.services;
 
-  if (absolutePath.match('src/api') && !confServer.apis.find((p) => absolutePath.match(`src/api/${p}/`))) {
+  if (
+    absolutePath.match('src/api') &&
+    !absolutePath.match('src/api/types.js') &&
+    !confServer.apis.find((p) => absolutePath.match(`src/api/${p}/`))
+  ) {
     return false;
   }
   if (absolutePath.match('conf.dd-') && absolutePath.match('.js')) return false;
-  if (absolutePath.match('jsdoc.dd-') && absolutePath.match('.json')) return false;
+  if (absolutePath.match('typedoc.dd-') && absolutePath.match('.json')) return false;
   if (
     absolutePath.match('src/client/services/') &&
     !clients.find((p) => absolutePath.match(`src/client/services/${p}/`))
@@ -1227,7 +1250,7 @@ const validateTemplatePath = (absolutePath = '') => {
   ) {
     return false;
   }
-  if (absolutePath.match('src/client/sw/') && !clients.find((p) => absolutePath.match(`src/client/sw/${p}.sw.js`))) {
+  if (absolutePath.match('src/client/sw/') && !absolutePath.match('src/client/sw/core.sw.js')) {
     return false;
   }
   if (
@@ -1249,14 +1272,8 @@ const validateTemplatePath = (absolutePath = '') => {
     return false;
   }
   if (
-    absolutePath.match('src/client/ssr/offline') &&
-    !confSsr.offline.find((p) => absolutePath.match(`src/client/ssr/offline/${p.client}.js`))
-  ) {
-    return false;
-  }
-  if (
-    absolutePath.match('src/client/ssr/pages') &&
-    !confSsr.pages.find((p) => absolutePath.match(`src/client/ssr/pages/${p.client}.js`))
+    absolutePath.match('src/client/ssr/views') &&
+    !(confSsr.views || []).find((p) => absolutePath.match(`src/client/ssr/views/${p.client}.js`))
   ) {
     return false;
   }
@@ -1278,15 +1295,17 @@ const validateTemplatePath = (absolutePath = '') => {
 /**
  * @method awaitDeployMonitor
  * @description Waits for the deploy monitor.
- * @param {boolean} [init=false] - The init flag.
+ * @param {boolean} [isFinal=false] - If true, logs when the final (non-replica) deployment completes.
  * @param {number} [deltaMs=1000] - The delta ms.
  * @returns {Promise<void>} - The await deploy monitor.
  * @memberof ServerConfBuilder
  */
-const awaitDeployMonitor = async (init = false, deltaMs = 1000) => {
-  if (init) Underpost.env.set('await-deploy', new Date().toISOString());
+const awaitDeployMonitor = async (isFinal = false, deltaMs = 1000) => {
+  Underpost.env.set('await-deploy', new Date().toISOString());
+  if (isFinal) logger.info('Final deployment running (no replica)');
   await timer(deltaMs);
-  if (Underpost.env.get('await-deploy')) return await awaitDeployMonitor();
+  if (Underpost.env.get('container-status') === 'error') throw new Error('Container status error');
+  if (Underpost.env.get('await-deploy')) return await awaitDeployMonitor(isFinal, deltaMs);
 };
 
 /**
@@ -1311,59 +1330,6 @@ const mergeFile = async (parts = [], outputFilePath) => {
   });
 };
 
-/**
- * @method rebuildConfFactory
- * @description Rebuilds the conf factory.
- * @param {object} options - The options.
- * @param {string} options.deployId - The deploy ID.
- * @param {string} options.valkey - The valkey.
- * @param {boolean} [options.mongo=false] - The mongo.
- * @returns {object} - The rebuild conf factory.
- * @memberof ServerConfBuilder
- */
-const rebuildConfFactory = ({ deployId, valkey, mongo }) => {
-  const confServer = loadReplicas(deployId, loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`));
-  const hosts = {};
-  for (const host of Object.keys(confServer)) {
-    hosts[host] = {};
-    for (const path of Object.keys(confServer[host])) {
-      if (!confServer[host][path].db) continue;
-      const { singleReplica, replicas, db } = confServer[host][path];
-      const { provider } = db;
-      if (singleReplica) {
-        for (const replica of replicas) {
-          const deployIdReplica = buildReplicaId({ replica, deployId });
-          const confServerReplica = loadConfServerJson(`./engine-private/replica/${deployIdReplica}/conf.server.json`);
-          for (const _host of Object.keys(confServerReplica)) {
-            for (const _path of Object.keys(confServerReplica[_host])) {
-              hosts[host][_path] = { replica: { host, path } };
-              confServerReplica[_host][_path].valkey = valkey;
-              switch (provider) {
-                case 'mongoose':
-                  confServerReplica[_host][_path].db.host = mongo.host;
-                  break;
-              }
-            }
-          }
-          fs.writeFileSync(
-            `./engine-private/replica/${deployIdReplica}/conf.server.json`,
-            JSON.stringify(confServerReplica, null, 4),
-            'utf8',
-          );
-        }
-      } else hosts[host][path] = {};
-      confServer[host][path].valkey = valkey;
-      switch (provider) {
-        case 'mongoose':
-          confServer[host][path].db.host = mongo.host;
-          break;
-      }
-    }
-  }
-  fs.writeFileSync(`./engine-private/conf/${deployId}/conf.server.json`, JSON.stringify(confServer, null, 4), 'utf8');
-  return { hosts };
-};
-
 /**
  * @method getPathsSSR
  * @description Gets the paths SSR.
@@ -1376,8 +1342,7 @@ const getPathsSSR = (conf) => {
   for (const o of conf.head) paths.push(`src/client/ssr/head/${o}.js`);
   for (const o of conf.body) paths.push(`src/client/ssr/body/${o}.js`);
   for (const o of Object.keys(conf.mailer)) paths.push(`src/client/ssr/mailer/${conf.mailer[o]}.js`);
-  for (const o of conf.offline) paths.push(`src/client/ssr/mailer/${o.client}.js`);
-  for (const o of conf.pages) paths.push(`src/client/ssr/pages/${o.client}.js`);
+  for (const o of conf.views || []) paths.push(`src/client/ssr/views/${o.client}.js`);
   return paths;
 };
 
@@ -1745,6 +1710,44 @@ const loadConfServerJson = (jsonPath, options) => {
   return options && options.resolve === true ? resolveConfSecrets(raw) : raw;
 };
 
+/**
+ * Creates and writes the /etc/hosts file for a deployment.
+ * @method etcHostFactory
+ * @param {Array<string>} hosts - List of hosts to be added to the hosts file.
+ * @param {object} options - Options for the hosts file creation.
+ * @param {boolean} options.append - Whether to append to the existing hosts file.
+ * @returns {object} - Object containing the rendered hosts file.
+ * @memberof ServerConfBuilder
+ */
+const etcHostFactory = (hosts = [], options = { append: false }) => {
+  hosts = hosts.map((host) => {
+    try {
+      if (!host.startsWith('http')) host = `http://${host}`;
+      const hostname = new URL(host).hostname;
+      logger.info('Hostname extract valid', { host, hostname });
+      return hostname;
+    } catch (e) {
+      logger.warn('No hostname extract valid', host);
+      return host;
+    }
+  });
+  const renderHosts = `127.0.0.1         ${hosts.join(
+    ' ',
+  )} localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6`;
+
+  if (options && options.append && fs.existsSync(`/etc/hosts`)) {
+    fs.writeFileSync(
+      `/etc/hosts`,
+      fs.readFileSync(`/etc/hosts`, 'utf8') +
+        `
+${renderHosts}`,
+      'utf8',
+    );
+  } else fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
+  return { renderHosts };
+};
+
 export {
   Config,
   loadConf,
@@ -1773,7 +1776,6 @@ export {
   pathPortAssignmentFactory,
   deployRangePortFactory,
   awaitDeployMonitor,
-  rebuildConfFactory,
   buildCliDoc,
   getInstanceContext,
   buildApiConf,
@@ -1783,6 +1785,7 @@ export {
   devProxyHostFactory,
   isTlsDevProxy,
   getTlsHosts,
+  resolveHostKeyContext,
   resolveConfSecrets,
   loadConfServerJson,
   getConfFolder,
@@ -1791,4 +1794,5 @@ export {
   DEFAULT_DEPLOY_ID,
   loadCronDeployEnv,
   cronDeployIdResolve,
+  etcHostFactory,
 };

package/src/server/data-query.js

@@ -5,7 +5,16 @@
  * @namespace DataQuery
  */
 
-export const DataQuery = {
+/**
+ * @class DataQuery
+ * @description Utility class for parsing request query parameters into Mongoose query options,
+ * including support for AG Grid filterModel and sortModel. Provides a static `parse`
+ * method that takes in request query parameters and returns an object containing the MongoDB
+ * query, sort options, pagination skip/limit, and page number. Designed to be used in API
+ * controllers to handle complex querying needs from the frontend.
+ * @memberof DataQuery
+ */
+class DataQuery {
   /**
    * Parse request query parameters into Mongoose query options
    * @param {Object} params - The request query parameters (req.query)
@@ -20,7 +29,7 @@ export const DataQuery = {
    * @memberof DataQuery
    * @returns {Object} { query, sort, skip, limit, page }
    */
-  parse: (params = {}) => {
+  static parse(params = {}) {
     let { filterModel, sortModel, page, limit, sort: sortParam, asc, order, query: defaultQuery } = params;
 
     // === 1. Pagination ===
@@ -35,7 +44,7 @@ export const DataQuery = {
     const query = DataQuery._parseFilter(filterModel, defaultQuery);
 
     return { query, sort, skip, limit, page };
-  },
+  }
 
   /**
    * Parse sort parameters from AG Grid sortModel or simple sort params
@@ -47,7 +56,7 @@ export const DataQuery = {
    * @return {Object} sort object for Mongoose
    * @memberof DataQuery
    */
-  _parseSort: (sortModel, sortParam, asc, order) => {
+  static _parseSort(sortModel, sortParam, asc, order) {
     const sort = {};
 
     // Parse sortModel from string if needed
@@ -90,7 +99,7 @@ export const DataQuery = {
     }
 
     return sort;
-  },
+  }
 
   /**
    * Parse filter parameters from AG Grid filterModel
@@ -100,7 +109,7 @@ export const DataQuery = {
    * @return {Object} query object for Mongoose
    * @memberof DataQuery
    */
-  _parseFilter: (filterModel, defaultQuery) => {
+  static _parseFilter(filterModel, defaultQuery) {
     let query = defaultQuery ? { ...defaultQuery } : {};
 
     // Parse filterModel from string if needed
@@ -127,7 +136,7 @@ export const DataQuery = {
     });
 
     return query;
-  },
+  }
 
   /**
    * Parse a single field filter
@@ -137,7 +146,7 @@ export const DataQuery = {
    * @return {Object|null} query condition for the field or null if invalid
    * @memberof DataQuery
    */
-  _parseFieldFilter: (field, filter) => {
+  static _parseFieldFilter(field, filter) {
     if (!filter || !filter.filterType) {
       return null;
     }
@@ -158,7 +167,7 @@ export const DataQuery = {
       default:
         return null;
     }
-  },
+  }
 
   /**
    * Parse text filter
@@ -168,7 +177,7 @@ export const DataQuery = {
    * @return {Object|null} query condition for the text field or null if invalid
    * @memberof DataQuery
    */
-  _parseTextFilter: (field, filter) => {
+  static _parseTextFilter(field, filter) {
     const { type, filter: filterValue } = filter;
 
     if (filterValue === null || filterValue === undefined || filterValue === '') {
@@ -219,7 +228,7 @@ export const DataQuery = {
     }
 
     return query;
-  },
+  }
 
   /**
    * Parse number filter
@@ -229,7 +238,7 @@ export const DataQuery = {
    * @return {Object|null} query condition for the number field or null if invalid
    * @memberof DataQuery
    */
-  _parseNumberFilter: (field, filter) => {
+  static _parseNumberFilter(field, filter) {
     const { type, filter: filterValue, filterTo } = filter;
 
     if (filterValue === null || filterValue === undefined) {
@@ -281,7 +290,7 @@ export const DataQuery = {
     }
 
     return query;
-  },
+  }
 
   /**
    * Parse date filter
@@ -291,7 +300,7 @@ export const DataQuery = {
    * @return {Object|null} query condition for the date field or null if invalid
    * @memberof DataQuery
    */
-  _parseDateFilter: (field, filter) => {
+  static _parseDateFilter(field, filter) {
     const { type, dateFrom, dateTo } = filter;
 
     // Handle blank/notBlank without dates
@@ -391,7 +400,7 @@ export const DataQuery = {
     }
 
     return query;
-  },
+  }
 
   /**
    * Parse set filter
@@ -401,7 +410,7 @@ export const DataQuery = {
    * @return {Object|null} query condition for the set field or null if invalid
    * @memberof DataQuery
    */
-  _parseSetFilter: (field, filter) => {
+  static _parseSetFilter(field, filter) {
     const { values } = filter;
 
     if (!Array.isArray(values) || values.length === 0) {
@@ -409,7 +418,7 @@ export const DataQuery = {
     }
 
     return { [field]: { $in: values } };
-  },
+  }
 
   /**
    * Parse multi filter (combines multiple filters with AND/OR)
@@ -419,7 +428,7 @@ export const DataQuery = {
    * @return {Object|null} query condition for the multi filter or null if invalid
    * @memberof DataQuery
    */
-  _parseMultiFilter: (field, filter) => {
+  static _parseMultiFilter(field, filter) {
     const { filterModels, operator } = filter;
 
     if (!Array.isArray(filterModels) || filterModels.length === 0) {
@@ -445,5 +454,8 @@ export const DataQuery = {
       // AND operator (default)
       return { $and: conditions };
     }
-  },
-};
+  }
+}
+
+export { DataQuery };
+export default DataQuery;

package/src/server/dns.js

@@ -101,6 +101,22 @@ class Dns {
     return ipv4.address;
   }
 
+  /**
+   * Gets the MAC address of the main (default route) network interface.
+   * @static
+   * @memberof UnderpostDns
+   * @returns {string|null} The MAC address, or null if not found.
+   */
+  static getMainInterfaceMac() {
+    const interfaceName = Dns.getDefaultNetworkInterface();
+    const networkInfo = os.networkInterfaces()[interfaceName];
+    if (!networkInfo || networkInfo.length === 0) {
+      logger.error(`Could not find network interface: ${interfaceName}`);
+      return null;
+    }
+    return networkInfo[0].mac;
+  }
+
   /**
    * Setup nftables tables and chains if they don't exist.
    * @static
@@ -491,6 +507,12 @@ class Dns {
       });
     }
 
+    if (options.mac) {
+      const mac = Dns.getMainInterfaceMac();
+      console.log(mac);
+      return mac;
+    }
+
     let ip;
     if (options.dhcp) ip = Dns.getLocalIPv4Address();
     else ip = await Dns.getPublicIp();