underpost 2.8.857 → 2.8.861

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,19 @@ 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}`,
+      );
+    },
+    switchTraffic(deployId, env, targetTraffic, replicas = 1) {
+      UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, targetTraffic);
+      shellExec(
+        `node bin deploy --info-router --build-manifest --traffic ${targetTraffic} --replicas ${replicas} ${deployId} ${env}`,
+      );
+      shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml`);
+    },
   };
 }
 

package/src/cli/index.js

@@ -23,6 +23,7 @@ program.name('underpost').description(`underpost ci/cd cli ${Underpost.version}`
 program
   .command('new')
   .argument('<app-name>', 'The name of the application to create.')
+  .option('--dev', 'Sets the development cli context')
   .description('Initializes a new Underpost project with a predefined structure.')
   .action(Underpost.repo.new);
 
@@ -249,6 +250,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/repository.js

@@ -80,7 +80,7 @@ class UnderpostRepository {
       );
     },
 
-    new(repositoryName) {
+    new(repositoryName, options = { dev: false }) {
       return new Promise(async (resolve, reject) => {
         try {
           await logger.setUpInfo();
@@ -89,15 +89,22 @@ class UnderpostRepository {
               await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), ':'),
             );
           else actionInitLog();
-          const exeRootPath = `${getNpmRootPath()}/underpost`;
+          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 });
-          fs.copySync(exeRootPath, destFolder);
-          fs.writeFileSync(`${destFolder}/.gitignore`, fs.readFileSync(`${exeRootPath}/.dockerignore`, 'utf8'), 'utf8');
-          shellExec(`cd ${destFolder} && git init && git add . && git commit -m "Base template implementation"`);
+          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`);
           return resolve();

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);
@@ -205,6 +218,34 @@ class UnderpostRun {
       const { underpostRoot } = options;
       shellExec(`kubectl apply -k ${underpostRoot}/manifests/deployment/adminer/.`);
     },
+    promote: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      let [inputDeployId, inputEnv, inputReplicas] = path.split(',');
+      if (!inputEnv) inputEnv = 'production';
+      if (!inputReplicas) inputReplicas = 1;
+      if (inputDeployId === 'dd') {
+        for (const deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',')) {
+          const currentTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId);
+          const targetTraffic = currentTraffic === 'blue' ? 'green' : 'blue';
+          UnderpostDeploy.API.switchTraffic(deployId, inputEnv, targetTraffic, inputReplicas);
+        }
+      } else {
+        const currentTraffic = UnderpostDeploy.API.getCurrentTraffic(inputDeployId);
+        const targetTraffic = currentTraffic === 'blue' ? 'green' : 'blue';
+        UnderpostDeploy.API.switchTraffic(inputDeployId, inputEnv, targetTraffic, inputReplicas);
+      }
+    },
+
+    metrics: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',');
+      let hosts = [];
+      for (const deployId of deployList) {
+        const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
+        hosts = hosts.concat(Object.keys(confServer));
+      }
+      shellExec(`node bin cluster --prom ${hosts.join(',')}`);
+      shellExec(`node bin cluster --grafana`);
+    },
+
     cluster: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',');
       const env = 'production';
@@ -255,14 +296,8 @@ class UnderpostRun {
 
       logger.info(`${iteratorTag} | Deployment ready. | Total delay number check iterations: ${checkStatusIteration}`);
 
-      UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, targetTraffic);
+      UnderpostDeploy.API.switchTraffic(deployId, env, targetTraffic);
 
-      shellExec(
-        `node bin deploy --info-router --build-manifest --traffic ${targetTraffic} --replicas ${
-          options.replicas ? options.replicas : 1
-        } ${deployId} ${env}`,
-      );
-      shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml`);
       shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${currentTraffic}`);
     },
     'tf-vae-test': async (path, options = UnderpostRun.DEFAULT_OPTION) => {

package/src/client/components/core/VanillaJs.js

@@ -457,6 +457,19 @@ const getLang = () =>
     .slice(0, 2)
     .toLowerCase();
 
+function hexToRgbA(hex) {
+  let c;
+  if (/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)) {
+    c = hex.substring(1).split('');
+    if (c.length == 3) {
+      c = [c[0], c[0], c[1], c[1], c[2], c[2]];
+    }
+    c = '0x' + c.join('');
+    return [(c >> 16) & 255, (c >> 8) & 255, c & 255];
+  }
+  throw new Error('Invalid Hex');
+}
+
 export {
   s,
   htmls,
@@ -486,4 +499,5 @@ export {
   isDevInstance,
   getDataFromInputFile,
   getLang,
+  hexToRgbA,
 };

package/src/index.js

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

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

@@ -159,7 +159,7 @@ const buildCoverage = async ({ host, path }) => {
     shellExec(`npm test`);
   }
 
-  const coverageBuildPath = `${jsDocsConfig.opts.destination}/coverage`;
+  const coverageBuildPath = `${jsDocsConfig.opts.destination}coverage`;
   fs.mkdirSync(coverageBuildPath, { recursive: true });
   fs.copySync(`./coverage`, coverageBuildPath);
 

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-build.js

@@ -535,7 +535,13 @@ Sitemap: https://${host}${path === '/' ? '' : path}/sitemap.xml`,
         );
       }
 
-      if (!enableLiveRebuild && !process.argv.includes('l') && !process.argv.includes('deploy') && docsBuild) {
+      if (
+        fullBuildEnabled &&
+        !enableLiveRebuild &&
+        !process.argv.includes('l') &&
+        !process.argv.includes('deploy') &&
+        docsBuild
+      ) {
         await buildDocs({
           host,
           path,

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' : ''

package/src/server/conf.js

@@ -35,10 +35,9 @@ const Config = {
     if (!deployContext) deployContext = process.argv[2];
     if (!fs.existsSync(`./tmp`)) fs.mkdirSync(`./tmp`, { recursive: true });
     fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
-    if (fs.existsSync(`./engine-private/conf/${deployContext}`))
-      return loadConf(deployContext, process.env.NODE_ENV, subConf);
     if (fs.existsSync(`./engine-private/replica/${deployContext}`))
       return loadConf(deployContext, process.env.NODE_ENV, subConf);
+    else if (deployContext.startsWith('dd-')) return loadConf(deployContext, process.env.NODE_ENV, subConf);
 
     if (deployContext === 'deploy') return;
 
@@ -104,6 +103,7 @@ const loadConf = (deployId, envInput, subConf) => {
     shellExec(`git checkout ${path}/package-lock.json`);
     return;
   }
+  if (!deployId.startsWith('dd-')) deployId = 'dd-default';
   const folder = fs.existsSync(`./engine-private/replica/${deployId}`)
     ? `./engine-private/replica/${deployId}`
     : `./engine-private/conf/${deployId}`;

package/src/server/start.js

@@ -79,11 +79,11 @@ class UnderpostStartUp {
         }
       }),
 
-    async callback(deployId = 'default', env = 'development', options = { build: false, run: false }) {
+    async callback(deployId = 'dd-default', env = 'development', options = { build: false, run: false }) {
       if (options.build === true) await UnderpostStartUp.API.build(deployId, env);
       if (options.run === true) await UnderpostStartUp.API.run(deployId, env);
     },
-    async build(deployId = 'default', env = 'development') {
+    async build(deployId = 'dd-default', env = 'development') {
       const buildBasePath = `/home/dd`;
       const repoName = `engine-${deployId.split('-')[1]}`;
       shellExec(`cd ${buildBasePath} && underpost clone underpostnet/${repoName}`);
@@ -100,7 +100,7 @@ class UnderpostStartUp {
       }
       shellExec(`node bin/deploy build-full-client ${deployId}`);
     },
-    async run(deployId = 'default', env = 'development') {
+    async run(deployId = 'dd-default', env = 'development') {
       const runCmd = env === 'production' ? 'run prod-img' : 'run dev-img';
       if (fs.existsSync(`./engine-private/replica`)) {
         const replicas = await fs.readdir(`./engine-private/replica`);