underpost 2.8.52 → 2.8.55

package/src/cli/deploy.js

@@ -180,28 +180,42 @@ spec:
     async callback(
       deployList = 'default',
       env = 'development',
-      options = { remove: false, infoRouter: false, sync: false, buildManifest: false },
+      options = { remove: false, infoRouter: false, sync: false, buildManifest: false, infoUtil: false, expose: false },
     ) {
+      if (options.infoUtil === true)
+        return logger.info(`
+kubectl rollout restart deployment/deployment-name
+kubectl rollout undo deployment/deployment-name
+kubectl scale statefulsets <stateful-set-name> --replicas=<new-replicas>
+        `);
       if (deployList === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`))
         deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
       if (options.sync) UnderpostDeploy.API.sync(deployList);
       if (options.buildManifest === true) await UnderpostDeploy.API.buildManifest(deployList, env);
       if (options.infoRouter === true)
         return logger.info('router', await UnderpostDeploy.API.routerFactory(deployList, env));
+      const etcHost = (
+        concat,
+      ) => `127.0.0.1  ${concat} localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6`;
+      let concatHots = '';
 
       for (const _deployId of deployList.split(',')) {
         const deployId = _deployId.trim();
         if (!deployId) continue;
-
+        if (options.expose === true) {
+          const svc = UnderpostDeploy.API.get(deployId, 'svc')[0];
+          const port = parseInt(svc[`PORT(S)`].split('/TCP')[0]);
+          logger.info(deployId, {
+            svc,
+            port,
+          });
+          shellExec(`sudo kubectl port-forward -n default svc/${svc.NAME} ${port}:${port}`, { async: true });
+          continue;
+        }
         shellExec(`sudo kubectl delete svc ${deployId}-${env}-service`);
         shellExec(`sudo kubectl delete deployment ${deployId}-${env}`);
 
-        const etcHost = (
-          concat,
-        ) => `127.0.0.1  ${concat} localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6`;
-        let concatHots = '';
-
         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}`);
@@ -219,38 +233,37 @@ spec:
           shellExec(`sudo kubectl apply -f ./${manifestsPath}/proxy.yaml`);
           if (env === 'production') shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml`);
         }
+      }
+      let renderHosts;
+      switch (process.platform) {
+        case 'linux':
+          {
+            switch (env) {
+              case 'development':
+                renderHosts = etcHost(concatHots);
+                fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
 
-        let renderHosts;
-
-        switch (process.platform) {
-          case 'linux':
-            {
-              switch (env) {
-                case 'development':
-                  renderHosts = etcHost(concatHots);
-                  fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
-
-                  break;
+                break;
 
-                default:
-                  break;
-              }
+              default:
+                break;
             }
-            break;
+          }
+          break;
 
-          default:
-            break;
-        }
+        default:
+          break;
+      }
+      if (renderHosts)
         logger.info(
           `
 ` + renderHosts,
         );
-      }
     },
-    getPods(deployId) {
-      const raw = shellExec(`sudo kubectl get pods --all-namespaces -o wide`, {
+    get(deployId, kindType = 'pods') {
+      const raw = shellExec(`sudo kubectl get ${kindType} --all-namespaces -o wide`, {
         stdout: true,
-        disableLog: false,
+        disableLog: true,
         silent: true,
       });
 

package/src/cli/image.js

@@ -54,23 +54,6 @@ class UnderpostImage {
             {
               const lamppPublicPath = '/xampp/htdocs/online';
               shellExec(`sudo mkdir -p ${lamppPublicPath}`);
-
-              {
-                shellExec(
-                  `cd ${lamppPublicPath} && git clone https://${process.env.GITHUB_TOKEN}@github.com/${process.env.DD_LAMPP_REPO_0}`,
-                );
-
-                shellExec(`cd ${lamppPublicPath} && sudo ${process.env.DD_LAMPP_SCRIPT_0}`);
-
-                shellExec(
-                  `sudo sed -i -e "s@define( 'DB_HOST', 'localhost' );@define( 'DB_HOST', '${process.env.MARIADB_HOST}' );@g" ${lamppPublicPath}/${process.env.DD_LAMPP_REPO_0_FOLDER}/wp-config.php`,
-                );
-              }
-              {
-                shellExec(
-                  `cd ${lamppPublicPath} && git clone https://${process.env.GITHUB_TOKEN}@github.com/${process.env.DD_LAMPP_REPO_1}`,
-                );
-              }
             }
             break;
 
@@ -109,7 +92,7 @@ class UnderpostImage {
         shellExec(`node bin/deploy conf ${deployId} ${env}`);
         shellExec(`node bin/deploy build-full-client ${deployId}`);
         if (options.run === true) {
-          const runCmd = env === 'production' ? 'start' : 'run dev-img';
+          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) {

package/src/cli/script.js

@@ -2,6 +2,7 @@ import { getNpmRootPath } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
+import UnderpostDeploy from './deploy.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -13,8 +14,31 @@ class UnderpostScript {
       packageJson.scripts[key] = value;
       fs.writeFileSync(`${npmRoot}/package.json`, JSON.stringify(packageJson, null, 4));
     },
-    run(key) {
+    run(key, value, options) {
       const npmRoot = `${getNpmRootPath()}/underpost`;
+      const packageJson = JSON.parse(fs.readFileSync(`${npmRoot}/package.json`, 'utf8'));
+      if (options.itc === true) {
+        value = packageJson.scripts[key];
+        const podScriptPath = `${options.itcPath && typeof options.itcPath === 'string' ? options.itcPath : '/'}${value
+          .split('/')
+          .pop()}`;
+        const nameSpace = options.ns && typeof options.ns === 'string' ? options.ns : 'default';
+        const podMatch = options.podName && typeof options.podName === 'string' ? options.podName : key;
+
+        if (fs.existsSync(`${value}`)) {
+          for (const pod of UnderpostDeploy.API.get(podMatch)) {
+            shellExec(`sudo kubectl cp ${value} ${nameSpace}/${pod.NAME}:${podScriptPath}`);
+            const cmd = `node ${podScriptPath}`;
+            shellExec(`sudo kubectl exec -i ${pod.NAME} -- sh -c "${cmd}"`);
+          }
+        } else {
+          for (const pod of UnderpostDeploy.API.get(podMatch)) {
+            shellExec(`sudo kubectl exec -i ${pod.NAME} -- sh -c "${value}"`);
+          }
+        }
+
+        return;
+      }
       shellExec(`cd ${npmRoot} && npm run ${key}`);
     },
     get(key) {

package/src/cli/test.js

@@ -1,3 +1,4 @@
+import { timer } from '../client/components/core/CommonJs.js';
 import { MariaDB } from '../db/mariadb/MariaDB.js';
 import { getNpmRootPath } from '../server/conf.js';
 import { actionInitLog, loggerFactory, setUpInfo } from '../server/logger.js';
@@ -28,9 +29,17 @@ class UnderpostTest {
       actionInitLog();
       shellExec(`cd ${getNpmRootPath()}/underpost && npm run test`);
     },
-    async callback(deployList = '', options = { insideContainer: false, sh: false, logs: false }) {
+    async callback(deployList = '', options = { itc: false, sh: false, logs: false }) {
+      if (
+        options.podName &&
+        typeof options.podName === 'string' &&
+        options.podStatus &&
+        typeof options.podStatus === 'string'
+      )
+        return await UnderpostTest.API.podStatusMonitor(options.podName, options.podStatus);
+
       if (options.sh === true || options.logs === true) {
-        const [pod] = UnderpostDeploy.API.getPods(deployList);
+        const [pod] = UnderpostDeploy.API.get(deployList);
         if (pod) {
           if (options.sh) return pbcopy(`sudo kubectl exec -it ${pod.NAME} -- sh`);
           if (options.logs) return shellExec(`sudo kubectl logs -f ${pod.NAME}`);
@@ -41,7 +50,7 @@ class UnderpostTest {
         for (const _deployId of deployList.split(',')) {
           const deployId = _deployId.trim();
           if (!deployId) continue;
-          if (options.insideContainer === true)
+          if (options.itc === true)
             switch (deployId) {
               case 'dd-lampp':
                 {
@@ -64,7 +73,7 @@ class UnderpostTest {
                 break;
             }
           else {
-            const pods = UnderpostDeploy.API.getPods(deployId);
+            const pods = UnderpostDeploy.API.get(deployId);
             if (pods.length > 0)
               for (const deployData of pods) {
                 const { NAME } = deployData;
@@ -77,6 +86,21 @@ class UnderpostTest {
         }
       } else return UnderpostTest.API.run();
     },
+    podStatusMonitor(podName, status = 'Running', deltaMs = 1000) {
+      return new Promise(async (resolve) => {
+        let index = 0;
+        logger.info(`Loading ${podName} instance`, { status, deltaMs });
+        const _monitor = async () => {
+          await timer(deltaMs);
+          const result = UnderpostDeploy.API.get(podName).find((p) => p.STATUS === status);
+          logger.info(`Testing pod ${podName}... ${result ? 1 : 0}/1 - elapsed time ${deltaMs * (index + 1)}ms`);
+          if (result) return resolve();
+          index++;
+          return _monitor();
+        };
+        await _monitor();
+      });
+    },
   };
 }
 

package/src/db/mongo/MongooseDB.js

@@ -79,7 +79,19 @@ const MongooseDB = {
               if (process.argv.includes('rocky')) {
                 // https://github.com/mongodb/mongodb-selinux
                 // https://www.mongodb.com/docs/v7.0/tutorial/install-mongodb-enterprise-on-red-hat/
-                shellExec(`sudo chown -R mongod:mongod /var/lib/mongo`);
+                // https://www.mongodb.com/docs/v6.0/tutorial/install-mongodb-on-red-hat/
+                // https://www.mongodb.com/docs/v4.4/tutorial/install-mongodb-on-red-hat/
+                // dnf install selinux-policy-devel
+                // git clone https://github.com/mongodb/mongodb-selinux
+                // cd mongodb-selinux
+                // make
+                // sudo make install
+                // yum list installed | grep mongo
+                // sudo yum erase $(rpm -qa | grep mongodb)
+                // remove service
+                // sudo systemctl reset-failed
+                // MongoDB 5.0+ requires a CPU with AVX support
+                // check: grep avx /proc/cpuinfo
               }
               logger.info('install legacy 4.4');
               shellExec(`wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -`);
@@ -112,9 +124,13 @@ const MongooseDB = {
           shellExec(`sudo systemctl unmask mongod`);
           shellExec(`sudo pkill -f mongod`);
           shellExec(`sudo systemctl enable mongod.service`);
+
           shellExec(`sudo chown -R mongodb:mongodb /var/lib/mongodb`);
           shellExec(`sudo chown mongodb:mongodb /tmp/mongodb-27017.sock`);
 
+          shellExec(`sudo chown -R mongod:mongod /var/lib/mongodb`);
+          shellExec(`sudo chown mongod:mongod /tmp/mongodb-27017.sock`);
+
           logger.info('run server');
           shellExec(`sudo service mongod restart`);
 

package/src/index.js

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

package/src/server/backup.js

@@ -9,7 +9,7 @@ dotenv.config();
 const logger = loggerFactory(import.meta);
 
 class BackUp {
-  static callback = async function (deployList, options = { disableKindCluster: false }) {
+  static callback = async function (deployList, options = { itc: false }) {
     if ((!deployList || deployList === 'dd') && fs.existsSync(`./engine-private/deploy/dd.router`))
       deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
 
@@ -25,7 +25,7 @@ class BackUp {
       const deployId = _deployId.trim();
       if (!deployId) continue;
 
-      if (options.disableKindCluster !== true) {
+      if (!(options.itc === true)) {
         shellExec(`underpost db --export ${deployId}`);
         continue;
       }

package/src/server/conf.js

@@ -19,17 +19,8 @@ import { DefaultConf } from '../../conf.js';
 import read from 'read';
 import splitFile from 'split-file';
 import axios from 'axios';
-import https from 'https';
 import { ssrFactory } from './client-formatted.js';
 
-// axios.defaults.baseURL = BASE_URL;
-
-// const httpsAgent = new https.Agent({
-//   rejectUnauthorized: false,
-// });
-
-// axios.defaults.httpsAgent = httpsAgent;
-
 colors.enable();
 
 dotenv.config();
@@ -1004,7 +995,7 @@ const Cmd = {
   syncPorts: (deployGroupId) => `node bin/deploy sync-env-port ${deployGroupId}`,
   cron: (deployList, jobList, name, expression, options) =>
     `pm2 start ./bin/index.js --no-autorestart --instances 1 --cron "${expression}" --name ${name} -- cron ${
-      options?.disableKindCluster ? `--disable-kind-cluster ` : ''
+      options?.itc ? `--itc ` : ''
     }${deployList} ${jobList}`,
 };
 
@@ -1082,6 +1073,8 @@ const getNpmRootPath = () =>
     silent: true,
   }).trim();
 
+const getUnderpostRootPath = () => `${getNpmRootPath()}/underpost`;
+
 const writeEnv = (envPath, envObj) =>
   fs.writeFileSync(
     envPath,
@@ -1127,5 +1120,6 @@ export {
   buildPortProxyRouter,
   splitFileFactory,
   getNpmRootPath,
+  getUnderpostRootPath,
   writeEnv,
 };

package/src/server/dns.js

@@ -1,17 +1,10 @@
 import axios from 'axios';
 import dotenv from 'dotenv';
 import fs from 'fs';
-import https from 'https';
 import validator from 'validator';
 import { ip } from './network.js';
 import { loggerFactory } from './logger.js';
-import { shellExec } from './process.js';
-
-const httpsAgent = new https.Agent({
-  rejectUnauthorized: false,
-});
-
-axios.defaults.httpsAgent = httpsAgent;
+import UnderpostRootEnv from '../cli/env.js';
 
 dotenv.config();
 
@@ -30,47 +23,47 @@ class Dns {
     // 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'));
+      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;
+      let testIp;
 
-    try {
-      testIp = await ip.public.ipv4();
-    } catch (error) {
-      logger.error(error, { testIp, stack: error.stack });
-    }
-      const ipFileName = `${deployId}.ip`;
-      const currentIp = fs.existsSync(`./engine-private/deploy/${ipFileName}`)
-        ? fs.readFileSync(`./engine-private/deploy/${ipFileName}`, 'utf8')
-      : undefined;
+      try {
+        testIp = await ip.public.ipv4();
+      } catch (error) {
+        logger.error(error, { testIp, stack: error.stack });
+      }
+
+      const currentIp = UnderpostRootEnv.API.get('ip');
 
-    if (testIp && typeof testIp === 'string' && validator.isIP(testIp) && currentIp !== testIp) {
-      logger.info(`new ip`, testIp);
-      for (const recordType of Object.keys(confCronData.records)) {
-        switch (recordType) {
-          case 'A':
-            for (const dnsProvider of confCronData.records[recordType]) {
-              if (typeof Dns.services.updateIp[dnsProvider.dns] === 'function')
-                await Dns.services.updateIp[dnsProvider.dns]({ ...dnsProvider, ip: testIp });
-            }
-            break;
+      if (testIp && typeof testIp === 'string' && validator.isIP(testIp) && currentIp !== testIp) {
+        logger.info(`new ip`, testIp);
+        for (const recordType of Object.keys(confCronData.records)) {
+          switch (recordType) {
+            case 'A':
+              for (const dnsProvider of confCronData.records[recordType]) {
+                if (typeof Dns.services.updateIp[dnsProvider.dns] === 'function')
+                  await Dns.services.updateIp[dnsProvider.dns]({ ...dnsProvider, ip: testIp });
+              }
+              break;
 
-          default:
-            break;
+            default:
+              break;
+          }
         }
-      }
-      try {
-        const ipUrlTest = `https://${process.env.DEFAULT_DEPLOY_HOST}`;
-        const response = await axios.get(ipUrlTest);
-        const verifyIp = response.request.socket.remoteAddress;
-        logger.info(ipUrlTest + ' IP', verifyIp);
-        if (verifyIp === testIp) {
-            fs.writeFileSync(`./engine-private/deploy/${ipFileName}`, testIp, 'utf8');
-        } else logger.error('ip not updated');
-      } catch (error) {
-        logger.error(error), 'ip not updated';
+        try {
+          const ipUrlTest = `https://${process.env.DEFAULT_DEPLOY_HOST}`;
+          const response = await axios.get(ipUrlTest);
+          const verifyIp = response.request.socket.remoteAddress;
+          logger.info(ipUrlTest + ' verify ip', verifyIp);
+          if (verifyIp === testIp) {
+            logger.info('ip updated successfully', testIp);
+            UnderpostRootEnv.API.set('ip', testIp);
+          } else logger.error('ip not updated', testIp);
+        } catch (error) {
+          logger.error(error, error.stack);
+          logger.error('ip not updated', testIp);
         }
       }
     }

package/src/server/downloader.js

@@ -2,16 +2,8 @@ import axios from 'axios';
 import fs from 'fs';
 import { loggerFactory } from './logger.js';
 import dotenv from 'dotenv';
-import https from 'https';
-
 dotenv.config();
 
-const httpsAgent = new https.Agent({
-  rejectUnauthorized: false,
-});
-
-axios.defaults.httpsAgent = httpsAgent;
-
 const logger = loggerFactory(import.meta);
 
 const Downloader = (url, fullPath, options = { method: 'get', responseType: 'stream' }) =>

package/test/api.test.js

@@ -2,7 +2,6 @@
 
 import axios from 'axios';
 import dotenv from 'dotenv';
-import https from 'https';
 
 import { expect } from 'chai';
 import { loggerFactory } from '../src/server/logger.js';
@@ -20,13 +19,6 @@ const BASE_URL =
     ? `http://localhost:${PORT}/${process.env.BASE_API}`
     : `https://www.nexodev.org/api`;
 
-axios.defaults.baseURL = BASE_URL;
-
-const httpsAgent = new https.Agent({
-  rejectUnauthorized: false,
-});
-axios.defaults.httpsAgent = httpsAgent;
-
 describe(`GET 'Test' API Request `, async () => {
   {
     const url = `${BASE_URL}/test/youtube-id/?url=https://www.youtube.com/watch?v=o4f42SbyDMk`;

package/manifests/core/kustomization.yaml

@@ -1,11 +0,0 @@
----
-# kubectl apply -k core/.
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - underpost-engine-pv-pvc.yaml
-  - underpost-engine-headless-service.yaml
-  - underpost-engine-statefulset.yaml
-  - underpost-engine-backup-pv-pvc.yaml
-  - underpost-engine-mongodb-backup-cronjob.yaml
-  - underpost-engine-backup-access.yaml

package/manifests/core/underpost-engine-backup-access.yaml

@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: backup-access
-spec:
-  containers:
-    - name: busybox
-      image: busybox
-      command: ['sh', '-c', 'sleep 3600']
-      volumeMounts:
-        - name: backup-storage
-          mountPath: /backup
-  volumes:
-    - name: backup-storage
-      persistentVolumeClaim:
-        claimName: backup-pvc

package/manifests/core/underpost-engine-backup-pv-pvc.yaml

@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: backup-pv
-spec:
-  capacity:
-    storage: 5Gi
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: /mnt/backup
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: backup-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi

package/manifests/core/underpost-engine-headless-service.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: mongodb-service
-spec:
-  clusterIP: None
-  selector:
-    app: mongodb
-  ports:
-    - port: 27017

package/manifests/core/underpost-engine-mongodb-backup-cronjob.yaml

@@ -1,40 +0,0 @@
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: mongodb-backup
-spec:
-  schedule: '*/5 * * * *' # Runs backup every five minutes
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          containers:
-            - name: mongodump
-              image: docker.io/library/mongo:latest
-              command:
-                - sh
-                - -c
-                - |
-                  # Perform backup
-                  mongodump -u $MONGO_INITDB_ROOT_USERNAME -p $MONGO_INITDB_ROOT_PASSWORD --host=mongodb-service --port=27017 --out=/backup/$(date +\%Y-\%m-\%dT\%H-\%M-\%S)
-                  # Remove backups older than 7 days
-                  find /backup -type d -mtime +7 -exec rm -rf {} +
-              volumeMounts:
-                - name: backup-storage
-                  mountPath: /backup
-              env:
-                - name: MONGO_INITDB_ROOT_USERNAME
-                  valueFrom:
-                    secretKeyRef:
-                      name: mongodb-secret
-                      key: username
-                - name: MONGO_INITDB_ROOT_PASSWORD
-                  valueFrom:
-                    secretKeyRef:
-                      name: mongodb-secret
-                      key: password
-          restartPolicy: Never
-          volumes:
-            - name: backup-storage
-              persistentVolumeClaim:
-                claimName: backup-pvc

package/manifests/core/underpost-engine-mongodb-configmap.yaml

@@ -1,26 +0,0 @@
-# origin conf: /etc/mongod.conf
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: mongodb-config-file
-  namespace: default
-data:
-  mongod.conf: |
-    storage:
-      dbPath: /data/db
-    systemLog:
-      destination: file
-      logAppend: true
-      path: /var/log/mongodb/mongod.log
-    replication:
-      replSetName: rs0
-    net:
-      bindIp: 127.0.0.1
-      port: 27017
-    processManagement:
-      fork: true
-    setParameter:
-      enableLocalhostAuthBypass: false
-    security:
-      authorization: enabled
-      keyFile: /etc/mongodb-keyfile