underpost 2.8.641 → 2.8.651

package/src/cli/monitor.js

@@ -4,13 +4,32 @@ import UnderpostDeploy from './deploy.js';
 import axios from 'axios';
 import UnderpostRootEnv from './env.js';
 import fs from 'fs-extra';
+import { shellExec } from '../server/process.js';
 
 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);
+    async callback(
+      deployId,
+      env = 'development',
+      options = { now: false, single: false, msInterval: '', type: '' },
+      commanderOptions,
+      auxRouter,
+    ) {
+      if (deployId === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`)) {
+        for (const _deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(','))
+          UnderpostMonitor.API.callback(
+            _deployId.trim(),
+            env,
+            options,
+            commanderOptions,
+            await UnderpostDeploy.API.routerFactory(_deployId, env),
+          );
+        return;
+      }
+
+      const router = auxRouter ?? (await UnderpostDeploy.API.routerFactory(deployId, env));
 
       const confServer = loadReplicas(
         JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
@@ -19,20 +38,30 @@ class UnderpostMonitor {
 
       const pathPortAssignmentData = pathPortAssignmentFactory(router, confServer);
 
-      logger.info('', pathPortAssignmentData);
+      logger.info(`${deployId} ${env}`, pathPortAssignmentData);
 
-      const errorPayloads = [];
+      let errorPayloads = [];
+      let traffic = 'blue';
       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');
+        logger.info(`[${deployId}-${env}] 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}`;
+            let urlTest = `http://localhost:${port}${path}`;
+            switch (options.type) {
+              case 'remote':
+              case 'blue-green':
+                urlTest = `https://${host}${path}`;
+                break;
+
+              default:
+                break;
+            }
             // logger.info('Test instance', urlTest);
             await axios.get(urlTest, { timeout: 10000 }).catch((error) => {
               // console.log(error);
@@ -50,8 +79,42 @@ class UnderpostMonitor {
                 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(
+                    `Deployment ${deployId} ${env} has been reached max attempts error payloads`,
+                    errorPayloads,
+                  );
+                  switch (options.type) {
+                    case 'blue-green':
+                      {
+                        const confServer = JSON.parse(
+                          fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
+                        );
+
+                        for (const host of Object.keys(confServer)) {
+                          shellExec(`sudo kubectl delete HTTPProxy ${host}`);
+                        }
+                        shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${traffic}`);
+
+                        if (traffic === 'blue') traffic = 'green';
+                        else traffic = 'blue';
+
+                        shellExec(
+                          `node bin deploy --info-router --build-manifest --traffic ${traffic} ${deployId} ${env}`,
+                        );
+
+                        shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml`);
+                      }
+
+                      break;
+
+                    case 'remote':
+                      break;
+
+                    default:
+                      if (reject) reject(message);
+                      else throw new Error(message);
+                  }
+                  errorPayloads = [];
                 }
                 logger.error('Error accumulator', errorPayloads.length);
               }
@@ -63,11 +126,44 @@ class UnderpostMonitor {
       if (options.single === true) return;
       let optionsMsTimeout = parseInt(options.msInterval);
       if (isNaN(optionsMsTimeout)) optionsMsTimeout = 30000;
+      let monitorTrafficName;
+      let monitorPodName;
       const monitorCallBack = (resolve, reject) => {
-        const envMsTimeout = UnderpostRootEnv.API.get('monitor-ms');
+        const envMsTimeout = UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-ms`);
         setTimeout(
           async () => {
-            switch (UnderpostRootEnv.API.get('monitor-input')) {
+            switch (options.type) {
+              case 'blue-green':
+                {
+                  if (monitorTrafficName !== traffic) {
+                    monitorTrafficName = undefined;
+                    monitorPodName = undefined;
+                  }
+                  const cmd = `underpost config get container-status`;
+                  const checkDeploymentReadyStatus = () => {
+                    const [podName] = UnderpostDeploy.API.get(`${deployId}-${env}-${traffic}`);
+                    if (
+                      shellExec(`sudo kubectl exec -i ${podName} -- sh -c "${cmd}"`, { stdout: true }).match(
+                        `${deployId}-${env}-running-deployment`,
+                      )
+                    ) {
+                      monitorPodName = podName;
+                      monitorTrafficName = `${traffic}`;
+                    }
+                  };
+                  if (!monitorPodName) {
+                    checkDeploymentReadyStatus();
+                    monitorCallBack(resolve, reject);
+                    return;
+                  }
+                }
+
+                break;
+
+              default:
+                break;
+            }
+            switch (UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-input`)) {
               case 'pause':
                 monitorCallBack(resolve, reject);
                 return;
@@ -84,7 +180,7 @@ class UnderpostMonitor {
           !isNaN(envMsTimeout) ? envMsTimeout : optionsMsTimeout,
         );
       };
-      return await new Promise((...args) => monitorCallBack(...args));
+      return new Promise((...args) => monitorCallBack(...args));
     },
   };
 }

package/src/cli/repository.js

@@ -4,7 +4,7 @@ import { pbcopy, shellExec } from '../server/process.js';
 import { actionInitLog, loggerFactory } from '../server/logger.js';
 import fs from 'fs-extra';
 import { getNpmRootPath } from '../server/conf.js';
-import { listenPortController, listenServerFactory } from '../server/network.js';
+import UnderpostStartUp from '../server/start.js';
 
 dotenv.config();
 
@@ -78,7 +78,10 @@ class UnderpostRepository {
       return new Promise(async (resolve, reject) => {
         try {
           await logger.setUpInfo();
-          if (repositoryName === 'service') return resolve(await listenPortController(listenServerFactory(), ':'));
+          if (repositoryName === 'service')
+            return resolve(
+              await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), ':'),
+            );
           else actionInitLog();
           const exeRootPath = `${getNpmRootPath()}/underpost`;
           const destFolder = `./${repositoryName}`;

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

@@ -204,7 +204,7 @@ const Account = {
             disabled: false,
             extension: async () =>
               html`${await BtnIcon.Render({
-                class: `wfa btn-input-extension btn-account-update-username`,
+                class: `in wfa btn-input-extension btn-account-update-username`,
                 type: 'button',
                 style: 'text-align: left',
                 label: html`${Translate.Render(`update`)}`,
@@ -223,7 +223,7 @@ const Account = {
             extension: !(options && options.disabled && options.disabled.includes('emailConfirm'))
               ? async () => html`<div class="in verify-email-status"></div>
                   ${await BtnIcon.Render({
-                    class: `wfa btn-input-extension btn-confirm-email`,
+                    class: `in wfa btn-input-extension btn-confirm-email`,
                     type: 'button',
                     style: 'text-align: left',
                     label: html`<div class="in">
@@ -246,7 +246,7 @@ const Account = {
             disabledEye: true,
             extension: async () =>
               html`${await BtnIcon.Render({
-                class: `wfa btn-input-extension btn-account-change-password`,
+                class: `in wfa btn-input-extension btn-account-change-password`,
                 type: 'button',
                 style: 'text-align: left',
                 label: html`${Translate.Render(`change-password`)}`,

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

@@ -761,7 +761,6 @@ const renderWave = ({ id }) => {
 const cssTokensEffect = {};
 const cssTokensContainer = {};
 const cssEffect = async (containerSelector, event) => {
-  return;
   // Array.from(event.target.classList)
   let offsetX, offsetY;
   if (Array.from(event.srcElement.classList).includes('ripple') && cssTokensContainer[containerSelector]) {

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

@@ -524,6 +524,7 @@ const CssCoreDark = {
           margin: 5px 0 0 0;
           padding: 5px;
           font-size: 16px;
+          min-height: 40px;
         }
         .btn-input-extension:hover {
         }
@@ -843,6 +844,7 @@ const CssCoreLight = {
           margin: 5px 0 0 0;
           padding: 5px;
           font-size: 16px;
+          min-height: 40px;
         }
         .btn-input-extension:hover {
         }

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

@@ -12,7 +12,7 @@ const EventsUI = {
     if (!s(id)) return;
     let complete = true;
     s(id)[type] = async function (e) {
-      cssEffect(id, e);
+      if (options.clickEffect) cssEffect(id, e);
       if (complete) {
         complete = false;
         await LoadingAnimation.spinner.play(loadingContainer ? loadingContainer : id);

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

@@ -7,28 +7,18 @@ const RichText = {
   Render: async function (options = { id: '', parentIdModal: '' }) {
     const id = options?.id ? options.id : getId(this.Tokens, 'rich-text-');
     this.Tokens[id] = {};
-    let top, height;
     setTimeout(() => {
       const easyMDE = new EasyMDE({
         element: s(`.${id}`),
+        hideIcons: ['fullscreen', 'side-by-side'],
         onToggleFullScreen: (onFs) => {
           if (onFs) {
             if (options.parentIdModal) {
-              s(`.btn-bar-modal-container-${options.parentIdModal}`).classList.add('hide');
-              top = newInstance(s(`.${options.parentIdModal}`).style.top);
-              height = newInstance(s(`.${options.parentIdModal}`).style.height);
-              s(`.${options.parentIdModal}`).style.top = '0px';
-              s(`.${options.parentIdModal}`).style.height = `${window.innerHeight}px`;
             }
             // Modal.cleanUI();
-            if (s(`.slide-menu-top-bar`)) s(`.slide-menu-top-bar`).classList.add('hide');
           } else {
             if (options.parentIdModal) {
-              s(`.btn-bar-modal-container-${options.parentIdModal}`).classList.remove('hide');
-              s(`.${options.parentIdModal}`).style.top = top;
-              s(`.${options.parentIdModal}`).style.height = height;
             }
-            if (s(`.slide-menu-top-bar`)) s(`.slide-menu-top-bar`).classList.add('remove');
             // Modal.restoreUI();
           }
         },

package/src/index.js

@@ -16,6 +16,7 @@ import UnderpostRepository from './cli/repository.js';
 import UnderpostScript from './cli/script.js';
 import UnderpostSecret from './cli/secrets.js';
 import UnderpostTest from './cli/test.js';
+import UnderpostStartUp from './server/start.js';
 
 /**
  * Underpost main module methods
@@ -29,7 +30,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.641';
+  static version = 'v2.8.651';
   /**
    * Repository cli API
    * @static
@@ -51,6 +52,13 @@ class Underpost {
    * @memberof Underpost
    */
   static test = UnderpostTest.API;
+  /**
+   * Underpost Start Up cli API
+   * @static
+   * @type {UnderpostStartUp.API}
+   * @memberof Underpost
+   */
+  static start = UnderpostStartUp.API;
   /**
    * Cluster cli API
    * @static
@@ -93,13 +101,6 @@ class Underpost {
    * @memberof Underpost
    */
   static deploy = UnderpostDeploy.API;
-  /**
-   * Deployment cli NETWORK
-   * @static
-   * @type {UnderpostDeploy.NETWORK}
-   * @memberof Underpost
-   */
-  static deployNetwork = UnderpostDeploy.NETWORK;
   /**
    * Cron cli API
    * @static

package/src/mailer/MailerProvider.js

@@ -32,6 +32,9 @@ const MailerProvider = {
     },
   ) {
     try {
+      options.transport.tls = {
+        rejectUnauthorized: false,
+      };
       const { id } = options;
       // Generate test SMTP service account from ethereal.email
       // Only needed if you don't have a real mail account for testing

package/src/server/client-build.js

@@ -683,6 +683,19 @@ Sitemap: https://${host}${path === '/' ? '' : path}/sitemap.xml`,
 root file where the route starts, such as index.js, app.js, routes.js, etc ... */
 
         await swaggerAutoGen({ openapi: '3.0.0' })(outputFile, routes, doc);
+
+        const htmlFiles = await fs.readdir(`./public/${host}/docs/engine/${Underpost.version.replace('v', '')}`);
+        for (const htmlFile of htmlFiles) {
+          if (htmlFile.match('.html')) {
+            fs.writeFileSync(
+              `./public/${host}/docs/engine/${Underpost.version.replace('v', '')}/${htmlFile}`,
+              fs
+                .readFileSync(`./public/${host}/docs/engine/${Underpost.version.replace('v', '')}/${htmlFile}`, 'utf8')
+                .replaceAll('Tutorials', 'References'),
+              'utf8',
+            );
+          }
+        }
       }
 
       if (client) {

package/src/server/conf.js

@@ -923,6 +923,49 @@ const mergeFile = async (parts = [], outputFilePath) => {
   });
 };
 
+const rebuildConfFactory = ({ deployId, valkey, mongo }) => {
+  const confServer = loadReplicas(
+    JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
+  );
+  for (const host of Object.keys(confServer)) {
+    for (const path of Object.keys(confServer[host])) {
+      if (!confServer[host][path].db) continue;
+      const { singleReplica, replicas, db } = confServer[host][path];
+      const { provider } = db;
+      if (singleReplica) {
+        for (const replica of replicas) {
+          const deployIdReplica = buildReplicaId({ replica, deployId });
+          const confServerReplica = JSON.parse(
+            fs.readFileSync(`./engine-private/replica/${deployIdReplica}/conf.server.json`, 'utf8'),
+          );
+          for (const _host of Object.keys(confServerReplica)) {
+            for (const _path of Object.keys(confServerReplica[_host])) {
+              confServerReplica[_host][_path].valkey = valkey;
+              switch (provider) {
+                case 'mongoose':
+                  confServerReplica[_host][_path].db.host = mongo.host;
+                  break;
+              }
+            }
+          }
+          fs.writeFileSync(
+            `./engine-private/replica/${deployIdReplica}/conf.server.json`,
+            JSON.stringify(confServerReplica, null, 4),
+            'utf8',
+          );
+        }
+      }
+      confServer[host][path].valkey = valkey;
+      switch (provider) {
+        case 'mongoose':
+          confServer[host][path].db.host = mongo.host;
+          break;
+      }
+    }
+  }
+  fs.writeFileSync(`./engine-private/conf/${deployId}/conf.server.json`, JSON.stringify(confServer, null, 4), 'utf8');
+};
+
 const getRestoreCronCmd = async (options = { host: '', path: '', conf: {}, deployId: '' }) => {
   const { host, path, conf, deployId } = options;
   const { runtime, db, git, directory } = conf[host][path];
@@ -1166,4 +1209,5 @@ export {
   pathPortAssignmentFactory,
   deployRangePortFactory,
   awaitDeployMonitor,
+  rebuildConfFactory,
 };

package/src/server/peer.js

@@ -2,7 +2,7 @@ import { PeerServer } from 'peer';
 import dotenv from 'dotenv';
 import { loggerFactory } from './logger.js';
 import fs from 'fs-extra';
-import { listenServerFactory } from './network.js';
+import UnderpostStartUp from './start.js';
 
 dotenv.config();
 
@@ -25,7 +25,7 @@ const createPeerServer = async ({ port, devPort, origins, host, path }) => {
     // cert: fs.readFileSync(''),
     // ca: fs.readFileSync(''),
   };
-  const peerServer = listenServerFactory(() => PeerServer(options));
+  const peerServer = UnderpostStartUp.API.listenServerFactory(() => PeerServer(options));
 
   return { options, peerServer, meta: import.meta };
 };

package/src/server/proxy.js

@@ -5,9 +5,9 @@ import dotenv from 'dotenv';
 
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { loggerFactory, loggerMiddleware } from './logger.js';
-import { listenPortController } from './network.js';
 import { createSslServer, sslRedirectMiddleware } from './ssl.js';
 import { buildPortProxyRouter, buildProxyRouter, maintenanceMiddleware } from './conf.js';
+import UnderpostStartUp from './start.js';
 
 dotenv.config();
 
@@ -71,11 +71,11 @@ const buildProxy = async () => {
         switch (port) {
           case 443:
             const { ServerSSL } = await createSslServer(app, hosts);
-            await listenPortController(ServerSSL, port, runningData);
+            await UnderpostStartUp.API.listenPortController(ServerSSL, port, runningData);
             break;
 
           default:
-            await listenPortController(app, port, runningData);
+            await UnderpostStartUp.API.listenPortController(app, port, runningData);
 
             break;
         }
@@ -83,7 +83,7 @@ const buildProxy = async () => {
         break;
 
       default:
-        await listenPortController(app, port, runningData);
+        await UnderpostStartUp.API.listenPortController(app, port, runningData);
 
         break;
     }

package/src/server/runtime.js

@@ -9,7 +9,7 @@ import compression from 'compression';
 
 import { createServer } from 'http';
 import { getRootDirectory } from './process.js';
-import { listenPortController, logRuntimeRouter, listenServerFactory } from './network.js';
+import UnderpostStartUp from './start.js';
 import { loggerFactory, loggerMiddleware } from './logger.js';
 import { getCapVariableName, newInstance } from '../client/components/core/CommonJs.js';
 import { Xampp } from '../runtime/xampp/Xampp.js';
@@ -21,6 +21,7 @@ import { Lampp } from '../runtime/lampp/Lampp.js';
 import { getDeployId } from './conf.js';
 import { JSONweb, ssrFactory } from './client-formatted.js';
 import Underpost from '../index.js';
+import { createValkeyConnection } from './valkey.js';
 
 dotenv.config();
 
@@ -67,6 +68,7 @@ const buildRuntime = async () => {
         peer,
         singleReplica,
         replicas,
+        valkey,
       } = confServer[host][path];
 
       if (singleReplica && replicas && replicas.length > 0 && !singleReplicaHosts.includes(host)) {
@@ -182,7 +184,11 @@ const buildRuntime = async () => {
           // RewriteCond %{HTTP_HOST} ^(?:www\.)?(.+)$ [NC]
           // RewriteRule ^ https://%1%{REQUEST_URI} [L,NE,R=301]
 
-          await listenPortController(listenServerFactory(), port, runningData);
+          await UnderpostStartUp.API.listenPortController(
+            UnderpostStartUp.API.listenServerFactory(),
+            port,
+            runningData,
+          );
           break;
         case 'xampp':
           if (!Xampp.enabled()) continue;
@@ -229,7 +235,11 @@ const buildRuntime = async () => {
           // if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
           //   $_SERVER['HTTPS'] = 'on';
           // }
-          await listenPortController(listenServerFactory(), port, runningData);
+          await UnderpostStartUp.API.listenPortController(
+            UnderpostStartUp.API.listenServerFactory(),
+            port,
+            runningData,
+          );
           break;
         case 'nodejs':
           const app = express();
@@ -282,7 +292,7 @@ const buildRuntime = async () => {
             currentPort += 2;
             const staticPort = newInstance(currentPort);
 
-            await listenPortController(app, staticPort, runningData);
+            await UnderpostStartUp.API.listenPortController(app, staticPort, runningData);
             currentPort++;
             continue;
           }
@@ -333,7 +343,7 @@ const buildRuntime = async () => {
             //   }),
             // );
 
-            await listenPortController(app, port, runningData);
+            await UnderpostStartUp.API.listenPortController(app, port, runningData);
             break;
           }
 
@@ -353,6 +363,9 @@ const buildRuntime = async () => {
 
           if (db && apis) await DataBaseProvider.load({ apis, host, path, db });
 
+          // valkey server
+          await createValkeyConnection({ host, path }, valkey);
+
           if (mailer) {
             const mailerSsrConf = confSSR[getCapVariableName(client)];
             await MailerProvider.load({
@@ -441,7 +454,7 @@ const buildRuntime = async () => {
                 port,
                 origins,
               });
-              await listenPortController(listenServerFactory(), port, {
+              await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), port, {
                 runtime: 'nodejs',
                 client: null,
                 host,
@@ -461,7 +474,7 @@ const buildRuntime = async () => {
               path,
             });
 
-            await listenPortController(peerServer, peerPort, {
+            await UnderpostStartUp.API.listenPortController(peerServer, peerPort, {
               runtime: 'nodejs',
               client: null,
               host,
@@ -470,7 +483,7 @@ const buildRuntime = async () => {
             });
           }
 
-          await listenPortController(server, port, runningData);
+          await UnderpostStartUp.API.listenPortController(server, port, runningData);
 
           break;
         default:
@@ -483,7 +496,7 @@ const buildRuntime = async () => {
   if (Xampp.enabled() && Xampp.router) Xampp.initService();
   if (Lampp.enabled() && Lampp.router) Lampp.initService();
 
-  logRuntimeRouter();
+  UnderpostStartUp.API.logRuntimeRouter();
 };
 
 export { buildRuntime };