underpost 2.8.867 → 2.8.872

package/src/server/conf.js

@@ -9,17 +9,12 @@ import {
   timer,
 } from '../client/components/core/CommonJs.js';
 import * as dir from 'path';
-import cliProgress from 'cli-progress';
-import cliSpinners from 'cli-spinners';
-import logUpdate from 'log-update';
 import colors from 'colors';
 import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
 import { DefaultConf } from '../../conf.js';
-import read from 'read';
 import splitFile from 'split-file';
-import axios from 'axios';
-import { ssrFactory } from './client-formatted.js';
+import UnderpostRootEnv from '../cli/env.js';
 
 colors.enable();
 
@@ -32,7 +27,7 @@ const Config = {
   build: async function (deployContext = 'dd-default', deployList, subConf) {
     if (typeof process.argv[2] === 'string' && process.argv[2].startsWith('dd-')) deployContext = process.argv[2];
     if (!fs.existsSync(`./tmp`)) fs.mkdirSync(`./tmp`, { recursive: true });
-    fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
+    UnderpostRootEnv.API.set('await-deploy', new Date().toISOString());
     if (fs.existsSync(`./engine-private/replica/${deployContext}`))
       return loadConf(deployContext, process.env.NODE_ENV, subConf);
     else if (deployContext.startsWith('dd-')) return loadConf(deployContext, process.env.NODE_ENV, subConf);
@@ -591,51 +586,6 @@ const buildPortProxyRouter = (port, proxyRouter) => {
   return reOrderRouter;
 };
 
-const cliBar = async (time = 5000) => {
-  // create new progress bar
-  const b = new cliProgress.SingleBar({
-    format: 'Delay | {bar} | {percentage}% || {value}/{total} Chunks || Speed: {speed}',
-    barCompleteChar: '\u2588',
-    barIncompleteChar: '\u2591',
-    hideCursor: true,
-  });
-
-  const maxValueDisplay = 200;
-  const minValueDisplay = 0;
-  const steps = 10;
-  const incrementValue = 200 / steps;
-  const delayTime = time / steps;
-  // initialize the bar - defining payload token "speed" with the default value "N/A"
-  b.start(maxValueDisplay, minValueDisplay, {
-    speed: 'N/A',
-  });
-
-  // update values
-  // b1.increment();
-  // b1.update(20);
-
-  for (const step of range(1, steps)) {
-    b.increment(incrementValue);
-    await timer(delayTime);
-  }
-
-  // stop the bar
-  b.stop();
-};
-
-const cliSpinner = async (time = 5000, message0, message1, color, type = 'dots') => {
-  const { frames, interval } = cliSpinners[type];
-  const steps = parseInt(time / interval);
-  let index = 0;
-  for (const step of range(1, steps)) {
-    const msg = `${message0 ? message0 : ''}${frames[index]}${message1 ? message1 : ''}`;
-    logUpdate(color ? msg[color] : msg);
-    await timer(interval);
-    index++;
-    if (index === frames.length) index = 0;
-  }
-};
-
 const buildReplicaId = ({ deployId, replica }) => `${deployId}-${replica.slice(1)}`;
 
 const getDataDeploy = (
@@ -777,9 +727,9 @@ const validateTemplatePath = (absolutePath = '') => {
 };
 
 const awaitDeployMonitor = async (init = false, deltaMs = 1000) => {
-  if (init) fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
+  if (init) UnderpostRootEnv.API.set('await-deploy', new Date().toISOString());
   await timer(deltaMs);
-  if (fs.existsSync(`./tmp/await-deploy`)) return await awaitDeployMonitor();
+  if (UnderpostRootEnv.API.get('await-deploy')) return await awaitDeployMonitor();
 };
 
 const getCronBackUpFolder = (host = '', path = '') => {
@@ -991,8 +941,6 @@ export {
   buildWsSrc,
   cloneSrcComponents,
   buildProxyRouter,
-  cliBar,
-  cliSpinner,
   getDataDeploy,
   validateTemplatePath,
   buildReplicaId,

package/src/server/process.js

@@ -5,6 +5,7 @@ import dotenv from 'dotenv';
 import fs from 'fs-extra';
 import { loggerFactory } from './logger.js';
 import clipboard from 'clipboardy';
+import UnderpostRootEnv from '../cli/env.js';
 
 dotenv.config();
 
@@ -47,7 +48,7 @@ const ProcessController = {
       this.logger.info(`process on exit`, args);
     });
     this.onSigListen();
-    if (fs.existsSync(`./tmp/await-deploy`)) fs.remove(`./tmp/await-deploy`);
+    UnderpostRootEnv.API.delete('await-deploy');
   },
 };
 

package/src/server/runtime.js

@@ -404,6 +404,13 @@ const buildRuntime = async () => {
           const path404 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/404/index.html`;
           const page404 = fs.existsSync(path404) ? `${path === '/' ? '' : path}/404` : undefined;
           app.use(function (req, res, next) {
+            // if /<path>/home redirect to /<path>
+            const homeRedirectPath = `${path === '/' ? '' : path}/home`;
+            if (req.url.startsWith(homeRedirectPath)) {
+              const redirectUrl = req.url.replace('/home', '');
+              return res.redirect(redirectUrl.startsWith('/') ? redirectUrl : `/${redirectUrl}`);
+            }
+
             if (page404) return res.status(404).redirect(page404);
             else {
               res.set('Content-Type', 'text/html');

package/src/server/ssl.js

@@ -50,8 +50,7 @@ const buildSSL = async (host) => {
 
           fs.writeFileSync(`./engine-private/ssl/${host}/_ca_bundle.crt`, ca, 'utf8');
           fs.writeFileSync(`./engine-private/ssl/${host}/_ca_full_bundle.crt`, caFull, 'utf8');
-          // TODO: no repeat folderHost match
-          // fs.removeSync(`${sslPath}/${folderHost}`);
+
           return true;
         }
       }