@underpostnet/underpost 2.8.4 → 2.8.6

package/src/server/runtime.js

@@ -15,11 +15,12 @@ import { getCapVariableName, newInstance } from '../client/components/core/Commo
 import { Xampp } from '../runtime/xampp/Xampp.js';
 import { MailerProvider } from '../mailer/MailerProvider.js';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
-import { createProxyMiddleware } from 'http-proxy-middleware';
+// import { createProxyMiddleware } from 'http-proxy-middleware';
 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();
 
@@ -31,20 +32,6 @@ const buildRuntime = async () => {
   const collectDefaultMetrics = promClient.collectDefaultMetrics;
   collectDefaultMetrics();
 
-  if (fs.existsSync(`/root/.bashrc`) && !fs.readFileSync(`/root/.bashrc`, 'utf8').match(`underpost-engine`)) {
-    fs.writeFileSync(
-      `/root/.bashrc`,
-      `${fs.readFileSync(`/root/.bashrc`, 'utf8')}
-` +
-        `export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm underpost-engine bash_completion
-
-export PATH=$PATH:/opt/lampp/bin`,
-      'utf8',
-    );
-  }
-
   const promCounterOption = {
     name: `${deployId.replaceAll('-', '_')}_http_requests_total`,
     help: 'Total number of HTTP requests',
@@ -54,7 +41,6 @@ export PATH=$PATH:/opt/lampp/bin`,
   // logger.info('promCounterOption', promCounterOption);
 
   const requestCounter = new promClient.Counter(promCounterOption);
-
   const ipInstance = ''; // await ip.public.ipv4();
   const initPort = parseInt(process.env.PORT) + 1;
   let currentPort = initPort;
@@ -101,12 +87,13 @@ export PATH=$PATH:/opt/lampp/bin`,
         apis,
       };
 
-      let redirectUrl;
-      let redirectTarget;
-      if (redirect) {
-        redirectUrl = new URL(redirect);
-        redirectTarget = redirect[redirect.length - 1] === '/' ? redirect.slice(0, -1) : redirect;
-      }
+      const redirectTarget = redirect
+        ? redirect[redirect.length - 1] === '/'
+          ? redirect.slice(0, -1)
+          : redirect
+        : undefined;
+
+      // if (redirect) logger.info('redirect', new URL(redirect));
 
       switch (runtime) {
         case 'lampp':
@@ -398,6 +385,13 @@ export PATH=$PATH:/opt/lampp/bin`,
             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;
@@ -414,6 +408,13 @@ export PATH=$PATH:/opt/lampp/bin`,
             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/src/dns.js

@@ -1,22 +0,0 @@
-'use strict';
-
-// https://nodejs.org/api
-// https://expressjs.com/en/4x/api.html
-
-import dotenv from 'dotenv';
-import { loggerFactory } from './server/logger.js';
-import { Dns } from './server/dns.js';
-import { ProcessController } from './server/process.js';
-import { Config } from './server/conf.js';
-
-dotenv.config();
-
-await Config.build();
-
-const logger = loggerFactory(import.meta);
-
-await logger.setUpInfo();
-
-await Dns.InitIpDaemon();
-
-ProcessController.init(logger);

package/src/server/project.js

@@ -1,39 +0,0 @@
-import { loadConf, newProject, repoClone, repoCommit, repoPull, repoPush } from './conf.js';
-
-class Project {
-  constructor(repositoryName, version) {
-    return newProject(repositoryName, version);
-  }
-
-  static clone(gitUri = 'underpostnet/pwa-microservices-template') {
-    return repoClone(gitUri);
-  }
-
-  static useEnv(deployId = 'default', env = 'production') {
-    return loadConf(deployId, env);
-  }
-
-  static pull(repoPath = './', gitUri = 'underpostnet/pwa-microservices-template') {
-    return repoPull(repoPath, gitUri);
-  }
-
-  static commit(
-    repoPath = './',
-    commitType = 'feat',
-    subModule = '',
-    message = '',
-    options = {
-      copy: false,
-      info: false,
-      empty: false,
-    },
-  ) {
-    return repoCommit(repoPath, commitType, subModule, message, options);
-  }
-
-  static push(repoPath = './', gitUri = 'underpostnet/pwa-microservices-template') {
-    return repoPush(repoPath, gitUri);
-  }
-}
-
-export default Project;

package/startup.cjs

@@ -1,12 +0,0 @@
-const shell = require('shelljs');
-
-// /usr/bin/supervisord -n
-// /usr/sbin/sshd -D
-
-shell.exec(`/usr/bin/supervisord -n`, { async: true });
-
-// shell.exec(`sudo /opt/lampp/lampp start`, { async: true });
-
-// shell.exec(`/usr/bin/mongod -f /etc/mongod.conf`, { async: true });
-
-shell.exec(`underpost new app`);