underpost 2.8.1 → 2.8.41

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,51 +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 run install-template`);
-    switch (process.platform) {
-      case 'linux':
-        try {
-          await MongooseDB.server();
-        } catch (error) {
-          logger.error(error, 'failed to start mongodb server');
-        }
-        break;
+  .action((...args) => ((args[1] = Underpost.version), new Underpost.project(...args)));
 
-      default:
-        break;
-    }
-    shellExec(`npm run dev`);
-  });
+program
+  .command('clone <uri>')
+  .description('Clone github repository, if your GITHUB_TOKEN environment exists, it will be used')
+  .action(Underpost.project.clone);
 
 program
-  .command('test')
-  .description('Run tests')
-  .action(() => {
-    console.log(
-      underpostASCI() +
-        `
-    ${Underpost.version} https://www.nexodev.org/docs
-    `,
-    );
-    shellCd(`${globalBinFolder}`);
-    shellExec(`npm run test`);
-  });
+  .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')
@@ -78,4 +58,6 @@ program
     program.outputHelp();
   });
 
+const options = program.opts();
+
 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,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,18 +1,40 @@
 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'));
       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 +53,6 @@ switch (process.argv[2]) {
     }
     break;
   default:
+    shellExec(`sudo code ${process.argv[2]} --user-data-dir="/root/.vscode-root" --no-sandbox`);
     break;
 }

package/conf.js

@@ -1,4 +1,8 @@
-const DefaultConf = {
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+const DefaultConf = /**/ {
   client: {
     default: {
       metadata: {
@@ -75,58 +79,16 @@ const DefaultConf = {
         ],
       },
       views: [
-        {
-          path: '/',
-          title: 'Home',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/home',
-          title: 'Home',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/settings',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/log-in',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/sign-up',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/log-out',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/account',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/docs',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/recover',
-          client: 'Default',
-          ssr: 'Default',
-        },
-        {
-          path: '/default-management',
-          client: 'Default',
-          ssr: 'Default',
-        },
+        { path: '/', title: 'Home', client: 'Default', ssr: 'Default' },
+        { path: '/home', title: 'Home', client: 'Default', ssr: 'Default' },
+        { path: '/settings', client: 'Default', ssr: 'Default' },
+        { path: '/log-in', client: 'Default', ssr: 'Default' },
+        { path: '/sign-up', client: 'Default', ssr: 'Default' },
+        { path: '/log-out', client: 'Default', ssr: 'Default' },
+        { path: '/account', client: 'Default', ssr: 'Default' },
+        { path: '/docs', client: 'Default', ssr: 'Default' },
+        { path: '/recover', client: 'Default', ssr: 'Default' },
+        { path: '/default-management', client: 'Default', ssr: 'Default' },
         { client: 'Default', ssr: 'Default', path: '/404', title: '404 Not Found' },
         { client: 'Default', ssr: 'Default', path: '/500', title: '500 Server Error' },
       ],
@@ -137,24 +99,15 @@ const DefaultConf = {
           import_name: '@neodrag/vanilla',
           import_name_build: '/dist/@neodrag-vanilla/index.js',
         },
-        {
-          folder: './node_modules/@fortawesome/fontawesome-free',
-          public_folder: '/dist/fontawesome',
-        },
+        { folder: './node_modules/@fortawesome/fontawesome-free', public_folder: '/dist/fontawesome' },
         {
           folder: './node_modules/sortablejs/modular',
           public_folder: '/dist/sortablejs',
           import_name: 'sortablejs',
           import_name_build: '/dist/sortablejs/sortable.complete.esm.js',
         },
-        {
-          folder: './node_modules/validator',
-          public_folder: '/dist/validator',
-        },
-        {
-          folder: './node_modules/@loadingio/css-spinner/entries',
-          public_folder: '/dist/loadingio',
-        },
+        { folder: './node_modules/validator', public_folder: '/dist/validator' },
+        { folder: './node_modules/@loadingio/css-spinner/entries', public_folder: '/dist/loadingio' },
         {
           import_name: 'ag-grid-community',
           import_name_build: '/dist/ag-grid-community/ag-grid-community.auto.complete.esm.min.js',
@@ -169,10 +122,7 @@ const DefaultConf = {
           import_name: 'socket.io/client-dist/socket.io.esm.min.js',
           import_name_build: '/dist/socket.io/socket.io.esm.min.js',
         },
-        {
-          folder: './node_modules/peerjs/dist',
-          public_folder: '/dist/peerjs',
-        },
+        { folder: './node_modules/peerjs/dist', public_folder: '/dist/peerjs' },
       ],
       services: ['default', 'core', 'user', 'test', 'file'],
     },
@@ -181,35 +131,12 @@ const DefaultConf = {
     Default: {
       head: ['Seo', 'Pwa', 'Css', 'DefaultScripts', 'Production'],
       body: ['CacheControl', 'DefaultSplashScreen', '404', '500'],
-      mailer: {
-        userVerifyEmail: 'DefaultVerifyEmail',
-        userRecoverEmail: 'DefaultRecoverEmail',
-      },
+      mailer: { userVerifyEmail: 'DefaultVerifyEmail', userRecoverEmail: 'DefaultRecoverEmail' },
       offline: [
-        {
-          path: '/offline',
-          title: 'No Network Connection',
-          client: 'NoNetworkConnection',
-          head: [],
-          body: [],
-        },
-        {
-          path: '/maintenance',
-          title: 'Server Maintenance',
-          client: 'Maintenance',
-          head: [],
-          body: [],
-        },
-      ],
-      pages: [
-        {
-          path: '/test',
-          title: 'Test',
-          client: 'Test',
-          head: [],
-          body: [],
-        },
+        { path: '/offline', title: 'No Network Connection', client: 'NoNetworkConnection', head: [], body: [] },
+        { path: '/maintenance', title: 'Server Maintenance', client: 'Maintenance', head: [], body: [] },
       ],
+      pages: [{ path: '/test', title: 'Test', client: 'Test', head: [], body: [] }],
     },
   },
   server: {
@@ -227,24 +154,14 @@ const DefaultConf = {
         ws: 'core',
         peer: true,
         proxy: [80, 443],
-        db: {
-          provider: 'mongoose',
-          host: 'mongodb://127.0.0.1:27017',
-          name: 'default',
-        },
+        db: { provider: 'mongoose', host: 'mongodb://127.0.0.1:27017', name: 'default' },
         mailer: {
-          sender: {
-            email: 'noreply@default.net',
-            name: 'Default',
-          },
+          sender: { email: 'noreply@default.net', name: 'Default' },
           transport: {
             host: 'smtp.default.com',
             port: 465,
             secure: true,
-            auth: {
-              user: 'noreply@default.net',
-              pass: '',
-            },
+            auth: { user: 'noreply@default.net', pass: '' },
           },
         },
       },
@@ -262,35 +179,11 @@ const DefaultConf = {
     },
   },
   cron: {
-    ipDaemon: {
-      ip: null,
-    },
-    records: {
-      A: [
-        {
-          host: 'example.com',
-          dns: 'dondominio',
-          api_key: '???',
-          user: '???',
-        },
-      ],
-    },
-    backups: [
-      {
-        deployGroupId: 'default-group',
-      },
-    ],
-    jobs: {
-      dns: {
-        expression: '* * * * *',
-        enabled: true,
-      },
-      backups: {
-        expression: '0 1 * * *',
-        enabled: true,
-      },
-    },
+    ipDaemon: { ip: null },
+    records: { A: [{ host: 'example.com', dns: 'dondominio', api_key: '???', user: '???' }] },
+    backups: [{ deployGroupId: 'default-group' }],
+    jobs: { dns: { expression: '* * * * *', enabled: true }, backups: { expression: '0 1 * * *', enabled: true } },
   },
-};
+}; /**/
 
 export { DefaultConf };

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.1'
+      engine.version: '2.8.41'
     networks:
       - load-balancer
 

package/manifests/core/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+# kubectl apply -k core/.
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - underpost-engine-pv-pvc.yaml
+  - underpost-engine-headless-service.yaml
+  - underpost-engine-statefulset.yaml
+  - underpost-engine-backup-pv-pvc.yaml
+  - underpost-engine-mongodb-backup-cronjob.yaml
+  - underpost-engine-backup-access.yaml

package/manifests/core/underpost-engine-backup-access.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: backup-access
+spec:
+  containers:
+    - name: busybox
+      image: busybox
+      command: ['sh', '-c', 'sleep 3600']
+      volumeMounts:
+        - name: backup-storage
+          mountPath: /backup
+  volumes:
+    - name: backup-storage
+      persistentVolumeClaim:
+        claimName: backup-pvc

package/manifests/core/underpost-engine-backup-pv-pvc.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: backup-pv
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: /mnt/backup
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: backup-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi

package/manifests/core/underpost-engine-headless-service.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongodb-service
+spec:
+  clusterIP: None
+  selector:
+    app: mongodb
+  ports:
+    - port: 27017