underpost 2.8.1 → 2.8.6

package/src/server/network.js

@@ -1,10 +1,7 @@
-import detect from 'detect-port';
 import fs from 'fs-extra';
 
 import { publicIp, publicIpv4, publicIpv6 } from 'public-ip';
-import { killPortProcess } from 'kill-port-process';
-import { loggerFactory } from './logger.js';
-import { orderArrayFromAttrInt } from '../client/components/core/CommonJs.js';
+import { actionInitLog, loggerFactory } from './logger.js';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
 import { getDeployId } from './conf.js';
 
@@ -15,38 +12,6 @@ import { getDeployId } from './conf.js';
 
 const logger = loggerFactory(import.meta);
 
-const network = {
-  port: {
-    status: async (ports) => {
-      const status = [];
-      for (const port of ports) {
-        status.push({
-          port,
-          open: await new Promise((resolve) =>
-            detect(port)
-              .then((_port) => {
-                if (port == _port)
-                  // `port: ${port} was not occupied`
-                  return resolve(false);
-
-                // `port: ${port} was occupied, try port: ${_port}`
-                return resolve(true);
-              })
-              .catch((error) => resolve(`${error.message}`)),
-          ),
-        });
-      }
-      return status;
-    },
-    kill: async (ports) => await killPortProcess(ports),
-    portClean: async function (port) {
-      const [portStatus] = await this.status([port]);
-      // logger.info('port status', portStatus);
-      if (portStatus.open) await this.kill([port]);
-    },
-  },
-};
-
 const ip = {
   public: {
     get: async () => await publicIp(), // => 'fe80::200:f8ff:fe21:67cf'
@@ -74,8 +39,8 @@ const saveRuntimeRouter = async () => {
     const host = process.env.DEFAULT_DEPLOY_HOST;
     const path = process.env.DEFAULT_DEPLOY_PATH;
     const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
-    if (!deployId || !host || !path) {
-      logger.warn('default deploy instance not found');
+    if (!deployId || !host || !path || !fs.existsSync(confServerPath)) {
+      // logger.warn('default deploy instance not found');
       return;
     }
     const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
@@ -112,7 +77,7 @@ const saveRuntimeRouter = async () => {
 
     if (closeConn) await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
   } catch (error) {
-    logger.error(error);
+    logger.error(error, error.stack);
   }
 };
 
@@ -149,20 +114,30 @@ const saveRuntimeCron = async () => {
 
     if (closeConn) await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
   } catch (error) {
-    logger.error(error);
+    logger.error(error, error.stack);
   }
 };
 
 const listenServerFactory = (logic = async () => {}) => {
   return {
-    listen: async (...args) => (logic ? await logic(...args) : undefined, args[1]()),
+    listen: async (...args) => (
+      setTimeout(() => {
+        const message = 'Listen server factory timeout';
+        logger.error(message);
+        throw new Error(message);
+      }, 80000000), // ~ 55 days
+      (logic ? await logic(...args) : undefined, args[1]())
+    ),
   };
 };
 
 const listenPortController = async (server, port, metadata) =>
   new Promise((resolve) => {
     try {
-      if (!server) server = listenServerFactory();
+      if (port === ':') {
+        server.listen(port, actionInitLog);
+        return resolve(true);
+      }
 
       const { host, path, client, runtime, meta } = metadata;
       const error = [];
@@ -202,7 +177,6 @@ const listenPortController = async (server, port, metadata) =>
 
 export {
   ip,
-  network,
   listenPortController,
   networkRouter,
   netWorkCron,

package/src/server/process.js

@@ -3,8 +3,8 @@
 import shell from 'shelljs';
 import dotenv from 'dotenv';
 import fs from 'fs-extra';
-
 import { loggerFactory } from './logger.js';
+import clipboard from 'clipboardy';
 
 dotenv.config();
 
@@ -63,4 +63,27 @@ const shellCd = (cd, options = { disableLog: false }) => {
   return shell.cd(cd);
 };
 
-export { ProcessController, getRootDirectory, shellExec, shellCd };
+function pbcopy(data) {
+  switch (process.platform) {
+    case 'linux':
+      {
+        // sudo dnf install xclip
+        // sudo apt update
+        // sudo apt install xclip
+        // paste: xclip -o
+        // copy:
+        // shellExec(`echo "${data}" | xclip -sel clip`, { async: true });
+      }
+
+      break;
+
+    default:
+      break;
+  }
+
+  clipboard.writeSync(data || '🦄');
+
+  logger.info(`copied to clipboard`, clipboard.readSync());
+}
+
+export { ProcessController, getRootDirectory, shellExec, shellCd, pbcopy };

package/src/server/proxy.js

@@ -5,10 +5,9 @@ import dotenv from 'dotenv';
 
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { loggerFactory, loggerMiddleware } from './logger.js';
-import { listenPortController, network } from './network.js';
-import { orderArrayFromAttrInt } from '../client/components/core/CommonJs.js';
+import { listenPortController } from './network.js';
 import { createSslServer, sslRedirectMiddleware } from './ssl.js';
-import { buildProxyRouter, maintenanceMiddleware } from './conf.js';
+import { buildPortProxyRouter, buildProxyRouter, maintenanceMiddleware } from './conf.js';
 
 dotenv.config();
 
@@ -16,7 +15,7 @@ const logger = loggerFactory(import.meta);
 
 const buildProxy = async () => {
   // default target
-  await network.port.portClean(process.env.PORT);
+
   express().listen(process.env.PORT);
 
   const proxyRouter = buildProxyRouter();
@@ -57,27 +56,7 @@ const buildProxy = async () => {
         // '^/target-path': '/',
       },
     };
-    if (!process.argv.includes('maintenance')) {
-      // build router
-      Object.keys(hosts).map((hostKey) => {
-        let { host, path, target, proxy, peer } = hosts[hostKey];
-        if (process.env.NODE_ENV === 'development') host = `localhost`;
-
-        if (!proxy.includes(port)) return;
-        const absoluteHost = [80, 443].includes(port)
-          ? `${host}${path === '/' ? '' : path}`
-          : `${host}:${port}${path === '/' ? '' : path}`;
-
-        if (!(absoluteHost in options.router)) options.router[absoluteHost] = target;
-      });
-      if (Object.keys(options.router).length === 0) continue;
-
-      // order router
-      const router = {};
-      for (const absoluteHostKey of orderArrayFromAttrInt(Object.keys(options.router), 'length'))
-        router[absoluteHostKey] = options.router[absoluteHostKey];
-      options.router = router;
-    }
+    if (!process.argv.includes('maintenance')) options.router = buildPortProxyRouter(port, proxyRouter);
 
     const filter = false
       ? (pathname, req) => {
@@ -86,7 +65,6 @@ const buildProxy = async () => {
         }
       : proxyPath;
     app.use(proxyPath, createProxyMiddleware(filter, options));
-    await network.port.portClean(port);
 
     switch (process.env.NODE_ENV) {
       case 'production':

package/src/server/runtime.js

@@ -9,17 +9,18 @@ import compression from 'compression';
 
 import { createServer } from 'http';
 import { getRootDirectory } from './process.js';
-import { network, listenPortController, saveRuntimeRouter, logRuntimeRouter, listenServerFactory } from './network.js';
+import { listenPortController, saveRuntimeRouter, logRuntimeRouter, listenServerFactory } from './network.js';
 import { loggerFactory, loggerMiddleware } from './logger.js';
 import { getCapVariableName, newInstance } from '../client/components/core/CommonJs.js';
 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':
@@ -295,7 +282,7 @@ export PATH=$PATH:/opt/lampp/bin`,
             logger.info('Build static server runtime', `${host}${path}`);
             currentPort += 2;
             const staticPort = newInstance(currentPort);
-            await network.port.portClean(staticPort);
+
             await listenPortController(app, staticPort, runningData);
             currentPort++;
             continue;
@@ -346,7 +333,7 @@ export PATH=$PATH:/opt/lampp/bin`,
             //     changeOrigin: true,
             //   }),
             // );
-            await network.port.portClean(port);
+
             await listenPortController(app, port, runningData);
             break;
           }
@@ -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;
@@ -460,7 +461,7 @@ export PATH=$PATH:/opt/lampp/bin`,
               host,
               path,
             });
-            await network.port.portClean(peerPort);
+
             await listenPortController(peerServer, peerPort, {
               runtime: 'nodejs',
               client: null,
@@ -470,7 +471,6 @@ export PATH=$PATH:/opt/lampp/bin`,
             });
           }
 
-          await network.port.portClean(port);
           await listenPortController(server, port, runningData);
 
           break;
@@ -481,8 +481,8 @@ export PATH=$PATH:/opt/lampp/bin`,
     }
   }
 
-  if (Xampp.enabled() && Xampp.router) await Xampp.initService({ daemon: true });
-  if (Lampp.enabled() && Lampp.router) await Lampp.initService({ daemon: true });
+  if (Xampp.enabled() && Xampp.router) Xampp.initService();
+  if (Lampp.enabled() && Lampp.router) Lampp.initService();
 
   saveRuntimeRouter();
   logRuntimeRouter();

package/src/server/ssl.js

@@ -70,7 +70,7 @@ const validateSecureContext = (host) => {
 const buildSecureContext = (host) => {
   return {
     key: fs.readFileSync(`./engine-private/ssl/${host}/key.key`, 'utf8'),
-    cert: fs.readFileSync(`./engine-private/ssl/${host}/crt.crt`, 'utf8'),
+    cert: fs.readFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, 'utf8'),
     ca: fs.readFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, 'utf8'),
   };
 };

package/src/server/valkey.js

@@ -21,6 +21,8 @@ const selectDtoFactory = (payload, select) => {
 
 const valkeyClientFactory = async () => {
   const valkey = new Valkey({
+    // port: 6379,
+    // host: 'service-valkey.default.svc.cluster.local',
     retryStrategy: (attempt) => {
       if (attempt === 1) {
         valkey.disconnect();

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/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/prompt-optimizer.js

@@ -1,28 +0,0 @@
-// https://github.com/xenova/transformers.js/blob/f43d3dd348fd7b293008802590bb3a1afa218dc7/src/models.js#L10
-
-import { AutoModelForSeq2SeqLM, AutoTokenizer } from '@xenova/transformers';
-import { loggerFactory } from './logger.js';
-import dotenv from 'dotenv';
-
-dotenv.config();
-
-const logger = loggerFactory(import.meta);
-
-const tokenizer = await AutoTokenizer.from_pretrained('Xenova/t5-small');
-
-const model = await AutoModelForSeq2SeqLM.from_pretrained('Xenova/t5-small');
-
-const prompt = 'translate English to German: I love transformers!';
-
-logger.info('input', { prompt });
-
-const tokenizerData = await tokenizer(prompt);
-
-const { input_ids } = tokenizerData;
-
-const outputs = await model.generate(input_ids);
-
-for (const output of outputs) {
-  const decoded = tokenizer.decode(output, { skip_special_tokens: true });
-  logger.info('decoded', { decoded });
-}

package/startup.js

@@ -1,11 +0,0 @@
-import { shellExec } from './src/server/process.js';
-
-// /usr/bin/supervisord -n
-// /usr/sbin/sshd -D
-shellExec(`/usr/bin/supervisord -n`, { async: true });
-
-shellExec(`sudo /opt/lampp/lampp start`, { async: true });
-
-shellExec(`/usr/bin/mongod -f /etc/mongod.conf`, { async: true });
-
-shellExec(`underpost new app server`);