underpost 2.8.522 → 2.8.531

package/bin/deploy.js

@@ -672,80 +672,79 @@ try {
       break;
     }
 
-    case 'update-version':
-      {
-        const newVersion = process.argv[3];
-        const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
-        const { version } = originPackageJson;
-        originPackageJson.version = newVersion;
-        fs.writeFileSync(`package.json`, JSON.stringify(originPackageJson, null, 4), 'utf8');
-
-        const originPackageLockJson = JSON.parse(fs.readFileSync(`package-lock.json`, 'utf8'));
-        originPackageLockJson.version = newVersion;
-        originPackageLockJson.packages[''].version = newVersion;
-        fs.writeFileSync(`package-lock.json`, JSON.stringify(originPackageLockJson, null, 4), 'utf8');
-
-        if (fs.existsSync(`./engine-private/conf`)) {
-          const files = await fs.readdir(`./engine-private/conf`, { recursive: true });
-          for (const relativePath of files) {
-            const filePah = `./engine-private/conf/${relativePath.replaceAll(`\\`, '/')}`;
-            if (filePah.split('/').pop() === 'package.json') {
-              const originPackage = JSON.parse(fs.readFileSync(filePah, 'utf8'));
-              originPackage.version = newVersion;
-              fs.writeFileSync(filePah, JSON.stringify(originPackage, null, 4), 'utf8');
-            }
-            if (filePah.split('/').pop() === 'deployment.yaml') {
-              fs.writeFileSync(
-                filePah,
-                fs
-                  .readFileSync(filePah, 'utf8')
-                  .replaceAll(`v${version}`, `v${newVersion}`)
-                  .replaceAll(`engine.version: ${version}`, `engine.version: ${newVersion}`),
-                'utf8',
-              );
-            }
+    case 'version-build': {
+      const newVersion = process.argv[3];
+      const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
+      const { version } = originPackageJson;
+      originPackageJson.version = newVersion;
+      fs.writeFileSync(`package.json`, JSON.stringify(originPackageJson, null, 4), 'utf8');
+
+      const originPackageLockJson = JSON.parse(fs.readFileSync(`package-lock.json`, 'utf8'));
+      originPackageLockJson.version = newVersion;
+      originPackageLockJson.packages[''].version = newVersion;
+      fs.writeFileSync(`package-lock.json`, JSON.stringify(originPackageLockJson, null, 4), 'utf8');
+
+      if (fs.existsSync(`./engine-private/conf`)) {
+        const files = await fs.readdir(`./engine-private/conf`, { recursive: true });
+        for (const relativePath of files) {
+          const filePah = `./engine-private/conf/${relativePath.replaceAll(`\\`, '/')}`;
+          if (filePah.split('/').pop() === 'package.json') {
+            const originPackage = JSON.parse(fs.readFileSync(filePah, 'utf8'));
+            originPackage.version = newVersion;
+            fs.writeFileSync(filePah, JSON.stringify(originPackage, null, 4), 'utf8');
+          }
+          if (filePah.split('/').pop() === 'deployment.yaml') {
+            fs.writeFileSync(
+              filePah,
+              fs
+                .readFileSync(filePah, 'utf8')
+                .replaceAll(`v${version}`, `v${newVersion}`)
+                .replaceAll(`engine.version: ${version}`, `engine.version: ${newVersion}`),
+              'utf8',
+            );
           }
         }
+      }
+
+      fs.writeFileSync(
+        `./docker-compose.yml`,
+        fs
+          .readFileSync(`./docker-compose.yml`, 'utf8')
+          .replaceAll(`engine.version: '${version}'`, `engine.version: '${newVersion}'`),
+        'utf8',
+      );
 
+      if (fs.existsSync(`./.github/workflows/docker-image.yml`))
         fs.writeFileSync(
-          `./docker-compose.yml`,
+          `./.github/workflows/docker-image.yml`,
           fs
-            .readFileSync(`./docker-compose.yml`, 'utf8')
-            .replaceAll(`engine.version: '${version}'`, `engine.version: '${newVersion}'`),
+            .readFileSync(`./.github/workflows/docker-image.yml`, 'utf8')
+            .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
           'utf8',
         );
 
-        if (fs.existsSync(`./.github/workflows/docker-image.yml`))
-          fs.writeFileSync(
-            `./.github/workflows/docker-image.yml`,
-            fs
-              .readFileSync(`./.github/workflows/docker-image.yml`, 'utf8')
-              .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
-            'utf8',
-          );
+      fs.writeFileSync(
+        `./src/index.js`,
+        fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
+        'utf8',
+      );
 
-        fs.writeFileSync(
-          `./src/index.js`,
-          fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
-          'utf8',
-        );
+      shellExec(`node bin/deploy update-dependencies`);
+      shellExec(`auto-changelog`);
+      shellExec(`node bin deploy dd --build-manifest --sync --info-router`);
+      shellExec(`node bin deploy dd production --build-manifest --sync --info-router`);
+      break;
+    }
 
-        shellExec(`node bin/deploy update-dependencies`);
-        shellExec(`auto-changelog`);
-        setTimeout(() => {
-          shellExec(`underpost deploy dd --build-manifest --sync --info-router`);
-          shellExec(`underpost deploy dd production --build-manifest --sync --info-router`);
-          shellExec(`node bin/build dd conf`);
-          shellExec(`git add . && cd ./engine-private && git add .`);
-          shellExec(`underpost cmt . ci package-pwa-microservices-template 'update version ${newVersion}'`);
-          shellExec(
-            `underpost cmt ./engine-private ci package-pwa-microservices-template 'update version ${newVersion}'`,
-          );
-          shellExec(`underpost push . underpostnet/engine`);
-          shellExec(`cd ./engine-private && underpost push . underpostnet/engine-private`);
-        }, 1000);
-      }
+    case 'version-deploy': {
+      shellExec(`node bin/build dd conf`);
+      shellExec(`git add . && cd ./engine-private && git add .`);
+      shellExec(`node bin cmt . ci package-pwa-microservices-template`);
+      shellExec(`node bin cmt ./engine-private ci package-pwa-microservices-template`);
+      shellExec(`node bin push . underpostnet/engine`);
+      shellExec(`cd ./engine-private && node ../bin push . underpostnet/engine-private`);
       break;
+    }
 
     case 'update-authors': {
       // #### Ordered by first contribution.

package/bin/index.js

@@ -2,20 +2,18 @@
 
 import dotenv from 'dotenv';
 import { Command } from 'commander';
-import { loggerFactory } from '../src/server/logger.js';
 import Underpost from '../src/index.js';
-import { getNpmRootPath, loadConf } from '../src/server/conf.js';
+import { getUnderpostRootPath, loadConf } from '../src/server/conf.js';
 import fs from 'fs-extra';
 import { commitData } from '../src/client/components/core/CommonJs.js';
 import UnderpostScript from '../src/cli/script.js';
 import UnderpostDB from '../src/cli/db.js';
 import UnderpostCron from '../src/cli/cron.js';
 
-const npmRoot = getNpmRootPath();
-const underpostRoot = `${npmRoot}/underpost/.env`;
-fs.existsSync(underpostRoot) ? dotenv.config({ path: underpostRoot, override: true }) : dotenv.config();
-
-const logger = loggerFactory(import.meta);
+const underpostRootPath = getUnderpostRootPath();
+fs.existsSync(`${underpostRootPath}/.env`)
+  ? dotenv.config({ path: `${underpostRootPath}/.env`, override: true })
+  : dotenv.config();
 
 const program = new Command();
 
@@ -150,7 +148,7 @@ program
   .command('install')
   .description('Fast import underpost npm dependencies')
   .action(() => {
-    fs.copySync(`${npmRoot}/underpost/node_modules`, './node_modules');
+    fs.copySync(`${underpostRootPath}/node_modules`, './node_modules');
   });
 
 program
@@ -165,17 +163,20 @@ program
   .command('script')
   .argument('operator', `Options: ${Object.keys(UnderpostScript.API)}`)
   .argument('<script-name>', 'Script name')
-  .argument('[script-value]', 'Literal command')
+  .argument('[script-value]', 'Literal command, or path')
+  .option('--itc', 'Inside container execution context')
+  .option('--ns <ns-name>', 'Options name space context')
+  .option('--pod-name <pod-name>')
   .description(
     'Supports a number of built-in underpost global scripts and their preset life cycle events as well as arbitrary scripts',
   )
-  .action((...args) => Underpost.script[args[0]](args[1], args[2]));
+  .action((...args) => Underpost.script[args[0]](args[1], args[2], args[3]));
 
 program
   .command('cron')
   .argument('[deploy-list]', 'Deploy id list, e.g. default-a,default-b')
   .argument('[job-list]', `Deploy id list, e.g. ${Object.keys(UnderpostCron.JOB)}, for default all available jobs`)
-  .option('--disable-kind-cluster', 'Disable kind cluster configuration')
+  .option('--itc', 'Inside container execution context')
   .option('--init', 'Init cron jobs for cron job default deploy id')
   .description('Cron jobs management')
   .action(Underpost.cron.callback);
@@ -184,7 +185,7 @@ program
   .command('test')
   .argument('[deploy-list]', 'Deploy id list, e.g. default-a,default-b')
   .description('Manage Test, for default run current underpost default test')
-  .option('--inside-container', 'Inside container execution context')
+  .option('--itc', 'Inside container execution context')
   .option('--sh', 'Copy to clipboard, container entrypoint shell command')
   .option('--logs', 'Display container logs')
   .option('--pod-name <pod-name>')

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.522'
+      engine.version: '2.8.531'
     networks:
       - load-balancer
 

package/manifests/mongodb-4.4/kustomization.yaml

@@ -0,0 +1,7 @@
+---
+# kubectl apply -k core/.
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - pv-pvc.yaml
+  - service-deployment.yaml

package/manifests/mongodb-4.4/pv-pvc.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: mongodb-pv
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: /data/mongodb
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mongodb-pvc
+spec:
+  storageClassName: ''
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi

package/manifests/mongodb-4.4/service-deployment.yaml

@@ -0,0 +1,62 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mongodb-deployment
+  namespace: default
+spec:
+  selector:
+    matchLabels:
+      app: mongodb
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mongodb
+    spec:
+      hostname: mongo
+      containers:
+        - name: mongodb
+          image: docker.io/library/mongo:4.4
+          command: ['mongod', '--replSet', 'rs0', '--bind_ip_all']
+          # -- bash
+          # mongo
+          # use admin
+          # rs.initiate()
+          ports:
+            - containerPort: 27017
+
+          volumeMounts:
+            - name: mongo-persistent-storage
+              mountPath: /data/db
+
+          resources:
+            requests:
+              memory: '500Mi'
+              cpu: '500m'
+      volumes:
+        - name: mongo-persistent-storage
+          persistentVolumeClaim:
+            claimName: mongodb-pvc
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongodb-service
+  namespace: default
+spec:
+  clusterIP: None
+  selector:
+    app: mongodb
+  ports:
+    - protocol: TCP
+      port: 27017
+#     targetPort: 27017
+# type: ClusterIP
+
+# rs.initiate();
+# use admin;
+# db.createUser({user: "your_user",pwd: "your_password", roles: [{role: "userAdminAnyDatabase", db: "admin" },{ role: "readWriteAnyDatabase", db: "admin" }]});
+# cfg = rs.conf();
+# cfg.members[0].host = "127.0.0.1:27027";
+# rs.reconfig(cfg);

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.522",
+    "version": "2.8.531",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/cli/cluster.js

@@ -1,5 +1,5 @@
 import { timer } from '../client/components/core/CommonJs.js';
-import { cliSpinner } from '../server/conf.js';
+import { cliSpinner, getNpmRootPath } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import UnderpostDeploy from './deploy.js';
@@ -23,6 +23,8 @@ class UnderpostCluster {
         nsUse: '',
       },
     ) {
+      const npmRoot = getNpmRootPath();
+      const underpostRoot = `${npmRoot}/underpost`;
       if (options.reset === true) return await UnderpostCluster.API.reset();
       if (options.listPods === true) return console.table(UnderpostDeploy.API.getPods(podName ?? undefined));
 
@@ -72,13 +74,15 @@ class UnderpostCluster {
         // shellExec(`cp /etc/kubernetes/admin.conf ~/.kube/config`);
         shellExec(`sudo systemctl restart kubelet`);
         shellExec(`sudo service docker restart`);
-        shellExec(`cd ./manifests && kind create cluster --config kind-config.yaml`);
+        shellExec(`sudo systemctl enable --now containerd.service`);
+        shellExec(`sudo systemctl restart containerd`);
+        shellExec(`cd ${underpostRoot}/manifests && kind create cluster --config kind-config.yaml`);
         shellExec(`sudo chown $(id -u):$(id -g) $HOME/.kube/config**`);
       } else logger.warn('Cluster already initialized');
 
       if (options.full || options.valkey) {
         shellExec(`kubectl delete statefulset service-valkey`);
-        shellExec(`kubectl apply -k ./manifests/valkey`);
+        shellExec(`kubectl apply -k ${underpostRoot}/manifests/valkey`);
       }
       if (options.full || options.mariadb) {
         shellExec(
@@ -88,7 +92,7 @@ class UnderpostCluster {
           `sudo kubectl create secret generic github-secret --from-literal=GITHUB_TOKEN=${process.env.GITHUB_TOKEN}`,
         );
         shellExec(`kubectl delete statefulset mariadb-statefulset`);
-        shellExec(`kubectl apply -k ./manifests/mariadb`);
+        shellExec(`kubectl apply -k ${underpostRoot}/manifests/mariadb`);
       }
       if (options.full || options.mongodb) {
         shellExec(
@@ -98,7 +102,7 @@ class UnderpostCluster {
           `sudo kubectl create secret generic mongodb-secret --from-file=username=/home/dd/engine/engine-private/mongodb-username --from-file=password=/home/dd/engine/engine-private/mongodb-password`,
         );
         shellExec(`kubectl delete statefulset mongodb`);
-        shellExec(`kubectl apply -k ./manifests/mongodb`);
+        shellExec(`kubectl apply -k ${underpostRoot}/manifests/mongodb`);
 
         await UnderpostTest.API.podStatusMonitor('mongodb-1');
 
@@ -135,7 +139,7 @@ class UnderpostCluster {
 
         const letsEncName = 'letsencrypt-prod';
         shellExec(`sudo kubectl delete ClusterIssuer ${letsEncName}`);
-        shellExec(`sudo kubectl apply -f ./manifests/${letsEncName}.yaml`);
+        shellExec(`sudo kubectl apply -f ${underpostRoot}/manifests/${letsEncName}.yaml`);
       }
     },
     reset() {

package/src/cli/cron.js

@@ -46,7 +46,7 @@ class UnderpostCron {
     callback: async function (
       deployList = 'default',
       jobList = Object.keys(UnderpostCron.JOB),
-      options = { disableKindCluster: false, init: false },
+      options = { itc: false, init: false },
     ) {
       if (options.init === true) {
         await Underpost.test.setUpInfo();

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;
 

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,25 @@ 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];
+        if (fs.existsSync(`${value}`)) {
+          const podScriptPath = `/${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;
+
+          for (const pod of UnderpostDeploy.API.getPods(podMatch)) {
+            shellExec(`sudo kubectl cp ${value} ${nameSpace}/${pod.NAME}:${podScriptPath}`);
+            const cmd = `cd / && node ${podScriptPath}`;
+            shellExec(`sudo kubectl exec -i ${pod.NAME} -- sh -c "${cmd}"`);
+          }
+        }
+
+        return;
+      }
       shellExec(`cd ${npmRoot} && npm run ${key}`);
     },
     get(key) {

package/src/cli/test.js

@@ -29,7 +29,7 @@ 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' &&
@@ -50,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':
                 {

package/src/db/mongo/MongooseDB.js

@@ -90,6 +90,8 @@ const MongooseDB = {
                 // 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 -`);

package/src/index.js

@@ -27,7 +27,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.522';
+  static version = 'v2.8.531';
   /**
    * 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

@@ -995,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}`,
 };
 
@@ -1073,6 +1073,8 @@ const getNpmRootPath = () =>
     silent: true,
   }).trim();
 
+const getUnderpostRootPath = () => `${getNpmRootPath()}/underpost`;
+
 const writeEnv = (envPath, envObj) =>
   fs.writeFileSync(
     envPath,
@@ -1118,5 +1120,6 @@ export {
   buildPortProxyRouter,
   splitFileFactory,
   getNpmRootPath,
+  getUnderpostRootPath,
   writeEnv,
 };