underpost 2.8.866 → 2.8.867

package/README.md

@@ -29,10 +29,11 @@
 
 
 
+
 <!-- 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.866)](https://socket.dev/npm/package/underpost/overview/2.8.866) [![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.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)
 
 
 <!-- end-badges -->
@@ -50,6 +51,7 @@
 
 
 
+
 </div>
 
 <div align="center">
@@ -94,7 +96,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.866
+## underpost ci/cd cli v2.8.867
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -28,6 +28,7 @@ import { DefaultConf } from '../conf.js';
 import colors from 'colors';
 import { program } from '../src/cli/index.js';
 import { getLocalIPv4Address, ip } from '../src/server/dns.js';
+import { timer } from '../src/client/components/core/CommonJs.js';
 
 colors.enable();
 
@@ -367,6 +368,17 @@ try {
     }
 
     case 'version-build': {
+      shellExec(`node bin run kill 4001`);
+      shellExec(`node bin run kill 4002`);
+      shellExec(`node bin run kill 4003`);
+      shellExec(`npm run update-template`);
+      shellExec(`cd ../pwa-microservices-template && npm run build && timeout 5s npm run dev`, {
+        async: true,
+      });
+      await timer(5500);
+      const templateRunnerResult = fs.readFileSync(`../pwa-microservices-template/logs/start.js/all.log`, 'utf8');
+      logger.info('Test template runner result');
+      console.log(templateRunnerResult);
       shellExec(`node bin/deploy clean-core-repo`);
       shellCd(`/home/dd/engine`);
       const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
@@ -429,10 +441,23 @@ try {
       shellExec(`node bin/deploy update-dependencies`);
       shellExec(`auto-changelog`);
       shellExec(`node bin/build dd`);
-      shellExec(`node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd`);
       shellExec(
         `node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd production`,
       );
+      for (const deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(`,`)) {
+        fs.copySync(
+          `./engine-private/conf/${deployId}/build/development/deployment.yaml`,
+          `./manifests/deployment/${deployId}-development/deployment.yaml`,
+        );
+        fs.copySync(
+          `./engine-private/conf/${deployId}/build/development/proxy.yaml`,
+          `./manifests/deployment/${deployId}-development/proxy.yaml`,
+        );
+      }
+      shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
+      shellExec(`node bin new --deploy-id dd-default`);
+      console.log(fs.existsSync(`./engine-private/conf/dd-default`));
+      shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
       break;
     }
 

package/bin/file.js

@@ -60,6 +60,8 @@ try {
         else {
           shellExec(`cd ${toPath} && git reset && git checkout . && git clean -f -d`);
           shellExec(`underpost pull ${toPath} underpostnet/pwa-microservices-template`);
+          shellExec(`sudo rm -rf ${toPath}/engine-private`);
+          shellExec(`sudo rm -rf ${toPath}/logs`);
         }
       } else {
         fs.removeSync(toPath);
@@ -94,6 +96,7 @@ try {
           './manifests/deployment/dd-template-development',
           'bin/web3.js',
           'bin/cyberia.js',
+          'bin/cyberia0.js',
         ]) {
           if (fs.existsSync(deletePath)) fs.removeSync('../pwa-microservices-template/' + deletePath);
         }

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.866
+## underpost ci/cd cli v2.8.867
 
 ### Usage: `underpost [options] [command]`
   ```

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.866
+          image: localhost/rockylinux9-underpost:v2.8.867
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.866
+          image: localhost/rockylinux9-underpost:v2.8.867
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.866",
+    "version": "2.8.867",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

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

@@ -51,6 +51,7 @@ const Modal = {
       RouterInstance: {},
       disableTools: [],
       observer: false,
+      disableBoxShadow: false,
     },
   ) {
     if (options.heightBottomBar === undefined) options.heightBottomBar = 50;
@@ -89,6 +90,11 @@ const Modal = {
       onHome: {},
       homeModals: options.homeModals ? options.homeModals : [],
       query: options.query ? `${window.location.search}` : undefined,
+      getTop: () => window.innerHeight - (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar),
+      getHeight: () =>
+        window.innerHeight -
+        (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
+        (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar),
     };
 
     if (idModal !== 'main-body' && options.mode !== 'view') {
@@ -117,12 +123,7 @@ const Modal = {
 
           Responsive.Event[`view-${idModal}`] = () => {
             if (!this.Data[idModal]) return delete Responsive.Event[`view-${idModal}`];
-            if (this.Data[idModal].slideMenu)
-              s(`.${idModal}`).style.height = `${
-                window.innerHeight -
-                (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
-                (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
-              }px`;
+            if (this.Data[idModal].slideMenu) s(`.${idModal}`).style.height = `${this.Data[idModal].getHeight()}px`;
           };
           Responsive.Event[`view-${idModal}`]();
 
@@ -207,11 +208,7 @@ const Modal = {
             const { barConfig } = options;
             options.style = {
               position: 'absolute',
-              height: `${
-                window.innerHeight -
-                (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
-                (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
-              }px`,
+              height: `${Modal.Data[idModal].getHeight()}px`,
               width: `${slideMenuWidth}px`,
               // 'overflow-x': 'hidden',
               // overflow: 'visible', // required for tooltip
@@ -239,11 +236,7 @@ const Modal = {
                 if (this.Data[_idModal].slideMenu && this.Data[_idModal].slideMenu.id === idModal)
                   this.Data[_idModal].slideMenu.callBack();
               }
-              s(`.${idModal}`).style.height = `${
-                window.innerHeight -
-                (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
-                (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
-              }px`;
+              s(`.${idModal}`).style.height = `${Modal.Data[idModal].getHeight()}px`;
               if (s(`.main-body-top`)) {
                 if (Modal.mobileModal()) {
                   if (s(`.btn-menu-${idModal}`).classList.contains('hide') && collapseSlideMenuWidth !== slideMenuWidth)
@@ -753,9 +746,12 @@ const Modal = {
                 s(`.main-btn-${results[currentKeyBoardSearchBoxIndex].routerId}`).click();
                 Modal.removeModal(searchBoxHistoryId);
               };
-
+              let boxHistoryDelayRender = 0;
               const searchBoxHistoryOpen = async () => {
-                if (!s(`.${id}`)) {
+                if (boxHistoryDelayRender) return;
+                boxHistoryDelayRender = 1000;
+                setTimeout(() => (boxHistoryDelayRender = 0));
+                if (!s(`.${searchBoxHistoryId}`)) {
                   const { barConfig } = await Themes[Css.currentTheme]();
                   barConfig.buttons.maximize.disabled = true;
                   barConfig.buttons.minimize.disabled = true;
@@ -763,7 +759,7 @@ const Modal = {
                   barConfig.buttons.menu.disabled = true;
                   barConfig.buttons.close.disabled = false;
                   await Modal.Render({
-                    id,
+                    id: searchBoxHistoryId,
                     barConfig,
                     title: html`<div class="search-box-recent-title">
                         ${renderViewTitle({
@@ -964,6 +960,7 @@ const Modal = {
                   heightBottomBar: originHeightBottomBar,
                   barMode: options.barMode,
                   observer: true,
+                  disableBoxShadow: true,
                 });
                 const maxWidthInputSearchBox = 450;
                 const paddingInputSearchBox = 5;
@@ -985,12 +982,7 @@ const Modal = {
                   s(`.top-bar-search-box`).style.top = `${
                     (originHeightTopBar - s(`.top-bar-search-box`).clientHeight) / 2
                   }px`;
-                  if (this.Data[id].slideMenu)
-                    s(`.${id}`).style.height = `${
-                      window.innerHeight -
-                      (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
-                      (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
-                    }px`;
+                  if (this.Data[id].slideMenu) s(`.${id}`).style.height = `${Modal.Data[id].getHeight()}px`;
                 };
                 Responsive.Event[`view-${id}`]();
                 Keyboard.instanceMultiPressKey({
@@ -1119,9 +1111,7 @@ const Modal = {
                     if (!this.Data[id] || !s(`.${id}`)) return delete Responsive.Event[`view-${id}`];
                     //  <div class="in fll right-offset-menu-bottom-bar" style="height: 100%"></div>
                     // s(`.right-offset-menu-bottom-bar`).style.width = `${window.innerWidth - slideMenuWidth}px`;
-                    s(`.${id}`).style.top = `${
-                      window.innerHeight - (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
-                    }px`;
+                    s(`.${id}`).style.top = `${Modal.Data[id].getTop()}px`;
                   };
                   Responsive.Event[`view-${id}`]();
                 }
@@ -1293,11 +1283,7 @@ const Modal = {
                     s(`.main-body-btn-ui-close`).classList.contains('hide') &&
                     s(`.btn-restore-${id}`).style.display !== 'none'
                       ? `${window.innerHeight}px`
-                      : `${
-                          window.innerHeight -
-                          (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
-                          (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
-                        }px`;
+                      : `${Modal.Data[id].getHeight()}px`;
 
                   if (
                     s(`.main-body-btn-ui-close`).classList.contains('hide') &&
@@ -1405,7 +1391,11 @@ const Modal = {
         }
       </style>
       ${renderStyleTag(`style-${idModal}`, `.${idModal}`, options)}
-      <div class="fix ${options && options.class ? options.class : ''} modal box-shadow ${idModal}">
+      <div
+        class="fix ${options && options.class ? options.class : ''} modal ${options.disableBoxShadow
+          ? ''
+          : 'box-shadow'} ${idModal}"
+      >
         <div class="abs modal-handle-${idModal}"></div>
         <div class="in modal-html-${idModal}">
           <div class="stq bar-default-modal bar-default-modal-${idModal}">
@@ -1918,11 +1908,7 @@ const Modal = {
             if (s(`.btn-restore-${idModal}`) && s(`.btn-restore-${idModal}`).style.display !== 'none') {
               s(`.${idModal}`).style.height = s(`.main-body-btn-ui-close`).classList.contains('hide')
                 ? `${window.innerHeight}px`
-                : `${
-                    window.innerHeight -
-                    (options.heightTopBar ? options.heightTopBar : heightDefaultTopBar) -
-                    (options.heightBottomBar ? options.heightBottomBar : heightDefaultBottomBar)
-                  }px`;
+                : `${Modal.Data[idModal].getHeight()}px`;
             }
             s(`.${idModal}`).style.top = s(`.main-body-btn-ui-close`).classList.contains('hide')
               ? `0px`

package/src/index.js

@@ -35,7 +35,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.866';
+  static version = 'v2.8.867';
   /**
    * Repository cli API
    * @static

package/src/server/conf.js

@@ -48,17 +48,17 @@ const Config = {
     if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
     fs.writeFileSync(
       `${folder}/.env.production`,
-      fs.readFileSync('./.env.production', 'utf8').replace('dd-default', deployId),
+      fs.readFileSync('./.env.production', 'utf8').replaceAll('dd-default', deployId),
       'utf8',
     );
     fs.writeFileSync(
       `${folder}/.env.development`,
-      fs.readFileSync('./.env.development', 'utf8').replace('dd-default', deployId),
+      fs.readFileSync('./.env.development', 'utf8').replaceAll('dd-default', deployId),
       'utf8',
     );
     fs.writeFileSync(
       `${folder}/.env.test`,
-      fs.readFileSync('./.env.test', 'utf8').replace('dd-default', deployId),
+      fs.readFileSync('./.env.test', 'utf8').replaceAll('dd-default', deployId),
       'utf8',
     );
     fs.writeFileSync(`${folder}/package.json`, fs.readFileSync('./package.json', 'utf8'), 'utf8');
@@ -562,16 +562,24 @@ const buildPortProxyRouter = (port, proxyRouter) => {
   // build router
   Object.keys(hosts).map((hostKey) => {
     let { host, path, target, proxy, peer } = hosts[hostKey];
-    if (process.argv.includes('localhost') && process.env.NODE_ENV === 'development') host = `localhost`;
+    if (process.env.NODE_ENV === 'development') host = `localhost`;
+
+    if (!proxy.includes(port)) {
+      logger.warn('Proxy port not set on conf', { port, host, path, proxy, target });
+      if (process.env.NODE_ENV === 'production') {
+        logger.warn('Omitting host', { host, path, target });
+        return;
+      }
+    }
 
-    if (!proxy.includes(port)) return;
     const absoluteHost = [80, 443].includes(port)
       ? `${host}${path === '/' ? '' : path}`
       : `${host}:${port}${path === '/' ? '' : path}`;
 
-    if (process.argv.includes('localhost')) {
-      if (!(absoluteHost in router)) router[absoluteHost] = target;
-    } else router[absoluteHost] = target;
+    if (absoluteHost in router)
+      logger.warn('Overwrite: Absolute host already exists on router', { absoluteHost, target });
+
+    router[absoluteHost] = target;
   }); // order router
 
   if (Object.keys(router).length === 0) return router;

package/test/api.test.js

@@ -21,12 +21,13 @@ const BASE_URL =
 
 describe(`GET 'Test' API Request `, async () => {
   {
-    const url = `${BASE_URL}/test/youtube-id/?url=https://www.youtube.com/watch?v=o4f42SbyDMk`;
+    const youtubeId = '2aib-pmgUdQ';
+    const url = `${BASE_URL}/test/youtube-id/?url=https://www.youtube.com/watch?v=${youtubeId}`;
     it(`youtube id from raw youtube url`, async () => {
       logger.info('request info', { url });
       const res = await axios.get(url);
       logger.info('response', res.data);
-      return expect(res.data.data).equal('o4f42SbyDMk');
+      return expect(res.data.data).equal(youtubeId);
     });
   }
   {

package/bin/cyberia0.js

@@ -1,78 +0,0 @@
-#! /usr/bin/env node
-
-import dotenv from 'dotenv';
-import { Command } from 'commander';
-import fs from 'fs-extra';
-import { pbcopy, shellExec } from '../src/server/process.js';
-import Jimp from 'jimp';
-import Underpost from '../src/index.js';
-import { loggerFactory } from '../src/server/logger.js';
-import { DataBaseProvider } from '../src/db/DataBaseProvider.js';
-
-dotenv.config();
-
-const logger = loggerFactory(import.meta);
-
-const deployId = process.env.DEFAULT_DEPLOY_ID;
-const host = process.env.DEFAULT_DEPLOY_HOST;
-const path = process.env.DEFAULT_DEPLOY_PATH;
-
-const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
-const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
-const { db } = confServer[host][path];
-
-logger.info('env', {
-  deployId,
-  host,
-  path,
-  db,
-});
-
-await DataBaseProvider.load({
-  apis: ['object-layer'],
-  host,
-  path,
-  db,
-});
-
-const ObjectLayer = DataBaseProvider.instance[`${host}${path}`].mongoose.models.ObjectLayer;
-
-const program = new Command();
-
-program.name('cyberia').description(`content generator cli ${Underpost.version}`).version(Underpost.version);
-
-const pngDirectoryIteratorByObjectLayerType = async (
-  objectLayerType = 'skin',
-  callback = ({ path, objectLayerType, objectLayerId, direction, frame }) => {},
-) => {
-  for (const objectLayerId of await fs.readdir(`./src/client/public/cyberia/assets/${objectLayerType}`)) {
-    for (const direction of await fs.readdir(
-      `./src/client/public/cyberia/assets/${objectLayerType}/${objectLayerId}`,
-    )) {
-      const dirFolder = `./src/client/public/cyberia/assets/${objectLayerType}/${objectLayerId}/${direction}`;
-      if (!fs.statSync(dirFolder).isDirectory()) continue;
-      for (const frame of await fs.readdir(dirFolder)) {
-        const imageFilePath = `./src/client/public/cyberia/assets/${objectLayerType}/${objectLayerId}/${direction}/${frame}`;
-        await callback({ path: imageFilePath, objectLayerType, objectLayerId, direction, frame });
-      }
-    }
-  }
-};
-
-program
-  .command('ol')
-  .option('--import [object-layer-type]', 'Import object layer from type storage png image')
-  .action(async (options = { import: false }) => {
-    if (options.import) {
-      await pngDirectoryIteratorByObjectLayerType(
-        options.import,
-        async ({ path, objectLayerType, objectLayerId, direction, frame }) => {
-          console.log(path, { objectLayerType, objectLayerId, direction, frame });
-        },
-      );
-    }
-    await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
-  })
-  .description('Object layer management');
-
-program.parse();