underpost 2.7.94 → 2.8.1

package/.vscode/settings.json

@@ -12,6 +12,7 @@
   "cSpell.words": [
     "ANAME",
     "browserconfig",
+    "Bymyelectrics",
     "certbot",
     "certonly",
     "changefreq",
@@ -43,6 +44,7 @@
     "lampp",
     "loadingio",
     "Longname",
+    "metanarrative",
     "Microdata",
     "minami",
     "MMORPG",
@@ -60,6 +62,8 @@
     "Tokenomics",
     "underpost",
     "Unequip",
+    "uuidv",
+    "Valkey",
     "webroot",
     "xampp",
     "xfwd",
@@ -74,7 +78,7 @@
   "[xml]": {
     "editor.defaultFormatter": "redhat.vscode-xml"
   },
-  "docwriter.style": "JSDoc",
+  "docwriter.style": "Auto-detect",
   "docwriter.progress.trackFunctions": false,
   "docwriter.progress.trackMethods": false,
   "files.exclude": {

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';
@@ -729,22 +752,8 @@ try {
           );
 
         fs.writeFileSync(
-          `./src/client/components/core/Docs.js`,
-          fs
-            .readFileSync(`./src/client/components/core/Docs.js`, 'utf8')
-            .replaceAll(`/engine/${version}`, `/engine/${newVersion}`),
-          'utf8',
-        );
-
-        fs.writeFileSync(
-          `./src/client/ssr/body/CacheControl.js`,
-          fs.readFileSync(`./src/client/ssr/body/CacheControl.js`, 'utf8').replaceAll(`v${version}`, `v${newVersion}`),
-          'utf8',
-        );
-
-        fs.writeFileSync(
-          `./bin/index.js`,
-          fs.readFileSync(`./bin/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
+          `./src/index.js`,
+          fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
           'utf8',
         );
 
@@ -998,6 +1007,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

@@ -6,6 +6,7 @@ import fs from 'fs-extra';
 import { Command } from 'commander';
 import { MongooseDB } from '../src/db/mongo/MongooseDB.js';
 import { loggerFactory, underpostASCI } from '../src/server/logger.js';
+import Underpost from '../src/index.js';
 
 dotenv.config();
 
@@ -19,9 +20,7 @@ const globalBinFolder = `${shellExec(`npm root -g`, {
 
 const program = new Command();
 
-const version = '2.7.94';
-
-program.name('underpost').description(`underpost.net ci/cd cli ${version}`).version(version);
+program.name('underpost').description(`underpost.net ci/cd cli ${Underpost.version}`).version(Underpost.version);
 
 program
   .command('new <app-name>')
@@ -30,7 +29,7 @@ program
     console.log(
       underpostASCI() +
         `
-    v${version} https://www.nexodev.org/docs
+    ${Underpost.version} https://www.nexodev.org/docs
     `,
     );
     await logger.setUpInfo();
@@ -65,7 +64,7 @@ program
     console.log(
       underpostASCI() +
         `
-    v${version} https://www.nexodev.org/docs
+    ${Underpost.version} https://www.nexodev.org/docs
     `,
     );
     shellCd(`${globalBinFolder}`);

package/bin/util.js

@@ -13,6 +13,7 @@ import { network } from '../src/server/network.js';
 import { Config } from '../src/server/conf.js';
 import { FileFactory } from '../src/api/file/file.service.js';
 import { buildTextImg, faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
+import keyword_extractor from 'keyword-extractor';
 
 const httpsAgent = new https.Agent({
   rejectUnauthorized: false,
@@ -203,7 +204,24 @@ try {
       shellExec(`git checkout jsdoc.json`);
       break;
     }
+    case 'get-keys': {
+      const sentence = fs.existsSync('./_')
+        ? fs.readFileSync('./_', 'utf8')
+        : process.argv[3]
+        ? process.argv[3]
+        : 'President Obama woke up Monday facing a Congressional defeat that many in both parties believed could hobble his presidency.';
+
+      //  Extract the keywords
+      const extraction_result = keyword_extractor.extract(sentence, {
+        language: 'english',
+        remove_digits: true,
+        // return_changed_case: true,
+        // remove_duplicates: false,
+      });
 
+      console.log(extraction_result.join(', '));
+      break;
+    }
     default:
       break;
   }

package/conf.js

@@ -3,7 +3,7 @@ const DefaultConf = {
     default: {
       metadata: {
         title: 'Demo App',
-        backgroundImage: './src/client/public/default/assets/background/white0-min.jpg',
+        backgroundImage: 'assets/background/white0-min.jpg',
         description: 'Web application',
         keywords: ['web', 'app', 'spa', 'demo', 'github-pages'],
         author: 'https://github.com/underpostnet',
@@ -193,6 +193,13 @@ const DefaultConf = {
           head: [],
           body: [],
         },
+        {
+          path: '/maintenance',
+          title: 'Server Maintenance',
+          client: 'Maintenance',
+          head: [],
+          body: [],
+        },
       ],
       pages: [
         {

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.1'
     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.1",
   "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",
@@ -55,7 +55,6 @@
     "@fortawesome/fontawesome-free": "^6.4.2",
     "@loadingio/css-spinner": "^2.0.2",
     "@neodrag/vanilla": "^2.0.3",
-    "@xenova/transformers": "^2.17.2",
     "adm-zip": "^0.5.10",
     "ag-grid-community": "31.0.0",
     "axios": "^1.5.1",
@@ -84,24 +83,26 @@
     "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",
@@ -114,17 +115,19 @@
     "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",
+    "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",
     "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

@@ -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: {