@underpostnet/underpost 2.7.83 → 2.7.92

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: [
@@ -50,6 +56,9 @@ const DefaultConf = {
           'Panel',
           'PanelForm',
           'Scroll',
+          'Alert',
+          '404',
+          '500',
         ],
         default: [
           'MenuDefault',
@@ -118,6 +127,8 @@ const DefaultConf = {
           client: 'Default',
           ssr: 'Default',
         },
+        { client: 'Default', ssr: 'Default', path: '/404', title: '404 Not Found' },
+        { client: 'Default', ssr: 'Default', path: '/500', title: '500 Server Error' },
       ],
       dists: [
         {
@@ -168,8 +179,30 @@ const DefaultConf = {
   },
   ssr: {
     Default: {
-      head: ['PwaDefault', 'Css', 'DefaultScripts'],
+      head: ['Seo', 'Pwa', 'Css', 'DefaultScripts', 'Production'],
       body: ['CacheControl', 'DefaultSplashScreen'],
+      mailer: {
+        userVerifyEmail: 'DefaultVerifyEmail',
+        userRecoverEmail: 'DefaultRecoverEmail',
+      },
+      offline: [
+        {
+          path: '/offline',
+          title: 'No Network Connection',
+          client: 'NoNetworkConnection',
+          head: [],
+          body: [],
+        },
+      ],
+      pages: [
+        {
+          path: '/test',
+          title: 'Test',
+          client: 'Test',
+          head: [],
+          body: [],
+        },
+      ],
     },
   },
   server: {
@@ -183,6 +216,7 @@ const DefaultConf = {
         iconsBuild: true,
         liteBuild: false,
         docsBuild: false,
+        offlineBuild: false,
         ws: 'core',
         peer: true,
         proxy: [80, 443],
@@ -205,10 +239,6 @@ const DefaultConf = {
               pass: '',
             },
           },
-          templates: {
-            userVerifyEmail: 'DefaultVerifyEmail',
-            userRecoverEmail: 'DefaultRecoverEmail',
-          },
         },
       },
     },
@@ -227,8 +257,6 @@ const DefaultConf = {
   cron: {
     ipDaemon: {
       ip: null,
-      minutesTimeInterval: 3,
-      disabled: false,
     },
     records: {
       A: [
@@ -245,6 +273,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.83'
+      engine.version: '2.7.92'
     networks:
       - load-balancer
 

package/package.json

@@ -2,14 +2,15 @@
     "type": "module",
     "main": "src/index.js",
     "name": "@underpostnet/underpost",
-    "version": "2.7.83",
+    "version": "2.7.92",
     "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",
@@ -124,7 +124,7 @@
         "mocha": "^10.4.0",
         "plantuml": "^0.0.2",
         "swagger-autogen": "^2.23.7",
-        "to-json-schema": "^0.2.5"
+        "easy-json-schema": "^0.0.2-beta"
     },
     "publishConfig": {
         "provenance": true,

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,35 @@
 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')) {
+      shellExec(req.body.sh, { stdout: true, async: true });
+      return {
+        status: 'success',
+        message: 'Command "' + req.body.sh + '" running',
+      };
+    }
     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
 
@@ -449,7 +449,9 @@ const UserService = {
         });
         switch (user.role) {
           case 'admin': {
-            if (req.body.password) req.body.password = await hashPassword(req.body.password);
+            if (req.body.password !== undefined && req.body.password !== user.password)
+              req.body.password = await hashPassword(req.body.password);
+            else delete req.body.password;
             return await User.findByIdAndUpdate(req.params.id, req.body, {
               runValidators: true,
             });

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

@@ -0,0 +1,20 @@
+import { Alert } from './Alert.js';
+import { Modal } from './Modal.js';
+import { s } from './VanillaJs.js';
+
+const Page404 = {
+  Render: async function (options = { idModal: '' }) {
+    setTimeout(() => {
+      Modal.Data[options.idModal].onObserverListener['404'] = () => {
+        if (s(`.container-404-${options.idModal}`))
+          s(`.container-404-${options.idModal}`).style.height = `${
+            s(`.${options.idModal}`).offsetHeight - Modal.headerTitleHeight
+          }px`;
+      };
+      Modal.Data[options.idModal].onObserverListener['404']();
+    });
+    return html`<div class="in container-404-${options.idModal}">${await Alert.e404()}</div>`;
+  },
+};
+
+export { Page404 };

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

@@ -0,0 +1,20 @@
+import { Alert } from './Alert.js';
+import { Modal } from './Modal.js';
+import { s } from './VanillaJs.js';
+
+const Page500 = {
+  Render: async function (options = { idModal: '' }) {
+    setTimeout(() => {
+      Modal.Data[options.idModal].onObserverListener['500'] = () => {
+        if (s(`.container-500-${options.idModal}`))
+          s(`.container-500-${options.idModal}`).style.height = `${
+            s(`.${options.idModal}`).offsetHeight - Modal.headerTitleHeight
+          }px`;
+      };
+      Modal.Data[options.idModal].onObserverListener['500']();
+    });
+    return html`<div class="in container-500-${options.idModal}">${await Alert.e500()}</div>`;
+  },
+};
+
+export { Page500 };

package/src/client/{ssr/common → components/core}/Alert.js

@@ -1,4 +1,6 @@
-const maintenance = async ({ Translate }) => {
+import { Translate } from './Translate.js';
+
+const maintenance = async () => {
   const icon = html`<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 24 24">
     <path
       fill="none"
@@ -12,11 +14,11 @@ const maintenance = async ({ Translate }) => {
   return html` <div class="abs center" style="top: 45%">
     ${icon}
     <br />
-    <br />${Translate('server-maintenance')}
+    <br />${Translate.Render('server-maintenance')}
   </div>`;
 };
 
-const noInternet = async ({ Translate }) => {
+const noInternet = async () => {
   const icon = html`<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 20 20">
     <path
       fill="currentColor"
@@ -26,11 +28,11 @@ const noInternet = async ({ Translate }) => {
   return html` <div class="abs center" style="top: 45%">
     ${icon}
     <br />
-    <br />${Translate('no-internet-connection')}
+    <br />${Translate.Render('no-internet-connection')}
   </div>`;
 };
 
-const e404 = async ({ Translate }) => {
+const e404 = async () => {
   const icon = html`
     <svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 24 24">
       <path
@@ -45,13 +47,13 @@ const e404 = async ({ Translate }) => {
     <br />
     <span class="bold">404</span>
     <br />
-    <br />${Translate('page-not-found')} <br />
+    <br />${Translate.Render('page-not-found')} <br />
     <br />
-    <a href="${location.origin}">${Translate('back')}</a>
+    <a href="${location.origin}">${Translate.Render('back')}</a>
   </div>`;
 };
 
-const e500 = async ({ Translate }) => {
+const e500 = async () => {
   const icon = html`<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 20 20">
     <path
       fill="currentColor"
@@ -64,12 +66,12 @@ const e500 = async ({ Translate }) => {
     <br />
     <span class="bold">500</span>
     <br />
-    <br />${Translate('page-broken')} <br />
+    <br />${Translate.Render('page-broken')} <br />
     <br />
-    <a href="${location.origin}">${Translate('back')}</a>
+    <a href="${location.origin}">${Translate.Render('back')}</a>
   </div>`;
 };
 
 const Alert = { maintenance, noInternet, e404, e500 };
 
-export { Alert, e404 };
+export { Alert };

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

@@ -683,6 +683,8 @@ const getCapVariableName = (value = 'default') => cap(value.replaceAll('-', ' ')
 
 const hexToNumber = (hex = 0xdc) => Number(hex) || parseFloat(hex, 16);
 
+const numberToHex = (number = 0) => number.toString(16);
+
 // 0x = Hexadecimal
 // 0b = Binary
 // 0o = Octal
@@ -739,4 +741,5 @@ export {
   rgbToHex,
   getCapVariableName,
   hexToNumber,
+  numberToHex,
 };

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'])}
     `,
 };