underpost 2.8.45 → 2.8.452

package/.github/workflows/ghpkg.yml

@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '22.x'
+          node-version: '23.x'
 
       - name: Install dependencies
         run: |
@@ -49,6 +49,11 @@ jobs:
           git add .       
           git commit -m "ci(package-pwa-microservices-template-ghpkg): ⚙️ Update github repo package"
           git push https://${{ secrets.GIT_AUTH_TOKEN }}@github.com/underpostnet/pwa-microservices-template.git
+  # cd ../engine
+  # git commit --allow-empty -m "ci(engine-core-repo-build): ⚙️ Update engine core repository"
+  # git commit --allow-empty -m "ci(engine-cyberia-repo-build): ⚙️ Update engine cyberia repository"
+  # git commit --allow-empty -m "ci(engine-lampp-repo-build): ⚙️ Update engine lampp repository"
+  # git push https://${{ secrets.GIT_AUTH_TOKEN }}@github.com/underpostnet/engine.git
 
   pwa-microservices-template-ghpk:
     if: github.repository == 'underpostnet/pwa-microservices-template' && startsWith(github.event.head_commit.message, 'ci(package-pwa-microservices-template-ghpkg)')
@@ -63,7 +68,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '22.x'
+          node-version: '23.x'
 
         # - name: Get npm root
         #   run: sudo npm root -g
@@ -114,5 +119,11 @@ jobs:
           git commit -m "ci(package-pwa-microservices-template-ghpkg): ⚙️ Update github repo package"
           git push https://${{ secrets.GIT_AUTH_TOKEN }}@github.com/underpostnet/pwa-microservices-template-ghpkg.git
 
+# git clone --bare https://github.com/underpostnet/engine.git
+# mkdir engine
+# mv ./engine.git ./engine/.git
+# cd engine
+# git init
+
 # git push -u origin https://${{ secrets.GIT_AUTH_TOKEN }}@github.com/underpostnet/pwa-microservices-template-ghpkg.git
 # git push -u origin master

package/.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '22.x'
+          node-version: '23.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: '22.x'
+          node-version: '23.x'
           registry-url: 'https://registry.npmjs.org'
           # Defaults to the user or organization that owns the workflow file
           # scope: '@underpostnet'
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '22.x'
+          node-version: '23.x'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Dependencies
@@ -56,7 +56,7 @@ jobs:
       # Publish to npm git hub package
       - uses: actions/setup-node@v4
         with:
-          node-version: '22.x'
+          node-version: '23.x'
           registry-url: 'https://registry.npmjs.org'
           # Defaults to the user or organization that owns the workflow file
           scope: '@underpostnet'
@@ -70,7 +70,7 @@ jobs:
       - name: Setup node to publish to GitHub Packages
         uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 23.x
           registry-url: 'https://npm.pkg.github.com'
           # Defaults to the user or organization that owns the workflow file
           scope: '@underpostnet'

package/.github/workflows/pwa-microservices-template.page.yml

@@ -38,7 +38,7 @@ jobs:
       #   run: git lfs checkout
       - uses: actions/setup-node@v4
         with:
-          node-version: '22.x'
+          node-version: '23.x'
 
       - name: Build the site
         run: |

package/bin/build.js

@@ -292,16 +292,16 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
   if (!fs.existsSync(`${basePath}/images`)) fs.mkdirSync(`${basePath}/images`);
 
   const env = process.argv.includes('development') ? 'development' : 'production';
-
+  const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml', 'secret.yaml'];
   // remove engine-private of .dockerignore for local testing
 
-  {
+  if (process.argv.includes('engine')) {
     fs.removeSync(`${basePath}/manifests/deployment`);
 
     if (!fs.existsSync(`./manifests/deployment/${confName}-${env}`))
       fs.mkdirSync(`./manifests/deployment/${confName}-${env}`);
 
-    for (const file of ['Dockerfile', 'proxy.yaml', 'deployment.yaml', 'secret.yaml']) {
+    for (const file of deploymentsFiles) {
       if (fs.existsSync(`./engine-private/conf/${confName}/build/${env}/${file}`)) {
         fs.copyFileSync(`./engine-private/conf/${confName}/build/${env}/${file}`, `${basePath}/${file}`);
         fs.copyFileSync(
@@ -310,5 +310,11 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
         );
       }
     }
+  } else {
+    for (const file of deploymentsFiles) {
+      if (fs.existsSync(`./manifests/deployment/${confName}-${env}/${file}`)) {
+        fs.copyFileSync(`./manifests/deployment/${confName}-${env}/${file}`, `${basePath}/${file}`);
+      }
+    }
   }
 }

package/bin/deploy.js

@@ -2,7 +2,6 @@ import fs from 'fs-extra';
 import axios from 'axios';
 
 import dotenv from 'dotenv';
-import plantuml from 'plantuml';
 
 import { pbcopy, shellCd, shellExec } from '../src/server/process.js';
 import { loggerFactory } from '../src/server/logger.js';
@@ -591,6 +590,7 @@ try {
     }
     case 'build-uml':
       {
+        const plantuml = await import('plantuml');
         const folder = process.argv[3] ? process.argv[3] : `./src/client/public/default/plantuml`;
         const confData = Config.default;
 

package/bin/file.js

@@ -80,6 +80,7 @@ try {
           '.github/workflows/engine.lampp.ci.yml',
           '.github/workflows/engine.core.ci.yml',
           '.github/workflows/engine.cyberia.ci.yml',
+          './manifests/deployment/dd-lampp-development',
           'bin/web3.js',
           'bin/cyberia.js',
         ]) {

package/bin/index.js

@@ -8,6 +8,7 @@ import { getNpmRootPath, loadConf } from '../src/server/conf.js';
 import fs from 'fs-extra';
 import { commitData } from '../src/client/components/core/CommonJs.js';
 import UnderpostScript from '../src/cli/script.js';
+import { shellExec } from '../src/server/process.js';
 
 const npmRoot = getNpmRootPath();
 const underpostRoot = `${npmRoot}/underpost/.env`;
@@ -28,6 +29,7 @@ program
 program
   .command('clone')
   .argument(`<uri>`, 'e.g. username/repository')
+  .option('--bare', 'Clone only .git files')
   .description('Clone github repository')
   .action(Underpost.repo.clone);
 
@@ -130,6 +132,14 @@ program
   .description('Pull underpost dockerfile images requirements')
   .action(Underpost.image.dockerfile.pullBaseImages);
 
+program
+  .command('install')
+  .description('Fast import npm dependencies')
+  .action(() => {
+    fs.copySync(`${npmRoot}/underpost/node_modules`, './node_modules');
+    shellExec(`npm install --only=dev --ignore-scripts`);
+  });
+
 program
   .command('script')
   .argument('operator', `Options: ${Object.keys(UnderpostScript.API)}`)

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

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.45",
+    "version": "2.8.452",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -16,6 +16,7 @@
         "docs": "jsdoc -c jsdoc.json",
         "install-global": "npm install -g pm2 && npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd && npm install -g yarn && npm install -g auto-changelog",
         "install-test": "npm install -g mocha && npm install -g c8 && npm install -g nyc && npm install -g coveralls",
+        "install-underpost": "cp -a $(npm root -g)/underpost/node_modules ./node_modules && npm install --only=dev --ignore-scripts",
         "install": "npm run install-global && npm run install-test",
         "docker:start": "docker-compose up",
         "prettier": "prettier --write .",

package/src/cli/repository.js

@@ -11,11 +11,13 @@ const logger = loggerFactory(import.meta);
 
 class UnderpostRepository {
   static API = {
-    clone(gitUri = 'underpostnet/pwa-microservices-template') {
+    clone(gitUri = 'underpostnet/pwa-microservices-template', options = { bare: false }) {
       const repoName = gitUri.split('/').pop();
       if (fs.existsSync(`./${repoName}`)) fs.removeSync(`./${repoName}`);
       return shellExec(
-        `git clone https://${process.env.GITHUB_TOKEN ? `${process.env.GITHUB_TOKEN}@` : ''}github.com/${gitUri}.git`,
+        `git clone ${options?.bare === true ? ` --bare ` : ''}https://${
+          process.env.GITHUB_TOKEN ? `${process.env.GITHUB_TOKEN}@` : ''
+        }github.com/${gitUri}.git`,
         {
           disableLog: true,
         },

package/src/index.js

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

package/src/server/conf.js

@@ -525,9 +525,11 @@ const buildPortProxyRouter = (port, proxyRouter) => {
 
   if (Object.keys(router).length === 0) return router;
 
+  const reOrderRouter = {};
   for (const absoluteHostKey of orderArrayFromAttrInt(Object.keys(router), 'length'))
-    router[absoluteHostKey] = router[absoluteHostKey];
-  return router;
+    reOrderRouter[absoluteHostKey] = router[absoluteHostKey];
+
+  return reOrderRouter;
 };
 
 const cliBar = async (time = 5000) => {