underpost 2.8.531 → 2.8.611

package/.github/workflows/ghpkg.yml

@@ -43,7 +43,7 @@ jobs:
         run: |
           npm install -g underpost
           underpost config set GITHUB_TOKEN ${{ secrets.GIT_AUTH_TOKEN }}
-          underpost install
+          npm install
           node ./bin/deploy rename-package @underpostnet/underpost
           node ./bin/deploy set-repo underpostnet/pwa-microservices-template-ghpkg
 

package/.github/workflows/npmpkg.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           npm install -g underpost
           underpost config set GITHUB_TOKEN ${{ secrets.GIT_AUTH_TOKEN }}
-          underpost install
+          npm install
 
       - name: Set git credentials
         run: |

package/.github/workflows/pwa-microservices-template.page.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Build the site
         run: |
           npm install -g underpost
-          underpost install
+          npm install
           node bin/deploy update-default-conf ghpkg
           env-cmd -f .env.production node bin/deploy build-full-client github-pages underpostnet.github.io /pwa-microservices-template-ghpkg
       # git lfs install

package/.vscode/settings.json

@@ -119,5 +119,8 @@
   "docwriter.hotkey.mac": "⌘ + .",
   "[dotenv]": {
     "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "[shellscript]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
   }
 }

package/bin/build.js

@@ -20,11 +20,15 @@ const logger = loggerFactory(import.meta);
 const confName = process.argv[2];
 const basePath = '../pwa-microservices-template';
 const repoName = `engine-${confName.split('dd-')[1]}`;
+const deployList = (confName === 'dd' ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8') : confName).split(
+  ',',
+);
 
 logger.info('', {
   confName,
   repoName,
   basePath,
+  deployList,
 });
 
 if (process.argv.includes('clean')) {
@@ -35,10 +39,7 @@ if (process.argv.includes('clean')) {
 }
 
 if (process.argv.includes('conf')) {
-  for (const _confName of (confName === 'dd'
-    ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8')
-    : confName
-  ).split(',')) {
+  for (const _confName of deployList) {
     const _repoName = `engine-${_confName.split('dd-')[1]}`;
     const privateRepoName = `${_repoName}-private`;
     const privateGitUri = `${process.env.GITHUB_USERNAME}/${privateRepoName}`;
@@ -58,6 +59,12 @@ if (process.argv.includes('conf')) {
         if (replica.match(_confName))
           fs.copySync(`./engine-private/replica/${replica}`, `../${privateRepoName}/replica/${replica}`);
     }
+    if (fs.existsSync(`./engine-private/itc-scripts`)) {
+      const itcScripts = await fs.readdir(`./engine-private/itc-scripts`);
+      for (const itcScript of itcScripts)
+        if (itcScript.match(_confName))
+          fs.copySync(`./engine-private/itc-scripts/${itcScript}`, `../${privateRepoName}/itc-scripts/${itcScript}`);
+    }
     shellExec(
       `cd ../${privateRepoName}` +
         ` && git add .` +
@@ -68,6 +75,13 @@ if (process.argv.includes('conf')) {
   process.exit(0);
 }
 
+if (confName === 'dd') {
+  for (const _confName of deployList) {
+    shellExec(`node bin/build ${_confName}`);
+  }
+  process.exit(0);
+}
+
 const { DefaultConf } = await import(`../conf.${confName}.js`);
 
 {
@@ -133,12 +147,23 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
     }
   }
 
+  shellExec(`node bin/deploy update-default-conf ${confName}`);
+
   fs.copyFileSync(`./conf.${confName}.js`, `${basePath}/conf.js`);
   fs.copyFileSync(
     `./.github/workflows/engine.${confName.split('dd-')[1]}.ci.yml`,
     `${basePath}/.github/workflows/engine.${confName.split('dd-')[1]}.ci.yml`,
   );
 
+  switch (confName) {
+    case 'dd-cyberia':
+      fs.copyFileSync(`./bin/cyberia.js`, `${basePath}/bin/cyberia.js`);
+      break;
+
+    default:
+      break;
+  }
+
   const packageJson = JSON.parse(fs.readFileSync(`${basePath}/package.json`, 'utf8'));
   packageJson.name = repoName;
   fs.writeFileSync(

package/bin/deploy.js

@@ -731,6 +731,7 @@ try {
 
       shellExec(`node bin/deploy update-dependencies`);
       shellExec(`auto-changelog`);
+      shellExec(`node bin/build dd`);
       shellExec(`node bin deploy dd --build-manifest --sync --info-router`);
       shellExec(`node bin deploy dd production --build-manifest --sync --info-router`);
       break;
@@ -837,7 +838,7 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
         DefaultConf.client = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.client.json`, 'utf8'));
         DefaultConf.server = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
         DefaultConf.ssr = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.ssr.json`, 'utf8'));
-        DefaultConf.cron = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.cron.json`, 'utf8'));
+        // DefaultConf.cron = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.cron.json`, 'utf8'));
 
         for (const host of Object.keys(DefaultConf.server)) {
           for (const path of Object.keys(DefaultConf.server[host])) {

package/bin/index.js

@@ -6,9 +6,6 @@ import Underpost from '../src/index.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 underpostRootPath = getUnderpostRootPath();
 fs.existsSync(`${underpostRootPath}/.env`)
@@ -85,12 +82,14 @@ program
   .option('--reset', `Delete all clusters and prune all data and caches`)
   .option('--mariadb', 'Init with mariadb statefulset')
   .option('--mongodb', 'Init with mongodb statefulset')
+  .option('--mongodb4', 'Init with mongodb 4.4 service')
   .option('--valkey', 'Init with valkey service')
   .option('--contour', 'Init with project contour base HTTPProxy and envoy')
   .option('--cert-manager', 'Init with letsencrypt-prod ClusterIssuer')
   .option('--info', 'Get all kinds objects deployed')
   .option('--full', 'Init with all statefulsets and services available')
   .option('--ns-use <ns-name>', 'Switches current context to namespace')
+  .option('--dev', 'init with dev cluster')
   .option('--list-pods', 'Display list pods information')
   .action(Underpost.cluster.init)
   .description('Manage cluster, for default initialization base kind cluster');
@@ -102,7 +101,11 @@ program
   .option('--remove', 'Delete deployments and services')
   .option('--sync', 'Sync deployments env, ports, and replicas')
   .option('--info-router', 'Display router structure')
+  .option('--expose', 'Expose service match deploy-list')
+  .option('--info-util', 'Display kubectl util management commands')
+  .option('--cert', 'Reset tls/ssl certificate secrets')
   .option('--build-manifest', 'Build kind yaml manifests: deployments, services, proxy and secrets')
+  .option('--version', 'Set custom version')
   .description('Manage deployment, for default deploy development pods')
   .action(Underpost.deploy.callback);
 
@@ -126,6 +129,7 @@ program
   .argument('<deploy-id>', 'Deploy configuration id')
   .argument('[env]', 'Optional environment, for default is development')
   .option('--run', 'Run custom entry point script')
+  .option('--build', 'Build custom image container scripts')
   .description('Dockerfile custom node build script')
   .action(Underpost.image.dockerfile.script);
 
@@ -136,6 +140,8 @@ program
   .argument('[path]', 'Absolute or relative directory, for default is current')
   .option('--image-archive', 'Only load tar image from ./images')
   .option('--podman-save', 'Save image from podman to ./images')
+  .option('--image-name <image-name>', 'Set custom image name')
+  .option('--image-version <image-version>', 'Set custom image version')
   .description('Build image from Dockerfile')
   .action(Underpost.image.dockerfile.build);
 
@@ -156,15 +162,23 @@ program
   .argument('<deploy-list>', 'Deploy id list, e.g. default-a,default-b')
   .option('--import', 'Import container backups from repositories')
   .option('--export', 'Export container backups to repositories')
+  .option('--pod-name <pod-name>', 'Optional pod context')
+  .option('--collection <collection>', 'Collection')
+  .option('--out-path <out-path>', 'Custom out path backup')
+  .option('--drop', 'Drop databases')
+  .option('--preserveUUID', 'Preserve Ids')
+  .option('--git', 'Upload to github')
+  .option('--ns <ns-name>', 'Optional name space context')
   .description('Manage databases')
-  .action(UnderpostDB.API.callback);
+  .action(Underpost.db.callback);
 
 program
   .command('script')
-  .argument('operator', `Options: ${Object.keys(UnderpostScript.API)}`)
+  .argument('operator', `Options: ${Object.keys(Underpost.script)}`)
   .argument('<script-name>', 'Script name')
   .argument('[script-value]', 'Literal command, or path')
   .option('--itc', 'Inside container execution context')
+  .option('--itc-path', 'Inside container path options')
   .option('--ns <ns-name>', 'Options name space context')
   .option('--pod-name <pod-name>')
   .description(
@@ -175,12 +189,25 @@ program
 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`)
+  .argument('[job-list]', `Deploy id list, e.g. ${Object.keys(Underpost.cron)}, for default all available jobs`)
   .option('--itc', 'Inside container execution context')
   .option('--init', 'Init cron jobs for cron job default deploy id')
+  .option('--git', 'Upload to github')
   .description('Cron jobs management')
   .action(Underpost.cron.callback);
 
+program
+  .command('fs')
+  .argument('[path]', 'Absolute or relative directory')
+  .option('--rm', 'Remove file')
+  .option('--git', 'Current git changes')
+  .option('--recursive', 'Upload files recursively')
+  .option('--deploy-id <deploy-id>', 'Deploy configuration id')
+  .option('--pull', 'Download file')
+  .option('--force', 'Force action')
+  .description('File storage management, for default upload file')
+  .action(Underpost.fs.callback);
+
 program
   .command('test')
   .argument('[deploy-list]', 'Deploy id list, e.g. default-a,default-b')
@@ -190,6 +217,7 @@ program
   .option('--logs', 'Display container logs')
   .option('--pod-name <pod-name>')
   .option('--pod-status <pod-status>')
+  .option('--kind-type <kind-type>')
   .action(Underpost.test.callback);
 
 program.parse();

package/bin/vs.js

@@ -20,6 +20,7 @@ switch (process.argv[2]) {
     logger.info('Open new vs windows', 'Ctrl Shift N');
     logger.info('Close current vs windows', 'Ctrl Shift W');
     logger.info('Preview md', 'Ctrl shift V');
+    logger.info('Open git changes', 'Ctrl G + G');
     logger.warn('Terminal shortcut configure with command pallette', 'Ctl shift T');
     break;
   }

package/conf.js

@@ -179,9 +179,7 @@ const DefaultConf = /**/ {
     },
   },
   cron: {
-    ipDaemon: { ip: null },
     records: { A: [{ host: 'example.com', dns: 'dondominio', api_key: '???', user: '???' }] },
-    backups: [{ deployGroupId: 'default-group' }],
     jobs: { dns: { expression: '* * * * *', enabled: true }, backups: { expression: '0 1 * * *', enabled: true } },
   },
 }; /**/

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

package/manifests/kind-config-dev.yaml

@@ -0,0 +1,12 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+  - role: control-plane
+  - role: worker
+    # extraPortMappings:
+    # - containerPort: 80
+    #   hostPort: 80
+    #   listenAddress: '0.0.0.0'
+    # - containerPort: 443
+    #   hostPort: 443
+    #   listenAddress: '0.0.0.0'

package/manifests/mongodb/kustomization.yaml

@@ -7,5 +7,5 @@ resources:
   - headless-service.yaml
   - statefulset.yaml
   - backup-pv-pvc.yaml
-  - backup-cronjob.yaml
-  - backup-access.yaml
+  # - backup-cronjob.yaml
+  # - backup-access.yaml

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

@@ -29,10 +29,10 @@ spec:
             - name: mongo-persistent-storage
               mountPath: /data/db
 
-          resources:
-            requests:
-              memory: '500Mi'
-              cpu: '500m'
+      # resources:
+      #   requests:
+      #     memory: '500Mi'
+      #     cpu: '500m'
       volumes:
         - name: mongo-persistent-storage
           persistentVolumeClaim:
@@ -56,6 +56,7 @@ spec:
 
 # rs.initiate();
 # use admin;
+# rs.initiate({ _id: "rs0", members: [ { _id: 0, host: "127.0.0.1:27017" } ] })
 # 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";

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.531",
+    "version": "2.8.611",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -57,9 +57,11 @@
         "ag-grid-community": "31.0.0",
         "axios": "^1.5.1",
         "chai": "^5.1.0",
+        "clean-jsdoc-theme": "^4.3.0",
         "cli-progress": "^3.12.0",
         "cli-spinners": "^3.0.0",
         "clipboardy": "^4.0.0",
+        "cloudinary": "^2.5.1",
         "color": "^4.2.3",
         "colors": "^1.4.0",
         "commander": "^12.1.0",
@@ -67,6 +69,7 @@
         "cors": "^2.8.5",
         "d3": "^7.9.0",
         "dotenv": "^16.3.1",
+        "easy-json-schema": "^0.0.2-beta",
         "easymde": "^2.18.0",
         "env-cmd": "^10.1.0",
         "express": "^4.18.2",
@@ -87,6 +90,7 @@
         "log-update": "^6.0.0",
         "mariadb": "^3.2.2",
         "marked": "^12.0.2",
+        "mocha": "^10.8.2",
         "mongoose": "^8.9.5",
         "morgan": "^1.10.0",
         "nodemailer": "^6.9.9",
@@ -95,6 +99,7 @@
         "peer": "^1.0.2",
         "peerjs": "^1.5.2",
         "pixi.js": "7.4.2",
+        "plantuml": "^0.0.2",
         "prom-client": "^15.1.2",
         "public-ip": "^6.0.1",
         "read": "^2.1.0",
@@ -106,17 +111,13 @@
         "socket.io": "^4.8.0",
         "sortablejs": "^1.15.0",
         "split-file": "^2.3.0",
+        "swagger-autogen": "^2.23.7",
         "swagger-ui-express": "^5.0.0",
         "systeminformation": "^5.23.7",
         "uglify-js": "^3.17.4",
         "validator": "^13.11.0",
         "vanilla-jsoneditor": "^2.3.2",
-        "winston": "^3.11.0",
-        "clean-jsdoc-theme": "^4.3.0",
-        "easy-json-schema": "^0.0.2-beta",
-        "mocha": "^10.8.2",
-        "plantuml": "^0.0.2",
-        "swagger-autogen": "^2.23.7"
+        "winston": "^3.11.0"
     },
     "devDependencies": {
         "clean-jsdoc-theme": "^4.3.0",

package/src/cli/cluster.js

@@ -12,7 +12,8 @@ class UnderpostCluster {
     async init(
       podName,
       options = {
-        valkey: false,
+        mongodb: false,
+        mongodb4: false,
         mariadb: false,
         valkey: false,
         full: false,
@@ -20,19 +21,20 @@ class UnderpostCluster {
         certManager: false,
         listPods: false,
         reset: false,
+        dev: false,
         nsUse: '',
       },
     ) {
       const npmRoot = getNpmRootPath();
-      const underpostRoot = `${npmRoot}/underpost`;
+      const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
       if (options.reset === true) return await UnderpostCluster.API.reset();
-      if (options.listPods === true) return console.table(UnderpostDeploy.API.getPods(podName ?? undefined));
+      if (options.listPods === true) return console.table(UnderpostDeploy.API.get(podName ?? undefined));
 
-      if (options.nsUse) {
+      if (options.nsUse && typeof options.nsUse === 'string') {
         shellExec(`kubectl config set-context --current --namespace=${options.nsUse}`);
         return;
       }
-      if (options.info) {
+      if (options.info === true) {
         shellExec(`kubectl config get-contexts`); // config env persisente for manage multiple clusters
         shellExec(`kubectl config get-clusters`);
         shellExec(`kubectl get nodes -o wide`); // set of nodes of a cluster
@@ -63,12 +65,8 @@ class UnderpostCluster {
         shellExec(`kubectl get crd --all-namespaces -o wide`);
         return;
       }
-      const testClusterInit = shellExec(`kubectl get pods --all-namespaces -o wide`, {
-        disableLog: true,
-        silent: true,
-        stdout: true,
-      });
-      if (!(testClusterInit.match('kube-system') && testClusterInit.match('kube-proxy'))) {
+
+      if (!UnderpostDeploy.API.get('kube-apiserver-kind-control-plane')[0]) {
         shellExec(`containerd config default > /etc/containerd/config.toml`);
         shellExec(`sed -i -e "s/SystemdCgroup = false/SystemdCgroup = true/g" /etc/containerd/config.toml`);
         // shellExec(`cp /etc/kubernetes/admin.conf ~/.kube/config`);
@@ -76,15 +74,19 @@ class UnderpostCluster {
         shellExec(`sudo service docker restart`);
         shellExec(`sudo systemctl enable --now containerd.service`);
         shellExec(`sudo systemctl restart containerd`);
-        shellExec(`cd ${underpostRoot}/manifests && kind create cluster --config kind-config.yaml`);
+        shellExec(
+          `cd ${underpostRoot}/manifests && kind create cluster --config kind-config${
+            options?.dev === true ? '-dev' : ''
+          }.yaml`,
+        );
         shellExec(`sudo chown $(id -u):$(id -g) $HOME/.kube/config**`);
       } else logger.warn('Cluster already initialized');
 
-      if (options.full || options.valkey) {
+      if (options.full === true || options.valkey === true) {
         shellExec(`kubectl delete statefulset service-valkey`);
         shellExec(`kubectl apply -k ${underpostRoot}/manifests/valkey`);
       }
-      if (options.full || options.mariadb) {
+      if (options.full === true || options.mariadb === true) {
         shellExec(
           `sudo kubectl create secret generic mariadb-secret --from-file=username=/home/dd/engine/engine-private/mariadb-username --from-file=password=/home/dd/engine/engine-private/mariadb-password`,
         );
@@ -94,7 +96,29 @@ class UnderpostCluster {
         shellExec(`kubectl delete statefulset mariadb-statefulset`);
         shellExec(`kubectl apply -k ${underpostRoot}/manifests/mariadb`);
       }
-      if (options.full || options.mongodb) {
+      if (options.mongodb4 === true) {
+        shellExec(`kubectl apply -k ${underpostRoot}/manifests/mongodb-4.4`);
+
+        const deploymentName = 'mongodb-deployment';
+
+        const successInstance = await UnderpostTest.API.statusMonitor(deploymentName);
+
+        if (successInstance) {
+          const mongoConfig = {
+            _id: 'rs0',
+            members: [{ _id: 0, host: '127.0.0.1:27017' }],
+          };
+
+          const [pod] = UnderpostDeploy.API.get(deploymentName);
+
+          shellExec(
+            `sudo kubectl exec -i ${pod.NAME} -- mongo --quiet \
+        --eval 'rs.initiate(${JSON.stringify(mongoConfig)})'`,
+          );
+        }
+
+        // await UnderpostTest.API.statusMonitor('mongodb-1');
+      } else if (options.full === true || options.mongodb === true) {
         shellExec(
           `sudo kubectl create secret generic mongodb-keyfile --from-file=/home/dd/engine/engine-private/mongodb-keyfile`,
         );
@@ -104,29 +128,31 @@ class UnderpostCluster {
         shellExec(`kubectl delete statefulset mongodb`);
         shellExec(`kubectl apply -k ${underpostRoot}/manifests/mongodb`);
 
-        await UnderpostTest.API.podStatusMonitor('mongodb-1');
+        const successInstance = await UnderpostTest.API.statusMonitor('mongodb-1');
 
-        const mongoConfig = {
-          _id: 'rs0',
-          members: [
-            { _id: 0, host: 'mongodb-0.mongodb-service:27017', priority: 1 },
-            { _id: 1, host: 'mongodb-1.mongodb-service:27017', priority: 1 },
-          ],
-        };
+        if (successInstance) {
+          const mongoConfig = {
+            _id: 'rs0',
+            members: [
+              { _id: 0, host: 'mongodb-0.mongodb-service:27017', priority: 1 },
+              { _id: 1, host: 'mongodb-1.mongodb-service:27017', priority: 1 },
+            ],
+          };
 
-        shellExec(
-          `sudo kubectl exec -i mongodb-0 -- mongosh --quiet --json=relaxed \
-          --eval 'use admin' \
-          --eval 'rs.initiate(${JSON.stringify(mongoConfig)})' \
-          --eval 'rs.status()'`,
-        );
+          shellExec(
+            `sudo kubectl exec -i mongodb-0 -- mongosh --quiet --json=relaxed \
+        --eval 'use admin' \
+        --eval 'rs.initiate(${JSON.stringify(mongoConfig)})' \
+        --eval 'rs.status()'`,
+          );
+        }
       }
 
-      if (options.full || options.contour)
+      if (options.full === true || options.contour === true)
         shellExec(`kubectl apply -f https://projectcontour.io/quickstart/contour.yaml`);
 
-      if (options.full || options.certManager) {
-        if (!UnderpostDeploy.API.getPods('cert-manager').find((p) => p.STATUS === 'Running')) {
+      if (options.full === true || options.certManager === true) {
+        if (!UnderpostDeploy.API.get('cert-manager').find((p) => p.STATUS === 'Running')) {
           shellExec(`helm repo add jetstack https://charts.jetstack.io --force-update`);
           shellExec(
             `helm install cert-manager jetstack/cert-manager \

package/src/cli/cron.js

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