cyberia 3.2.5 → 3.2.9

package/src/cli/index.js

@@ -46,6 +46,9 @@ program
   .option('--sync-env-port', 'Sync environment port assignments across all deploy IDs')
   .option('--single-replica', 'Build single replica folders instead of full client')
   .option('--build-zip', 'Create zip files of the builds')
+  .option('--split <mb>', 'Split generated zip files into parts of the specified size in MB')
+  .option('--unzip <build-prefix>', 'Extract a built client zip or split zip parts using the given build prefix')
+  .option('--merge-zip <build-prefix>', 'Merge split ZIP parts back into a single ZIP file for the given build prefix')
   .option('--lite-build', 'Skip full build (default is full build)')
   .option('--icons-build', 'Build icons')
   .description('Builds client assets, single replicas, and/or syncs environment ports.')
@@ -62,6 +65,11 @@ program
   .option('--build', 'Triggers the client-side application build process.')
   .option('--underpost-quickly-install', 'Uses Underpost Quickly Install for dependency installation.')
   .option('--skip-pull-base', 'Skips cloning repositories, uses current workspace code directly.')
+  .option('--skip-full-build', 'Skips the full client bundle build during deployment.')
+  .option(
+    '--pull-bundle',
+    'Downloads the pre-built client bundle from Cloudinary via pull-bundle before starting. Use together with --skip-full-build to skip the local build entirely.',
+  )
   .action(Underpost.start.callback)
   .description('Initiates application servers, build pipelines, or other defined services based on the deployment ID.');
 
@@ -226,6 +234,7 @@ program
   .option('--ban-egress-clear', 'Clears all banned egress IP addresses.')
   .option('--ban-both-add', 'Adds IP addresses to both banned ingress and egress lists.')
   .option('--ban-both-remove', 'Removes IP addresses from both banned ingress and egress lists.')
+  .option('--mac', 'Prints the MAC address of the main network interface.')
   .description('Displays the current public machine IP addresses.')
   .action(Underpost.dns.ipDispatcher);
 
@@ -329,6 +338,14 @@ program
     'Sets the local:remote port to expose when --expose is active (overrides auto-detected service port).',
   )
   .option('--cmd <cmd>', 'Custom initialization command for deployment (comma-separated commands).')
+  .option(
+    '--skip-full-build',
+    'Skip client bundle rebuild; container will pull pre-built bundle via pull-bundle instead.',
+  )
+  .option(
+    '--pull-bundle',
+    'Explicitly pull the pre-built client bundle from Cloudinary inside the container. Use together with --skip-full-build.',
+  )
   .description('Manages application deployments, defaulting to deploying development pods.')
   .action(Underpost.deploy.callback);
 
@@ -485,6 +502,7 @@ program
   .option('--recursive', 'Uploads files recursively from the specified path.')
   .option('--deploy-id <deploy-id>', 'Specifies the deployment configuration ID for file operations.')
   .option('--pull', 'Downloads the specified file.')
+  .option('--omit-unzip', 'With --pull, keeps the downloaded .zip file and skips extraction.')
   .option('--force', 'Forces the action, overriding any warnings or conflicts.')
   .option('--storage-file-path <storage-file-path>', 'Specifies a custom file storage path.')
   .description('Manages file storage, defaulting to file upload operations.')
@@ -613,7 +631,6 @@ program
   .option('--k3s', 'Sets the k3s cluster context for the runner execution.')
   .option('--kind', 'Sets the kind cluster context for the runner execution.')
   .option('--git-clean', 'Runs git clean on volume mount paths before copying.')
-  .option('--log-type <log-type>', 'Sets the log type for the runner execution.')
   .option('--deploy-id <deploy-id>', 'Sets deploy id context for the runner execution.')
   .option('--user <user>', 'Sets user context for the runner execution.')
   .option('--hosts <hosts>', 'Comma-separated list of hosts for the runner execution.')
@@ -657,6 +674,14 @@ program
       '(e.g., "127.0.0.1=foo.local,bar.local;10.1.2.3=foo.remote,bar.remote").',
   )
   .option('--copy', 'Copies the runner output to the clipboard (supported by: generate-pass, template-deploy-local).')
+  .option(
+    '--skip-full-build',
+    'Skip client bundle rebuild; triggers pull-bundle in container startup (supported by: sync, template-deploy).',
+  )
+  .option(
+    '--pull-bundle',
+    'Explicitly download the pre-built client bundle from Cloudinary inside the container (supported by: sync, template-deploy). Use together with --skip-full-build.',
+  )
   .description('Runs specified scripts using various runners.')
   .action(Underpost.run.callback);
 

package/src/cli/release.js

@@ -120,7 +120,7 @@ class UnderpostRelease {
         `./manifests/deployment/dd-default-development/deployment.yaml`,
         fs
           .readFileSync(`./manifests/deployment/dd-default-development/deployment.yaml`, 'utf8')
-          .replaceAll(`underpost:v${version}`, `underpost:v${newVersion}`),
+          .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
         'utf8',
       );
 
@@ -133,6 +133,62 @@ class UnderpostRelease {
           'utf8',
         );
 
+      // Update underpost/* image versions in all engine-*.cd.yml workflows.
+      for (const wf of fs.readdirSync(`./.github/workflows`)) {
+        if (!wf.match(/^engine-.+\.cd\.yml$/)) continue;
+        const wfPath = `./.github/workflows/${wf}`;
+        const updated = fs
+          .readFileSync(wfPath, 'utf8')
+          .replace(/underpost\/([^:'"]+):v[0-9]+\.[0-9]+\.[0-9]+/g, `underpost/$1:v${newVersion}`);
+        fs.writeFileSync(wfPath, updated, 'utf8');
+      }
+
+      // Update version tag in all runtime docker image workflows (type=raw,value=v<version>).
+      for (const wf of fs.readdirSync(`./.github/workflows`)) {
+        if (!wf.match(/^docker-image\..+\.ci\.yml$/) || wf === 'docker-image.ci.yml') continue;
+        const wfPath = `./.github/workflows/${wf}`;
+        fs.writeFileSync(
+          wfPath,
+          fs.readFileSync(wfPath, 'utf8').replaceAll(`type=raw,value=v${version}`, `type=raw,value=v${newVersion}`),
+          'utf8',
+        );
+      }
+
+      // Update image version in all conf.instances.json files for underpost/* images.
+      if (fs.existsSync(`./engine-private/conf`)) {
+        const confFiles = await fs.readdir(`./engine-private/conf`, { recursive: true });
+        for (const relativePath of confFiles) {
+          const filePath = `./engine-private/conf/${relativePath.replaceAll('\\', '/')}`;
+          if (filePath.split('/').pop() !== 'conf.instances.json' || !fs.existsSync(filePath)) continue;
+
+          let instances;
+          try {
+            instances = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+          } catch {
+            logger.warn(`Skipping invalid JSON file: ${filePath}`);
+            continue;
+          }
+
+          if (!Array.isArray(instances)) continue;
+
+          let updated = false;
+          for (const instance of instances) {
+            if (!instance || typeof instance !== 'object') continue;
+            if (!instance.image || typeof instance.image !== 'string') continue;
+            if (!instance.image.startsWith('underpost/')) continue;
+
+            const baseImage = instance.image.split('@')[0].split(':')[0];
+            const nextImage = `${baseImage}:v${newVersion}`;
+            if (instance.image !== nextImage) {
+              instance.image = nextImage;
+              updated = true;
+            }
+          }
+
+          if (updated) fs.writeFileSync(filePath, JSON.stringify(instances, null, 2), 'utf8');
+        }
+      }
+
       fs.writeFileSync(
         `./src/index.js`,
         fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),

package/src/cli/repository.js

@@ -21,7 +21,7 @@ import {
   buildReplicaId,
   writeEnv,
 } from '../server/conf.js';
-import { buildClient } from '../server/client-build.js';
+import { buildClient, unzipClientBuild, mergeClientBuildZip } from '../server/client-build.js';
 import { DefaultConf } from '../../conf.js';
 import Underpost from '../index.js';
 
@@ -401,6 +401,7 @@ class UnderpostRepository {
 
     /**
      * Retrieves the message of the last Git commit.
+     * @param {number} [skip=0] - Number of commits to skip from HEAD (0 = most recent).
      * @returns {string} The last commit message.
      * @memberof UnderpostRepository
      */
@@ -642,6 +643,9 @@ class UnderpostRepository {
      * @param {boolean} [options.syncEnvPort=false] - If true, syncs environment port assignments across all deploy IDs.
      * @param {boolean} [options.singleReplica=false] - If true, builds single replica folders instead of full client.
      * @param {boolean} [options.buildZip=false] - If true, creates zip files of the builds.
+     * @param {string|number} [options.split=''] - Optional ZIP part size in MB. When set with buildZip, writes split parts.
+     * @param {string} [options.unzip=''] - Optional build ZIP prefix to extract from ./build.
+     * @param {string} [options.mergeZip=''] - Optional build prefix to merge split ZIP parts into a single ZIP.
      * @param {boolean} [options.liteBuild=false] - If true, skips full build (default is full build).
      * @param {boolean} [options.iconsBuild=false] - If true, builds icons.
      * @returns {Promise<boolean>} A promise that resolves when the build is complete.
@@ -656,12 +660,31 @@ class UnderpostRepository {
         syncEnvPort: false,
         singleReplica: false,
         buildZip: false,
+        split: '',
+        unzip: '',
+        mergeZip: '',
         liteBuild: false,
         iconsBuild: false,
       },
     ) {
       return new Promise(async (resolve, reject) => {
         try {
+          if (options.mergeZip) {
+            mergeClientBuildZip({
+              buildPrefix: options.mergeZip,
+              logger,
+            });
+            return resolve(true);
+          }
+
+          if (options.unzip) {
+            unzipClientBuild({
+              buildPrefix: options.unzip,
+              logger,
+            });
+            return resolve(true);
+          }
+
           // Handle singleReplica operation (must run before syncEnvPort to ensure replica dirs exist)
           if (options.singleReplica) {
             const replicaPath = path;
@@ -804,6 +827,9 @@ class UnderpostRepository {
             let argPath = path ? path.split(',') : [];
             let deployIdSingleReplicas = [];
             let singleReplicaHosts = [];
+            const isReplicaContext = resolvedDeployId
+              ? fs.existsSync(`./engine-private/replica/${resolvedDeployId}`)
+              : false;
             const serverConf = resolvedDeployId
               ? readConfJson(resolvedDeployId, 'server', { loadReplicas: true })
               : Config.default.server;
@@ -814,7 +840,7 @@ class UnderpostRepository {
                 if (argHost.length && argPath.length && (!argHost.includes(host) || !argPath.includes(path))) {
                   delete serverConf[host][path];
                 } else {
-                  if (serverConf[host][path].singleReplica && serverConf[host][path].replicas) {
+                  if (!isReplicaContext && serverConf[host][path].singleReplica && serverConf[host][path].replicas) {
                     singleReplicaHosts.push({ host, path });
                     deployIdSingleReplicas = deployIdSingleReplicas.concat(
                       serverConf[host][path].replicas.map((replica) =>
@@ -827,10 +853,17 @@ class UnderpostRepository {
             }
             await buildClient({
               buildZip: options.buildZip || false,
+              split: options.split || '',
               fullBuild: options.liteBuild ? false : true,
               iconsBuild: options.iconsBuild || false,
             });
-            for (const replicaDeployId of deployIdSingleReplicas) await Underpost.repo.client(replicaDeployId);
+            for (const replicaDeployId of deployIdSingleReplicas) {
+              if (!fs.existsSync(`./engine-private/replica/${replicaDeployId}`)) {
+                logger.warn('Skip replica client build: replica folder not found', { replicaDeployId });
+                continue;
+              }
+              await Underpost.repo.client(replicaDeployId);
+            }
 
             return resolve(true);
           }
@@ -917,6 +950,7 @@ Prevent build private config repo.`,
     /**
      * Retrieves the Git commit history.
      * @param {number} [sinceCommit=1] - The number of recent commits to retrieve.
+     * @param {string} [repoPath='.'] - The path to the repository.
      * @returns {Array<{hash: string, message: string, files: string}>} An array of commit objects with hash, message, and files.
      * @memberof UnderpostRepository
      */
@@ -1238,19 +1272,10 @@ Prevent build private config repo.`,
     },
 
     /**
-     * Returns metadata about unpushed commits in a git repository.
-     * Fetches from origin, then counts commits ahead of the remote branch.
-     * @param {string} [repoPath='.'] - Path to the git repository.
-     * @param {number} [fallback=1] - Value to return as `count` when no unpushed commits are detected.
-     * @returns {{ count: number, branch: string, hasUnpushed: boolean }} Unpush metadata.
-     * @memberof UnderpostRepository
-     */
-    /**
-     * Checks whether a remote Git repository URL is reachable.
-     * Uses `git ls-remote` with `|| true` so the process always exits 0.
-     * Injects `GITHUB_TOKEN` into GitHub HTTPS URLs when available.
-     * @param {string} url - Full HTTPS clone URL to test (e.g. "https://github.com/org/repo.git").
-     * @returns {boolean} `true` when the remote responded with at least one ref hash.
+     * Resolves a Git remote URL, normalizing short-form owner/repo references to full
+     * GitHub HTTPS URLs and injecting GITHUB_TOKEN when available.
+     * @param {string} url - The repository URL or short-form (e.g. "owner/repo" or full HTTPS URL).
+     * @returns {string} The resolved (and optionally authenticated) HTTPS URL.
      * @memberof UnderpostRepository
      */
     resolveAuthUrl(url) {
@@ -1268,7 +1293,14 @@ Prevent build private config repo.`,
       }
       return normalized;
     },
-
+    /**
+     * Checks whether a remote Git repository URL is reachable.
+     * Uses `git ls-remote` with `|| true` so the process always exits 0.
+     * Injects `GITHUB_TOKEN` into GitHub HTTPS URLs when available.
+     * @param {string} url - Full HTTPS clone URL to test (e.g. "https://github.com/org/repo.git").
+     * @returns {boolean} `true` when the remote responded with at least one ref hash.
+     * @memberof UnderpostRepository
+     */
     isRemoteRepo(url) {
       if (!url) return false;
       const authUrl = Underpost.repo.resolveAuthUrl(url);
@@ -1282,6 +1314,14 @@ Prevent build private config repo.`,
       return typeof raw === 'string' && /^[0-9a-f]{40}\t/m.test(raw);
     },
 
+    /**
+     * Returns metadata about unpushed commits in a git repository.
+     * Fetches from origin, then counts commits ahead of the remote branch.
+     * @param {string} [repoPath='.'] - Path to the git repository.
+     * @param {number} [fallback=1] - Value to return as `count` when no unpushed commits are detected.
+     * @returns {{ count: number, branch: string, hasUnpushed: boolean }} Unpush metadata.
+     * @memberof UnderpostRepository
+     */
     getUnpushedCount(repoPath = '.', fallback = 1) {
       const branch = shellExec(`cd ${repoPath} && git branch --show-current`, {
         stdout: true,
@@ -1321,19 +1361,6 @@ Prevent build private config repo.`,
         .trim()
         .replaceAll('] - ', '] ');
     },
-
-    /**
-     * Manages a cron-backup Git repository: clone, pull, commit, or push.
-     * Resolves the repository path as `../<repoName>` relative to the CWD.
-     * Requires the `GITHUB_USERNAME` environment variable to be set.
-     * @param {object} params
-     * @param {string} params.repoName - Repository name (e.g. `engine-cyberia-cron-backups`).
-     * @param {'clone'|'pull'|'commit'|'push'} params.operation - Git operation to perform.
-     * @param {string} [params.message=''] - Commit message (used by the `commit` operation).
-     * @param {boolean} [params.forceClone=false] - Remove existing clone before re-cloning.
-     * @returns {boolean} `true` on success, `false` if GITHUB_USERNAME is unset or on error.
-     * @memberof UnderpostRepository
-     */
     /**
      * Initializes a git repository at the given path and configures user identity
      * from environment variables (`GITHUB_USERNAME` / `GITHUB_EMAIL`).
@@ -1366,7 +1393,18 @@ Prevent build private config repo.`,
         }
       }
     },
-
+    /**
+     * Manages a cron-backup Git repository: clone, pull, commit, or push.
+     * Resolves the repository path as `../<repoName>` relative to the CWD.
+     * Requires the `GITHUB_USERNAME` environment variable to be set.
+     * @param {object} params
+     * @param {string} params.repoName - Repository name (e.g. `engine-cyberia-cron-backups`).
+     * @param {'clone'|'pull'|'commit'|'push'} params.operation - Git operation to perform.
+     * @param {string} [params.message=''] - Commit message (used by the `commit` operation).
+     * @param {boolean} [params.forceClone=false] - Remove existing clone before re-cloning.
+     * @returns {boolean} `true` on success, `false` if GITHUB_USERNAME is unset or on error.
+     * @memberof UnderpostRepository
+     */
     manageBackupRepo({ repoName, operation, message = '', forceClone = false }) {
       try {
         const username = process.env.GITHUB_USERNAME;