@underpostnet/underpost 2.8.5 → 2.8.6

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();
 
@@ -19,8 +12,8 @@ const logger = loggerFactory(import.meta);
 
 class Dns {
   static callback = async function (deployList) {
-    // NAT-VPS modem/router device configuration:
-    // LAN --> [NAT-VPS] --> WAN
+    // 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
     // verify inet ip proxy server address
@@ -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/src/server/runtime.js

@@ -19,7 +19,8 @@ import { DataBaseProvider } from '../db/DataBaseProvider.js';
 import { createPeerServer } from './peer.js';
 import { Lampp } from '../runtime/lampp/Lampp.js';
 import { getDeployId } from './conf.js';
-import { ssrFactory } from './client-formatted.js';
+import { JSONweb, ssrFactory } from './client-formatted.js';
+import Underpost from '../index.js';
 
 dotenv.config();
 
@@ -384,6 +385,13 @@ const buildRuntime = async () => {
             ssrPath,
             ssrHeadComponents: '',
             ssrBodyComponents: (await ssrFactory(`./src/client/ssr/body/404.js`))(),
+            renderPayload: {
+              apiBasePath: process.env.BASE_API,
+              version: Underpost.version,
+            },
+            renderApi: {
+              JSONweb,
+            },
           });
           const path404 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/404/index.html`;
           const page404 = fs.existsSync(path404) ? `${path === '/' ? '' : path}/404` : undefined;
@@ -400,6 +408,13 @@ const buildRuntime = async () => {
             ssrPath,
             ssrHeadComponents: '',
             ssrBodyComponents: (await ssrFactory(`./src/client/ssr/body/500.js`))(),
+            renderPayload: {
+              apiBasePath: process.env.BASE_API,
+              version: Underpost.version,
+            },
+            renderApi: {
+              JSONweb,
+            },
           });
           const path500 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/500/index.html`;
           const page500 = fs.existsSync(path500) ? `${path === '/' ? '' : path}/500` : undefined;

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

package/manifests/core/underpost-engine-statefulset.yaml

@@ -1,91 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: mongodb # Specifies the name of the statefulset
-spec:
-  serviceName: 'mongodb-service' # Specifies the service to use
-  replicas: 2
-  selector:
-    matchLabels:
-      app: mongodb
-  template:
-    metadata:
-      labels:
-        app: mongodb
-    spec:
-      containers:
-        - name: mongodb
-          image: docker.io/library/mongo:latest
-          command:
-            - mongod
-            - '--replSet'
-            - 'rs0'
-            # - '--config'
-            # - '-f'
-            # - '/etc/mongod.conf'
-            # - '--auth'
-            # - '--clusterAuthMode'
-            # - 'keyFile'
-            # - '--keyFile'
-            # - '/etc/mongodb-keyfile'
-            # - '--interleave'
-            # - 'all'
-            # - '--wiredTigerCacheSizeGB'
-            # - '0.25'
-            # - '--setParameter'
-            # - 'authenticationMechanisms=SCRAM-SHA-1'
-            # - '--fork'
-            - '--logpath'
-            - '/var/log/mongodb/mongod.log'
-            - '--bind_ip_all'
-          ports:
-            - containerPort: 27017
-          volumeMounts:
-            - name: mongodb-storage
-              mountPath: /data/db
-            - name: keyfile
-              mountPath: /etc/mongodb-keyfile
-              readOnly: true
-            # - name: mongodb-configuration-file
-            #   mountPath: /etc/mongod.conf
-            #   subPath: mongod.conf
-            #   readOnly: true
-            # - name: mongodb-config
-            #   mountPath: /config
-          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
-          resources:
-            requests:
-              cpu: '100m'
-              memory: '256Mi'
-            limits:
-              cpu: '500m'
-              memory: '512Mi'
-      volumes:
-        - name: keyfile
-          secret:
-            secretName: mongodb-keyfile
-            defaultMode: 0400
-        # - name: mongodb-configuration-file
-        #   configMap:
-        #     name: mongodb-config-file
-        # - name: mongodb-config
-        #   configMap:
-        #     name: mongodb-config
-  volumeClaimTemplates:
-    - metadata:
-        name: mongodb-storage
-      spec:
-        accessModes: ['ReadWriteOnce']
-        resources:
-          requests:
-            storage: 5Gi

package/manifests/valkey/underpost-engine-valkey-service.yaml

@@ -1,17 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: service-valkey
-  namespace: default
-spec:
-  ports:
-    - port: 6379
-      targetPort: 6379
-  selector:
-    app: service-valkey
-  ipFamilyPolicy: PreferDualStack
-  ipFamilies:
-    - IPv4
-    # - IPv6
-  type: ClusterIP

package/manifests/valkey/underpost-engine-valkey-statefulset.yaml

@@ -1,39 +0,0 @@
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: service-valkey
-  namespace: default
-spec:
-  serviceName: service-valkey
-  replicas: 1
-  selector:
-    matchLabels:
-      app: service-valkey
-  template:
-    metadata:
-      labels:
-        app: service-valkey
-    spec:
-      containers:
-        - name: service-valkey
-          image: docker.io/valkey/valkey:latest
-          env:
-            - name: TZ
-              value: Europe/Zurich
-          ports:
-            - containerPort: 6379
-          startupProbe:
-            tcpSocket:
-              port: 6379
-            failureThreshold: 30
-            periodSeconds: 5
-            timeoutSeconds: 5
-          livenessProbe:
-            tcpSocket:
-              port: 6379
-            failureThreshold: 2
-            periodSeconds: 30
-            timeoutSeconds: 5
-      restartPolicy: Always
-      automountServiceAccountToken: false