underpost 3.2.11 → 3.2.14

package/bin/build.template.js

@@ -1,187 +1,31 @@
-import fs from 'fs-extra';
+#! /usr/bin/env node
 
-import { loggerFactory } from '../src/server/logger.js';
-import { getDirname, newInstance, uniqueArray } from '../src/client/components/core/CommonJs.js';
-import { shellExec } from '../src/server/process.js';
-import walk from 'ignore-walk';
-import { validateTemplatePath } from '../src/server/conf.js';
+import { Command } from 'commander';
+import fs from 'fs-extra';
 import dotenv from 'dotenv';
-
-const logger = loggerFactory(import.meta);
+import { loggerFactory } from '../src/server/logger.js';
+import { buildTemplate } from '../src/server/conf.js';
 
 if (fs.existsSync('./engine-private/conf/dd-cron/.env.production'))
-  dotenv.config({
-    path: `./engine-private/conf/dd-cron/.env.production`,
-    override: true,
-  });
+  dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
 else dotenv.config();
 
-// Engine-only paths stripped from the template after the source sync.
-const TEMPLATE_DELETE_PATHS = [
-  './.github',
-  './manifests/deployment/dd-lampp-development',
-  './manifests/deployment/dd-cyberia-development',
-  './manifests/deployment/dd-core-development',
-  './manifests/deployment/dd-template-development',
-  './src/server/object-layer.js',
-  './src/server/atlas-sprite-sheet-generator.js',
-  './src/server/shape-generator.js',
-  './src/server/semantic-layer-generator.js',
-  './src/server/semantic-layer-generator-floor.js',
-  './src/server/semantic-layer-generator-skin.js',
-  './src/server/semantic-layer-generator-resource.js',
-  './src/server/besu-genesis-generator.js',
-  './src/grpc/cyberia',
-  './src/runtime/cyberia-server',
-  './src/runtime/cyberia-client',
-  './test/shape-generator.test.js',
-  './src/client/public/cyberia-docs',
-  'bin/cyberia.js',
-  './hardhat',
-];
-
-// Workflow + service files re-added to the template after the engine-only strip above.
-const TEMPLATE_RESTORE_PATHS = [
-  `./.github/workflows/pwa-microservices-template-page.cd.yml`,
-  `./.github/workflows/pwa-microservices-template-test.ci.yml`,
-  `./.github/workflows/npmpkg.ci.yml`,
-  `./.github/workflows/ghpkg.ci.yml`,
-  `./.github/workflows/gitlab.ci.yml`,
-  `./.github/workflows/publish.ci.yml`,
-  `./.github/workflows/release.cd.yml`,
-  `./src/client/services/user/guest.service.js`,
-  './src/api/user/guest.service.js',
-  './src/ws/IoInterface.js',
-  './src/ws/IoServer.js',
-];
-
-const TEMPLATE_KEYWORDS = [
-  'underpost',
-  'underpost-platform',
-  'cli',
-  'toolchain',
-  'ci-cd',
-  'devops',
-  'kubernetes',
-  'k3s',
-  'kubeadm',
-  'lxd',
-  'bare-metal',
-  'container-orchestration',
-  'image-management',
-  'pwa',
-  'workbox',
-  'microservices',
-];
-
-const TEMPLATE_DESCRIPTION =
-  'Underpost Platform — end-to-end CI/CD and application-delivery toolchain CLI. Covers bare metal, Kubernetes, K3s, kubeadm, LXD, container/image orchestration, secrets, databases, cron jobs, monitoring, SSH, runners, PWA + Workbox delivery, and release orchestration. Extensible via downstream CLIs.';
-
-/**
- * Builds the pwa-microservices-template from scratch out of the current engine source tree.
- *
- * Clones (or resets) the template repo next to the engine, syncs every engine-tracked file the
- * template is allowed to carry (validateTemplatePath), strips engine-only modules, restores the
- * template's own CI workflows + guest services, and rewrites package.json / package-lock.json /
- * README so the template is a standalone, installable project.
- *
- * Usage: node bin/build.template [srcPath=./] [toPath=../pwa-microservices-template]
- */
-const srcPath = (process.argv[2] ?? './').replaceAll(`'`, '');
-const toPath = (process.argv[3] ?? '../pwa-microservices-template').replaceAll(`'`, '');
-const githubUsername = process.env.GITHUB_USERNAME;
-
-logger.info('Build template', { srcPath, toPath });
-
-try {
-  const sourceFiles = (
-    await new Promise((resolve) =>
-      walk(
-        {
-          path: srcPath,
-          ignoreFiles: [`.gitignore`],
-          includeEmpty: false,
-          follow: false,
-        },
-        (...args) => resolve(args[1]),
-      ),
-    )
-  ).filter((p) => !p.startsWith('.git'));
-
-  // Clone the template from 0 if missing; otherwise reset it to a clean pristine checkout.
-  if (!fs.existsSync(toPath)) {
-    shellExec(`cd .. && node engine/bin clone ${githubUsername}/pwa-microservices-template`);
-  } else {
-    shellExec(`cd ${toPath} && git reset && git checkout . && git clean -f -d`);
-    shellExec(`node bin pull ${toPath} ${githubUsername}/pwa-microservices-template`);
-    shellExec(`sudo rm -rf ${toPath}/engine-private`);
-    shellExec(`sudo rm -rf ${toPath}/logs`);
-  }
-  shellExec(`cd ${toPath} && git config core.filemode false`);
-
-  for (const copyPath of sourceFiles) {
-    if (copyPath === 'NaN') continue;
-    const absolutePath = `${srcPath}/${copyPath}`;
-    if (!validateTemplatePath(absolutePath)) continue;
-
-    const folder = getDirname(`${toPath}/${copyPath}`);
-    if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
-
-    logger.info('build', `${toPath}/${copyPath}`);
-    fs.copyFileSync(absolutePath, `${toPath}/${copyPath}`);
-  }
-
-  fs.copySync(`./.vscode`, `${toPath}/.vscode`);
-  fs.copySync(`./src/client/public/default`, `${toPath}/src/client/public/default`);
-
-  // Preserve the template's own README + package.json identity before merging engine metadata.
-  for (const checkoutPath of ['README.md', 'package.json']) shellExec(`cd ${toPath} && git checkout ${checkoutPath}`);
-
-  for (const deletePath of TEMPLATE_DELETE_PATHS) {
-    const target = `${toPath}/${deletePath}`;
-    if (fs.existsSync(target)) fs.removeSync(target);
-  }
-
-  fs.mkdirSync(`${toPath}/.github/workflows`, { recursive: true });
-  for (const restorePath of TEMPLATE_RESTORE_PATHS) fs.copyFileSync(restorePath, `${toPath}/${restorePath}`);
-
-  // ── package.json: take engine deps/scripts/version, keep template identity. ──
-  const originPackageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
-  const templatePackageJson = JSON.parse(fs.readFileSync(`${toPath}/package.json`, 'utf8'));
-  const templateName = templatePackageJson.name;
-
-  templatePackageJson.dependencies = originPackageJson.dependencies;
-  templatePackageJson.devDependencies = originPackageJson.devDependencies;
-  templatePackageJson.version = originPackageJson.version;
-  templatePackageJson.scripts = originPackageJson.scripts;
-  templatePackageJson.overrides = originPackageJson.overrides;
-  templatePackageJson.name = templateName;
-  templatePackageJson.description = TEMPLATE_DESCRIPTION;
-  templatePackageJson.keywords = uniqueArray(TEMPLATE_KEYWORDS.concat(templatePackageJson.keywords || []));
-  delete templatePackageJson.scripts['update:template'];
-  fs.writeFileSync(`${toPath}/package.json`, JSON.stringify(templatePackageJson, null, 4), 'utf8');
+const logger = loggerFactory(import.meta);
 
-  // ── package-lock.json: mirror engine packages, keep template name/version on the root entry. ──
-  const originPackageLockJson = JSON.parse(fs.readFileSync('./package-lock.json', 'utf8'));
-  const templatePackageLockJson = JSON.parse(fs.readFileSync(`${toPath}/package-lock.json`, 'utf8'));
-  const originBasePackageLock = newInstance(templatePackageLockJson.packages['']);
-  templatePackageLockJson.name = templateName;
-  templatePackageLockJson.version = originPackageLockJson.version;
-  templatePackageLockJson.packages = originPackageLockJson.packages;
-  templatePackageLockJson.packages[''].name = templateName;
-  templatePackageLockJson.packages[''].version = originPackageLockJson.version;
-  templatePackageLockJson.packages[''].hasInstallScript = originBasePackageLock.hasInstallScript;
-  templatePackageLockJson.packages[''].license = originBasePackageLock.license;
-  fs.writeFileSync(`${toPath}/package-lock.json`, JSON.stringify(templatePackageLockJson, null, 4), 'utf8');
+const program = new Command();
+
+program
+  .name('build.template')
+  .description('Rebuild the standalone pwa-microservices-template from scratch out of the engine source tree.')
+  .argument('[src-path]', 'Engine source root to sync from.', './')
+  .argument('[to-path]', 'Template output path.', '../pwa-microservices-template')
+  .action(async (srcPath, toPath) => {
+    try {
+      await buildTemplate({ srcPath: srcPath.replaceAll(`'`, ''), toPath: toPath.replaceAll(`'`, '') });
+    } catch (error) {
+      logger.error(error, error.stack);
+      process.exit(1);
+    }
+  });
 
-  fs.writeFileSync(
-    `${toPath}/README.md`,
-    fs
-      .readFileSync('./README.md', 'utf8')
-      .replace('<!-- template-title -->', '#### Base template for pwa/api-rest projects.'),
-    'utf8',
-  );
-} catch (error) {
-  logger.error(error, error.stack);
-  process.exit(1);
-}
+await program.parseAsync();

package/bin/deploy.js

@@ -283,7 +283,10 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
     }
 
     case 'cli-docs': {
-      buildCliDoc(program, process.argv[3], process.argv[4]);
+      const version = Underpost.version;
+      const newVersion =
+        process.argv[4] && !process.argv[4].startsWith('v') ? `v${process.argv[4]}` : process.argv[4] || version;
+      buildCliDoc(program, process.argv[3] || version, newVersion);
       break;
     }
 

package/bin/index.js

@@ -6,8 +6,8 @@ import { loggerFactory } from '../src/server/logger.js';
 const logger = loggerFactory(import.meta);
 
 try {
-  program.parse();
+  await program.parseAsync();
 } catch (error) {
   logger.error(error);
   process.exit(1);
-}
+}

package/conf.js

@@ -95,16 +95,8 @@ const DefaultConf = /**/ {
         { path: '/default-management', client: 'Default', ssr: 'Default' },
         { client: 'Default', ssr: 'Default', path: '/404', title: '404 Not Found' },
         { client: 'Default', ssr: 'Default', path: '/500', title: '500 Server Error' },
-        {
-          path: '/blog',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/chat',
-          client: 'Default',
-          ssr: 'Default',
-        },
+        { path: '/blog', client: 'Default', ssr: 'Default' },
+        { path: '/chat', client: 'Default', ssr: 'Default' },
       ],
       dists: [
         {
@@ -121,10 +113,7 @@ const DefaultConf = /**/ {
           import_name_build: '/dist/sortablejs/sortable.complete.esm.js',
         },
         { folder: './node_modules/validator', public_folder: '/dist/validator' },
-        {
-          folder: './node_modules/easymde/dist',
-          public_folder: '/dist/easymde',
-        },
+        { folder: './node_modules/easymde/dist', public_folder: '/dist/easymde' },
         {
           folder: './node_modules/marked/lib',
           public_folder: '/dist/marked',
@@ -157,7 +146,6 @@ const DefaultConf = /**/ {
           import_name: 'dexie',
           import_name_build: '/dist/dexie/dexie.mjs',
         },
-
         { folder: './node_modules/peerjs/dist', public_folder: '/dist/peerjs' },
       ],
       services: ['default', 'core', 'user', 'test', 'file', 'document'],
@@ -201,40 +189,26 @@ const DefaultConf = /**/ {
         proxy: [80, 443],
         db: {
           provider: 'env:DB_PROVIDER:mongoose',
-          host: 'env:DB_HOST:mongodb://mongodb-0.mongodb-service:27017',
+          host: 'env:DB_HOST:mongodb://127.0.0.1:27017',
           name: 'env:DB_NAME:default',
           replicaSet: 'env:DB_REPLICA_SET:rs0',
+          authSource: 'env:DB_AUTH_SOURCE:admin',
+          user: 'env:DB_USER:',
+          password: 'env:DB_PASSWORD:',
         },
         mailer: {
-          sender: {
-            email: 'env:MAILER_SENDER_EMAIL:noreply@default.net',
-            name: 'env:MAILER_SENDER_NAME:Default',
-          },
+          sender: { email: 'env:MAILER_SENDER_EMAIL:noreply@default.net', name: 'env:MAILER_SENDER_NAME:Default' },
           transport: {
             host: 'env:SMTP_HOST:smtp.default.com',
             port: 'env:SMTP_PORT:int:465',
             secure: 'env:SMTP_SECURE:bool:true',
-            auth: {
-              user: 'env:SMTP_AUTH_USER:',
-              pass: 'env:SMTP_AUTH_PASS:',
-            },
+            auth: { user: 'env:SMTP_AUTH_USER:', pass: 'env:SMTP_AUTH_PASS:' },
           },
         },
-        valkey: {
-          port: 'env:VALKEY_PORT:int:6379',
-          host: 'env:VALKEY_HOST:127.0.0.1',
-        },
-      },
-    },
-    'www.default.net': {
-      '/': {
-        client: null,
-        runtime: 'nodejs',
-        apis: [],
-        origins: [],
-        proxy: [80, 443],
+        valkey: { port: 'env:VALKEY_PORT:int:6379', host: 'env:VALKEY_HOST:127.0.0.1' },
       },
     },
+    'www.default.net': { '/': { client: null, runtime: 'nodejs', apis: [], origins: [], proxy: [80, 443] } },
   },
   cron: {
     records: {

package/manifests/cronjobs/dd-cron/dd-cron-backup.yaml

@@ -23,14 +23,14 @@ spec:
         spec:
           containers:
             - name: dd-cron-backup
-              image: underpost/underpost-engine:v3.2.11
+              image: underpost/underpost-engine:v3.2.14
               command:
                 - /bin/sh
                 - -c
                 - >
                   cd /home/dd/engine &&
                   node bin env dd-cron production &&
-                  node bin cron dd-lampp,dd-cyberia,dd-core,dd-test backup --git --kubeadm 
+                  node bin cron dd-lampp,dd-cyberia,dd-core,dd-prototype,dd-test backup --git --kubeadm 
               volumeMounts:
                 - mountPath: /home/dd/engine
                   name: underpost-cron-container-volume

package/manifests/cronjobs/dd-cron/dd-cron-dns.yaml

@@ -23,7 +23,7 @@ spec:
         spec:
           containers:
             - name: dd-cron-dns
-              image: underpost/underpost-engine:v3.2.11
+              image: underpost/underpost-engine:v3.2.14
               command:
                 - /bin/sh
                 - -c

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

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-blue
-          image: underpost/underpost-engine:v3.2.11
+          image: underpost/underpost-engine:v3.2.14
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -98,7 +98,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: underpost/underpost-engine:v3.2.11
+          image: underpost/underpost-engine:v3.2.14
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/package.json

@@ -2,12 +2,13 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "3.2.11",
+    "version": "3.2.14",
     "description": "Underpost Platform — end-to-end CI/CD and application-delivery toolchain CLI. Covers bare metal, Kubernetes, K3s, kubeadm, LXD, container/image orchestration, secrets, databases, cron jobs, monitoring, SSH, runners, PWA + Workbox delivery, and release orchestration. Extensible via downstream CLIs.",
     "scripts": {
         "start": "node --max-old-space-size=8192 src/server",
         "build": "node bin client",
         "test": "NODE_ENV=test c8 mocha",
+        "test:monitor": "NODE_ENV=test c8 mocha test/deploy-monitor.test.js",
         "dev": "NODE_ENV=development nodemon src/server",
         "dev:container": "NODE_ENV=development node src/server",
         "prod:container": "NODE_ENV=production node src/server",
@@ -45,18 +46,12 @@
         "k3s",
         "kubeadm",
         "lxd",
-        "bare-metal",
+        "baremetal",
         "container-orchestration",
         "image-management",
         "pwa",
         "workbox",
-        "microservices",
-        "template",
-        "builder",
-        "engine",
-        "server",
-        "proxy",
-        "client"
+        "microservices"
     ],
     "author": "https://github.com/underpostnet",
     "license": "MIT",
@@ -78,12 +73,12 @@
         "clipboardy": "^5.3.1",
         "cloudinary": "^2.10.0",
         "colors": "^1.4.0",
-        "commander": "^14.0.3",
+        "commander": "^15.0.0",
         "compression": "^1.7.4",
         "cookie-parser": "^1.4.7",
         "cors": "^2.8.6",
         "d3": "^7.9.0",
-        "dexie": "^4.2.1",
+        "dexie": "^4.4.3",
         "dotenv": "^17.4.2",
         "easymde": "^2.21.0",
         "esbuild": "^0.28.0",
@@ -93,7 +88,7 @@
         "express-rate-limit": "^8.5.2",
         "express-slow-down": "^3.1.0",
         "fast-json-stable-stringify": "^2.1.0",
-        "favicons": "^7.2.0",
+        "favicons": "^7.3.0",
         "fs-extra": "^11.3.5",
         "fullcalendar": "^6.1.15",
         "helmet": "^8.2.0",
@@ -106,9 +101,9 @@
         "mariadb": "^3.2.2",
         "mocha": "^11.7.6",
         "marked": "^18.0.4",
-        "mongoose": "^9.6.2",
+        "mongoose": "^9.6.3",
         "morgan": "^1.10.0",
-        "nodemailer": "^8.0.9",
+        "nodemailer": "^8.0.10",
         "nodemon": "^3.0.1",
         "peer": "^1.0.2",
         "peerjs": "^1.5.5",