underpost 2.8.86 → 2.8.87

package/src/server/conf.js

@@ -9,17 +9,11 @@ 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';
 
 colors.enable();
 
@@ -27,68 +21,84 @@ dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
-// monitoring: https://app.pm2.io/
-
 const Config = {
   default: DefaultConf,
-  build: async function (options = { folder: '' }, deployContext, deployList, subConf) {
-    if (!deployContext) deployContext = process.argv[2];
+  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');
-    if (fs.existsSync(`./engine-private/conf/${deployContext}`))
-      return loadConf(deployContext, process.env.NODE_ENV, subConf);
     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);
+    if (deployContext === 'proxy') Config.buildProxy(deployContext, deployList, subConf);
+  },
+  deployIdFactory: function (deployId = 'dd-default') {
+    if (!deployId.startsWith('dd-')) deployId = `dd-${deployId}`;
 
-    if (deployContext === 'deploy') return;
-
-    if (deployContext === 'proxy') {
-      if (!deployList) deployList = process.argv[3];
-      if (!subConf) subConf = process.argv[4];
-      this.default.server = {};
-      for (const deployId of deployList.split(',')) {
-        let confPath = `./engine-private/conf/${deployId}/conf.server.json`;
-        const privateConfDevPath = fs.existsSync(`./engine-private/replica/${deployId}/conf.server.json`)
-          ? `./engine-private/replica/${deployId}/conf.server.json`
-          : `./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`;
-        const confDevPath = fs.existsSync(privateConfDevPath)
-          ? privateConfDevPath
-          : `./engine-private/conf/${deployId}/conf.server.dev.json`;
-
-        if (process.env.NODE_ENV === 'development' && fs.existsSync(confDevPath)) confPath = confDevPath;
-        const serverConf = JSON.parse(fs.readFileSync(confPath, 'utf8'));
-
-        for (const host of Object.keys(loadReplicas(serverConf, deployContext, subConf))) {
-          if (serverConf[host]['/'])
-            this.default.server[host] = {
-              ...this.default.server[host],
-              ...serverConf[host],
-            };
-          else
-            this.default.server[host] = {
-              ...serverConf[host],
-              ...this.default.server[host],
-            };
-        }
+    logger.info('Build deployId', deployId);
+
+    const folder = `./engine-private/conf/${deployId}`;
+
+    if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
+    fs.writeFileSync(
+      `${folder}/.env.production`,
+      fs.readFileSync('./.env.production', 'utf8').replaceAll('dd-default', deployId),
+      'utf8',
+    );
+    fs.writeFileSync(
+      `${folder}/.env.development`,
+      fs.readFileSync('./.env.development', 'utf8').replaceAll('dd-default', deployId),
+      'utf8',
+    );
+    fs.writeFileSync(
+      `${folder}/.env.test`,
+      fs.readFileSync('./.env.test', 'utf8').replaceAll('dd-default', deployId),
+      'utf8',
+    );
+    fs.writeFileSync(`${folder}/package.json`, fs.readFileSync('./package.json', 'utf8'), 'utf8');
+
+    this.buildTmpConf(folder);
+
+    return { deployIdFolder: folder, deployId };
+  },
+  buildTmpConf: function (folder = './conf') {
+    for (const confType of Object.keys(this.default))
+      fs.writeFileSync(`${folder}/conf.${confType}.json`, JSON.stringify(this.default[confType], null, 4), 'utf8');
+  },
+  buildProxy: function (deployContext = 'dd-default', deployList, subConf) {
+    if (!deployList) deployList = process.argv[3];
+    if (!subConf) subConf = process.argv[4];
+    this.default.server = {};
+    for (const deployId of deployList.split(',')) {
+      let confPath = `./engine-private/conf/${deployId}/conf.server.json`;
+      const privateConfDevPath = fs.existsSync(`./engine-private/replica/${deployId}/conf.server.json`)
+        ? `./engine-private/replica/${deployId}/conf.server.json`
+        : `./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`;
+      const confDevPath = fs.existsSync(privateConfDevPath)
+        ? privateConfDevPath
+        : `./engine-private/conf/${deployId}/conf.server.dev.json`;
+
+      if (process.env.NODE_ENV === 'development' && fs.existsSync(confDevPath)) confPath = confDevPath;
+      const serverConf = JSON.parse(fs.readFileSync(confPath, 'utf8'));
+
+      for (const host of Object.keys(loadReplicas(serverConf, deployContext, subConf))) {
+        if (serverConf[host]['/'])
+          this.default.server[host] = {
+            ...this.default.server[host],
+            ...serverConf[host],
+          };
+        else
+          this.default.server[host] = {
+            ...serverConf[host],
+            ...this.default.server[host],
+          };
       }
     }
-    if (!options || !options.folder)
-      options = {
-        ...options,
-        folder: `./conf`,
-      };
-    if (!fs.existsSync(options.folder)) fs.mkdirSync(options.folder, { recursive: true });
-    for (const confType of Object.keys(this.default)) {
-      fs.writeFileSync(
-        `${options.folder}/conf.${confType}.json`,
-        JSON.stringify(this.default[confType], null, 4),
-        'utf8',
-      );
-    }
+    this.buildTmpConf();
   },
 };
 
-const loadConf = (deployId, envInput, subConf) => {
+const loadConf = (deployId = 'dd-default', envInput, subConf) => {
   if (deployId === 'current') {
     console.log(process.env.DEPLOY_ID);
     return;
@@ -104,22 +114,15 @@ const loadConf = (deployId, envInput, subConf) => {
     shellExec(`git checkout ${path}/package-lock.json`);
     return;
   }
-  if (!deployId.startsWith('dd-')) deployId = 'dd-default';
   const folder = fs.existsSync(`./engine-private/replica/${deployId}`)
     ? `./engine-private/replica/${deployId}`
     : `./engine-private/conf/${deployId}`;
+  if (!fs.existsSync(folder)) Config.deployIdFactory(deployId);
   if (!fs.existsSync(`./conf`)) fs.mkdirSync(`./conf`);
-  if (!fs.existsSync(`./tmp`)) fs.mkdirSync(`./tmp`, { recursive: true });
-  const isValidDeployId = fs.existsSync(`${folder}`);
-  if (!isValidDeployId) {
-    logger.info(`Save new deploy conf: '${deployId}'`);
-    shellExec(`node bin/deploy save ${deployId}`);
-    return loadConf(deployId);
-  }
+  if (!fs.existsSync(`./tmp`)) fs.mkdirSync(`./tmp`);
+
   for (const typeConf of Object.keys(Config.default)) {
-    let srcConf = isValidDeployId
-      ? fs.readFileSync(`${folder}/conf.${typeConf}.json`, 'utf8')
-      : JSON.stringify(Config.default[typeConf]);
+    let srcConf = fs.readFileSync(`${folder}/conf.${typeConf}.json`, 'utf8');
     if (process.env.NODE_ENV === 'development' && typeConf === 'server') {
       if (!subConf) subConf = process.argv[3];
       const devConfPath = `${folder}/conf.${typeConf}.dev${subConf ? `.${subConf}` : ''}.json`;
@@ -494,15 +497,6 @@ const buildProxyRouter = () => {
       }
     }
   }
-  if (process.argv.includes('maintenance'))
-    (async () => {
-      globalThis.defaultHtmlSrcMaintenance = (await ssrFactory())({
-        title: 'Site in maintenance',
-        ssrPath: '/',
-        ssrHeadComponents: '',
-        ssrBodyComponents: (await ssrFactory(`./src/client/ssr/offline/Maintenance.js`))(),
-      });
-    })();
 
   return proxyRouter;
 };
@@ -562,16 +556,24 @@ const buildPortProxyRouter = (port, proxyRouter) => {
   // build router
   Object.keys(hosts).map((hostKey) => {
     let { host, path, target, proxy, peer } = hosts[hostKey];
-    if (process.argv.includes('localhost') && process.env.NODE_ENV === 'development') host = `localhost`;
+    if (process.env.NODE_ENV === 'development') host = `localhost`;
+
+    if (!proxy.includes(port)) {
+      logger.warn('Proxy port not set on conf', { port, host, path, proxy, target });
+      if (process.env.NODE_ENV === 'production') {
+        logger.warn('Omitting host', { host, path, target });
+        return;
+      }
+    }
 
-    if (!proxy.includes(port)) return;
     const absoluteHost = [80, 443].includes(port)
       ? `${host}${path === '/' ? '' : path}`
       : `${host}:${port}${path === '/' ? '' : path}`;
 
-    if (process.argv.includes('localhost')) {
-      if (!(absoluteHost in router)) router[absoluteHost] = target;
-    } else router[absoluteHost] = target;
+    if (absoluteHost in router)
+      logger.warn('Overwrite: Absolute host already exists on router', { absoluteHost, target });
+
+    router[absoluteHost] = target;
   }); // order router
 
   if (Object.keys(router).length === 0) return router;
@@ -583,51 +585,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 = (
@@ -636,7 +593,6 @@ const getDataDeploy = (
     deployGroupId: '',
     deployId: '',
     disableSyncEnvPort: false,
-    deployIdConcat: [],
   },
 ) => {
   let dataDeploy =
@@ -649,8 +605,6 @@ const getDataDeploy = (
     .map((deployId) => deployId.trim())
     .filter((deployId) => deployId);
 
-  if (options.deployIdConcat) dataDeploy = dataDeploy.concat(options.deployIdConcat);
-
   if (options.deployId) dataDeploy = dataDeploy.filter((d) => d === options.deployId);
 
   dataDeploy = dataDeploy.map((deployId) => {
@@ -777,12 +731,6 @@ const awaitDeployMonitor = async (init = false, deltaMs = 1000) => {
   if (fs.existsSync(`./tmp/await-deploy`)) return await awaitDeployMonitor();
 };
 
-const getDeployId = () => {
-  const deployIndexArg = process.argv.findIndex((a) => a.match(`deploy-id:`));
-  if (deployIndexArg > -1) return process.argv[deployIndexArg].split(':')[1].trim();
-  return 'dd-default';
-};
-
 const getCronBackUpFolder = (host = '', path = '') => {
   return `${host}${path.replace(/\\/g, '/').replace(`/`, '-')}`;
 };
@@ -992,14 +940,11 @@ export {
   buildWsSrc,
   cloneSrcComponents,
   buildProxyRouter,
-  cliBar,
-  cliSpinner,
   getDataDeploy,
   validateTemplatePath,
   buildReplicaId,
   getCronBackUpFolder,
   mergeFile,
-  getDeployId,
   getPathsSSR,
   buildKindPorts,
   buildPortProxyRouter,

package/src/server/proxy.js

@@ -55,7 +55,7 @@ const buildProxy = async () => {
         // '^/target-path': '/',
       },
     };
-    if (!process.argv.includes('maintenance')) options.router = buildPortProxyRouter(port, proxyRouter);
+    options.router = buildPortProxyRouter(port, proxyRouter);
 
     const filter = false
       ? (pathname, req) => {

package/src/server/runtime.js

@@ -18,7 +18,6 @@ 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';
 import { JSONweb, ssrFactory } from './client-formatted.js';
 import Underpost from '../index.js';
 import { createValkeyConnection } from './valkey.js';
@@ -28,7 +27,7 @@ dotenv.config();
 const logger = loggerFactory(import.meta);
 
 const buildRuntime = async () => {
-  const deployId = getDeployId();
+  const deployId = process.env.DEPLOY_ID;
 
   const collectDefaultMetrics = promClient.collectDefaultMetrics;
   collectDefaultMetrics();

package/src/server/start.js

@@ -107,12 +107,12 @@ class UnderpostStartUp {
         for (const replica of replicas) {
           if (!replica.match(deployId)) continue;
           shellExec(`node bin/deploy conf ${replica} ${env}`);
-          shellExec(`npm ${runCmd} deploy deploy-id:${replica}`, { async: true });
+          shellExec(`npm ${runCmd} ${replica}`, { async: true });
           await awaitDeployMonitor(true);
         }
       }
       shellExec(`node bin/deploy conf ${deployId} ${env}`);
-      shellExec(`npm ${runCmd} deploy deploy-id:${deployId}`, { async: true });
+      shellExec(`npm ${runCmd} ${deployId}`, { async: true });
       await awaitDeployMonitor(true);
       UnderpostRootEnv.API.set('container-status', `${deployId}-${env}-running-deployment`);
     },

package/test/api.test.js

@@ -21,12 +21,13 @@ const BASE_URL =
 
 describe(`GET 'Test' API Request `, async () => {
   {
-    const url = `${BASE_URL}/test/youtube-id/?url=https://www.youtube.com/watch?v=o4f42SbyDMk`;
+    const youtubeId = '2aib-pmgUdQ';
+    const url = `${BASE_URL}/test/youtube-id/?url=https://www.youtube.com/watch?v=${youtubeId}`;
     it(`youtube id from raw youtube url`, async () => {
       logger.info('request info', { url });
       const res = await axios.get(url);
       logger.info('response', res.data);
-      return expect(res.data.data).equal('o4f42SbyDMk');
+      return expect(res.data.data).equal(youtubeId);
     });
   }
   {

package/bin/cyberia0.js

@@ -1,78 +0,0 @@
-#! /usr/bin/env node
-
-import dotenv from 'dotenv';
-import { Command } from 'commander';
-import fs from 'fs-extra';
-import { pbcopy, shellExec } from '../src/server/process.js';
-import Jimp from 'jimp';
-import Underpost from '../src/index.js';
-import { loggerFactory } from '../src/server/logger.js';
-import { DataBaseProvider } from '../src/db/DataBaseProvider.js';
-
-dotenv.config();
-
-const logger = loggerFactory(import.meta);
-
-const deployId = process.env.DEFAULT_DEPLOY_ID;
-const host = process.env.DEFAULT_DEPLOY_HOST;
-const path = process.env.DEFAULT_DEPLOY_PATH;
-
-const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
-const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
-const { db } = confServer[host][path];
-
-logger.info('env', {
-  deployId,
-  host,
-  path,
-  db,
-});
-
-await DataBaseProvider.load({
-  apis: ['object-layer'],
-  host,
-  path,
-  db,
-});
-
-const ObjectLayer = DataBaseProvider.instance[`${host}${path}`].mongoose.models.ObjectLayer;
-
-const program = new Command();
-
-program.name('cyberia').description(`content generator cli ${Underpost.version}`).version(Underpost.version);
-
-const pngDirectoryIteratorByObjectLayerType = async (
-  objectLayerType = 'skin',
-  callback = ({ path, objectLayerType, objectLayerId, direction, frame }) => {},
-) => {
-  for (const objectLayerId of await fs.readdir(`./src/client/public/cyberia/assets/${objectLayerType}`)) {
-    for (const direction of await fs.readdir(
-      `./src/client/public/cyberia/assets/${objectLayerType}/${objectLayerId}`,
-    )) {
-      const dirFolder = `./src/client/public/cyberia/assets/${objectLayerType}/${objectLayerId}/${direction}`;
-      if (!fs.statSync(dirFolder).isDirectory()) continue;
-      for (const frame of await fs.readdir(dirFolder)) {
-        const imageFilePath = `./src/client/public/cyberia/assets/${objectLayerType}/${objectLayerId}/${direction}/${frame}`;
-        await callback({ path: imageFilePath, objectLayerType, objectLayerId, direction, frame });
-      }
-    }
-  }
-};
-
-program
-  .command('ol')
-  .option('--import [object-layer-type]', 'Import object layer from type storage png image')
-  .action(async (options = { import: false }) => {
-    if (options.import) {
-      await pngDirectoryIteratorByObjectLayerType(
-        options.import,
-        async ({ path, objectLayerType, objectLayerId, direction, frame }) => {
-          console.log(path, { objectLayerType, objectLayerId, direction, frame });
-        },
-      );
-    }
-    await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
-  })
-  .description('Object layer management');
-
-program.parse();