@underpostnet/underpost 2.7.91 → 2.7.93

package/bin/deploy.js

@@ -29,12 +29,12 @@ 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 toJsonSchema from 'to-json-schema';
 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';
 import { JSONweb } from '../src/server/client-formatted.js';
+import ejs from 'easy-json-schema';
 
 const logger = loggerFactory(import.meta);
 
@@ -573,29 +573,33 @@ try {
     }
     case 'build-uml':
       {
-        const host = process.argv[3];
-        const path = process.argv[4];
-        const folder = `./public/${host}${path}/docs/plantuml`;
+        const folder = process.argv[3] ? process.argv[3] : `./src/client/public/default/plantuml`;
         const confData = Config.default;
 
         if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
 
         for (const typeConf of Object.keys(confData)) {
-          {
+          logger.info(`generate ${typeConf} instance`);
+          try {
             const svg = await plantuml(`
               @startjson
                 ${JSON.stringify(confData[typeConf])}
               @endjson
             `);
             fs.writeFileSync(`${folder}/${typeConf}-conf.svg`, svg);
+          } catch (error) {
+            logger.error(error, error.stack);
           }
-          {
+          logger.info(`generate ${typeConf} schema`);
+          try {
             const svg = await plantuml(`
             @startjson
-              ${JSON.stringify(toJsonSchema(confData[typeConf]))}
+              ${JSON.stringify(ejs(confData[typeConf]))}
             @endjson
           `);
             fs.writeFileSync(`${folder}/${typeConf}-schema.svg`, svg);
+          } catch (error) {
+            logger.error(error, error.stack);
           }
         }
       }
@@ -733,10 +737,8 @@ try {
         );
 
         fs.writeFileSync(
-          `./src/client/ssr/components/body/CacheControl.js`,
-          fs
-            .readFileSync(`./src/client/ssr/components/body/CacheControl.js`, 'utf8')
-            .replaceAll(`v${version}`, `v${newVersion}`),
+          `./src/client/ssr/body/CacheControl.js`,
+          fs.readFileSync(`./src/client/ssr/body/CacheControl.js`, 'utf8').replaceAll(`v${version}`, `v${newVersion}`),
           'utf8',
         );
 

package/bin/file.js

@@ -87,6 +87,7 @@ try {
           '.github/workflows/deploy.ssh.yml',
           '.github/workflows/deploy.api-rest.yml',
           'bin/web3.js',
+          'bin/cyberia.js',
           'src/ipfs.js',
           'src/k8s.js',
         ]) {

package/bin/hwt.js

@@ -0,0 +1,59 @@
+import fs from 'fs-extra';
+import axios from 'axios';
+import https from 'https';
+
+import dotenv from 'dotenv';
+import { shellCd, shellExec } from '../src/server/process.js';
+import { loggerFactory } from '../src/server/logger.js';
+
+const logger = loggerFactory(import.meta);
+
+const httpsAgent = new https.Agent({
+  rejectUnauthorized: false,
+});
+
+axios.defaults.httpsAgent = httpsAgent;
+
+logger.info('argv', process.argv);
+
+const [exe, dir, operator, templateId, publicPath] = process.argv;
+
+// engine for 'html-website-templates'
+
+try {
+  switch (operator) {
+    case 'set-base':
+      {
+        switch (parseInt(templateId)) {
+          // Horizontal Scroll One Page Template Website
+          case 0:
+            {
+              fs.writeFile(
+                `${publicPath}/index.html`,
+                fs
+                  .readFileSync(`${publicPath}/index.html`, 'utf8')
+                  .replace(`<ul class="menu">`, `<ul class="menu hidden">`)
+                  .replaceAll(`<section class="slide fade-6 kenBurns">`, `<section class="fade-6 kenBurns hidden">`)
+                  .replace(`<section class="fade-6 kenBurns hidden">`, `<section class="slide fade-6 kenBurns">`)
+                  .replaceAll(
+                    `<nav class="panel bottom forceMobileView">`,
+                    `<nav class="panel bottom forceMobileView hidden">`,
+                  ),
+
+                'utf8',
+              );
+            }
+            break;
+
+          default:
+            break;
+        }
+      }
+      break;
+
+    default:
+      break;
+  }
+} catch (error) {
+  logger.error(error, error.stack);
+}

package/bin/index.js

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

package/conf.js

@@ -56,6 +56,9 @@ const DefaultConf = {
           'Panel',
           'PanelForm',
           'Scroll',
+          'Alert',
+          '404',
+          '500',
         ],
         default: [
           'MenuDefault',
@@ -124,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: [
         {
@@ -175,7 +180,29 @@ const DefaultConf = {
   ssr: {
     Default: {
       head: ['Seo', 'Pwa', 'Css', 'DefaultScripts', 'Production'],
-      body: ['CacheControl', 'DefaultSplashScreen'],
+      body: ['CacheControl', 'DefaultSplashScreen', '404', '500'],
+      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: {
@@ -189,6 +216,7 @@ const DefaultConf = {
         iconsBuild: true,
         liteBuild: false,
         docsBuild: false,
+        offlineBuild: false,
         ws: 'core',
         peer: true,
         proxy: [80, 443],
@@ -211,10 +239,6 @@ const DefaultConf = {
               pass: '',
             },
           },
-          templates: {
-            userVerifyEmail: 'DefaultVerifyEmail',
-            userRecoverEmail: 'DefaultRecoverEmail',
-          },
         },
       },
     },

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

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "@underpostnet/underpost",
-    "version": "2.7.91",
+    "version": "2.7.93",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -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/client/Default.index.js

@@ -9,13 +9,13 @@ import { SignUpDefault } from './components/default/SignUpDefault.js';
 import { MenuDefault } from './components/default/MenuDefault.js';
 import { RouterDefault } from './components/default/RoutesDefault.js';
 import { TranslateDefault } from './components/default/TranslateDefault.js';
-import { getProxyPath } from './components/core/VanillaJs.js';
 import { Worker } from './components/core/Worker.js';
 import { Keyboard } from './components/core/Keyboard.js';
 import { DefaultParams } from './components/default/CommonDefault.js';
 import { SocketIo } from './components/core/SocketIo.js';
 import { SocketIoDefault } from './components/default/SocketIoDefault.js';
 import { ElementsDefault } from './components/default/ElementsDefault.js';
+import { Scroll } from './components/core/Scroll.js';
 
 const htmlMainBody = async () => {
   return html`<span style="color: black; padding: 5px">Hello World!!</span>`;
@@ -35,6 +35,7 @@ window.onload = () =>
       await LogInDefault();
       await LogOutDefault();
       await SignUpDefault();
+      await Scroll.pullTopRefresh();
       await Keyboard.Init({ callBackTime: DefaultParams.EVENT_CALLBACK_TIME });
     },
   });

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/Docs.js

@@ -79,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.91`;
+        return `${getProxyPath()}docs/engine/2.7.93`;
       },
     },
     {

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

@@ -827,6 +827,7 @@ const Modal = {
                   heightTopBar: originHeightTopBar,
                   heightBottomBar: originHeightBottomBar,
                   barMode: options.barMode,
+                  observer: true,
                 });
                 const maxWidthInputSearchBox = 450;
                 const paddingInputSearchBox = 5;
@@ -1339,6 +1340,9 @@ const Modal = {
             backMenuButtonEvent();
           }
           s(`.btn-close-modal-menu`).click();
+          if (window.location.pathname !== (getProxyPath() === '/' ? getProxyPath() : `${getProxyPath()}/`))
+            setPath(getProxyPath());
+          setDocTitle({ ...options.RouterInstance, route: '' });
         };
         EventsUI.onClick(`.btn-icon-menu-back`, backMenuButtonEvent);
         EventsUI.onClick(`.btn-icon-menu-mode`, () => {
@@ -1531,20 +1535,18 @@ const Modal = {
         Responsive.Event['h-ui-hide-' + idModal] = () => {
           setTimeout(() => {
             if (!s(`.${idModal}`) || !s(`.main-body-btn-ui-close`)) return;
-            s(`.${idModal}`).style.height =
-              s(`.main-body-btn-ui-close`).classList.contains('hide') &&
-              s(`.btn-restore-${idModal}`).style.display !== 'none'
+            if (s(`.btn-restore-${idModal}`).style.display !== 'none') {
+              s(`.${idModal}`).style.height = s(`.main-body-btn-ui-close`).classList.contains('hide')
                 ? `${window.innerHeight}px`
                 : `${
                     window.innerHeight -
                     (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
                     (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
                   }px`;
-            s(`.${idModal}`).style.top =
-              s(`.main-body-btn-ui-close`).classList.contains('hide') &&
-              s(`.btn-restore-${idModal}`).style.display !== 'none'
+              s(`.${idModal}`).style.top = s(`.main-body-btn-ui-close`).classList.contains('hide')
                 ? `0px`
                 : `${options.heightTopBar ? options.heightTopBar : heightDefaultTopBar}px`;
+            }
           });
         };
         Responsive.Event['h-ui-hide-' + idModal]();

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

@@ -1,4 +1,5 @@
-import { s } from './VanillaJs.js';
+import { borderChar } from './Css.js';
+import { append, s } from './VanillaJs.js';
 
 const Scroll = {
   data: {},
@@ -29,6 +30,69 @@ const Scroll = {
       behavior: options.behavior || 'smooth',
     });
   },
+  pullTopRefresh: function () {
+    append(
+      'body',
+      html` <style>
+          .pull-refresh-icon-container {
+            height: 60px;
+            width: 100%;
+            z-index: 10;
+            transition: 0.3s;
+            left: 0px;
+          }
+          .pull-refresh-icon {
+            width: 60px;
+            height: 60px;
+            margin: auto;
+            color: white;
+            font-size: 30px;
+          }
+        </style>
+        ${borderChar(2, 'black', [' .pull-refresh-icon-container'])}
+        <div style="top: -60px" class="abs pull-refresh-icon-container">
+          <div class="in pull-refresh-icon">
+            <div class="abs center"><i class="fa-solid fa-arrows-rotate"></i></div>
+          </div>
+        </div>`,
+    );
+
+    let touchstartY = 0;
+    let reload = false;
+    const minHeightDragReload = 3;
+    const maxHeightDragReload = 20;
+
+    document.addEventListener('touchstart', (e) => {
+      touchstartY = e.touches[0].clientY;
+      // console.warn('touchstart', touchstartY);
+    });
+
+    document.addEventListener('touchmove', (e) => {
+      const touchY = e.touches[0].clientY;
+      const touchDiff = touchY - touchstartY;
+
+      // console.warn('touchDiff', touchDiff, maxHeightDragReload);
+
+      if (touchDiff > maxHeightDragReload)
+        s(`.pull-refresh-icon-container`).style.top = 60 + maxHeightDragReload + 'px';
+      else s(`.pull-refresh-icon-container`).style.top = 60 + touchDiff + 'px';
+
+      if (touchDiff > minHeightDragReload && window.scrollY === 0) {
+        reload = true;
+      } else {
+        reload = false;
+      }
+    });
+    document.addEventListener('touchend', (e) => {
+      // console.warn('touchend');
+      s(`.pull-refresh-icon-container`).style.top = '-60px';
+      if (reload) {
+        location.reload();
+        // console.warn('reload');
+      }
+      reload = false;
+    });
+  },
 };
 
 export { Scroll };

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

@@ -66,11 +66,7 @@ const Translate = {
 
 const TranslateCore = {
   Init: async function () {
-    s('html').lang = localStorage.getItem('lang')
-      ? localStorage.getItem('lang')
-      : getLang() && getLang().match('es')
-      ? 'es'
-      : 'en';
+    s('html').lang = getLang();
     Translate.Data = {
       ...Translate.Data,
       isEmpty: {
@@ -252,6 +248,26 @@ const TranslateCore = {
           en: 'Comments',
           es: 'Comentarios',
         },
+        ['server-maintenance']: {
+          en: "The server is under maintenance <br> we'll be back soon.",
+          es: 'El servidor está en mantenimiento <br> volveremos pronto.',
+        },
+        ['no-internet-connection']: {
+          en: 'No internet connection <br> verify your network',
+          es: 'Sin conexión a internet <br> verifica tu red',
+        },
+        ['page-not-found']: {
+          en: 'Page not found',
+          es: 'Página no encontrada',
+        },
+        ['page-broken']: {
+          es: 'Algo salio mal',
+          en: 'Something went wrong',
+        },
+        ['back']: {
+          en: 'Back to <br>  homepage',
+          es: 'Volver a  <br> la pagina principal',
+        },
       },
     };
     Translate.Data['warning-upload-no-selects-file'] = {

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

@@ -428,7 +428,10 @@ const isDevInstance = () => location.origin.match('localhost') && location.port;
 
 const getDataFromInputFile = async (file) => Array.from(new Uint8Array(await file.arrayBuffer()));
 
-const getLang = () => navigator.language || navigator.userLanguage;
+const getLang = () =>
+  (localStorage.getItem('lang') || navigator.language || navigator.userLanguage || s('html').lang)
+    .slice(0, 2)
+    .toLowerCase();
 
 export {
   s,

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

@@ -13,6 +13,15 @@ const Worker = {
   devMode: () => location.origin.match('localhost') || location.origin.match('127.0.0.1'),
   instance: async function ({ router, render }) {
     logger.warn('Init');
+    window.ononline = async () => {
+      logger.warn('ononline');
+    };
+    window.onoffline = async () => {
+      logger.warn('onoffline');
+    };
+    setTimeout(() => {
+      if ('onLine' in navigator && navigator.onLine) window.ononline();
+    });
     navigator.serviceWorker.addEventListener('controllerchange', () => {
       logger.info('The controller of current browsing context has changed.');
     });
@@ -48,12 +57,9 @@ const Worker = {
       // channel.postMessage({ title: 'Hello from Client broadcast message' });
       // channel.close();
     });
+    this.RouterInstance = router();
     const isInstall = await this.status();
     if (!isInstall) await this.install();
-    else await this.update();
-    await this.updateOfflineSrc();
-    // else if (location.hostname === 'localhost') await this.update();
-    this.RouterInstance = router();
     await render();
     LoadRouter(this.RouterInstance);
     LoadingAnimation.removeSplashScreen();
@@ -212,13 +218,6 @@ const Worker = {
       }
     });
   },
-  updateOfflineSrc: async function () {
-    try {
-      await fetch(`${getProxyPath()}offline.html`);
-    } catch (error) {
-      logger.error('error');
-    }
-  },
   // TODO: GPS management
   RenderSetting: async function () {
     setTimeout(() => {