underpost 2.85.0 → 2.85.1

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

@@ -28,18 +28,9 @@ jobs:
           script: |
             set -e
             echo "Starting remote release deploy"
-            cd /home/dd/engine
-            npm install -g underpost
-            underpost run secret
             underpost run pull
+            underpost run git-conf
             underpost run secret
-            node bin run git-conf
-            node bin run template-deploy-image
-            underpost config set GITHUB_USERNAME underpostnet
-            mkdir -p /home/dd
-            sudo rm -rf /home/dd/engine
-            cd /home/dd
-            underpost clone underpostnet/engine
-            cd engine
-            npm install
-            node bin run ssh-deploy sync-engine-test
+            cd /home/dd/engine
+            underpost run template-deploy-image
+            underpost run ssh-deploy sync-engine-test

package/Dockerfile

@@ -34,7 +34,9 @@ RUN npm --version
 RUN npm install -g underpost
 RUN underpost --version
 
-# Set working directory
+# Create working directory
+RUN mkdir /home/dd
+VOLUME /home/dd
 WORKDIR /home/dd
 
 # Expose necessary ports

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.0)](https://socket.dev/npm/package/underpost/overview/2.85.0) [![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.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)
 
 <!-- end-badges -->
 
@@ -66,7 +66,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.85.0
+## underpost ci/cd cli v2.85.1
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/zed.js

@@ -1,11 +1,14 @@
 import { shellExec } from '../src/server/process.js';
 import fs from 'fs-extra';
 import { loggerFactory } from '../src/server/logger.js';
+import { getUnderpostRootPath } from '../src/server/conf.js';
 
 const logger = loggerFactory(import.meta);
+const underpostRoot = getUnderpostRootPath();
 
-fs.copyFileSync(`./.vscode/zed.settings.json`, `/root/.config/zed/settings.json`);
-fs.copyFileSync(`./.vscode/zed.keymap.json`, `/root/.config/zed/keymap.json`);
+if (!fs.existsSync('/root/.config/zed')) fs.mkdirSync('/root/.config/zed', { recursive: true });
+fs.copyFileSync(`${underpostRoot}/.vscode/zed.settings.json`, `/root/.config/zed/settings.json`);
+fs.copyFileSync(`${underpostRoot}/.vscode/zed.keymap.json`, `/root/.config/zed/keymap.json`);
 
 shellExec(`ZED_ALLOW_ROOT=true zed ${process.argv[2] ? process.argv[2] : '.'}`);
 

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.85.0
+## underpost ci/cd cli v2.85.1
 
 ### Usage: `underpost [options] [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, monitor, db-client, git-conf, promote, metrics, cluster, deploy, 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, host-update, dev-container, monitor, db-client, git-conf, promote, metrics, cluster, deploy, service, sync-replica, tf-vae-test, deploy-job.
   path                                     The absolute or relative directory path where the script is located.
 
 Options:

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.0
+          image: localhost/rockylinux9-underpost:v2.85.1
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.85.0
+          image: localhost/rockylinux9-underpost:v2.85.1
           #          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.0
+          image: localhost/rockylinux9-underpost:v2.85.1
 #          resources:
 #            requests:
 #              memory: "96294Ki"
@@ -104,7 +104,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.85.0
+          image: localhost/rockylinux9-underpost:v2.85.1
 #          resources:
 #            requests:
 #              memory: "96294Ki"

package/manifests/deployment/mongo-express/deployment.yaml

@@ -30,6 +30,8 @@ spec:
             #     secretKeyRef:
             #       name: mongodb-secret
             #       key: password
+            - name: ME_CONFIG_SITE_BASEURL
+              value: '/mongo/'
             - name: ME_CONFIG_BASICAUTH_USERNAME
               valueFrom:
                 secretKeyRef:

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.85.0",
+    "version": "2.85.1",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/cli/deploy.js

@@ -85,21 +85,28 @@ class UnderpostDeploy {
     /**
      * Creates a YAML service configuration for a deployment.
      * @param {string} deployId - Deployment ID for which the service is being created.
+     * @param {string} path - Path for which the service is being created.
      * @param {string} env - Environment for which the service is being created.
      * @param {number} port - Port number for the service.
      * @param {Array<string>} deploymentVersions - List of deployment versions.
      * @returns {string} - YAML service configuration for the specified deployment.
+     * @param {string} [serviceId] - Custom service name (optional).
      * @memberof UnderpostDeploy
      */
-    deploymentYamlServiceFactory({ deployId, env, port, deploymentVersions }) {
-      return deploymentVersions
-        .map(
-          (version, i) => `    - name: ${deployId}-${env}-${version}-service
+    deploymentYamlServiceFactory({ deployId, path, env, port, deploymentVersions, serviceId }) {
+      return `
+    - conditions:
+        - prefix: ${path}
+      enableWebsockets: true
+      services:
+    ${deploymentVersions
+      .map(
+        (version, i) => `    - name: ${serviceId ? serviceId : `${deployId}-${env}-${version}-service`}
           port: ${port}
           weight: ${i === 0 ? 100 : 0}
     `,
-        )
-        .join('');
+      )
+      .join('')}`;
     },
     /**
      * Creates a YAML deployment configuration for a deployment.
@@ -214,6 +221,9 @@ ${UnderpostDeploy.API.deploymentYamlPartsFactory({
 
         let proxyYaml = '';
         let secretYaml = '';
+        const customServices = fs.existsSync(`./engine-private/conf/${deployId}/conf.services.json`)
+          ? JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.services.json`))
+          : [];
 
         for (const host of Object.keys(confServer)) {
           if (env === 'production') secretYaml += UnderpostDeploy.API.buildCertManagerCertificate({ host });
@@ -236,20 +246,33 @@ spec:
       secretName: ${host}`
     }
   routes:`;
+          const deploymentVersions =
+            options.traffic && typeof options.traffic === 'string' ? options.traffic.split(',') : ['blue'];
           for (const conditionObj of pathPortAssignment) {
             const { path, port } = conditionObj;
-            proxyYaml += `
-    - conditions:
-        - prefix: ${path}
-      enableWebsockets: true
-      services:
-    ${UnderpostDeploy.API.deploymentYamlServiceFactory({
-      deployId,
-      env,
-      port,
-      deploymentVersions:
-        options.traffic && typeof options.traffic === 'string' ? options.traffic.split(',') : ['blue'],
-    })}`;
+            proxyYaml += UnderpostDeploy.API.deploymentYamlServiceFactory({
+              path,
+              deployId,
+              env,
+              port,
+              deploymentVersions,
+            });
+          }
+          for (const customService of customServices) {
+            const { path: _path, port, serviceId, host: _host } = customService;
+            if (host === _host) {
+              switch (serviceId) {
+                case 'mongo-express-service': {
+                  proxyYaml += UnderpostDeploy.API.deploymentYamlServiceFactory({
+                    path: _path,
+                    port,
+                    serviceId,
+                    deploymentVersions,
+                  });
+                  break;
+                }
+              }
+            }
           }
         }
         const yamlPath = `./engine-private/conf/${deployId}/build/${env}/proxy.yaml`;
@@ -579,6 +602,23 @@ EOF`);
      * @memberof UnderpostDeploy
      */
     existsContainerFile({ podName, path }) {
+      if (podName === 'kind-worker') {
+        const isFile = JSON.parse(
+          shellExec(`docker exec ${podName} sh -c 'test -f "$1" && echo true || echo false' sh ${path}`, {
+            stdout: true,
+            disableLog: true,
+            silent: true,
+          }).trim(),
+        );
+        const isFolder = JSON.parse(
+          shellExec(`docker exec ${podName} sh -c 'test -d "$1" && echo true || echo false' sh ${path}`, {
+            stdout: true,
+            disableLog: true,
+            silent: true,
+          }).trim(),
+        );
+        return isFolder || isFile;
+      }
       return JSON.parse(
         shellExec(`kubectl exec ${podName} -- test -f ${path} && echo "true" || echo "false"`, {
           stdout: true,
@@ -704,6 +744,61 @@ EOF`);
       }
       logger.info(`${iteratorTag} | Deployment ready. | Total delay number check iterations: ${checkStatusIteration}`);
     },
+
+    /**
+     * Retrieves the currently loaded images in the Kubernetes cluster.
+     * @returns {Array<object>} - Array of objects containing pod names and their corresponding images.
+     * @memberof UnderpostDeploy
+     */
+    getCurrentLoadedImages(node = 'kind-worker', specContainers = false) {
+      if (specContainers) {
+        const raw = shellExec(
+          `kubectl get pods --all-namespaces -o=jsonpath='{range .items[*]}{"\\n"}{.metadata.name}{":\\t"}{range .spec.containers[*]}{.image}{", "}{end}{end}'`,
+          {
+            stdout: true,
+            silent: true,
+          },
+        );
+        return raw
+          .split(`\n`)
+          .map((lines) => ({
+            pod: lines.split('\t')[0].replaceAll(':', '').trim(),
+            image: lines.split('\t')[1] ? lines.split('\t')[1].replaceAll(',', '').trim() : null,
+          }))
+          .filter((o) => o.image);
+      }
+      if (node === 'kind-worker') {
+        const raw = shellExec(`docker exec -i kind-control-plane crictl images`, {
+          stdout: true,
+          silent: true,
+        });
+
+        const heads = raw
+          .split(`\n`)[0]
+          .split(' ')
+          .filter((_r) => _r.trim());
+
+        const pods = raw
+          .split(`\n`)
+          .filter((r) => !r.match('IMAGE'))
+          .map((r) => r.split(' ').filter((_r) => _r.trim()));
+
+        const result = [];
+
+        for (const row of pods) {
+          if (row.length === 0) continue;
+          const pod = {};
+          let index = -1;
+          for (const head of heads) {
+            if (head in pod) continue;
+            index++;
+            pod[head] = row[index];
+          }
+          result.push(pod);
+        }
+        return result;
+      }
+    },
   };
 }
 

package/src/cli/image.js

@@ -53,7 +53,7 @@ class UnderpostImage {
         const baseCommand = options.dev ? 'node bin' : 'underpost';
         const baseCommandOption = options.dev ? ' --dev' : '';
         const IMAGE_NAME = `rockylinux9-underpost`;
-        const IMAGE_NAME_FULL = `${IMAGE_NAME}:${options.version ?? Underpost.version}`;
+        const IMAGE_NAME_FULL = `${IMAGE_NAME}:${options.version ? options.version : Underpost.version}`;
         let LOAD_TYPE = '';
         if (options.kindLoad === true) {
           LOAD_TYPE = `--kind-load`;
@@ -105,7 +105,7 @@ class UnderpostImage {
           dev: false,
         },
       ) {
-        const {
+        let {
           path,
           imageName,
           imagePath,
@@ -119,6 +119,7 @@ class UnderpostImage {
           reset,
           dev,
         } = options;
+        if (!path) path = '.';
         const podManImg = `localhost/${imageName}`;
         if (imagePath && typeof imagePath === 'string' && !fs.existsSync(imagePath))
           fs.mkdirSync(imagePath, { recursive: true });

package/src/cli/repository.js

@@ -111,8 +111,10 @@ class UnderpostRepository {
     ) {
       if (!repoPath) repoPath = '.';
       if (options.msg) {
-        let key = Object.keys(commitData).find((k) => k && options.msg.toLocaleLowerCase().match(k));
-        if (!key) key == 'chore';
+        options.msg = options.msg.replaceAll('"', '').replaceAll(`'`, '').replaceAll('`', '');
+        let key = Object.keys(commitData).find((k) => k && options.msg.toLocaleLowerCase().slice(0, 16).match(k));
+        if (!key) key = Object.keys(commitData).find((k) => k && options.msg.toLocaleLowerCase().match(k));
+        if (!key || key === undefined) key = 'chore';
         shellExec(
           `underpost cmt ${repoPath} ${key} ${options.deployId ? options.deployId : `''`} '${options.msg.replaceAll(`${key}(${key}`, '')}'`,
         );

package/src/cli/run.js

@@ -274,7 +274,7 @@ class UnderpostRun {
      * @param {Object} options - The default underpost runner options for customizing workflow
      * @memberof UnderpostRun
      */
-    'template-deploy': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+    'template-deploy': (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
       const baseCommand = options.dev ? 'node bin' : 'underpost';
       shellExec(`${baseCommand} run clean`);
       shellExec(
@@ -314,16 +314,23 @@ class UnderpostRun {
     },
     /**
      * @method pull
-     * @description Cleans the core repository and pulls the latest content for `engine` and `engine-private` repositories from the remote.
+     * @description Clones or pulls updates for the `engine` and `engine-private` repositories into `/home/dd/engine` and `/home/dd/engine/engine-private`.
      * @param {string} path - The input value, identifier, or path for the operation.
      * @param {Object} options - The default underpost runner options for customizing workflow
      * @memberof UnderpostRun
      */
     pull: (path, options = UnderpostRun.DEFAULT_OPTION) => {
-      shellCd(`/home/dd/engine`);
-      shellExec(`node bin/deploy clean-core-repo`);
-      shellExec(`underpost pull . ${process.env.GITHUB_USERNAME}/engine`);
-      shellExec(`underpost pull ./engine-private ${process.env.GITHUB_USERNAME}/engine-private`);
+      if (!fs.existsSync(`/home/dd`) || !fs.existsSync(`/home/dd/engine`)) {
+        fs.mkdirSync(`/home/dd`, { recursive: true });
+        shellExec(`cd /home/dd && underpost clone ${process.env.GITHUB_USERNAME}/engine`);
+      } else {
+        shellExec(`underpost run clean`);
+        shellExec(`cd /home/dd/engine && underpost pull . ${process.env.GITHUB_USERNAME}/engine`);
+      }
+      if (!fs.existsSync(`/home/dd/engine/engine-private`))
+        shellExec(`cd /home/dd/engine && underpost clone ${process.env.GITHUB_USERNAME}/engine-private`);
+      else
+        shellExec(`cd /home/dd/engine/engine-private underpost pull . ${process.env.GITHUB_USERNAME}/engine-private`);
     },
     /**
      * @method release-deploy
@@ -412,7 +419,7 @@ class UnderpostRun {
 
       shellExec(
         `${baseCommand} deploy --kubeadm --build-manifest --sync --info-router --replicas ${
-          replicas ?? 1
+          replicas ? replicas : 1
         } --node ${node}${image ? ` --image ${image}` : ''}${versions ? ` --versions ${versions}` : ''} dd ${env}`,
       );
 
@@ -447,6 +454,43 @@ class UnderpostRun {
       shellExec(`${options.underpostRoot}/scripts/rocky-setup.sh --yes${options.dev ? ' --install-dev' : ``}`);
     },
 
+    /**
+     * @method dev-container
+     * @description Runs a development container pod named `underpost-dev-container` with specified volume mounts and opens a terminal to follow its logs.
+     * @param {string} path - The input value, identifier, or path for the operation (used as an optional command to run inside the container).
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    'dev-container': async (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
+      options.dev = true;
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
+      const baseClusterCommand = options.dev ? ' --dev' : '';
+      const currentImage = UnderpostDeploy.API.getCurrentLoadedImages('kind-worker', false).find((o) =>
+        o.IMAGE.match('underpost'),
+      );
+      const podName = `underpost-dev-container`;
+      if (!UnderpostDeploy.API.existsContainerFile({ podName: 'kind-worker', path: '/home/dd/engine' })) {
+        shellExec(`docker exec -i kind-worker bash -c "mkdir -p /home/dd"`);
+        shellExec(`docker cp /home/dd/engine kind-worker:/home/dd/engine`);
+        shellExec(`docker exec -i kind-worker bash -c "chown -R 1000:1000 /home/dd || true; chmod -R 755 /home/dd"`);
+      }
+      if (!currentImage) shellExec(`${baseCommand} dockerfile-pull-base-images${baseClusterCommand} --kind-load`);
+      // shellExec(`kubectl delete pod ${podName} --ignore-not-found`);
+      await UnderpostRun.RUNNERS['deploy-job']('', {
+        dev: true,
+        podName,
+        imageName: currentImage ? currentImage.image : `localhost/rockylinux9-underpost:${Underpost.version}`,
+        volumeHostPath: '/home/dd',
+        volumeMountPath: '/home/dd',
+        on: {
+          init: async () => {
+            // openTerminal(`kubectl logs -f ${podName}`);
+          },
+        },
+        args: [daemonProcess(path ? path : `cd /home/dd/engine && npm run test`)],
+      });
+    },
+
     /**
      * @method monitor
      * @description Monitors a specific pod (identified by `path`) for the existence of a file (`/await`), and performs conditional actions (like file copying and opening Firefox) when the file is removed.
@@ -706,6 +750,64 @@ class UnderpostRun {
       UnderpostDeploy.API.switchTraffic(deployId, env, targetTraffic);
     },
 
+    /**
+     * @method service
+     * @description Deploys and exposes specific services (like `mongo-express-service`) on the cluster, updating deployment configurations and monitoring status.
+     * @param {string} path - The input value, identifier, or path for the operation (formatted as `deployId,serviceId,host,path,replicas,image,node`).
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    service: async (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
+      const env = options.dev ? 'development' : 'production';
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
+      // const baseClusterCommand = options.dev ? ' --dev' : '';
+      shellCd(`/home/dd/engine`);
+      let [deployId, serviceId, host, _path, replicas, image, node] = path.split(',');
+      const services = fs.existsSync(`./engine-private/deploy/${deployId}/conf.services.json`)
+        ? JSON.parse(fs.readFileSync(`./engine-private/deploy/${deployId}/conf.services.json`, 'utf8'))
+        : [];
+      switch (serviceId) {
+        case 'mongo-express-service': {
+          let serviceData = services.findIndex((s) => s.serviceId === serviceId);
+          const payload = {
+            serviceId,
+            path: _path,
+            port: 8081,
+            host,
+          };
+          if (serviceData == -1) {
+            services.push(payload);
+          } else {
+            services[serviceData] = payload;
+          }
+          fs.writeFileSync(
+            `./engine-private/conf/${deployId}/conf.services.json`,
+            JSON.stringify(services, null, 4),
+            'utf8',
+          );
+          shellExec(`kubectl delete svc mongo-express-service --ignore-not-found`);
+          shellExec(`kubectl delete deployment mongo-express --ignore-not-found`);
+          shellExec(`kubectl apply -f manifests/deployment/mongo-express/deployment.yaml`);
+
+          const success = await UnderpostTest.API.statusMonitor('mongo-express');
+
+          if (success) {
+            const versions = UnderpostDeploy.API.getCurrentTraffic(deployId) || 'blue';
+            if (!node) node = os.hostname();
+            shellExec(
+              `${baseCommand} deploy --kubeadm --build-manifest --sync --info-router --replicas ${
+                replicas ? replicas : 1
+              } --node ${node}${image ? ` --image ${image}` : ''}${versions ? ` --versions ${versions}` : ''} dd ${env}`,
+            );
+            shellExec(
+              `${baseCommand} deploy --kubeadm --disable-update-deployment ${deployId} ${env} --versions ${versions}`,
+            );
+          } else logger.error('Mongo Express deployment failed');
+          break;
+        }
+      }
+    },
+
     /**
      * @method sync-replica
      * @description Syncs a replica for the dd.router

package/src/index.js

@@ -35,7 +35,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.85.0';
+  static version = 'v2.85.1';
   /**
    * Repository cli API
    * @static