@underpostnet/underpost 2.8.0 → 2.8.31

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

@@ -14,6 +14,14 @@ const logger = loggerFactory(import.meta);
  * @memberof Underpost
  */
 class Underpost {
+  /**
+   * Underpost engine version
+   * @static
+   * @type {String}
+   * @memberof Underpost
+   */
+  static version = 'v2.8.31';
+
   constructor() {}
 
   /**

package/src/server/client-build.js

@@ -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')}`,
                       });
                     }
 

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) {

package/src/server/conf.js

@@ -9,7 +9,6 @@ import colors from 'colors';
 import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
 import { DefaultConf } from '../../conf.js';
-import ncp from 'copy-paste';
 import read from 'read';
 import splitFile from 'split-file';
 import axios from 'axios';
@@ -253,8 +252,8 @@ const buildClientSrc = async (
   }
 
   fs.writeFileSync(
-    `./src/client/ssr/components/head/${toClientVariableName}Scripts.js`,
-    formattedSrc(fs.readFileSync(`./src/client/ssr/components/head/${fromClientVariableName}Scripts.js`, 'utf8')),
+    `./src/client/ssr/head/${toClientVariableName}Scripts.js`,
+    formattedSrc(fs.readFileSync(`./src/client/ssr/head/${fromClientVariableName}Scripts.js`, 'utf8')),
     'utf8',
   );
 
@@ -473,7 +472,7 @@ const buildProxyRouter = () => {
         title: 'Site in maintenance',
         ssrPath: '/',
         ssrHeadComponents: '',
-        ssrBodyComponents: (await ssrFactory(`./src/client/ssr/body/Maintenance.js`))(),
+        ssrBodyComponents: (await ssrFactory(`./src/client/ssr/offline/Maintenance.js`))(),
       });
     })();
 
@@ -770,9 +769,10 @@ const deployRun = async (dataDeploy, currentAttempt = 1) => {
   } else logger.info(`Deploy process successfully`);
 };
 
-const restoreMacroDb = async (deployGroupId = '') => {
+const restoreMacroDb = async (deployGroupId = '', deployId = null) => {
   const dataDeploy = await getDataDeploy({ deployGroupId, buildSingleReplica: false });
   for (const deployGroup of dataDeploy) {
+    if (deployId && deployGroup.deployId !== deployId) continue;
     if (!deployGroup.replicaHost) {
       const deployServerConfPath = `./engine-private/conf/${deployGroup.deployId}/conf.server.json`;
       const serverConf = JSON.parse(fs.readFileSync(deployServerConfPath, 'utf8'));

package/src/server/logger.js

@@ -86,6 +86,7 @@ const format = (meta) =>
  * @memberof Logger
  */
 const setUpInfo = async (logger = new winston.Logger()) => {
+  logger.info('npm_package_version', process.env.npm_package_version);
   logger.info('argv', process.argv);
   logger.info('platform', process.platform);
   logger.info('env', process.env.NODE_ENV);
@@ -179,12 +180,13 @@ const loggerMiddleware = (meta = { url: '' }) => {
 };
 
 const underpostASCI = () => `
-▗▖ ▗▖▗▖  ▗▖▗▄▄▄  ▗▄▄▄▖▗▄▄▖ ▄▄▄▄   ▄▄▄   ▄▄▄  ■  
-▐▌ ▐▌▐▛▚▖▐▌▐▌  █ ▐▌   ▐▌ ▐▌█   █ █   █ ▀▄▄▗▄▟▙▄▖
-▐▌ ▐▌▐▌ ▝▜▌▐▌  █ ▐▛▀▀▘▐▛▀▚▖█▄▄▄▀ ▀▄▄▄▀ ▄▄▄▀ ▐▌  
-▝▚▄▞▘▐▌  ▐▌▐▙▄▄▀ ▐▙▄▄▖▐▌ ▐▌█                ▐▌  
-                           ▀                ▐▌  
-                                                
+
+██╗░░░██╗███╗░░██╗██████╗░███████╗██████╗░██████╗░░█████╗░░██████╗████████╗
+██║░░░██║████╗░██║██╔══██╗██╔════╝██╔══██╗██╔══██╗██╔══██╗██╔════╝╚══██╔══╝
+██║░░░██║██╔██╗██║██║░░██║█████╗░░██████╔╝██████╔╝██║░░██║╚█████╗░░░░██║░░░
+██║░░░██║██║╚████║██║░░██║██╔══╝░░██╔══██╗██╔═══╝░██║░░██║░╚═══██╗░░░██║░░░
+╚██████╔╝██║░╚███║██████╔╝███████╗██║░░██║██║░░░░░╚█████╔╝██████╔╝░░░██║░░░
+░╚═════╝░╚═╝░░╚══╝╚═════╝░╚══════╝╚═╝░░╚═╝╚═╝░░░░░░╚════╝░╚═════╝░░░░╚═╝░░░
                                                 `;
 
 export { loggerFactory, loggerMiddleware, setUpInfo, underpostASCI };

package/src/server/process.js

@@ -3,8 +3,8 @@
 import shell from 'shelljs';
 import dotenv from 'dotenv';
 import fs from 'fs-extra';
-
 import { loggerFactory } from './logger.js';
+import clipboard from 'clipboardy';
 
 dotenv.config();
 
@@ -63,4 +63,27 @@ const shellCd = (cd, options = { disableLog: false }) => {
   return shell.cd(cd);
 };
 
-export { ProcessController, getRootDirectory, shellExec, shellCd };
+function pbcopy(data) {
+  switch (process.platform) {
+    case 'linux':
+      {
+        // sudo dnf install xclip
+        // sudo apt update
+        // sudo apt install xclip
+        // paste: xclip -o
+        // copy:
+        // shellExec(`echo "${data}" | xclip -sel clip`, { async: true });
+      }
+
+      break;
+
+    default:
+      break;
+  }
+
+  clipboard.writeSync(data || '🦄');
+
+  logger.info(`copied to clipboard:`, clipboard.readSync());
+}
+
+export { ProcessController, getRootDirectory, shellExec, shellCd, pbcopy };

package/src/server/ssl.js

@@ -70,7 +70,7 @@ const validateSecureContext = (host) => {
 const buildSecureContext = (host) => {
   return {
     key: fs.readFileSync(`./engine-private/ssl/${host}/key.key`, 'utf8'),
-    cert: fs.readFileSync(`./engine-private/ssl/${host}/crt.crt`, 'utf8'),
+    cert: fs.readFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, 'utf8'),
     ca: fs.readFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, 'utf8'),
   };
 };

package/src/server/valkey.js

@@ -21,6 +21,8 @@ const selectDtoFactory = (payload, select) => {
 
 const valkeyClientFactory = async () => {
   const valkey = new Valkey({
+    // port: 6379,
+    // host: 'service-valkey.default.svc.cluster.local',
     retryStrategy: (attempt) => {
       if (attempt === 1) {
         valkey.disconnect();
@@ -53,6 +55,7 @@ const getValkeyObject = async (key = '') => {
   try {
     return JSON.parse(object);
   } catch (error) {
+    logger.error(error);
     return object;
   }
 };

package/startup.cjs

@@ -0,0 +1,12 @@
+const shell = require('shelljs');
+
+// /usr/bin/supervisord -n
+// /usr/sbin/sshd -D
+
+shell.exec(`/usr/bin/supervisord -n`, { async: true });
+
+// shell.exec(`sudo /opt/lampp/lampp start`, { async: true });
+
+// shell.exec(`/usr/bin/mongod -f /etc/mongod.conf`, { async: true });
+
+shell.exec(`underpost new app`);

package/startup.js

@@ -1,11 +0,0 @@
-import { shellExec } from './src/server/process.js';
-
-// /usr/bin/supervisord -n
-// /usr/sbin/sshd -D
-shellExec(`/usr/bin/supervisord -n`, { async: true });
-
-shellExec(`sudo /opt/lampp/lampp start`, { async: true });
-
-shellExec(`/usr/bin/mongod -f /etc/mongod.conf`, { async: true });
-
-shellExec(`underpost new app server`);