cyberia 3.0.2 → 3.1.3

package/src/cli/env.js

@@ -10,12 +10,10 @@ import { loggerFactory } from '../server/logger.js';
 import dotenv from 'dotenv';
 import { pbcopy } from '../server/process.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**
- * @class UnderpostEnv
+ * @class UnderpostRootEnv
  * @description Manages the environment variables of the underpost root.
  * @memberof UnderpostEnv
  */
@@ -41,7 +39,9 @@ class UnderpostRootEnv {
       if (options.build) {
         const deployIdList = options.deployId
           ? [options.deployId]
-          : fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',');
+          : fs.existsSync(`./engine-private/deploy/dd.router`)
+            ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',')
+            : [DEFAULT_DEPLOY_ID];
         for (const deployId of deployIdList)
           for (const envFile of ['test', 'development', 'production'])
             _set(`./engine-private/conf/${deployId}/.env.${envFile}`, key, value);
@@ -79,7 +79,7 @@ class UnderpostRootEnv {
     get(key, value, options = { plain: false, disableLog: false, copy: false }) {
       const exeRootPath = `${getNpmRootPath()}/underpost`;
       const envPath = `${exeRootPath}/.env`;
-      if (!fs.existsSync(envPath)) {
+      if (!fs.existsSync(envPath) || !fs.statSync(envPath).isFile()) {
         logger.warn(`Empty environment variables`);
         return undefined;
       }

package/src/cli/fs.js

@@ -6,14 +6,12 @@
 
 import { v2 as cloudinary } from 'cloudinary';
 import { loggerFactory } from '../server/logger.js';
-import dotenv from 'dotenv';
 import AdmZip from 'adm-zip';
 import * as dir from 'path';
 import fs from 'fs-extra';
 import Downloader from '../server/downloader.js';
 import { shellExec } from '../server/process.js';
 import Underpost from '../index.js';
-dotenv.config();
 
 const logger = loggerFactory(import.meta);
 

package/src/cli/image.js

@@ -5,14 +5,11 @@
  */
 
 import fs from 'fs-extra';
-import dotenv from 'dotenv';
 import { loggerFactory } from '../server/logger.js';
 import Underpost from '../index.js';
 import { getNpmRootPath, getUnderpostRootPath } from '../server/conf.js';
 import { shellExec } from '../server/process.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**

package/src/cli/index.js

@@ -7,11 +7,10 @@ import { commitData } from '../client/components/core/CommonJs.js';
 
 import Underpost from '../index.js';
 
-const underpostRootPath = getUnderpostRootPath();
+const underpostGlobalEnv = `${getUnderpostRootPath()}/.env`;
 
-fs.existsSync(`${underpostRootPath}/.env`)
-  ? dotenv.config({ path: `${underpostRootPath}/.env`, override: true })
-  : dotenv.config();
+if (fs.existsSync(underpostGlobalEnv)) dotenv.config({ path: underpostGlobalEnv, override: true, quiet: true });
+else dotenv.config({ quiet: true });
 
 const program = new Command();
 
@@ -27,6 +26,10 @@ program
   .option('--build', 'Build the deployment to pwa-microservices-template (requires --deploy-id)')
   .option('--clean-template', 'Clean the build directory (pwa-microservices-template)')
   .option('--sync-conf', 'Sync configuration to private repositories (requires --deploy-id)')
+  .option(
+    '--sync-start',
+    "Sync start scripts in deploy ID package.json with root package.json (use 'dd' as --deploy-id to sync all dd.router)",
+  )
   .option('--purge', 'Remove deploy ID conf and all related repositories (requires --deploy-id)')
   .option('--dev', 'Sets the development cli context')
   .option('--default-conf', 'Create default deploy ID conf env files')
@@ -34,6 +37,20 @@ program
   .description('Initializes a new Underpost project, service, or configuration.')
   .action(Underpost.repo.new);
 
+program
+  .command('client')
+  .argument('[deploy-id]', 'The deployment ID to build.', 'dd-default')
+  .argument('[sub-conf]', 'The sub-configuration for the build.', '')
+  .argument('[host]', 'Comma-separated hosts to filter the build.', '')
+  .argument('[path]', 'Comma-separated paths to filter the build.', '')
+  .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('--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.')
+  .action(Underpost.repo.client);
+
 program
   .command('start')
   .argument('<deploy-id>', 'The unique identifier for the deployment configuration.')
@@ -44,6 +61,7 @@ program
   .option('--run', 'Starts application servers and monitors their health.')
   .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.')
   .action(Underpost.start.callback)
   .description('Initiates application servers, build pipelines, or other defined services based on the deployment ID.');
 
@@ -51,7 +69,7 @@ program
   .command('clone')
   .argument(`<uri>`, 'The URI of the GitHub repository (e.g., "username/repository").')
   .option('--bare', 'Performs a bare clone, downloading only the .git files.')
-  .option('-g8', 'Uses the g8 repository extension for cloning.')
+  .option('--g8', 'Uses the g8 repository extension for cloning.')
   .description('Clones a specified GitHub repository into the current directory.')
   .action(Underpost.repo.clone);
 
@@ -60,7 +78,7 @@ program
   .argument('<path>', 'The absolute or relative directory path where the repository is located.')
   .argument(`<uri>`, 'The URI of the GitHub repository (e.g., "username/repository").')
   .description('Pulls the latest changes from a specified GitHub repository.')
-  .option('-g8', 'Uses the g8 repository extension for pulling.')
+  .option('--g8', 'Uses the g8 repository extension for pulling.')
   .action(Underpost.repo.pull);
 
 program
@@ -90,6 +108,7 @@ program
     '--changelog-no-hash',
     'Excludes commit hashes from the generated changelog entries (used with --changelog-build).',
   )
+  .option('-b', 'Shows the current Git branch name.')
   .description('Manages commits to a GitHub repository, supporting various commit types and options.')
   .action(Underpost.repo.commit);
 
@@ -98,7 +117,7 @@ program
   .argument('<path>', 'The absolute or relative directory path of the repository.')
   .argument(`<uri>`, 'The URI of the GitHub repository (e.g., "username/repository").')
   .option('-f', 'Forces the push, overwriting the remote repository history.')
-  .option('-g8', 'Uses the g8 repository extension for pushing.')
+  .option('--g8', 'Uses the g8 repository extension for pushing.')
   .description('Pushes committed changes from a local repository to a remote GitHub repository.')
   .action(Underpost.repo.push);
 
@@ -112,11 +131,11 @@ program
   .argument('[subConf]', 'Optional: The sub configuration to set.')
   .description('Sets environment variables and configurations related to a specific deployment ID.')
   .action((deployId, env, subConf) => {
-    if (fs.existsSync(`./engine-private/conf/${deployId}/.env.${env}`))
-      dotenv.config({ path: `./engine-private/conf/${deployId}/.env.${env}`, override: true });
-    else if (deployId === 'root') {
-      deployId = Underpost.env.get('DEPLOY_ID');
-    } else dotenv.config({ path: `./.env`, override: true });
+    if (deployId === 'root') {
+      const underpostRootDeployId = Underpost.env.get('DEPLOY_ID');
+      if (underpostRootDeployId) deployId = underpostRootDeployId;
+    }
+    if (env) process.env.NODE_ENV = env;
     loadConf(deployId, subConf);
   });
 
@@ -556,7 +575,6 @@ program
   .option('--force', 'Forces operation, overriding any warnings or conflicts.')
   .option('--tls', 'Enables TLS for the runner execution.')
   .option('--reset', 'Resets the runner state before execution.')
-  .option('--terminal', 'Enables terminal mode for interactive script execution.')
   .option('--dev-proxy-port-offset <port-offset>', 'Sets a custom port offset for development proxy.')
   .option('--host-network', 'Enables host network mode for the runner execution.')
   .option('--requests-memory <requests-memory>', 'Requests memory limit for the runner execution.')
@@ -608,10 +626,20 @@ program
     'Sets the maximum number of status check attempts (default: 600).',
   )
   .option('--dry-run', 'Preview operations without executing them.')
+  .option(
+    '--from-n-commit <n>',
+    'Number of commits back to use for message propagation in template-deploy (default: 1, last commit only).',
+  )
   .option(
     '--create-job-now',
     'After applying cron manifests, immediately create a Job from each CronJob (forwarded to cron runner).',
   )
+  .option(
+    '--host-aliases <host-aliases>',
+    'Adds entries to the Pod /etc/hosts via hostAliases. ' +
+      'Format: semicolon-separated entries of "ip=hostname1,hostname2" ' +
+      '(e.g., "127.0.0.1=foo.local,bar.local;10.1.2.3=foo.remote,bar.remote").',
+  )
   .description('Runs specified scripts using various runners.')
   .action(Underpost.run.callback);
 

package/src/cli/monitor.js

@@ -4,7 +4,7 @@
  * @namespace UnderpostMonitor
  */
 
-import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
+import { loadReplicas, pathPortAssignmentFactory, loadConfServerJson, loadCronDeployEnv } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import axios from 'axios';
 import fs from 'fs-extra';
@@ -71,6 +71,7 @@ class UnderpostMonitor {
       commanderOptions,
       auxRouter,
     ) {
+      loadCronDeployEnv();
       if (!options.namespace) options.namespace = 'default';
       if (!options.replicas) options.replicas = '1';
       if (deployId === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`)) {
@@ -100,7 +101,7 @@ class UnderpostMonitor {
 
       const confServer = loadReplicas(
         deployId,
-        JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
+        loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`),
       );
 
       const pathPortAssignmentData = await pathPortAssignmentFactory(deployId, router, confServer);
@@ -127,7 +128,7 @@ class UnderpostMonitor {
 
       const switchTraffic = (targetTraffic) => {
         const nextTraffic = targetTraffic ?? (traffic === 'blue' ? 'green' : 'blue');
-        // Delegate traffic switching to centralized deploy implementation so behavior is consistent
+        // Delegate traffic switching to deploy implementation so behavior is consistent
         Underpost.deploy.switchTraffic(deployId, env, nextTraffic, options.replicas, options.namespace, options);
         // Keep local traffic in sync with the environment
         traffic = nextTraffic;
@@ -168,9 +169,7 @@ class UnderpostMonitor {
                   switch (options.type) {
                     case 'blue-green':
                     default: {
-                      const confServer = JSON.parse(
-                        fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
-                      );
+                      const confServer = loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`);
 
                       const namespace = options.namespace;
                       Underpost.deploy.configMap(env, namespace);