underpost 2.8.866 → 2.8.871

package/src/server/client-icons.js

@@ -1,80 +1,17 @@
 import { favicons } from 'favicons';
-// TODO: search alternatives
-// import textToImage from 'text-to-image';
 import { loggerFactory } from './logger.js';
 import fs from 'fs-extra';
-import { getCapVariableName, s4 } from '../client/components/core/CommonJs.js';
-import { FileFactory } from '../api/file/file.service.js';
-import { svg, png, png3x } from 'font-awesome-assets';
+import { getCapVariableName } from '../client/components/core/CommonJs.js';
 
 const logger = loggerFactory(import.meta);
 
-const faBase64Png = (faId = 'check', width = 100, height = 100, color = '#209e00') => {
-  const b64Src = png3x(faId, color, width, height);
-  return b64Src.split('src="data:image/png;base64,')[1].split('"')[0];
-};
-
-const defaultBaseTextImgOptions = {
-  debug: true,
-  fontFamily: 'Arial',
-  fontWeight: 'bold',
-  bgColor: 'black',
-  textColor: 'white',
-  debugFilename: 'src/client/public/text-image.png',
-  verticalAlign: 'center',
-  textAlign: 'center',
-};
-
-const defaultBaseTextImgOptionsSizes = {
-  '70x70': {
-    maxWidth: 70,
-    customHeight: 70,
-    fontSize: 25,
-    margin: 10,
-  },
-  '100x100': {
-    maxWidth: 100,
-    customHeight: 100,
-    fontSize: 30,
-    margin: 12,
-  },
-  '100x300': {
-    maxWidth: 300,
-    customHeight: 100,
-    fontSize: 30,
-    margin: 12,
-  },
-  '1200x1200': {
-    maxWidth: 1200,
-    customHeight: 1200,
-    fontSize: 500,
-    margin: 50,
-  },
-};
-
-const buildTextImg = async (text = 'APP', options, size = '1200x1200') => {
-  options = { ...defaultBaseTextImgOptions, ...defaultBaseTextImgOptionsSizes[size], ...options };
-  // await textToImage.generate(text, options);
-};
-
-const getBufferPngText = async ({ text, textColor, bgColor, size, debugFilename }) => {
-  if (!text) text = 'Hello World!';
-  if (!textColor) textColor = '#000000';
-  if (!bgColor) bgColor = '#ffffff';
-  if (!size) size = '100x300';
-  if (!debugFilename) debugFilename = `./${s4()}${s4()}${s4()}.png`;
-  await buildTextImg(text, { textColor, bgColor, size, debugFilename }, size);
-  if (!fs.existsSync(debugFilename)) return Buffer.alloc(0); // Return empty buffer if file not found
-  const bufferImage = fs.readFileSync(debugFilename);
-  fs.removeSync(debugFilename);
-  return bufferImage;
-};
-
 const buildIcons = async ({
   publicClientId,
-  metadata: { title, description, keywords, author, thumbnail, themeColor },
+  metadata: { title, description, keywords, author, thumbnail, themeColor, baseBuildIconReference },
 }) => {
-  const source = `src/client/public/${publicClientId}/assets/logo/base-icon.png`; // Source image(s). `string`, `buffer` or array of `string`
+  const source = baseBuildIconReference
+    ? baseBuildIconReference
+    : `src/client/public/${publicClientId}/assets/logo/base-icon.png`; // Source image(s). `string`, `buffer` or array of `string`
 
   const configuration = {
     path: '/', // Path for overriding default icons path. `string`
@@ -149,13 +86,4 @@ const buildIcons = async ({
   }
 };
 
-const getDefaultProfileImageId = async (File) => {
-  const faId = 'user';
-  const tmpFilePath = `./tmp/${faId}-${s4() + s4()}.svg`;
-  fs.writeFileSync(tmpFilePath, svg(faId, '#f5f5f5d1'), 'utf8');
-  const file = await new File(FileFactory.svg(fs.readFileSync(tmpFilePath), `${faId}.svg`)).save();
-  fs.removeSync(tmpFilePath);
-  return file._id;
-};
-
-export { buildIcons, buildTextImg, defaultBaseTextImgOptions, faBase64Png, getBufferPngText, getDefaultProfileImageId };
+export { buildIcons };

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);
@@ -48,17 +43,17 @@ const Config = {
     if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
     fs.writeFileSync(
       `${folder}/.env.production`,
-      fs.readFileSync('./.env.production', 'utf8').replace('dd-default', deployId),
+      fs.readFileSync('./.env.production', 'utf8').replaceAll('dd-default', deployId),
       'utf8',
     );
     fs.writeFileSync(
       `${folder}/.env.development`,
-      fs.readFileSync('./.env.development', 'utf8').replace('dd-default', deployId),
+      fs.readFileSync('./.env.development', 'utf8').replaceAll('dd-default', deployId),
       'utf8',
     );
     fs.writeFileSync(
       `${folder}/.env.test`,
-      fs.readFileSync('./.env.test', 'utf8').replace('dd-default', deployId),
+      fs.readFileSync('./.env.test', 'utf8').replaceAll('dd-default', deployId),
       'utf8',
     );
     fs.writeFileSync(`${folder}/package.json`, fs.readFileSync('./package.json', 'utf8'), 'utf8');
@@ -562,16 +557,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 +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 = (
@@ -769,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 = '') => {
@@ -983,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/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();