underpost 2.7.5 → 2.7.6

package/.env.development

@@ -2,7 +2,5 @@ NODE_ENV=development
 PORT=4000
 JWT_SECRET=test
 EXPIRE=168
-PINATA_API_KEY=
-PINATA_SECRET_API_KEY=
 NODE_OPTIONS=--max-old-space-size=8192
 BASE_API=api

package/.env.production

@@ -2,7 +2,5 @@ NODE_ENV=production
 PORT=3000
 JWT_SECRET=test
 EXPIRE=168
-PINATA_API_KEY=
-PINATA_SECRET_API_KEY=
 NODE_OPTIONS=--max-old-space-size=8192
 BASE_API=api

package/.env.test

@@ -2,7 +2,5 @@ NODE_ENV=test
 PORT=5000
 JWT_SECRET=test
 EXPIRE=168
-PINATA_API_KEY=
-PINATA_SECRET_API_KEY=
 NODE_OPTIONS=--max-old-space-size=8192
 BASE_API=api

package/.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '21.x'
+          node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Dependencies
@@ -25,7 +25,7 @@ jobs:
       # Publish to npm
       - uses: actions/setup-node@v4
         with:
-          node-version: '21.x'
+          node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
           # Defaults to the user or organization that owns the workflow file
           # scope: '@underpostnet'
@@ -38,7 +38,7 @@ jobs:
       - name: Setup node to publish to GitHub Packages
         uses: actions/setup-node@v4
         with:
-          node-version: 21.x
+          node-version: 22.x
           registry-url: 'https://npm.pkg.github.com'
           # Defaults to the user or organization that owns the workflow file
           scope: '@underpostnet'

package/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v2.7.2](https://github.com/underpostnet/engine/compare/v2.7.1...v2.7.2)
+
+> 8 October 2024
+
+- underpost panel advance [`60087d5`](https://github.com/underpostnet/engine/commit/60087d55920ae9ddf7d7a3396606088d028cc996)
+- file explorer content ui ux refactor [`38e87a0`](https://github.com/underpostnet/engine/commit/38e87a0f0bd222e1d8c9d76904d086aa9d2125ea)
+- add macro db restore logic [`9cfd41c`](https://github.com/underpostnet/engine/commit/9cfd41c5d7adcd309976e7d327af800ffcf92dac)
+
+#### [v2.7.1](https://github.com/underpostnet/engine/compare/v2.6.3...v2.7.1)
+
+> 19 September 2024
+
+- update version 2.7.0 [`03c5c35`](https://github.com/underpostnet/engine/commit/03c5c35a71e7ffb35203a668bfa2f8e2f86125e0)
+- update [`d410da6`](https://github.com/underpostnet/engine/commit/d410da62fadbbb841eb9dcfa5922f105d35ad81d)
+- add changelog generator [`28b3256`](https://github.com/underpostnet/engine/commit/28b3256ab9cebaa9caf2b52426e48f0b3105c8b7)
+
 #### [v2.6.3](https://github.com/underpostnet/engine/compare/v2.6.2...v2.6.3)
 
 > 14 September 2024
@@ -12,80 +28,26 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - update refactor docs and coverage [`b455016`](https://github.com/underpostnet/engine/commit/b455016f5f2b2bdc142aacb4dfd66ab890125662)
 - update [`b8f01f2`](https://github.com/underpostnet/engine/commit/b8f01f258999c9ebc1173b0616f0f7b8f7171048)
 
-#### [v2.6.2](https://github.com/underpostnet/engine/compare/v2.5.6...v2.6.2)
+#### [v2.6.2](https://github.com/underpostnet/engine/compare/v2.5.1...v2.6.2)
 
 > 13 September 2024
 
 - update version 2.6.2 [`0895afb`](https://github.com/underpostnet/engine/commit/0895afbde42dd5a573507ccfcb07c328648b4eb0)
-- update [`344d303`](https://github.com/underpostnet/engine/commit/344d303702ebce22dff50d8c0f8d8d870a2860ee)
-
-#### [v2.5.6](https://github.com/underpostnet/engine/compare/v2.5.2...v2.5.6)
-
-> 13 September 2024
-
 - update version 2.5.6 [`ca57b87`](https://github.com/underpostnet/engine/commit/ca57b87c56a544e7b7e53baa5a6e15415e16b99b)
 - update [`eec4943`](https://github.com/underpostnet/engine/commit/eec49433f50b4dfa7b7bbff48891a60f5be25545)
-- update [`5f0a6ac`](https://github.com/underpostnet/engine/commit/5f0a6aca1ae971bc42f654cf3f2bf7ace7fe613d)
-
-#### [v2.5.2](https://github.com/underpostnet/engine/compare/v2.5.1...v2.5.2)
 
-> 12 September 2024
-
-- update dependebot security [`1289b96`](https://github.com/underpostnet/engine/commit/1289b9627dc59bf08e66edbef1bf7bf08e53984c)
-- update [`ec11af8`](https://github.com/underpostnet/engine/commit/ec11af86e884ca3eeaeaa12695edddaa8b46492d)
-- remove toast-ui [`40c207f`](https://github.com/underpostnet/engine/commit/40c207f13f3e6d7ab71fc4cc203ce6ff02101bb5)
-
-#### [v2.5.1](https://github.com/underpostnet/engine/compare/v2.5.0...v2.5.1)
+#### [v2.5.1](https://github.com/underpostnet/engine/compare/v2.0.0...v2.5.1)
 
 > 27 August 2024
 
-- refactor ssr [`4fa5d24`](https://github.com/underpostnet/engine/commit/4fa5d24531f791fa860a4ba38b9784491f084a68)
-- bucket to document [`747cb0b`](https://github.com/underpostnet/engine/commit/747cb0bf5198e4b97df186e642413fa49ed9383f)
-- add user control table managements [`2cfb710`](https://github.com/underpostnet/engine/commit/2cfb7103a591b941897ff3834ad5874565cba6b4)
-
-#### [v2.5.0](https://github.com/underpostnet/engine/compare/v2.0.0...v2.5.0)
-
-> 23 August 2024
-
 - css refactor [`49b1904`](https://github.com/underpostnet/engine/commit/49b1904e83162f9066fbf843ced37d4e87db5581)
 - refactor [`dad4f95`](https://github.com/underpostnet/engine/commit/dad4f9567629b737254702ce8be6b243e68fb01e)
 - add sitemap builder [`53d05a6`](https://github.com/underpostnet/engine/commit/53d05a62d03ea327df3d37181a4b5c272d417289)
 
-### [v2.0.0](https://github.com/underpostnet/engine/compare/v1.0.4...v2.0.0)
+#### v2.0.0
 
 > 30 March 2024
 
 - seed-city assets [`6d9decb`](https://github.com/underpostnet/engine/commit/6d9decbae96b828aa001777f96dd75aab3fc71d1)
 - update [`1069fc5`](https://github.com/underpostnet/engine/commit/1069fc5268aa5ef7c101695393de59edfc14daf8)
 - update [`41ae7d4`](https://github.com/underpostnet/engine/commit/41ae7d4c969cce0608171c820e05ebab42610a7f)
-
-#### [v1.0.4](https://github.com/underpostnet/engine/compare/v1.0.3...v1.0.4)
-
-> 14 January 2023
-
-- update [`8109700`](https://github.com/underpostnet/engine/commit/81097008baa95ac50efb760b228dc4abae63c379)
-- update [`b6bb47f`](https://github.com/underpostnet/engine/commit/b6bb47f95bd56c0062066ecae5f03813cf1ed6f8)
-- update [`15c0ca9`](https://github.com/underpostnet/engine/commit/15c0ca9f9a8203bec53a9677d5a8edcd04a7f1df)
-
-#### [v1.0.3](https://github.com/underpostnet/engine/compare/v1.0.2...v1.0.3)
-
-> 21 December 2022
-
-- update [`69418ba`](https://github.com/underpostnet/engine/commit/69418ba34831983e07aa458d1ea4a742c7b66096)
-- update [`003412f`](https://github.com/underpostnet/engine/commit/003412fadf3efe6b819f037e99855192f13ccd7e)
-
-#### [v1.0.2](https://github.com/underpostnet/engine/compare/v1.0.1...v1.0.2)
-
-> 21 December 2022
-
-- update [`470f07a`](https://github.com/underpostnet/engine/commit/470f07a72398792ac9ecf07bf1ba5170bc427dc5)
-- update [`dacc20a`](https://github.com/underpostnet/engine/commit/dacc20a14971388bcf2a5077286989a77197aadc)
-- update [`d2efee0`](https://github.com/underpostnet/engine/commit/d2efee08f9b31dd9fca31a3b1b15bdaa0e75faea)
-
-#### v1.0.1
-
-> 11 October 2022
-
-- update [`bd40237`](https://github.com/underpostnet/engine/commit/bd402372513151a15a972a7727f7d77d014739f1)
-- update [`39dd3b9`](https://github.com/underpostnet/engine/commit/39dd3b9a5a6b4292b899840dd5cd333cc80410d1)
-- First Commit [`ad7b2a3`](https://github.com/underpostnet/engine/commit/ad7b2a3be0746b34fa19ba896d3faa7f1b4f40dc)

package/Dockerfile

@@ -37,7 +37,7 @@ RUN apt-get install -yq --no-install-recommends \
     gnupg
 
 # install nodejs https://github.com/nodesource/distributions/blob/master/README.md#deb
-RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
     apt-get install -y nodejs \
     build-essential && \
     node --version && \ 

package/README.md

@@ -16,7 +16,7 @@ template
 
 <div align="center">
 
-<a target="_top"  href='https://www.npmjs.com/package/npm/v/10.2.3' ><img alt='npm' src='https://img.shields.io/badge/npm v10.2.3-100000?style=flat&logo=npm&logoColor=white&labelColor=CB3837&color=727273'/></a> <a target="_top"  href='https://nodejs.org/download/release/v21.2.0/' ><img alt='nodedotjs' src='https://img.shields.io/badge/node v21.2.0-100000?style=flat&logo=nodedotjs&logoColor=white&labelColor=5FA04E&color=727273'/></a> <a target="_top"  href='https://pgp.mongodb.com/' ><img alt='mongodb' src='https://img.shields.io/badge/mongodb_server v7.0-100000?style=flat&logo=mongodb&logoColor=white&labelColor=47A248&color=727273'/></a>
+<a target="_top"  href='https://www.npmjs.com/package/npm/v/10.2.3' ><img alt='npm' src='https://img.shields.io/badge/npm v10.2.3-100000?style=flat&logo=npm&logoColor=white&labelColor=CB3837&color=727273'/></a> <a target="_top"  href='https://nodejs.org/download/release/v22.9.0/' ><img alt='nodedotjs' src='https://img.shields.io/badge/node v22.9.0-100000?style=flat&logo=nodedotjs&logoColor=white&labelColor=5FA04E&color=727273'/></a> <a target="_top"  href='https://pgp.mongodb.com/' ><img alt='mongodb' src='https://img.shields.io/badge/mongodb_server v7.0-100000?style=flat&logo=mongodb&logoColor=white&labelColor=47A248&color=727273'/></a>
 
 </div>
 

package/bin/deploy.js

@@ -25,6 +25,7 @@ import {
   buildReplicaId,
   Cmd,
   restoreMacroDb,
+  fixDependencies,
 } from '../src/server/conf.js';
 import { buildClient } from '../src/server/client-build.js';
 import { range, setPad, timer, uniqueArray } from '../src/client/components/core/CommonJs.js';
@@ -568,6 +569,9 @@ try {
           fs.readFileSync(`./bin/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
           'utf8',
         );
+
+        // only engine
+        // shellExec(`node bin/deploy update-package`);
       }
       break;
 
@@ -612,6 +616,47 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
 
     case 'lampp': {
       await Lampp.install();
+      break;
+    }
+
+    case 'heb': {
+      // https://besu.hyperledger.org/
+      // https://github.com/hyperledger/besu/archive/refs/tags/24.9.1.tar.gz
+
+      switch (process.platform) {
+        case 'linux':
+          {
+            shellCd(`..`);
+
+            // Download the Linux binary
+            shellExec(`wget https://github.com/hyperledger/besu/releases/download/24.9.1/besu-24.9.1.tar.gz`);
+
+            // Unzip the file:
+            shellExec(`tar -xvzf besu-24.9.1.tar.gz`);
+
+            shellCd(`besu-24.9.1`);
+
+            shellExec(`bin/besu --help`);
+
+            // Set env path
+            // export PATH=$PATH:/dd/besu-24.9.1/bin
+
+            // Open src
+            // shellExec(`sudo code /dd/besu-24.9.1 --user-data-dir="/root/.vscode-root" --no-sandbox`);
+          }
+
+          break;
+
+        default:
+          break;
+      }
+
+      break;
+    }
+
+    case 'fix-deps': {
+      await fixDependencies();
+      break;
     }
 
     default:

package/bin/index.js

@@ -19,7 +19,7 @@ const globalBinFolder = `${shellExec(`npm root -g`, {
 
 const program = new Command();
 
-const version = '2.7.5';
+const version = '2.7.6';
 
 program.name('underpost').description(`underpost.net ci/cd cli ${version}`).version(version);
 

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.5'
+      engine.version: '2.7.6'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.7.5",
+    "version": "2.7.6",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -39,10 +39,7 @@
         "url": "git+https://github.com/underpostnet/pwa-microservices-template.git"
     },
     "keywords": [
-        "pwa",
-        "template",
-        "microservices",
-        "api",
+        "engine",
         "server",
         "proxy",
         "client"
@@ -57,7 +54,6 @@
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@loadingio/css-spinner": "^2.0.2",
         "@neodrag/vanilla": "^2.0.3",
-        "@pinata/sdk": "^2.1.0",
         "@xenova/transformers": "^2.17.2",
         "adm-zip": "^0.5.10",
         "ag-grid-community": "31.0.0",
@@ -114,12 +110,11 @@
         "simple-git": "^3.26.0",
         "simple-icons": "^13.9.0",
         "sitemap": "^7.1.1",
-        "socket.io": "^4.7.2",
+        "socket.io": "^4.8.0",
         "sortablejs": "^1.15.0",
         "split-file": "^2.3.0",
         "swagger-ui-express": "^5.0.0",
         "systeminformation": "^5.21.17",
-        "text-to-image": "^5.2.0",
         "uglify-js": "^3.17.4",
         "validator": "^13.11.0",
         "winston": "^3.11.0"

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

@@ -21,6 +21,10 @@ const FileFactory = {
     }
     return results;
   },
+  hex: (raw = '') => {
+    return Buffer.from(raw, 'utf8').toString('hex');
+    // reverse hexValue.toString()
+  },
   svg: (data = new Buffer(), name = '') => {
     return {
       name: name,

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

@@ -681,6 +681,12 @@ function rgbToHex(rgb) {
 
 const getCapVariableName = (value = 'default') => cap(value.replaceAll('-', ' ')).replaceAll(' ', '');
 
+const hexToNumber = (hex = 0xdc) => Number(hex) || parseFloat(hex, 16);
+
+// 0x = Hexadecimal
+// 0b = Binary
+// 0o = Octal
+
 export {
   s4,
   range,
@@ -732,4 +738,5 @@ export {
   componentFromStr,
   rgbToHex,
   getCapVariableName,
+  hexToNumber,
 };

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

@@ -63,7 +63,7 @@ const Docs = {
       icon: html`<i class="fa-brands fa-osi"></i>`,
       text: 'Source Docs',
       url: function () {
-        return `${getProxyPath()}docs/engine/2.7.5`;
+        return `${getProxyPath()}docs/engine/2.7.6`;
       },
     },
     {
@@ -82,9 +82,10 @@ const Docs = {
         return `${getProxyPath()}docs/coverage`;
       },
       themeEvent: () => {
-        s(`.doc-icon-coverage`).src = `https://cdn.simpleicons.org/coveralls/${rgbToHex(
-          window.getComputedStyle(s('html')).color,
-        )}`;
+        if (s(`.doc-icon-coverage`))
+          s(`.doc-icon-coverage`).src = `https://cdn.simpleicons.org/coveralls/${rgbToHex(
+            window.getComputedStyle(s('html')).color,
+          )}`;
       },
     },
     {
@@ -95,9 +96,10 @@ const Docs = {
         return `https://coveralls.io/github/underpostnet/engine`;
       },
       themeEvent: () => {
-        s(`.doc-icon-coverage-link`).src = `https://cdn.simpleicons.org/coveralls/${rgbToHex(
-          window.getComputedStyle(s('html')).color,
-        )}`;
+        if (s(`.doc-icon-coverage-link`))
+          s(`.doc-icon-coverage-link`).src = `https://cdn.simpleicons.org/coveralls/${rgbToHex(
+            window.getComputedStyle(s('html')).color,
+          )}`;
       },
     },
   ].concat(

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

@@ -170,7 +170,7 @@ const LoadingAnimation = {
             `.ssr-loading-info`,
             html`<span style="color: white">Download </span> <br />
               <br />
-              ...${nameSrcLoad.slice(-30)}`,
+              ...${nameSrcLoad.slice(-30).replaceAll('file', 'storage')}`,
           );
       }
     }

package/src/client/ssr/body-components/CacheControl.js

@@ -109,6 +109,6 @@ SrrComponent = ({ ttiLoadTimeLimit }) => {
       const CacheControl = ${CacheControl};
       CacheControl({ ttiLoadTimeLimit: ${ttiLoadTimeLimit ? ttiLoadTimeLimit : 1000 * 70 * 1} });
     </script>
-    <div class="clean-cache-container">v2.7.5</div>
+    <div class="clean-cache-container">v2.7.6</div>
   `;
 };

package/src/index.js

@@ -27,6 +27,7 @@ class Underpost {
    * @static
    * @method setUpInfo
    * @returns {Promise<void>}
+   * @memberof Underpost
    */
   static async setUpInfo() {
     return await setUpInfo(logger);

package/src/server/client-icons.js

@@ -1,5 +1,6 @@
 import { favicons } from 'favicons';
-import textToImage from 'text-to-image';
+// TODO: search alternatives
+// import textToImage from 'text-to-image';
 import { loggerFactory } from './logger.js';
 import fs from 'fs-extra';
 import { png3x } from 'font-awesome-assets';
@@ -52,7 +53,7 @@ const defaultBaseTextImgOptionsSizes = {
 
 const buildTextImg = async (text = 'APP', options, size = '1200x1200') => {
   options = { ...defaultBaseTextImgOptions, ...defaultBaseTextImgOptionsSizes[size], ...options };
-  await textToImage.generate(text, options);
+  // await textToImage.generate(text, options);
 };
 
 const getBufferPngText = async ({ text, textColor, bgColor, size, debugFilename }) => {
@@ -62,6 +63,7 @@ const getBufferPngText = async ({ text, textColor, bgColor, size, debugFilename
   if (!size) size = '100x300';
   if (!debugFilename) debugFilename = `./${s4()}${s4()}${s4()}.png`;
   await buildTextImg(text, { textColor, bgColor, size, debugFilename }, size);
+  if (!fs.existsSync(debugFilename)) return Buffer.alloc(0); // Return empty buffer if file not found
   const bufferImage = fs.readFileSync(debugFilename);
   fs.removeSync(debugFilename);
   return bufferImage;

package/src/server/conf.js

@@ -12,6 +12,16 @@ import { DefaultConf } from '../../conf.js';
 import ncp from 'copy-paste';
 import read from 'read';
 import splitFile from 'split-file';
+import axios from 'axios';
+import https from 'https';
+
+// axios.defaults.baseURL = BASE_URL;
+
+const httpsAgent = new https.Agent({
+  rejectUnauthorized: false,
+});
+
+axios.defaults.httpsAgent = httpsAgent;
 
 colors.enable();
 dotenv.config();
@@ -585,6 +595,7 @@ const validateTemplatePath = (absolutePath = '') => {
   ) {
     return false;
   }
+  if (absolutePath.match('hardhat/')) return false;
   if (
     absolutePath.match('/client') &&
     absolutePath.match('.index.js') &&
@@ -829,6 +840,23 @@ const Cmd = {
   syncPorts: (deployGroupId) => `node bin/deploy sync-env-port ${deployGroupId}`,
 };
 
+const fixDependencies = async () => {
+  // sed -i "$line_number s,.*,$new_text," "$file"
+  // sed -i "$line_number c \\$new_text" "$file"
+  const dep = fs.readFileSync(`./node_modules/peer/dist/module.mjs`, 'utf8');
+  const errorLine = `import {WebSocketServer as $hSjDC$WebSocketServer} from "ws";`;
+
+  fs.writeFileSync(
+    `./node_modules/peer/dist/module.mjs`,
+    dep.replaceAll(
+      errorLine,
+      `import WebSocketServer from "ws";
+    let $hSjDC$WebSocketServer = WebSocketServer.Server;`,
+    ),
+    'utf8',
+  );
+};
+
 export {
   Cmd,
   Config,
@@ -857,4 +885,5 @@ export {
   getCronBackUpFolder,
   getRestoreCronCmd,
   mergeBackUp,
+  fixDependencies,
 };

package/startup.js

@@ -8,4 +8,4 @@ shellExec(`sudo /opt/lampp/lampp start`, { async: true });
 
 shellExec(`/usr/bin/mongod -f /etc/mongod.conf`, { async: true });
 
-shellExec(`underpost new app`);
+shellExec(`underpost new app server`);

package/setup.sh

@@ -1,25 +0,0 @@
-sudo apt update
-sudo apt upgrade
-
-# Install the MongoDB 4.4 GPG key:
-wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -
-
-# Add the source location for the MongoDB packages:
-# echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list
-echo "deb [ arch=arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.2.list
-
-# Download the package details for the MongoDB packages:
-sudo apt-get update
-
-# Install MongoDB:
-sudo apt-get install -y mongodb-org
-# sudo apt-get install mongodb
-
-# Ensure mongod config is picked up:
-sudo systemctl daemon-reload
-
-# Tell systemd to run mongod on reboot:
-sudo systemctl enable mongod
-
-# Start up mongod!
-sudo systemctl start mongod