underpost 2.8.867 → 2.8.872

package/.github/workflows/release.cd.yml

@@ -34,4 +34,6 @@ jobs:
             node bin run --dev pull
             underpost run secret
             underpost run underpost-config
-            underpost run release-deploy
+            underpost run ssh-deploy engine-core
+            underpost run ssh-deploy engine-lampp
+            underpost run ssh-deploy engine-cyberia

package/README.md

@@ -23,6 +23,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -33,7 +45,7 @@
 <!-- badges -->
 
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.867)](https://socket.dev/npm/package/underpost/overview/2.8.867) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.872)](https://socket.dev/npm/package/underpost/overview/2.8.872) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 
 <!-- end-badges -->
@@ -45,6 +57,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -96,7 +120,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.867
+## underpost ci/cd cli v2.8.872
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/build.js

@@ -156,6 +156,7 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
   switch (confName) {
     case 'dd-cyberia':
       fs.copyFileSync(`./bin/cyberia.js`, `${basePath}/bin/cyberia.js`);
+      fs.copyFileSync(`./bin/cyberia.js`, `${basePath}/bin/cyberia0.js`);
       break;
 
     default:

package/bin/deploy.js

@@ -379,6 +379,10 @@ try {
       const templateRunnerResult = fs.readFileSync(`../pwa-microservices-template/logs/start.js/all.log`, 'utf8');
       logger.info('Test template runner result');
       console.log(templateRunnerResult);
+      if (!templateRunnerResult || templateRunnerResult.toLowerCase().match('error')) {
+        logger.error('Test template runner result failed');
+        break;
+      }
       shellExec(`node bin/deploy clean-core-repo`);
       shellCd(`/home/dd/engine`);
       const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));

package/bin/util.js

@@ -1,14 +1,10 @@
 import fs from 'fs-extra';
 import si from 'systeminformation';
 import * as dir from 'path';
-import { svg } from 'font-awesome-assets';
 
 import { loggerFactory } from '../src/server/logger.js';
-import { pbcopy, shellExec } from '../src/server/process.js';
+import { pbcopy } from '../src/server/process.js';
 import { buildKindPorts } from '../src/server/conf.js';
-import { FileFactory } from '../src/api/file/file.service.js';
-import { faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
-import keyword_extractor from 'keyword-extractor';
 
 const logger = loggerFactory(import.meta);
 
@@ -73,57 +69,6 @@ try {
       cleanEmptyFoldersRecursively('./');
       break;
 
-    case 'text-to-image': {
-      const buffer = await getBufferPngText({
-        text: process.argv[3],
-        textColor: process.argv[4],
-        bgColor: process.argv[5],
-        size: process.argv[6],
-        debugFilename: process.argv[7],
-      });
-      fs.writeFileSync(`./text-to-image.png`, buffer);
-      break;
-    }
-    case 'fa-image':
-      const faId = process.argv[3] ? process.argv[3] : 'user';
-      const color = process.argv[4] ? process.argv[4] : '#5f5f5f';
-      const path = process.argv[5] ? process.argv[5] : './';
-
-      {
-        fs.writeFileSync(`./tmp/${faId}.svg`, svg(faId, color), 'utf8');
-        const data = fs.readFileSync(`./tmp/${faId}.svg`);
-        console.log(FileFactory.svg(data, `${faId}.svg`));
-        fs.removeSync(`${path}${faId}.svg`);
-      }
-      {
-        fs.writeFileSync(`${path}${faId}.png`, Buffer.from(faBase64Png(faId, 100, 100, color), 'base64'));
-      }
-
-      break;
-
-    case 'b64-image':
-      fs.writeFileSync('b64-image', `data:image/jpg;base64,${fs.readFileSync(process.argv[3]).toString('base64')}`);
-      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;
-    }
-
     case 'build-ports': {
       pbcopy(buildKindPorts(process.argv[3], process.argv[4]));
     }

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.867
+## underpost ci/cd cli v2.8.872
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -307,6 +307,8 @@ Options:
                                     current resource deployments.
   --kubeadm                         Enables the kubeadm context for deployment
                                     operations.
+  --etc-hosts                       Enables the etc-hosts context for
+                                    deployment operations.
   --restore-hosts                   Restores default `/etc/hosts` entries.
   -h, --help                        display help for command
  

package/conf.js

@@ -63,6 +63,7 @@ const DefaultConf = /**/ {
           'Alert',
           '404',
           '500',
+          'Pagination',
         ],
         default: [
           'MenuDefault',
@@ -110,7 +111,7 @@ const DefaultConf = /**/ {
         { folder: './node_modules/@loadingio/css-spinner/entries', public_folder: '/dist/loadingio' },
         {
           import_name: 'ag-grid-community',
-          import_name_build: '/dist/ag-grid-community/ag-grid-community.auto.complete.esm.min.js',
+          import_name_build: '/dist/ag-grid-community/ag-grid-community.min.js',
           folder: './node_modules/ag-grid-community/dist',
           public_folder: '/dist/ag-grid-community',
           styles: './node_modules/ag-grid-community/styles',
@@ -147,7 +148,7 @@ const DefaultConf = /**/ {
         apis: ['default', 'core', 'user', 'test', 'file'],
         origins: [],
         minifyBuild: false,
-        iconsBuild: true,
+        iconsBuild: false,
         liteBuild: true,
         docsBuild: false,
         offlineBuild: false,

package/manifests/deployment/dd-default-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.867
+          image: localhost/rockylinux9-underpost:v2.8.872
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.867
+          image: localhost/rockylinux9-underpost:v2.8.872
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/deployment/mongo-express/deployment.yaml

@@ -20,16 +20,16 @@ spec:
           ports:
             - containerPort: 8081
           env:
-            - name: ME_CONFIG_MONGODB_ADMINUSERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: mongodb-secret
-                  key: username
-            - name: ME_CONFIG_MONGODB_ADMINPASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: mongodb-secret
-                  key: password
+            # - name: ME_CONFIG_MONGODB_ADMINUSERNAME
+            #   valueFrom:
+            #     secretKeyRef:
+            #       name: mongodb-secret
+            #       key: username
+            # - name: ME_CONFIG_MONGODB_ADMINPASSWORD
+            #   valueFrom:
+            #     secretKeyRef:
+            #       name: mongodb-secret
+            #       key: password
             - name: ME_CONFIG_BASICAUTH_USERNAME
               valueFrom:
                 secretKeyRef:
@@ -42,8 +42,8 @@ spec:
                   key: password
             - name: ME_CONFIG_MONGODB_SERVER
               value: 'mongodb-0.mongodb-service'
-            - name: ME_CONFIG_MONGODB_ENABLE_ADMIN
-              value: 'true'
+            # - name: ME_CONFIG_MONGODB_ENABLE_ADMIN
+            #   value: 'true'
             - name: ME_CONFIG_MONGODB_PORT
               value: '27017'
 ---

package/manifests/maas/nvim.sh

@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+sudo dnf install -y neovim
+
+
+sudo rm -rf ~/.config/nvim
+sudo rm -rf ~/.local/share/nvim
+
+mkdir -p ~/.config/nvim
+mkdir -p ~/.local/share/nvim/site/autoload
+
+# Install vim-plug for Neovim
+curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \
+  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+
+# Create an init.vim with nvim-tree.lua + web-devicons + gruvbox (theme)
+cat > ~/.config/nvim/init.vim <<'EOF'
+" Minimal init.vim to use nvim-tree.lua + gruvbox theme via vim-plug
+
+" --- vim-plug manager
+call plug#begin('~/.local/share/nvim/plugged')
+
+" file explorer (nvim-tree)
+Plug 'nvim-tree/nvim-tree.lua'
+Plug 'nvim-tree/nvim-web-devicons'    " optional: file icons
+
+" colorscheme
+Plug 'morhetz/gruvbox'
+
+" sensible defaults, optional
+Plug 'tpope/vim-sensible'
+
+call plug#end()
+
+" --- UI settings
+syntax on
+filetype plugin indent on
+set number
+set relativenumber
+if has('termguicolors')
+  set termguicolors
+endif
+set background=dark
+
+" gruvbox options (optional)
+let g:gruvbox_contrast_dark = 'soft'
+colorscheme gruvbox
+
+" --- nvim-tree configuration (Lua block)
+lua << 'LUA'
+-- safe require
+local ok, tree = pcall(require, "nvim-tree")
+if not ok then
+  return
+end
+tree.setup{
+  view = {
+    width = 30,
+    side = "left",
+    preserve_window_proportions = true,
+  },
+  renderer = {
+    indent_markers = { enable = true },
+  },
+  actions = {
+    open_file = {
+      quit_on_open = false,
+    }
+  }
+}
+LUA
+
+" --- mappings: Ctrl-n toggles nvim-tree
+nnoremap <C-n> :NvimTreeToggle<CR>
+
+" Open nvim-tree on startup when opening nvim with no file args
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NvimTreeToggle | wincmd p | endif
+EOF
+
+# Fix permissions in case something was left owned by root (happens if you used sudo on these paths before)
+sudo chown -R "$USER":"$USER" ~/.config/nvim ~/.local/share/nvim 2>/dev/null || true
+
+# Install plugins automatically (non-interactive)
+nvim +PlugInstall +qall
+
+echo
+echo "Done. Plugins installed."
+echo "Run 'nvim' and press Ctrl-n to toggle the file tree."
+echo "If colorscheme is not correct, ensure your terminal supports truecolor and TERM is xterm-256color."

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.867",
+    "version": "2.8.872",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -54,15 +54,12 @@
         "@loadingio/css-spinner": "^2.0.2",
         "@neodrag/vanilla": "^2.0.3",
         "adm-zip": "^0.5.10",
-        "ag-grid-community": "31.0.0",
+        "ag-grid-community": "^31.3.4",
         "axios": "^1.5.1",
         "chai": "^5.1.0",
         "clean-jsdoc-theme": "^4.3.0",
-        "cli-progress": "^3.12.0",
-        "cli-spinners": "^3.0.0",
         "clipboardy": "^4.0.0",
         "cloudinary": "^2.5.1",
-        "color": "^4.2.3",
         "colors": "^1.4.0",
         "commander": "^12.1.0",
         "compression": "^1.7.4",
@@ -74,7 +71,6 @@
         "express": "^4.18.2",
         "express-fileupload": "^1.4.3",
         "favicons": "^7.2.0",
-        "font-awesome-assets": "^0.0.9",
         "fs-extra": "^11.1.1",
         "fullcalendar": "^6.1.15",
         "html-minifier-terser": "^7.2.0",
@@ -82,11 +78,8 @@
         "ignore-walk": "^6.0.4",
         "iovalkey": "^0.2.1",
         "jimp": "^0.22.12",
-        "joystick-controller": "^1.0.15",
         "json-colorizer": "^2.2.2",
         "jsonwebtoken": "^9.0.2",
-        "keyword-extractor": "^0.0.28",
-        "log-update": "^6.0.0",
         "mariadb": "^3.2.2",
         "marked": "^12.0.2",
         "mocha": "^10.8.2",
@@ -94,10 +87,8 @@
         "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.2",
         "prom-client": "^15.1.2",
         "public-ip": "^6.0.1",
         "read": "^2.1.0",
@@ -116,7 +107,6 @@
         "vanilla-jsoneditor": "^2.3.2",
         "winston": "^3.11.0"
     },
-    "devDependencies": {},
     "publishConfig": {
         "provenance": true,
         "access": "public",

package/src/api/file/file.service.js

@@ -5,14 +5,18 @@ import crypto from 'crypto';
 const logger = loggerFactory(import.meta);
 
 const FileFactory = {
-  upload: async function (req, File) {
-    const results = [];
-    if (!req.files) throw { message: 'not file found' };
-    if (Array.isArray(req.files.file)) for (const file of req.files.file) results.push(await new File(file).save());
+  filesExtract: (req) => {
+    const files = [];
+    if (Array.isArray(req.files.file)) for (const file of req.files.file) files.push(file);
     else if (Object.keys(req.files).length > 0)
-      for (const keyFile of Object.keys(req.files)) results.push(await new File(req.files[keyFile]).save());
+      for (const keyFile of Object.keys(req.files)) files.push(req.files[keyFile]);
+    return files;
+  },
+  upload: async function (req, File) {
+    const results = FileFactory.filesExtract(req);
     let index = -1;
-    for (const file of results) {
+    for (let file of results) {
+      file = await new File(file).save();
       index++;
       const [result] = await File.find({
         _id: file._id,
@@ -25,7 +29,23 @@ const FileFactory = {
     return Buffer.from(raw, 'utf8').toString('hex');
     // reverse hexValue.toString()
   },
-  svg: (data = new Buffer(), name = '') => {
+  getMymeTypeFromPath: (path) => {
+    switch (path.split('.').pop()) {
+      case 'png':
+        return 'image/png';
+      case 'jpg':
+        return 'image/jpeg';
+      case 'jpeg':
+        return 'image/jpeg';
+      case 'gif':
+        return 'image/gif';
+      case 'svg':
+        return 'image/svg+xml';
+      default:
+        return 'application/octet-stream';
+    }
+  },
+  create: (data = Buffer.from([]), name = '') => {
     return {
       name: name,
       data: data,
@@ -33,7 +53,7 @@ const FileFactory = {
       encoding: '7bit',
       tempFilePath: '',
       truncated: false,
-      mimetype: 'image/svg+xml',
+      mimetype: FileFactory.getMymeTypeFromPath(name),
       md5: crypto.createHash('md5').update(data).digest('hex'),
       cid: undefined,
     };

package/src/api/user/user.router.js

@@ -4,6 +4,7 @@ import { loggerFactory } from '../../server/logger.js';
 import { UserController } from './user.controller.js';
 import express from 'express';
 import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+import { FileFactory } from '../file/file.service.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -11,6 +12,7 @@ const UserRouter = (options) => {
   const router = express.Router();
 
   (async () => {
+    // admin user seed
     try {
       const models = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models;
       if (models.User) {
@@ -35,6 +37,7 @@ const UserRouter = (options) => {
       console.log(error);
     }
 
+    // default user avatar seed
     options.png = {
       buffer: {
         'invalid-token': fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-invalid-token.png`),
@@ -45,6 +48,27 @@ const UserRouter = (options) => {
         res.set('Content-Type', 'image/png');
       },
     };
+
+    try {
+      const models = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models;
+      const name = 'api-user-default-avatar.png';
+      const imageFile = await models.File.findOne({ name });
+      let _id;
+      if (imageFile) {
+        _id = imageFile._id;
+      } else {
+        const file = await new models.File(
+          FileFactory.create(fs.readFileSync(`./src/client/public/default/assets/mailer/${name}`), name),
+        ).save();
+        _id = file._id;
+      }
+      options.getDefaultProfileImageId = async () => {
+        return _id;
+      };
+    } catch (error) {
+      logger.error('Error checking/creating default profile image');
+      console.log(error);
+    }
   })();
 
   router.post(`/mailer/:id`, authMiddleware, async (req, res) => {

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

@@ -9,7 +9,6 @@ import { DataBaseProvider } from '../../db/DataBaseProvider.js';
 import { FileFactory } from '../file/file.service.js';
 import { UserDto } from './user.model.js';
 import { selectDtoFactory, ValkeyAPI } from '../../server/valkey.js';
-import { getDefaultProfileImageId } from '../../server/client-icons.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -129,7 +128,7 @@ const UserService = {
             if (!user.profileImageId)
               await User.findByIdAndUpdate(
                 user._id,
-                { profileImageId: await getDefaultProfileImageId(File) },
+                { profileImageId: await options.getDefaultProfileImageId(File) },
                 {
                   runValidators: true,
                 },
@@ -212,7 +211,7 @@ const UserService = {
         if (validatePassword.status === 'error') throw new Error(validatePassword.message);
         req.body.password = await hashPassword(req.body.password);
         req.body.role = req.body.role === 'guest' ? 'guest' : 'user';
-        req.body.profileImageId = await getDefaultProfileImageId(File);
+        req.body.profileImageId = await options.getDefaultProfileImageId(File);
         const { _id } = await new User(req.body).save();
         if (_id) {
           const user = await User.findOne({ _id }).select(UserDto.select.get());
@@ -313,7 +312,7 @@ const UserService = {
         if (!file && !(await ValkeyAPI.getValkeyObject(options, req.auth.user.email))) {
           await User.findByIdAndUpdate(
             user._id,
-            { profileImageId: await getDefaultProfileImageId(File) },
+            { profileImageId: await options.getDefaultProfileImageId(File) },
             {
               runValidators: true,
             },

package/src/cli/cluster.js

@@ -410,21 +410,10 @@ EOF
         const successInstance = await UnderpostTest.API.statusMonitor('mongodb-0', 'Running', 'pods', 1000, 60 * 10);
 
         if (successInstance) {
-          if (!options.mongoDbHost) options.mongoDbHost = 'mongodb-service';
+          if (!options.mongoDbHost) options.mongoDbHost = 'mongodb-0.mongodb-service';
           const mongoConfig = {
             _id: 'rs0',
-            members: [
-              {
-                _id: 0,
-                host: `${options.mongoDbHost === 'mongodb-service' ? 'mongodb-0.' : ''}${options.mongoDbHost}:27017`,
-                priority: 1,
-              },
-              // {
-              //   _id: 1,
-              //   host: `${options.mongoDbHost === 'mongodb-service' ? 'mongodb-1.' : ''}${options.mongoDbHost}:27017`,
-              //   priority: 1,
-              // },
-            ],
+            members: options.mongoDbHost.split(',').map((host, index) => ({ _id: index, host: `${host}:27017` })),
           };
 
           shellExec(

package/src/cli/cron.js

@@ -64,7 +64,6 @@ class UnderpostCron {
             shellExec(Cmd.cron(deployId, job, name, confCronConfig.jobs[job].expression, options));
           }
         }
-        if (fs.existsSync(`./tmp/await-deploy`)) fs.remove(`./tmp/await-deploy`);
         return;
       }
       for (const _jobId of jobList.split(',')) {

package/src/cli/db.js

@@ -177,25 +177,6 @@ class UnderpostDB {
                         }`,
                       );
                     }
-                    if (false) {
-                      const containerBaseBackupPath = '/backup';
-                      let timeFolder = shellExec(
-                        `sudo kubectl exec -i ${podName} -- sh -c "cd ${containerBaseBackupPath} && ls -a"`,
-                        {
-                          stdout: true,
-                          disableLog: false,
-                          silent: true,
-                        },
-                      ).split(`\n`);
-                      timeFolder = timeFolder[timeFolder.length - 2];
-                      if (timeFolder === '..') {
-                        logger.warn(`Cannot backup available`, { timeFolder });
-                      } else {
-                        shellExec(
-                          `sudo kubectl cp ${nameSpace}/${podName}:${containerBaseBackupPath}/${timeFolder}/${dbName} ${_toNewBsonPath}`,
-                        );
-                      }
-                    }
                   }
                   break;
                 }