underpost 2.7.94 → 2.8.0

package/.vscode/settings.json

@@ -43,6 +43,7 @@
     "lampp",
     "loadingio",
     "Longname",
+    "metanarrative",
     "Microdata",
     "minami",
     "MMORPG",
@@ -60,6 +61,8 @@
     "Tokenomics",
     "underpost",
     "Unequip",
+    "uuidv",
+    "Valkey",
     "webroot",
     "xampp",
     "xfwd",

package/bin/deploy.js

@@ -35,6 +35,7 @@ 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';
+import { Xampp } from '../src/runtime/xampp/Xampp.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -283,6 +284,28 @@ try {
       }
       break;
 
+    case 'xampp': {
+      const directory = 'c:/xampp/htdocs';
+      const host = 'localhost';
+      const port = 80;
+      Xampp.removeRouter();
+      Xampp.appendRouter(`  Listen ${port} 
+               <VirtualHost *:${port}>
+                DocumentRoot "${directory}"
+                ServerName ${host}:${port}
+      
+                <Directory "${directory}">
+                  Options Indexes FollowSymLinks MultiViews
+                  AllowOverride All
+                  Require all granted
+                </Directory>
+      
+              </VirtualHost>
+              `);
+      if (Xampp.enabled() && Xampp.router) Xampp.initService({ daemon: true });
+      break;
+    }
+
     case 'adminer': {
       const directory = '/dd/engine/public/adminer';
       // const host = '127.0.0.1';
@@ -998,6 +1021,22 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
       break;
     }
 
+    case 'valkey': {
+      if (!process.argv.includes('server')) {
+        shellExec(`cd /dd && git clone https://github.com/valkey-io/valkey.git`);
+        shellExec(`cd /dd/valkey && make`);
+        shellExec(`apt install valkey-tools`); // valkey-cli
+      }
+      shellExec(`cd /dd/valkey && ./src/valkey-server`);
+
+      break;
+    }
+
+    case 'valkey-service': {
+      shellExec(`pm2 start bin/deploy.js --node-args=\"--max-old-space-size=8192\" --name valkey -- valkey server`);
+      break;
+    }
+
     default:
       break;
   }

package/bin/index.js

@@ -19,7 +19,7 @@ const globalBinFolder = `${shellExec(`npm root -g`, {
 
 const program = new Command();
 
-const version = '2.7.94';
+const version = '2.8.0';
 
 program.name('underpost').description(`underpost.net ci/cd cli ${version}`).version(version);
 

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.94'
+      engine.version: '2.8.0'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "main": "src/index.js",
   "name": "underpost",
-  "version": "2.7.94",
+  "version": "2.8.0",
   "description": "pwa api rest template",
   "scripts": {
     "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -11,7 +11,7 @@
     "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": "env-cmd -f .env.development node src/client.dev",
     "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",
@@ -117,7 +117,8 @@
     "systeminformation": "^5.21.17",
     "uglify-js": "^3.17.4",
     "validator": "^13.11.0",
-    "winston": "^3.11.0"
+    "winston": "^3.11.0",
+    "iovalkey": "^0.2.1"
   },
   "devDependencies": {
     "clean-jsdoc-theme": "^4.3.0",

package/src/api/user/user.model.js

@@ -58,7 +58,7 @@ const UserDto = {
     },
   },
   auth: {
-    payload: (user) => ({ _id: user._id.toString(), role: user.role }),
+    payload: (user) => ({ _id: user._id.toString(), role: user.role, email: user.email }),
   },
 };
 

package/src/api/user/user.service.js

@@ -6,24 +6,13 @@ import { CoreWsEmit } from '../../ws/core/core.ws.emit.js';
 import { CoreWsMailerChannel } from '../../ws/core/channels/core.ws.mailer.js';
 import validator from 'validator';
 import { DataBaseProvider } from '../../db/DataBaseProvider.js';
-import { s4 } from '../../client/components/core/CommonJs.js';
 import { FileFactory } from '../file/file.service.js';
-import fs from 'fs-extra';
-import { svg, png, png3x } from 'font-awesome-assets';
 import { UserDto } from './user.model.js';
-import Jimp from 'jimp';
+import { selectDtoFactory, ValkeyAPI } from '../../server/valkey.js';
+import { getDefaultProfileImageId } from '../../server/client-icons.js';
 
 const logger = loggerFactory(import.meta);
 
-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;
-};
-
 const UserService = {
   post: async (req, res, options) => {
     /** @type {import('./user.model.js').UserModel} */
@@ -235,6 +224,15 @@ const UserService = {
           }
         } else throw new Error('invalid email or password');
 
+      case 'guest': {
+        const user = await ValkeyAPI.valkeyObjectFactory('user', options);
+        await ValkeyAPI.setValkeyObject(user.email, user);
+        return {
+          token: hashJWT({ user: UserDto.auth.payload(user) }),
+          user: selectDtoFactory(user, UserDto.select.get()),
+        };
+      }
+
       default: {
         const validatePassword = validatePasswordMiddleware(req.body.password);
         if (validatePassword.status === 'error') throw new Error(validatePassword.message);
@@ -327,13 +325,15 @@ const UserService = {
         return await User.find().select(UserDto.select.getAll());
 
       case 'auth': {
-        const user = await User.findOne({
-          _id: req.auth.user._id,
-        });
+        const user = (await ValkeyAPI.getValkeyObject(req.auth.user.email))
+          ? await ValkeyAPI.getValkeyObject(req.auth.user.email)
+          : await User.findOne({
+              _id: req.auth.user._id,
+            });
 
         const file = await File.findOne({ _id: user.profileImageId });
 
-        if (!file) {
+        if (!file && !(await ValkeyAPI.getValkeyObject(req.auth.user.email))) {
           await User.findByIdAndUpdate(
             user._id,
             { profileImageId: await getDefaultProfileImageId(File) },
@@ -342,10 +342,11 @@ const UserService = {
             },
           );
         }
-
-        return await User.findOne({
-          _id: req.auth.user._id,
-        }).select(UserDto.select.get());
+        return (await ValkeyAPI.getValkeyObject(req.auth.user.email))
+          ? selectDtoFactory(await ValkeyAPI.getValkeyObject(req.auth.user.email), UserDto.select.get())
+          : await User.findOne({
+              _id: req.auth.user._id,
+            }).select(UserDto.select.get());
       }
 
       default: {

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

@@ -1,11 +1,11 @@
 import { UserService } from '../../services/user/user.service.js';
+import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { newInstance, s4 } from './CommonJs.js';
 import { renderStatus, renderWave } from './Css.js';
 import { EventsUI } from './EventsUI.js';
 import { fileFormDataFactory, Input } from './Input.js';
 import { LogIn } from './LogIn.js';
-import { LogOut } from './LogOut.js';
 import { Modal } from './Modal.js';
 import { NotificationManager } from './NotificationManager.js';
 import { Translate } from './Translate.js';
@@ -21,19 +21,19 @@ const Account = {
     const waveAnimationId = 'account-wave';
     const profileFileAccept = ['image/png', 'image/jpeg'];
     setTimeout(async () => {
-      if (LogIn.Scope.user.main.model.user.profileImage) {
-        append(
-          `.wave-animation-container-${waveAnimationId}`,
-          html` <div class="abs center account-profile-image-container">
-              <img
-                class="abs center account-profile-image"
-                style="opacity: 1"
-                src="${LogIn.Scope.user.main.model.user.profileImage.imageSrc}"
-              />
-            </div>
-            <div class="abs center account-profile-image-loading" style="color: white"></div>`,
-        );
-      }
+      append(
+        `.wave-animation-container-${waveAnimationId}`,
+        html` <div class="abs center account-profile-image-container">
+            <img
+              class="abs center account-profile-image"
+              style="opacity: 1"
+              ${LogIn.Scope.user.main.model.user.profileImage
+                ? `src="${LogIn.Scope.user.main.model.user.profileImage.imageSrc}"`
+                : ''}
+            />
+          </div>
+          <div class="abs center account-profile-image-loading" style="color: white"></div>`,
+      );
 
       const formData = [
         {
@@ -49,133 +49,141 @@ const Account = {
           rules: [{ type: 'isStrongPassword' }],
         },
       ];
-      const validators = await Validator.instance(formData);
 
-      for (const inputData of formData) {
-        s(`.${inputData.id}`).value =
-          !user[inputData.model] && inputData.defaultValue ? inputData.defaultValue : user[inputData.model];
-      }
-      let lastUser;
-      const submit = async () => {
-        lastUser = newInstance(user);
-        const { errorMessage } = await validators();
-        if (errorMessage) return;
-        const body = {};
+      this.formData = formData;
+
+      this.instanceModalUiEvents = async ({ user }) => {
+        const validators = await Validator.instance(formData);
+
         for (const inputData of formData) {
-          if (!s(`.${inputData.id}`).value || s(`.${inputData.id}`).value === 'undefined') continue;
-          if ('model' in inputData) {
-            body[inputData.model] = s(`.${inputData.id}`).value;
-            user[inputData.model] = s(`.${inputData.id}`).value;
-          }
+          s(`.${inputData.id}`).value =
+            !user[inputData.model] && inputData.defaultValue ? inputData.defaultValue : user[inputData.model];
         }
-        const result = await UserService.put({ id: user._id, body });
-        NotificationManager.Push({
-          html:
-            result.status === 'error' && result.message
-              ? result.message
-              : Translate.Render(`${result.status}-update-user`),
-          status: result.status,
-        });
-        if (result.status === 'success') {
-          user = result.data;
-          this.triggerUpdateEvent({ user });
-          if (lastUser.emailConfirmed !== user.emailConfirmed) {
-            this.renderVerifyEmailStatus(user);
-          }
+        let lastUser;
+        const submit = async () => {
           lastUser = newInstance(user);
-        }
-      };
-      EventsUI.onClick(`.btn-account`, async (e) => {
-        e.preventDefault();
-        await submit();
-      });
-      EventsUI.onClick(`.btn-account-update-username`, async (e) => {
-        e.preventDefault();
-        await submit();
-      });
-
-      if (s(`.btn-confirm-email`))
-        EventsUI.onClick(`.btn-confirm-email`, async (e) => {
-          e.preventDefault();
-          const result = await UserService.post({
-            id: 'mailer/verify-email',
-            body: { email: s(`.account-email`).value },
-          });
+          const { successKeys } = await validators();
+          if (successKeys.length === 0) return;
+          const body = {};
+          for (const inputData of formData) {
+            if (!s(`.${inputData.id}`).value || s(`.${inputData.id}`).value === 'undefined') continue;
+            if ('model' in inputData && successKeys.includes(inputData.id)) {
+              body[inputData.model] = s(`.${inputData.id}`).value;
+              user[inputData.model] = s(`.${inputData.id}`).value;
+            }
+          }
+          const result = await UserService.put({ id: user._id, body });
           NotificationManager.Push({
-            html: result.status === 'error' ? result.message : Translate.Render(`email send`),
+            html:
+              result.status === 'error' && result.message
+                ? result.message
+                : Translate.Render(`${result.status}-update-user`),
             status: result.status,
           });
+          if (result.status === 'success') {
+            user = result.data;
+            this.triggerUpdateEvent({ user });
+            if (lastUser.emailConfirmed !== user.emailConfirmed) {
+              this.renderVerifyEmailStatus(user);
+            }
+            lastUser = newInstance(user);
+          }
+        };
+        EventsUI.onClick(`.btn-account`, async (e) => {
+          e.preventDefault();
+          await submit();
         });
-      this.renderVerifyEmailStatus(user);
-
-      s(`.${waveAnimationId}`).style.cursor = 'pointer';
-      s(`.${waveAnimationId}`).onclick = async (e) => {
-        e.preventDefault();
-        s(`.account-profile-image-input`).click();
-      };
-      EventsUI.onChange(
-        `.account-profile-image-input`,
-        async (e) => {
+        EventsUI.onClick(`.btn-account-update-username`, async (e) => {
           e.preventDefault();
-          s(`.account-profile-image`).style.opacity = 0;
-          const formFile = fileFormDataFactory(e, profileFileAccept);
+          await submit();
+        });
 
-          const { status, data } = await UserService.put({
-            id: `profile-image/${user._id}`,
-            body: formFile,
-            headerId: 'file',
+        if (s(`.btn-confirm-email`))
+          EventsUI.onClick(`.btn-confirm-email`, async (e) => {
+            e.preventDefault();
+            const result = await UserService.post({
+              id: 'mailer/verify-email',
+              body: { email: s(`.account-email`).value },
+            });
+            NotificationManager.Push({
+              html: result.status === 'error' ? result.message : Translate.Render(`email send`),
+              status: result.status,
+            });
           });
+        this.renderVerifyEmailStatus(user);
 
-          if (status === 'success') {
-            user.profileImageId = data.profileImageId;
-            delete LogIn.Scope.user.main.model.user.profileImage;
-            await LogIn.Trigger({ user });
-            s(`.account-profile-image`).src = LogIn.Scope.user.main.model.user.profileImage.imageSrc;
-          } else {
-            NotificationManager.Push({
-              html: Translate.Render('file-upload-failed'),
-              status: 'error',
+        s(`.${waveAnimationId}`).style.cursor = 'pointer';
+        s(`.${waveAnimationId}`).onclick = async (e) => {
+          e.preventDefault();
+          s(`.account-profile-image-input`).click();
+        };
+        EventsUI.onChange(
+          `.account-profile-image-input`,
+          async (e) => {
+            e.preventDefault();
+            s(`.account-profile-image`).style.opacity = 0;
+            const formFile = fileFormDataFactory(e, profileFileAccept);
+
+            const { status, data } = await UserService.put({
+              id: `profile-image/${user._id}`,
+              body: formFile,
+              headerId: 'file',
             });
-          }
 
-          s(`.account-profile-image`).style.opacity = 1;
-        },
-        { loadingContainer: `.account-profile-image-loading` },
-      );
-      s(`.btn-account-change-password`).onclick = (e) => {
-        e.preventDefault();
-        // s(`.btn-close-modal-account`).click();
-        s(`.main-btn-recover`).click();
-      };
-      s(`.btn-account-delete-confirm`).onclick = async (e) => {
-        e.preventDefault();
-        const confirmResult = await Modal.RenderConfirm({
-          html: async () => {
-            return html`
-              <div class="in section-mp" style="text-align: center">${Translate.Render('confirm-delete-account')}</div>
-            `;
+            if (status === 'success') {
+              user.profileImageId = data.profileImageId;
+              delete LogIn.Scope.user.main.model.user.profileImage;
+              await LogIn.Trigger({ user });
+              s(`.account-profile-image`).src = LogIn.Scope.user.main.model.user.profileImage.imageSrc;
+            } else {
+              NotificationManager.Push({
+                html: Translate.Render('file-upload-failed'),
+                status: 'error',
+              });
+            }
+
+            s(`.account-profile-image`).style.opacity = 1;
           },
-          id: 'delete-account-modal',
+          { loadingContainer: `.account-profile-image-loading` },
+        );
+        s(`.btn-account-change-password`).onclick = (e) => {
+          e.preventDefault();
+          // s(`.btn-close-modal-account`).click();
+          s(`.main-btn-recover`).click();
+        };
+        s(`.btn-account-delete-confirm`).onclick = async (e) => {
+          e.preventDefault();
+          const confirmResult = await Modal.RenderConfirm({
+            html: async () => {
+              return html`
+                <div class="in section-mp" style="text-align: center">
+                  ${Translate.Render('confirm-delete-account')}
+                </div>
+              `;
+            },
+            id: 'delete-account-modal',
+          });
+          if (confirmResult.status === 'cancelled') return;
+          s(`.btn-account-delete-confirm`).classList.add('hide');
+          s(`.btn-account-delete`).classList.remove('hide');
+          s(`.btn-account-delete`).click();
+        };
+        EventsUI.onClick(`.btn-account-delete`, async (e) => {
+          e.preventDefault();
+          const result = await UserService.delete({ id: user._id });
+          NotificationManager.Push({
+            html: result.status === 'error' ? result.message : Translate.Render(`success-delete-account`),
+            status: result.status,
+          });
+          s(`.btn-account-delete-confirm`).classList.remove('hide');
+          s(`.btn-account-delete`).classList.add('hide');
+          if (result.status === 'success') {
+            s(`.main-btn-home`).click();
+            await Auth.sessionOut();
+          }
         });
-        if (confirmResult.status === 'cancelled') return;
-        s(`.btn-account-delete-confirm`).classList.add('hide');
-        s(`.btn-account-delete`).classList.remove('hide');
-        s(`.btn-account-delete`).click();
       };
-      EventsUI.onClick(`.btn-account-delete`, async (e) => {
-        e.preventDefault();
-        const result = await UserService.delete({ id: user._id });
-        NotificationManager.Push({
-          html: result.status === 'error' ? result.message : Translate.Render(`success-delete-account`),
-          status: result.status,
-        });
-        s(`.btn-account-delete-confirm`).classList.remove('hide');
-        s(`.btn-account-delete`).classList.add('hide');
-        if (result.status === 'success') {
-          LogOut.Trigger();
-          s(`.main-btn-home`).click();
-        }
-      });
+      await this.instanceModalUiEvents({ user });
     });
     return html`
       <input type="file" accept="${profileFileAccept.join(', ')}" class="account-profile-image-input hide" />
@@ -285,6 +293,16 @@ const Account = {
       if (user.emailConfirmed === true) s(`.account-email`).setAttribute('disabled', '');
     }
   },
+  instanceModalUiEvents: async (user) => null,
+  updateForm: async function (user) {
+    if (!s(`.modal-account`)) return;
+    await this.instanceModalUiEvents({ user });
+    s(`.account-profile-image`).style.opacity = 0;
+    for (const inputData of this.formData)
+      if (s(`.${inputData.id}`)) s(`.${inputData.id}`).value = user[inputData.model];
+    s(`.account-profile-image`).src = LogIn.Scope.user.main.model.user.profileImage.imageSrc;
+    s(`.account-profile-image`).style.opacity = 1;
+  },
 };
 
 export { Account };

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

@@ -1,7 +1,19 @@
+import { UserMock, UserService } from '../../services/user/user.service.js';
+import { Account } from './Account.js';
+import { loggerFactory } from './Logger.js';
+import { LogIn } from './LogIn.js';
+import { LogOut } from './LogOut.js';
+import { SignUp } from './SignUp.js';
+
+const logger = loggerFactory(import.meta);
+
 const token = Symbol('token');
 
+const guestToken = Symbol('guestToken');
+
 const Auth = {
   [token]: '',
+  [guestToken]: '',
   setToken: function (value = '') {
     return (this[token] = value);
   },
@@ -11,8 +23,89 @@ const Auth = {
   getToken: function () {
     return this[token];
   },
+  setGuestToken: function (value = '') {
+    return (this[guestToken] = value);
+  },
+  deleteGuestToken: function () {
+    return (this[guestToken] = '');
+  },
+  getGuestToken: function () {
+    return this[guestToken];
+  },
+  // jwt
   getJWT: function () {
-    return `Bearer ${this.getToken()}`;
+    return `Bearer ${this.getToken() ? this.getToken() : this.getGuestToken()}`;
+  },
+  signUpToken: async function (
+    result = {
+      data: {
+        token: '',
+        user: null,
+      },
+    },
+  ) {
+    try {
+      localStorage.setItem('jwt', result.data.token);
+      await Auth.sessionIn();
+      await SignUp.Trigger(result.data);
+    } catch (error) {
+      logger.error(error);
+      localStorage.removeItem('jwt');
+    }
+  },
+  sessionIn: async function (userServicePayload) {
+    try {
+      const token = userServicePayload?.data?.token ? userServicePayload.data.token : localStorage.getItem('jwt');
+
+      if (token) {
+        this.setToken(token);
+        const result = userServicePayload
+          ? userServicePayload
+          : await (async () => {
+              const _result = await UserService.get({ id: 'auth' });
+              return {
+                status: _result.status,
+                data: {
+                  user: _result.data,
+                },
+              };
+            })();
+        const { status, data, message } = result;
+        if (status === 'success') {
+          localStorage.setItem('jwt', token);
+          await LogIn.Trigger({ user: data.user });
+          await Account.updateForm(data.user);
+          return { user: data.user };
+        } else throw new Error(message);
+      }
+
+      // anon guest session
+      this.deleteToken();
+      localStorage.removeItem('jwt');
+      let guestToken = localStorage.getItem('jwt.g');
+
+      if (!guestToken) {
+        const result = await UserService.post({ id: 'guest' });
+        localStorage.setItem('jwt.g', result.data.token);
+        guestToken = result.data.token;
+      }
+
+      this.setGuestToken(guestToken);
+      let { data, status, message } = await UserService.get({ id: 'auth' });
+      if (status === 'error') throw new Error(message);
+      await Account.updateForm(data);
+      return { user: data };
+    } catch (error) {
+      logger.error(error);
+      localStorage.removeItem('jwt');
+      localStorage.removeItem('jwt.g');
+      return { user: UserMock.default };
+    }
+  },
+  sessionOut: async function () {
+    this.deleteToken();
+    localStorage.removeItem('jwt');
+    await LogOut.Trigger(await this.sessionIn());
   },
 };
 

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

@@ -344,7 +344,7 @@ const renderBubbleDialog = async function (
   }
   if (options.trianglePositionCss) cssTrianglePosition = options.trianglePositionCss;
   return html` <div
-    class="${options?.classSelectors ? options.classSelectors : 'inl'} bubble-dialog bubble-dialog-${id}"
+    class="${options?.classSelectors ? options.classSelectors : 'in'} bubble-dialog bubble-dialog-${id}"
     ${options.bubbleCss ? `style='${options.bubbleCss}'` : ''}
   >
     <style class="style-bubble-dialog-triangle-${id}">

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.94`;
+        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);

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/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/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.94</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];
 

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;
         }
       }

package/src/server/valkey.js

@@ -0,0 +1,125 @@
+import Valkey from 'iovalkey';
+import mongoose from 'mongoose';
+import { hashPassword } from './auth.js';
+import { loggerFactory } from './logger.js';
+
+const logger = loggerFactory(import.meta);
+
+let valkeyEnabled = true;
+
+const disableValkeyErrorMessage = 'valkey is not enabled';
+
+const isValkeyEnable = () => valkeyEnabled;
+
+const selectDtoFactory = (payload, select) => {
+  const result = {};
+  for (const key of Object.keys(select)) {
+    if (select[key] === 1 && key in payload) result[key] = payload[key];
+  }
+  return result;
+};
+
+const valkeyClientFactory = async () => {
+  const valkey = new Valkey({
+    retryStrategy: (attempt) => {
+      if (attempt === 1) {
+        valkey.disconnect();
+        valkeyEnabled = false;
+        logger.warn('Valkey service not enabled', { valkeyEnabled });
+        return;
+      }
+      return 1000; // 1 second interval attempt
+    },
+  }); // Connect to 127.0.0.1:6379
+  // new Valkey(6380); // 127.0.0.1:6380
+  // new Valkey(6379, '192.168.1.1'); // 192.168.1.1:6379
+  // new Valkey('/tmp/redis.sock');
+  // new Valkey({
+  //   port: 6379, // Valkey port
+  //   host: '127.0.0.1', // Valkey host
+  //   username: 'default', // needs Valkey >= 6
+  //   password: 'my-top-secret',
+  //   db: 0, // Defaults to 0
+  // });
+  return valkey;
+};
+
+const getValkeyObject = async (key = '') => {
+  if (!valkeyEnabled) {
+    logger.warn(disableValkeyErrorMessage + ' get', key);
+    return null;
+  }
+  const object = await valkey.get(key);
+  try {
+    return JSON.parse(object);
+  } catch (error) {
+    return object;
+  }
+};
+
+const setValkeyObject = async (key = '', payload = {}) => {
+  if (!valkeyEnabled) throw new Error(disableValkeyErrorMessage);
+  return await valkey.set(key, JSON.stringify(payload));
+};
+
+const updateValkeyObject = async (key = '', payload = {}) => {
+  if (!valkeyEnabled) throw new Error(disableValkeyErrorMessage);
+  const object = await getValkeyObject(key, valkey);
+  object.updatedAt = new Date().toISOString();
+  return await valkey.set(key, JSON.stringify({ ...object, ...payload }));
+};
+
+const valkeyObjectFactory = async (module = '', options = { host: 'localhost', object: {} }) => {
+  if (!valkeyEnabled) throw new Error(disableValkeyErrorMessage);
+  const idoDate = new Date().toISOString();
+  options.object = options.object || {};
+  const { object } = options;
+  const _id = new mongoose.Types.ObjectId().toString();
+  object._id = _id;
+  object.createdAt = idoDate;
+  object.updatedAt = idoDate;
+  switch (module) {
+    case 'user': {
+      const role = 'guest';
+      object._id = `${role}${_id}`;
+      return {
+        ...object,
+        username: `${role}${_id.slice(-5)}`,
+        email: `${_id}@${options.host}`,
+        password: hashPassword(process.env.JWT_SECRET),
+        role,
+        failedLoginAttempts: 0,
+        phoneNumbers: [],
+        publicKey: [],
+        profileImageId: null,
+        emailConfirmed: false,
+        recoverTimeOut: null,
+        lastLoginDate: null,
+      };
+    }
+    default:
+      throw new Error(`module schema not found: ${module}`);
+  }
+};
+
+const ValkeyAPI = {
+  valkeyClientFactory,
+  selectDtoFactory,
+  getValkeyObject,
+  setValkeyObject,
+  valkeyObjectFactory,
+  updateValkeyObject,
+};
+
+const valkey = await ValkeyAPI.valkeyClientFactory();
+
+export {
+  valkeyClientFactory,
+  selectDtoFactory,
+  getValkeyObject,
+  setValkeyObject,
+  valkeyObjectFactory,
+  updateValkeyObject,
+  isValkeyEnable,
+  ValkeyAPI,
+};