underpost 2.8.857 → 2.8.858

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

@@ -8,7 +8,7 @@ on:
 
 jobs:
   after-publish:
-    if: github.repository == 'underpostnet/pwa-microservices-template'
+    if: github.repository == 'underpostnet/pwa-microservices-template' || startsWith(github.event.head_commit.message, 'cd(ssh-release)')
     runs-on: ubuntu-latest
     steps:
       - name: Run remote deploy via SSH
@@ -33,4 +33,5 @@ jobs:
             underpost config set GITHUB_TOKEN ${{ secrets.GITHUB_TOKEN }}
             node bin run --dev pull
             underpost run secret
+            underpost run underpost-config
             underpost run release-deploy

package/README.md

@@ -21,10 +21,12 @@
 
 
 
+
+
 <!-- 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.8.857)](https://socket.dev/npm/package/underpost/overview/2.8.857) [![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.8.858)](https://socket.dev/npm/package/underpost/overview/2.8.858) [![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 -->
@@ -34,6 +36,8 @@
 
 
 
+
+
 </div>
 
 <div align="center">
@@ -78,7 +82,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.857
+## underpost ci/cd cli v2.8.858
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -383,7 +383,7 @@ try {
     }
 
     case 'version-build': {
-      shellExec(`node bin clean-core-repo`);
+      shellExec(`node bin/deploy clean-core-repo`);
       shellCd(`/home/dd/engine`);
       const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
       const newVersion = process.argv[3] ?? originPackageJson.version;

package/bin/file.js

@@ -55,7 +55,15 @@ try {
 
       console.log('copy paths', result);
 
-      if (type !== 'update-template') fs.removeSync(toPath);
+      if (type === 'update-template') {
+        if (!fs.existsSync(toPath)) shellExec(`cd .. && underpost clone underpostnet/pwa-microservices-template`);
+        else {
+          shellExec(`cd ${toPath} && git reset && git checkout . && git clean -f -d`);
+          shellExec(`underpost pull ${toPath} underpostnet/pwa-microservices-template`);
+        }
+      } else {
+        fs.removeSync(toPath);
+      }
 
       for (const copyPath of result) {
         const folder = getDirname(`${toPath}/${copyPath}`);

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.857
+## underpost ci/cd cli v2.8.858
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -442,6 +442,8 @@ Options:
   --export     Exports to local storage.
   --crons      Apply to cron data collection
   --instances  Apply to instance data collection
+  --generate   Generate cluster metadata
+  --itc        Apply under container execution context
   -h, --help   display help for command
  
 ```
@@ -483,8 +485,8 @@ updates.
 Arguments:
   deploy-list  A comma-separated list of deployment IDs (e.g.,
                "default-a,default-b").
-  job-list     A comma-separated list of job IDs. Options: callback. Defaults
-               to all available jobs.
+  job-list     A comma-separated list of job IDs. Options: callback,
+               getRelatedDeployId. Defaults to all available jobs.
 
 Options:
   --itc        Executes cron jobs within the container execution context.
@@ -591,7 +593,7 @@ Options:
 Runs a script from the specified path.
 
 Arguments:
-  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, cyberia-ide, engine-ide, template-deploy, clean, pull, release-deploy, ssh-deploy, ide, monitor, db-client, cluster, deploy, 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, cyberia-ide, engine-ide, template-deploy, clean, pull, release-deploy, ssh-deploy, ide, dev-client, dev-api, monitor, db-client, cluster, deploy, 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.8.857
+          image: localhost/rockylinux9-underpost:v2.8.858
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.857
+          image: localhost/rockylinux9-underpost:v2.8.858
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/package.json

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

package/src/cli/cron.js

@@ -21,7 +21,6 @@ const logger = loggerFactory(import.meta);
  * @memberof UnderpostCron
  */
 class UnderpostCron {
-  static NETWORK = [];
   static JOB = {
     /**
      * DNS cli API
@@ -53,7 +52,6 @@ class UnderpostCron {
       options = { itc: false, init: false, git: false },
     ) {
       if (options.init === true) {
-        UnderpostCron.NETWORK = [];
         const jobDeployId = fs.readFileSync('./engine-private/deploy/dd.cron', 'utf8').trim();
         deployList = fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').trim();
         const confCronConfig = JSON.parse(fs.readFileSync(`./engine-private/conf/${jobDeployId}/conf.cron.json`));
@@ -62,21 +60,8 @@ class UnderpostCron {
             const name = `${jobDeployId}-${job}`;
             let deployId;
             shellExec(Cmd.delete(name));
-            switch (job) {
-              case 'dns':
-                deployId = jobDeployId;
-                break;
-
-              default:
-                deployId = deployList;
-                break;
-            }
+            deployId = UnderpostCron.API.getRelatedDeployId(job);
             shellExec(Cmd.cron(deployId, job, name, confCronConfig.jobs[job].expression, options));
-            UnderpostCron.NETWORK.push({
-              deployId,
-              jobId: job,
-              expression: confCronConfig.jobs[job].expression,
-            });
           }
         }
         if (fs.existsSync(`./tmp/await-deploy`)) fs.remove(`./tmp/await-deploy`);
@@ -87,6 +72,16 @@ class UnderpostCron {
         if (UnderpostCron.JOB[jobId]) await UnderpostCron.JOB[jobId].callback(deployList, options);
       }
     },
+    getRelatedDeployId(jobId) {
+      switch (jobId) {
+        case 'dns':
+          return fs.readFileSync('./engine-private/deploy/dd.cron', 'utf8').trim();
+        case 'backup':
+          return fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').trim();
+        default:
+          return fs.readFileSync('./engine-private/deploy/dd.cron', 'utf8').trim();
+      }
+    },
   };
 }
 

package/src/cli/db.js

@@ -4,6 +4,8 @@ import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
 import UnderpostDeploy from './deploy.js';
 import UnderpostCron from './cron.js';
+import { DataBaseProvider } from '../db/DataBaseProvider.js';
+import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -217,28 +219,29 @@ class UnderpostDB {
         }
       }
     },
-    async updateDashboardData(
+    async clusterMetadataFactory(
       deployId = process.env.DEFAULT_DEPLOY_ID,
       host = process.env.DEFAULT_DEPLOY_HOST,
       path = process.env.DEFAULT_DEPLOY_PATH,
     ) {
-      try {
-        deployId = deployId ?? process.env.DEFAULT_DEPLOY_ID;
-        host = host ?? process.env.DEFAULT_DEPLOY_HOST;
-        path = path ?? process.env.DEFAULT_DEPLOY_PATH;
-
-        const { db } = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'))[host][
-          path
-        ];
+      deployId = deployId ?? process.env.DEFAULT_DEPLOY_ID;
+      host = host ?? process.env.DEFAULT_DEPLOY_HOST;
+      path = path ?? process.env.DEFAULT_DEPLOY_PATH;
+      const env = 'production';
+      const deployList = fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').split(',');
 
-        await DataBaseProvider.load({ apis: ['instance'], host, path, db });
+      const { db } = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'))[host][
+        path
+      ];
+      try {
+        await DataBaseProvider.load({ apis: ['instance', 'cron'], host, path, db });
 
         /** @type {import('../api/instance/instance.model.js').InstanceModel} */
         const Instance = DataBaseProvider.instance[`${host}${path}`].mongoose.models.Instance;
 
         await Instance.deleteMany();
 
-        for (const _deployId of deployList.split(',')) {
+        for (const _deployId of deployList) {
           const deployId = _deployId.trim();
           if (!deployId) continue;
           const confServer = loadReplicas(
@@ -252,34 +255,45 @@ class UnderpostDB {
             for (const { path, port } of pathPortAssignmentData[host]) {
               if (!confServer[host][path]) continue;
 
-              const { client, runtime, apis } = confServer[host][path];
-
-              const body = {
-                deployId,
-                host,
-                path,
-                port,
-                client,
-                runtime,
-                apis,
-              };
-
-              logger.info('save', body);
+              const { client, runtime, apis, peer } = confServer[host][path];
+              {
+                const body = {
+                  deployId,
+                  host,
+                  path,
+                  port,
+                  client,
+                  runtime,
+                  apis,
+                };
+
+                logger.info('Instance save', body);
+                await new Instance(body).save();
+              }
 
-              await new Instance(body).save();
+              if (peer) {
+                const body = {
+                  deployId,
+                  host,
+                  path: path === '/' ? '/peer' : `${path}/peer`,
+                  port: port + 1,
+                  runtime: 'nodejs',
+                };
+
+                logger.info('Instance save', body);
+                await new Instance(body).save();
+              }
             }
           }
         }
-
-        await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
       } catch (error) {
         logger.error(error, error.stack);
       }
 
       try {
-        const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
-        const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
-        const { db } = confServer[host][path];
+        const cronDeployId = fs.readFileSync('./engine-private/deploy/dd.cron', 'utf8').trim();
+        const confCronPath = `./engine-private/conf/${cronDeployId}/conf.cron.json`;
+        const confCron = JSON.parse(fs.readFileSync(confCronPath, 'utf8'));
 
         await DataBaseProvider.load({ apis: ['cron'], host, path, db });
 
@@ -288,21 +302,28 @@ class UnderpostDB {
 
         await Cron.deleteMany();
 
-        for (const cronInstance of UnderpostCron.NETWORK) {
-          logger.info('save', cronInstance);
-          await new Cron(cronInstance).save();
+        for (const jobId of Object.keys(confCron.jobs)) {
+          const body = {
+            jobId,
+            deployId: UnderpostCron.API.getRelatedDeployId(jobId),
+            expression: confCron.jobs[jobId].expression,
+            enabled: confCron.jobs[jobId].enabled,
+          };
+          logger.info('Cron save', body);
+          await new Cron(body).save();
         }
-
-        await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
       } catch (error) {
         logger.error(error, error.stack);
       }
+      await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
     },
     clusterMetadataBackupCallback(
       deployId = process.env.DEFAULT_DEPLOY_ID,
       host = process.env.DEFAULT_DEPLOY_HOST,
       path = process.env.DEFAULT_DEPLOY_PATH,
       options = {
+        generate: false,
+        itc: false,
         import: false,
         export: false,
         instances: false,
@@ -313,6 +334,10 @@ class UnderpostDB {
       host = host ?? process.env.DEFAULT_DEPLOY_HOST;
       path = path ?? process.env.DEFAULT_DEPLOY_PATH;
 
+      if (options.generate === true) {
+        UnderpostDB.API.clusterMetadataFactory(deployId, host, path);
+      }
+
       if (options.instances === true) {
         const outputPath = './engine-private/instances';
         if (fs.existsSync(outputPath)) fs.mkdirSync(outputPath, { recursive: true });

package/src/cli/deploy.js

@@ -323,10 +323,7 @@ Password: <Your Key>
         logger.info('router', await UnderpostDeploy.API.routerFactory(deployList, env));
         return;
       }
-      shellExec(`kubectl delete configmap underpost-config`);
-      shellExec(
-        `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env}`,
-      );
+      UnderpostDeploy.API.configMap(env);
       let renderHosts = '';
       let concatHots = '';
       const etcHost = (
@@ -477,6 +474,12 @@ Password: <Your Key>
       }
       return { ready: notReadyPods.length === 0, notReadyPods, readyPods };
     },
+    configMap(env) {
+      shellExec(`kubectl delete configmap underpost-config`);
+      shellExec(
+        `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env}`,
+      );
+    },
   };
 }
 

package/src/cli/index.js

@@ -249,6 +249,8 @@ program
   .option('--export', 'Exports to local storage.')
   .option('--crons', 'Apply to cron data collection')
   .option('--instances', 'Apply to instance data collection')
+  .option('--generate', 'Generate cluster metadata')
+  .option('--itc', 'Apply under container execution context')
   .description('Manages cluster metadata operations, including import and export.')
   .action(Underpost.db.clusterMetadataBackupCallback);
 

package/src/cli/monitor.js

@@ -120,10 +120,7 @@ class UnderpostMonitor {
                           fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
                         );
 
-                        shellExec(`kubectl delete configmap underpost-config`);
-                        shellExec(
-                          `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env}`,
-                        );
+                        UnderpostDeploy.API.configMap(env);
 
                         for (const host of Object.keys(confServer)) {
                           shellExec(`sudo kubectl delete HTTPProxy ${host}`);

package/src/cli/run.js

@@ -54,6 +54,9 @@ class UnderpostRun {
         }`,
       );
     },
+    'underpost-config': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      UnderpostDeploy.API.configMap(path ?? 'production');
+    },
     'gpu-env': (path, options = UnderpostRun.DEFAULT_OPTION) => {
       shellExec(
         `node bin cluster --dev --reset && node bin cluster --dev --dedicated-gpu --kubeadm && kubectl get pods --all-namespaces -o wide -w`,
@@ -128,6 +131,16 @@ class UnderpostRun {
       const { underpostRoot } = options;
       shellExec(`node ${underpostRoot}/bin/vs ${path}`);
     },
+    'dev-client': (_path, options = UnderpostRun.DEFAULT_OPTION) => {
+      let [deployId, hostpath, subConf, lite] = _path.split(',');
+      let [host, path] = hostpath.split('/');
+      if (!path) path = '/';
+      shellExec(`npm run dev-client ${deployId} ${host} ${path} ${subConf} static${lite === 'l' ? ' l' : ''}`);
+    },
+    'dev-api': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      let [deployId, subConf] = path.split(',');
+      shellExec(`npm run dev-api ${deployId} ${subConf}`);
+    },
     monitor: (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const pid = getTerminalPid();
       logger.info('monitor pid', pid);

package/src/index.js

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

package/src/server/client-build-live.js

@@ -59,7 +59,7 @@ const clientLiveBuild = async () => {
     const updates = JSON.parse(fs.readFileSync(`./tmp/client.build.json`, 'utf8'));
     const liveClientBuildPaths = [];
     for (let srcPath of updates) {
-      srcPath = srcPath.replaceAll('/', `\\`); // linux case
+      srcPath = srcPath.replaceAll('/', `\\`);
 
       const srcBuildPath = `./src${srcPath.split('src')[1].replace(/\\/g, '/')}`;
       if (

package/src/server/client-dev-server.js

@@ -7,7 +7,7 @@ const logger = loggerFactory(import.meta);
 
 const createClientDevServer = () => {
   // process.argv.slice(2).join(' ')
-  shellExec(`env-cmd -f .env.development node bin/deploy build-full-client ${process.argv.slice(2).join(' ')} l`);
+  shellExec(`env-cmd -f .env.development node bin/deploy build-full-client ${process.argv.slice(2).join(' ')}`);
   shellExec(
     `env-cmd -f .env.development node src/api ${process.argv[2]}${process.argv[5] ? ` ${process.argv[5]}` : ''}${
       process.argv.includes('static') ? ' static' : ''