underpost 2.8.44 → 2.8.46

package/src/server/conf.js

@@ -13,8 +13,8 @@ import cliProgress from 'cli-progress';
 import cliSpinners from 'cli-spinners';
 import logUpdate from 'log-update';
 import colors from 'colors';
-import { actionInitLog, loggerFactory } from './logger.js';
-import { pbcopy, shellExec } from './process.js';
+import { loggerFactory } from './logger.js';
+import { shellExec } from './process.js';
 import { DefaultConf } from '../../conf.js';
 import read from 'read';
 import splitFile from 'split-file';
@@ -525,9 +525,11 @@ const buildPortProxyRouter = (port, proxyRouter) => {
 
   if (Object.keys(router).length === 0) return router;
 
+  const reOrderRouter = {};
   for (const absoluteHostKey of orderArrayFromAttrInt(Object.keys(router), 'length'))
-    router[absoluteHostKey] = router[absoluteHostKey];
-  return router;
+    reOrderRouter[absoluteHostKey] = router[absoluteHostKey];
+
+  return reOrderRouter;
 };
 
 const cliBar = async (time = 5000) => {
@@ -1039,132 +1041,6 @@ const setUpProxyMaintenanceServer = ({ deployGroupId }) => {
   shellExec(`node bin/deploy run ${proxyDeployId} maintenance`);
 };
 
-const repoClone = (gitUri = 'underpostnet/pwa-microservices-template') => {
-  const repoName = gitUri.split('/').pop();
-  if (fs.existsSync(`./${repoName}`)) fs.removeSync(`./${repoName}`);
-  shellExec(
-    `git clone https://${process.env.GITHUB_TOKEN ? `${process.env.GITHUB_TOKEN}@` : ''}github.com/${gitUri}.git`,
-  );
-  if (process.env.GITHUB_TOKEN) {
-    shellExec(
-      `git clone https://${
-        process.env.GITHUB_TOKEN ? `${process.env.GITHUB_TOKEN}@` : ''
-      }github.com/${gitUri}-private.git`,
-    );
-    fs.moveSync(`./${repoName}-private`, `./${repoName}/engine-private`, {
-      overwrite: true,
-    });
-  }
-};
-
-const repoPull = (repoPath = './', gitUri = 'underpostnet/pwa-microservices-template') => {
-  shellExec(`cd ${repoPath} && git pull https://${process.env.GITHUB_TOKEN}@github.com/${gitUri}.git`, {
-    disableLog: true,
-  });
-};
-
-const commitData = {
-  feat: {
-    description: 'A new feature',
-    title: 'Features',
-    emoji: '✨',
-  },
-  fix: {
-    description: 'A bug fix',
-    title: 'Bug Fixes',
-    emoji: '🐛',
-  },
-  docs: {
-    description: 'Documentation only changes',
-    title: 'Documentation',
-    emoji: '📚',
-  },
-  style: {
-    description:
-      'Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)',
-    title: 'Styles',
-    emoji: '💎',
-  },
-  refactor: {
-    description: 'A code change that neither fixes a bug nor adds a feature',
-    title: 'Code Refactoring',
-    emoji: '📦',
-  },
-  perf: {
-    description: 'A code change that improves performance',
-    title: 'Performance Improvements',
-    emoji: '⚡️',
-  },
-  cd: {
-    description:
-      'Changes to our Continuous Delivery configuration files and scripts (example scopes: Jenkins, Spinnaker, ArgoCD)',
-    title: 'Continuous Delivery',
-    emoji: '🚀',
-  },
-  test: {
-    description: 'Adding missing tests or correcting existing tests',
-    title: 'Tests',
-    emoji: '🚨',
-  },
-  build: {
-    description: 'Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)',
-    title: 'Builds',
-    emoji: '🛠',
-  },
-  ci: {
-    description:
-      'Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)',
-    title: 'Continuous Integrations',
-    emoji: '⚙️',
-  },
-  chore: {
-    description: "Other changes that don't modify src or test files",
-    title: 'Chores',
-    emoji: '♻️',
-  },
-  revert: {
-    description: 'Reverts a previous commit',
-    title: 'Reverts',
-    emoji: '🗑',
-  },
-  backup: {
-    description: 'Changes related to backups, including creation, restoration, and maintenance.',
-    title: 'Backups',
-    emoji: '💾',
-  },
-};
-
-const repoCommit = (
-  repoPath = './',
-  commitType = 'feat',
-  subModule = '',
-  message = '',
-  options = {
-    copy: false,
-    info: false,
-    empty: false,
-  },
-) => {
-  if (options.info) return logger.info('', commitData);
-  const _message = `${commitType}${subModule ? `(${subModule})` : ''}${process.argv.includes('!') ? '!' : ''}: ${
-    commitData[commitType].emoji
-  } ${message ? message : commitData[commitType].description}`;
-  if (options.copy) return pbcopy(_message);
-  shellExec(`cd ${repoPath} && git commit ${options?.empty ? `--allow-empty ` : ''}-m "${_message}"`);
-};
-
-const repoPush = (repoPath = './', gitUri = 'underpostnet/pwa-microservices-template') => {
-  shellExec(`cd ${repoPath} && git push https://${process.env.GITHUB_TOKEN}@github.com/${gitUri}.git`, {
-    disableLog: true,
-  });
-  logger.info(
-    'commit url',
-    `http://github.com/${gitUri}/commit/${shellExec(`cd ${repoPath} && git rev-parse --verify HEAD`, {
-      stdout: true,
-    }).trim()}`,
-  );
-};
-
 const getNpmRootPath = () =>
   shellExec(`npm root -g`, {
     stdout: true,
@@ -1172,37 +1048,6 @@ const getNpmRootPath = () =>
     silent: true,
   }).trim();
 
-const newProject = (repositoryName, version) => {
-  return new Promise(async (resolve, reject) => {
-    try {
-      const exeRootPath = `${getNpmRootPath()}/underpost`;
-      // const exeRootPath = '/home/dd/pwa-microservices-template';
-      actionInitLog(version);
-      await logger.setUpInfo();
-      const destFolder = `${process.cwd()}/${repositoryName}`;
-      logger.info('Note: This process may take several minutes to complete');
-      logger.info('build app', { destFolder });
-      fs.mkdirSync(destFolder, { recursive: true });
-      fs.copySync(exeRootPath, destFolder);
-      if (fs.existsSync(`${destFolder}/node_modules`)) fs.removeSync(`${destFolder}/node_modules`);
-      fs.writeFileSync(`${destFolder}/.gitignore`, fs.readFileSync(`${exeRootPath}/.dockerignore`, 'utf8'), 'utf8');
-      shellExec(`cd ${destFolder} && git init && git add . && git commit -m "Base template implementation"`);
-      shellExec(`cd ${destFolder} && npm install`);
-      shellExec(`cd ${destFolder} && npm run build`);
-      shellExec(`cd ${destFolder} && npm run dev`);
-      return resolve();
-    } catch (error) {
-      logger.error(error, error.stack);
-      return reject(error.message);
-    }
-  });
-};
-
-const runTest = (version) => {
-  actionInitLog(version);
-  shellExec(`cd ${getNpmRootPath()}/underpost && npm run test`);
-};
-
 const writeEnv = (envPath, envObj) =>
   fs.writeFileSync(
     envPath,
@@ -1212,46 +1057,6 @@ const writeEnv = (envPath, envObj) =>
     'utf8',
   );
 
-const UnderpostRootEnv = {
-  set: (key, value) => {
-    const exeRootPath = `${getNpmRootPath()}/underpost`;
-    const envPath = `${exeRootPath}/.env`;
-    let env = {};
-    if (fs.existsSync(envPath)) env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-    env[key] = value;
-    writeEnv(envPath, env);
-  },
-  delete: (key, value) => {
-    const exeRootPath = `${getNpmRootPath()}/underpost`;
-    const envPath = `${exeRootPath}/.env`;
-    let env = {};
-    if (fs.existsSync(envPath)) env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-    delete env[key];
-    writeEnv(envPath, env);
-  },
-  get: (key) => {
-    const exeRootPath = `${getNpmRootPath()}/underpost`;
-    const envPath = `${exeRootPath}/.env`;
-    if (!fs.existsSync(envPath)) return logger.error(`Unable to find underpost root environment`);
-    const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-    logger.info('underpost root', { [key]: env[key] });
-    return env[key];
-  },
-  list: () => {
-    const exeRootPath = `${getNpmRootPath()}/underpost`;
-    const envPath = `${exeRootPath}/.env`;
-    if (!fs.existsSync(envPath)) return logger.error(`Unable to find underpost root environment`);
-    const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-    logger.info('underpost root', env);
-    return env;
-  },
-  clean: () => {
-    const exeRootPath = `${getNpmRootPath()}/underpost`;
-    const envPath = `${exeRootPath}/.env`;
-    fs.removeSync(envPath);
-  },
-};
-
 export {
   Cmd,
   Config,
@@ -1287,13 +1092,6 @@ export {
   buildKindPorts,
   buildPortProxyRouter,
   splitFileFactory,
-  repoClone,
-  repoPull,
-  repoCommit,
-  repoPush,
-  newProject,
-  runTest,
   getNpmRootPath,
   writeEnv,
-  UnderpostRootEnv,
 };

package/src/server/logger.js

@@ -84,8 +84,8 @@ const format = (meta) =>
  * @memberof Logger
  */
 const setUpInfo = async (logger = new winston.Logger()) => {
-  logger.info('npm_package_version', process.env.npm_package_version);
   logger.info('argv', process.argv);
+  logger.info('cwd', process.cwd());
   logger.info('platform', process.platform);
   logger.info('env', process.env.NODE_ENV);
   logger.info('--max-old-space-size', {
@@ -186,11 +186,11 @@ const underpostASCI = () => `
 ░╚═════╝░╚═╝░░╚══╝╚═════╝░╚══════╝╚═╝░░╚═╝╚═╝░░░░░░╚════╝░╚═════╝░░░░╚═╝░░░
                                                 `;
 
-const actionInitLog = (version = '0.0.0') =>
+const actionInitLog = () =>
   console.log(
     underpostASCI() +
       `
-    ${version} https://www.nexodev.org/docs
+    https://www.nexodev.org/docs
 `,
   );
 

package/src/server/network.js

@@ -39,8 +39,8 @@ const saveRuntimeRouter = async () => {
     const host = process.env.DEFAULT_DEPLOY_HOST;
     const path = process.env.DEFAULT_DEPLOY_PATH;
     const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
-    if (!deployId || !host || !path) {
-      logger.warn('default deploy instance not found');
+    if (!deployId || !host || !path || !fs.existsSync(confServerPath)) {
+      // logger.warn('default deploy instance not found');
       return;
     }
     const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));

package/startup.cjs

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