underpost 2.7.93 → 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.93';
+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.93'
+      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.93",
+  "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/core/core.service.js

@@ -9,11 +9,9 @@ const CoreService = {
     /** @type {import('./core.model.js').CoreModel} */
     const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Core;
     if (req.path.startsWith('/sh')) {
-      shellExec(req.body.sh, { stdout: true, async: true });
-      return {
-        status: 'success',
-        message: 'Command "' + req.body.sh + '" running',
-      };
+      if (req.body.print) return shellExec(req.body.sh, { stdout: true });
+      shellExec(req.body.sh, { async: true });
+      return 'Command "' + req.body.sh + '" running';
     }
     return await new Core(req.body).save();
   },

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