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

@@ -1,134 +1,134 @@
 {
-    "type": "module",
-    "main": "src/index.js",
-    "name": "underpost",
-    "version": "2.7.91",
-    "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",
-        "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",
-        "backup": "node bin/db default.net/ export",
-        "install-template": "npm install && npm run build",
-        "install-global": "npm install -g pm2 && npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd && npm install -g yarn && npm install -g auto-changelog",
-        "install-test": "npm install -g mocha && npm install -g c8 && npm install -g nyc && npm install -g coveralls",
-        "install-vs-extensions": "node bin/vs import",
-        "preinstall": "npm config set audit false && npm config set loglevel error",
-        "restore-preinstall": "npm config set audit true && npm config set loglevel notice",
-        "install": "npm run install-global && npm run install-test && npm run restore-preinstall --no-audit --no-warnings",
-        "docker:start": "docker-compose up",
-        "prettier": "prettier --write .",
-        "coveralls": "nyc npm run test --reporter=text-lcov | coveralls -v",
-        "test": "env-cmd -f .env.test c8 mocha",
-        "update": "npm update -g && npm update && npm audit fix --force && npm audit fix --force",
-        "underpost-publish": "npm publish --provenance --access public",
-        "underpost-unpublish": "npm unpublish underpost@2.5.x",
-        "login": "npm adduser",
-        "bin": "npm link --force"
-    },
-    "bin": {
-        "underpost": "bin/index.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/underpostnet/pwa-microservices-template.git"
-    },
-    "keywords": [
-        "engine",
-        "server",
-        "proxy",
-        "client"
-    ],
-    "author": "https://github.com/underpostnet",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/underpostnet/pwa-microservices-template/issues"
-    },
-    "homepage": "https://github.com/underpostnet/pwa-microservices-template#readme",
-    "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.4.2",
-        "@loadingio/css-spinner": "^2.0.2",
-        "@neodrag/vanilla": "^2.0.3",
-        "@xenova/transformers": "^2.17.2",
-        "adm-zip": "^0.5.10",
-        "ag-grid-community": "31.0.0",
-        "axios": "^1.5.1",
-        "chai": "^5.1.0",
-        "cli-progress": "^3.12.0",
-        "cli-spinners": "^3.0.0",
-        "color": "^4.2.3",
-        "colors": "^1.4.0",
-        "commander": "^12.1.0",
-        "compression": "^1.7.4",
-        "copy-paste": "^1.5.3",
-        "cors": "^2.8.5",
-        "d3": "^7.9.0",
-        "deepmerge": "^4.3.1",
-        "detect-port": "^1.5.1",
-        "dotenv": "^16.3.1",
-        "easymde": "^2.18.0",
-        "env-cmd": "^10.1.0",
-        "eventemitter3": "^5.0.1",
-        "express": "^4.18.2",
-        "express-fileupload": "^1.4.3",
-        "favicons": "^7.2.0",
-        "font-awesome-assets": "^0.0.9",
-        "fs-extra": "^11.1.1",
-        "fullcalendar": "^6.1.15",
-        "html-minifier-terser": "^7.2.0",
-        "http-proxy-middleware": "^2.0.6",
-        "ignore-walk": "^6.0.4",
-        "is-admin": "^4.0.0",
-        "is-ip": "^5.0.1",
-        "jimp": "^0.22.12",
-        "joystick-controller": "^1.0.15",
-        "json-colorizer": "^2.2.2",
-        "jsonwebtoken": "^9.0.2",
-        "kill-port-process": "^3.2.0",
-        "log-update": "^6.0.0",
-        "mariadb": "^3.2.2",
-        "marked": "^12.0.2",
-        "mongoose": "^8.0.1",
-        "morgan": "^1.10.0",
-        "nodemailer": "^6.9.9",
-        "nodemon": "^3.0.1",
-        "pathfinding": "^0.4.18",
-        "peer": "^1.0.2",
-        "peerjs": "^1.5.2",
-        "pixi.js": "7.4.0",
-        "prom-client": "^15.1.2",
-        "public-ip": "^6.0.1",
-        "read": "^2.1.0",
-        "sharp": "^0.32.5",
-        "shelljs": "^0.8.5",
-        "simple-git": "^3.26.0",
-        "simple-icons": "^13.9.0",
-        "sitemap": "^7.1.1",
-        "socket.io": "^4.8.0",
-        "sortablejs": "^1.15.0",
-        "split-file": "^2.3.0",
-        "swagger-ui-express": "^5.0.0",
-        "systeminformation": "^5.21.17",
-        "uglify-js": "^3.17.4",
-        "validator": "^13.11.0",
-        "winston": "^3.11.0"
-    },
-    "devDependencies": {
-        "clean-jsdoc-theme": "^4.3.0",
-        "mocha": "^10.4.0",
-        "plantuml": "^0.0.2",
-        "swagger-autogen": "^2.23.7",
-        "to-json-schema": "^0.2.5"
-    },
-    "publishConfig": {
-        "provenance": true,
-        "access": "public",
-        "registry": "https://registry.npmjs.org/"
-    }
-}
+  "type": "module",
+  "main": "src/index.js",
+  "name": "underpost",
+  "version": "2.7.93",
+  "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",
+    "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",
+    "backup": "node bin/db default.net/ export",
+    "install-template": "npm install && npm run build",
+    "install-global": "npm install -g pm2 && npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd && npm install -g yarn && npm install -g auto-changelog",
+    "install-test": "npm install -g mocha && npm install -g c8 && npm install -g nyc && npm install -g coveralls",
+    "install-vs-extensions": "node bin/vs import",
+    "preinstall": "npm config set audit false && npm config set loglevel error",
+    "restore-preinstall": "npm config set audit true && npm config set loglevel notice",
+    "install": "npm run install-global && npm run install-test && npm run restore-preinstall --no-audit --no-warnings",
+    "docker:start": "docker-compose up",
+    "prettier": "prettier --write .",
+    "coveralls": "nyc npm run test --reporter=text-lcov | coveralls -v",
+    "test": "env-cmd -f .env.test c8 mocha",
+    "update": "npm update -g && npm update && npm audit fix --force && npm audit fix --force",
+    "underpost-publish": "npm publish --provenance --access public",
+    "underpost-unpublish": "npm unpublish underpost@2.5.x",
+    "login": "npm adduser",
+    "bin": "npm link --force"
+  },
+  "bin": {
+    "underpost": "bin/index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/underpostnet/pwa-microservices-template.git"
+  },
+  "keywords": [
+    "engine",
+    "server",
+    "proxy",
+    "client"
+  ],
+  "author": "https://github.com/underpostnet",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/underpostnet/pwa-microservices-template/issues"
+  },
+  "homepage": "https://github.com/underpostnet/pwa-microservices-template#readme",
+  "dependencies": {
+    "@fortawesome/fontawesome-free": "^6.4.2",
+    "@loadingio/css-spinner": "^2.0.2",
+    "@neodrag/vanilla": "^2.0.3",
+    "@xenova/transformers": "^2.17.2",
+    "adm-zip": "^0.5.10",
+    "ag-grid-community": "31.0.0",
+    "axios": "^1.5.1",
+    "chai": "^5.1.0",
+    "cli-progress": "^3.12.0",
+    "cli-spinners": "^3.0.0",
+    "color": "^4.2.3",
+    "colors": "^1.4.0",
+    "commander": "^12.1.0",
+    "compression": "^1.7.4",
+    "copy-paste": "^1.5.3",
+    "cors": "^2.8.5",
+    "d3": "^7.9.0",
+    "deepmerge": "^4.3.1",
+    "detect-port": "^1.5.1",
+    "dotenv": "^16.3.1",
+    "easymde": "^2.18.0",
+    "env-cmd": "^10.1.0",
+    "eventemitter3": "^5.0.1",
+    "express": "^4.18.2",
+    "express-fileupload": "^1.4.3",
+    "favicons": "^7.2.0",
+    "font-awesome-assets": "^0.0.9",
+    "fs-extra": "^11.1.1",
+    "fullcalendar": "^6.1.15",
+    "html-minifier-terser": "^7.2.0",
+    "http-proxy-middleware": "^2.0.6",
+    "ignore-walk": "^6.0.4",
+    "is-admin": "^4.0.0",
+    "is-ip": "^5.0.1",
+    "jimp": "^0.22.12",
+    "joystick-controller": "^1.0.15",
+    "json-colorizer": "^2.2.2",
+    "jsonwebtoken": "^9.0.2",
+    "kill-port-process": "^3.2.0",
+    "log-update": "^6.0.0",
+    "mariadb": "^3.2.2",
+    "marked": "^12.0.2",
+    "mongoose": "^8.0.1",
+    "morgan": "^1.10.0",
+    "nodemailer": "^6.9.9",
+    "nodemon": "^3.0.1",
+    "pathfinding": "^0.4.18",
+    "peer": "^1.0.2",
+    "peerjs": "^1.5.2",
+    "pixi.js": "7.4.0",
+    "prom-client": "^15.1.2",
+    "public-ip": "^6.0.1",
+    "read": "^2.1.0",
+    "sharp": "^0.32.5",
+    "shelljs": "^0.8.5",
+    "simple-git": "^3.26.0",
+    "simple-icons": "^13.9.0",
+    "sitemap": "^7.1.1",
+    "socket.io": "^4.8.0",
+    "sortablejs": "^1.15.0",
+    "split-file": "^2.3.0",
+    "swagger-ui-express": "^5.0.0",
+    "systeminformation": "^5.21.17",
+    "uglify-js": "^3.17.4",
+    "validator": "^13.11.0",
+    "winston": "^3.11.0"
+  },
+  "devDependencies": {
+    "clean-jsdoc-theme": "^4.3.0",
+    "mocha": "^10.4.0",
+    "plantuml": "^0.0.2",
+    "swagger-autogen": "^2.23.7",
+    "easy-json-schema": "^0.0.2-beta"
+  },
+  "publishConfig": {
+    "provenance": true,
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  }
+}

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`;
       },
     },
     {