underpost 2.7.8 → 2.7.9

package/src/server/proxy.js

@@ -9,7 +9,8 @@ import { loggerFactory, loggerMiddleware } from './logger.js';
 import { listenPortController, network } from './network.js';
 import { orderArrayFromAttrInt } from '../client/components/core/CommonJs.js';
 import { createSslServer, sslRedirectMiddleware } from './ssl.js';
-import { buildProxyRouter } from './conf.js';
+import { buildProxyRouter, maintenanceMiddleware } from './conf.js';
+import { getRootDirectory } from './process.js';
 
 dotenv.config();
 
@@ -25,6 +26,9 @@ const buildProxy = async () => {
   for (let port of Object.keys(proxyRouter)) {
     port = parseInt(port);
     const hosts = proxyRouter[port];
+    const proxyPath = '/';
+    const proxyHost = 'localhost';
+    const runningData = { host: proxyHost, path: proxyPath, client: null, runtime: 'nodejs', meta: import.meta };
     const app = express();
 
     // set logger
@@ -47,6 +51,7 @@ const buildProxy = async () => {
       onProxyReq: (proxyReq, req, res, options) => {
         // https://wtools.io/check-http-status-code
         // http://nexodev.org
+        maintenanceMiddleware(req, res, port, proxyRouter);
         sslRedirectMiddleware(req, res, port, proxyRouter);
       },
       pathRewrite: {
@@ -54,30 +59,27 @@ const buildProxy = async () => {
         // '^/target-path': '/',
       },
     };
-
-    // 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;
-
-    // instance proxy server
-    const proxyPath = '/';
-    const proxyHost = 'localhost';
+    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;
+    }
 
     const filter = false
       ? (pathname, req) => {
@@ -88,8 +90,6 @@ const buildProxy = async () => {
     app.use(proxyPath, createProxyMiddleware(filter, options));
     await network.port.portClean(port);
 
-    const runningData = { host: proxyHost, path: proxyPath, client: null, runtime: 'nodejs', meta: import.meta };
-
     switch (process.env.NODE_ENV) {
       case 'production':
         switch (port) {

package/src/server/runtime.js

@@ -18,13 +18,14 @@ import { DataBaseProvider } from '../db/DataBaseProvider.js';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { createPeerServer } from './peer.js';
 import { Lampp } from '../runtime/lampp/Lampp.js';
+import { getDeployId } from './conf.js';
 
 dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
 const buildRuntime = async () => {
-  const deployId = `${process.argv[3] ? process.argv[3] : 'default'}`;
+  const deployId = getDeployId();
 
   const collectDefaultMetrics = promClient.collectDefaultMetrics;
   collectDefaultMetrics();
@@ -95,6 +96,7 @@ export PATH=$PATH:/opt/lampp/bin`,
         runtime,
         client,
         meta: import.meta,
+        apis,
       };
 
       let redirectUrl;

package/src/client/ssr/offline/default.index.js

@@ -1,31 +0,0 @@
-import { htmls, loggerFactory } from '../common/SsrCore.js';
-import { Alert } from '../common/Alert.js';
-import { Translate } from '../common/Translate.js';
-import { Worker } from '../common/Worker.js';
-/*imports*/
-
-const logger = loggerFactory({ url: '/offline.js' });
-
-window.onload = () =>
-  Worker.instance({
-    render: async () => {
-      window.ononline = async () => {
-        location.href = '/';
-      };
-      window.onoffline = async () => {
-        htmls(`.page-render`, html`${await Alert.noInternet({ Translate })}`);
-      };
-      try {
-        if (navigator.onLine) {
-          const maintenance = await fetch(location.origin + '/favicon.ico');
-          if (maintenance.status !== 200) {
-            htmls(`.page-render`, html`${await Alert.maintenance({ Translate })}`);
-          } else window.ononline();
-        }
-        throw new Error(`no internet connection`);
-      } catch (error) {
-        logger.error(error);
-        window.onoffline();
-      }
-    },
-  });

package/src/cron.js

@@ -1,30 +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';
-import { BackUpManagement } from './server/backup.js';
-import { CronManagement } from './server/cron.js';
-
-dotenv.config();
-
-await Config.build();
-
-const logger = loggerFactory(import.meta);
-
-await logger.setUpInfo();
-
-// every minutes
-CronManagement.add('ip', '* * * * *', await Dns.InitIpDaemon());
-
-// every day at 1 am
-CronManagement.add('backup', '0 1 * * *', await BackUpManagement.Init());
-
-await CronManagement.init();
-
-ProcessController.init(logger);

package/src/server/cron.js

@@ -1,35 +0,0 @@
-import cron from 'node-cron';
-import { loggerFactory } from './logger.js';
-
-const logger = loggerFactory(import.meta);
-
-const CronManagement = {
-  data: {},
-  init: function () {
-    // verify tokens
-    // https://github.com/settings/tokens
-    for (const cronKey of Object.keys(this.data)) {
-      if (this.data[cronKey].valid) {
-        this.data[cronKey].task.start();
-        logger.info(`Cron task "${this.data[cronKey].name}" started`);
-      } else {
-        logger.error(
-          `Invalid cron expression "${this.data[cronKey].expression}" for task "${this.data[cronKey].name}"`,
-        );
-      }
-    }
-  },
-  add: function (name = 'task', expression = '* * * * *', callback = async () => null) {
-    const args = { name, expression, valid: cron.validate(expression) };
-    this.data[name] = {
-      ...args,
-      task: cron.schedule(expression, callback, {
-        scheduled: false,
-        timezone: process.env.TIME_ZONE || 'America/New_York',
-        name,
-      }),
-    };
-  },
-};
-
-export { CronManagement };