@underpostnet/underpost 2.7.91 → 2.7.92

package/src/server/runtime.js

@@ -11,7 +11,7 @@ import { createServer } from 'http';
 import { getRootDirectory } from './process.js';
 import { network, listenPortController, saveRuntimeRouter, logRuntimeRouter, listenServerFactory } from './network.js';
 import { loggerFactory, loggerMiddleware } from './logger.js';
-import { newInstance } from '../client/components/core/CommonJs.js';
+import { getCapVariableName, newInstance } from '../client/components/core/CommonJs.js';
 import { Xampp } from '../runtime/xampp/Xampp.js';
 import { MailerProvider } from '../mailer/MailerProvider.js';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
@@ -19,6 +19,7 @@ import { createProxyMiddleware } from 'http-proxy-middleware';
 import { createPeerServer } from './peer.js';
 import { Lampp } from '../runtime/lampp/Lampp.js';
 import { getDeployId } from './conf.js';
+import { ssrFactory } from './client-formatted.js';
 
 dotenv.config();
 
@@ -58,6 +59,7 @@ export PATH=$PATH:/opt/lampp/bin`,
   const initPort = parseInt(process.env.PORT) + 1;
   let currentPort = initPort;
   const confServer = JSON.parse(fs.readFileSync(`./conf/conf.server.json`, 'utf8'));
+  const confSSR = JSON.parse(fs.readFileSync(`./conf/conf.ssr.json`, 'utf8'));
   const singleReplicaHosts = [];
   for (const host of Object.keys(confServer)) {
     if (singleReplicaHosts.length > 0 && !singleReplicaHosts.includes(host)) {
@@ -310,7 +312,7 @@ export PATH=$PATH:/opt/lampp/bin`,
           app.use(fileUpload());
 
           // json formatted response
-          app.set('json spaces', 2);
+          if (process.env.NODE_ENV === 'development') app.set('json spaces', 2);
 
           // lang handling middleware
           app.use(function (req, res, next) {
@@ -365,15 +367,17 @@ export PATH=$PATH:/opt/lampp/bin`,
 
           if (db && apis) await DataBaseProvider.load({ apis, host, path, db });
 
-          if (mailer)
+          if (mailer) {
+            const mailerSsrConf = confSSR[getCapVariableName(client)];
             await MailerProvider.load({
               id: `${host}${path}`,
               meta: `mailer-${host}${path}`,
               host,
               path,
               ...mailer,
+              templates: mailerSsrConf ? mailerSsrConf.mailer : {},
             });
-
+          }
           if (apis) {
             const apiPath = `${path === '/' ? '' : path}/${process.env.BASE_API}`;
             for (const api of apis)
@@ -385,17 +389,41 @@ export PATH=$PATH:/opt/lampp/bin`,
                 app.use(`${apiPath}/${api}`, router);
               })();
           }
+
+          const Render = await ssrFactory();
+          const ssrPath = path === '/' ? path : `${path}/`;
+
+          const defaultHtmlSrc404 = Render({
+            title: '404 Not Found',
+            ssrPath,
+            ssrHeadComponents: '',
+            ssrBodyComponents: (await ssrFactory(`./src/client/ssr/body/404.js`))(),
+          });
+          const path404 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/404/index.html`;
+          const page404 = fs.existsSync(path404) ? `${path === '/' ? '' : path}/404` : undefined;
           app.use(function (req, res, next) {
-            const path404 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/404.html`;
-            if (fs.existsSync(path404)) return res.status(404).sendFile(path404);
-            else res.status(404).send('Sorry cant find that!');
+            if (page404) return res.status(404).redirect(page404);
+            else {
+              res.set('Content-Type', 'text/html');
+              return res.status(404).send(defaultHtmlSrc404);
+            }
           });
 
+          const defaultHtmlSrc500 = Render({
+            title: '500 Server Error',
+            ssrPath,
+            ssrHeadComponents: '',
+            ssrBodyComponents: (await ssrFactory(`./src/client/ssr/body/500.js`))(),
+          });
+          const path500 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/500/index.html`;
+          const page500 = fs.existsSync(path500) ? `${path === '/' ? '' : path}/500` : undefined;
           app.use(function (err, req, res, next) {
             logger.error(err, err.stack);
-            const path500 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/500.html`;
-            if (fs.existsSync(path500)) return res.status(500).sendFile(path500);
-            res.status(500).send('Something broke!');
+            if (page500) return res.status(500).redirect(page500);
+            else {
+              res.set('Content-Type', 'text/html');
+              return res.status(500).send(defaultHtmlSrc500);
+            }
           });
 
           // instance server

package/src/client/ssr/common/SsrCore.js

@@ -1,91 +0,0 @@
-const s = (el) => document.querySelector(el);
-
-const append = (el, html) => s(el).insertAdjacentHTML('beforeend', html);
-
-const htmls = (el, html) => (s(el).innerHTML = html);
-
-const s4 = () => (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
-
-const range = (start, end) => {
-  return end < start
-    ? range(end, start).reverse()
-    : Array.apply(0, Array(end - start + 1)).map((element, index) => index + start);
-};
-
-const timer = (ms) => new Promise((res) => setTimeout(res, ms));
-
-const newInstance = (obj) => {
-  // structuredClone() 2022 ES6 feature
-  try {
-    return JSON.parse(JSON.stringify(obj));
-  } catch (error) {
-    return { error: error.message };
-  }
-};
-
-const fullScreenIn = () => {
-  const elem = document.documentElement;
-  if (elem.requestFullscreen) {
-    elem.requestFullscreen();
-  } else if (elem.mozRequestFullScreen) {
-    /* Firefox */
-    elem.mozRequestFullScreen();
-  } else if (elem.webkitRequestFullscreen) {
-    /* Chrome, Safari & Opera */
-    elem.webkitRequestFullscreen();
-  } else if (elem.msRequestFullscreen) {
-    /* IE/Edge */
-    elem = window.top.document.body; //To break out of frame in IE
-    elem.msRequestFullscreen();
-  }
-};
-
-const borderChar = (px, color, selectors) => {
-  if (selectors) {
-    return selectors
-      .map(
-        (selector) => html`
-          <style>
-            ${selector} {
-              text-shadow: ${px}px -${px}px ${px}px ${color}, -${px}px ${px}px ${px}px ${color},
-                -${px}px -${px}px ${px}px ${color}, ${px}px ${px}px ${px}px ${color};
-            }
-          </style>
-        `,
-      )
-      .join('');
-  }
-  return html`
-    text-shadow: ${px}px -${px}px ${px}px ${color}, -${px}px ${px}px ${px}px ${color}, -${px}px -${px}px ${px}px
-    ${color}, ${px}px ${px}px ${px}px ${color};
-  `;
-};
-const getLang = () =>
-  localStorage.getItem('lang') ? localStorage.getItem('lang') : navigator.language || navigator.userLanguage;
-
-const loggerFactory = (meta) => {
-  meta = meta.url.split('/').pop();
-  const types = ['error', 'warn', 'info', 'debug'];
-  const logger = {
-    log: function (type, args) {
-      if (location.hostname !== 'localhost' && console.log() !== null) {
-        console.log = () => null;
-        console.error = () => null;
-        console.info = () => null;
-        console.warn = () => null;
-      }
-      return location.hostname === 'localhost'
-        ? console[type](`[${meta}] ${new Date().toISOString()} ${type}:`, ...args)
-        : null;
-    },
-  };
-  types.map(
-    (type) =>
-      (logger[type] = function (...args) {
-        return this.log(type, args);
-      }),
-  );
-  return logger;
-};
-
-export { getLang, s, append, s4, range, timer, htmls, newInstance, fullScreenIn, borderChar, loggerFactory };

package/src/client/ssr/common/Translate.js

@@ -1,26 +0,0 @@
-const TranslateCore = {
-  ['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',
-  },
-};
-
-const Translate = (key) => TranslateCore[key][getLang().match('es') ? 'es' : 'en'];
-
-export { Translate };

package/src/client/ssr/common/Worker.js

@@ -1,28 +0,0 @@
-const Worker = {
-  instance: async function (options = { render: async () => {} }) {
-    window.serviceWorkerReady = true;
-    append(
-      'body',
-      html`
-        <style>
-          body {
-            background-color: #dcdcdc;
-            color: #303030;
-            font-family: arial;
-            font-size: 16px;
-          }
-          .page-render {
-            min-height: 100vh;
-          }
-          a {
-            color: #000000;
-          }
-        </style>
-        <div class="in page-render"></div>
-      `,
-    );
-    await options.render();
-  },
-};
-
-export { Worker };

package/src/client/ssr/components/head/PwaDefault.js

@@ -1,60 +0,0 @@
-SrrComponent = () => html`<link rel="icon" type="image/x-icon" href="/favicon.ico">
-<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="48x48" href="/favicon-48x48.png">
-<link rel="manifest" href="/manifest.webmanifest" crossOrigin="use-credentials">
-<meta name="mobile-web-app-capable" content="yes">
-<meta name="theme-color" content="#fff">
-<meta name="application-name" content="Default">
-<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
-<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
-<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">
-<link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
-<link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png">
-<link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
-<link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png">
-<link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
-<link rel="apple-touch-icon" sizes="167x167" href="/apple-touch-icon-167x167.png">
-<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
-<link rel="apple-touch-icon" sizes="1024x1024" href="/apple-touch-icon-1024x1024.png">
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-<meta name="apple-mobile-web-app-title" content="Default">
-<link rel="apple-touch-startup-image" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-640x1136.png">
-<link rel="apple-touch-startup-image" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-1136x640.png">
-<link rel="apple-touch-startup-image" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-750x1334.png">
-<link rel="apple-touch-startup-image" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-1334x750.png">
-<link rel="apple-touch-startup-image" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)" href="/apple-touch-startup-image-1125x2436.png">
-<link rel="apple-touch-startup-image" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)" href="/apple-touch-startup-image-2436x1125.png">
-<link rel="apple-touch-startup-image" media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)" href="/apple-touch-startup-image-1170x2532.png">
-<link rel="apple-touch-startup-image" media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)" href="/apple-touch-startup-image-2532x1170.png">
-<link rel="apple-touch-startup-image" media="(device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)" href="/apple-touch-startup-image-1179x2556.png">
-<link rel="apple-touch-startup-image" media="(device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)" href="/apple-touch-startup-image-2556x1179.png">
-<link rel="apple-touch-startup-image" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-828x1792.png">
-<link rel="apple-touch-startup-image" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-1792x828.png">
-<link rel="apple-touch-startup-image" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)" href="/apple-touch-startup-image-1242x2688.png">
-<link rel="apple-touch-startup-image" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)" href="/apple-touch-startup-image-2688x1242.png">
-<link rel="apple-touch-startup-image" media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)" href="/apple-touch-startup-image-1242x2208.png">
-<link rel="apple-touch-startup-image" media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)" href="/apple-touch-startup-image-2208x1242.png">
-<link rel="apple-touch-startup-image" media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)" href="/apple-touch-startup-image-1284x2778.png">
-<link rel="apple-touch-startup-image" media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)" href="/apple-touch-startup-image-2778x1284.png">
-<link rel="apple-touch-startup-image" media="(device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)" href="/apple-touch-startup-image-1290x2796.png">
-<link rel="apple-touch-startup-image" media="(device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)" href="/apple-touch-startup-image-2796x1290.png">
-<link rel="apple-touch-startup-image" media="(device-width: 744px) and (device-height: 1133px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-1488x2266.png">
-<link rel="apple-touch-startup-image" media="(device-width: 744px) and (device-height: 1133px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-2266x1488.png">
-<link rel="apple-touch-startup-image" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-1536x2048.png">
-<link rel="apple-touch-startup-image" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-2048x1536.png">
-<link rel="apple-touch-startup-image" media="(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-1620x2160.png">
-<link rel="apple-touch-startup-image" media="(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-2160x1620.png">
-<link rel="apple-touch-startup-image" media="(device-width: 820px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-1640x2160.png">
-<link rel="apple-touch-startup-image" media="(device-width: 820px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-2160x1640.png">
-<link rel="apple-touch-startup-image" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-1668x2388.png">
-<link rel="apple-touch-startup-image" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-2388x1668.png">
-<link rel="apple-touch-startup-image" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-1668x2224.png">
-<link rel="apple-touch-startup-image" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-2224x1668.png">
-<link rel="apple-touch-startup-image" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="/apple-touch-startup-image-2048x2732.png">
-<link rel="apple-touch-startup-image" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="/apple-touch-startup-image-2732x2048.png">
-<meta name="msapplication-TileColor" content="#fff">
-<meta name="msapplication-TileImage" content="/mstile-144x144.png">
-<meta name="msapplication-config" content="/browserconfig.xml">
-<link rel="yandex-tableau-widget" href="/yandex-browser-manifest.json">`;