underpost 2.8.451 → 2.8.453

package/.github/workflows/ghpkg.yml

@@ -9,47 +9,6 @@ permissions:
   packages: write
   id-token: write
 jobs:
-  pwa-microservices-template:
-    if: github.repository == 'underpostnet/engine' && startsWith(github.event.head_commit.message, 'ci(package-pwa-microservices-template)')
-    name: Update github repo package Jobs
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      packages: write
-      id-token: write
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '22.x'
-
-      - name: Install dependencies
-        run: |
-          npm install
-
-      - name: Set git credentials
-        run: |
-          git config --global credential.helper ""
-          git config credential.helper ""
-          git config --global user.name 'underpostnet'
-          git config --global user.email 'development@underpost.net'
-          git config --global credential.interactive always
-          git config user.name 'underpostnet'
-          git config user.email 'development@underpost.net'
-          git config credential.interactive always
-
-      - name: Clone github package repository
-        run: |
-          cd .. && git clone https://github.com/underpostnet/pwa-microservices-template.git
-          cd engine
-          npm run update-template
-          cd ../pwa-microservices-template
-          git remote set-url origin git@github.com:underpostnet/pwa-microservices-template.git
-          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
-
   pwa-microservices-template-ghpk:
     if: github.repository == 'underpostnet/pwa-microservices-template' && startsWith(github.event.head_commit.message, 'ci(package-pwa-microservices-template-ghpkg)')
     name: Update github repo package Jobs
@@ -63,7 +22,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
@@ -82,13 +41,15 @@ jobs:
 
       - name: Install dependencies and set repo configuration
         run: |
-          npm install
+          npm install -g underpost
+          underpost config set GITHUB_TOKEN ${{ secrets.GIT_AUTH_TOKEN }}
+          underpost install
           node ./bin/deploy rename-package @underpostnet/underpost
           node ./bin/deploy set-repo underpostnet/pwa-microservices-template-ghpkg
 
       - name: Clone github package repository
         run: |
-          git clone --bare https://github.com/underpostnet/pwa-microservices-template-ghpkg.git
+          underpost clone --bare underpostnet/pwa-microservices-template-ghpkg
           rm -rf ./.git
           cp -rf -a ./pwa-microservices-template-ghpkg.git ./.git
           rm -rf ./pwa-microservices-template-ghpkg.git
@@ -111,8 +72,14 @@ jobs:
           git status
           git remote set-url origin git@github.com:underpostnet/pwa-microservices-template-ghpkg.git
           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-ghpkg.git
+          underpost cmt . ci package-pwa-microservices-template-ghpkg 'Update github repo package'
+          underpost push . underpostnet/pwa-microservices-template-ghpkg
+
+# 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/npmpkg.yml

@@ -0,0 +1,67 @@
+name: Update npm repo package
+on:
+  push:
+    branches: ['master']
+  pull_request:
+    branches: ['master']
+permissions:
+  contents: write
+  packages: write
+  id-token: write
+jobs:
+  pwa-microservices-template:
+    if: github.repository == 'underpostnet/engine' && startsWith(github.event.head_commit.message, 'ci(package-pwa-microservices-template)')
+    name: Update npm repo package Jobs
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '23.x'
+
+      - name: Install dependencies
+        run: |
+          npm install -g underpost
+          underpost config set GITHUB_TOKEN ${{ secrets.GIT_AUTH_TOKEN }}
+          underpost install
+
+      - name: Set git credentials
+        run: |
+          git config --global credential.helper ""
+          git config credential.helper ""
+          git config --global user.name 'underpostnet'
+          git config --global user.email 'development@underpost.net'
+          git config --global credential.interactive always
+          git config user.name 'underpostnet'
+          git config user.email 'development@underpost.net'
+          git config credential.interactive always
+
+      - name: Clone github package repository
+        run: |
+          cd .. && underpost clone underpostnet/pwa-microservices-template
+          cd engine
+          npm run update-template
+          cd ../pwa-microservices-template
+          git remote set-url origin git@github.com:underpostnet/pwa-microservices-template.git
+          git add .       
+          underpost cmt . ci package-pwa-microservices-template-ghpkg 'Update npm repo package'
+          underpost push . underpostnet/pwa-microservices-template
+  # 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
+
+# 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,11 +38,12 @@ jobs:
       #   run: git lfs checkout
       - uses: actions/setup-node@v4
         with:
-          node-version: '22.x'
+          node-version: '23.x'
 
       - name: Build the site
         run: |
-          npm install
+          npm install -g underpost
+          underpost install
           node bin/deploy update-default-conf ghpkg
           env-cmd -f .env.production node bin/deploy build-full-client github-pages underpostnet.github.io /pwa-microservices-template-ghpkg
       # git lfs install

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

@@ -2,12 +2,12 @@ name: Test
 on: [push]
 jobs:
   test:
-    if: (github.repository == 'underpostnet/pwa-microservices-template') || (github.repository == 'underpostnet/pwa-microservices-template-ghpkg')
+    # if: (github.repository == 'underpostnet/pwa-microservices-template') || (github.repository == 'underpostnet/pwa-microservices-template-ghpkg')
     name: Node ${{ matrix.node }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [23.x]
         os: [ubuntu-latest]
       #  os: [ubuntu-latest, windows-latest]
 

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,13 @@ program
   .description('Pull underpost dockerfile images requirements')
   .action(Underpost.image.dockerfile.pullBaseImages);
 
+program
+  .command('install')
+  .description('Fast import underpost npm dependencies')
+  .action(() => {
+    fs.copySync(`${npmRoot}/underpost/node_modules`, './node_modules');
+  });
+
 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.451'
+      engine.version: '2.8.453'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.451",
+    "version": "2.8.453",
     "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 .",
@@ -105,12 +106,17 @@
         "uglify-js": "^3.17.4",
         "validator": "^13.11.0",
         "vanilla-jsoneditor": "^2.3.2",
-        "winston": "^3.11.0"
+        "winston": "^3.11.0",
+        "clean-jsdoc-theme": "^4.3.0",
+        "easy-json-schema": "^0.0.2-beta",
+        "mocha": "^10.8.2",
+        "plantuml": "^0.0.2",
+        "swagger-autogen": "^2.23.7"
     },
     "devDependencies": {
         "clean-jsdoc-theme": "^4.3.0",
         "easy-json-schema": "^0.0.2-beta",
-        "mocha": "^10.4.0",
+        "mocha": "^10.8.2",
         "plantuml": "^0.0.2",
         "swagger-autogen": "^2.23.7"
     },

package/src/cli/image.js

@@ -19,7 +19,7 @@ class UnderpostImage {
         const imagesStoragePath = `./images`;
         const tarFile = `${imagesStoragePath}/${imgName.replace(':', '_')}.tar`;
 
-        let secrets = '';
+        let secrets = ' ';
         let secretDockerInput = '';
 
         const envObj = dotenv.parse(fs.readFileSync(`${getNpmRootPath()}/underpost/.env`, 'utf8'));

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,
         },
@@ -92,7 +94,7 @@ class UnderpostRepository {
           if (fs.existsSync(`${destFolder}/node_modules`)) fs.removeSync(`${destFolder}/node_modules`);
           fs.writeFileSync(`${destFolder}/.gitignore`, fs.readFileSync(`${exeRootPath}/.dockerignore`, 'utf8'), 'utf8');
           shellExec(`cd ${destFolder} && git init && git add . && git commit -m "Base template implementation"`);
-          shellExec(`cd ${destFolder} && npm install`);
+          shellExec(`cd ${destFolder} && underpost install`);
           shellExec(`cd ${destFolder} && npm run build`);
           shellExec(`cd ${destFolder} && npm run dev`);
           return resolve();

package/src/index.js

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