@underpostnet/underpost 2.8.0 → 2.8.31

package/manifests/valkey/underpost-engine-valkey-statefulset.yaml

@@ -0,0 +1,39 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: service-valkey
+  namespace: default
+spec:
+  serviceName: service-valkey
+  replicas: 1
+  selector:
+    matchLabels:
+      app: service-valkey
+  template:
+    metadata:
+      labels:
+        app: service-valkey
+    spec:
+      containers:
+        - name: service-valkey
+          image: docker.io/valkey/valkey:latest
+          env:
+            - name: TZ
+              value: Europe/Zurich
+          ports:
+            - containerPort: 6379
+          startupProbe:
+            tcpSocket:
+              port: 6379
+            failureThreshold: 30
+            periodSeconds: 5
+            timeoutSeconds: 5
+          livenessProbe:
+            tcpSocket:
+              port: 6379
+            failureThreshold: 2
+            periodSeconds: 30
+            timeoutSeconds: 5
+      restartPolicy: Always
+      automountServiceAccountToken: false

package/package.json

@@ -2,16 +2,16 @@
     "type": "module",
     "main": "src/index.js",
     "name": "@underpostnet/underpost",
-    "version": "2.8.0",
+    "version": "2.8.31",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
         "pm2": "env-cmd -f .env.production pm2 start src/server.js --node-args=\"--max-old-space-size=8192\" --name engine && pm2 logs",
         "ssl": "env-cmd -f .env.production node bin/ssl",
         "pm2-delete": "pm2 delete engine",
-        "build": "node bin/deploy build-full-client",
+        "build": "node bin/deploy build-full-client && node bin/deploy fix-deps",
         "build-production": "env-cmd -f .env.production node bin/deploy build-full-client",
-        "dev": "env-cmd -f .env.development node src/client.dev",
+        "dev": "env-cmd -f .env.development node src/client.dev default",
         "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",
@@ -53,20 +53,25 @@
     "homepage": "https://github.com/underpostnet/pwa-microservices-template#readme",
     "dependencies": {
         "@fortawesome/fontawesome-free": "^6.4.2",
+        "@fullcalendar/rrule": "^6.1.15",
+        "@google/generative-ai": "^0.21.0",
         "@loadingio/css-spinner": "^2.0.2",
         "@neodrag/vanilla": "^2.0.3",
-        "@xenova/transformers": "^2.17.2",
+        "@nomiclabs/hardhat-ethers": "^2.2.3",
+        "@nomiclabs/hardhat-etherscan": "^3.1.8",
+        "@nomiclabs/hardhat-waffle": "^2.0.6",
+        "@openzeppelin/contracts": "^5.0.2",
         "adm-zip": "^0.5.10",
         "ag-grid-community": "31.0.0",
         "axios": "^1.5.1",
         "chai": "^5.1.0",
         "cli-progress": "^3.12.0",
         "cli-spinners": "^3.0.0",
+        "clipboardy": "^4.0.0",
         "color": "^4.2.3",
         "colors": "^1.4.0",
         "commander": "^12.1.0",
         "compression": "^1.7.4",
-        "copy-paste": "^1.5.3",
         "cors": "^2.8.5",
         "d3": "^7.9.0",
         "deepmerge": "^4.3.1",
@@ -84,27 +89,30 @@
         "html-minifier-terser": "^7.2.0",
         "http-proxy-middleware": "^2.0.6",
         "ignore-walk": "^6.0.4",
+        "iovalkey": "^0.2.1",
         "is-admin": "^4.0.0",
         "is-ip": "^5.0.1",
         "jimp": "^0.22.12",
         "joystick-controller": "^1.0.15",
         "json-colorizer": "^2.2.2",
         "jsonwebtoken": "^9.0.2",
+        "keyword-extractor": "^0.0.28",
         "kill-port-process": "^3.2.0",
         "log-update": "^6.0.0",
         "mariadb": "^3.2.2",
         "marked": "^12.0.2",
-        "mongoose": "^8.0.1",
+        "mongoose": "^8.9.5",
         "morgan": "^1.10.0",
         "nodemailer": "^6.9.9",
         "nodemon": "^3.0.1",
         "pathfinding": "^0.4.18",
         "peer": "^1.0.2",
         "peerjs": "^1.5.2",
-        "pixi.js": "7.4.0",
+        "pixi.js": "7.4.2",
         "prom-client": "^15.1.2",
         "public-ip": "^6.0.1",
         "read": "^2.1.0",
+        "rrule": "^2.8.1",
         "sharp": "^0.32.5",
         "shelljs": "^0.8.5",
         "simple-git": "^3.26.0",
@@ -114,18 +122,20 @@
         "sortablejs": "^1.15.0",
         "split-file": "^2.3.0",
         "swagger-ui-express": "^5.0.0",
-        "systeminformation": "^5.21.17",
+        "systeminformation": "^5.23.7",
         "uglify-js": "^3.17.4",
         "validator": "^13.11.0",
-        "winston": "^3.11.0",
-        "iovalkey": "^0.2.1"
+        "vanilla-jsoneditor": "^2.3.2",
+        "web3": "^4.13.0",
+        "winston": "^3.11.0"
     },
     "devDependencies": {
         "clean-jsdoc-theme": "^4.3.0",
+        "easy-json-schema": "^0.0.2-beta",
+        "hardhat": "^2.22.13",
         "mocha": "^10.4.0",
         "plantuml": "^0.0.2",
-        "swagger-autogen": "^2.23.7",
-        "easy-json-schema": "^0.0.2-beta"
+        "swagger-autogen": "^2.23.7"
     },
     "publishConfig": {
         "provenance": true,

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

@@ -26,7 +26,11 @@ const UserSchema = new Schema(
     profileImageId: { type: Schema.Types.ObjectId, ref: 'File' },
     phoneNumbers: [
       {
-        type: { type: String, enum: ['office', 'home', 'private'], number: { type: String } },
+        type: {
+          type: String,
+          enum: ['office', 'home', 'private'],
+        },
+        number: { type: String },
       },
     ],
     publicKey: {
@@ -58,6 +62,10 @@ const UserDto = {
     },
   },
   auth: {
+    // TODO: -> set login device, location, ip, fingerprint
+    //          and validate on authorization middleware
+    //       -> dynamic refresh 100 tokens per session with 12h interval
+    //       -> back secret per user, registrarion user model -> secret: { type: String }
     payload: (user) => ({ _id: user._id.toString(), role: user.role, email: user.email }),
   },
 };

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

@@ -237,7 +237,7 @@ const UserService = {
         const validatePassword = validatePasswordMiddleware(req.body.password);
         if (validatePassword.status === 'error') throw new Error(validatePassword.message);
         req.body.password = await hashPassword(req.body.password);
-        req.body.role = 'user';
+        req.body.role = req.body.role === 'guest' ? 'guest' : 'user';
         req.body.profileImageId = await getDefaultProfileImageId(File);
         const { _id } = await new User(req.body).save();
         if (_id) {

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

@@ -300,8 +300,10 @@ const Account = {
     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;
+    if (LogIn.Scope.user.main.model.user.profileImage) {
+      s(`.account-profile-image`).src = LogIn.Scope.user.main.model.user.profileImage.imageSrc;
+      s(`.account-profile-image`).style.opacity = 1;
+    }
   },
 };
 

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

@@ -46,8 +46,8 @@ const Auth = {
   ) {
     try {
       localStorage.setItem('jwt', result.data.token);
-      await Auth.sessionIn();
       await SignUp.Trigger(result.data);
+      await Auth.sessionIn();
     } catch (error) {
       logger.error(error);
       localStorage.removeItem('jwt');
@@ -76,7 +76,7 @@ const Auth = {
           await LogIn.Trigger({ user: data.user });
           await Account.updateForm(data.user);
           return { user: data.user };
-        } else throw new Error(message);
+        }
       }
 
       // anon guest session

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

@@ -1,7 +1,7 @@
 import { EventSchedulerService } from '../../services/event-scheduler/event-scheduler.service.js';
 import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
-import { newInstance, range, s4 } from './CommonJs.js';
+import { isValidDate, newInstance, range, s4 } from './CommonJs.js';
 import { renderCssAttr } from './Css.js';
 import { Modal } from './Modal.js';
 import { NotificationManager } from './NotificationManager.js';
@@ -13,15 +13,27 @@ import { append, getQueryParams, getTimeZone, htmls, s, sa } from './VanillaJs.j
 
 // https://fullcalendar.io/docs/event-object
 
+const daysOfWeekOptions = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
+
+const eventDateFactory = (event) =>
+  newInstance({
+    event: { ...event.extendedProps, title: event._def.title },
+    start: event.start,
+    end: event.end,
+  });
+
 const CalendarCore = {
   RenderStyle: async function () {},
   Data: {},
-  Render: async function (options = { idModal: '', Elements: {}, heightTopBar: 50, heightBottomBar: 50 }) {
+  Render: async function (
+    options = { idModal: '', Elements: {}, heightTopBar: 50, heightBottomBar: 50, hiddenDates: [] },
+  ) {
     this.Data[options.idModal] = {
       data: [],
       originData: [],
       filesData: [],
       calendar: {},
+      hiddenDates: options.hiddenDates ? options.hiddenDates : [],
     };
 
     const { heightTopBar, heightBottomBar } = options;
@@ -40,56 +52,87 @@ const CalendarCore = {
     };
     getSrrData();
 
-    const dateFormat = (date) =>
-      html`<span
-        style="${renderCssAttr({
-          style: {
-            'font-size': '14px',
-            color: '#888',
-          },
-        })}"
-        >${new Date(date).toLocaleString().replaceAll(',', '')}</span
-      >`;
-
     const getPanelData = async () => {
       const result = await EventSchedulerService.get({
-        id: `${getQueryParams().cid ? getQueryParams().cid : 'creatorUser'}`,
+        id: `${getQueryParams().cid ? getQueryParams().cid : Auth.getToken() ? 'creatorUser' : ''}`,
       });
       NotificationManager.Push({
         html: result.status === 'success' ? Translate.Render('success-get-events-scheduler') : result.message,
         status: result.status,
       });
       if (result.status === 'success') {
-        const resultData = Array.isArray(result.data) ? result.data : [result.data];
+        const resultData = Array.isArray(result.data) ? result.data : result.data ? [result.data] : [];
         this.Data[options.idModal].filesData = [];
         this.Data[options.idModal].originData = newInstance(resultData);
         this.Data[options.idModal].data = resultData.map((o) => {
           if (o.creatorUserId && options.Elements.Data.user.main.model.user._id === o.creatorUserId) o.tools = true;
           o.id = o._id;
-          o.start = dateFormat(o.start);
-          o.end = dateFormat(o.end);
+
           this.Data[options.idModal].filesData.push({});
           return o;
         });
+        setTimeout(() => {
+          renderCalendar(
+            resultData.map((o) => {
+              // FREQ=WEEKLY;
+              // if (o.daysOfWeek && o.daysOfWeek.length > 0) {
+              //   o.rrule = `RRULE:BYDAY=${o.daysOfWeek.map((d) => `${d[0]}${d[1]}`.toUpperCase()).join(',')}`;
+              // }
+              // o.rrule = 'FREQ=WEEKLY;BYDAY=SU;BYHOUR=10,11;COUNT=10';
+              if (o.daysOfWeek && o.daysOfWeek.length > 0)
+                o.daysOfWeek = o.daysOfWeek.map((v, i) => daysOfWeekOptions.indexOf(v));
+              else delete o.daysOfWeek;
+              // o.exdate = ['2024-04-02'];
+              // delete o.end;
+              // delete o.start;
+
+              return o;
+            }),
+          );
+        });
       }
     };
 
-    const renderCalendar = () => {
+    const renderCalendar = (events) => {
       const calendarEl = s(`.calendar-${idPanel}`);
       this.Data[options.idModal].calendar = new FullCalendar.Calendar(calendarEl, {
-        plugins: [FullCalendar.DayGrid.default, FullCalendar.TimeGrid.default, FullCalendar.List.default],
+        plugins: [
+          FullCalendar.DayGrid.default,
+          FullCalendar.TimeGrid.default,
+          FullCalendar.List.default,
+          // https://fullcalendar.io/docs/rrule-plugin
+          FullCalendar.RRule.default,
+        ],
         // initialView: 'dayGridWeek',
         timeZone: getTimeZone(),
         dateClick: function (arg) {
           console.error('calendar dateClick', arg.date.toString());
         },
-        events: [{ title: 'Meeting', start: new Date() }],
+        events: events ?? [{ title: 'Meeting', start: new Date() }],
         initialView: 'dayGridMonth',
         headerToolbar: {
           left: 'prev,next today',
           center: 'title',
           right: 'dayGridMonth,timeGridWeek,listWeek',
         },
+        eventClick: async function (args) {
+          const dateData = eventDateFactory(args.event);
+          // element -> args.el
+          // remove all events associated ->  args.event.remove();
+          // console.error('eventClick', JSON.stringify(dateData, null, 4));
+          if (options.eventClick) await options.eventClick(dateData, args);
+        },
+        eventClassNames: function (args) {
+          // console.error('eventClassNames', JSON.stringify(dateData, null, 4));
+          if (!args.event.extendedProps._id) return args.event.remove();
+          const dateData = eventDateFactory(args.event);
+          if (
+            CalendarCore.Data[options.idModal].hiddenDates.find(
+              (d) => d.eventSchedulerId === dateData.event._id && d.date === dateData.start,
+            )
+          )
+            return ['hide'];
+        },
       });
 
       this.Data[options.idModal].calendar.render();
@@ -139,29 +182,52 @@ const CalendarCore = {
         rules: [{ type: 'isEmpty' }],
       },
       {
-        id: 'description',
-        model: 'description',
+        id: 'title',
+        model: 'title',
         inputType: 'text',
         rules: [{ type: 'isEmpty' }],
         panel: { type: 'title' },
       },
       {
-        id: 'allDay',
-        model: 'allDay',
-        inputType: 'checkbox-on-off',
-        rules: [],
-        panel: { type: 'info-row', icon: html`<i class="fa-solid fa-infinity"></i>` },
+        id: 'description',
+        model: 'description',
+        inputType: 'text',
+        rules: [{ type: 'isEmpty' }],
+        panel: { type: 'info-row' },
       },
       {
         id: 'start',
         model: 'start',
         inputType: 'datetime-local',
-        panel: { type: 'subtitle' },
+        translateCode: 'startTime',
+        panel: { type: 'info-row' },
       },
       {
         id: 'end',
         model: 'end',
         inputType: 'datetime-local',
+        translateCode: 'endTime',
+        panel: { type: 'info-row' },
+      },
+      {
+        id: 'daysOfWeek',
+        model: 'daysOfWeek',
+        inputType: 'dropdown-checkbox',
+        dropdown: {
+          options: daysOfWeekOptions,
+        },
+        panel: { type: 'list' },
+      },
+      {
+        id: 'startTime',
+        model: 'startTime',
+        inputType: 'time',
+        panel: { type: 'info-row' },
+      },
+      {
+        id: 'endTime',
+        model: 'endTime',
+        inputType: 'time',
         panel: { type: 'info-row' },
       },
     ];
@@ -215,8 +281,7 @@ const CalendarCore = {
             if (options.route) {
               setQueryPath({ path: options.route, queryPath: payload._id });
               if (options.parentIdModal) Modal.Data[options.parentIdModal].query = `${window.location.search}`;
-              if (CalendarCore.Data[options.idModal].updatePanel)
-                await CalendarCore.Data[options.idModal].updatePanel();
+              await CalendarCore.Data[options.idModal].updatePanel();
             }
           },
           titleIcon,
@@ -250,12 +315,19 @@ const CalendarCore = {
           ],
           on: {
             add: async function ({ data, editId }) {
+              if (data.daysOfWeek && data.daysOfWeek.length > 0 && daysOfWeekOptions[data.daysOfWeek[0]]) {
+                data.daysOfWeek = data.daysOfWeek.map((d) => daysOfWeekOptions[d]);
+              }
+              data.timeZoneClient = getTimeZone();
               const {
                 status,
                 message,
                 data: documentData,
               } = editId
-                ? await EventSchedulerService.put({ id: editId, body: { ...data, _id: undefined } })
+                ? await EventSchedulerService.put({
+                    id: editId,
+                    body: { ...data, _id: undefined },
+                  })
                 : await EventSchedulerService.post({ body: data });
               NotificationManager.Push({
                 html:
@@ -268,10 +340,9 @@ const CalendarCore = {
               });
 
               if (status === 'success') {
-                data.start = dateFormat(data.start);
-                data.end = dateFormat(data.end);
-                data.tools = true;
-                data._id = documentData._id;
+                documentData.tools = true;
+                // data._id = documentData._id;
+                data = documentData;
 
                 let originObj, indexOriginObj;
                 let filesData = {};
@@ -291,8 +362,7 @@ const CalendarCore = {
 
                 setQueryPath({ path: options.route, queryPath: documentData._id });
                 if (options.parentIdModal) Modal.Data[options.parentIdModal].query = `${window.location.search}`;
-                if (CalendarCore.Data[options.idModal].updatePanel)
-                  await CalendarCore.Data[options.idModal].updatePanel();
+                await CalendarCore.Data[options.idModal].updatePanel();
               }
               return { data, status, message };
             },
@@ -319,11 +389,8 @@ const CalendarCore = {
                   status,
                 });
 
-                if (getQueryParams().cid === data.id) {
-                  setQueryPath({ path: options.route, queryPath: '' });
-                  if (CalendarCore.Data[options.idModal].updatePanel)
-                    await CalendarCore.Data[options.idModal].updatePanel();
-                }
+                setQueryPath({ path: options.route, queryPath: '' });
+                await CalendarCore.Data[options.idModal].updatePanel();
 
                 return { status };
               }
@@ -334,17 +401,13 @@ const CalendarCore = {
         <div class="in" style="margin-bottom: 100px"></div>`;
     };
 
-    let lastCid;
-    let lasUserId;
     this.Data[options.idModal].updatePanel = async () => {
       const cid = getQueryParams().cid ? getQueryParams().cid : '';
-      if (lastCid === cid && lasUserId === options.Elements.Data.user.main.model.user._id) return;
       if (options.route === 'home') Modal.homeCid = newInstance(cid);
-      lasUserId = newInstance(options.Elements.Data.user.main.model.user._id);
-      lastCid = cid;
       if (s(`.main-body-calendar-${options.idModal}`)) {
-        if (Auth.getToken()) await getPanelData();
-        else getSrrData();
+        // if (Auth.getToken())
+        // else getSrrData();
+        await getPanelData();
         htmls(`.main-body-calendar-${options.idModal}`, await panelRender());
       }
     };

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

@@ -518,25 +518,25 @@ function getDirname(path) {
   return parts.join('/'); // Adjust separator if needed for Windows ('\')
 }
 
-const isDayValid = (day) => {
-  const date = new Date();
-  date.setDate(day);
-  return date.getDate() === day;
-};
-
-const isMonthValid = (month) => {
-  const date = new Date();
-  date.setMonth(month - 1);
-  return date.getMonth() === month - 1;
-};
-
 const isValidDate = (day, month, year) => {
-  if (!isDayValid(day) || !isMonthValid(month)) {
-    return false;
-  }
+  if (!month && !year) return !(new Date(day) == 'Invalid Date');
+  // new Date('2025-12-28')
+  // Sat Dec 27 2025 19:00:00 GMT-0500 (Eastern Standard Time)
+  // new Date('2025/12/28')
+  // Sun Dec 28 2025 00:00:00 GMT-0500 (Eastern Standard Time)
+  return !(new Date(`${year}/${month}/${day}`) == 'Invalid Date');
+};
 
-  const date = new Date(year, month - 1, day);
-  return !isNaN(date.getTime());
+// console.log(req.body.timeZoneClient, Intl.DateTimeFormat().resolvedOptions().timeZone);
+// DateTime.fromISO("2017-05-15T09:10:23", { zone: "Europe/Paris" });
+const strToDateUTC = (date = '2025-01-30T14:32') => {
+  const year = parseInt(date.split('-')[0]);
+  const month = parseInt(date.split('-')[1]);
+  const day = parseInt(date.split('-')[2].split('T')[0]);
+  const hour = parseInt(date.split('T')[1].split(':')[0]);
+  const minute = parseInt(date.split('T')[1].split(':')[1]);
+  date = new Date(Date.UTC(year, month - 1, day, hour, minute, 0, 0));
+  return date;
 };
 
 const isValidFormat = (value, format) => {
@@ -685,6 +685,112 @@ const hexToNumber = (hex = 0xdc) => Number(hex) || parseFloat(hex, 16);
 
 const numberToHex = (number = 0) => number.toString(16);
 
+const generateRandomPasswordSelection = (length) => {
+  const _random = (arr) => {
+    const rand = Math.floor(Math.random() * arr.length);
+    return arr[rand];
+  };
+
+  const uppercase = [
+    'A',
+    'B',
+    'C',
+    'D',
+    'E',
+    'F',
+    'G',
+    'H',
+    'I',
+    'J',
+    'K',
+    'L',
+    'M',
+    'N',
+    'O',
+    'P',
+    'Q',
+    'R',
+    'S',
+    'T',
+    'U',
+    'V',
+    'W',
+    'X',
+    'Y',
+    'Z',
+  ];
+  const lowercase = [
+    'a',
+    'b',
+    'c',
+    'd',
+    'e',
+    'f',
+    'g',
+    'h',
+    'i',
+    'j',
+    'k',
+    'l',
+    'm',
+    'n',
+    'o',
+    'p',
+    'q',
+    'r',
+    's',
+    't',
+    'u',
+    'v',
+    'w',
+    'x',
+    'y',
+    'z',
+  ];
+  const special = [
+    '~',
+    '!',
+    '@',
+    '#',
+    '$',
+    '%',
+    '^',
+    '&',
+    '*',
+    '(',
+    ')',
+    '_',
+    '+',
+    '-',
+    '=',
+    '{',
+    '}',
+    '[',
+    ']',
+    ':',
+    ';',
+    '?',
+    ',',
+    '.',
+    '|',
+    '\\',
+  ];
+  const numbers = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+
+  const nonSpecial = [...uppercase, ...lowercase, ...numbers];
+
+  let password = '';
+
+  for (let i = 0; i < length; i++) {
+    // Previous character is a special character
+    if (i !== 0 && special.includes(password[i - 1])) {
+      password += _random(nonSpecial);
+    } else password += _random([...nonSpecial, ...special]);
+  }
+
+  return password;
+};
+
 // 0x = Hexadecimal
 // 0b = Binary
 // 0o = Octal
@@ -727,10 +833,9 @@ export {
   getSubpaths,
   formatBytes,
   getDirname,
-  isDayValid,
-  isMonthValid,
   isValidDate,
   isValidFormat,
+  strToDateUTC,
   getTimezoneOffset,
   cleanString,
   splitEveryXChar,
@@ -742,4 +847,5 @@ export {
   getCapVariableName,
   hexToNumber,
   numberToHex,
+  generateRandomPasswordSelection,
 };