underpost 2.7.93 → 2.8.0

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.93`;
+        return `${getProxyPath()}docs/engine/2.8.0`;
       },
     },
     {

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

@@ -1,6 +1,7 @@
 import { CoreService } from '../../services/core/core.service.js';
 import { FileService } from '../../services/file/file.service.js';
 import { UserService } from '../../services/user/user.service.js';
+import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { EventsUI } from './EventsUI.js';
 import { Input } from './Input.js';
@@ -102,7 +103,13 @@ const LogIn = {
           if ('model' in inputData) body[inputData.model] = s(`.${inputData.id}`).value;
         }
         const result = await UserService.post({ id: 'auth', body });
-        if (result.status === 'success') this.Trigger(result.data);
+        if (result.status === 'success') {
+          await Auth.sessionIn(result);
+          setTimeout(() => {
+            if (s(`.modal-log-in`)) s(`.btn-close-modal-log-in`).click();
+            if (s(`.modal-sign-up`)) s(`.btn-close-modal-sign-up`).click();
+          });
+        }
         if (result.status === 'error' && result.message.match('attempts')) {
           htmls(`.login-attempt-warn-value`, result.message.split(':')[1]);
           s(`.login-attempt-warn-container`).classList.remove('hide');

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

@@ -1,3 +1,4 @@
+import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { LogIn } from './LogIn.js';
 import { Translate } from './Translate.js';
@@ -37,9 +38,9 @@ const LogOut = {
   },
   Render: async function () {
     setTimeout(() => {
-      s('.btn-log-out').onclick = (e) => {
+      s('.btn-log-out').onclick = async (e) => {
         e.preventDefault();
-        LogOut.Trigger();
+        await Auth.sessionOut();
       };
     });
     // Translate.Render('confirm-logout')

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

@@ -87,6 +87,8 @@ const Modal = {
       onObserverListener: {},
       onClickListener: {},
       onExpandUiListener: {},
+      onBarUiOpen: {},
+      onBarUiClose: {},
       query: options.query ? `${window.location.search}` : undefined,
     };
     if (options && 'mode' in options) {
@@ -286,6 +288,8 @@ const Modal = {
                   s(`.modal-menu`).style.top = '0px';
                   s(`.main-body-btn-container`).style.top = '50px';
                   s(`.main-body`).style.top = '0px';
+                  for (const event of Object.keys(Modal.Data[idModal].onBarUiClose))
+                    Modal.Data[idModal].onBarUiClose[event]();
                 } else {
                   s(`.main-body-btn-ui-close`).classList.remove('hide');
                   s(`.main-body-btn-ui-open`).classList.add('hide');
@@ -296,6 +300,8 @@ const Modal = {
                   s(`.slide-menu-top-bar`).classList.remove('hide');
                   s(`.bottom-bar`).classList.remove('hide');
                   s(`.main-body`).style.top = `${options.heightTopBar}px`;
+                  for (const event of Object.keys(Modal.Data[idModal].onBarUiOpen))
+                    Modal.Data[idModal].onBarUiOpen[event]();
                 }
                 Responsive.Event[`slide-menu-modal-menu`]();
                 Object.keys(this.Data).map((_idModal) => {
@@ -1321,7 +1327,6 @@ const Modal = {
       case 'slide-menu-right':
       case 'slide-menu-left':
         const backMenuButtonEvent = async () => {
-          if (location.pathname !== getProxyPath()) setPath(getProxyPath());
           if (s(`.menu-btn-container-children`)) htmls(`.menu-btn-container-children`, '');
           // htmls(`.nav-title-display-${'modal-menu'}`, html`<i class="fas fa-home"></i> ${Translate.Render('home')}`);
           htmls(`.nav-title-display-${'modal-menu'}`, html``);
@@ -1340,8 +1345,7 @@ const Modal = {
             backMenuButtonEvent();
           }
           s(`.btn-close-modal-menu`).click();
-          if (window.location.pathname !== (getProxyPath() === '/' ? getProxyPath() : `${getProxyPath()}/`))
-            setPath(getProxyPath());
+          setPath(getProxyPath());
           setDocTitle({ ...options.RouterInstance, route: '' });
         };
         EventsUI.onClick(`.btn-icon-menu-back`, backMenuButtonEvent);
@@ -1535,7 +1539,7 @@ const Modal = {
         Responsive.Event['h-ui-hide-' + idModal] = () => {
           setTimeout(() => {
             if (!s(`.${idModal}`) || !s(`.main-body-btn-ui-close`)) return;
-            if (s(`.btn-restore-${idModal}`).style.display !== 'none') {
+            if (s(`.btn-restore-${idModal}`) && s(`.btn-restore-${idModal}`).style.display !== 'none') {
               s(`.${idModal}`).style.height = s(`.main-body-btn-ui-close`).classList.contains('hide')
                 ? `${window.innerHeight}px`
                 : `${
@@ -1543,10 +1547,10 @@ const Modal = {
                     (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
                     (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
                   }px`;
-              s(`.${idModal}`).style.top = s(`.main-body-btn-ui-close`).classList.contains('hide')
-                ? `0px`
-                : `${options.heightTopBar ? options.heightTopBar : heightDefaultTopBar}px`;
             }
+            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/Panel.js

@@ -372,13 +372,26 @@ const Panel = {
         } else {
           Responsive.Event[`${idPanel}-responsive`] = () => {
             if (s(`.${idPanel}-form-container`))
-              s(`.${idPanel}-form-container`).style.maxHeight = `${
-                window.innerHeight - heightTopBar - heightBottomBar
-              }px`;
+              s(`.${idPanel}-form-container`).style.maxHeight =
+                options.route === 'home' &&
+                s(`.${idPanel}-form-body`) &&
+                !s(`.${idPanel}-form-body`).classList.contains('hide') &&
+                !s(`.main-body-btn-ui-open`).classList.contains('hide')
+                  ? `${window.innerHeight}px`
+                  : `${window.innerHeight - heightTopBar - heightBottomBar}px`;
           };
           Responsive.Event[`${idPanel}-responsive`]();
         }
       };
+      if (options.route === 'home') {
+        Modal.Data['modal-menu'].onBarUiClose[`${idPanel}-responsive`] = () => {
+          resizeParentModal();
+        };
+
+        Modal.Data['modal-menu'].onBarUiOpen[`${idPanel}-responsive`] = () => {
+          resizeParentModal();
+        };
+      }
       setTimeout(resizeParentModal);
       if (options.route) {
         RouterEvents[options.parentIdModal] = ({ route }) => {

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

@@ -113,6 +113,7 @@ const PanelForm = {
         filesData: () => PanelForm.Data[idPanel].filesData,
         scrollClassContainer: options.scrollClassContainer ? options.scrollClassContainer : 'main-body',
         titleIcon,
+        route: options.route,
         formContainerClass: 'session-in-log-in',
         onClick: async function ({ payload }) {
           if (options.route) {

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

@@ -1,4 +1,5 @@
 import { borderChar } from './Css.js';
+import { Modal } from './Modal.js';
 import { append, s } from './VanillaJs.js';
 
 const Scroll = {
@@ -17,7 +18,7 @@ const Scroll = {
   scrollHandler: async function () {
     for (const selector in Scroll.data) await Scroll.data[selector].callback(Scroll.getScrollPosition(selector));
   },
-  addEvent: function (selector = '', callback = () => {}) {
+  addEvent: function (selector = '', callback = (position = 0) => {}) {
     Scroll.data[selector].callback = callback;
   },
   removeEvent: function (selector) {
@@ -30,6 +31,13 @@ const Scroll = {
       behavior: options.behavior || 'smooth',
     });
   },
+  topRefreshEvents: {},
+  addTopRefreshEvent: function (options = { id: '', callback: () => {}, condition: () => {} }) {
+    this.topRefreshEvents[options.id] = options;
+  },
+  removeTopRefreshEvent: function (id = '') {
+    delete this.topRefreshEvents[id];
+  },
   pullTopRefresh: function () {
     append(
       'body',
@@ -68,6 +76,15 @@ const Scroll = {
     });
 
     document.addEventListener('touchmove', (e) => {
+      if (
+        !Object.keys(Scroll.topRefreshEvents).find((event) => Scroll.topRefreshEvents[event].condition()) ||
+        (!s(`.btn-bar-center-icon-close`).classList.contains('hide') &&
+          !s(
+            `.btn-icon-menu-mode-${Modal.Data['modal-menu'].options.mode !== 'slide-menu-right' ? 'left' : 'right'}`,
+          ).classList.contains('hide'))
+      )
+        return;
+
       const touchY = e.touches[0].clientY;
       const touchDiff = touchY - touchstartY;
 
@@ -87,11 +104,26 @@ const Scroll = {
       // console.warn('touchend');
       s(`.pull-refresh-icon-container`).style.top = '-60px';
       if (reload) {
-        location.reload();
-        // console.warn('reload');
+        for (const event of Object.keys(Scroll.topRefreshEvents))
+          if (Scroll.topRefreshEvents[event].condition()) Scroll.topRefreshEvents[event].callback();
       }
       reload = false;
     });
+    Scroll.addTopRefreshEvent({
+      id: 'main-body',
+      callback: () => {
+        location.reload();
+      },
+      condition: () => {
+        return (
+          s('.main-body') &&
+          s('.main-body').scrollTop === 0 &&
+          !Object.keys(Modal.Data).find(
+            (idModal) => !['modal-menu', 'main-body', 'bottom-bar', 'main-body-top'].includes(idModal),
+          )
+        );
+      },
+    });
   },
 };
 

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

@@ -1,8 +1,8 @@
 import { UserService } from '../../services/user/user.service.js';
+import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { EventsUI } from './EventsUI.js';
 import { Input } from './Input.js';
-import { LogIn } from './LogIn.js';
 import { NotificationManager } from './NotificationManager.js';
 import { Translate } from './Translate.js';
 import { Validator } from './Validator.js';
@@ -52,10 +52,7 @@ const SignUp = {
               : Translate.Render(`no-valid-register`),
           status: result.status,
         });
-        if (result.status === 'success') {
-          await this.Trigger(result.data);
-          await LogIn.Trigger(result.data);
-        }
+        if (result.status === 'success') await Auth.signUpToken(result);
       });
       s(`.btn-sign-up-i-have-account`).onclick = () => {
         s(`.main-btn-log-in`).click();

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

@@ -35,6 +35,8 @@ const SocketIo = {
       // forceNew: true,
       // reconnectionAttempts: 'Infinity',
       // timeout: 10000,
+      // withCredentials: true,
+      // autoConnect: 5000,
       transports: ['websocket', 'polling', 'flashsocket'],
     };
     // logger.error(`connect options:`, JSON.stringify(connectOptions, null, 4));

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

@@ -106,6 +106,10 @@ const TranslateCore = {
       en: 'Enter your WhatsApp number, including your country code.',
       es: 'Número de WhatsApp, recuerda colocar el código de tu país',
     };
+    Translate.Data['¿'] = {
+      en: '',
+      es: '¿',
+    };
     Translate.Data['color-copy'] = { es: 'color copiado en el portapapeles', en: 'color copied to clipboard' };
     Translate.Data['pallet-colors'] = { en: 'pallet colors', es: 'paleta de colores' };
     Translate.Data['fullscreen'] = { en: 'Fullscreen', es: 'Pantalla completa' };

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

@@ -88,11 +88,18 @@ const Validator = {
 
     return async () => {
       let errorMessage = '';
+      const errorKeys = [];
+      const successKeys = [];
       for (const validatorKey of Object.keys(validatorFunction)) {
         const result = await validatorFunction[validatorKey]();
-        if (result && result.errorMessage) errorMessage += result.errorMessage;
+        if (result && result.errorMessage) {
+          errorMessage += result.errorMessage;
+          errorKeys.push(validatorKey);
+        } else {
+          successKeys.push(validatorKey);
+        }
       }
-      return { errorMessage };
+      return { errorMessage, errorKeys, successKeys };
     };
   },
 };

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

@@ -148,7 +148,10 @@ const pasteData = () => new Promise((resolve) => navigator.clipboard.readText().
  * history.
  * @memberof VanillaJS
  */
-const setPath = (path = '/', stateStorage = {}, title = '') => history.pushState(stateStorage, title, path);
+const setPath = (path = '/', stateStorage = {}, title = '') => {
+  if (window.location.pathname === path || window.location.pathname === `${path}/`) return;
+  return history.pushState(stateStorage, title, path);
+};
 
 /**
  * The function `getQueryParams` extracts query parameters from the current URL and returns them as an

package/src/client/components/default/LogInDefault.js

@@ -7,35 +7,14 @@ import { ElementsDefault } from './ElementsDefault.js';
 const LogInDefault = async function () {
   LogIn.Event['LogInDefault'] = async (options) => {
     const { token, user } = options;
-
-    if (token) {
-      localStorage.setItem('jwt', token);
-      Auth.setToken(token);
-    }
     ElementsDefault.Data.user.main.model.user = user;
-
     s(`.main-btn-log-in`).style.display = 'none';
     s(`.main-btn-sign-up`).style.display = 'none';
     s(`.main-btn-log-out`).style.display = null;
     s(`.main-btn-account`).style.display = null;
-
-    if (s(`.modal-log-in`)) s(`.btn-close-modal-log-in`).click();
-    if (s(`.modal-sign-up`)) s(`.btn-close-modal-sign-up`).click();
   };
-  const token = localStorage.getItem('jwt');
-  if (token) {
-    Auth.setToken(token);
-    const result = await UserService.get({ id: 'auth' });
-    if (result.status === 'success' && result.data) {
-      const user = result.data;
-      await LogIn.Trigger({
-        token,
-        user,
-      });
-    } else localStorage.removeItem('jwt');
-  } else {
-    // Anon
-  }
+  const { user } = await Auth.sessionIn();
+  ElementsDefault.Data.user.main.model.user = user;
 };
 
 export { LogInDefault };

package/src/client/components/default/LogOutDefault.js

@@ -6,8 +6,9 @@ import { s } from '../core/VanillaJs.js';
 import { ElementsDefault } from './ElementsDefault.js';
 
 const LogOutDefault = async function () {
-  LogOut.Event['LogOutDefault'] = async () => {
-    localStorage.removeItem('jwt');
+  LogOut.Event['LogOutDefault'] = async (result = { user: { _id: '' } }) => {
+    ElementsDefault.Data.user.main.model.user = result.user;
+
     s(`.main-btn-log-out`).style.display = 'none';
     s(`.main-btn-account`).style.display = 'none';
     s(`.main-btn-log-in`).style.display = null;
@@ -15,9 +16,6 @@ const LogOutDefault = async function () {
     if (s(`.modal-log-out`)) s(`.btn-close-modal-log-out`).click();
     if (s(`.modal-account`)) s(`.btn-close-modal-account`).click();
 
-    ElementsDefault.Data.user.main.model.user = { _id: '' };
-    Auth.deleteToken();
-
     NotificationManager.Push({
       html: Translate.Render(`success-logout`),
       status: 'success',

package/src/client/services/user/user.service.js

@@ -8,6 +8,14 @@ logger.info('Load service');
 
 const endpoint = 'user';
 
+const UserMock = {
+  default: {
+    username: 'guest',
+    email: `guest@${location.hostname}`,
+    role: 'guest',
+  },
+};
+
 const UserService = {
   post: (options = { id: '', body: {} }) =>
     new Promise((resolve, reject) =>
@@ -86,4 +94,4 @@ const UserService = {
     ),
 };
 
-export { UserService };
+export { UserService, UserMock };

package/src/client/ssr/body/CacheControl.js

@@ -109,6 +109,6 @@ SrrComponent = ({ ttiLoadTimeLimit }) => {
       const CacheControl = ${CacheControl};
       CacheControl({ ttiLoadTimeLimit: ${ttiLoadTimeLimit ? ttiLoadTimeLimit : 1000 * 70 * 1} });
     </script>
-    <div class="clean-cache-container">v2.7.93</div>
+    <div class="clean-cache-container">v2.8.0</div>
   `;
 };

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

@@ -64,10 +64,16 @@ self.addEventListener('fetch', (event) => {
         } catch (error) {
           console.error('Error opening cache for pre cached page', event.request.url, error);
           try {
-            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;
+            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;
           } catch (error) {
             console.error('Error opening cache for offline page', event.request.url, error);
             const response = new Response(JSON.stringify({ status: 'error', message: error.message }));

package/src/server/client-build.js

@@ -700,28 +700,7 @@ root file where the route starts, such as index.js, app.js, routes.js, etc ... *
 
         await swaggerAutoGen({ openapi: '3.0.0' })(outputFile, routes, doc);
       }
-      if (!enableLiveRebuild && process.argv.includes('zip')) {
-        logger.warn('build zip', rootClientPath);
-
-        if (!fs.existsSync('./build')) fs.mkdirSync('./build');
-
-        const zip = new AdmZip();
-        const files = await fs.readdir(rootClientPath, { recursive: true });
-
-        for (const relativePath of files) {
-          const filePath = dir.resolve(`${rootClientPath}/${relativePath}`);
-          if (!fs.lstatSync(filePath).isDirectory()) {
-            const folder = dir.relative(`public/${host}${path}`, dir.dirname(filePath));
-            zip.addLocalFile(filePath, folder);
-          }
-        }
-
-        const buildId = `${host}-${path.replaceAll('/', '')}`;
 
-        logger.warn('write zip', `./build/${buildId}.zip`);
-
-        zip.writeZip(`./build/${buildId}.zip`);
-      }
       if (client) {
         let PRE_CACHED_RESOURCES = [];
 
@@ -792,6 +771,28 @@ root file where the route starts, such as index.js, app.js, routes.js, etc ... *
           );
         }
       }
+      if (!enableLiveRebuild && process.argv.includes('zip')) {
+        logger.warn('build zip', rootClientPath);
+
+        if (!fs.existsSync('./build')) fs.mkdirSync('./build');
+
+        const zip = new AdmZip();
+        const files = await fs.readdir(rootClientPath, { recursive: true });
+
+        for (const relativePath of files) {
+          const filePath = dir.resolve(`${rootClientPath}/${relativePath}`);
+          if (!fs.lstatSync(filePath).isDirectory()) {
+            const folder = dir.relative(`public/${host}${path}`, dir.dirname(filePath));
+            zip.addLocalFile(filePath, folder);
+          }
+        }
+
+        const buildId = `${host}-${path.replaceAll('/', '')}`;
+
+        logger.warn('write zip', `./build/${buildId}.zip`);
+
+        zip.writeZip(`./build/${buildId}.zip`);
+      }
     }
   }
 };

package/src/server/client-icons.js

@@ -3,8 +3,9 @@ import { favicons } from 'favicons';
 // import textToImage from 'text-to-image';
 import { loggerFactory } from './logger.js';
 import fs from 'fs-extra';
-import { png3x } from 'font-awesome-assets';
 import { getCapVariableName, s4 } from '../client/components/core/CommonJs.js';
+import { FileFactory } from '../api/file/file.service.js';
+import { svg, png, png3x } from 'font-awesome-assets';
 
 const logger = loggerFactory(import.meta);
 
@@ -148,4 +149,13 @@ const buildIcons = async ({
   }
 };
 
-export { buildIcons, buildTextImg, defaultBaseTextImgOptions, faBase64Png, getBufferPngText };
+const getDefaultProfileImageId = async (File) => {
+  const faId = 'user';
+  const tmpFilePath = `./tmp/${faId}-${s4() + s4()}.svg`;
+  fs.writeFileSync(tmpFilePath, svg(faId, '#f5f5f5d1'), 'utf8');
+  const file = await new File(FileFactory.svg(fs.readFileSync(tmpFilePath), `${faId}.svg`)).save();
+  fs.removeSync(tmpFilePath);
+  return file._id;
+};
+
+export { buildIcons, buildTextImg, defaultBaseTextImgOptions, faBase64Png, getBufferPngText, getDefaultProfileImageId };

package/src/server/conf.js

@@ -583,7 +583,7 @@ const validateTemplatePath = (absolutePath = '') => {
   const confServer = DefaultConf.server[host][path];
   const confClient = DefaultConf.client[client];
   const confSsr = DefaultConf.ssr[ssr];
-  const clients = Object.keys(confClient).concat(['core', 'test', 'default']);
+  const clients = Object.keys(confClient).concat(['core', 'test', 'default', 'user']);
 
   if (absolutePath.match('src/api') && !confServer.apis.find((p) => absolutePath.match(`src/api/${p}/`))) {
     return false;
@@ -935,6 +935,7 @@ const maintenanceMiddleware = (req, res, port, proxyRouter) => {
 
 const setUpProxyMaintenanceServer = ({ deployGroupId }) => {
   shellExec(`pm2 kill`);
+  shellExec(`node bin/deploy valkey-service`);
   const proxyDeployId = fs.readFileSync(`./engine-private/deploy/${deployGroupId}.proxy`, 'utf8').trim();
   shellExec(`node bin/deploy conf ${proxyDeployId} production`);
   shellExec(`node bin/deploy run ${proxyDeployId} maintenance`);

package/src/server/network.js

@@ -74,6 +74,10 @@ const saveRuntimeRouter = async () => {
     const host = process.env.DEFAULT_DEPLOY_HOST;
     const path = process.env.DEFAULT_DEPLOY_PATH;
     const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
+    if (!deployId || !host || !path) {
+      logger.warn('default deploy instance not found');
+      return;
+    }
     const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
     const { db } = confServer[host][path];
 
@@ -97,7 +101,7 @@ const saveRuntimeRouter = async () => {
           port: networkRouter[_host][_path].port,
           apis: networkRouter[_host][_path].apis,
         };
-        const instance = await Instance.findOne({ deployId: body.deployId, port: body.port });
+        const instance = await Instance.findOne({ deployId: body.deployId, host: _host, path: _path });
         if (instance) {
           await Instance.findByIdAndUpdate(instance._id, body);
         } else {

package/src/server/ssl.js

@@ -50,8 +50,8 @@ const buildSSL = async (host) => {
 
           fs.writeFileSync(`./engine-private/ssl/${host}/_ca_bundle.crt`, ca, 'utf8');
           fs.writeFileSync(`./engine-private/ssl/${host}/_ca_full_bundle.crt`, caFull, 'utf8');
-
-          fs.removeSync(`${sslPath}/${folderHost}`);
+          // TODO: no repeat folderHost match
+          // fs.removeSync(`${sslPath}/${folderHost}`);
           return true;
         }
       }