underpost 2.8.866 → 2.8.871

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

package/src/cli/deploy.js

@@ -247,6 +247,7 @@ spec:
         restoreHosts: false,
         disableUpdateDeployment: false,
         infoTraffic: false,
+        etcHosts: false,
       },
     ) {
       if (options.infoUtil === true)
@@ -326,14 +327,10 @@ Password: <Your Key>
       }
       UnderpostDeploy.API.configMap(env);
       let renderHosts = '';
-      let concatHots = '';
-      const etcHost = (
-        concat,
-      ) => `127.0.0.1  ${concat} localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6`;
+      let etcHosts = [];
       if (options.restoreHosts === true) {
-        renderHosts = etcHost(concatHots);
-        fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
+        const factoryResult = UnderpostDeploy.API.etcHostFactory(etcHosts);
+        renderHosts = factoryResult.renderHosts;
         logger.info(renderHosts);
         return;
       }
@@ -362,7 +359,7 @@ Password: <Your Key>
         for (const host of Object.keys(confServer)) {
           shellExec(`sudo kubectl delete HTTPProxy ${host}`);
           if (env === 'production' && options.cert === true) shellExec(`sudo kubectl delete Certificate ${host}`);
-          if (!options.remove === true && env === 'development') concatHots += ` ${host}`;
+          if (!options.remove === true && env === 'development') etcHosts.push(host);
         }
 
         const manifestsPath =
@@ -377,24 +374,9 @@ Password: <Your Key>
             shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml`);
         }
       }
-      switch (process.platform) {
-        case 'linux':
-          {
-            switch (env) {
-              case 'development':
-                renderHosts = etcHost(concatHots);
-                fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
-
-                break;
-
-              default:
-                break;
-            }
-          }
-          break;
-
-        default:
-          break;
+      if (options.etcHosts === true) {
+        const factoryResult = UnderpostDeploy.API.etcHostFactory(etcHosts);
+        renderHosts = factoryResult.renderHosts;
       }
       if (renderHosts)
         logger.info(
@@ -488,6 +470,15 @@ Password: <Your Key>
       );
       shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml`);
     },
+    etcHostFactory(hosts = []) {
+      const renderHosts = `127.0.0.1         ${hosts.join(
+        ' ',
+      )} localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6`;
+
+      fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
+      return { renderHosts };
+    },
   };
 }
 

package/src/cli/fs.js

@@ -61,6 +61,7 @@ class UnderpostFileStorage {
             await UnderpostFileStorage.API.pull(_path, options);
           } else logger.warn(`Pull path already exists`, _path);
         }
+        shellExec(`cd ${path} && git init && git add . && git commit -m "Base pull state"`);
       } else {
         const files =
           options.git === true

package/src/cli/index.js

@@ -169,6 +169,7 @@ program
   .option('--disable-update-deployment', 'Disables updates to deployments.')
   .option('--info-traffic', 'Retrieves traffic configuration from current resource deployments.')
   .option('--kubeadm', 'Enables the kubeadm context for deployment operations.')
+  .option('--etc-hosts', 'Enables the etc-hosts context for deployment operations.')
   .option('--restore-hosts', 'Restores default `/etc/hosts` entries.')
   .description('Manages application deployments, defaulting to deploying development pods.')
   .action(Underpost.deploy.callback);

package/src/cli/run.js

@@ -72,12 +72,19 @@ class UnderpostRun {
       const baseCommand = options.dev ? 'node bin' : 'underpost';
       shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''} --reset`);
       shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''}`);
+      const mongoHosts = ['mongodb-0.mongodb-service'];
       shellExec(
-        `${baseCommand} cluster${options.dev ? ' --dev' : ''} --mongodb --mongo-db-host ${'127.0.0.1'} --pull-image`,
+        `${baseCommand} cluster${options.dev ? ' --dev' : ''} --mongodb --mongo-db-host ${mongoHosts.join(
+          ',',
+        )} --pull-image`,
       );
       shellExec(`${baseCommand} cluster${options.dev ? ' --dev' : ''} --valkey --pull-image`);
       shellExec(`${baseCommand} deploy --expose mongo`, { async: true });
       shellExec(`${baseCommand} deploy --expose valkey`, { async: true });
+      {
+        const hostListenResult = UnderpostDeploy.API.etcHostFactory(mongoHosts);
+        logger.info(hostListenResult.renderHosts);
+      }
     },
     'ssh-cluster-info': (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const { underpostRoot } = options;
@@ -306,7 +313,7 @@ class UnderpostRun {
 
       UnderpostDeploy.API.switchTraffic(deployId, env, targetTraffic);
 
-      shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${currentTraffic}`);
+      // shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${currentTraffic}`);
     },
     'tf-vae-test': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const { underpostRoot } = options;

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

@@ -346,7 +346,7 @@ const CalendarCore = {
                   status,
                 });
 
-                setQueryPath({ path: options.route, queryPath: '' });
+                setQueryPath({ path: options.route, queryPath: '', replace: true });
                 await CalendarCore.Data[options.idModal].updatePanel();
 
                 return { status };

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

@@ -524,6 +524,12 @@ const CssCoreDark = {
         }
         .btn-input-extension:hover {
         }
+        .section-mp-border {
+          border: 2px solid #313131;
+          border-radius: 5px;
+          padding: 5px;
+          margin: 5px;
+        }
       </style>
       ${scrollBarDarkRender()} ${borderChar(1, 'black', ['.main-body-btn-container'])}
     `,
@@ -848,6 +854,12 @@ const CssCoreLight = {
         }
         .btn-input-extension:hover {
         }
+        .section-mp-border {
+          border: 2px solid #bbb;
+          border-radius: 5px;
+          padding: 5px;
+          margin: 5px;
+        }
       </style>
       ${scrollBarLightRender()} ${borderChar(1, 'white', ['.main-body-btn-container'])}
     `,

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

@@ -4,7 +4,7 @@ import { rgbToHex } from './CommonJs.js';
 import { Css, darkTheme, dynamicCol, renderCssAttr, simpleIconsRender, ThemeEvents, Themes } from './Css.js';
 import { DropDown } from './DropDown.js';
 import { buildBadgeToolTipMenuOption, Modal, renderMenuLabel, renderViewTitle } from './Modal.js';
-import { listenQueryPathInstance, setQueryPath } from './Router.js';
+import { listenQueryPathInstance, setQueryPath, closeModalRouteChangeEvent } from './Router.js';
 import { Translate } from './Translate.js';
 import { getProxyPath, getQueryParams, htmls, s, sa } from './VanillaJs.js';
 import Sortable from 'sortablejs';
@@ -51,7 +51,7 @@ const Docs = {
     };
     Modal.Data[ModalId].onObserverListener[ModalId]();
     Modal.Data[ModalId].onCloseListener[ModalId] = () => {
-      setQueryPath({ path: 'docs', queryPath: '' });
+      closeModalRouteChangeEvent({ closedId: ModalId });
     };
   },
   Data: [

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

@@ -9,35 +9,26 @@ const FullScreen = {
     Responsive.Event['full-screen-settings'] = () => {
       let fullScreenMode = checkFullScreen();
       if ((fullScreenSwitch && !fullScreenMode) || (!fullScreenSwitch && fullScreenMode))
-        if (s('.fullscreen-toggle')) ToggleSwitch.Tokens[`fullscreen-toggle`].click();
+        if (s('.fullscreen')) ToggleSwitch.Tokens[`fullscreen`].click();
     };
-    setTimeout(
-      () => (s(`.toggle-form-container-fullscreen`).onclick = () => ToggleSwitch.Tokens[`fullscreen-toggle`].click()),
-    );
-    return html`<div class="in section-mp toggle-form-container toggle-form-container-fullscreen hover">
-      <div class="fl ">
-        <div class="in fll" style="width: 70%">
-          <div class="in"><i class="fa-solid fa-expand"></i> ${Translate.Render('fullscreen')}</div>
-        </div>
-        <div class="in fll" style="width: 30%">
-          ${await ToggleSwitch.Render({
-            id: 'fullscreen-toggle',
-            containerClass: 'inl',
-            disabledOnClick: true,
-            checked: fullScreenSwitch,
-            on: {
-              unchecked: () => {
-                fullScreenSwitch = false;
-                if (checkFullScreen()) fullScreenOut();
-              },
-              checked: () => {
-                fullScreenSwitch = true;
-                if (!checkFullScreen()) fullScreenIn();
-              },
-            },
-          })}
-        </div>
-      </div>
+    return html`<div class="in section-mp">
+      ${await ToggleSwitch.Render({
+        wrapper: true,
+        wrapperLabel: html`<i class="fa-solid fa-expand"></i> ${Translate.Render('fullscreen')}`,
+        id: 'fullscreen',
+        disabledOnClick: true,
+        checked: fullScreenSwitch,
+        on: {
+          unchecked: () => {
+            fullScreenSwitch = false;
+            if (checkFullScreen()) fullScreenOut();
+          },
+          checked: () => {
+            fullScreenSwitch = true;
+            if (!checkFullScreen()) fullScreenIn();
+          },
+        },
+      })}
     </div>`;
   },
 };

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

@@ -65,6 +65,7 @@ const Input = {
         type="${options?.type ? options.type : 'text'}"
         class="${options.inputClass ? options.inputClass : 'in wfa'} ${id}"
         ${options?.min !== undefined ? `min="${options.min}"` : ''}
+        ${options?.max !== undefined ? `max="${options.max}"` : ''}
         placeholder${options?.placeholder ? `="${options.placeholder}"` : ''}
         ${options?.value !== undefined ? `value="${options.value}"` : ''}
         ${options?.autocomplete ? `autocomplete="${options.autocomplete}"` : ''}