underpost 2.7.2 → 2.7.5

package/.github/workflows/publish.yml

@@ -21,6 +21,33 @@ jobs:
         run: npm install
 
       - run: npm ci
-      - run: npm publish --provenance --access public
+
+      # Publish to npm
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '21.x'
+          registry-url: 'https://registry.npmjs.org'
+          # Defaults to the user or organization that owns the workflow file
+          # scope: '@underpostnet'
+      - env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        name: Publish to npm
+        run: npm publish --provenance --access public
+
+      # Publish to GitHub Packages
+      - name: Setup node to publish to GitHub Packages
+        uses: actions/setup-node@v4
+        with:
+          node-version: 21.x
+          registry-url: 'https://npm.pkg.github.com'
+          # Defaults to the user or organization that owns the workflow file
+          scope: '@underpostnet'
+
+      - run: |
+          node ./bin/deploy rename-package @underpostnet/underpost
+          npm config set //npm.pkg.github.com/:_authToken=${{ secrets.GIT_AUTH_TOKEN }}
+          echo "//npm.pkg.github.com/:_authToken=${{ secrets.GIT_AUTH_TOKEN }}" > ~/.npmrc
+          echo "@underposnet:registry=https://npm.pkg.github.com" >> ~/.npmrc
+          npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/test.yml

@@ -0,0 +1,80 @@
+name: Test
+on:
+  push:
+    branches: ['master']
+  pull_request:
+    branches: ['master']
+jobs:
+  test:
+    name: Node ${{ matrix.node }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node-version: [21.x]
+        os: [ubuntu-latest]
+      #  os: [ubuntu-latest, windows-latest]
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+
+      - name: Set Node.js version
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Get npm root
+        run: sudo npm root -g
+
+      - name: Install underpost cli
+        run: sudo npm install -g underpost
+
+      - name: Run test
+        run: sudo underpost test
+
+      # for travis
+      # - name: Run coveralls
+      #   run: npm run coveralls # nyc npm run test --reporter=text-lcov | coveralls -v
+
+      # - name: Test token
+      #   run: echo "${{ secrets.COVERALLS_REPO_TOKEN }}"
+
+      # - name: Coveralls
+      #   uses: coverallsapp/github-action@master
+      #   with:
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
+      #     flag-name: ${{matrix.os}}-node-${{ matrix.node }}
+      #     parallel: true
+
+      # - name: Coveralls
+      #   uses: coverallsapp/github-action@master
+      #   with:
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
+      #     path-to-lcov: '/usr/local/lib/node_modules/underpost/coverage/lcov.info'
+      #   env:
+      #     COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+      #     COVERALLS_GIT_BRANCH: "${{ github.ref }}"
+
+      # - name: Coveralls
+      #   run: node ./node_modules/coveralls-next/bin/coveralls.js # cat ./coverage/lcov.info |
+      #   env:
+      #     COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+      #     COVERALLS_SERVICE_NAME: CI-pipeline
+      #     COVERALLS_SERVICE_JOB_ID: ${{github.run_id}}
+      #     COVERALLS_SERVICE_JOB_NUMBER: ${{github.run_number}}
+      #     COVERALLS_FLAG_NAME: ${{matrix.os}}-node-${{ matrix.node }}
+      #     COVERALLS_PARALLEL: true
+      #     NODE_COVERALLS_DEBUG: 1
+  # finish:
+  #   needs: test
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Clone repository
+  #       uses: actions/checkout@v2
+
+  #     - name: Coveralls Finished
+  #       run: |
+  #         curl -kv -d 'payload[build_num]=${{github.run_id}}&payload[status]=done' https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}
+  #       env:
+  #         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+  #         COVERALLS_GIT_BRANCH: '${{ github.ref }}'

package/bin/deploy.js

@@ -30,6 +30,8 @@ import { buildClient } from '../src/server/client-build.js';
 import { range, setPad, timer, uniqueArray } from '../src/client/components/core/CommonJs.js';
 import toJsonSchema from 'to-json-schema';
 import simpleGit from 'simple-git';
+import { MongooseDB } from '../src/db/mongo/MongooseDB.js';
+import { Lampp } from '../src/runtime/lampp/Lampp.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -251,6 +253,19 @@ try {
 
                 shellExec(Cmd.replica(deployId, host, path));
               }
+              if (serverConf[host][path].db) {
+                switch (serverConf[host][path].db.provider) {
+                  case 'mariadb':
+                    {
+                      shellExec(`node bin/db ${host}${path} create ${deployId}`);
+                    }
+
+                    break;
+
+                  default:
+                    break;
+                }
+              }
             }
           }
         }
@@ -475,6 +490,21 @@ try {
     case 'build-macro-replica':
       getDataDeploy({ deployGroupId: process.argv[3], buildSingleReplica: true });
       break;
+
+    case 'rename-package': {
+      const name = process.argv[3];
+      const originPackage = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
+      originPackage.name = name;
+      fs.writeFileSync(`./package.json`, JSON.stringify(originPackage, null, 4), 'utf8');
+
+      const originPackageLockJson = JSON.parse(fs.readFileSync(`./package-lock.json`, 'utf8'));
+      originPackageLockJson.name = name;
+      originPackageLockJson.packages[''].name = name;
+      fs.writeFileSync(`./package-lock.json`, JSON.stringify(originPackageLockJson, null, 4), 'utf8');
+
+      break;
+    }
+
     case 'update-version':
       {
         const newVersion = process.argv[3];
@@ -574,6 +604,16 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
       }
 
       break;
+
+    case 'mongo': {
+      await MongooseDB.server();
+      break;
+    }
+
+    case 'lampp': {
+      await Lampp.install();
+    }
+
     default:
       break;
   }

package/bin/file.js

@@ -10,11 +10,6 @@ const logger = loggerFactory(import.meta);
 
 logger.info('argv', process.argv);
 
-// usage:
-// node bin/file create './wena que-onda.py'
-// node bin/file create js-module './wena que-onda.js'
-// node bin/file copy-src 'c:/dd/excel-api' 'c:/dd/engine/engine-private/deploy/excel-api'
-
 let [exe, dir, type] = process.argv;
 let rawPath = process.argv[3].replaceAll(`'`, '');
 let toPath = process.argv[4].replaceAll(`'`, '');
@@ -77,6 +72,12 @@ try {
         fs.copyFileSync(absolutePath, `${toPath}/${copyPath}`);
       }
 
+      if (type === 'update-template') {
+        fs.copySync(`./.vscode`, `../pwa-microservices-template/.vscode`);
+        fs.copySync(`./.github`, `../pwa-microservices-template/.github`);
+        fs.copySync(`./src/client/public/default`, `../pwa-microservices-template/src/client/public/default`);
+      }
+
       break;
     case 'create':
       const buildPath = `${path}/${name}${ext ? `.${ext}` : ''}`;

package/bin/index.js

@@ -4,9 +4,13 @@ import dotenv from 'dotenv';
 import { shellCd, shellExec } from '../src/server/process.js';
 import fs from 'fs-extra';
 import { Command } from 'commander';
+import { MongooseDB } from '../src/db/mongo/MongooseDB.js';
+import { loggerFactory, underpostASCI } from '../src/server/logger.js';
 
 dotenv.config();
 
+const logger = loggerFactory(import.meta);
+
 const globalBinFolder = `${shellExec(`npm root -g`, {
   stdout: true,
   silent: true,
@@ -15,23 +19,42 @@ const globalBinFolder = `${shellExec(`npm root -g`, {
 
 const program = new Command();
 
-const version = '2.7.2';
+const version = '2.7.5';
 
 program.name('underpost').description(`underpost.net ci/cd cli ${version}`).version(version);
 
 program
   .command('new <app-name>')
   .description('Create a new project')
-  .action((appName) => {
+  .action(async (appName) => {
+    console.log(
+      underpostASCI() +
+        `
+    v${version} https://www.nexodev.org/docs
+    `,
+    );
+    await logger.setUpInfo();
     const destFolder = `${process.cwd()}/${appName}`;
-    console.log('Note: This process may take several minutes to complete');
-    console.log('build app', { destFolder });
+    logger.info('Note: This process may take several minutes to complete');
+    logger.info('build app', { destFolder });
     fs.mkdirSync(destFolder, { recursive: true });
     fs.copySync(globalBinFolder, destFolder);
     fs.writeFileSync(`${destFolder}/.gitignore`, fs.readFileSync(`${globalBinFolder}/.dockerignore`, 'utf8'), 'utf8');
     shellCd(`${destFolder}`);
     shellExec(`git init && git add . && git commit -m "Base template implementation"`);
     shellExec(`npm run install-template`);
+    switch (process.platform) {
+      case 'linux':
+        try {
+          await MongooseDB.server();
+        } catch (error) {
+          logger.error(error, 'failed to start mongodb server');
+        }
+        break;
+
+      default:
+        break;
+    }
     shellExec(`npm run dev`);
   });
 
@@ -39,6 +62,12 @@ program
   .command('test')
   .description('Run tests')
   .action(() => {
+    console.log(
+      underpostASCI() +
+        `
+    v${version} https://www.nexodev.org/docs
+    `,
+    );
     shellCd(`${globalBinFolder}`);
     shellExec(`npm run test`);
   });

package/bin/ssl.js

@@ -14,10 +14,7 @@ const logger = loggerFactory(import.meta);
 
 await logger.setUpInfo();
 
-// usage
-// node bin/ssl windows <deploy-id> www.example.com
-
-const [exe, dir, os, deployId, hosts] = process.argv;
+const [exe, dir, deployId, hosts] = process.argv;
 
 try {
   let cmd;
@@ -44,14 +41,7 @@ try {
       await ncp.copy(cmd);
       await read({ prompt: 'Command copy to clipboard, press enter to continue.\n' });
       // Certificate
-      switch (os) {
-        case 'windows':
-          await buildSSL(host);
-          break;
-
-        default:
-          break;
-      }
+      await buildSSL(host);
       logger.info('Certificate saved', host);
     } else throw new Error(`host not found: ${host}`);
   }

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

package/package.json

@@ -1,138 +1,139 @@
 {
-  "type": "module",
-  "main": "src/index.js",
-  "name": "underpost",
-  "version": "2.7.2",
-  "description": "pwa api rest template",
-  "scripts": {
-    "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
-    "pm2": "env-cmd -f .env.production pm2 start src/server.js --node-args=\"--max-old-space-size=8192\" --name engine && pm2 logs",
-    "ssl": "env-cmd -f .env.production node bin/ssl",
-    "pm2-delete": "pm2 delete engine",
-    "build": "node bin/deploy build-full-client --no-warnings",
-    "dev": "env-cmd -f .env.development node src/client.dev --no-warnings",
-    "dev-api": "env-cmd -f .env.development nodemon --watch src --ignore src/client src/api",
-    "docs": "jsdoc -c jsdoc.json",
-    "backup": "node bin/db default.net/ export",
-    "install-template": "npm install && npm run build",
-    "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-vs-extensions": "node bin/vs import",
-    "preinstall": "npm config set audit false && npm config set loglevel error",
-    "restore-preinstall": "npm config set audit true && npm config set loglevel notice",
-    "install": "npm run install-global && npm run install-test && npm run restore-preinstall --no-audit --no-warnings",
-    "docker:start": "docker-compose up",
-    "prettier": "prettier --write .",
-    "coveralls": "nyc npm run test --reporter=text-lcov | coveralls -v",
-    "test": "env-cmd -f .env.test c8 mocha",
-    "update": "npm update -g && npm update && npm audit fix --force && npm audit fix --force",
-    "underpost-publish": "npm publish --provenance --access public",
-    "underpost-unpublish": "npm unpublish underpost@2.5.x",
-    "login": "npm adduser",
-    "bin": "npm link --force"
-  },
-  "bin": {
-    "underpost": "bin/index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/underpostnet/pwa-microservices-template.git"
-  },
-  "keywords": [
-    "pwa",
-    "template",
-    "microservices",
-    "api",
-    "server",
-    "proxy",
-    "client"
-  ],
-  "author": "https://github.com/underpostnet",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/underpostnet/pwa-microservices-template/issues"
-  },
-  "homepage": "https://github.com/underpostnet/pwa-microservices-template#readme",
-  "dependencies": {
-    "@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",
-    "axios": "^1.5.1",
-    "chai": "^5.1.0",
-    "cli-progress": "^3.12.0",
-    "cli-spinners": "^3.0.0",
-    "color": "^4.2.3",
-    "colors": "^1.4.0",
-    "commander": "^12.1.0",
-    "compression": "^1.7.4",
-    "copy-paste": "^1.5.3",
-    "cors": "^2.8.5",
-    "d3": "^7.9.0",
-    "deepmerge": "^4.3.1",
-    "detect-port": "^1.5.1",
-    "dotenv": "^16.3.1",
-    "easymde": "^2.18.0",
-    "env-cmd": "^10.1.0",
-    "eventemitter3": "^5.0.1",
-    "express": "^4.18.2",
-    "express-fileupload": "^1.4.3",
-    "favicons": "^7.2.0",
-    "font-awesome-assets": "^0.0.9",
-    "fs-extra": "^11.1.1",
-    "fullcalendar": "^6.1.15",
-    "html-minifier-terser": "^7.2.0",
-    "http-proxy-middleware": "^2.0.6",
-    "ignore-walk": "^6.0.4",
-    "is-admin": "^4.0.0",
-    "is-ip": "^5.0.1",
-    "jimp": "^0.22.12",
-    "joystick-controller": "^1.0.15",
-    "json-colorizer": "^2.2.2",
-    "jsonwebtoken": "^9.0.2",
-    "kill-port-process": "^3.2.0",
-    "log-update": "^6.0.0",
-    "mariadb": "^3.2.2",
-    "marked": "^12.0.2",
-    "mongoose": "^8.0.1",
-    "morgan": "^1.10.0",
-    "node-cron": "^3.0.3",
-    "nodemailer": "^6.9.9",
-    "nodemon": "^3.0.1",
-    "pathfinding": "^0.4.18",
-    "peer": "^1.0.2",
-    "peerjs": "^1.5.2",
-    "pixi.js": "7.4.0",
-    "prom-client": "^15.1.2",
-    "public-ip": "^6.0.1",
-    "read": "^2.1.0",
-    "sharp": "^0.32.5",
-    "shelljs": "^0.8.5",
-    "simple-git": "^3.26.0",
-    "simple-icons": "^13.9.0",
-    "sitemap": "^7.1.1",
-    "socket.io": "^4.7.2",
-    "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"
-  },
-  "devDependencies": {
-    "clean-jsdoc-theme": "^4.3.0",
-    "mocha": "^10.4.0",
-    "plantuml": "^0.0.2",
-    "swagger-autogen": "^2.23.7",
-    "to-json-schema": "^0.2.5"
-  },
-  "publishConfig": {
-    "provenance": true,
-    "access": "public"
-  }
-}
+    "type": "module",
+    "main": "src/index.js",
+    "name": "underpost",
+    "version": "2.7.5",
+    "description": "pwa api rest template",
+    "scripts": {
+        "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
+        "pm2": "env-cmd -f .env.production pm2 start src/server.js --node-args=\"--max-old-space-size=8192\" --name engine && pm2 logs",
+        "ssl": "env-cmd -f .env.production node bin/ssl",
+        "pm2-delete": "pm2 delete engine",
+        "build": "node bin/deploy build-full-client --no-warnings",
+        "dev": "env-cmd -f .env.development node src/client.dev --no-warnings",
+        "dev-api": "env-cmd -f .env.development nodemon --watch src --ignore src/client src/api",
+        "docs": "jsdoc -c jsdoc.json",
+        "backup": "node bin/db default.net/ export",
+        "install-template": "npm install && npm run build",
+        "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-vs-extensions": "node bin/vs import",
+        "preinstall": "npm config set audit false && npm config set loglevel error",
+        "restore-preinstall": "npm config set audit true && npm config set loglevel notice",
+        "install": "npm run install-global && npm run install-test && npm run restore-preinstall --no-audit --no-warnings",
+        "docker:start": "docker-compose up",
+        "prettier": "prettier --write .",
+        "coveralls": "nyc npm run test --reporter=text-lcov | coveralls -v",
+        "test": "env-cmd -f .env.test c8 mocha",
+        "update": "npm update -g && npm update && npm audit fix --force && npm audit fix --force",
+        "underpost-publish": "npm publish --provenance --access public",
+        "underpost-unpublish": "npm unpublish underpost@2.5.x",
+        "login": "npm adduser",
+        "bin": "npm link --force"
+    },
+    "bin": {
+        "underpost": "bin/index.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/underpostnet/pwa-microservices-template.git"
+    },
+    "keywords": [
+        "pwa",
+        "template",
+        "microservices",
+        "api",
+        "server",
+        "proxy",
+        "client"
+    ],
+    "author": "https://github.com/underpostnet",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/underpostnet/pwa-microservices-template/issues"
+    },
+    "homepage": "https://github.com/underpostnet/pwa-microservices-template#readme",
+    "dependencies": {
+        "@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",
+        "axios": "^1.5.1",
+        "chai": "^5.1.0",
+        "cli-progress": "^3.12.0",
+        "cli-spinners": "^3.0.0",
+        "color": "^4.2.3",
+        "colors": "^1.4.0",
+        "commander": "^12.1.0",
+        "compression": "^1.7.4",
+        "copy-paste": "^1.5.3",
+        "cors": "^2.8.5",
+        "d3": "^7.9.0",
+        "deepmerge": "^4.3.1",
+        "detect-port": "^1.5.1",
+        "dotenv": "^16.3.1",
+        "easymde": "^2.18.0",
+        "env-cmd": "^10.1.0",
+        "eventemitter3": "^5.0.1",
+        "express": "^4.18.2",
+        "express-fileupload": "^1.4.3",
+        "favicons": "^7.2.0",
+        "font-awesome-assets": "^0.0.9",
+        "fs-extra": "^11.1.1",
+        "fullcalendar": "^6.1.15",
+        "html-minifier-terser": "^7.2.0",
+        "http-proxy-middleware": "^2.0.6",
+        "ignore-walk": "^6.0.4",
+        "is-admin": "^4.0.0",
+        "is-ip": "^5.0.1",
+        "jimp": "^0.22.12",
+        "joystick-controller": "^1.0.15",
+        "json-colorizer": "^2.2.2",
+        "jsonwebtoken": "^9.0.2",
+        "kill-port-process": "^3.2.0",
+        "log-update": "^6.0.0",
+        "mariadb": "^3.2.2",
+        "marked": "^12.0.2",
+        "mongoose": "^8.0.1",
+        "morgan": "^1.10.0",
+        "node-cron": "^3.0.3",
+        "nodemailer": "^6.9.9",
+        "nodemon": "^3.0.1",
+        "pathfinding": "^0.4.18",
+        "peer": "^1.0.2",
+        "peerjs": "^1.5.2",
+        "pixi.js": "7.4.0",
+        "prom-client": "^15.1.2",
+        "public-ip": "^6.0.1",
+        "read": "^2.1.0",
+        "sharp": "^0.32.5",
+        "shelljs": "^0.8.5",
+        "simple-git": "^3.26.0",
+        "simple-icons": "^13.9.0",
+        "sitemap": "^7.1.1",
+        "socket.io": "^4.7.2",
+        "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"
+    },
+    "devDependencies": {
+        "clean-jsdoc-theme": "^4.3.0",
+        "mocha": "^10.4.0",
+        "plantuml": "^0.0.2",
+        "swagger-autogen": "^2.23.7",
+        "to-json-schema": "^0.2.5"
+    },
+    "publishConfig": {
+        "provenance": true,
+        "access": "public",
+        "registry": "https://registry.npmjs.org/"
+    }
+}

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.2`;
+        return `${getProxyPath()}docs/engine/2.7.5`;
       },
     },
     {

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.2</div>
+    <div class="clean-cache-container">v2.7.5</div>
   `;
 };