underpost 3.2.30 → 3.2.80

package/src/cli/index.js

@@ -108,18 +108,24 @@ program
   .option('--edit', 'Edit last commit.')
   .option('--deploy-id <deploy-id>', 'Sets the deployment configuration ID for the commit context.')
   .option('--cached', 'Commit staged changes only or context.')
-  .option('--hashes <hashes>', 'Comma-separated list of specific file hashes of commits.')
-  .option('--extension <extension>', 'specific file extensions of commits.')
   .option(
-    '--changelog [latest-n]',
-    'Print plain the changelog of the specified number of latest n commits, if no number is provided it will get the changelog to latest ci integration',
+    '--init-repo [origin]',
+    'Initialize a git repository at the specified path. Optionally set the git remote origin URL.',
   )
+  .option('--hashes <hashes>', 'Comma-separated list of specific file hashes of commits.')
+  .option('--extension <extension>', 'specific file extensions of commits.')
+  .option('--changelog', 'Print the plain changelog of the last N commits (see --from-n-commit, default 1).')
   .option('--changelog-build', 'Builds a CHANGELOG.md file based on the commit history')
   .option('--changelog-min-version <version>', 'Sets the minimum version limit for --changelog-build (default: 2.85.0)')
   .option(
     '--changelog-no-hash',
     'Excludes commit hashes from the generated changelog entries (used with --changelog-build).',
   )
+  .option(
+    '--changelog-msg',
+    'Print the sanitized, commit-ready changelog message of the last N commits (see --from-n-commit, default 1). Empty when there are no tagged entries.',
+  )
+  .option('--from-n-commit <n>', 'Number of latest commits to include in --changelog/--changelog-msg (default: 1).')
   .option('--unpush', 'With --log, automatically sets range to unpushed commits ahead of remote.')
   .option('-b', 'Shows the current Git branch name.')
   .option('-p [branch]', 'Shows the reflog for the specified branch.')
@@ -434,25 +440,31 @@ program
   .option('--rm <image-id>', 'Removes specified Underpost Dockerfile images.')
   .option('--path [path]', 'The path to the Dockerfile directory.')
   .option('--image-name [image-name]', 'Sets a custom name for the Docker image.')
-  .option('--image-path [image-path]', 'Sets the output path for the tar image archive.')
+  .option('--image-out-path [image-out-path]', 'Sets the output path for the tar image archive.')
   .option('--dockerfile-name [dockerfile-name]', 'Sets a custom name for the Dockerfile.')
   .option('--podman-save', 'Exports the built image as a tar file using Podman.')
-  .option('--pull-base', 'Pulls base images and builds a "rockylinux9-underpost" image.')
+  .option('--pull-base', 'Pulls the base image prerequisites (rockylinux:9) on the host; combine with --build.')
   .option('--spec', 'Get current cached list of container images used by all pods')
   .option('--namespace <namespace>', 'Kubernetes namespace for image operations (defaults to "default").')
   .option('--kind', 'Set kind cluster env image context management.')
   .option('--kubeadm', 'Set kubeadm cluster env image context management.')
   .option('--k3s', 'Set k3s cluster env image context management.')
+  .option('--docker-compose', 'Load the built image tar into the local Docker store for Docker Compose availability.')
   .option('--node-name', 'Set node name for kubeadm or k3s cluster env image context management.')
   .option('--reset', 'Performs a build without using the cache.')
   .option('--dev', 'Use development mode.')
   .option('--pull-dockerhub <dockerhub-image>', 'Sets a custom Docker Hub image for base image pulls.')
+  .option(
+    '--import-tar <tar-path>',
+    'Load a pre-built image tar archive (e.g. ./image-v1.0.0.tar) into the enabled target(s) without building. Combine with --kind, --kubeadm, --k3s and/or --docker-compose; the archive is loaded into each enabled one.',
+  )
   .description('Manages Docker images, including building, saving, and loading into Kubernetes clusters.')
   .action(async (options) => {
     if (options.rm) Underpost.image.rm({ ...options, imageName: options.rm });
     if (options.ls) Underpost.image.list({ ...options, log: true });
     if (options.pullBase) Underpost.image.pullBaseImages(options);
     if (options.build) Underpost.image.build(options);
+    if (options.importTar) Underpost.image.importTar(options);
     if (options.pullDockerhub)
       Underpost.image.pullDockerHubImage({ ...options, dockerhubImage: options.pullDockerhub });
   });
@@ -692,6 +704,7 @@ program
   .option('--kubeadm', 'Sets the kubeadm cluster context for the runner execution.')
   .option('--k3s', 'Sets the k3s cluster context for the runner execution.')
   .option('--kind', 'Sets the kind cluster context for the runner execution.')
+  .option('--traffic <traffic>', 'Blue/green traffic colour to bake into generated manifests (default: blue).')
   .option('--git-clean', 'Runs git clean on volume mount paths before copying.')
   .option('--deploy-id <deploy-id>', 'Sets deploy id context for the runner execution.')
   .option('--user <user>', 'Sets user context for the runner execution.')
@@ -749,6 +762,7 @@ program
     '--test',
     'Enables test/generic-purpose mode for the runner (e.g. use self-signed TLS instead of cert-manager).',
   )
+  .option('--branch <branch>', 'Sets the branch for git operations (default: current branch).')
   .description('Runs specified scripts using various runners.')
   .action(Underpost.run.callback);
 
@@ -765,6 +779,12 @@ program
     '--deploy-id <deploy-id>',
     "Deployment to run as the app container (default: dd-default). 'dd-default' self-bootstraps a fresh engine; any other id runs the standard 'underpost start' command (mirrors src/cli/deploy.js).",
   )
+  .option(
+    '--docker-compose-id <docker-compose-id>',
+    'Selects a canonical custom-workflow stack at engine-private/conf/<deploy-id>/docker-compose/<docker-compose-id>/ ' +
+      '(docker-compose.yml + compose.env + nginx.conf, used as-is; nginx/env generation is skipped). ' +
+      'e.g. --deploy-id dd-cyberia --docker-compose-id cyberia for the Cyberia MMO ecosystem.',
+  )
   .option('--env <env>', 'Deployment environment for non-default deploy ids (default: development).')
   .option('--generate', 'Render dynamic supporting files (nginx router config, env-file, app-command override).')
   .option('--up', 'Start the full stack detached (regenerates config first).')

package/src/cli/release.js

@@ -117,9 +117,57 @@ const buildVersionBumpTargets = () => [
       /(underpost-engine:v)\d+\.\d+\.\d+/g,
       /(type=raw,value=v)\d+\.\d+\.\d+/g,
       /(UNDERPOST_VERSION=)\d+\.\d+\.\d+/g,
+      /(UNDERPOST_VERSION:\s*['"]?)\d+\.\d+\.\d+/g,
     ],
   },
 
+  // ── Docker-compose image-tag defaults. Root compose + generator + cyberia runtime compose.
+  //    Tags live in `${VAR:-vX.Y.Z}` / `VAR=vX.Y.Z` shapes bumpp cannot detect. ──
+  {
+    file: 'docker-compose.yml',
+    patterns: /(_TAG:-v)\d+\.\d+\.\d+/g,
+  },
+  {
+    file: 'src/cli/docker-compose.js',
+    patterns: /(_TAG=v)\d+\.\d+\.\d+/g,
+  },
+  {
+    file: 'src/runtime/engine-cyberia/docker-compose.yml',
+    patterns: /(_TAG:-v)\d+\.\d+\.\d+/g,
+  },
+  {
+    file: 'engine-private/conf/dd-cyberia/docker-compose/cyberia/docker-compose.yml',
+    patterns: /(_TAG:-v)\d+\.\d+\.\d+/g,
+  },
+
+  // ── Cyberia CLI dev image tar/name defaults (bin/cyberia.js). ──
+  {
+    file: 'bin/cyberia.js',
+    patterns: [/(-dev_v)\d+\.\d+\.\d+(?=\.tar)/g, /(-dev:v)\d+\.\d+\.\d+/g],
+  },
+
+  // ── Runtime Dockerfiles: `ARG UNDERPOST_VERSION=X.Y.Z` build-arg defaults. ──
+  {
+    dir: 'src/runtime',
+    match: /^Dockerfile(\.\w+)?$/,
+    patterns: /(ARG UNDERPOST_VERSION=)\d+\.\d+\.\d+/g,
+    recursive: true,
+  },
+
+  // ── Runtime compose.env shipped tag defaults ──
+  {
+    dir: 'src/runtime',
+    match: /^compose\.env$/,
+    patterns: /(_TAG=v)\d+\.\d+\.\d+/g,
+    recursive: true,
+  },
+
+  // ── Deploy-monitor smoke-test image default (scripts/test-monitor.sh). ──
+  {
+    file: 'scripts/test-monitor.sh',
+    patterns: /(underpost\/[a-z0-9-]+:v)\d+\.\d+\.\d+/g,
+  },
+
   // ── engine-private confs (gitignored — bumped only if present). ──
   {
     dir: 'engine-private/conf',
@@ -448,11 +496,10 @@ class UnderpostRelease {
       let commitMsg = message;
       if (!commitMsg) {
         shellCd('/home/dd/engine');
-        const rawMsg = shellExec(`node bin cmt --changelog 1 --changelog-no-hash`, {
+        commitMsg = shellExec(`node bin cmt --changelog-msg --changelog-no-hash`, {
           stdout: true,
           silent: true,
         }).trim();
-        commitMsg = Underpost.repo.sanitizeChangelogMessage(rawMsg);
         shellCd('/home/dd');
       }
       commitMsg = (commitMsg || '').trim() || `Update ${repoName} repository`;
@@ -492,11 +539,10 @@ class UnderpostRelease {
       let commitMsg = message;
       if (!commitMsg) {
         shellCd('/home/dd/engine');
-        const rawMsg = shellExec(`node bin cmt --changelog 1 --changelog-no-hash`, {
+        commitMsg = shellExec(`node bin cmt --changelog-msg --changelog-no-hash`, {
           stdout: true,
           silent: true,
         }).trim();
-        commitMsg = Underpost.repo.sanitizeChangelogMessage(rawMsg);
       }
       commitMsg = (commitMsg || '').trim() || `Update pwa-microservices-template repository`;
       shellCd('/home/dd');

package/src/cli/repository.js

@@ -21,6 +21,7 @@ import {
   getDataDeploy,
   buildReplicaId,
   writeEnv,
+  readConfInstances,
 } from '../server/conf.js';
 import { buildClient, unzipClientBuild, mergeClientBuildZip } from '../client-builder/client-build.js';
 import { DefaultConf } from '../../conf.js';
@@ -145,6 +146,14 @@ class UnderpostRepository {
     ) {
       if (!repoPath) repoPath = '.';
 
+      if (options.initRepo) {
+        Underpost.repo.initLocalRepo({
+          path: repoPath,
+          origin: typeof options.initRepo === 'string' ? options.initRepo : undefined,
+        });
+        return;
+      }
+
       if (options.hasChanges) {
         const status = shellExec(`cd ${repoPath} && git status --porcelain`, {
           stdout: true,
@@ -218,7 +227,7 @@ class UnderpostRepository {
         return;
       }
 
-      if (options.changelog !== undefined || options.changelogBuild) {
+      if (options.changelog !== undefined || options.changelogBuild || options.changelogMsg !== undefined) {
         const releaseMatch = 'New release v:';
         // Helper: parse [<tag>] commits into grouped sections
         const buildSectionChangelog = (commits) => {
@@ -255,7 +264,8 @@ class UnderpostRepository {
             stdout: true,
             silent: true,
             disableLog: true,
-          });
+            silentOnError: true,
+          }).toString();
           return rawLog
             .split('\n')
             .map((line) => {
@@ -346,15 +356,18 @@ class UnderpostRepository {
           fs.writeFileSync(changelogPath, `# Changelog\n\n${changelog}`);
           logger.info('CHANGELOG.md built at', changelogPath);
         } else {
-          // --changelog [latest-n]: print changelog of last N commits (default: 1)
-          const hasExplicitCount =
-            options.changelog !== undefined && options.changelog !== true && !isNaN(parseInt(options.changelog));
-          const scanLimit = hasExplicitCount ? parseInt(options.changelog) : 1;
-          const allCommits = fetchHistory(scanLimit);
-
-          const sections = buildVersionSections(allCommits);
-          let changelog = renderSections(sections);
-          console.log(changelog || `No changelog entries found.\n`);
+          // --changelog / --changelog-msg: message from the last N commits, where N is --from-n-commit
+          // (default 1, last commit only). No auto-detection.
+          const n = parseInt(options.fromNCommit) > 0 ? parseInt(options.fromNCommit) : 1;
+          const sections = buildVersionSections(fetchHistory(n));
+          const changelog = renderSections(sections);
+          if (options.changelogMsg !== undefined) {
+            // Sanitized, commit-ready message; empty string when there are no tagged entries so
+            // callers fall back to their own generic default instead of a placeholder.
+            console.log(Underpost.repo.sanitizeChangelogMessage(changelog));
+          } else {
+            console.log(changelog || `No changelog entries found.\n`);
+          }
         }
 
         return;
@@ -1257,17 +1270,40 @@ Prevent build private config repo.`,
       return copiedFiles;
     },
 
+    /**
+     * Resolves the default branch for a remote GitHub repository by querying
+     * `git ls-remote --symref` and extracting the HEAD ref target.
+     * Falls back to `main` when detection fails.
+     * @param {string} repo - The GitHub repository (e.g., "owner/repo").
+     * @returns {string} The default branch name (e.g. "main" or "master").
+     * @memberof UnderpostRepository
+     */
+    getDefaultBranch(repo) {
+      if (!repo) return 'main';
+      const authUrl = Underpost.repo.resolveAuthUrl(repo);
+      const raw = shellExec(
+        `GIT_TERMINAL_PROMPT=0 git -c credential.helper= ls-remote --symref "${authUrl}" HEAD 2>&1`,
+        { stdout: true, silent: true, disableLog: true, silentOnError: true },
+      );
+      // --symref emits a line like: ref: refs/heads/main	HEAD
+      const match = typeof raw === 'string' ? raw.match(/^ref:\s*refs\/heads\/(\S+)\tHEAD$/m) : null;
+      const branch = match ? match[1] : 'main';
+      logger.info('getDefaultBranch', { repo, branch });
+      return branch;
+    },
+
     /**
      * Dispatches a GitHub Actions workflow using gh CLI or curl fallback.
      * @param {object} options - Dispatch options.
      * @param {string} options.repo - The GitHub repository (e.g., "owner/repo").
      * @param {string} options.workflowFile - The workflow file name (e.g., "engine-core.cd.yml").
-     * @param {string} [options.ref='master'] - The git ref to dispatch against.
+     * @param {string} [options.ref] - The git ref to dispatch against. Auto-detects the remote's default branch when omitted.
      * @param {object} [options.inputs={}] - Key-value inputs for the workflow_dispatch event.
      * @memberof UnderpostRepository
      */
-    dispatchWorkflow(options = { repo: '', workflowFile: '', ref: 'master', inputs: {} }) {
-      const { repo, workflowFile, ref, inputs } = options;
+    dispatchWorkflow(options = { repo: '', workflowFile: '', ref: '', inputs: {} }) {
+      const { repo, workflowFile, inputs } = options;
+      const ref = options.ref || Underpost.repo.getDefaultBranch(repo);
       const ghAvailable = shellExec('command -v gh 2>/dev/null', {
         stdout: true,
         silent: true,
@@ -1344,14 +1380,18 @@ Prevent build private config repo.`,
       if (!url) return false;
       const authUrl = Underpost.repo.resolveAuthUrl(url);
       // GIT_TERMINAL_PROMPT=0 prevents git from hanging on credential prompts inside containers.
-      const raw = shellExec(`GIT_TERMINAL_PROMPT=0 git ls-remote "${authUrl}" HEAD 2>&1`, {
+      // `-c credential.helper=` disables any host-configured credential helper so its stderr
+      // warnings don't pollute the ls-remote output; the token is already embedded in authUrl.
+      const raw = shellExec(`GIT_TERMINAL_PROMPT=0 git -c credential.helper= ls-remote "${authUrl}" HEAD 2>&1`, {
         stdout: true,
         silent: true,
         disableLog: true,
         silentOnError: true,
       });
-      logger.info('isRemoteRepo', { url, raw: (raw || '').slice(0, 120) });
-      return typeof raw === 'string' && /^[0-9a-f]{40}\t/m.test(raw);
+      const refLine = typeof raw === 'string' ? (raw.match(/^[0-9a-f]{40}\t.*$/m) || [])[0] : undefined;
+      const accessible = !!refLine;
+      logger.info('isRemoteRepo', { url, accessible, ref: refLine || (raw || '').trim().split('\n').pop() });
+      return accessible;
     },
 
     /**
@@ -1422,17 +1462,31 @@ Prevent build private config repo.`,
      * @memberof UnderpostRepository
      */
     getUnpushedCount(repoPath = '.', fallback = 1) {
+      // Every git call is silentOnError: a detached HEAD (CI checkout) or a missing upstream must
+      // degrade to the fallback, never throw — otherwise the thrown error is logged to stdout and
+      // can be captured as a commit message by callers that read this command's output.
       const branch = shellExec(`cd ${repoPath} && git branch --show-current`, {
         stdout: true,
         silent: true,
         disableLog: true,
-      }).trim();
-      shellExec(`cd ${repoPath} && git fetch origin 2>/dev/null`, { silent: true, disableLog: true });
+        silentOnError: true,
+      })
+        .toString()
+        .trim();
+      if (!branch) return { count: fallback, branch: '', hasUnpushed: false };
+      shellExec(`cd ${repoPath} && git fetch origin 2>/dev/null`, {
+        silent: true,
+        disableLog: true,
+        silentOnError: true,
+      });
       const raw = shellExec(`cd ${repoPath} && git rev-list --count origin/${branch}..HEAD 2>/dev/null`, {
         stdout: true,
         silent: true,
         disableLog: true,
-      }).trim();
+        silentOnError: true,
+      })
+        .toString()
+        .trim();
       const count = parseInt(raw);
       const hasUnpushed = !isNaN(count) && count > 0;
       return { count: hasUnpushed ? count : fallback, branch, hasUnpushed };
@@ -1447,7 +1501,7 @@ Prevent build private config repo.`,
      */
     sanitizeChangelogMessage(message) {
       if (!message) return '';
-      return message
+      const sanitized = message
         .replace(/^##\s+\d{4}-\d{2}-\d{2}\s*/gm, '')
         .replace(/^###\s+(\S+)\s*/gm, '[$1] ')
         .replace(/^- /gm, '')
@@ -1459,6 +1513,9 @@ Prevent build private config repo.`,
         .join('\n')
         .trim()
         .replaceAll('] - ', '] ');
+      // The empty-changelog placeholder must never become a commit message; return empty so
+      // callers fall back to their own generic default.
+      return sanitized === 'No changelog entries found.' ? '' : sanitized;
     },
     /**
      * Initializes a git repository at the given path and configures user identity
@@ -1783,12 +1840,17 @@ Prevent build private config repo.`,
      *  4. Falls back to `${GITHUB_USERNAME}/engine` when no match is found.
      *
      * @param {string} [runtime=''] - The runtime identifier to look up (e.g. `'cyberia-server'`, `'cyberia-client'`).
+     * @param {boolean} [ownRuntimeRepo=false] - Whether to check for the runtime's own repository.
      * @returns {string} The resolved `owner/repo` string.
      * @memberof UnderpostRepository
      */
-    resolveInstanceRepo(runtime = '') {
+    resolveInstanceRepo(runtime = '', ownRuntimeRepo = false) {
       const fallback = `${process.env.GITHUB_USERNAME}/engine`;
       if (!runtime) return fallback;
+      // A `.dev` suffix selects the development image workflow
+      // (docker-image.<runtime>.dev.ci.yml) but resolves to the same instance
+      // repo as its production counterpart, so strip it before matching.
+      runtime = runtime.replace(/\.dev$/, '');
       const ddRouter = './engine-private/deploy/dd.router';
       const deployIds = fs.existsSync(ddRouter)
         ? fs
@@ -1801,8 +1863,10 @@ Prevent build private config repo.`,
         const confPath = `./engine-private/conf/${deployId}/conf.instances.json`;
         if (!fs.existsSync(confPath)) continue;
         try {
-          const instances = JSON.parse(fs.readFileSync(confPath, 'utf8'));
-          const match = instances.find((i) => i && i.runtime === runtime);
+          // readConfInstances returns the bare array of entries. The template
+          // entries carry runtime + metadata.repository, so the un-expanded list
+          // is enough here (no need to expand variants).
+          const match = readConfInstances(deployId).find((i) => i && i.runtime === runtime);
           if (match && match.metadata && match.metadata.repository) {
             logger.info(`[resolveInstanceRepo] resolved from ${confPath}`, {
               runtime,
@@ -1814,6 +1878,16 @@ Prevent build private config repo.`,
           logger.warn(`[resolveInstanceRepo] failed to parse ${confPath}: ${err.message}`);
         }
       }
+      if (ownRuntimeRepo) {
+        const runtimeRepo = Underpost.repo.isRemoteRepo(`${process.env.GITHUB_USERNAME}/${runtime}`);
+        if (runtimeRepo) {
+          logger.info(`[resolveInstanceRepo] resolved from ${process.env.GITHUB_USERNAME}/${runtime}`, {
+            runtime,
+            repo: `${process.env.GITHUB_USERNAME}/${runtime}`,
+          });
+          return `${process.env.GITHUB_USERNAME}/${runtime}`;
+        }
+      }
       return fallback;
     },