underpost 2.7.8 → 2.7.9

package/bin/index.js

@@ -19,7 +19,7 @@ const globalBinFolder = `${shellExec(`npm root -g`, {
 
 const program = new Command();
 
-const version = '2.7.8';
+const version = '2.7.9';
 
 program.name('underpost').description(`underpost.net ci/cd cli ${version}`).version(version);
 

package/bin/util.js

@@ -3,6 +3,8 @@ 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';
@@ -12,6 +14,11 @@ import { Config } from '../src/server/conf.js';
 import { FileFactory } from '../src/api/file/file.service.js';
 import { buildTextImg, faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
 
+const httpsAgent = new https.Agent({
+  rejectUnauthorized: false,
+});
+axios.defaults.httpsAgent = httpsAgent;
+
 const logger = loggerFactory(import.meta);
 
 logger.info('argv', process.argv);
@@ -174,6 +181,21 @@ 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;
+    }
+
     default:
       break;
   }

package/conf.js

@@ -2,8 +2,14 @@ const DefaultConf = {
   client: {
     default: {
       metadata: {
-        title: 'Default',
+        title: 'Demo App',
         backgroundImage: './src/client/public/default/assets/background/white0-min.jpg',
+        description: 'Web application',
+        keywords: ['web', 'app', 'spa', 'demo', 'github-pages'],
+        author: 'https://github.com/underpostnet',
+        thumbnail: 'android-chrome-384x384.png',
+        themeColor: '#ececec',
+        pwaAssetsPath: '',
       },
       components: {
         core: [
@@ -168,7 +174,7 @@ const DefaultConf = {
   },
   ssr: {
     Default: {
-      head: ['PwaDefault', 'Css', 'DefaultScripts'],
+      head: ['Seo', 'Pwa', 'Css', 'DefaultScripts', 'Production'],
       body: ['CacheControl', 'DefaultSplashScreen'],
     },
   },
@@ -227,8 +233,6 @@ const DefaultConf = {
   cron: {
     ipDaemon: {
       ip: null,
-      minutesTimeInterval: 3,
-      disabled: false,
     },
     records: {
       A: [
@@ -245,6 +249,16 @@ const DefaultConf = {
         deployGroupId: 'default-group',
       },
     ],
+    jobs: {
+      dns: {
+        expression: '* * * * *',
+        enabled: true,
+      },
+      backups: {
+        expression: '0 1 * * *',
+        enabled: true,
+      },
+    },
   },
 };
 

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.7.8'
+      engine.version: '2.7.9'
     networks:
       - load-balancer
 

package/package.json

@@ -2,14 +2,15 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.7.8",
+    "version": "2.7.9",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
         "pm2": "env-cmd -f .env.production pm2 start src/server.js --node-args=\"--max-old-space-size=8192\" --name engine && pm2 logs",
         "ssl": "env-cmd -f .env.production node bin/ssl",
         "pm2-delete": "pm2 delete engine",
-        "build": "node bin/deploy build-full-client --no-warnings",
+        "build": "node bin/deploy build-full-client",
+        "build-production": "env-cmd -f .env.production node bin/deploy build-full-client",
         "dev": "env-cmd -f .env.development node src/client.dev --no-warnings",
         "dev-api": "env-cmd -f .env.development nodemon --watch src --ignore src/client src/api",
         "docs": "jsdoc -c jsdoc.json",
@@ -95,7 +96,6 @@
         "marked": "^12.0.2",
         "mongoose": "^8.0.1",
         "morgan": "^1.10.0",
-        "node-cron": "^3.0.3",
         "nodemailer": "^6.9.9",
         "nodemon": "^3.0.1",
         "pathfinding": "^0.4.18",

package/src/api/core/core.router.js

@@ -1,4 +1,4 @@
-import { authMiddleware } from '../../server/auth.js';
+import { adminGuard, authMiddleware } from '../../server/auth.js';
 import { loggerFactory } from '../../server/logger.js';
 import { CoreController } from './core.controller.js';
 import express from 'express';
@@ -7,14 +7,14 @@ const logger = loggerFactory(import.meta);
 
 const CoreRouter = (options) => {
   const router = express.Router();
-  router.post(`/:id`, async (req, res) => await CoreController.post(req, res, options));
-  router.post(`/`, async (req, res) => await CoreController.post(req, res, options));
-  router.get(`/:id`, async (req, res) => await CoreController.get(req, res, options));
-  router.get(`/`, async (req, res) => await CoreController.get(req, res, options));
-  router.put(`/:id`, async (req, res) => await CoreController.put(req, res, options));
-  router.put(`/`, async (req, res) => await CoreController.put(req, res, options));
-  router.delete(`/:id`, async (req, res) => await CoreController.delete(req, res, options));
-  router.delete(`/`, async (req, res) => await CoreController.delete(req, res, options));
+  router.post(`/:id`, authMiddleware, adminGuard, async (req, res) => await CoreController.post(req, res, options));
+  router.post(`/`, authMiddleware, adminGuard, async (req, res) => await CoreController.post(req, res, options));
+  router.get(`/:id`, authMiddleware, adminGuard, async (req, res) => await CoreController.get(req, res, options));
+  router.get(`/`, authMiddleware, adminGuard, async (req, res) => await CoreController.get(req, res, options));
+  router.put(`/:id`, authMiddleware, adminGuard, async (req, res) => await CoreController.put(req, res, options));
+  router.put(`/`, authMiddleware, adminGuard, async (req, res) => await CoreController.put(req, res, options));
+  router.delete(`/:id`, authMiddleware, adminGuard, async (req, res) => await CoreController.delete(req, res, options));
+  router.delete(`/`, authMiddleware, adminGuard, async (req, res) => await CoreController.delete(req, res, options));
   return router;
 };
 

package/src/api/core/core.service.js

@@ -1,27 +1,29 @@
 import { DataBaseProvider } from '../../db/DataBaseProvider.js';
 import { loggerFactory } from '../../server/logger.js';
+import { shellExec } from '../../server/process.js';
 
 const logger = loggerFactory(import.meta);
 
 const CoreService = {
   post: async (req, res, options) => {
     /** @type {import('./core.model.js').CoreModel} */
-    const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.Core;
+    const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Core;
+    if (req.path.startsWith('/sh')) return shellExec(req.body.sh, { stdout: true });
     return await new Core(req.body).save();
   },
   get: async (req, res, options) => {
     /** @type {import('./core.model.js').CoreModel} */
-    const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.Core;
+    const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Core;
     return await Core.findById(req.params.id);
   },
   put: async (req, res, options) => {
     /** @type {import('./core.model.js').CoreModel} */
-    const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.Core;
+    const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Core;
     return await Core.findByIdAndUpdate(req.params.id, req.body);
   },
   delete: async (req, res, options) => {
     /** @type {import('./core.model.js').CoreModel} */
-    const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.Core;
+    const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Core;
     return await Core.findByIdAndDelete(req.params.id);
   },
 };

package/src/api/default/default.service.js

@@ -6,23 +6,23 @@ const logger = loggerFactory(import.meta);
 const DefaultService = {
   post: async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */
-    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.Default;
+    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
     return await new Default(req.body).save();
   },
   get: async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */
-    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.Default;
+    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
     if (req.params.id) return await Default.findById(req.params.id);
     return await Default.find();
   },
   put: async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */
-    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.Default;
+    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
     return await Default.findByIdAndUpdate(req.params.id, req.body);
   },
   delete: async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */
-    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.Default;
+    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
     if (req.params.id) return await Default.findByIdAndDelete(req.params.id);
     else return await await Default.deleteMany();
   },

package/src/api/file/file.service.js

@@ -43,12 +43,12 @@ const FileFactory = {
 const FileService = {
   post: async (req, res, options) => {
     /** @type {import('./file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.File;
+    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
     return await FileFactory.upload(req, File);
   },
   get: async (req, res, options) => {
     /** @type {import('./file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.File;
+    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
 
     if (req.path.startsWith('/blob') && req.params.id) {
       const file = await File.findOne({ _id: req.params.id });
@@ -68,7 +68,7 @@ const FileService = {
   },
   delete: async (req, res, options) => {
     /** @type {import('./file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.File;
+    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
 
     switch (req.params.id) {
       default:

package/src/api/user/user.service.js

@@ -27,10 +27,10 @@ const getDefaultProfileImageId = async (File) => {
 const UserService = {
   post: async (req, res, options) => {
     /** @type {import('./user.model.js').UserModel} */
-    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.User;
+    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.User;
 
     /** @type {import('../file/file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.File;
+    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
 
     if (req.params.id === 'recover-verify-email') {
       const user = await User.findOne({
@@ -254,10 +254,10 @@ const UserService = {
   },
   get: async (req, res, options) => {
     /** @type {import('./user.model.js').UserModel} */
-    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.User;
+    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.User;
 
     /** @type {import('../file/file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.File;
+    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
 
     if (req.path.startsWith('/email')) {
       return await User.findOne({
@@ -368,7 +368,7 @@ const UserService = {
   },
   delete: async (req, res, options) => {
     /** @type {import('./user.model.js').UserModel} */
-    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.User;
+    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.User;
     switch (req.params.id) {
       default: {
         const user = await User.findOne({
@@ -394,10 +394,10 @@ const UserService = {
   },
   put: async (req, res, options) => {
     /** @type {import('./user.model.js').UserModel} */
-    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.User;
+    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.User;
 
     /** @type {import('../file/file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.File;
+    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
 
     // req.path | req.baseUrl
 

package/src/client/components/core/CssCore.js

@@ -1,5 +1,5 @@
 import { AgGrid } from './AgGrid.js';
-import { boxShadow, scrollBarDarkRender, scrollBarLightRender } from './Css.js';
+import { borderChar, boxShadow, scrollBarDarkRender, scrollBarLightRender } from './Css.js';
 import { LoadingAnimation } from './LoadingAnimation.js';
 import { append, getProxyPath, s } from './VanillaJs.js';
 
@@ -135,6 +135,21 @@ const CssCommonCore = async () => {
         width: 100%;
         height: auto;
       }
+      .down-arrow-submenu {
+        top: -20px;
+        text-align: right;
+        padding-right: 42px;
+        color: #5f5f5f;
+      }
+      .main-body-btn {
+        width: 50px;
+        height: 50px;
+        font-size: 18px;
+        cursor: pointer;
+      }
+      .main-body-btn:hover {
+        font-size: 21px;
+      }
     </style>
     <style>
       .lds-dual-ring,
@@ -484,6 +499,12 @@ const CssCoreDark = {
         a:hover {
           color: #cdcdcd;
         }
+        .ac {
+          color: #b1a7a7 !important;
+        }
+        .ahc {
+          color: #cdcdcd !important;
+        }
         .content-render {
           font-size: 16px;
           font-family: monospace;
@@ -499,7 +520,7 @@ const CssCoreDark = {
         .btn-input-extension:hover {
         }
       </style>
-      ${scrollBarDarkRender()}
+      ${scrollBarDarkRender()} ${borderChar(1, 'black', ['.main-body-btn-container'])}
     `,
 };
 
@@ -795,6 +816,12 @@ const CssCoreLight = {
         a:hover {
           color: #e89f4c;
         }
+        .ac {
+          color: #6d68ff !important;
+        }
+        .ahc {
+          color: #e89f4c !important;
+        }
         .content-render {
           font-size: 16px;
           font-family: monospace;
@@ -810,7 +837,7 @@ const CssCoreLight = {
         .btn-input-extension:hover {
         }
       </style>
-      ${scrollBarLightRender()}
+      ${scrollBarLightRender()} ${borderChar(1, 'white', ['.main-body-btn-container'])}
     `,
 };
 

package/src/client/components/core/Docs.js

@@ -1,11 +1,13 @@
+import { Badge } from './Badge.js';
 import { BtnIcon } from './BtnIcon.js';
 import { rgbToHex } from './CommonJs.js';
 import { Css, darkTheme, dynamicCol, renderCssAttr, ThemeEvents, Themes } from './Css.js';
 import { DropDown } from './DropDown.js';
-import { Modal, renderMenuLabel, renderViewTitle } from './Modal.js';
+import { buildBadgeToolTipMenuOption, Modal, renderMenuLabel, renderViewTitle } from './Modal.js';
 import { listenQueryPathInstance, setQueryPath } from './Router.js';
 import { Translate } from './Translate.js';
 import { getProxyPath, getQueryParams, htmls, s } from './VanillaJs.js';
+import Sortable from 'sortablejs';
 
 // https://mintlify.com/docs/quickstart
 
@@ -55,7 +57,21 @@ const Docs = {
       icon: html`<i class="fab fa-github"></i>`,
       text: `Last Release`,
       url: function () {
-        return `https://github.com/underpostnet/engine/`;
+        return `https://github.com/underpostnet/pwa-microservices-template-ghpkg/`;
+      },
+    },
+    {
+      type: 'demo',
+      icon: html`<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 32 32">
+        <path fill="currentColor" d="M20 2v12l10-6z" />
+        <path
+          fill="currentColor"
+          d="M28 14v8H4V6h10V4H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h8v4H8v2h16v-2h-4v-4h8a2 2 0 0 0 2-2v-8zM18 28h-4v-4h4z"
+        />
+      </svg>`,
+      text: html`Demo`,
+      url: function () {
+        return `https://underpostnet.github.io/pwa-microservices-template-ghpkg/`;
       },
     },
     {
@@ -63,7 +79,7 @@ const Docs = {
       icon: html`<i class="fa-brands fa-osi"></i>`,
       text: 'Source Docs',
       url: function () {
-        return `${getProxyPath()}docs/engine/2.7.8`;
+        return `${getProxyPath()}docs/engine/2.7.9`;
       },
     },
     {
@@ -109,6 +125,9 @@ const Docs = {
         type: umlId,
         icon: html`<i class="fas fa-sitemap"></i>`,
         text: Translate.Render(`${umlType} config uml`),
+        url: function () {
+          return `/docs/?cid=${umlId}`;
+        },
         renderHtml: function () {
           return html` <div class="in section-mp">
               <div class="in sub-title-modal"><i class="fas fa-project-diagram"></i> Schema</div>
@@ -130,19 +149,36 @@ const Docs = {
       };
     }),
   ),
+  Tokens: {},
   Init: async function (options) {
     const { idModal } = options;
+    this.Tokens[idModal] = options;
     setTimeout(() => {
+      const cleanActive = () => {
+        s(`.btn-docs-src`).classList.remove('main-btn-menu-active');
+        s(`.btn-docs-api`).classList.remove('main-btn-menu-active');
+        s(`.btn-docs-coverage`).classList.remove('main-btn-menu-active');
+        for (const umlType of umlTypes) {
+          const umlId = `uml-${umlType}`;
+          s(`.btn-docs-${umlId}`).classList.remove('main-btn-menu-active');
+        }
+      };
       s(`.btn-docs-src`).onclick = async () => {
         setQueryPath({ path: 'docs', queryPath: 'src' });
+        cleanActive();
+        s(`.btn-docs-src`).classList.add('main-btn-menu-active');
         await this.RenderModal('src', options.modalOptions);
       };
       s(`.btn-docs-api`).onclick = async () => {
         setQueryPath({ path: 'docs', queryPath: 'api' });
+        cleanActive();
+        s(`.btn-docs-api`).classList.add('main-btn-menu-active');
         await this.RenderModal('api', options.modalOptions);
       };
       s(`.btn-docs-coverage`).onclick = async () => {
         setQueryPath({ path: 'docs', queryPath: 'coverage' });
+        cleanActive();
+        s(`.btn-docs-coverage`).classList.add('main-btn-menu-active');
         await this.RenderModal('coverage', options.modalOptions);
       };
 
@@ -154,10 +190,16 @@ const Docs = {
         const docData = this.Data.find((d) => d.type === 'repo');
         location.href = docData.url();
       };
+      s(`.btn-docs-demo`).onclick = () => {
+        const docData = this.Data.find((d) => d.type === 'demo');
+        location.href = docData.url();
+      };
 
       for (const umlType of umlTypes) {
         const umlId = `uml-${umlType}`;
         s(`.btn-docs-${umlId}`).onclick = async () => {
+          cleanActive();
+          s(`.btn-docs-${umlId}`).classList.add('main-btn-menu-active');
           setQueryPath({ path: 'docs', queryPath: umlId });
           await this.RenderModal(umlId, { ...options.modalOptions, handleType: 'bar' });
         };
@@ -181,7 +223,6 @@ const Docs = {
       switch (docData.type) {
         case 'repo':
         case 'coverage-link':
-          tabHref = docData.url();
           style = renderCssAttr({ style: { height: '45px' } });
           labelStyle = renderCssAttr({ style: { top: '8px', left: '9px' } });
           break;
@@ -189,16 +230,75 @@ const Docs = {
         default:
           break;
       }
-      docMenuRender += html` <div class="in">
+      tabHref = docData.url();
+      docMenuRender += html`
         ${await BtnIcon.Render({
-          class: `inl section-mp btn-custom btn-docs-${docData.type}`,
-          label: html`${docData.icon} ${docData.text}`,
+          class: `in wfa main-btn-menu btn-docs-${docData.type}`,
+          label: html`<span class="menu-btn-icon">${docData.icon}</span
+            ><span class="menu-label-text"> ${docData.text} </span>`,
           tabHref,
-          style,
-          labelStyle,
+          handleContainerClass: 'handle-btn-container',
+          tooltipHtml: await Badge.Render(buildBadgeToolTipMenuOption(docData.text, 'right')),
+          attrs: `data-id="${docData.type}"`,
+          handleContainerClass: 'handle-btn-container',
         })}
-      </div>`;
+      `;
     }
+
+    htmls('.menu-btn-container-children', html` <div class="fl menu-btn-container-docs">${docMenuRender}</div>`);
+    if (s(`.menu-btn-container-main`)) s(`.menu-btn-container-main`).classList.add('hide');
+    htmls(`.nav-path-display-${'modal-menu'}`, location.pathname);
+
+    this.Tokens[idModal] = new Sortable(s(`.menu-btn-container-docs`), {
+      animation: 150,
+      group: `docs-sortable`,
+      forceFallback: true,
+      fallbackOnBody: true,
+      handle: '.handle-btn-container',
+      store: {
+        /**
+         * Get the order of elements. Called once during initialization.
+         * @param   {Sortable}  sortable
+         * @returns {Array}
+         */
+        get: function (sortable) {
+          const order = localStorage.getItem(sortable.options.group.name);
+          return order ? order.split('|') : [];
+        },
+
+        /**
+         * Save the order of elements. Called onEnd (when the item is dropped).
+         * @param {Sortable}  sortable
+         */
+        set: function (sortable) {
+          const order = sortable.toArray();
+          localStorage.setItem(sortable.options.group.name, order.join('|'));
+        },
+      },
+      // chosenClass: 'css-class',
+      // ghostClass: 'css-class',
+      // Element dragging ended
+      onEnd: function (/**Event*/ evt) {
+        // console.log('Sortable onEnd', evt);
+        // console.log('evt.oldIndex', evt.oldIndex);
+        // console.log('evt.newIndex', evt.newIndex);
+        const slotId = Array.from(evt.item.classList).pop();
+        // console.log('slotId', slotId);
+        if (evt.oldIndex === evt.newIndex) s(`.${slotId}`).click();
+
+        // var itemEl = evt.item; // dragged HTMLElement
+        // evt.to; // target list
+        // evt.from; // previous list
+        // evt.oldIndex; // element's old index within old parent
+        // evt.newIndex; // element's new index within new parent
+        // evt.oldDraggableIndex; // element's old index within old parent, only counting draggable elements
+        // evt.newDraggableIndex; // element's new index within new parent, only counting draggable elements
+        // evt.clone; // the clone element
+        // evt.pullMode; // when item is in another sortable: `"clone"` if cloning, `true` if moving
+      },
+    });
+
+    return '';
     return html` <div class="in section-mp">${docMenuRender}</div>`;
     return html` <div class="in section-mp">
       ${await DropDown.Render({