cyberia 3.1.3 → 3.2.9

package/src/server/client-formatted.js

@@ -1,87 +1,170 @@
 /**
- * Module for formatting client-side code
+ * Module for formatting client-side code using esbuild for import rewriting and minification.
  * @module src/server/client-formatted.js
  * @namespace clientFormatted
  */
 
 'use strict';
 
+import * as esbuild from 'esbuild';
+import fs from 'fs-extra';
+import * as path from 'path';
+
+/**
+ * Escapes a string for safe use inside a RegExp.
+ * @param {string} s - The string to escape.
+ * @returns {string} The escaped string.
+ * @memberof clientFormatted
+ */
+const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
 /**
- * Formats a source code string by removing 'html`' and 'css`' tags from template literals.
+ * Formats a source code string by removing 'html`' and 'css`' tagged template prefixes.
+ * Used for SSR VM execution where the full esbuild pipeline is not needed.
  * @param {string} src - The source code string.
  * @returns {string} The formatted source code.
  * @memberof clientFormatted
  */
-const srcFormatted = (src) =>
-  src
-    .replaceAll(' html`', '`')
-    .replaceAll(' css`', '`')
-    .replaceAll('{html`', '{`')
-    .replaceAll('{css`', '{`')
-    .replaceAll('(html`', '(`')
-    .replaceAll('(css`', '(`')
-    .replaceAll('[html`', '[`')
-    .replaceAll('[css`', '[`');
+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(`{...}`)').
+ * Escapes backticks and template expression markers for safe template literal embedding.
  * @param {*} data - The data to be stringified.
  * @returns {string} A string representing the code to parse the JSON data.
  * @memberof clientFormatted
  */
-const JSONweb = (data) => 'JSON.parse(`' + JSON.stringify(data) + '`)';
+const JSONweb = (data) => {
+  const json = JSON.stringify(data).replace(/`/g, '\\`').replace(/\$\{/g, '\\${');
+  return 'JSON.parse(`' + json + '`)';
+};
 
 /**
- * Formats a component's source code by rewriting its import paths to be absolute for browser consumption.
- * @param {string} src - The source code of the component.
- * @param {string} module - The name of the module/component.
- * @param {Array<object>} dists - An array of distribution objects with import names.
- * @param {string} proxyPath - The proxy path for the application.
- * @param {string} [componentBasePath=''] - The base path for components.
- * @param {string} [baseHost=''] - The base host URL.
- * @returns {string} The formatted source code with updated import paths.
+ * Creates an esbuild plugin that rewrites import paths for browser consumption.
+ * Handles dist library imports, relative imports, and marks all remaining imports as external.
+ * @param {object} options
+ * @param {Array<object>} [options.dists=[]] - Distribution objects with import_name and import_name_build.
+ * @param {string} options.proxyPath - The proxy path for the application.
+ * @param {string} [options.basePath=''] - The base path for the module type (e.g., 'components', 'services').
+ * @param {string} [options.module=''] - The module/component name for relative import resolution.
+ * @param {string} [options.baseHost=''] - The base host URL.
+ * @returns {import('esbuild').Plugin}
  * @memberof clientFormatted
  */
-const componentFormatted = (src, module, dists, proxyPath, componentBasePath = '', baseHost = '') => {
-  dists.map(
-    (dist) =>
-      (src = src.replaceAll(
-        `from '${dist.import_name}'`,
-        `from '${baseHost}${proxyPath !== '/' ? `${proxyPath}` : ''}${dist.import_name_build}'`,
-      )),
-  );
-  return src
-    .replaceAll(
-      `from '../`,
-      `from '${baseHost}${proxyPath !== '/' ? `${proxyPath}/` : '/'}${
-        componentBasePath === '' ? `` : `${componentBasePath}/`
-      }`,
-    )
-    .replaceAll(
-      `from './`,
-      `from '${baseHost}${proxyPath !== '/' ? `${proxyPath}/` : '/'}${
-        componentBasePath === '' ? `` : `${componentBasePath}/`
-      }${module}/`,
-    );
-};
+const importRewritePlugin = ({
+  dists = [],
+  proxyPath,
+  basePath = '',
+  module = '',
+  baseHost = '',
+  externalizeBareImports = true,
+}) => ({
+  name: 'import-rewrite',
+  setup(build) {
+    const prefix = `${baseHost}${proxyPath !== '/' ? `${proxyPath}/` : '/'}`;
+
+    // Rewrite dist library imports (e.g., '@neodrag/vanilla' → '/proxyPath/dist/@neodrag-vanilla/index.js')
+    if (dists) {
+      for (const dist of dists) {
+        if (!dist.import_name) continue;
+        const filter = new RegExp(`^${escapeRegExp(dist.import_name)}$`);
+        build.onResolve({ filter }, () => ({
+          path: `${baseHost}${proxyPath !== '/' ? proxyPath : ''}${dist.import_name_build}`,
+          external: true,
+        }));
+      }
+    }
+
+    // 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 normalizedImporter = (args.importer || '').replace(/\\/g, '/');
+      if (!normalizedImporter.includes('/src/client/')) {
+        return;
+      }
+
+      // 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,
+      };
+    });
+
+    // 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 };
+    });
+  },
+});
 
 /**
- * Formats a view's source code by rewriting its import paths.
- * @param {string} src - The source code of the view.
- * @param {Array<object>} dists - An array of distribution objects with import names.
- * @param {string} proxyPath - The proxy path for the application.
- * @param {string} [baseHost=''] - The base host URL.
- * @returns {string} The formatted source code with updated import paths.
+ * Transforms a JavaScript source file using esbuild with import path rewriting,
+ * tagged template stripping, and optional minification.
+ * Replaces the previous srcFormatted + componentFormatted/viewFormatted + UglifyJS pipeline.
+ * @param {string} srcPath - Path to the source file.
+ * @param {object} options
+ * @param {Array<object>} [options.dists=[]] - Distribution objects with import names.
+ * @param {string} options.proxyPath - The proxy path for the application.
+ * @param {string} [options.basePath=''] - Base path for the module type (e.g., 'components', 'services').
+ * @param {string} [options.module=''] - Module name for relative import resolution.
+ * @param {string} [options.baseHost=''] - Base host URL.
+ * @param {boolean} [options.minify=false] - Whether to minify the output.
+ * @returns {Promise<string>} The transformed source code.
  * @memberof clientFormatted
  */
-const viewFormatted = (src, dists, proxyPath, baseHost = '') => {
-  dists.map(
-    (dist) =>
-      (src = src.replaceAll(dist.import_name, `${proxyPath !== '/' ? `${proxyPath}` : ''}${dist.import_name_build}`)),
-  );
-  const componentFromFormatted = `from '${baseHost}${proxyPath !== '/' ? `${proxyPath}/` : '/'}`;
-  return src.replaceAll(`from './`, componentFromFormatted).replaceAll(`from '../`, componentFromFormatted);
+const transformClientJs = async (
+  srcPath,
+  {
+    dists = [],
+    proxyPath,
+    basePath = '',
+    module = '',
+    baseHost = '',
+    minify: shouldMinify = false,
+    externalizeBareImports = true,
+  } = {},
+) => {
+  const src = fs.readFileSync(srcPath, 'utf8');
+  const stripped = srcFormatted(src);
+
+  const result = await esbuild.build({
+    stdin: {
+      contents: stripped,
+      loader: 'js',
+      resolveDir: path.dirname(path.resolve(srcPath)),
+      sourcefile: srcPath,
+    },
+    bundle: true,
+    write: false,
+    format: 'esm',
+    platform: 'browser',
+    target: 'esnext',
+    minify: shouldMinify,
+    logLevel: 'warning',
+    plugins: [importRewritePlugin({ dists, proxyPath, basePath, module, baseHost, externalizeBareImports })],
+  });
+
+  return result.outputFiles[0].text;
 };
 
-export { srcFormatted, JSONweb, componentFormatted, viewFormatted };
+export { srcFormatted, JSONweb, transformClientJs };

package/src/server/conf.js

@@ -148,6 +148,23 @@ const getConfFolder = (deployId) => {
     : `./engine-private/conf/${deployId}`;
 };
 
+/**
+ * Reads `engine-private/deploy/dd.cron` and returns the deploy-id string,
+ * or `null` if the file does not exist or is empty.
+ *
+ * @method cronDeployIdResolve
+ * @returns {string|null} The deploy-id from dd.cron, or null.
+ * @memberof ServerConfBuilder
+ */
+const cronDeployIdResolve = () => {
+  const cronDeployFile = './engine-private/deploy/dd.cron';
+  if (fs.existsSync(cronDeployFile)) {
+    const id = fs.readFileSync(cronDeployFile, 'utf8').trim();
+    return id || null;
+  }
+  return null;
+};
+
 /**
  * Loads the deployment-specific `.env` file referenced by `engine-private/deploy/dd.cron`
  * into `process.env`. Uses `NODE_ENV` to select the environment variant
@@ -162,15 +179,12 @@ function loadCronDeployEnv() {
   const envName = process.env.NODE_ENV || 'production';
 
   // 1) Load dd.cron env (takes full precedence)
-  const cronDeployFile = './engine-private/deploy/dd.cron';
-  if (fs.existsSync(cronDeployFile)) {
-    const cronDeployId = fs.readFileSync(cronDeployFile, 'utf8').trim();
-    if (cronDeployId) {
-      const cronEnvPath = `./engine-private/conf/${cronDeployId}/.env.${envName}`;
-      if (fs.existsSync(cronEnvPath)) {
-        const cronEnv = dotenv.parse(fs.readFileSync(cronEnvPath, 'utf8'));
-        process.env = { ...process.env, ...cronEnv };
-      }
+  const cronDeployId = cronDeployIdResolve();
+  if (cronDeployId) {
+    const cronEnvPath = `./engine-private/conf/${cronDeployId}/.env.${envName}`;
+    if (fs.existsSync(cronEnvPath)) {
+      const cronEnv = dotenv.parse(fs.readFileSync(cronEnvPath, 'utf8'));
+      process.env = { ...process.env, ...cronEnv };
     }
   }
 
@@ -443,7 +457,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;
@@ -1142,6 +1156,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`),
@@ -1149,7 +1164,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,
@@ -1197,7 +1212,7 @@ const validateTemplatePath = (absolutePath = '') => {
     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}/`))
@@ -1213,7 +1228,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 (
@@ -1776,4 +1791,5 @@ export {
   readConfJson,
   DEFAULT_DEPLOY_ID,
   loadCronDeployEnv,
+  cronDeployIdResolve,
 };

package/src/server/cron.js

@@ -16,7 +16,7 @@ const volumeHostPath = '/home/dd';
 const enginePath = '/home/dd/engine';
 const cronVolumeName = 'underpost-cron-container-volume';
 const shareEnvVolumeName = 'underpost-share-env';
-const underpostContainerEnvPath = '/usr/lib/node_modules/underpost/.env';
+const underpostContainerEnvDir = '/usr/lib/node_modules/underpost';
 
 /**
  * Generates a Kubernetes CronJob YAML manifest string.
@@ -33,7 +33,9 @@ const underpostContainerEnvPath = '/usr/lib/node_modules/underpost/.env';
  * @param {string} [params.cmd] - Optional pre-script commands to run before cron execution
  * @param {boolean} [params.suspend=false] - Whether the CronJob is suspended
  * @param {boolean} [params.dryRun=false] - Pass --dry-run flag to the cron command inside the container
- * @param {boolean} [params.ssh=false] - Execute backup commands via SSH on the remote node
+ * @param {boolean} [params.k3s=false] - Pass --k3s flag to the cron command inside the container
+ * @param {boolean} [params.kind=false] - Pass --kind flag to the cron command inside the container
+ * @param {boolean} [params.kubeadm=false] - Pass --kubeadm flag to the cron command inside the container
  * @returns {string} Kubernetes CronJob YAML manifest
  * @memberof UnderpostCron
  */
@@ -49,7 +51,9 @@ const cronJobYamlFactory = ({
   cmd,
   suspend = false,
   dryRun = false,
-  ssh = false,
+  k3s = false,
+  kind = false,
+  kubeadm = false,
 }) => {
   const containerImage = image || `underpost/underpost-engine:${Underpost.version}`;
 
@@ -60,10 +64,12 @@ const cronJobYamlFactory = ({
     .replace(/^-|-$/g, '')
     .substring(0, 52);
 
-  const cmdPart = cmd ? `${cmd} && ` : '';
-  const cronBin = dev ? 'node bin' : 'underpost';
-  const flags = `${git ? '--git ' : ''}${dev ? '--dev ' : ''}${dryRun ? '--dry-run ' : ''}${ssh ? '--ssh ' : ''}`;
-  const cronCommand = `${cmdPart}${cronBin} cron ${flags}${deployList} ${jobList}`;
+  const cronBin = 'node bin'; // dev ? 'node bin' : 'underpost';
+  const flags = `${git ? '--git ' : ''}${dev ? '--dev ' : ''}${dryRun ? '--dry-run ' : ''}${k3s ? '--k3s ' : ''}${kind ? '--kind ' : ''}${kubeadm ? '--kubeadm ' : ''}`;
+  const commands = [`cd ${enginePath}`]; // `node bin run secret`
+  if (cmd) commands.push(cmd);
+  commands.push(`${cronBin} cron ${deployList} ${jobList} ${flags}`);
+  const fullCommand = commands.join(' &&\n                  ');
 
   return `apiVersion: batch/v1
 kind: CronJob
@@ -95,13 +101,12 @@ spec:
                 - /bin/sh
                 - -c
                 - >
-                  ${cronCommand}
+                  ${fullCommand}
               volumeMounts:
                 - mountPath: ${enginePath}
                   name: ${cronVolumeName}
-                - mountPath: ${underpostContainerEnvPath}
+                - mountPath: ${underpostContainerEnvDir}
                   name: ${shareEnvVolumeName}
-                  subPath: .env
           volumes:
             - hostPath:
                 path: ${enginePath}
@@ -183,7 +188,6 @@ class UnderpostCron {
      * @param {boolean} [options.kubeadm] - Use kubeadm cluster context (apply directly on host)
      * @param {boolean} [options.dryRun] - Preview cron jobs without executing them
      * @param {boolean} [options.createJobNow] - After applying, immediately create a Job from each CronJob (requires --apply)
-     * @param {boolean} [options.ssh] - Execute backup commands via SSH on the remote node
      * @memberof UnderpostCron
      */
     callback: async function (
@@ -227,7 +231,6 @@ class UnderpostCron {
      * @param {boolean} [options.k3s] - k3s cluster context (apply directly on host)
      * @param {boolean} [options.kind] - kind cluster context (apply via kind-worker container)
      * @param {boolean} [options.kubeadm] - kubeadm cluster context (apply directly on host)
-     * @param {boolean} [options.ssh] - Execute backup commands via SSH on the remote node
      * @memberof UnderpostCron
      */
     setupDeployStart: async function (deployId, options = {}) {
@@ -269,21 +272,19 @@ class UnderpostCron {
         logger.warn(`package.json not found for deploy-id: ${deployId}`, { path: packageJsonPath });
       }
 
-      // Generate and apply cron job manifests for this deploy-id
       await Underpost.cron.generateK8sCronJobs({
         deployId,
         namespace: options.namespace,
         image: options.image,
         apply: options.apply,
         createJobNow: options.createJobNow,
-        git: true,
-        dev: true,
-        kubeadm: true,
-        ssh: true,
-        cmd: ` cd ${enginePath} && node bin env ${deployId} production`,
-        k3s: false,
-        kind: false,
-        dryRun: false,
+        git: !!options.git,
+        dev: !!options.dev,
+        kubeadm: !!options.kubeadm,
+        cmd: options.cmd || `node bin env ${deployId} production`,
+        k3s: !!options.k3s,
+        kind: !!options.kind,
+        dryRun: !!options.dryRun,
       });
     },
 
@@ -305,7 +306,6 @@ class UnderpostCron {
      * @param {boolean} [options.kubeadm=false] - kubeadm cluster context (apply directly on host)
      * @param {boolean} [options.createJobNow=false] - After applying, create a Job from each CronJob immediately
      * @param {boolean} [options.dryRun=false] - Pass --dry-run=client to kubectl commands
-     * @param {boolean} [options.ssh=false] - Execute backup commands via SSH on the remote node
      * @memberof UnderpostCron
      */
     generateK8sCronJobs: async function (options = {}) {
@@ -362,7 +362,9 @@ class UnderpostCron {
           cmd: options.cmd,
           suspend: false,
           dryRun: !!options.dryRun,
-          ssh: !!options.ssh,
+          k3s: !!options.k3s,
+          kind: !!options.kind,
+          kubeadm: !!options.kubeadm,
         });
 
         const yamlFilePath = `${outputDir}/${cronJobName}.yaml`;

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
@@ -265,7 +281,8 @@ class Dns {
    * @returns {Promise<void>}
    */
   static async callback(deployList) {
-    loadCronDeployEnv();
+    // loadCronDeployEnv();
+
     const isOnline = await Dns.isInternetConnection();
 
     if (!isOnline) return;
@@ -490,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();