underpost 2.8.1 → 2.8.6

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

@@ -11,35 +11,49 @@ const Translate = {
   Data: {},
   Token: {},
   Event: {},
+  Options: {},
   Parse: function (lang) {
     s('html').lang = lang;
     Object.keys(this.Token).map((translateHash) => {
       if (translateHash in this.Token && lang in this.Token[translateHash]) {
-        if (!('placeholder' in this.Token[translateHash]) && s(`.${translateHash}`))
-          htmls(`.${translateHash}`, textFormatted(this.Token[translateHash][lang]));
+        if (!('placeholder' in this.Options[translateHash]) && s(`.${translateHash}`))
+          htmls(
+            `.${translateHash}`,
+            this.Options[translateHash]?.disableTextFormat
+              ? this.Token[translateHash][lang]
+              : textFormatted(this.Token[translateHash][lang]),
+          );
         else if ('placeholder' in this.Token[translateHash] && s(this.Token[translateHash].placeholder))
-          s(this.Token[translateHash].placeholder).placeholder = textFormatted(this.Token[translateHash][lang]);
+          s(this.Token[translateHash].placeholder).placeholder = this.Options[translateHash]?.disableTextFormat
+            ? this.Token[translateHash][lang]
+            : textFormatted(this.Token[translateHash][lang]);
       }
     });
     for (const keyEvent of Object.keys(this.Event)) this.Event[keyEvent]();
   },
-  Render: function (keyLang, placeholder) {
+  Render: function (keyLang, placeholder, options = { disableTextFormat: false }) {
     if (!(keyLang in this.Data)) {
       // TODO: add translate package or library for this case
       logger.warn('translate key lang does not exist: ', keyLang);
-      return textFormatted(keyLang);
+      return options.disableTextFormat ? keyLang : textFormatted(keyLang);
     }
     if (placeholder) this.Data[keyLang].placeholder = placeholder;
     keyLang = this.Data[keyLang];
     const translateHash = getId(this.Token, 'trans');
+    this.Options[translateHash] = options;
     this.Token[translateHash] = newInstance(keyLang);
     if ('placeholder' in keyLang) {
-      if (s('html').lang in keyLang) return textFormatted(keyLang[s('html').lang]);
-      return textFormatted(keyLang['en']);
+      if (s('html').lang in keyLang)
+        return options.disableTextFormat ? keyLang[s('html').lang] : textFormatted(keyLang[s('html').lang]);
+      return options.disableTextFormat ? keyLang['en'] : textFormatted(keyLang['en']);
     }
     if (s('html').lang in keyLang)
-      return html`<span class="${translateHash}">${textFormatted(keyLang[s('html').lang])}</span>`;
-    return html`<span class="${translateHash}">${textFormatted(keyLang['en'])}</span>`;
+      return html`<span class="${translateHash}"
+        >${options.disableTextFormat ? keyLang[s('html').lang] : textFormatted(keyLang[s('html').lang])}</span
+      >`;
+    return html`<span class="${translateHash}"
+      >${options.disableTextFormat ? keyLang['en'] : textFormatted(keyLang['en'])}</span
+    >`;
   },
   renderLang: function (language) {
     localStorage.setItem('lang', language);
@@ -474,6 +488,30 @@ const TranslateCore = {
     Translate.Data['friday'] = { es: 'Viernes', en: 'Friday' };
     Translate.Data['saturday'] = { es: 'Sábado', en: 'Saturday' };
     Translate.Data['sunday'] = { es: 'Domingo', en: 'Sunday' };
+
+    Translate.Data['description'] = { es: 'Descripción', en: 'Description' };
+    Translate.Data['daysOfWeek'] = { es: 'Días de la semana', en: 'Days of the week' };
+    Translate.Data['startTime'] = { es: 'Hora de inicio', en: 'Start time' };
+    Translate.Data['endTime'] = { es: 'Hora de finalizacion', en: 'End time' };
+    Translate.Data['appointment-scheduled'] = {
+      en: 'Your appointment has been scheduled',
+      es: 'Tu cita ha sido programada',
+    };
+    Translate.Data['info'] = { es: 'Información', en: 'Info' };
+    Translate.Data['complete-name'] = { es: 'Nombre completo', en: 'Complete name' };
+    Translate.Data['identityDocument'] = { es: 'Rut', en: 'Identity document' };
+    Translate.Data['day'] = { es: 'Día', en: 'Day' };
+    Translate.Data['month'] = { es: 'Mes', en: 'Month' };
+    Translate.Data['year'] = { es: 'Año', en: 'Year' };
+    Translate.Data['phone'] = { es: 'Teléfono', en: 'Phone' };
+    Translate.Data['invalid-identity-document'] = {
+      en: 'Invalid identity document',
+      es: 'Documento de identidad inválido',
+    };
+    Translate.Data['expired-session'] = {
+      en: 'Your session has expired. Please log in again.',
+      es: 'Su sesión ha expirado. Por favor, inicie sesión de nuevo.',
+    };
   },
 };
 

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

@@ -1,4 +1,4 @@
-import { validatePassword } from './CommonJs.js';
+import { isChileanIdentityDocument, validatePassword } from './CommonJs.js';
 import { renderStatus } from './Css.js';
 import { loggerFactory } from './Logger.js';
 import { textFormatted, Translate } from './Translate.js';
@@ -58,6 +58,14 @@ const Validator = {
                 if (!validator.isLength(s(`.${validatorData.id}`).value, rule.options))
                   errorMessage += this.renderErrorMessage(rule);
                 break;
+
+              case 'isChileanIdentityDocument': {
+                if (!isChileanIdentityDocument(s(`.${validatorData.id}`).value)) {
+                  errorMessage += this.renderErrorMessage(undefined, Translate.Render('invalid-identity-document'));
+                }
+
+                break;
+              }
               default:
                 if (
                   validator[rule.type] &&

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

@@ -419,14 +419,6 @@ const isActiveTab = () => document.hasFocus();
 const isActiveElement = (classSearch = '') =>
   document.activeElement?.classList?.value?.match(classSearch) ? true : false;
 
-const getCurrentTrace = () => {
-  try {
-    _stack;
-  } catch (error) {
-    return error.stack.split('is not defined')[1];
-  }
-};
-
 const isDevInstance = () => location.origin.match('localhost') && location.port;
 
 const getDataFromInputFile = async (file) => Array.from(new Uint8Array(await file.arrayBuffer()));
@@ -460,7 +452,6 @@ export {
   isNavigator,
   getTimeZone,
   getAllChildNodes,
-  getCurrentTrace,
   isActiveTab,
   isActiveElement,
   isDevInstance,

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

@@ -22,41 +22,44 @@ const Worker = {
     setTimeout(() => {
       if ('onLine' in navigator && navigator.onLine) window.ononline();
     });
-    navigator.serviceWorker.addEventListener('controllerchange', () => {
-      logger.info('The controller of current browsing context has changed.');
-    });
-    navigator.serviceWorker.ready.then((worker) => {
-      logger.info('Ready', worker);
-      // event message
-      navigator.serviceWorker.addEventListener('message', (event) => {
-        logger.info('Received event message', event.data);
-        const { status } = event.data;
+    if ('serviceWorker' in navigator) {
+      navigator.serviceWorker.addEventListener('controllerchange', () => {
+        logger.info('The controller of current browsing context has changed.');
+      });
+      navigator.serviceWorker.ready.then((worker) => {
+        logger.info('Ready', worker);
+        // event message
+        navigator.serviceWorker.addEventListener('message', (event) => {
+          logger.info('Received event message', event.data);
+          const { status } = event.data;
 
-        switch (status) {
-          case 'loader':
-            {
-              LoadingAnimation.RenderCurrentSrcLoad(event);
-            }
-            break;
+          switch (status) {
+            case 'loader':
+              {
+                LoadingAnimation.RenderCurrentSrcLoad(event);
+              }
+              break;
 
-          default:
-            break;
-        }
-      });
+            default:
+              break;
+          }
+        });
 
-      // if (navigator.serviceWorker.controller)
-      //   navigator.serviceWorker.controller.postMessage({
-      //     title: 'Hello from Client event message',
-      //   });
+        // if (navigator.serviceWorker.controller)
+        //   navigator.serviceWorker.controller.postMessage({
+        //     title: 'Hello from Client event message',
+        //   });
+
+        // broadcast message
+        // const channel = new BroadcastChannel('sw-messages');
+        // channel.addEventListener('message', (event) => {
+        //   logger.info('Received broadcast message', event.data);
+        // });
+        // channel.postMessage({ title: 'Hello from Client broadcast message' });
+        // channel.close();
+      });
+    }
 
-      // broadcast message
-      // const channel = new BroadcastChannel('sw-messages');
-      // channel.addEventListener('message', (event) => {
-      //   logger.info('Received broadcast message', event.data);
-      // });
-      // channel.postMessage({ title: 'Hello from Client broadcast message' });
-      // channel.close();
-    });
     this.RouterInstance = router();
     const isInstall = await this.status();
     if (!isInstall) await this.install();

package/src/client/services/core/core.service.js

@@ -4,13 +4,24 @@ import { getProxyPath } from '../../components/core/VanillaJs.js';
 
 const logger = loggerFactory(import.meta);
 
+logger.info('Load service');
+
+const endpoint = 'core';
+
 // https://developer.mozilla.org/en-US/docs/Web/API/AbortController
-const getBaseHost = () => location.host;
+const getBaseHost = () => (window.renderPayload?.apiBaseHost ? window.renderPayload.apiBaseHost : location.host);
 
-const getApiBasePath = () => `${getProxyPath()}api/`;
+const getApiBasePath = (options) =>
+  `${
+    options?.proxyPath
+      ? `/${options.proxyPath}/`
+      : window.renderPayload?.apiBaseProxyPath
+      ? window.renderPayload.apiBaseProxyPath
+      : getProxyPath()
+  }${window.renderPayload?.apiBasePath ? window.renderPayload.apiBasePath : 'api'}/`;
 
-const getApiBaseUrl = (options = { id: '', endpoint: '' }) =>
-  `${location.protocol}//${getBaseHost()}${getApiBasePath()}${options?.endpoint ? options.endpoint : ''}${
+const getApiBaseUrl = (options = { id: '', endpoint: '', proxyPath: '' }) =>
+  `${location.protocol}//${getBaseHost()}${getApiBasePath(options)}${options?.endpoint ? options.endpoint : ''}${
     options?.id ? `/${options.id}` : ''
   }`;
 
@@ -38,11 +49,6 @@ const payloadFactory = (body) => {
   return JSON.stringify(body);
 };
 
-logger.info('Load service');
-
-const endpoint = 'core';
-const _VERSION = window._VERSION;
-
 const CoreService = {
   getRaw: (options = { url: '' }) =>
     new Promise((resolve, reject) =>
@@ -159,7 +165,6 @@ const CoreService = {
 const ApiBase = getApiBaseUrl;
 
 export {
-  _VERSION,
   CoreService,
   headersFactory,
   payloadFactory,

package/src/client/services/default/default.management.js

@@ -1,6 +1,6 @@
 import { AgGrid } from '../../components/core/AgGrid.js';
 import { BtnIcon } from '../../components/core/BtnIcon.js';
-import { getId, timer } from '../../components/core/CommonJs.js';
+import { getId, getValueFromJoinString, timer } from '../../components/core/CommonJs.js';
 import { darkTheme } from '../../components/core/Css.js';
 import { EventsUI } from '../../components/core/EventsUI.js';
 import { loggerFactory } from '../../components/core/Logger.js';
@@ -88,7 +88,9 @@ const DefaultManagement = {
                       ${Translate.Render('confirm-delete-item')}
                       ${Object.keys(params.data).length > 0
                         ? html`<br />
-                            "${params.data[Object.keys(params.data)[0]]}"`
+                            "${options.defaultColKeyFocus
+                              ? getValueFromJoinString(params.data, options.defaultColKeyFocus)
+                              : params.data[Object.keys(params.data)[0]]}"`
                         : ''}
                     </div>
                   `;

package/src/client/ssr/Render.js

@@ -1,4 +1,4 @@
-SrrComponent = ({ title, ssrPath, buildId, ssrHeadComponents, ssrBodyComponents }) => html`
+SrrComponent = ({ title, ssrPath, buildId, ssrHeadComponents, ssrBodyComponents, renderPayload, renderApi }) => html`
   <!DOCTYPE html>
   <html dir="ltr" lang="en">
     <head>
@@ -6,6 +6,9 @@ SrrComponent = ({ title, ssrPath, buildId, ssrHeadComponents, ssrBodyComponents
       <link rel="icon" type="image/x-icon" href="${ssrPath}favicon.ico" />
       <meta charset="UTF-8" />
       <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+      <script>
+        window.renderPayload = ${renderApi.JSONweb(renderPayload)};
+      </script>
       ${ssrHeadComponents}
     </head>
     <body>

package/src/client/ssr/body/CacheControl.js

@@ -70,7 +70,7 @@ const CacheControl = function ({ ttiLoadTimeLimit }) {
   setTimeout(window.cacheControlCallBack, ttiLoadTimeLimit); // 70s limit);
 };
 
-SrrComponent = ({ ttiLoadTimeLimit }) => {
+SrrComponent = ({ ttiLoadTimeLimit, version }) => {
   const borderChar = (px, color, selectors) => {
     if (selectors) {
       return selectors
@@ -106,10 +106,9 @@ SrrComponent = ({ ttiLoadTimeLimit }) => {
     </style>
     ${borderChar(1, 'black', ['.clean-cache-container'])}
     <script>
-      window._VERSION = '${process.env.npm_package_version}';
       const CacheControl = ${CacheControl};
       CacheControl({ ttiLoadTimeLimit: ${ttiLoadTimeLimit ? ttiLoadTimeLimit : 1000 * 70 * 1} });
     </script>
-    <div class="clean-cache-container">${process.env.npm_package_version}</div>
+    <div class="clean-cache-container">${version}</div>
   `;
 };

package/src/client/sw/default.sw.js

@@ -1,6 +1,6 @@
-const PRE_CACHED_RESOURCES = [];
-const CACHE_NAME = 'app-cache';
-const PROXY_PATH = '/';
+const PRE_CACHED_RESOURCES = self.renderPayload?.PRE_CACHED_RESOURCES ? self.renderPayload.PRE_CACHED_RESOURCES : [];
+const CACHE_NAME = self.renderPayload?.CACHE_NAME ? self.renderPayload.CACHE_NAME : 'app-cache';
+const PROXY_PATH = self.renderPayload?.PROXY_PATH ? self.renderPayload.PROXY_PATH : '/';
 self.addEventListener('install', (event) => {
   // Activate right away
   self.skipWaiting();

package/src/db/mongo/MongooseDB.js

@@ -9,7 +9,12 @@ const MongooseDB = {
   connect: async (host, name) => {
     const uri = `${host}/${name}`;
     // logger.info('MongooseDB connect', { host, name, uri });
-    return await mongoose.createConnection(uri).asPromise();
+    return await mongoose
+      .createConnection(uri, {
+        // useNewUrlParser: true,
+        // useUnifiedTopology: true,
+      })
+      .asPromise();
     return new Promise((resolve, reject) =>
       mongoose
         .connect(
@@ -67,8 +72,27 @@ const MongooseDB = {
             shellExec(`sudo rm -r /var/lib/mongodb`);
             // restore lib
             // shellExec(`sudo chown -R mongodb:mongodb /var/lib/mongodb/*`);
+            // mongod --repair
 
             if (process.argv.includes('legacy')) {
+              // TODO:
+              if (process.argv.includes('rocky')) {
+                // https://github.com/mongodb/mongodb-selinux
+                // https://www.mongodb.com/docs/v7.0/tutorial/install-mongodb-enterprise-on-red-hat/
+                // https://www.mongodb.com/docs/v6.0/tutorial/install-mongodb-on-red-hat/
+                // https://www.mongodb.com/docs/v4.4/tutorial/install-mongodb-on-red-hat/
+                // dnf install selinux-policy-devel
+                // git clone https://github.com/mongodb/mongodb-selinux
+                // cd mongodb-selinux
+                // make
+                // sudo make install
+                // yum list installed | grep mongo
+                // sudo yum erase $(rpm -qa | grep mongodb)
+                // remove service
+                // sudo systemctl reset-failed
+                // MongoDB 5.0+ requires a CPU with AVX support
+                // check: grep avx /proc/cpuinfo
+              }
               logger.info('install legacy 4.4');
               shellExec(`wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -`);
 
@@ -100,9 +124,13 @@ const MongooseDB = {
           shellExec(`sudo systemctl unmask mongod`);
           shellExec(`sudo pkill -f mongod`);
           shellExec(`sudo systemctl enable mongod.service`);
+
           shellExec(`sudo chown -R mongodb:mongodb /var/lib/mongodb`);
           shellExec(`sudo chown mongodb:mongodb /tmp/mongodb-27017.sock`);
 
+          shellExec(`sudo chown -R mongod:mongod /var/lib/mongodb`);
+          shellExec(`sudo chown mongod:mongod /tmp/mongodb-27017.sock`);
+
           logger.info('run server');
           shellExec(`sudo service mongod restart`);
 

package/src/index.js

@@ -4,9 +4,17 @@
  * @namespace Underpost
  */
 
-import { loggerFactory, setUpInfo } from './server/logger.js';
-
-const logger = loggerFactory(import.meta);
+import UnderpostCluster from './cli/cluster.js';
+import UnderpostCron from './cli/cron.js';
+import UnderpostDB from './cli/db.js';
+import UnderpostDeploy from './cli/deploy.js';
+import UnderpostRootEnv from './cli/env.js';
+import UnderpostFileStorage from './cli/fs.js';
+import UnderpostImage from './cli/image.js';
+import UnderpostRepository from './cli/repository.js';
+import UnderpostScript from './cli/script.js';
+import UnderpostSecret from './cli/secrets.js';
+import UnderpostTest from './cli/test.js';
 
 /**
  * Underpost main module methods
@@ -20,26 +28,84 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.1';
-
-  constructor() {}
-
+  static version = 'v2.8.6';
+  /**
+   * Repository cli API
+   * @static
+   * @type {UnderpostRepository.API}
+   * @memberof Underpost
+   */
+  static repo = UnderpostRepository.API;
+  /**
+   * Root Env cli API
+   * @static
+   * @type {UnderpostRootEnv.API}
+   * @memberof Underpost
+   */
+  static env = UnderpostRootEnv.API;
+  /**
+   * Test cli API
+   * @static
+   * @type {UnderpostTest.API}
+   * @memberof Underpost
+   */
+  static test = UnderpostTest.API;
+  /**
+   * Cluster cli API
+   * @static
+   * @type {UnderpostCluster.API}
+   * @memberof Underpost
+   */
+  static cluster = UnderpostCluster.API;
+  /**
+   * Image cli API
+   * @static
+   * @type {UnderpostImage.API}
+   * @memberof Underpost
+   */
+  static image = UnderpostImage.API;
+  /**
+   * Secrets cli API
+   * @static
+   * @type {UnderpostSecret.API}
+   * @memberof Underpost
+   */
+  static secret = UnderpostSecret.API;
   /**
-   * Logs information about the current process environment to the console.
-   *
-   * This function is used to log details about
-   * the execution context, such as command-line arguments,
-   * environment variables, the process's administrative privileges,
-   * and the maximum available heap space size.
-   *
+   * Scripts cli API
    * @static
-   * @method setUpInfo
-   * @returns {Promise<void>}
+   * @type {UnderpostScript.API}
    * @memberof Underpost
    */
-  static async setUpInfo() {
-    return await setUpInfo(logger);
-  }
+  static script = UnderpostScript.API;
+  /**
+   * Database cli API
+   * @static
+   * @type {UnderpostDB.API}
+   * @memberof Underpost
+   */
+  static db = UnderpostDB.API;
+  /**
+   * Deployment cli API
+   * @static
+   * @type {UnderpostDeploy.API}
+   * @memberof Underpost
+   */
+  static deploy = UnderpostDeploy.API;
+  /**
+   * Cron cli API
+   * @static
+   * @type {UnderpostCron.API}
+   * @memberof Underpost
+   */
+  static cron = UnderpostCron.API;
+  /**
+   * File Storage cli API
+   * @static
+   * @type {UnderpostFileStorage.API}
+   * @memberof UnderpostFileStorage
+   */
+  static fs = UnderpostFileStorage.API;
 }
 
 const up = Underpost;

package/src/runtime/lampp/Lampp.js

@@ -1,5 +1,4 @@
 import fs from 'fs-extra';
-import { network } from '../../server/network.js';
 import { shellCd, shellExec } from '../../server/process.js';
 import { timer } from '../../client/components/core/CommonJs.js';
 import { loggerFactory } from '../../server/logger.js';
@@ -39,20 +38,9 @@ const Lampp = {
       );
 
     shellExec(cmd);
-    await network.port.portClean(3306);
-    for (const port of this.ports) await network.port.portClean(port);
     cmd = `sudo /opt/lampp/lampp start`;
     if (this.router) fs.writeFileSync(`./tmp/lampp-router.conf`, this.router, 'utf-8');
-    shellExec(cmd, { async: true });
-    if (options && options.daemon) this.daemon();
-  },
-  daemon: async function () {
-    await timer(1000 * 60 * 2); // 2 minutes
-    for (const port of this.ports) {
-      const [portStatus] = await network.port.status([port]);
-      if (!portStatus.open) return await this.initService();
-    }
-    this.daemon();
+    shellExec(cmd);
   },
   enabled: () => fs.existsSync(`/opt/lampp/apache2/conf/httpd.conf`),
   appendRouter: function (render) {

package/src/runtime/xampp/Xampp.js

@@ -1,7 +1,5 @@
 import fs from 'fs-extra';
-import { network } from '../../server/network.js';
 import { shellExec } from '../../server/process.js';
-import { timer } from '../../client/components/core/CommonJs.js';
 
 const Xampp = {
   ports: [],
@@ -16,20 +14,9 @@ const Xampp = {
     fs.writeFileSync(`C:/xampp/apache/conf/extra/httpd-ssl.conf`, this.router || '', 'utf8');
     cmd = `C:/xampp/xampp_stop.exe`;
     shellExec(cmd);
-    await network.port.portClean(3306);
-    for (const port of this.ports) await network.port.portClean(port);
     cmd = `C:/xampp/xampp_start.exe`;
     if (this.router) fs.writeFileSync(`./tmp/xampp-router.conf`, this.router, 'utf-8');
     shellExec(cmd);
-    if (options && options.daemon) this.daemon();
-  },
-  daemon: async function () {
-    await timer(1000 * 60 * 2); // 2 minutes
-    for (const port of this.ports) {
-      const [portStatus] = await network.port.status([port]);
-      if (!portStatus.open) return await this.initService();
-    }
-    this.daemon();
   },
   enabled: () => fs.existsSync(`C:/xampp/apache/conf/httpd.conf`),
   appendRouter: function (render) {

package/src/server/auth.js

@@ -9,7 +9,7 @@ import jwt from 'jsonwebtoken';
 import { loggerFactory } from './logger.js';
 import crypto from 'crypto';
 import { userRoleEnum } from '../api/user/user.model.js';
-import { validatePassword } from '../client/components/core/CommonJs.js';
+import { commonAdminGuard, commonModeratorGuard, validatePassword } from '../client/components/core/CommonJs.js';
 
 dotenv.config();
 
@@ -162,7 +162,7 @@ const authMiddleware = (req, res, next) => {
  */
 const adminGuard = (req, res, next) => {
   try {
-    if (!(userRoleEnum.indexOf(req.auth.user.role) === userRoleEnum.indexOf('admin')))
+    if (!commonAdminGuard(req.auth.user.role))
       return res.status(403).json({ status: 'error', message: 'Insufficient permission' });
     return next();
   } catch (error) {
@@ -194,7 +194,7 @@ const adminGuard = (req, res, next) => {
  */
 const moderatorGuard = (req, res, next) => {
   try {
-    if (!(userRoleEnum.indexOf(req.auth.user.role) <= userRoleEnum.indexOf('moderator')))
+    if (!commonModeratorGuard(req.auth.user.role))
       return res.status(403).json({ status: 'error', message: 'Insufficient permission' });
     return next();
   } catch (error) {