underpost 2.8.65 → 2.8.67

package/src/cli/monitor.js

@@ -5,6 +5,7 @@ import axios from 'axios';
 import UnderpostRootEnv from './env.js';
 import fs from 'fs-extra';
 import { shellExec } from '../server/process.js';
+import { isInternetConnection } from '../server/dns.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -13,7 +14,8 @@ class UnderpostMonitor {
     async callback(
       deployId,
       env = 'development',
-      options = { now: false, single: false, msInterval: '', type: '' },
+      options = { now: false, single: false, msInterval: '', type: '', replicas: '', sync: false },
+      commanderOptions,
       auxRouter,
     ) {
       if (deployId === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`)) {
@@ -22,6 +24,7 @@ class UnderpostMonitor {
             _deployId.trim(),
             env,
             options,
+            commanderOptions,
             await UnderpostDeploy.API.routerFactory(_deployId, env),
           );
         return;
@@ -36,15 +39,43 @@ class UnderpostMonitor {
 
       const pathPortAssignmentData = pathPortAssignmentFactory(router, confServer);
 
-      logger.info(`${deployId} ${env}`, pathPortAssignmentData);
-
       let errorPayloads = [];
-      let traffic = 'blue';
-      const maxAttempts = Object.keys(pathPortAssignmentData)
-        .map((host) => pathPortAssignmentData[host].length)
-        .reduce((accumulator, value) => accumulator + value, 0);
+      if (options.sync === true) {
+        const currentTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId);
+        if (currentTraffic) UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, currentTraffic);
+      }
+      let traffic = UnderpostRootEnv.API.get(`${deployId}-${env}-traffic`) ?? 'blue';
+      const maxAttempts = parseInt(
+        Object.keys(pathPortAssignmentData)
+          .map((host) => pathPortAssignmentData[host].length)
+          .reduce((accumulator, value) => accumulator + value, 0) * 2.5,
+      );
+
+      logger.info(`Init deploy monitor`, {
+        pathPortAssignmentData,
+        maxAttempts,
+        deployId,
+        env,
+        traffic,
+      });
+
+      const switchTraffic = () => {
+        if (traffic === 'blue') traffic = 'green';
+        else traffic = 'blue';
+        UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, traffic);
+        shellExec(
+          `node bin deploy --info-router --build-manifest --traffic ${traffic} --replicas ${
+            options.replicas ? options.replicas : 1
+          } ${deployId} ${env}`,
+        );
+        shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml`);
+      };
 
       const monitor = async (reject) => {
+        if (UnderpostRootEnv.API.get(`monitor-init-callback-script`))
+          shellExec(UnderpostRootEnv.API.get(`monitor-init-callback-script`));
+        const currentTimestamp = new Date().getTime();
+        errorPayloads = errorPayloads.filter((e) => currentTimestamp - e.timestamp < 60 * 1000 * 5);
         logger.info(`[${deployId}-${env}] Check server health`);
         for (const host of Object.keys(pathPortAssignmentData)) {
           for (const instance of pathPortAssignmentData[host]) {
@@ -52,6 +83,7 @@ class UnderpostMonitor {
             if (path.match('peer') || path.match('socket')) continue;
             let urlTest = `http://localhost:${port}${path}`;
             switch (options.type) {
+              case 'remote':
               case 'blue-green':
                 urlTest = `https://${host}${path}`;
                 break;
@@ -71,6 +103,7 @@ class UnderpostMonitor {
                 status: error.status,
                 code: error.code,
                 errors: error.errors,
+                timestamp: new Date().getTime(),
               };
               if (errorPayload.status !== 404) {
                 errorPayloads.push(errorPayload);
@@ -87,30 +120,31 @@ class UnderpostMonitor {
                           fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
                         );
 
+                        shellExec(`kubectl delete configmap underpost-config`);
+                        shellExec(
+                          `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env}`,
+                        );
+
                         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`);
-                        errorPayloads = [];
+                        switchTraffic();
                       }
 
                       break;
 
+                    case 'remote':
+                      break;
+
                     default:
                       if (reject) reject(message);
                       else throw new Error(message);
                   }
+                  errorPayloads = [];
                 }
-                logger.error('Error accumulator', errorPayloads.length);
+                logger.error(`Error accumulator ${deployId}-${env}-${traffic}`, errorPayloads.length);
               }
             });
           }
@@ -119,13 +153,19 @@ class UnderpostMonitor {
       if (options.now === true) await monitor();
       if (options.single === true) return;
       let optionsMsTimeout = parseInt(options.msInterval);
-      if (isNaN(optionsMsTimeout)) optionsMsTimeout = 30000;
+      if (isNaN(optionsMsTimeout)) optionsMsTimeout = 60250; // 60.25 seconds
       let monitorTrafficName;
       let monitorPodName;
       const monitorCallBack = (resolve, reject) => {
         const envMsTimeout = UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-ms`);
         setTimeout(
           async () => {
+            const isOnline = await isInternetConnection();
+            if (!isOnline) {
+              logger.warn('No internet connection');
+              monitorCallBack(resolve, reject);
+              return;
+            }
             switch (options.type) {
               case 'blue-green':
                 {
@@ -135,14 +175,17 @@ class UnderpostMonitor {
                   }
                   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}`;
+                    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}`;
+                      }
                     }
                   };
                   if (!monitorPodName) {
@@ -157,19 +200,30 @@ class UnderpostMonitor {
               default:
                 break;
             }
-            switch (UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-input`)) {
-              case 'pause':
-                monitorCallBack(resolve, reject);
-                return;
-              case 'restart':
-                return reject();
-              case 'stop':
-                return resolve();
-              default:
-                await monitor(reject);
-                monitorCallBack(resolve, reject);
-                return;
-            }
+            for (const monitorStatus of [
+              { key: `monitor-input`, value: UnderpostRootEnv.API.get(`monitor-input`) },
+              {
+                key: `${deployId}-${env}-monitor-input`,
+                value: UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-input`),
+              },
+            ])
+              switch (monitorStatus.value) {
+                case 'pause':
+                  monitorCallBack(resolve, reject);
+                  return;
+                case 'restart':
+                  UnderpostRootEnv.API.delete(monitorStatus.key);
+                  return reject();
+                case 'stop':
+                  UnderpostRootEnv.API.delete(monitorStatus.key);
+                  return resolve();
+                case 'blue-green-switch':
+                  UnderpostRootEnv.API.delete(monitorStatus.key);
+                  switchTraffic();
+              }
+            await monitor(reject);
+            monitorCallBack(resolve, reject);
+            return;
           },
           !isNaN(envMsTimeout) ? envMsTimeout : optionsMsTimeout,
         );

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

@@ -19,8 +19,8 @@ const JoyStick = {
             /* border: 2px solid red; */
             left: 5px;
             bottom: 5px;
-            height: 200px;
-            width: 200px;
+            height: 175px;
+            width: 175px;
             z-index: 3;
           }
           .joy-img-background-${id} {

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

@@ -1629,6 +1629,7 @@ const Modal = {
   currentTopModalId: '',
   zIndexSync: function ({ idModal }) {
     setTimeout(() => {
+      if (!this.Data[idModal]) return;
       const cleanTopModal = () => {
         Object.keys(this.Data).map((_idModal) => {
           if (this.Data[_idModal].options.zIndexSync && s(`.${_idModal}`)) s(`.${_idModal}`).style.zIndex = '3';

package/src/index.js

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

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

@@ -927,7 +927,9 @@ const rebuildConfFactory = ({ deployId, valkey, mongo }) => {
   const confServer = loadReplicas(
     JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
   );
+  const hosts = {};
   for (const host of Object.keys(confServer)) {
+    hosts[host] = {};
     for (const path of Object.keys(confServer[host])) {
       if (!confServer[host][path].db) continue;
       const { singleReplica, replicas, db } = confServer[host][path];
@@ -940,6 +942,7 @@ const rebuildConfFactory = ({ deployId, valkey, mongo }) => {
           );
           for (const _host of Object.keys(confServerReplica)) {
             for (const _path of Object.keys(confServerReplica[_host])) {
+              hosts[host][_path] = { replica: { host, path } };
               confServerReplica[_host][_path].valkey = valkey;
               switch (provider) {
                 case 'mongoose':
@@ -954,7 +957,7 @@ const rebuildConfFactory = ({ deployId, valkey, mongo }) => {
             'utf8',
           );
         }
-      }
+      } else hosts[host][path] = {};
       confServer[host][path].valkey = valkey;
       switch (provider) {
         case 'mongoose':
@@ -964,6 +967,7 @@ const rebuildConfFactory = ({ deployId, valkey, mongo }) => {
     }
   }
   fs.writeFileSync(`./engine-private/conf/${deployId}/conf.server.json`, JSON.stringify(confServer, null, 4), 'utf8');
+  return { hosts };
 };
 
 const getRestoreCronCmd = async (options = { host: '', path: '', conf: {}, deployId: '' }) => {

package/src/server/dns.js

@@ -5,6 +5,9 @@ import validator from 'validator';
 import { publicIp, publicIpv4, publicIpv6 } from 'public-ip';
 import { loggerFactory } from './logger.js';
 import UnderpostRootEnv from '../cli/env.js';
+import dns from 'node:dns';
+import os from 'node:os';
+import { shellExec } from './process.js';
 
 dotenv.config();
 
@@ -18,35 +21,59 @@ const ip = {
   },
 };
 
+const isInternetConnection = (domain = 'google.com') =>
+  new Promise((resolve) => dns.lookup(domain, {}, (err) => resolve(err ? false : true)));
+
+// export INTERFACE=$(ip route | grep default | cut -d ' ' -f 5)
+// export IP_ADDRESS=$(ip -4 addr show dev $INTERFACE | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+const getLocalIPv4Address = () =>
+  os.networkInterfaces()[
+    shellExec(`ip route | grep default | cut -d ' ' -f 5`, {
+      stdout: true,
+      silent: true,
+      disableLog: true,
+    }).trim()
+  ].find((i) => i.family === 'IPv4').address;
+
 class Dns {
   static callback = async function (deployList) {
     // Network topology configuration:
     // LAN -> [NAT-VPS](modem/router device) -> WAN
     // enabled DMZ Host to proxy IP 80-443 (79-444) sometimes router block first port
-    // disabled local red DHCP
+
+    // Enabling DHCP
+    // Navigate to Subnets > VLAN > Configure DHCP.
+    // Select the appropriate DHCP options (Managed or Relay).
+    // Save and apply changes.
+
     // verify inet ip proxy server address
     // DHCP (Dynamic Host Configuration Protocol) LAN reserver IP -> MAC ID
     // LAN server or device's local servers port ->  3000-3100 (2999-3101)
     // DNS Records: [ANAME](Address Dynamic) -> [A](ipv4) host | [AAAA](ipv6) host -> [public-ip]
     // Forward the router's TCP/UDP ports to the LAN device's IP address
-    for (const _deployId of deployList.split(',')) {
-      const deployId = _deployId.trim();
-      const privateCronConfPath = `./engine-private/conf/${deployId}/conf.cron.json`;
-      const confCronPath = fs.existsSync(privateCronConfPath) ? privateCronConfPath : './conf/conf.cron.json';
-      const confCronData = JSON.parse(fs.readFileSync(confCronPath, 'utf8'));
-
-      let testIp;
-
-      try {
-        testIp = await ip.public.ipv4();
-      } catch (error) {
-        logger.error(error, { testIp, stack: error.stack });
-      }
+    const isOnline = await isInternetConnection();
+
+    if (!isOnline) return;
 
-      const currentIp = UnderpostRootEnv.API.get('ip');
+    let testIp;
 
-      if (testIp && typeof testIp === 'string' && validator.isIP(testIp) && currentIp !== testIp) {
-        logger.info(`new ip`, testIp);
+    try {
+      testIp = await ip.public.ipv4();
+    } catch (error) {
+      logger.error(error, { testIp, stack: error.stack });
+    }
+
+    const currentIp = UnderpostRootEnv.API.get('ip');
+
+    if (validator.isIP(testIp) && currentIp !== testIp) {
+      logger.info(`new ip`, testIp);
+      UnderpostRootEnv.API.set('monitor-input', 'pause');
+
+      for (const _deployId of deployList.split(',')) {
+        const deployId = _deployId.trim();
+        const privateCronConfPath = `./engine-private/conf/${deployId}/conf.cron.json`;
+        const confCronPath = fs.existsSync(privateCronConfPath) ? privateCronConfPath : './conf/conf.cron.json';
+        const confCronData = JSON.parse(fs.readFileSync(confCronPath, 'utf8'));
         for (const recordType of Object.keys(confCronData.records)) {
           switch (recordType) {
             case 'A':
@@ -68,6 +95,7 @@ class Dns {
           if (verifyIp === testIp) {
             logger.info('ip updated successfully', testIp);
             UnderpostRootEnv.API.set('ip', testIp);
+            UnderpostRootEnv.API.delete('monitor-input');
           } else logger.error('ip not updated', testIp);
         } catch (error) {
           logger.error(error, error.stack);
@@ -102,3 +130,5 @@ class Dns {
 }
 
 export default Dns;
+
+export { Dns, ip, isInternetConnection, getLocalIPv4Address };

package/src/server/runtime.js

@@ -142,6 +142,8 @@ const buildRuntime = async () => {
           // if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
           //   $_SERVER['HTTPS'] = 'on';
           // }
+          // For plugins:
+          // define( 'FS_METHOD', 'direct' );
 
           // ErrorDocument 404 /custom_404.html
           // ErrorDocument 500 /custom_50x.html

package/src/server/start.js

@@ -1,5 +1,4 @@
 import UnderpostDeploy from '../cli/deploy.js';
-import UnderpostMonitor from '../cli/monitor.js';
 import fs from 'fs-extra';
 import { awaitDeployMonitor } from './conf.js';
 import { actionInitLog, loggerFactory } from './logger.js';