@underpostnet/underpost 2.8.0 → 2.8.4

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,7 +9,7 @@ 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';
@@ -295,7 +295,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 +346,7 @@ export PATH=$PATH:/opt/lampp/bin`,
             //     changeOrigin: true,
             //   }),
             // );
-            await network.port.portClean(port);
+
             await listenPortController(app, port, runningData);
             break;
           }
@@ -460,7 +460,7 @@ export PATH=$PATH:/opt/lampp/bin`,
               host,
               path,
             });
-            await network.port.portClean(peerPort);
+
             await listenPortController(peerServer, peerPort, {
               runtime: 'nodejs',
               client: null,
@@ -470,7 +470,6 @@ export PATH=$PATH:/opt/lampp/bin`,
             });
           }
 
-          await network.port.portClean(port);
           await listenPortController(server, port, runningData);
 
           break;
@@ -481,8 +480,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();
@@ -53,6 +55,7 @@ const getValkeyObject = async (key = '') => {
   try {
     return JSON.parse(object);
   } catch (error) {
+    logger.error(error);
     return object;
   }
 };

package/startup.cjs

@@ -0,0 +1,12 @@
+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`);

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`);