underpost 2.8.622 → 2.8.635

package/bin/index.js

@@ -220,4 +220,12 @@ program
   .option('--kind-type <kind-type>')
   .action(Underpost.test.callback);
 
+program
+  .command('monitor')
+  .argument('<deploy-id>', 'Deploy configuration id')
+  .argument('[env]', 'Optional environment, for default is development')
+  .description('Monitor health server management')
+  .option('--itc', 'Inside container execution context')
+  .action(Underpost.monitor.callback);
+
 program.parse();

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.622'
+      engine.version: '2.8.635'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.622",
+    "version": "2.8.635",
     "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

@@ -3,8 +3,10 @@ import {
   buildPortProxyRouter,
   buildProxyRouter,
   Config,
+  deployRangePortFactory,
   getDataDeploy,
   loadReplicas,
+  pathPortAssignmentFactory,
 } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
@@ -36,15 +38,13 @@ class UnderpostDeploy {
       for (const _deployId of deployList.split(',')) {
         const deployId = _deployId.trim();
         if (!deployId) continue;
-
-        const router = await UnderpostDeploy.API.routerFactory(deployId, env);
-        const ports = Object.values(router).map((p) => parseInt(p.split(':')[2]));
-        const fromPort = Math.min(...ports);
-        const toPort = Math.max(...ports);
         const confServer = loadReplicas(
           JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
           'proxy',
         );
+        const router = await UnderpostDeploy.API.routerFactory(deployId, env);
+        const pathPortAssignmentData = pathPortAssignmentFactory(router, confServer);
+        const { fromPort, toPort } = deployRangePortFactory(router);
 
         fs.mkdirSync(`./engine-private/conf/${deployId}/build/${env}`, { recursive: true });
         if (env === 'development') fs.mkdirSync(`./manifests/deployment/${deployId}-${env}`, { recursive: true });
@@ -141,27 +141,8 @@ spec:
     kind: ClusterIssuer
   secretName: ${host}`;
 
-          const pathPortConditions = [];
-          for (const path of Object.keys(confServer[host])) {
-            const { peer } = confServer[host][path];
-            if (!router[`${host}${path === '/' ? '' : path}`]) continue;
-            const port = parseInt(router[`${host}${path === '/' ? '' : path}`].split(':')[2]);
-            // logger.info('', { host, port, path });
-            pathPortConditions.push({
-              port,
-              path,
-            });
-
-            if (peer) {
-              //  logger.info('', { host, port: port + 1, path: '/peer' });
-              pathPortConditions.push({
-                port: port + 1,
-                path: '/peer',
-              });
-            }
-          }
-
-          // logger.info('', { host, pathPortConditions });
+          const pathPortAssignment = pathPortAssignmentData[host];
+          // logger.info('', { host, pathPortAssignment });
           proxyYaml += `
 ---
 apiVersion: projectcontour.io/v1
@@ -178,7 +159,7 @@ spec:
       secretName: ${host}`
           }
   routes:`;
-          for (const conditionObj of pathPortConditions) {
+          for (const conditionObj of pathPortAssignment) {
             const { path, port } = conditionObj;
             proxyYaml += `
     - conditions:

package/src/cli/image.js

@@ -2,10 +2,10 @@ import fs from 'fs-extra';
 import Underpost from '../index.js';
 import { shellCd, shellExec } from '../server/process.js';
 import dotenv from 'dotenv';
-import { getNpmRootPath } from '../server/conf.js';
+import { awaitDeployMonitor, getNpmRootPath } from '../server/conf.js';
 import { timer } from '../client/components/core/CommonJs.js';
-import UnderpostRootEnv from './env.js';
 import { loggerFactory } from '../server/logger.js';
+import UnderpostMonitor from './monitor.js';
 
 dotenv.config();
 
@@ -69,59 +69,57 @@ class UnderpostImage {
             for (const itcScript of itcScripts)
               if (itcScript.match(deployId)) shellExec(`node ./engine-private/itc-scripts/${itcScript}`);
           }
-        }
-        switch (deployId) {
-          default:
-            {
+          switch (deployId) {
+            default:
               {
-                const originPath = `./src/db/mongo/MongooseDB.js`;
-                fs.writeFileSync(
-                  originPath,
-                  fs.readFileSync(originPath, 'utf8').replaceAll(
-                    `connect: async (host, name) => {`,
-                    `connect: async (host, name) => {
+                {
+                  const originPath = `./src/db/mongo/MongooseDB.js`;
+                  fs.writeFileSync(
+                    originPath,
+                    fs.readFileSync(originPath, 'utf8').replaceAll(
+                      `connect: async (host, name) => {`,
+                      `connect: async (host, name) => {
     host = 'mongodb://mongodb-0.mongodb-service:27017';
-        `,
-                  ),
-                  'utf8',
-                );
-              }
+          `,
+                    ),
+                    'utf8',
+                  );
+                }
 
-              {
-                const originPath = `./src/server/valkey.js`;
-                fs.writeFileSync(
-                  originPath,
-                  fs.readFileSync(originPath, 'utf8').replaceAll(
-                    `    // port: 6379,
+                {
+                  const originPath = `./src/server/valkey.js`;
+                  fs.writeFileSync(
+                    originPath,
+                    fs.readFileSync(originPath, 'utf8').replaceAll(
+                      `    // port: 6379,
     // host: 'service-valkey.default.svc.cluster.local',`,
-                    `     port: 6379,
+                      `     port: 6379,
     host: 'service-valkey.default.svc.cluster.local',`,
-                  ),
-                  'utf8',
-                );
+                    ),
+                    'utf8',
+                  );
+                }
               }
-            }
-            break;
+              break;
+          }
+          shellExec(`node bin/deploy conf ${deployId} ${env}`);
+          shellExec(`node bin/deploy build-full-client ${deployId}`);
         }
-        shellExec(`node bin/deploy conf ${deployId} ${env}`);
-        shellExec(`node bin/deploy build-full-client ${deployId}`);
         if (options.run === true) {
           const runCmd = env === 'production' ? 'run prod-img' : 'run dev-img';
           if (fs.existsSync(`./engine-private/replica`)) {
             const replicas = await fs.readdir(`./engine-private/replica`);
             for (const replica of replicas) {
+              if (!replica.match(deployId)) continue;
               shellExec(`node bin/deploy conf ${replica} ${env}`);
               shellExec(`npm ${runCmd} deploy deploy-id:${replica}`, { async: true });
-              fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
-              const monitor = async () => {
-                await timer(1000);
-                if (fs.existsSync(`./tmp/await-deploy`)) return await monitor();
-              };
-              await monitor();
+              await awaitDeployMonitor(true);
             }
-            shellExec(`node bin/deploy conf ${deployId} ${env}`);
           }
-          shellExec(`npm ${runCmd} deploy deploy-id:${deployId}`);
+          shellExec(`node bin/deploy conf ${deployId} ${env}`);
+          shellExec(`npm ${runCmd} deploy deploy-id:${deployId}`, { async: true });
+          await awaitDeployMonitor(true);
+          await UnderpostMonitor.API.callback(deployId, env, { itc: true });
         }
       },
     },

package/src/cli/monitor.js

@@ -0,0 +1,68 @@
+import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
+import { loggerFactory } from '../server/logger.js';
+import UnderpostDeploy from './deploy.js';
+import axios from 'axios';
+import UnderpostRootEnv from './env.js';
+import fs from 'fs-extra';
+import { timer } from '../client/components/core/CommonJs.js';
+
+const logger = loggerFactory(import.meta);
+
+class UnderpostMonitor {
+  static API = {
+    async callback(deployId, env = 'development', options = { itc: false }) {
+      const router = await UnderpostDeploy.API.routerFactory(deployId, env);
+
+      const confServer = loadReplicas(
+        JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
+        'proxy',
+      );
+
+      const pathPortAssignmentData = pathPortAssignmentFactory(router, confServer);
+
+      logger.info('', pathPortAssignmentData);
+
+      if (options.itc === true) {
+        const errorPayloads = [];
+        const maxAttempts = Object.keys(pathPortAssignmentData)
+          .map((host) => pathPortAssignmentData[host].length)
+          .reduce((accumulator, value) => accumulator + value, 0);
+
+        const monitor = async () => {
+          await timer(30000);
+          if (UnderpostRootEnv.API.get('running-job')) return await monitor();
+          for (const host of Object.keys(pathPortAssignmentData)) {
+            for (const instance of pathPortAssignmentData[host]) {
+              const { port, path } = instance;
+              if (path.match('peer') || path.match('socket')) continue;
+              const urlTest = `http://localhost:${port}${path}`;
+              logger.info('Test instance', urlTest);
+              await axios.get(urlTest, { timeout: 10000 }).catch((error) => {
+                // console.log(error);
+                const errorPayload = {
+                  urlTest,
+                  host,
+                  port,
+                  path,
+                  name: error.name,
+                  status: error.status,
+                  code: error.code,
+                  errors: error.errors,
+                };
+                if (errorPayload.status !== 404) {
+                  errorPayloads.push(errorPayload);
+                  if (errorPayloads.length >= maxAttempts) throw new Error(JSON.stringify(errorPayloads, null, 4));
+                  logger.error('Error accumulator', errorPayloads.length);
+                }
+              });
+            }
+          }
+          await monitor();
+        };
+        await monitor();
+      }
+    },
+  };
+}
+
+export default UnderpostMonitor;

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

@@ -79,7 +79,7 @@ const Docs = {
       icon: html`<i class="fa-brands fa-osi"></i>`,
       text: 'Source Docs',
       url: function () {
-        return `${getProxyPath()}docs/engine/${window.renderPayload.version}`;
+        return `${getProxyPath()}docs/engine/${window.renderPayload.version.replace('v', '')}`;
       },
     },
     {

package/src/index.js

@@ -11,6 +11,7 @@ import UnderpostDeploy from './cli/deploy.js';
 import UnderpostRootEnv from './cli/env.js';
 import UnderpostFileStorage from './cli/fs.js';
 import UnderpostImage from './cli/image.js';
+import UnderpostMonitor from './cli/monitor.js';
 import UnderpostRepository from './cli/repository.js';
 import UnderpostScript from './cli/script.js';
 import UnderpostSecret from './cli/secrets.js';
@@ -28,7 +29,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.622';
+  static version = 'v2.8.635';
   /**
    * Repository cli API
    * @static
@@ -106,6 +107,13 @@ class Underpost {
    * @memberof UnderpostFileStorage
    */
   static fs = UnderpostFileStorage.API;
+  /**
+   * Monitor cli API
+   * @static
+   * @type {UnderpostMonitor.API}
+   * @memberof UnderpostMonitor
+   */
+  static monitor = UnderpostMonitor.API;
 }
 
 const up = Underpost;

package/src/server/conf.js

@@ -499,6 +499,40 @@ const buildProxyRouter = () => {
   return proxyRouter;
 };
 
+const pathPortAssignmentFactory = (router, confServer) => {
+  const pathPortAssignmentData = {};
+  for (const host of Object.keys(confServer)) {
+    const pathPortAssignment = [];
+    for (const path of Object.keys(confServer[host])) {
+      const { peer } = confServer[host][path];
+      if (!router[`${host}${path === '/' ? '' : path}`]) continue;
+      const port = parseInt(router[`${host}${path === '/' ? '' : path}`].split(':')[2]);
+      // logger.info('', { host, port, path });
+      pathPortAssignment.push({
+        port,
+        path,
+      });
+
+      if (peer) {
+        //  logger.info('', { host, port: port + 1, path: '/peer' });
+        pathPortAssignment.push({
+          port: port + 1,
+          path: '/peer',
+        });
+      }
+    }
+    pathPortAssignmentData[host] = pathPortAssignment;
+  }
+  return pathPortAssignmentData;
+};
+
+const deployRangePortFactory = (router) => {
+  const ports = Object.values(router).map((p) => parseInt(p.split(':')[2]));
+  const fromPort = Math.min(...ports);
+  const toPort = Math.max(...ports);
+  return { ports, fromPort, toPort };
+};
+
 const buildKindPorts = (from, to) =>
   range(parseInt(from), parseInt(to))
     .map(
@@ -729,7 +763,7 @@ const validateTemplatePath = (absolutePath = '') => {
   return true;
 };
 
-const deployTest = async (dataDeploy) => {
+const deployTest = async (dataDeploy = [{ deployId: 'default' }]) => {
   const failed = [];
   for (const deploy of dataDeploy) {
     const deployServerConfPath = fs.existsSync(`./engine-private/replica/${deploy.deployId}/conf.server.json`)
@@ -773,6 +807,12 @@ const deployTest = async (dataDeploy) => {
   return { failed };
 };
 
+const awaitDeployMonitor = async (init = false, deltaMs = 1000) => {
+  if (init) fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
+  await timer(deltaMs);
+  if (fs.existsSync(`./tmp/await-deploy`)) return await awaitDeployMonitor();
+};
+
 const getDeployGroupId = () => {
   const deployGroupIndexArg = process.argv.findIndex((a) => a.match(`deploy-group:`));
   if (deployGroupIndexArg > -1) return process.argv[deployGroupIndexArg].split(':')[1].trim();
@@ -1122,4 +1162,8 @@ export {
   getNpmRootPath,
   getUnderpostRootPath,
   writeEnv,
+  deployTest,
+  pathPortAssignmentFactory,
+  deployRangePortFactory,
+  awaitDeployMonitor,
 };