underpost 2.8.1 → 2.8.7

package/bin/file.js

@@ -1,7 +1,13 @@
 import fs from 'fs-extra';
 
 import { loggerFactory } from '../src/server/logger.js';
-import { cap, getCapVariableName, getDirname } from '../src/client/components/core/CommonJs.js';
+import {
+  cap,
+  getCapVariableName,
+  getDirname,
+  newInstance,
+  uniqueArray,
+} from '../src/client/components/core/CommonJs.js';
 import { shellCd, shellExec } from '../src/server/process.js';
 import walk from 'ignore-walk';
 import { validateTemplatePath } from '../src/server/conf.js';
@@ -25,16 +31,8 @@ let name = getCapVariableName(file.split('.')[0]);
 logger.info('File metadata', { path, file, ext, name });
 
 try {
-  // throw '';
-  // let cmd;
   let content = '';
   switch (type) {
-    case 'create-js-module':
-      // node bin/file './src/client/components/core/progress bar.js'
-      content = `const ${name} = {}; export { ${name} }`;
-      setTimeout(() => shellExec(`prettier --write ${buildPath}`));
-      break;
-
     case 'update-template':
     case 'copy-src':
       console.log({ rawPath, toPath });
@@ -77,22 +75,75 @@ try {
         fs.copySync(`./.github`, `../pwa-microservices-template/.github`);
         fs.copySync(`./src/client/public/default`, `../pwa-microservices-template/src/client/public/default`);
 
-        shellCd('../pwa-microservices-template');
-        for (const deletePath of ['CHANGELOG.md', 'README.md', 'package-lock.json', 'package.json']) {
-          shellExec(`git checkout ${deletePath}`);
-        }
+        for (const checkoutPath of ['README.md', 'package-lock.json', 'package.json'])
+          shellExec(`cd ../pwa-microservices-template && git checkout ${checkoutPath}`);
+
         for (const deletePath of [
           '.github/workflows/coverall.yml',
           '.github/workflows/docker-image.yml',
           '.github/workflows/deploy.ssh.yml',
           '.github/workflows/deploy.api-rest.yml',
+          '.github/workflows/engine.lampp.ci.yml',
+          '.github/workflows/engine.core.ci.yml',
+          '.github/workflows/engine.cyberia.ci.yml',
+          './manifests/deployment/dd-lampp-development',
+          './manifests/deployment/dd-cyberia-development',
+          './manifests/deployment/dd-core-development',
           'bin/web3.js',
           'bin/cyberia.js',
-          'src/ipfs.js',
-          'src/k8s.js',
         ]) {
-          fs.removeSync('../pwa-microservices-template/' + deletePath);
+          if (fs.existsSync(deletePath)) fs.removeSync('../pwa-microservices-template/' + deletePath);
         }
+        const originPackageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+        const templatePackageJson = JSON.parse(fs.readFileSync('../pwa-microservices-template/package.json', 'utf8'));
+
+        const name = templatePackageJson.name;
+        const description = templatePackageJson.description;
+        const dev = templatePackageJson.scripts.dev;
+        const build = templatePackageJson.scripts.build;
+
+        templatePackageJson.dependencies = originPackageJson.dependencies;
+        templatePackageJson.devDependencies = originPackageJson.devDependencies;
+        templatePackageJson.version = originPackageJson.version;
+        templatePackageJson.scripts = originPackageJson.scripts;
+        templatePackageJson.name = name;
+        templatePackageJson.description = description;
+        templatePackageJson.scripts.dev = dev;
+        templatePackageJson.scripts.build = build;
+        templatePackageJson.keywords = uniqueArray(
+          ['pwa', 'microservices', 'template', 'builder'].concat(templatePackageJson.keywords),
+        );
+        delete templatePackageJson.scripts['update-template'];
+        fs.writeFileSync(
+          '../pwa-microservices-template/package.json',
+          JSON.stringify(templatePackageJson, null, 4),
+          'utf8',
+        );
+
+        const originPackageLockJson = JSON.parse(fs.readFileSync('./package-lock.json', 'utf8'));
+        const templatePackageLockJson = JSON.parse(
+          fs.readFileSync('../pwa-microservices-template/package-lock.json', 'utf8'),
+        );
+        const originBasePackageLock = newInstance(templatePackageLockJson.packages['']);
+        templatePackageLockJson.version = originPackageLockJson.version;
+        templatePackageLockJson.packages = originPackageLockJson.packages;
+        templatePackageLockJson.packages[''].name = originBasePackageLock.name;
+        templatePackageLockJson.packages[''].version = originPackageLockJson.version;
+        templatePackageLockJson.packages[''].hasInstallScript = originBasePackageLock.hasInstallScript;
+        templatePackageLockJson.packages[''].license = originBasePackageLock.license;
+        fs.writeFileSync(
+          '../pwa-microservices-template/package-lock.json',
+          JSON.stringify(templatePackageLockJson, null, 4),
+          'utf8',
+        );
+        const splitKeyword = '## underpost ci/cd cli';
+        fs.writeFileSync(
+          `../pwa-microservices-template/README.md`,
+          fs.readFileSync(`../pwa-microservices-template/README.md`, 'utf8').split(`<!-- -->`)[0] +
+            `<!-- -->
+${splitKeyword + fs.readFileSync(`./README.md`, 'utf8').split(splitKeyword)[1]}`,
+          'utf8',
+        );
       }
 
       break;

package/bin/hwt.js

@@ -1,19 +1,9 @@
 import fs from 'fs-extra';
-import axios from 'axios';
-import https from 'https';
 
-import dotenv from 'dotenv';
-import { shellCd, shellExec } from '../src/server/process.js';
 import { loggerFactory } from '../src/server/logger.js';
 
 const logger = loggerFactory(import.meta);
 
-const httpsAgent = new https.Agent({
-  rejectUnauthorized: false,
-});
-
-axios.defaults.httpsAgent = httpsAgent;
-
 logger.info('argv', process.argv);
 
 const [exe, dir, operator, templateId, publicPath] = process.argv;

package/bin/index.js

@@ -1,81 +1,5 @@
 #! /usr/bin/env node
 
-import dotenv from 'dotenv';
-import { shellCd, shellExec } from '../src/server/process.js';
-import fs from 'fs-extra';
-import { Command } from 'commander';
-import { MongooseDB } from '../src/db/mongo/MongooseDB.js';
-import { loggerFactory, underpostASCI } from '../src/server/logger.js';
-import Underpost from '../src/index.js';
-
-dotenv.config();
-
-const logger = loggerFactory(import.meta);
-
-const globalBinFolder = `${shellExec(`npm root -g`, {
-  stdout: true,
-  silent: true,
-  disableLog: true,
-}).trim()}/underpost`;
-
-const program = new Command();
-
-program.name('underpost').description(`underpost.net ci/cd cli ${Underpost.version}`).version(Underpost.version);
-
-program
-  .command('new <app-name>')
-  .description('Create a new project')
-  .action(async (appName) => {
-    console.log(
-      underpostASCI() +
-        `
-    ${Underpost.version} https://www.nexodev.org/docs
-    `,
-    );
-    await logger.setUpInfo();
-    const destFolder = `${process.cwd()}/${appName}`;
-    logger.info('Note: This process may take several minutes to complete');
-    logger.info('build app', { destFolder });
-    fs.mkdirSync(destFolder, { recursive: true });
-    fs.copySync(globalBinFolder, destFolder);
-    fs.writeFileSync(`${destFolder}/.gitignore`, fs.readFileSync(`${globalBinFolder}/.dockerignore`, 'utf8'), 'utf8');
-    shellCd(`${destFolder}`);
-    shellExec(`git init && git add . && git commit -m "Base template implementation"`);
-    shellExec(`npm run install-template`);
-    switch (process.platform) {
-      case 'linux':
-        try {
-          await MongooseDB.server();
-        } catch (error) {
-          logger.error(error, 'failed to start mongodb server');
-        }
-        break;
-
-      default:
-        break;
-    }
-    shellExec(`npm run dev`);
-  });
-
-program
-  .command('test')
-  .description('Run tests')
-  .action(() => {
-    console.log(
-      underpostASCI() +
-        `
-    ${Underpost.version} https://www.nexodev.org/docs
-    `,
-    );
-    shellCd(`${globalBinFolder}`);
-    shellExec(`npm run test`);
-  });
-
-program
-  .command('help')
-  .description('Display help information')
-  .action(() => {
-    program.outputHelp();
-  });
+import { program } from '../src/cli/index.js';
 
 program.parse();

package/bin/ssl.js

@@ -1,9 +1,7 @@
 import fs from 'fs';
 import read from 'read';
-import ncp from 'copy-paste';
 import dotenv from 'dotenv';
-
-import { getRootDirectory, shellExec } from '../src/server/process.js';
+import { getRootDirectory, pbcopy, shellExec } from '../src/server/process.js';
 import { loggerFactory } from '../src/server/logger.js';
 import { Cmd, loadConf } from '../src/server/conf.js';
 import { buildSSL } from '../src/server/ssl.js';
@@ -24,9 +22,9 @@ try {
   for (const host of hosts.split(',')) {
     if (host in confServer) {
       const directory = confServer[host]['/']?.['directory'] ? confServer[host]['/']['directory'] : undefined;
-      cmd = `certbot certonly --webroot --webroot-path ${
+      cmd = `sudo certbot certonly --webroot --webroot-path ${
         directory ? directory : `${getRootDirectory()}/public/${host}`
-      } -d ${host}`;
+      } --cert-name ${host} -d ${host}`;
       // directory ? directory : `${getRootDirectory()}/public/${host}`
       // directory ? directory : `${getRootDirectory()}/public/www.${host.split('.').slice(-2).join('.')}`
 
@@ -38,16 +36,26 @@ try {
       // certbot delete --cert-name <domain>
 
       logger.info(`Run the following command`, cmd);
-      await ncp.copy(cmd);
-      await read({ prompt: 'Command copy to clipboard, press enter to continue.\n' });
+      try {
+        await pbcopy(cmd);
+        await read({ prompt: 'Command copy to clipboard, press enter to continue.\n' });
+      } catch (error) {
+        logger.error(error);
+      }
       // Certificate
-      await buildSSL(host);
+      if (process.argv.includes('build')) await buildSSL(host);
       logger.info('Certificate saved', host);
     } else throw new Error(`host not found: ${host}`);
   }
-
-  cmd = `certbot renew --dry-run`;
-  await ncp.copy(cmd);
+  // check for renewal conf:
+  // /etc/letsencrypt/renewal
+  // /etc/letsencrypt/live
+  cmd = `sudo certbot renew --dry-run`;
+  try {
+    await pbcopy(cmd);
+  } catch (error) {
+    logger.error(error);
+  }
   logger.info(`run the following command for renewal. Command copy to clipboard`, cmd);
   logger.info(`success install SLL`, hosts);
 } catch (error) {

package/bin/util.js

@@ -1,25 +1,15 @@
 import fs from 'fs-extra';
-import merge from 'deepmerge';
 import si from 'systeminformation';
 import * as dir from 'path';
 import { svg } from 'font-awesome-assets';
-import axios from 'axios';
-import https from 'https';
 
 import { loggerFactory } from '../src/server/logger.js';
-import { shellCd, shellExec } from '../src/server/process.js';
-import { range, s4 } from '../src/client/components/core/CommonJs.js';
-import { network } from '../src/server/network.js';
-import { Config } from '../src/server/conf.js';
+import { pbcopy, shellExec } from '../src/server/process.js';
+import { buildKindPorts } from '../src/server/conf.js';
 import { FileFactory } from '../src/api/file/file.service.js';
-import { buildTextImg, faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
+import { faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
 import keyword_extractor from 'keyword-extractor';
 
-const httpsAgent = new https.Agent({
-  rejectUnauthorized: false,
-});
-axios.defaults.httpsAgent = httpsAgent;
-
 const logger = loggerFactory(import.meta);
 
 logger.info('argv', process.argv);
@@ -29,35 +19,10 @@ const operator = process.argv[2];
 try {
   // let cmd;
   switch (operator) {
-    case 'cls':
-      fs.removeSync('./public');
-      fs.removeSync('./logs');
-      fs.removeSync('./conf');
-      //   fs.removeSync('./engine-private');
-      //   fs.removeSync('./node_modules');
-      break;
     case 'log':
-      (() => {
-        const logPath = `./logs/${process.argv[3]}/${process.argv[4]}.log`;
-        logger.info('Read', logPath);
-        console.log(fs.readFileSync(logPath, 'utf8'));
-      })();
-      break;
-    case 'kill-ports':
-      if (!process.argv[3]) process.argv[3] = '22,80,443,3000-3020';
-      for (const port of process.argv[3].split(',')) {
-        const rangePort = port.split('-');
-        if (rangePort[1])
-          for (const port of range(parseInt(rangePort[0]), parseInt(rangePort[1]))) {
-            logger.info('clean port', port);
-            await network.port.portClean(port);
-          }
-        else {
-          logger.info('clean port', parseInt(port));
-          await network.port.portClean(port);
-        }
-      }
+      console.log(fs.readFileSync(process.argv[3], 'utf8'));
       break;
+
     case 'system-info':
       await (async () => {
         for (const infoKey of Object.keys(si)) {
@@ -74,56 +39,6 @@ try {
         }
       })();
       break;
-    case 'export-git-changes':
-      {
-        const baseFrom = process.argv[3];
-        const baseTo = process.argv[4];
-        // if (fs.existsSync(baseTo)) fs.removeSync(baseTo);
-        shellCd(baseFrom);
-        {
-          try {
-            let output = shellExec('git status', { silent: true, stdout: true });
-            console.log('output:', output);
-            output = output
-              .split(`to discard changes in working directory)`)[1]
-              .split(`Untracked files:`)[0]
-              .split('modified:')
-              .map((c) => c.trim().replaceAll(`\n`, ''));
-            output[output.length - 1] = output[output.length - 1].split('no changes added to commit')[0];
-            output.shift();
-            for (const fromPath of output) {
-              const from = `${baseFrom}/${fromPath}`;
-              const to = `${baseTo}/${fromPath}`;
-              logger.info('Copy path', { from, to });
-              fs.copySync(from, to);
-            }
-          } catch (error) {
-            logger.error(error);
-          }
-        }
-        {
-          try {
-            let output = shellExec('git status', { silent: true, stdout: true });
-            console.log('output:', output);
-            output = output
-              .split(`to include in what will be committed)`)[1]
-              .split(`no changes added to commit`)[0]
-              .split(`\n`)
-              .map((l) => l.trim())
-              .filter((l) => l);
-
-            for (const fromPath of output) {
-              const from = `${baseFrom}/${fromPath}`;
-              const to = `${baseTo}/${fromPath}`;
-              logger.info('Copy path', { from, to });
-              fs.copySync(from, to);
-            }
-          } catch (error) {
-            logger.error(error);
-          }
-        }
-      }
-      break;
     case 'delete-empty-folder':
       function cleanEmptyFoldersRecursively(folder) {
         if (!fs.existsSync(folder)) {
@@ -190,20 +105,6 @@ try {
       fs.writeFileSync('b64-image', `data:image/jpg;base64,${fs.readFileSync(process.argv[3]).toString('base64')}`);
       break;
 
-    case 'get-ip': {
-      const response = await axios.get(process.argv[3]);
-      logger.info(process.argv[3] + ' IP', response.request.socket.remoteAddress);
-      break;
-    }
-
-    case 'clean-env': {
-      shellExec(`git checkout package.json`);
-      shellExec(`git checkout .env.production`);
-      shellExec(`git checkout .env.development`);
-      shellExec(`git checkout .env.test`);
-      shellExec(`git checkout jsdoc.json`);
-      break;
-    }
     case 'get-keys': {
       const sentence = fs.existsSync('./_')
         ? fs.readFileSync('./_', 'utf8')
@@ -222,6 +123,10 @@ try {
       console.log(extraction_result.join(', '));
       break;
     }
+
+    case 'build-ports': {
+      pbcopy(buildKindPorts(process.argv[3], process.argv[4]));
+    }
     default:
       break;
   }

package/bin/vs.js

@@ -1,18 +1,41 @@
 import fs from 'fs-extra';
 import { shellExec } from '../src/server/process.js';
+import { loggerFactory } from '../src/server/logger.js';
+
+const logger = loggerFactory(import.meta);
 
 switch (process.argv[2]) {
+  case 'info': {
+    logger.info('Formatted', 'Ctrl shift I');
+    logger.info('Command', 'Ctrl shift P');
+    logger.info('Search', 'Ctrl shift F');
+    logger.info('Debug', 'Ctrl shift D');
+    logger.info('New File', 'Ctrl N');
+    logger.info('Change tab', 'Ctrl Tab');
+    logger.info('Fold All', 'Ctrl K + Ctrl 0');
+    logger.info('Unfold All', 'Ctrl K + Ctrl J');
+    logger.info('Close All tabs', 'Ctrl K + W');
+    logger.info('Go to line number', 'Ctrl G');
+    logger.info('Change current project folder', 'Ctrl K + Ctrl O');
+    logger.info('Open new vs windows', 'Ctrl Shift N');
+    logger.info('Close current vs windows', 'Ctrl Shift W');
+    logger.info('Preview md', 'Ctrl shift V');
+    logger.info('Open git changes', 'Ctrl G + G');
+    logger.warn('Terminal shortcut configure with command pallette', 'Ctl shift T');
+    break;
+  }
   case 'import':
     {
       const extensions = JSON.parse(fs.readFileSync(`./.vscode/extensions.json`, 'utf8'));
       extensions.recommendations.map((extension) => {
-        if (extension) shellExec(`code --install-extension ${extension}`);
+        if (extension)
+          shellExec(`sudo code --user-data-dir="/root/.vscode-root" --no-sandbox --install-extension ${extension}`);
       });
     }
     break;
   case 'export':
     {
-      shellExec(`code --list-extensions > vs-extensions.txt`);
+      shellExec(`sudo code --user-data-dir="/root/.vscode-root" --no-sandbox --list-extensions > vs-extensions.txt`);
       fs.writeFileSync(
         `./.vscode/extensions.json`,
         JSON.stringify(
@@ -31,5 +54,6 @@ switch (process.argv[2]) {
     }
     break;
   default:
+    shellExec(`sudo code ${process.argv[2]} --user-data-dir="/root/.vscode-root" --no-sandbox`);
     break;
 }