underpost 2.8.31 → 2.8.42

package/bin/deploy.js

@@ -4,7 +4,7 @@ import axios from 'axios';
 import dotenv from 'dotenv';
 import plantuml from 'plantuml';
 
-import { shellCd, shellExec } from '../src/server/process.js';
+import { pbcopy, shellCd, shellExec } from '../src/server/process.js';
 import { loggerFactory } from '../src/server/logger.js';
 import {
   Config,
@@ -29,7 +29,6 @@ import {
 } from '../src/server/conf.js';
 import { buildClient } from '../src/server/client-build.js';
 import { range, setPad, timer, uniqueArray } from '../src/client/components/core/CommonJs.js';
-import simpleGit from 'simple-git';
 import { MongooseDB } from '../src/db/mongo/MongooseDB.js';
 import { Lampp } from '../src/runtime/lampp/Lampp.js';
 import { DefaultConf } from '../conf.js';
@@ -139,8 +138,7 @@ try {
       }
       break;
     case 'conf': {
-      loadConf(process.argv[3]);
-      if (process.argv[4]) fs.writeFileSync(`.env`, fs.readFileSync(`.env.${process.argv[4]}`, 'utf8'), 'utf8');
+      loadConf(process.argv[3], process.argv[4]);
       break;
     }
     case 'run':
@@ -307,7 +305,7 @@ try {
     }
 
     case 'adminer': {
-      const directory = '/dd/engine/public/adminer';
+      const directory = '/home/dd/engine/public/adminer';
       // const host = '127.0.0.1';
       const host = 'localhost';
       const port = 80;
@@ -337,7 +335,7 @@ try {
 
     case 'pma':
       {
-        const directory = '/dd/engine/public/phpmyadmin';
+        const directory = '/home/dd/engine/public/phpmyadmin';
         // const host = '127.0.0.1';
         const host = 'localhost';
         const port = 80;
@@ -733,6 +731,16 @@ try {
               originPackage.version = newVersion;
               fs.writeFileSync(filePah, JSON.stringify(originPackage, null, 4), 'utf8');
             }
+            if (filePah.split('/').pop() === 'deployment.yaml') {
+              fs.writeFileSync(
+                filePah,
+                fs
+                  .readFileSync(filePah, 'utf8')
+                  .replaceAll(`v${version}`, `v${newVersion}`)
+                  .replaceAll(`engine.version: ${version}`, `engine.version: ${newVersion}`),
+                'utf8',
+              );
+            }
           }
         }
 
@@ -753,14 +761,6 @@ try {
             'utf8',
           );
 
-        fs.writeFileSync(
-          `./manifests/test/underpost-engine-pod.yaml`,
-          fs
-            .readFileSync(`./manifests/test/underpost-engine-pod.yaml`, 'utf8')
-            .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
-          'utf8',
-        );
-
         fs.writeFileSync(
           `./src/index.js`,
           fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
@@ -773,29 +773,19 @@ try {
       break;
 
     case 'update-authors': {
-      // shellExec(`git log --reverse --format='%aN (<%aE>)' | sort -u`, { stdout: true });
-      const logs = await simpleGit().log();
-
+      // #### Ordered by first contribution.
       fs.writeFileSync(
         './AUTHORS.md',
         `# Authors
 
-#### Ordered by first contribution.
 
-${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}](mailto:${log.author_email}))`)).join(`
-`)}
+${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).join(`\n\n\n`)}
 
 #### Generated by [underpost.net](https://underpost.net)`,
         'utf8',
       );
 
-      // hash: '1c7418ad2f49c7798a6d28d370b34c69d31dce46',
-      // date: '2024-09-16T17:10:13-03:00',
-      // message: 'update',
-      // refs: '',
-      // body: '',
-      // author_name: 'fcoverdugo',
-      // author_email: 'fcoverdugoa@underpost.net'
+      break;
     }
 
     case 'restore-macro-db':
@@ -837,10 +827,10 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
             shellExec(`bin/besu --help`);
 
             // Set env path
-            // export PATH=$PATH:/dd/besu-24.9.1/bin
+            // export PATH=$PATH:/home/dd/besu-24.9.1/bin
 
             // Open src
-            // shellExec(`sudo code /dd/besu-24.9.1 --user-data-dir="/root/.vscode-root" --no-sandbox`);
+            // shellExec(`sudo code /home/dd/besu-24.9.1 --user-data-dir="/root/.vscode-root" --no-sandbox`);
           }
 
           break;
@@ -858,23 +848,43 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
     }
 
     case 'update-default-conf': {
-      const host = process.argv[3] ? process.argv[3] : 'underpostnet.github.io';
-      const path = process.argv[4] ? process.argv[4] : '/pwa-microservices-template-ghpkg';
-      DefaultConf.server = {
-        [host]: { [path]: DefaultConf.server['default.net']['/'] },
-      };
-      DefaultConf.server[host][path].apiBaseProxyPath = '/';
-      DefaultConf.server[host][path].apiBaseHost = 'www.nexodev.org';
-      fs.writeFileSync(
-        './conf.js',
-        `
-        const DefaultConf = ${JSONweb(DefaultConf)};
-        
-        export { DefaultConf }
-
-        `,
-        'utf8',
-      );
+      const defaultServer = DefaultConf.server['default.net']['/'];
+      let confName = process.argv[3];
+      if (confName === 'ghpkg') {
+        confName = undefined;
+        const host = 'underpostnet.github.io';
+        const path = '/pwa-microservices-template-ghpkg';
+        DefaultConf.server = {
+          [host]: { [path]: defaultServer },
+        };
+        DefaultConf.server[host][path].apiBaseProxyPath = '/';
+        DefaultConf.server[host][path].apiBaseHost = 'www.nexodev.org';
+      } else if (confName) {
+        DefaultConf.client = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.client.json`, 'utf8'));
+        DefaultConf.server = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
+        DefaultConf.ssr = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.ssr.json`, 'utf8'));
+        DefaultConf.cron = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.cron.json`, 'utf8'));
+
+        for (const host of Object.keys(DefaultConf.server)) {
+          for (const path of Object.keys(DefaultConf.server[host])) {
+            DefaultConf.server[host][path].db = defaultServer.db;
+            DefaultConf.server[host][path].mailer = defaultServer.mailer;
+
+            delete DefaultConf.server[host][path]._wp_client;
+            delete DefaultConf.server[host][path]._wp_git;
+            delete DefaultConf.server[host][path]._wp_directory;
+            delete DefaultConf.server[host][path].wp;
+            delete DefaultConf.server[host][path].git;
+            delete DefaultConf.server[host][path].directory;
+          }
+        }
+      }
+      const sepRender = '/**/';
+      const confRawPaths = fs.readFileSync('./conf.js', 'utf8').split(sepRender);
+      confRawPaths[1] = `${JSON.stringify(DefaultConf)};`;
+      const targetConfPath = `./conf${confName ? `.${confName}` : ''}.js`;
+      fs.writeFileSync(targetConfPath, confRawPaths.join(sepRender), 'utf8');
+      shellExec(`prettier --write ${targetConfPath}`);
 
       break;
     }
@@ -1045,15 +1055,15 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
           shellExec(`sudo systemctl start valkey`);
           shellExec(`valkey-cli ping`);
         } else {
-          shellExec(`cd /dd && git clone https://github.com/valkey-io/valkey.git`);
-          shellExec(`cd /dd/valkey && make`);
+          shellExec(`cd /home/dd && git clone https://github.com/valkey-io/valkey.git`);
+          shellExec(`cd /home/dd/valkey && make`);
           shellExec(`apt install valkey-tools`); // valkey-cli
         }
       }
       if (process.argv.includes('rocky')) {
         shellExec(`sudo systemctl stop valkey`);
         shellExec(`sudo systemctl start valkey`);
-      } else shellExec(`cd /dd/valkey && ./src/valkey-server`);
+      } else shellExec(`cd /home/dd/valkey && ./src/valkey-server`);
 
       break;
     }

package/bin/file.js

@@ -86,10 +86,11 @@ try {
           '.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',
           'bin/web3.js',
           'bin/cyberia.js',
-          'src/ipfs.js',
-          'src/k8s.js',
         ]) {
           fs.removeSync('../pwa-microservices-template/' + deletePath);
         }

package/bin/index.js

@@ -2,22 +2,14 @@
 
 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 { actionInitLog, loggerFactory } 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);
@@ -25,40 +17,39 @@ program.name('underpost').description(`underpost.net ci/cd cli ${Underpost.versi
 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 install`);
-    shellExec(`npm run build`);
-    shellExec(`npm run dev`);
-  });
+  .action((...args) => ((args[1] = Underpost.version), new Underpost.project(...args)));
 
 program
-  .command('test')
-  .description('Run tests')
-  .action(() => {
-    console.log(
-      underpostASCI() +
-        `
-    ${Underpost.version} https://www.nexodev.org/docs
-    `,
-    );
-    shellCd(`${globalBinFolder}`);
-    shellExec(`npm run test`);
-  });
+  .command('clone <uri>')
+  .description('Clone github repository, if your GITHUB_TOKEN environment exists, it will be used')
+  .action(Underpost.project.clone);
+
+program
+  .command('pull <path> <uri>')
+  .description('Pull github repository, if your GITHUB_TOKEN environment exists, it will be used')
+  .action(Underpost.project.pull);
+
+program
+  .option('--copy')
+  .option('--info')
+  .option('--empty')
+  .command('cmt <path> [commit-type] [sub-module] [message]')
+  .description(
+    'Commit github repository, if your GITHUB_TOKEN environment exists, it will be used, use --copy will copy to clipboard message, use --info will see info commit types, use --empty will allow empty files',
+  )
+  .action((...args) => ((args[4] = options), Underpost.project.commit(...args)));
+
+program
+  .command('push <path> <uri>')
+  .description('Push github repository, if your GITHUB_TOKEN environment exists, it will be used')
+  .action(Underpost.project.push);
+
+program
+  .command('env <deploy-id> [env]')
+  .description('Set environment variables files and conf related to <deploy-id>')
+  .action(Underpost.project.useEnv);
+
+program.command('test').description('Run tests').action(Underpost.runTest);
 
 program
   .command('help')
@@ -67,4 +58,6 @@ program
     program.outputHelp();
   });
 
+const options = program.opts();
+
 program.parse();

package/bin/util.js

@@ -1,5 +1,4 @@
 import fs from 'fs-extra';
-import merge from 'deepmerge';
 import si from 'systeminformation';
 import * as dir from 'path';
 import { svg } from 'font-awesome-assets';
@@ -7,12 +6,10 @@ 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({
@@ -29,35 +26,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 +46,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,12 +112,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`);
@@ -222,6 +138,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,7 +1,28 @@
 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.warn('Terminal shortcut configure with command pallette', 'Ctl shift T');
+    break;
+  }
   case 'import':
     {
       const extensions = JSON.parse(fs.readFileSync(`./.vscode/extensions.json`, 'utf8'));
@@ -32,5 +53,6 @@ switch (process.argv[2]) {
     }
     break;
   default:
+    shellExec(`sudo code ${process.argv[2]} --user-data-dir="/root/.vscode-root" --no-sandbox`);
     break;
 }