underpost 2.8.841 → 2.8.844

package/src/cli/index.js

@@ -86,7 +86,13 @@ program
   .argument('<deploy-id>', `The deployment configuration ID. Use 'clean' to restore default environment settings.`)
   .argument('[env]', 'Optional: The environment to set (e.g., "production", "development"). Defaults to "production".')
   .description('Sets environment variables and configurations related to a specific deployment ID.')
-  .action(loadConf);
+  .action((...args) => {
+    if (args[0] === 'current') {
+      console.log(process.env.DEPLOY_ID);
+      return;
+    }
+    loadConf(...args);
+  });
 
 // 'config' command: Manage Underpost configurations
 program
@@ -112,6 +118,7 @@ program
   .option('--mariadb', 'Initializes the cluster with a MariaDB statefulset.')
   .option('--mysql', 'Initializes the cluster with a MySQL statefulset.')
   .option('--mongodb', 'Initializes the cluster with a MongoDB statefulset.')
+  .option('--mongo-db-host <host>', 'Set custom mongo db host')
   .option('--postgresql', 'Initializes the cluster with a PostgreSQL statefulset.')
   .option('--mongodb4', 'Initializes the cluster with a MongoDB 4.4 service.')
   .option('--valkey', 'Initializes the cluster with a Valkey service.')
@@ -326,6 +333,7 @@ program
   .option('--pod-name <pod-name>', 'Optional: Specifies the pod name for test execution.')
   .option('--volume-host-path <volume-host-path>', 'Optional: Specifies the volume host path for test execution.')
   .option('--volume-mount-path <volume-mount-path>', 'Optional: Specifies the volume mount path for test execution.')
+  .option('--volume-type <volume-type>', 'Optional: Specifies the volume type for test execution.')
   .option('--image-name <image-name>', 'Optional: Specifies the image name for test execution.')
   .option('--container-name <container-name>', 'Optional: Specifies the container name for test execution.')
   .option('--namespace <namespace>', 'Optional: Specifies the namespace for test execution.')

package/src/cli/monitor.js

@@ -173,19 +173,15 @@ class UnderpostMonitor {
                     monitorTrafficName = undefined;
                     monitorPodName = undefined;
                   }
-                  const cmd = `underpost config get container-status`;
                   const checkDeploymentReadyStatus = () => {
-                    const pods = UnderpostDeploy.API.get(`${deployId}-${env}-${traffic}`);
-                    if (pods && pods[0]) {
-                      const { NAME } = pods[0];
-                      if (
-                        shellExec(`sudo kubectl exec -i ${NAME} -- sh -c "${cmd}"`, { stdout: true }).match(
-                          `${deployId}-${env}-running-deployment`,
-                        )
-                      ) {
-                        monitorPodName = NAME;
-                        monitorTrafficName = `${traffic}`;
-                      }
+                    const { ready, notReadyPods, readyPods } = UnderpostDeploy.API.checkDeploymentReadyStatus(
+                      deployId,
+                      env,
+                      traffic,
+                    );
+                    if (ready) {
+                      monitorPodName = readyPods[0].NAME;
+                      monitorTrafficName = `${traffic}`;
                     }
                   };
                   if (!monitorPodName) {

package/src/cli/run.js

@@ -65,6 +65,27 @@ class UnderpostRun {
       shellExec(`kubectl delete pod tf-gpu-test-pod`);
       shellExec(`kubectl apply -f ${underpostRoot}/manifests/deployment/tensorflow/tf-gpu-test.yaml`);
     },
+    'dev-cluster': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
+      shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''} --reset`);
+      shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''}`);
+      shellExec(
+        `${baseCommand} cluster${options.dev ? ' --dev' : ''} --mongodb --mongo-db-host ${'127.0.0.1'} --pull-image`,
+      );
+      shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''} --valkey --pull-image`);
+      shellExec(`${baseCommand} deploy --expose mongo`, { async: true });
+      shellExec(`${baseCommand} deploy --expose valkey`, { async: true });
+    },
+    'cyberia-ide': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
+      shellExec(`${baseCommand} run ide /home/dd/cyberia-server`);
+      shellExec(`${baseCommand} run ide /home/dd/cyberia-client`);
+    },
+    'engine-ide': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const baseCommand = options.dev ? 'node bin' : 'underpost';
+      shellExec(`${baseCommand} run ide /home/dd/engine`);
+      shellExec(`${baseCommand} run ide /home/dd/engine/engine-private`);
+    },
     ide: (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const { underpostRoot } = options;
       shellExec(`node ${underpostRoot}/bin/vs ${path}`);
@@ -142,6 +163,65 @@ class UnderpostRun {
       };
       _monitor();
     },
+    'db-client': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const { underpostRoot } = options;
+      shellExec(`kubectl apply -k ${underpostRoot}/manifests/deployment/adminer/.`);
+    },
+    cluster: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',');
+      const env = 'production';
+      shellCd(`/home/dd/engine`);
+      shellExec(`underpost cluster --reset`);
+      await timer(5000);
+      shellExec(`underpost cluster --kubeadm`);
+      await timer(5000);
+      shellExec(`underpost dockerfile-pull-base-images --path /home/dd/engine/src/runtime/lampp --kubeadm-load`);
+      await timer(5000);
+      shellExec(`underpost cluster --kubeadm --pull-image --mongodb`);
+      await timer(5000);
+      shellExec(`underpost cluster --kubeadm --pull-image --mariadb`);
+      await timer(5000);
+      for (const deployId of deployList) {
+        shellExec(`underpost db ${deployId} --import --git`);
+      }
+      await timer(5000);
+      shellExec(`underpost cluster --kubeadm --pull-image --valkey`);
+      await timer(5000);
+      shellExec(`underpost cluster --kubeadm --contour`);
+      await timer(5000);
+      shellExec(`underpost cluster --kubeadm --cert-manager`);
+      for (const deployId of deployList) {
+        shellExec(`underpost deploy ${deployId} ${env} --kubeadm --cert`);
+      }
+    },
+    deploy: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const deployId = path;
+      const currentTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId);
+      const targetTraffic = currentTraffic === 'blue' ? 'green' : 'blue';
+      const env = 'production';
+      shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${targetTraffic}`);
+
+      let secondsElapsed = 0;
+      logger.info('Deployment init', { deployId, env, targetTraffic });
+
+      while (!UnderpostDeploy.API.checkDeploymentReadyStatus(deployId, env, targetTraffic).ready) {
+        await timer(1000);
+        secondsElapsed++;
+        logger.info(`Deployment in progress, seconds elapsed: ${secondsElapsed}`);
+      }
+
+      logger.info(`Deployment ready, seconds elapsed: ${secondsElapsed}`);
+
+      UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, 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) => {
       const { underpostRoot } = options;
       const podName = 'tf-vae-test';

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

@@ -137,10 +137,6 @@ const CssCommonCore = async () => {
       .title-view-modal .view-title-icon {
         font-size: 21px !important;
       }
-      .plantuml-svg {
-        width: 100%;
-        height: auto;
-      }
       .down-arrow-submenu {
         top: -20px;
         text-align: right;

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

@@ -11,8 +11,6 @@ import Sortable from 'sortablejs';
 
 // https://mintlify.com/docs/quickstart
 
-const umlTypes = ['server', 'cron', 'client', 'ssr'];
-
 const Docs = {
   RenderModal: async function (type, modalOptions) {
     const docData = this.Data.find((d) => d.type === type);
@@ -118,37 +116,7 @@ const Docs = {
           )}`;
       },
     },
-  ].concat(
-    umlTypes.map((umlType) => {
-      const umlId = `uml-${umlType}`;
-      return {
-        type: umlId,
-        icon: html`<i class="fas fa-sitemap"></i>`,
-        text: Translate.Render(`${umlType} config uml`),
-        url: function () {
-          return `/docs/?cid=${umlId}`;
-        },
-        renderHtml: function () {
-          return html` <div class="in section-mp">
-              <div class="in sub-title-modal"><i class="fas fa-project-diagram"></i> Schema</div>
-            </div>
-            <div class="in section-mp">
-              <a href="${getProxyPath()}docs/plantuml/${umlType}-schema.svg" target="_blank"
-                ><img class="in plantuml-svg" src="${getProxyPath()}docs/plantuml/${umlType}-schema.svg"
-              /></a>
-            </div>
-            <div class="in section-mp">
-              <div class="in sub-title-modal"><i class="fas fa-project-diagram"></i> Instance example</div>
-            </div>
-            <div class="in section-mp">
-              <a href="${getProxyPath()}docs/plantuml/${umlType}-conf.svg" target="_blank"
-                ><img class="in plantuml-svg" src="${getProxyPath()}docs/plantuml/${umlType}-conf.svg"
-              /></a>
-            </div>`;
-        },
-      };
-    }),
-  ),
+  ],
   Tokens: {},
   Init: async function (options) {
     const { idModal } = options;
@@ -158,10 +126,6 @@ const Docs = {
         s(`.btn-docs-src`).classList.remove('main-btn-menu-active');
         s(`.btn-docs-api`).classList.remove('main-btn-menu-active');
         s(`.btn-docs-coverage`).classList.remove('main-btn-menu-active');
-        for (const umlType of umlTypes) {
-          const umlId = `uml-${umlType}`;
-          s(`.btn-docs-${umlId}`).classList.remove('main-btn-menu-active');
-        }
       };
       s(`.btn-docs-src`).onclick = async () => {
         setQueryPath({ path: 'docs', queryPath: 'src' });
@@ -195,16 +159,6 @@ const Docs = {
         location.href = docData.url();
       };
 
-      for (const umlType of umlTypes) {
-        const umlId = `uml-${umlType}`;
-        s(`.btn-docs-${umlId}`).onclick = async () => {
-          cleanActive();
-          s(`.btn-docs-${umlId}`).classList.add('main-btn-menu-active');
-          setQueryPath({ path: 'docs', queryPath: umlId });
-          await this.RenderModal(umlId, { ...options.modalOptions, handleType: 'bar' });
-        };
-      }
-
       listenQueryPathInstance({
         id: options.idModal,
         routeId: 'docs',

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

@@ -2,7 +2,7 @@ import { LoadingAnimation } from '../core/LoadingAnimation.js';
 import { loggerFactory } from '../core/Logger.js';
 import { cssEffect } from './Css.js';
 import { NotificationManager } from './NotificationManager.js';
-import { s } from './VanillaJs.js';
+import { s, isActiveElement } from './VanillaJs.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -13,10 +13,37 @@ const EventsUI = {
     let complete = true;
     s(id)[type] = async function (e) {
       if (options.clickEffect) cssEffect(id, e);
+      const noGate = !!options.noGate;
+      const noLoading = !!options.noLoading;
+      const playLoading = async () => {
+        if (!noLoading) {
+          await LoadingAnimation.spinner.play(loadingContainer ? loadingContainer : id);
+          if (options.context !== 'modal') await LoadingAnimation.bar.play(id);
+        }
+      };
+      const stopLoading = async () => {
+        if (!noLoading) {
+          if (options.context !== 'modal') LoadingAnimation.bar.stop(id);
+          await LoadingAnimation.spinner.stop(loadingContainer ? loadingContainer : id);
+        }
+      };
+      if (noGate) {
+        try {
+          await playLoading();
+          await logic(e);
+        } catch (error) {
+          logger.error(error);
+          NotificationManager.Push({
+            status: 'error',
+            html: error?.message ? error.message : error ? error : 'Event error',
+          });
+        }
+        await stopLoading();
+        return;
+      }
       if (complete) {
         complete = false;
-        await LoadingAnimation.spinner.play(loadingContainer ? loadingContainer : id);
-        if (options.context !== 'modal') await LoadingAnimation.bar.play(id);
+        await playLoading();
         try {
           await logic(e);
         } catch (error) {
@@ -26,8 +53,7 @@ const EventsUI = {
             html: error?.message ? error.message : error ? error : 'Event error',
           });
         }
-        if (options.context !== 'modal') LoadingAnimation.bar.stop(id);
-        await LoadingAnimation.spinner.stop(loadingContainer ? loadingContainer : id);
+        await stopLoading();
         complete = true;
         return;
       }
@@ -41,6 +67,67 @@ const EventsUI = {
   onChange: async function (id = '', logic = async function (e) {}, options = { loadingContainer: '' }) {
     return await this.on(id, logic, 'onchange', options);
   },
+  // Shared hover/focus controller extracted from Modal
+  HoverFocusController: function ({ inputSelector, panelSelector, activeElementId, onDismiss } = {}) {
+    let hoverPanel = false;
+    let hoverInput = false;
+    const isActive = () => (activeElementId ? isActiveElement(activeElementId) : false);
+    const shouldStay = () => isActive() || hoverPanel || hoverInput;
+    const bind = () => {
+      if (inputSelector && s(inputSelector)) {
+        s(inputSelector).onmouseover = () => {
+          hoverInput = true;
+        };
+        s(inputSelector).onmouseout = () => {
+          hoverInput = false;
+        };
+      }
+      if (panelSelector && s(panelSelector)) {
+        s(panelSelector).onmouseover = () => {
+          hoverPanel = true;
+        };
+        s(panelSelector).onmouseout = () => {
+          hoverPanel = false;
+          if (activeElementId && s(`.${activeElementId}`) && s(`.${activeElementId}`).focus)
+            s(`.${activeElementId}`).focus();
+        };
+      }
+    };
+    const checkDismiss = () => {
+      if (!shouldStay()) onDismiss && onDismiss();
+    };
+    return { bind, shouldStay, checkDismiss };
+  },
+  // Generic click-outside binding to dismiss a panel/modal
+  // Options:
+  //  - shouldStay: function -> boolean
+  //  - onDismiss: function
+  //  - anchors: array of selectors to treat as inside clicks (e.g., input button, panel container)
+  //  - graceMs: number of ms after binding to ignore clicks (avoid closing on the same click that opened)
+  bindDismissOnDocumentClick: function ({ shouldStay, onDismiss, anchors = [], graceMs = 200 } = {}) {
+    if (typeof document === 'undefined') return () => {};
+    const bindAt = Date.now();
+    const isInsideAnchors = (target) => {
+      if (!target) return false;
+      for (const sel of anchors) {
+        const el = sel && typeof sel === 'string' ? s(sel) : null;
+        if (el && (el === target || el.contains(target))) return true;
+      }
+      return false;
+    };
+    const handler = (e) => {
+      // Ignore very quick clicks right after binding
+      if (Date.now() - bindAt < graceMs) return;
+      // If click is within anchors, ignore
+      if (isInsideAnchors(e?.target)) return;
+      // Defer to allow hover flags to update first
+      setTimeout(() => {
+        if (!shouldStay || !shouldStay()) onDismiss && onDismiss();
+      });
+    };
+    document.addEventListener('click', handler, true);
+    return () => document.removeEventListener('click', handler, true);
+  },
 };
 
 export { EventsUI };