@underpostnet/underpost 2.8.0 → 2.8.4

package/src/client/ssr/offline/Maintenance.js

@@ -0,0 +1,63 @@
+const s = (el) => document.querySelector(el);
+
+const append = (el, html) => s(el).insertAdjacentHTML('beforeend', html);
+
+const getLang = () =>
+  (localStorage.getItem('lang') || navigator.language || navigator.userLanguage || s('html').lang)
+    .slice(0, 2)
+    .toLowerCase();
+
+const main = () => {
+  const Translate = {
+    Data: {
+      ['server-maintenance']: {
+        en: "The server is under maintenance <br> we'll be back soon.",
+        es: 'El servidor está en mantenimiento <br> volveremos pronto.',
+      },
+    },
+    Render: function (id) {
+      return this.Data[id][getLang()] ? this.Data[id][getLang()] : this.Data[id]['en'];
+    },
+  };
+  const icon = html`<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 24 24">
+    <path
+      fill="none"
+      stroke="currentColor"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-width="2"
+      d="M3 7a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v2a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3zm9 13H6a3 3 0 0 1-3-3v-2a3 3 0 0 1 3-3h10.5m-.5 6a2 2 0 1 0 4 0a2 2 0 1 0-4 0m2-3.5V16m0 4v1.5m3.032-5.25l-1.299.75m-3.463 2l-1.3.75m0-3.5l1.3.75m3.463 2l1.3.75M7 8v.01M7 16v.01"
+    />
+  </svg>`;
+
+  append(
+    'body',
+    html` <style>
+        body {
+          font-family: arial;
+          font-size: 20px;
+          background-color: #d8d8d8;
+          color: #333;
+        }
+        a {
+          color: black;
+        }
+      </style>
+
+      <div class="abs center" style="top: 45%">
+        ${icon}
+        <br />
+        <br />${Translate.Render('server-maintenance')}
+      </div>`,
+  );
+};
+
+SrrComponent = () => html`<script>
+  {
+    const s = ${s};
+    const append = ${append};
+    const getLang = ${getLang};
+    const main = ${main};
+    window.onload = main;
+  }
+</script>`;

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

@@ -62,15 +62,35 @@ self.addEventListener('fetch', (event) => {
           if (!preCachedResponse) throw new Error(error.message);
           return preCachedResponse;
         } catch (error) {
-          console.error('Error opening cache for pre cached page', event.request.url, error);
+          console.error('Error opening cache for pre cached page', {
+            url: event.request.url,
+            error,
+            onLine: navigator.onLine,
+          });
           try {
+            if (!navigator.onLine) {
+              if (event.request.method.toUpperCase() === 'GET') {
+                const cache = await caches.open(CACHE_NAME);
+                const preCachedResponse = await cache.match(
+                  `${PROXY_PATH === '/' ? '' : PROXY_PATH}/offline/index.html`,
+                );
+                if (!preCachedResponse) throw new Error(error.message);
+                return preCachedResponse;
+              }
+              const response = new Response(JSON.stringify({ status: 'error', message: 'offline test response' }));
+              // response.status = 200;
+              response.headers.set('Content-Type', 'application/json');
+              return response;
+            }
             if (event.request.method.toUpperCase() === 'GET') {
               const cache = await caches.open(CACHE_NAME);
-              const preCachedResponse = await cache.match(`${PROXY_PATH === '/' ? '' : PROXY_PATH}/offline/index.html`);
+              const preCachedResponse = await cache.match(
+                `${PROXY_PATH === '/' ? '' : PROXY_PATH}/maintenance/index.html`,
+              );
               if (!preCachedResponse) throw new Error(error.message);
               return preCachedResponse;
             }
-            const response = new Response(JSON.stringify({ status: 'error', message: 'offline test response' }));
+            const response = new Response(JSON.stringify({ status: 'error', message: 'server in maintenance' }));
             // response.status = 200;
             response.headers.set('Content-Type', 'application/json');
             return response;

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,15 @@ 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/
+                shellExec(`sudo chown -R mongod:mongod /var/lib/mongo`);
+              }
               logger.info('install legacy 4.4');
               shellExec(`wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -`);
 

package/src/index.js

@@ -4,7 +4,9 @@
  * @namespace Underpost
  */
 
+import { runTest } from './server/conf.js';
 import { loggerFactory, setUpInfo } from './server/logger.js';
+import Project from './server/project.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -14,6 +16,15 @@ const logger = loggerFactory(import.meta);
  * @memberof Underpost
  */
 class Underpost {
+  /**
+   * Underpost engine version
+   * @static
+   * @type {String}
+   * @memberof Underpost
+   */
+  static version = 'v2.8.4';
+  static project = Project;
+
   constructor() {}
 
   /**
@@ -32,6 +43,10 @@ class Underpost {
   static async setUpInfo() {
     return await setUpInfo(logger);
   }
+
+  static runTest() {
+    return runTest(Underpost.version);
+  }
 }
 
 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) {

package/src/server/client-build.js

@@ -50,10 +50,10 @@ const fullBuild = async ({
   buildAcmeChallengePath(acmeChallengeFullPath);
 
   if (publicClientId && publicClientId.startsWith('html-website-templates')) {
-    if (!fs.existsSync(`/dd/html-website-templates/`))
-      shellExec(`cd /dd && git clone https://github.com/designmodo/html-website-templates.git`);
+    if (!fs.existsSync(`/home/dd/html-website-templates/`))
+      shellExec(`cd /home/dd && git clone https://github.com/designmodo/html-website-templates.git`);
     if (!fs.existsSync(`${rootClientPath}/index.php`)) {
-      fs.copySync(`/dd/html-website-templates/${publicClientId.split('-publicClientId-')[1]}`, rootClientPath);
+      fs.copySync(`/home/dd/html-website-templates/${publicClientId.split('-publicClientId-')[1]}`, rootClientPath);
       shellExec(`cd ${rootClientPath} && git init && git add . && git commit -m "Base template implementation"`);
       // git remote add origin git@github.com:<username>/<repo>.git
       fs.writeFileSync(`${rootClientPath}/.git/.htaccess`, `Deny from all`, 'utf8');
@@ -465,10 +465,11 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
                   case 'DefaultSplashScreen':
                     if (backgroundImage) {
                       ssrHeadComponents += SrrComponent({
-                        base64BackgroundImage: `data:image/${backgroundImage.split('.').pop()};base64,${fs
-                          .readFileSync(backgroundImage)
-                          .toString('base64')}`,
+                        backgroundImage: (path === '/' ? path : `${path}/`) + backgroundImage,
                       });
+                      // `data:image/${backgroundImage.split('.').pop()};base64,${fs
+                      //     .readFileSync()
+                      //     .toString('base64')}`,
                       break;
                     } else {
                       ssrHeadComponents += SrrComponent({ metadata });
@@ -480,7 +481,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
                         bgColor: metadata?.themeColor ? metadata.themeColor : '#ececec',
                       });
                       ssrHeadComponents += SrrComponent({
-                        base64BackgroundImage: `data:image/png;base64,${bufferBackgroundImage.toString('base64')}`,
+                        backgroundImage: `data:image/png;base64,${bufferBackgroundImage.toString('base64')}`,
                       });
                     }
 
@@ -544,17 +545,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
         let siteMapSrc = await new Promise((resolve) =>
           streamToPromise(Readable.from(siteMapLinks).pipe(siteMapStream)).then((data) => resolve(data.toString())),
         );
-        switch (publicClientId) {
-          case 'underpost':
-            siteMapSrc = siteMapSrc.replaceAll(
-              `</urlset>`,
-              `${fs.readFileSync(`./src/client/public/underpost/sitemap-template.txt`, 'utf8')} </urlset>`,
-            );
-            break;
 
-          default:
-            break;
-        }
         // Return a promise that resolves with your XML string
         fs.writeFileSync(`${rootClientPath}/sitemap.xml`, siteMapSrc, 'utf8');
         if (xslUrl)

package/src/server/client-icons.js

@@ -141,7 +141,7 @@ const buildIcons = async ({
     for (const file of response.files)
       fs.writeFileSync(`./src/client/public/${publicClientId}/${file.name}`, file.contents, 'utf8');
 
-    const ssrPath = `./src/client/ssr/components/head/Pwa${getCapVariableName(publicClientId)}.js`;
+    const ssrPath = `./src/client/ssr/head/Pwa${getCapVariableName(publicClientId)}.js`;
     if (!fs.existsSync(ssrPath))
       fs.writeFileSync(ssrPath, 'SrrComponent = () => html`' + response.html.join(`\n`) + '`;', 'utf8');
   } catch (error) {