underpost 2.85.1 → 2.85.7

package/.env.development

@@ -42,4 +42,5 @@ RPI4_MAC_ADDRESS=changethis
 NVIDIA_API_KEY=changethis
 DEFAULT_ADMIN_EMAIL=admin@default.net
 DEFAULT_ADMIN_PASSWORD=changethis
-BASE_API=api
+BASE_API=api
+DEV_PROXY_PORT_OFFSET=200

package/.env.production

@@ -51,4 +51,5 @@ NPM_USER=changethis
 NPM_PASSWORD=changethis
 BASE_API=api
 CERTBOT_LIVE_PATH=changethis
-CERTBOT_LIVE_PATH_WINDOWS=changethis
+CERTBOT_LIVE_PATH_WINDOWS=changethis
+DEV_PROXY_PORT_OFFSET=200

package/.env.test

@@ -42,4 +42,5 @@ RPI4_MAC_ADDRESS=changethis
 NVIDIA_API_KEY=changethis
 DEFAULT_ADMIN_EMAIL=admin@default.net
 DEFAULT_ADMIN_PASSWORD=changethis
-BASE_API=api
+BASE_API=api
+DEV_PROXY_PORT_OFFSET=200

package/.github/workflows/release.cd.yml

@@ -29,8 +29,8 @@ jobs:
             set -e
             echo "Starting remote release deploy"
             underpost run pull
-            underpost run git-conf
             underpost run secret
             cd /home/dd/engine
-            underpost run template-deploy-image
-            underpost run ssh-deploy sync-engine-test
+            node bin run --dev git-conf admin@underpost.net,underpostnet
+            node bin run --dev template-deploy-image
+            node bin run --dev ssh-deploy sync-engine-test

package/.vscode/zed.keymap.json

@@ -1,4 +1,26 @@
 [
+  {
+    "context": "Editor",
+    "bindings": {
+      "ctrl-c": "editor::Copy",
+      "ctrl-x": "editor::Cut",
+      "ctrl-v": "editor::Paste",
+      "ctrl-shift-c": "editor::CopyAndTrim",
+      "ctrl-shift-v": "editor::Paste",
+      "cmd-c": "editor::Copy",
+      "cmd-x": "editor::Cut",
+      "cmd-v": "editor::Paste"
+    }
+  },
+  {
+    "context": "Terminal",
+    "bindings": {
+      "ctrl-shift-c": "terminal::Copy",
+      "ctrl-shift-v": "terminal::Paste",
+      "cmd-shift-c": "terminal::Copy",
+      "cmd-shift-v": "terminal::Paste"
+    }
+  },
   {
     "context": "Editor && edit_prediction",
     "bindings": {

package/README.md

@@ -18,7 +18,7 @@
 
 <!-- badges -->
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.85.1)](https://socket.dev/npm/package/underpost/overview/2.85.1) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.85.7)](https://socket.dev/npm/package/underpost/overview/2.85.7) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 <!-- end-badges -->
 
@@ -66,7 +66,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.85.1
+## underpost ci/cd cli v2.85.7
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -75,7 +75,7 @@ npm run dev
   -h, --help                                                 display help for command
 
 Commands:
-  new [options] <app-name>                                   Initializes a new Underpost project, service, or configuration.
+  new [options] [app-name]                                   Initializes a new Underpost project, service, or configuration.
   start [options] <deploy-id> [env]                          Initiates application servers, build pipelines, or other defined services based on the deployment ID.
   clone [options] <uri>                                      Clones a specified GitHub repository into the current directory.
   pull [options] <path> <uri>                                Pulls the latest changes from a specified GitHub repository.

package/bin/deploy.js

@@ -380,6 +380,7 @@ try {
     }
 
     case 'version-build': {
+      dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
       shellCd(`/home/dd/engine`);
       shellExec(`node bin/deploy clean-core-repo`);
       shellExec(`node bin pull . ${process.env.GITHUB_USERNAME}/engine`);
@@ -493,6 +494,7 @@ try {
     }
 
     case 'version-deploy': {
+      dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
       shellExec(
         `underpost secret underpost --create-from-file /home/dd/engine/engine-private/conf/dd-cron/.env.production`,
       );
@@ -1302,8 +1304,8 @@ nvidia/gpu-operator \
 
     case 'tls': {
       fs.mkdirSync(`./engine-private/ssl/localhost`, { recursive: true });
-      const targetDir = `./engine-private/ssl/localhost`;
-      const domains = ['localhost', '127.0.0.1', '::1'];
+      const targetDir = `./engine-private/ssl/${process.argv[3] ? process.argv[3] : 'localhost'}`;
+      const domains = ['localhost', '127.0.0.1', '::1'].concat(process.argv[3] ? process.argv[3] : []);
       shellExec(`chmod +x ./scripts/ssl.sh`);
       shellExec(`./scripts/ssl.sh ${targetDir} "${domains.join(' ')}"`);
       break;

package/bin/file.js

@@ -11,9 +11,12 @@ import {
 import { shellCd, shellExec } from '../src/server/process.js';
 import walk from 'ignore-walk';
 import { validateTemplatePath } from '../src/server/conf.js';
+import dotenv from 'dotenv';
 
 const logger = loggerFactory(import.meta);
 
+dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
+
 logger.info('argv', process.argv);
 
 let [exe, dir, type] = process.argv;
@@ -69,6 +72,7 @@ try {
       }
 
       for (const copyPath of result) {
+        if (copyPath === 'NaN') continue;
         const folder = getDirname(`${toPath}/${copyPath}`);
         const absolutePath = `${rawPath}/${copyPath}`;
 

package/bin/vs.js

@@ -4,11 +4,11 @@ import { loggerFactory } from '../src/server/logger.js';
 
 const logger = loggerFactory(import.meta);
 
-// const vsCodeRootPath = '/root/.vscode-root';
-// const vsProgram = 'code';
+const vsCodeRootPath = '/root/.vscode-root';
+const vsProgram = 'code';
 
-const vsCodeRootPath = '/root/.windsurf';
-const vsProgram = 'windsurf';
+// const vsCodeRootPath = '/root/.windsurf';
+// const vsProgram = 'windsurf';
 
 switch (process.argv[2]) {
   case 'info': {

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.85.1
+## underpost ci/cd cli v2.85.7
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -7,7 +7,7 @@
   -h, --help                                                 display help for command
 
 Commands:
-  new [options] <app-name>                                   Initializes a new Underpost project, service, or configuration.
+  new [options] [app-name]                                   Initializes a new Underpost project, service, or configuration.
   start [options] <deploy-id> [env]                          Initiates application servers, build pipelines, or other defined services based on the deployment ID.
   clone [options] <uri>                                      Clones a specified GitHub repository into the current directory.
   pull [options] <path> <uri>                                Pulls the latest changes from a specified GitHub repository.
@@ -42,20 +42,20 @@ Commands:
 
 ### `new` :
 ```
- Usage: underpost new [options] <app-name>
+ Usage: underpost new [options] [app-name]
 
 Initializes a new Underpost project, service, or configuration.
 
 Arguments:
-  app-name               The name or deploy-id of the application to create.
+  app-name                 The name of the new project.
 
 Options:
-  --deploy-id            Crete deploy ID conf env files
-  --cluster              Create deploy ID cluster files and sync to current
-                         cluster
-  --dev                  Sets the development cli context
-  --sub-conf <sub-conf>  Create sub conf env files
-  -h, --help             display help for command
+  --deploy-id <deploy-id>  Crete deploy ID conf env files
+  --sub-conf <sub-conf>    Create sub conf env files
+  --cluster                Create deploy ID cluster files and sync to current
+                           cluster
+  --dev                    Sets the development cli context
+  -h, --help               display help for command
  
 ```
   
@@ -623,7 +623,7 @@ Options:
 Runs a script from the specified path.
 
 Arguments:
-  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, underpost-config, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, dev-hosts-expose, dev-hosts-restore, cyberia-ide, engine-ide, cluster-build, template-deploy, template-deploy-image, clean, pull, release-deploy, ssh-deploy, ide, sync, ls-deployments, host-update, dev-container, monitor, db-client, git-conf, promote, metrics, cluster, deploy, service, sync-replica, tf-vae-test, deploy-job.
+  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, underpost-config, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, dev-hosts-expose, dev-hosts-restore, cyberia-ide, engine-ide, cluster-build, template-deploy, template-deploy-image, clean, pull, release-deploy, ssh-deploy, ide, sync, ls-deployments, ls-images, host-update, dev-container, monitor, db-client, git-conf, promote, metrics, cluster, deploy, dev, service, release-cmt, sync-replica, tf-vae-test, deploy-job.
   path                                     The absolute or relative directory path where the script is located.
 
 Options:
@@ -642,6 +642,10 @@ Options:
   --kubeadm                                Flag to indicate Kubeadm cluster type context
   --k3s                                    Flag to indicate K3s cluster type context
   --force                                  Forces operation, overriding any warnings or conflicts.
+  --tls                                    Enables TLS for the runner execution.
+  --reset                                  Resets the runner state before execution.
+  --terminal                               Enables terminal mode for interactive script execution.
+  --dev-proxy-port-offset <port-offset>    Sets a custom port offset for development proxy.
   -h, --help                               display help for command
  
 ```

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

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-blue
-          image: localhost/rockylinux9-underpost:v2.85.1
+          image: localhost/rockylinux9-underpost:v2.85.7
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.85.1
+          image: localhost/rockylinux9-underpost:v2.85.7
           #          resources:
           #            requests:
           #              memory: "124Ki"

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

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.85.1
+          image: localhost/rockylinux9-underpost:v2.85.7
 #          resources:
 #            requests:
 #              memory: "96294Ki"
@@ -104,7 +104,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.85.1
+          image: localhost/rockylinux9-underpost:v2.85.7
 #          resources:
 #            requests:
 #              memory: "96294Ki"

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.85.1",
+    "version": "2.85.7",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -15,7 +15,7 @@
         "monitor": "pm2 start src/monitor.js --name monitor -- dd production",
         "dev-api": "env-cmd -f .env.development nodemon --watch src --ignore src/client src/api",
         "dev-client": "env-cmd -f .env.development node src/client.dev",
-        "proxy": "node src/proxy proxy",
+        "dev-proxy": "env-cmd -f .env.development node src/proxy proxy",
         "docs": "jsdoc -c jsdoc.json",
         "install-global": "npm install -g pm2 && npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd",
         "install-test": "npm install -g mocha && npm install -g c8 && npm install -g coveralls",

package/src/cli/baremetal.js

@@ -76,9 +76,9 @@ class UnderpostBaremetal {
       const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
 
       // Set default values if not provided.
-      workflowId = workflowId ?? 'rpi4mb';
-      hostname = hostname ?? workflowId;
-      ipAddress = ipAddress ?? '192.168.1.192';
+      workflowId = workflowId ? workflowId : 'rpi4mb';
+      hostname = hostname ? hostname : workflowId;
+      ipAddress = ipAddress ? ipAddress : '192.168.1.192';
 
       // Set default MAC address
       let macAddress = '00:00:00:00:00:00';

package/src/cli/deploy.js

@@ -80,7 +80,7 @@ class UnderpostDeploy {
       process.env.PORT = initEnvObj.PORT;
       process.env.NODE_ENV = env;
       await Config.build('proxy', deployList);
-      return buildPortProxyRouter(env === 'development' ? 80 : 443, buildProxyRouter());
+      return buildPortProxyRouter({ port: env === 'development' ? 80 : 443, proxyRouter: buildProxyRouter() });
     },
     /**
      * Creates a YAML service configuration for a deployment.
@@ -689,15 +689,37 @@ EOF`);
     /**
      * Creates a hosts file for a deployment.
      * @param {Array<string>} hosts - List of hosts to be added to the hosts file.
+     * @param {object} options - Options for the hosts file creation.
+     * @param {boolean} options.append - Whether to append to the existing hosts file.
+     * @returns {object} - Object containing the rendered hosts file.
      * @memberof UnderpostDeploy
      */
-    etcHostFactory(hosts = []) {
+    etcHostFactory(hosts = [], options = { append: false }) {
+      hosts = hosts.map((host) => {
+        try {
+          if (!host.startsWith('http')) host = `http://${host}`;
+          const hostname = new URL(host).hostname;
+          logger.info('Hostname extract valid', { host, hostname });
+          return hostname;
+        } catch (e) {
+          logger.warn('No hostname extract valid', host);
+          return host;
+        }
+      });
       const renderHosts = `127.0.0.1         ${hosts.join(
         ' ',
       )} localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6`;
 
-      fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
+      if (options && options.append && fs.existsSync(`/etc/hosts`)) {
+        fs.writeFileSync(
+          `/etc/hosts`,
+          fs.readFileSync(`/etc/hosts`, 'utf8') +
+            `
+${renderHosts}`,
+          'utf8',
+        );
+      } else fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
       return { renderHosts };
     },
     /**
@@ -768,7 +790,7 @@ EOF`);
           .filter((o) => o.image);
       }
       if (node === 'kind-worker') {
-        const raw = shellExec(`docker exec -i kind-control-plane crictl images`, {
+        const raw = shellExec(`docker exec -i ${node} crictl images`, {
           stdout: true,
           silent: true,
         });

package/src/cli/index.js

@@ -22,11 +22,11 @@ program.name('underpost').description(`underpost ci/cd cli ${Underpost.version}`
 // 'new' command: Create a new project
 program
   .command('new')
-  .argument('<app-name>', 'The name or deploy-id of the application to create.')
-  .option('--deploy-id', 'Crete deploy ID conf env files')
+  .argument('[app-name]', 'The name of the new project.')
+  .option('--deploy-id <deploy-id>', 'Crete deploy ID conf env files')
+  .option('--sub-conf <sub-conf>', 'Create sub conf env files')
   .option('--cluster', 'Create deploy ID cluster files and sync to current cluster')
   .option('--dev', 'Sets the development cli context')
-  .option('--sub-conf <sub-conf>', 'Create sub conf env files')
   .description('Initializes a new Underpost project, service, or configuration.')
   .action(Underpost.repo.new);
 
@@ -389,6 +389,10 @@ program
   .option('--kubeadm', 'Flag to indicate Kubeadm cluster type context')
   .option('--k3s', 'Flag to indicate K3s cluster type context')
   .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.')
   .description('Runs a script from the specified path.')
   .action(UnderpostRun.API.callback);
 

package/src/cli/repository.js

@@ -213,60 +213,50 @@ class UnderpostRepository {
     },
 
     /**
-     * Creates a new Underpost project, service, or configuration.
-     * @param {string} repositoryName - The name of the new project or service, or a deployId.
-     * @param {object} [options={ dev: false, deployId: false, cluster: false, subConf: '' }] - Creation options.
-     * @param {boolean} [options.dev=false] - If true, sets up a development project.
-     * @param {boolean} [options.deployId=false] - If true, creates deploy ID configuration files.
-     * @param {boolean} [options.cluster=false] - If true, creates cluster configuration files.
-     * @param {string} [options.subConf=''] - If provided, creates a sub-configuration for a deployId.
-     * @returns {Promise<void>} A promise that resolves when the operation is complete.
+     * Initializes a new Underpost repository, optionally setting up a deploy ID or sub-configuration.
+     * @param {string} [projectName=''] - The name of the project to create.
+     * @param {object} [options={ deployId: '', subConf: '', cluster: false, dev: false }] - Initialization options.
+     * @param {string} [options.deployId=''] - The deployment ID to set up.
+     * @param {string} [options.subConf=''] - The sub-configuration to create.
+     * @param {boolean} [options.cluster=false] - If true, sets up a clustered configuration.
+     * @param {boolean} [options.dev=false] - If true, uses development settings.
+     * @returns {Promise<boolean>} A promise that resolves when the initialization is complete.
      * @memberof UnderpostRepository
      */
-    new(repositoryName, options = { dev: false, deployId: false, cluster: false, subConf: '' }) {
+    new(projectName, options = { deployId: '', subConf: '', cluster: false, dev: false }) {
       return new Promise(async (resolve, reject) => {
         try {
           await logger.setUpInfo();
           actionInitLog();
-          if (options.subConf && typeof options.subConf === 'string') {
-            const deployId = repositoryName;
-            logger.info('Creating sub conf', {
-              deployId,
-              subConf: options.subConf,
-            });
-            fs.copySync(
-              `./engine-private/conf/${deployId}/conf.server.json`,
-              `./engine-private/conf/${deployId}/conf.server.dev.${options.subConf}.json`,
-            );
-            return resolve();
+          if (options.deployId) {
+            Config.deployIdFactory(options.deployId, options);
+            return resolve(true);
           }
-          if (repositoryName === 'service')
-            return resolve(
-              await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), ':'),
-            );
-          if (options.deployId === true) return Config.deployIdFactory(repositoryName, options);
-          const npmRoot = getNpmRootPath();
-          const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
-          const destFolder = `./${repositoryName}`;
-          logger.info('Note: This process may take several minutes to complete');
-          logger.info('build app', { destFolder });
-          if (fs.existsSync(destFolder)) fs.removeSync(destFolder);
-          fs.mkdirSync(destFolder, { recursive: true });
-          if (!options.dev) {
-            fs.copySync(underpostRoot, destFolder);
-            fs.writeFileSync(
-              `${destFolder}/.gitignore`,
-              fs.readFileSync(`${underpostRoot}/.dockerignore`, 'utf8'),
-              'utf8',
-            );
-            shellExec(`cd ${destFolder} && git init && git add . && git commit -m "Base template implementation"`);
+          if (projectName) {
+            const npmRoot = getNpmRootPath();
+            const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
+            const destFolder = `./${projectName}`;
+            logger.info('Note: This process may take several minutes to complete');
+            logger.info('build app', { destFolder });
+            if (fs.existsSync(destFolder)) fs.removeSync(destFolder);
+            fs.mkdirSync(destFolder, { recursive: true });
+            if (!options.dev) {
+              fs.copySync(underpostRoot, destFolder);
+              fs.writeFileSync(
+                `${destFolder}/.gitignore`,
+                fs.readFileSync(`${underpostRoot}/.dockerignore`, 'utf8'),
+                'utf8',
+              );
+              shellExec(`cd ${destFolder} && git init && git add . && git commit -m "Base template implementation"`);
+            }
+            shellExec(`cd ${destFolder} && npm run build`);
+            shellExec(`cd ${destFolder} && npm run dev`);
           }
-          shellExec(`cd ${destFolder} && npm run build`);
-          shellExec(`cd ${destFolder} && npm run dev`);
-          return resolve();
+          return resolve(true);
         } catch (error) {
+          console.log(error);
           logger.error(error, error.stack);
-          return reject(error.message);
+          return reject(false);
         }
       });
     },