underpost 2.8.85 → 2.8.86

package/manifests/deployment/{dd-template-development → dd-default-development}/proxy.yaml

@@ -16,7 +16,7 @@ spec:
         - prefix: /
       enableWebsockets: true
       services:
-        - name: dd-template-development-blue-service
+        - name: dd-default-development-blue-service
           port: 4001
           weight: 100
 
@@ -24,7 +24,7 @@ spec:
         - prefix: /peer
       enableWebsockets: true
       services:
-        - name: dd-template-development-blue-service
+        - name: dd-default-development-blue-service
           port: 4002
           weight: 100
 
@@ -41,6 +41,6 @@ spec:
         - prefix: /
       enableWebsockets: true
       services:
-        - name: dd-template-development-blue-service
+        - name: dd-default-development-blue-service
           port: 4003
           weight: 100

package/manifests/grafana/deployment.yaml

@@ -0,0 +1,57 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: grafana
+  name: grafana
+spec:
+  selector:
+    matchLabels:
+      app: grafana
+  template:
+    metadata:
+      labels:
+        app: grafana
+    spec:
+      securityContext:
+        fsGroup: 472
+        supplementalGroups:
+          - 0
+      containers:
+        - name: grafana
+          image: grafana/grafana:latest
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 3000
+              name: http-grafana
+              protocol: TCP
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /robots.txt
+              port: 3000
+              scheme: HTTP
+            initialDelaySeconds: 10
+            periodSeconds: 30
+            successThreshold: 1
+            timeoutSeconds: 2
+          livenessProbe:
+            failureThreshold: 3
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            tcpSocket:
+              port: 3000
+            timeoutSeconds: 1
+          resources:
+            requests:
+              cpu: 250m
+              memory: 750Mi
+          volumeMounts:
+            - mountPath: /var/lib/grafana
+              name: grafana-pv
+      volumes:
+        - name: grafana-pv
+          persistentVolumeClaim:
+            claimName: grafana-pvc

package/manifests/grafana/kustomization.yaml

@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - pvc.yaml
+  - deployment.yaml
+  - service.yaml

package/manifests/grafana/pvc.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: grafana-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: local-path
+  resources:
+    requests:
+      storage: 5Gi

package/manifests/grafana/service.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: grafana
+spec:
+  ports:
+    - port: 3000
+      protocol: TCP
+      targetPort: http-grafana
+  selector:
+    app: grafana
+  sessionAffinity: None
+  type: LoadBalancer

package/manifests/maas/ssh-cluster-info.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+REMOTE_USER=$(node bin config get --plain DEFAULT_SSH_USER)
+REMOTE_HOST=$(node bin config get --plain DEFAULT_SSH_HOST)
+SSH_KEY=$(node bin config get --plain DEFAULT_SSH_KEY_PATH)
+
+chmod 600 "$SSH_KEY"
+
+ssh -i "$SSH_KEY" -o BatchMode=yes "${REMOTE_USER}@${REMOTE_HOST}" sh <<EOF
+cd /home/dd/engine
+node bin deploy dd production --info-traffic
+kubectl get pods -A
+EOF

package/manifests/prometheus/deployment.yaml

@@ -0,0 +1,82 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: prometheus-config
+  labels:
+    app: prometheus
+data:
+  prometheus.yml: |
+    global:
+      scrape_interval: 30s
+      evaluation_interval: 30s
+
+    scrape_configs:
+      - job_name: 'scraper'
+        metrics_path: /metrics
+        scheme: https
+        static_configs:
+          - targets: []
+        # tls_config:
+        #   insecure_skip_verify: true
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: prometheus
+  labels:
+    app: prometheus
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: prometheus
+  template:
+    metadata:
+      labels:
+        app: prometheus
+    spec:
+      containers:
+        - name: prometheus
+          image: prom/prometheus:latest
+          args:
+            - '--config.file=/etc/prometheus/prometheus.yml'
+            - '--storage.tsdb.path=/prometheus'
+            - '--web.console.libraries=/usr/share/prometheus/console_libraries'
+            - '--web.console.templates=/usr/share/prometheus/consoles'
+          ports:
+            - containerPort: 9090
+              name: web
+          volumeMounts:
+            - name: prometheus-config
+              mountPath: /etc/prometheus/
+            - name: prometheus-data
+              mountPath: /prometheus
+          resources:
+            requests:
+              memory: '200Mi'
+              cpu: '100m'
+      volumes:
+        - name: prometheus-config
+          configMap:
+            name: prometheus-config
+        - name: prometheus-data
+          emptyDir: {}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: prometheus
+  labels:
+    app: prometheus
+spec:
+  ports:
+    - port: 9090
+      targetPort: 9090
+      protocol: TCP
+      name: web
+  selector:
+    app: prometheus
+  type: ClusterIP

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.85",
+    "version": "2.8.86",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -21,7 +21,6 @@
         "install-test": "npm install -g mocha && npm install -g c8 && npm install -g nyc && npm install -g coveralls",
         "install-underpost": "cp -a $(npm root -g)/underpost/node_modules ./node_modules && npm install --only=dev --ignore-scripts",
         "install": "npm run install-global && npm run install-test",
-        "docker:start": "docker-compose up",
         "prettier": "prettier --write .",
         "fix": "npm audit fix --force && npm audit",
         "changelog": "auto-changelog"

package/src/api/user/user.service.js

@@ -31,20 +31,10 @@ const UserService = {
       const token = hashJWT({ email: req.body.email }, '15m');
       const payloadToken = hashJWT({ email: req.body.email }, '15m');
       const id = `${options.host}${options.path}`;
-      const translate = {
-        H1: {
-          en: 'Recover your account',
-          es: 'Recupera tu cuenta',
-        },
-        P1: {
-          en: 'To recover your account, please click the button below:',
-          es: 'Para recuperar tu cuenta, haz click en el botón de abajo:',
-        },
-        BTN_LABEL: {
-          en: 'Recover Password',
-          es: 'Recuperar Contraseña',
-        },
-      };
+      const translate = MailerProvider.instance[id].translateTemplates.recoverEmail;
+      const recoverUrl = `${process.env.NODE_ENV === 'development' ? 'http://' : 'https://'}${req.body.hostname}${
+        req.body.proxyPath
+      }recover?payload=${payloadToken}`;
       const sendResult = await MailerProvider.send({
         id,
         sendOptions: {
@@ -55,13 +45,8 @@ const UserService = {
             .replace('{{H1}}', translate.H1[req.lang])
             .replace('{{P1}}', translate.P1[req.lang])
             .replace('{{TOKEN}}', token)
-            .replace(`{{COMPANY}}`, options.host) // html body
-            .replace(
-              '{{RECOVER_WEB_URL}}',
-              `${process.env === 'development' ? 'http://' : 'https://'}${options.host}${options.path}${
-                options.path === '/' ? 'recover' : `/recover`
-              }?payload=${payloadToken}`,
-            )
+            .replace(`{{COMPANY}}`, req.body.hostname) // html body
+            .replace('{{RECOVER_WEB_URL}}', recoverUrl)
             .replace('{{RECOVER_BTN_LABEL}}', translate.BTN_LABEL[req.lang]),
 
           attachments: [
@@ -98,18 +83,7 @@ const UserService = {
           },
         );
       }
-      const translate = {
-        H1: {
-          en: 'Confirm Your Email',
-          zh: '请确认您的电子邮箱',
-          es: 'Confirma tu correo electrónico',
-        },
-        P1: {
-          en: 'Email confirmed! Thanks.',
-          zh: '电子邮箱已确认！感谢。',
-          es: 'Correo electrónico confirmado! Gracias.',
-        },
-      };
+      const translate = MailerProvider.instance[id].translateTemplates.confirmEmail;
       const sendResult = await MailerProvider.send({
         id,
         sendOptions: {
@@ -120,7 +94,7 @@ const UserService = {
             .replace('{{H1}}', translate.H1[req.lang])
             .replace('{{P1}}', translate.P1[req.lang])
             .replace('{{TOKEN}}', token)
-            .replace(`{{COMPANY}}`, options.host), // html body
+            .replace(`{{COMPANY}}`, req.body.hostname), // html body
           attachments: [
             // {
             //   filename: 'logo.png',

package/src/cli/cluster.js

@@ -5,6 +5,7 @@ import UnderpostBaremetal from './baremetal.js';
 import UnderpostDeploy from './deploy.js';
 import UnderpostTest from './test.js';
 import os from 'os';
+import fs from 'fs-extra';
 
 const logger = loggerFactory(import.meta);
 
@@ -33,12 +34,13 @@ class UnderpostCluster {
      * @param {string} [options.nsUse=''] - Set the current kubectl namespace.
      * @param {boolean} [options.infoCapacity=false] - Display resource capacity information for the cluster.
      * @param {boolean} [options.infoCapacityPod=false] - Display resource capacity information for pods.
-     * @param {boolean} [options.istio=false] - Deploy Istio service mesh.
      * @param {boolean} [options.pullImage=false] - Pull necessary Docker images before deployment.
      * @param {boolean} [options.dedicatedGpu=false] - Configure for dedicated GPU usage (e.g., NVIDIA GPU Operator).
      * @param {boolean} [options.kubeadm=false] - Initialize the cluster using Kubeadm.
      * @param {boolean} [options.k3s=false] - Initialize the cluster using K3s.
      * @param {boolean} [options.initHost=false] - Perform initial host setup (install Docker, Podman, Kind, Kubeadm, Helm).
+     * @param {boolean} [options.grafana=false] - Initialize the cluster with a Grafana deployment.
+     * @param {string} [options.prom=''] - Initialize the cluster with a Prometheus Operator deployment and monitor scrap for specified hosts.
      * @param {boolean} [options.uninstallHost=false] - Uninstall all host components.
      * @param {boolean} [options.config=false] - Apply general host configuration (SELinux, containerd, sysctl, firewalld).
      * @param {boolean} [options.worker=false] - Configure as a worker node (for Kubeadm or K3s join).
@@ -63,12 +65,13 @@ class UnderpostCluster {
         nsUse: '',
         infoCapacity: false,
         infoCapacityPod: false,
-        istio: false,
         pullImage: false,
         dedicatedGpu: false,
         kubeadm: false,
         k3s: false,
         initHost: false,
+        grafana: false,
+        prom: '',
         uninstallHost: false,
         config: false,
         worker: false,
@@ -260,6 +263,42 @@ class UnderpostCluster {
         );
       }
 
+      if (options.grafana === true) {
+        shellExec(`kubectl delete deployment grafana --ignore-not-found`);
+        shellExec(`kubectl apply -k ${underpostRoot}/manifests/grafana`);
+      }
+
+      if (options.prom && typeof options.prom === 'string') {
+        shellExec(`kubectl delete deployment prometheus --ignore-not-found`);
+        shellExec(`kubectl delete configmap prometheus-config --ignore-not-found`);
+        shellExec(`kubectl delete service prometheus --ignore-not-found`);
+        // Prometheus server host: http://<prometheus-cluster-ip>:9090
+        const yaml = `${fs.readFileSync(`${underpostRoot}/manifests/prometheus/deployment.yaml`, 'utf8').replace(
+          '- targets: []',
+          `- targets: [${options.prom
+            .split(',')
+            .map((host) => `'${host}'`)
+            .join(',')}]`,
+        )}`;
+        console.log(yaml);
+        shellExec(`kubectl apply -f - <<EOF
+${yaml}
+EOF
+`);
+
+        // https://grafana.com/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/configuration/config-other-methods/prometheus/prometheus-operator/
+        // shellExec(
+        //   `kubectl create -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/master/bundle.yaml`,
+        // );
+        // shellExec(`kubectl apply -f ${underpostRoot}/manifests/prometheus/prometheus-cr.yaml`);
+        // shellExec(`kubectl rollout status sts prometheus-prometheus -n default`);
+        // shellExec(`kubectl apply -f ${underpostRoot}/manifests/prometheus/prometheus-server.yaml`);
+        // shellExec(`helm repo add prometheus-community https://prometheus-community.github.io/helm-charts`);
+        // shellExec(`helm repo update`);
+        // shellExec(`helm install prometheus prometheus-community/prometheus`);
+        // shellExec(`kubectl rollout status deployment prometheus-server -n default`);
+      }
+
       if (options.full === true || options.valkey === true) {
         if (options.pullImage === true) {
           // shellExec(`sudo podman pull valkey/valkey:latest`);

package/src/cli/cron.js

@@ -21,7 +21,6 @@ const logger = loggerFactory(import.meta);
  * @memberof UnderpostCron
  */
 class UnderpostCron {
-  static NETWORK = [];
   static JOB = {
     /**
      * DNS cli API
@@ -50,10 +49,9 @@ class UnderpostCron {
     callback: async function (
       deployList = 'default',
       jobList = Object.keys(UnderpostCron.JOB),
-      options = { itc: false, init: false, git: false, dashboardUpdate: false },
+      options = { itc: false, init: false, git: false },
     ) {
       if (options.init === true) {
-        UnderpostCron.NETWORK = [];
         const jobDeployId = fs.readFileSync('./engine-private/deploy/dd.cron', 'utf8').trim();
         deployList = fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').trim();
         const confCronConfig = JSON.parse(fs.readFileSync(`./engine-private/conf/${jobDeployId}/conf.cron.json`));
@@ -61,26 +59,11 @@ class UnderpostCron {
           for (const job of Object.keys(confCronConfig.jobs)) {
             const name = `${jobDeployId}-${job}`;
             let deployId;
-            if (!options.dashboardUpdate) shellExec(Cmd.delete(name));
-            switch (job) {
-              case 'dns':
-                deployId = jobDeployId;
-                break;
-
-              default:
-                deployId = deployList;
-                break;
-            }
-            if (!options.dashboardUpdate)
-              shellExec(Cmd.cron(deployId, job, name, confCronConfig.jobs[job].expression, options));
-            UnderpostCron.NETWORK.push({
-              deployId,
-              jobId: job,
-              expression: confCronConfig.jobs[job].expression,
-            });
+            shellExec(Cmd.delete(name));
+            deployId = UnderpostCron.API.getRelatedDeployId(job);
+            shellExec(Cmd.cron(deployId, job, name, confCronConfig.jobs[job].expression, options));
           }
         }
-        if (options.dashboardUpdate === true) await UnderpostCron.API.updateDashboardData();
         if (fs.existsSync(`./tmp/await-deploy`)) fs.remove(`./tmp/await-deploy`);
         return;
       }
@@ -89,30 +72,14 @@ class UnderpostCron {
         if (UnderpostCron.JOB[jobId]) await UnderpostCron.JOB[jobId].callback(deployList, options);
       }
     },
-    async updateDashboardData() {
-      try {
-        const deployId = process.env.DEFAULT_DEPLOY_ID;
-        const host = process.env.DEFAULT_DEPLOY_HOST;
-        const path = process.env.DEFAULT_DEPLOY_PATH;
-        const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
-        const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
-        const { db } = confServer[host][path];
-
-        await DataBaseProvider.load({ apis: ['cron'], host, path, db });
-
-        /** @type {import('../api/cron/cron.model.js').CronModel} */
-        const Cron = DataBaseProvider.instance[`${host}${path}`].mongoose.models.Cron;
-
-        await Cron.deleteMany();
-
-        for (const cronInstance of UnderpostCron.NETWORK) {
-          logger.info('save', cronInstance);
-          await new Cron(cronInstance).save();
-        }
-
-        await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
-      } catch (error) {
-        logger.error(error, error.stack);
+    getRelatedDeployId(jobId) {
+      switch (jobId) {
+        case 'dns':
+          return fs.readFileSync('./engine-private/deploy/dd.cron', 'utf8').trim();
+        case 'backup':
+          return fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').trim();
+        default:
+          return fs.readFileSync('./engine-private/deploy/dd.cron', 'utf8').trim();
       }
     },
   };

package/src/cli/db.js

@@ -3,6 +3,9 @@ import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
 import UnderpostDeploy from './deploy.js';
+import UnderpostCron from './cron.js';
+import { DataBaseProvider } from '../db/DataBaseProvider.js';
+import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -216,6 +219,152 @@ class UnderpostDB {
         }
       }
     },
+    async clusterMetadataFactory(
+      deployId = process.env.DEFAULT_DEPLOY_ID,
+      host = process.env.DEFAULT_DEPLOY_HOST,
+      path = process.env.DEFAULT_DEPLOY_PATH,
+    ) {
+      deployId = deployId ?? process.env.DEFAULT_DEPLOY_ID;
+      host = host ?? process.env.DEFAULT_DEPLOY_HOST;
+      path = path ?? process.env.DEFAULT_DEPLOY_PATH;
+      const env = 'production';
+      const deployList = fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').split(',');
+
+      const { db } = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'))[host][
+        path
+      ];
+      try {
+        await DataBaseProvider.load({ apis: ['instance', 'cron'], host, path, db });
+
+        /** @type {import('../api/instance/instance.model.js').InstanceModel} */
+        const Instance = DataBaseProvider.instance[`${host}${path}`].mongoose.models.Instance;
+
+        await Instance.deleteMany();
+
+        for (const _deployId of deployList) {
+          const deployId = _deployId.trim();
+          if (!deployId) continue;
+          const confServer = loadReplicas(
+            JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
+            'proxy',
+          );
+          const router = await UnderpostDeploy.API.routerFactory(deployId, env);
+          const pathPortAssignmentData = pathPortAssignmentFactory(router, confServer);
+
+          for (const host of Object.keys(confServer)) {
+            for (const { path, port } of pathPortAssignmentData[host]) {
+              if (!confServer[host][path]) continue;
+
+              const { client, runtime, apis, peer } = confServer[host][path];
+              {
+                const body = {
+                  deployId,
+                  host,
+                  path,
+                  port,
+                  client,
+                  runtime,
+                  apis,
+                };
+
+                logger.info('Instance save', body);
+                await new Instance(body).save();
+              }
+
+              if (peer) {
+                const body = {
+                  deployId,
+                  host,
+                  path: path === '/' ? '/peer' : `${path}/peer`,
+                  port: port + 1,
+                  runtime: 'nodejs',
+                };
+
+                logger.info('Instance save', body);
+                await new Instance(body).save();
+              }
+            }
+          }
+        }
+      } catch (error) {
+        logger.error(error, error.stack);
+      }
+
+      try {
+        const cronDeployId = fs.readFileSync('./engine-private/deploy/dd.cron', 'utf8').trim();
+        const confCronPath = `./engine-private/conf/${cronDeployId}/conf.cron.json`;
+        const confCron = JSON.parse(fs.readFileSync(confCronPath, 'utf8'));
+
+        await DataBaseProvider.load({ apis: ['cron'], host, path, db });
+
+        /** @type {import('../api/cron/cron.model.js').CronModel} */
+        const Cron = DataBaseProvider.instance[`${host}${path}`].mongoose.models.Cron;
+
+        await Cron.deleteMany();
+
+        for (const jobId of Object.keys(confCron.jobs)) {
+          const body = {
+            jobId,
+            deployId: UnderpostCron.API.getRelatedDeployId(jobId),
+            expression: confCron.jobs[jobId].expression,
+            enabled: confCron.jobs[jobId].enabled,
+          };
+          logger.info('Cron save', body);
+          await new Cron(body).save();
+        }
+      } catch (error) {
+        logger.error(error, error.stack);
+      }
+      await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
+    },
+    clusterMetadataBackupCallback(
+      deployId = process.env.DEFAULT_DEPLOY_ID,
+      host = process.env.DEFAULT_DEPLOY_HOST,
+      path = process.env.DEFAULT_DEPLOY_PATH,
+      options = {
+        generate: false,
+        itc: false,
+        import: false,
+        export: false,
+        instances: false,
+        crons: false,
+      },
+    ) {
+      deployId = deployId ?? process.env.DEFAULT_DEPLOY_ID;
+      host = host ?? process.env.DEFAULT_DEPLOY_HOST;
+      path = path ?? process.env.DEFAULT_DEPLOY_PATH;
+
+      if (options.generate === true) {
+        UnderpostDB.API.clusterMetadataFactory(deployId, host, path);
+      }
+
+      if (options.instances === true) {
+        const outputPath = './engine-private/instances';
+        if (fs.existsSync(outputPath)) fs.mkdirSync(outputPath, { recursive: true });
+        const collection = 'instances';
+        if (options.export === true)
+          shellExec(
+            `node bin db --export --collections ${collection} --out-path ${outputPath} --hosts ${host} --paths '${path}' ${deployId}`,
+          );
+        if (options.import === true)
+          shellExec(
+            `node bin db --import --drop --preserveUUID --out-path ${outputPath} --hosts ${host} --paths '${path}' ${deployId}`,
+          );
+      }
+      if (options.crons === true) {
+        const outputPath = './engine-private/crons';
+        if (fs.existsSync(outputPath)) fs.mkdirSync(outputPath, { recursive: true });
+        const collection = 'crons';
+        if (options.export === true)
+          shellExec(
+            `node bin db --export --collections ${collection} --out-path ${outputPath} --hosts ${host} --paths '${path}' ${deployId}`,
+          );
+        if (options.import === true)
+          shellExec(
+            `node bin db --import --drop --preserveUUID --out-path ${outputPath} --hosts ${host} --paths '${path}' ${deployId}`,
+          );
+      }
+    },
   };
 }