underpost 2.8.622 → 2.8.637

package/Dockerfile

@@ -1,11 +1,11 @@
 ARG BASE_DEBIAN=buster
 
+# USER root
+
 FROM debian:${BASE_DEBIAN}
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-WORKDIR /home/dd
-
 # Set root password to root, format is 'user:password'.
 RUN echo 'root:root' | chpasswd
 
@@ -25,9 +25,6 @@ RUN mkdir -p /var/run/sshd
 # Allow root login via password
 RUN sed -ri 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
 
-# copy supervisor config file to start openssh-server
-COPY supervisord-openssh-server.conf /etc/supervisor/conf.d/supervisord-openssh-server.conf
-
 # install open ssl git and others tools
 RUN apt-get install -yq --no-install-recommends libssl-dev curl wget git gnupg
 
@@ -37,12 +34,14 @@ RUN apt-get install -y nodejs build-essential
 RUN node --version
 RUN npm --version
 
-RUN npm install -g underpost
-
-VOLUME [ "/home/dd/engine/logs" ]
+WORKDIR /home/dd
 
 EXPOSE 22
 
-EXPOSE 4000-4004
+EXPOSE 80
+
+EXPOSE 443
+
+EXPOSE 3000-3100
 
-CMD [ "underpost", "new", "service" ]
+EXPOSE 4000-4100

package/bin/build.js

@@ -176,7 +176,7 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
   if (!fs.existsSync(`${basePath}/images`)) fs.mkdirSync(`${basePath}/images`);
 
   const env = process.argv.includes('development') ? 'development' : 'production';
-  const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml', 'secret.yaml'];
+  const deploymentsFiles = ['proxy.yaml', 'deployment.yaml', 'secret.yaml'];
   // remove engine-private of .dockerignore for local testing
   for (const file of deploymentsFiles) {
     if (fs.existsSync(`./manifests/deployment/${confName}-${env}/${file}`)) {

package/bin/index.js

@@ -135,13 +135,15 @@ program
 
 program
   .command('dockerfile-image-build')
-  .argument('<deploy-id>', 'Deploy configuration id')
-  .argument('[env]', 'Optional environment, for default is development')
-  .argument('[path]', 'Absolute or relative directory, for default is current')
-  .option('--image-archive', 'Only load tar image from ./images')
-  .option('--podman-save', 'Save image from podman to ./images')
-  .option('--image-name <image-name>', 'Set custom image name')
-  .option('--image-version <image-version>', 'Set custom image version')
+  .option('--path [path]', 'Dockerfile path')
+  .option('--image-name [image-name]', 'Set image name')
+  .option('--image-path [image-path]', 'Set tar image path')
+  .option('--dockerfile-name [dockerfile-name]', 'set Dockerfile name')
+  .option('--podman-save', 'Export tar file from podman')
+  .option('--kind-load', 'Import tar image to Kind cluster')
+  .option('--secrets', 'Dockerfile env secrets')
+  .option('--secrets-path [secrets-path]', 'Dockerfile custom path env secrets')
+  .option('--no-cache', 'Build without using cache')
   .description('Build image from Dockerfile')
   .action(Underpost.image.dockerfile.build);
 
@@ -220,4 +222,14 @@ 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')
+  .option('--ms-interval <ms-interval>', 'Custom ms interval delta time')
+  .option('--now', 'Exec immediately monitor script')
+  .option('--single', 'Disable recurrence')
+  .description('Monitor health server management')
+  .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.637'
     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.637",
     "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/fs.js

@@ -38,7 +38,7 @@ class UnderpostFileStorage {
       options = { rm: false, recursive: false, deployId: '', force: false, pull: false, git: false },
     ) {
       const { storage, storageConf } = UnderpostFileStorage.API.getStorageConf(options);
-      const deleteFiles = UnderpostRepository.API.getDeleteFiles(path);
+      const deleteFiles = options.pull === true ? [] : UnderpostRepository.API.getDeleteFiles(path);
       for (const relativePath of deleteFiles) {
         const _path = path + '/' + relativePath;
         if (_path in storage) {
@@ -46,10 +46,6 @@ class UnderpostFileStorage {
           delete storage[_path];
         }
       }
-      const files =
-        options.git === true
-          ? UnderpostRepository.API.getChangedFiles(path)
-          : await fs.readdir(path, { recursive: true });
       if (options.pull === true) {
         for (const _path of Object.keys(storage)) {
           if (!fs.existsSync(_path) || options.force === true) {
@@ -57,7 +53,11 @@ class UnderpostFileStorage {
             await UnderpostFileStorage.API.pull(_path, options);
           } else logger.warn(`Pull path already exists`, _path);
         }
-      } else
+      } else {
+        const files =
+          options.git === true
+            ? UnderpostRepository.API.getChangedFiles(path)
+            : await fs.readdir(path, { recursive: true });
         for (const relativePath of files) {
           const _path = path + '/' + relativePath;
           if (fs.statSync(_path).isDirectory()) {
@@ -68,6 +68,7 @@ class UnderpostFileStorage {
             if (storage) storage[_path] = {};
           } else logger.warn('File already exists', _path);
         }
+      }
       UnderpostFileStorage.API.writeStorageConf(storage, storageConf);
       if (options.git === true) {
         shellExec(`cd ${path} && git add .`);

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();
 
@@ -18,41 +18,49 @@ class UnderpostImage {
         shellExec(`sudo podman pull docker.io/library/debian:buster`);
       },
       build(
-        deployId = 'default',
-        env = 'development',
-        path = '.',
-        options = { imageArchive: false, podmanSave: false, imageName: '', imageVersion: '' },
+        options = {
+          path: '',
+          imageName: '',
+          imagePath: '',
+          dockerfileName: '',
+          podmanSave: false,
+          kindLoad: false,
+          secrets: false,
+          secretsPath: '',
+          noCache: false,
+        },
       ) {
-        const imgName = `${
-          options.imageName && typeof options.imageName === 'string' ? options.imageName : `${deployId}-${env}`
-        }:${
-          options.imageVersion && typeof options.imageVersion === 'string' ? options.imageVersion : Underpost.version
-        }`;
-        const podManImg = `localhost/${imgName}`;
-        const imagesStoragePath = `/images`;
-        if (!fs.existsSync(`${path}${imagesStoragePath}`))
-          fs.mkdirSync(`${path}${imagesStoragePath}`, { recursive: true });
-        const tarFile = `.${imagesStoragePath}/${imgName.replace(':', '_')}.tar`;
-
-        let secrets = ' ';
+        const { path, imageName, imagePath, dockerfileName, podmanSave, secrets, secretsPath, kindLoad, noCache } =
+          options;
+        const podManImg = `localhost/${imageName}`;
+        if (imagePath && typeof imagePath === 'string' && !fs.existsSync(imagePath))
+          fs.mkdirSync(imagePath, { recursive: true });
+        const tarFile = `${imagePath}/${imageName.replace(':', '_')}.tar`;
+        let secretsInput = ' ';
         let secretDockerInput = '';
-
-        const envObj = dotenv.parse(fs.readFileSync(`${getNpmRootPath()}/underpost/.env`, 'utf8'));
-
-        for (const key of Object.keys(envObj)) {
-          continue;
-          secrets += ` && export ${key}="${envObj[key]}" `; // $(cat gitlab-token.txt)
-          secretDockerInput += ` --secret id=${key},env=${key} \ `;
+        let cache = '';
+        if (secrets === true) {
+          const envObj = dotenv.parse(
+            fs.readFileSync(
+              secretsPath && typeof secretsPath === 'string' ? secretsPath : `${getNpmRootPath()}/underpost/.env`,
+              'utf8',
+            ),
+          );
+          for (const key of Object.keys(envObj)) {
+            secretsInput += ` && export ${key}="${envObj[key]}" `; // $(cat gitlab-token.txt)
+            secretDockerInput += ` --secret id=${key},env=${key} \ `;
+          }
         }
-        // --rm --no-cache
-        if (options.imageArchive !== true) {
+        if (noCache === true) cache += ' --rm --no-cache';
+        if (path && typeof path === 'string')
           shellExec(
-            `cd ${path}${secrets}&& sudo podman build -f ./Dockerfile -t ${imgName} --pull=never --cap-add=CAP_AUDIT_WRITE${secretDockerInput}`,
+            `cd ${path}${secretsInput}&& sudo podman build -f ./${
+              dockerfileName && typeof dockerfileName === 'string' ? dockerfileName : 'Dockerfile'
+            } -t ${imageName} --pull=never --cap-add=CAP_AUDIT_WRITE${cache}${secretDockerInput}`,
           );
-        }
-        if (options.imageArchive !== true || options.podmanSave === true)
-          shellExec(`cd ${path} && podman save -o ${tarFile} ${podManImg}`);
-        shellExec(`cd ${path} && sudo kind load image-archive ${tarFile}`);
+
+        if (podmanSave === true) shellExec(`podman save -o ${tarFile} ${podManImg}`);
+        if (kindLoad === true) shellExec(`sudo kind load image-archive ${tarFile}`);
       },
       async script(deployId = 'default', env = 'development', options = { run: false, build: false }) {
         if (options.build === true) {
@@ -69,59 +77,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,92 @@
+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';
+
+const logger = loggerFactory(import.meta);
+
+class UnderpostMonitor {
+  static API = {
+    async callback(deployId, env = 'development', options = { now: false, single: false, msInterval: '' }) {
+      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);
+
+      const errorPayloads = [];
+      const maxAttempts = Object.keys(pathPortAssignmentData)
+        .map((host) => pathPortAssignmentData[host].length)
+        .reduce((accumulator, value) => accumulator + value, 0);
+
+      const monitor = async (reject) => {
+        logger.info('Check server health');
+        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) {
+                  const message = JSON.stringify(errorPayloads, null, 4);
+                  if (reject) reject(message);
+                  else throw new Error(message);
+                }
+                logger.error('Error accumulator', errorPayloads.length);
+              }
+            });
+          }
+        }
+      };
+      if (options.now === true) await monitor();
+      if (options.single === true) return;
+      let optionsMsTimeout = parseInt(options.msInterval);
+      if (isNaN(optionsMsTimeout)) optionsMsTimeout = 30000;
+      const monitorCallBack = (resolve, reject) => {
+        const envMsTimeout = UnderpostRootEnv.API.get('monitor-ms');
+        setTimeout(
+          async () => {
+            switch (UnderpostRootEnv.API.get('monitor-input')) {
+              case 'pause':
+                monitorCallBack(resolve, reject);
+                return;
+              case 'restart':
+                return reject();
+              case 'stop':
+                return resolve();
+              default:
+                await monitor(reject);
+                monitorCallBack(resolve, reject);
+                return;
+            }
+          },
+          !isNaN(envMsTimeout) ? envMsTimeout : optionsMsTimeout,
+        );
+      };
+      return await new Promise((...args) => monitorCallBack(...args));
+    },
+  };
+}
+
+export default UnderpostMonitor;

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

@@ -252,7 +252,7 @@ const Account = {
         ${options?.bottomRender ? await options.bottomRender() : ``}
         <div class="in hide">
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-account',
+            class: 'in section-mp form-button btn-account',
             label: Translate.Render('update'),
             type: 'submit',
           })}
@@ -260,13 +260,13 @@ const Account = {
       </form>
       <div class="in">
         ${await BtnIcon.Render({
-          class: 'section-mp form-button btn-account-delete hide',
+          class: 'in section-mp form-button btn-account-delete hide',
           label: html` ${Translate.Render(`delete-account`)}`,
           type: 'button',
           style: 'color: #5f5f5f',
         })}
         ${await BtnIcon.Render({
-          class: 'section-mp form-button btn-account-delete-confirm',
+          class: 'in section-mp form-button btn-account-delete-confirm',
           label: html` ${Translate.Render(`delete-account`)}`,
           type: 'button',
           style: 'color: #5f5f5f',

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

@@ -25,7 +25,7 @@ const BlockChainManagement = {
                 placeholder: true,
               })}
               ${await BtnIcon.Render({
-                class: `section-mp btn-custom btn-upload-blockchain`,
+                class: `inl section-mp btn-custom btn-upload-blockchain`,
                 label: html`<i class="fas fa-plus"></i> ${Translate.Render(`create`)}`,
               })}
             </div>

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

@@ -409,9 +409,11 @@ const CalendarCore = {
       if (delayBlock) return;
       else {
         delayBlock = true;
+        const _currentPath = `${location.pathname}${location.search}`;
         setTimeout(() => {
           delayBlock = false;
-        }, 500);
+          if (`${location.pathname}${location.search}` !== _currentPath) this.Data[options.idModal].updatePanel();
+        }, 1000);
       }
       const cid = getQueryParams().cid ? getQueryParams().cid : '';
       if (options.route === 'home') Modal.homeCid = newInstance(cid);
@@ -521,7 +523,7 @@ const CalendarCore = {
       <div class="in calendar-container hide">
         <div class="stq modal calendar-buttons-container">
           ${await BtnIcon.Render({
-            class: `section-mp btn-custom close-calendar-container flr`,
+            class: `inl section-mp btn-custom close-calendar-container flr`,
             label: html`<i class="fa-solid fa-xmark"></i> ${Translate.Render('close')}`,
             type: 'button',
           })}

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

@@ -396,7 +396,8 @@ const CssCoreDark = {
           text-align: center;
           background: #1a1a1a;
           font-size: 17px;
-          height: 35px;
+          height: 30px;
+          padding: 5px 0px 5px 0px;
         }
         ::placeholder {
           color: #c6c4c4;
@@ -471,6 +472,7 @@ const CssCoreDark = {
           width: 260px;
           font-size: 20px;
           padding: 10px;
+          min-height: 45px;
         }
         .toggle-form-container {
           border: 2px solid #313131;
@@ -494,6 +496,7 @@ const CssCoreDark = {
           font-size: 20px;
           padding: 10px;
           text-align: center;
+          min-height: 45px;
         }
         .drop-zone-file-explorer {
           min-height: 300px;
@@ -700,7 +703,8 @@ const CssCoreLight = {
           text-align: center;
           background: #eaeaea;
           font-size: 17px;
-          height: 35px;
+          height: 30px;
+          padding: 5px 0px 5px 0px;
         }
         ::placeholder {
           color: #333;
@@ -776,6 +780,7 @@ const CssCoreLight = {
           width: 260px;
           font-size: 20px;
           padding: 10px;
+          min-height: 45px;
         }
         .toggle-form-container {
           border-radius: 5px;
@@ -800,6 +805,7 @@ const CssCoreLight = {
           font-size: 20px;
           padding: 10px;
           text-align: center;
+          min-height: 45px;
         }
         .input-container-width {
           cursor: pointer;

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/client/components/core/LoadingAnimation.js

@@ -75,28 +75,12 @@ const LoadingAnimation = {
       const style = {
         'text-align': 'center',
       };
-      if (s(container).classList) {
-        const classes = Array.from(s(container).classList);
-        if (classes.find((e) => e.match('management-table-btn-mini'))) {
-          style.top = '-2px';
-          style.left = '-2px';
-        } else if (classes.find((e) => e.match('-btn-tool'))) {
-          style.top = '-26px';
-          style.left = '-10px';
-        } else if (classes.find((e) => e.match('main-btn-')) && !classes.find((e) => e.match('main-btn-square-menu'))) {
-          style.top = '-8px';
-          style.left = '-10px';
-        } else if (classes.find((e) => e.match('action-bar-box'))) {
-          style.top = '-30px';
-          style.left = '-12px';
-        }
-      }
 
       append(
         container,
         html`
           <div
-            class="in ${id}"
+            class="abs center ${id}"
             style="${renderCssAttr({
               style,
             })}"

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

@@ -135,7 +135,7 @@ const LogIn = {
     return html`
       <div class="in">
         ${await BtnIcon.Render({
-          class: 'section-mp form-button btn-log-in-i-not-have-account',
+          class: 'in section-mp form-button btn-log-in-i-not-have-account',
           label: html`<i class="fas fa-user-plus"></i> ${Translate.Render(`i-not-have-account`)}
             <br />
             ${Translate.Render(`sign-up`)}`,
@@ -165,7 +165,7 @@ const LogIn = {
         </div>
         <div class="in">
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-log-in-forgot-password',
+            class: 'in section-mp form-button btn-log-in-forgot-password',
             label: html`<i class="fas fa-question-circle"></i> ${Translate.Render(`forgot-password`)}`,
             type: 'button',
           })}
@@ -181,7 +181,7 @@ const LogIn = {
 
         <div class="in">
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-log-in',
+            class: 'in section-mp form-button btn-log-in',
             label: Translate.Render('log-in'),
             type: 'submit',
           })}

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

@@ -47,7 +47,7 @@ const LogOut = {
     return html` <form class="in">
       <div class="in">
         ${await BtnIcon.Render({
-          class: 'section-mp btn-custom btn-log-out',
+          class: 'inl section-mp btn-custom btn-log-out',
           label: html`<i class="fa-solid fa-power-off"></i> ${Translate.Render('log-out')}`,
           type: 'submit',
         })}

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

@@ -246,7 +246,7 @@ const Panel = {
     let render = '';
     let renderForm = html` <div class="in modal stq" style="top: 0px; z-index: 1; padding-bottom: 5px">
         ${await BtnIcon.Render({
-          class: `section-mp btn-custom btn-${idPanel}-close`,
+          class: `inl section-mp btn-custom btn-${idPanel}-close`,
           label: html`<i class="fa-solid fa-xmark"></i> ${Translate.Render('close')}`,
           type: 'button',
         })}
@@ -404,13 +404,13 @@ const Panel = {
     }
     let renderFormBtn = html`
       ${await BtnIcon.Render({
-        class: `section-mp btn-custom btn-${idPanel}-submit`,
+        class: `inl section-mp btn-custom btn-${idPanel}-submit`,
         label: html`<span class="btn-${idPanel}-label-add"><i class="fas fa-plus"></i> ${Translate.Render('add')}</span
           ><span class="btn-${idPanel}-label-edit hide"><i class="fas fa-edit"></i> ${Translate.Render('edit')}</span>`,
         type: 'submit',
       })}
       ${await BtnIcon.Render({
-        class: `section-mp btn-custom btn-${idPanel}-clean`,
+        class: `inl section-mp btn-custom btn-${idPanel}-clean`,
         label: html`<i class="fa-solid fa-broom"></i> ${Translate.Render('clear')}`,
         type: 'button',
       })}
@@ -546,7 +546,7 @@ const Panel = {
             s(`.${btnSelector}`).onclick = () => dataBtn.onClick();
           });
         customButtonsRender += ` ${await BtnIcon.Render({
-          class: `section-mp btn-custom ${btnSelector}`,
+          class: `inl section-mp btn-custom ${btnSelector}`,
           label: dataBtn.label,
           type: 'button',
         })}`;
@@ -656,7 +656,7 @@ const Panel = {
         >
           <div class="in ${idPanel}-form-header">
             ${await BtnIcon.Render({
-              class: `section-mp btn-custom btn-${idPanel}-add ${
+              class: `inl section-mp btn-custom btn-${idPanel}-add ${
                 options?.role?.add ? (!options.role.add() ? 'hide' : '') : ''
               }`,
               label: html`<i class="fas fa-plus"></i> ${Translate.Render('add')}`,

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

@@ -430,9 +430,11 @@ const PanelForm = {
       if (delayBlock) return;
       else {
         delayBlock = true;
+        const _currentPath = `${location.pathname}${location.search}`;
         setTimeout(() => {
           delayBlock = false;
-        }, 500);
+          if (`${location.pathname}${location.search}` !== _currentPath) this.Data[idPanel].updatePanel();
+        }, 1000);
       }
       const cid = getQueryParams().cid ? getQueryParams().cid : '';
       if (options.route === 'home') Modal.homeCid = newInstance(cid);

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

@@ -126,7 +126,7 @@ const Recover = {
     });
     return html`
       ${await BtnIcon.Render({
-        class: 'section-mp form-button btn-recover-log-in hide',
+        class: 'in section-mp form-button btn-recover-log-in hide',
         label: Translate.Render('log-in'),
         type: 'button',
       })}
@@ -181,7 +181,7 @@ const Recover = {
         ${options?.bottomRender ? await options.bottomRender() : ``}
         <div class="in recover-send-btn-container">
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-recover',
+            class: 'in section-mp form-button btn-recover',
             label: Translate.Render(mode === 'recover-verify-email' ? 'send-recover-verify-email' : 'change-password'),
             type: 'button',
           })}
@@ -191,7 +191,7 @@ const Recover = {
             <i class="fa-solid fa-triangle-exclamation"></i> ${Translate.Render('15-min-valid-recover-email')}
           </div>
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-recover-resend',
+            class: 'in section-mp form-button btn-recover-resend',
             label: html`${Translate.Render('resend')} ${Translate.Render('recover-verify-email')}`,
             type: 'submit',
           })}

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

@@ -63,7 +63,7 @@ const SignUp = {
     });
     return html`
       ${await BtnIcon.Render({
-        class: 'section-mp form-button btn-sign-up-i-have-account',
+        class: 'in section-mp form-button btn-sign-up-i-have-account',
         label: html`<i class="fas fa-sign-in-alt"></i> ${Translate.Render('i-have-account')}<br />${Translate.Render(
             'log-in',
           )}`,
@@ -112,7 +112,7 @@ const SignUp = {
         ${options?.bottomRender ? await options.bottomRender() : ``}
         <div class="in">
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-sign-up',
+            class: 'in section-mp form-button btn-sign-up',
             label: Translate.Render('sign-up'),
             type: 'submit',
           })}

package/src/client/ssr/Render.js

@@ -133,6 +133,8 @@ SrrComponent = ({ title, ssrPath, buildId, ssrHeadComponents, ssrBodyComponents,
           border: none;
           padding-block: 0;
           padding-inline: 0;
+          height: 30px;
+          line-height: 30px;
         }
         input::file-selector-button {
           outline: none !important;

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.637';
   /**
    * 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/runtime/lampp/Dockerfile

@@ -0,0 +1,65 @@
+ARG BASE_DEBIAN=buster
+
+USER root
+
+FROM debian:${BASE_DEBIAN}
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Set root password to root, format is 'user:password'.
+RUN echo 'root:root' | chpasswd
+
+RUN apt-get update --fix-missing
+RUN apt-get upgrade -y
+# install sudo
+RUN apt-get -y install sudo
+# net-tools provides netstat commands
+RUN apt-get -y install curl net-tools
+RUN apt-get -yq install openssh-server supervisor
+# Few handy utilities which are nice to have
+RUN apt-get -y install nano vim less --no-install-recommends
+RUN apt-get clean
+
+# install ssh
+RUN mkdir -p /var/run/sshd
+# Allow root login via password
+RUN sed -ri 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
+
+# install open ssl git and others tools
+RUN apt-get install -yq --no-install-recommends libssl-dev curl wget git gnupg
+
+# install lampp
+RUN curl -Lo xampp-linux-installer.run https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/7.4.33/xampp-linux-x64-7.4.33-0-installer.run?from_af=true
+RUN chmod +x xampp-linux-installer.run
+RUN bash -c './xampp-linux-installer.run'
+RUN ln -sf /opt/lampp/lampp /usr/bin/lampp
+# Enable XAMPP web interface(remove security checks)
+RUN sed -i.bak s'/Require local/Require all granted/g' /opt/lampp/etc/extra/httpd-xampp.conf
+# Enable error display in php
+RUN sed -i.bak s'/display_errors=Off/display_errors=On/g' /opt/lampp/etc/php.ini
+# Enable includes of several configuration files
+RUN mkdir /opt/lampp/apache2/conf.d
+RUN echo "IncludeOptional /opt/lampp/apache2/conf.d/*.conf" >>/opt/lampp/etc/httpd.conf
+# Create a /www folder and a symbolic link to it in /opt/lampp/htdocs. It'll be accessible via http://localhost:[port]/www/
+# This is convenient because it doesn't interfere with xampp, phpmyadmin or other tools in /opt/lampp/htdocs
+# /opt/lampp/etc/httpd.conf
+RUN mkdir /www
+RUN ln -s /www /opt/lampp/htdocs
+
+# install nodejs https://github.com/nodesource/distributions/blob/master/README.md#deb
+RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash -
+RUN apt-get install -y nodejs build-essential
+RUN node --version
+RUN npm --version
+
+WORKDIR /home/dd
+
+EXPOSE 22
+
+EXPOSE 80
+
+EXPOSE 443
+
+EXPOSE 3000-3100
+
+EXPOSE 4000-4100

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,
 };