underpost 2.8.874 → 2.8.876

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

@@ -4,7 +4,7 @@ name: CD | Gihub page | PWA Microservices Template
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ['main']
+    branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -18,7 +18,7 @@ permissions:
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
-  group: 'pages'
+  group: "pages"
   cancel-in-progress: false
 
 jobs:
@@ -53,7 +53,8 @@ jobs:
         run: |
           npm install -g underpost
           npm install
-          node bin/deploy update-default-conf ghpkg
+          node bin/deploy update-default-conf dd-github-pages
+          underpost env dd-github-pages production
           env-cmd -f .env.production node bin/deploy build-full-client dd-github-pages underpostnet.github.io /pwa-microservices-template-ghpkg
       # git lfs install
       # git lfs track
@@ -65,7 +66,7 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           # Upload entire repository
-          path: './public/underpostnet.github.io/pwa-microservices-template-ghpkg/'
+          path: "./public/underpostnet.github.io/pwa-microservices-template-ghpkg/"
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4

package/.github/workflows/release.cd.yml

@@ -34,4 +34,5 @@ jobs:
             node bin run --dev pull
             underpost run secret
             underpost run underpost-config
+            node bin run --dev pull
             underpost run ssh-deploy engine-test

package/README.md

@@ -49,6 +49,9 @@
 
 
 
+
+
+
 
 
 
@@ -56,7 +59,7 @@
 <!-- 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.874)](https://socket.dev/npm/package/underpost/overview/2.8.874) [![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.876)](https://socket.dev/npm/package/underpost/overview/2.8.876) [![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 -->
@@ -94,6 +97,9 @@
 
 
 
+
+
+
 
 
 
@@ -142,7 +148,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.874
+## underpost ci/cd cli v2.8.876
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -368,6 +368,9 @@ try {
     }
 
     case 'version-build': {
+      shellCd(`/home/dd/engine`);
+      shellExec(`node bin/deploy clean-core-repo`);
+      shellExec(`node bin pull . ${process.env.GITHUB_USERNAME}/engine`);
       shellExec(`node bin run kill 4001`);
       shellExec(`node bin run kill 4002`);
       shellExec(`node bin run kill 4003`);
@@ -384,8 +387,8 @@ try {
         logger.error('Test template runner result failed');
         break;
       }
-      shellExec(`node bin/deploy clean-core-repo`);
       shellCd(`/home/dd/engine`);
+      shellExec(`node bin/deploy clean-core-repo`);
       const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
       const newVersion = process.argv[3] ?? originPackageJson.version;
       const node = process.argv[4] ?? 'kind-control-plane';
@@ -477,8 +480,8 @@ try {
       shellExec(`git add . && cd ./engine-private && git add .`);
       shellExec(`node bin cmt . ci package-pwa-microservices-template`);
       shellExec(`node bin cmt ./engine-private ci package-pwa-microservices-template`);
-      shellExec(`node bin push . underpostnet/engine`);
-      shellExec(`cd ./engine-private && node ../bin push . underpostnet/engine-private`);
+      shellExec(`node bin push . ${process.env.GITHUB_USERNAME}/engine`);
+      shellExec(`cd ./engine-private && node ../bin push . ${process.env.GITHUB_USERNAME}/engine-private`);
       break;
     }
 
@@ -536,15 +539,16 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
     case 'update-default-conf': {
       const defaultServer = DefaultConf.server['default.net']['/'];
       let confName = process.argv[3];
-      if (confName === 'ghpkg') {
-        confName = undefined;
-        const host = 'underpostnet.github.io';
+      let defaultConf = false;
+      if (confName === 'dd-github-pages') {
+        const host = `${process.env.GITHUB_USERNAME ?? 'underpostnet'}.github.io`;
         const path = '/pwa-microservices-template-ghpkg';
         DefaultConf.server = {
           [host]: { [path]: defaultServer },
         };
         DefaultConf.server[host][path].apiBaseProxyPath = '/';
         DefaultConf.server[host][path].apiBaseHost = 'www.nexodev.org';
+        defaultConf = true;
       } else if (confName === 'template') {
         const host = 'default.net';
         const path = '/';
@@ -554,7 +558,7 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
         };
         // mongodb-0.mongodb-service
         DefaultConf.server[host][path].db.host = 'mongodb://mongodb-service:27017';
-        confName = '';
+        defaultConf = true;
       } else if (confName && fs.existsSync(`./engine-private/conf/${confName}`)) {
         DefaultConf.client = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.client.json`, 'utf8'));
         DefaultConf.server = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
@@ -578,10 +582,22 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       const sepRender = '/**/';
       const confRawPaths = fs.readFileSync('./conf.js', 'utf8').split(sepRender);
       confRawPaths[1] = `${JSON.stringify(DefaultConf)};`;
-      const targetConfPath = `./conf${confName ? `.${confName}` : ''}.js`;
+      const targetConfPath = `./conf${defaultConf ? '' : `.${confName}`}.js`;
       fs.writeFileSync(targetConfPath, confRawPaths.join(sepRender), 'utf8');
       shellExec(`prettier --write ${targetConfPath}`);
 
+      switch (confName) {
+        case 'dd-github-pages':
+          {
+            if (fs.exists(`./engine-private/conf/${confName}`)) fs.removeSync(`./engine-private/conf/${confName}`);
+            shellExec(`node bin new --deploy-id ${confName}`);
+          }
+          break;
+
+        default:
+          break;
+      }
+
       break;
     }
 

package/bin/file.js

@@ -56,10 +56,11 @@ try {
       console.log('copy paths', result);
 
       if (type === 'update-template') {
-        if (!fs.existsSync(toPath)) shellExec(`cd .. && underpost clone underpostnet/pwa-microservices-template`);
+        if (!fs.existsSync(toPath))
+          shellExec(`cd .. && underpost clone ${process.env.GITHUB_USERNAME}/pwa-microservices-template`);
         else {
           shellExec(`cd ${toPath} && git reset && git checkout . && git clean -f -d`);
-          shellExec(`underpost pull ${toPath} underpostnet/pwa-microservices-template`);
+          shellExec(`underpost pull ${toPath} ${process.env.GITHUB_USERNAME}/pwa-microservices-template`);
           shellExec(`sudo rm -rf ${toPath}/engine-private`);
           shellExec(`sudo rm -rf ${toPath}/logs`);
         }

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.874
+## underpost ci/cd cli v2.8.876
 
 ### 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.874
+          image: localhost/rockylinux9-underpost:v2.8.876
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.874
+          image: localhost/rockylinux9-underpost:v2.8.876
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/deployment/dd-test-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.874
+          image: localhost/rockylinux9-underpost:v2.8.876
 #          resources:
 #            requests:
 #              memory: "96294Ki"
@@ -104,7 +104,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.8.874
+          image: localhost/rockylinux9-underpost:v2.8.876
 #          resources:
 #            requests:
 #              memory: "96294Ki"

package/package.json

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

package/src/cli/repository.js

@@ -1,6 +1,6 @@
 import { commitData } from '../client/components/core/CommonJs.js';
 import dotenv from 'dotenv';
-import { pbcopy, shellExec } from '../server/process.js';
+import { pbcopy, shellCd, shellExec } from '../server/process.js';
 import { actionInitLog, loggerFactory } from '../server/logger.js';
 import fs from 'fs-extra';
 import { getNpmRootPath } from '../server/conf.js';
@@ -13,7 +13,7 @@ const logger = loggerFactory(import.meta);
 
 class UnderpostRepository {
   static API = {
-    clone(gitUri = 'underpostnet/pwa-microservices-template', options = { bare: false, g8: false }) {
+    clone(gitUri = `${process.env.GITHUB_USERNAME}/pwa-microservices-template`, options = { bare: false, g8: false }) {
       const gExtension = options.g8 === true ? '.g8' : '.git';
       const repoName = gitUri.split('/').pop();
       if (fs.existsSync(`./${repoName}`)) fs.removeSync(`./${repoName}`);
@@ -26,7 +26,11 @@ class UnderpostRepository {
         },
       );
     },
-    pull(repoPath = './', gitUri = 'underpostnet/pwa-microservices-template', options = { g8: false }) {
+    pull(
+      repoPath = './',
+      gitUri = `${process.env.GITHUB_USERNAME}/pwa-microservices-template`,
+      options = { g8: false },
+    ) {
       const gExtension = options.g8 === true ? '.g8' : '.git';
       shellExec(
         `cd ${repoPath} && git pull https://${
@@ -49,7 +53,7 @@ class UnderpostRepository {
       },
     ) {
       if (commitType === 'reset') {
-        pbcopy(shellExec(`git --no-pager log -1 --pretty=%B`, { stdout: true }));
+        if (options.copy) pbcopy(shellExec(`git --no-pager log -1 --pretty=%B`, { stdout: true }));
         shellExec(`cd ${repoPath} && git reset --soft HEAD~${isNaN(parseInt(subModule)) ? 1 : parseInt(subModule)}`);
         return;
       }
@@ -61,7 +65,11 @@ class UnderpostRepository {
       shellExec(`cd ${repoPath} && git commit ${options?.empty ? `--allow-empty ` : ''}-m "${_message}"`);
     },
 
-    push(repoPath = './', gitUri = 'underpostnet/pwa-microservices-template', options = { f: false, g8: false }) {
+    push(
+      repoPath = './',
+      gitUri = `${process.env.GITHUB_USERNAME}/pwa-microservices-template}`,
+      options = { f: false, g8: false },
+    ) {
       const gExtension = options.g8 === true || options.G8 === true ? '.g8' : '.git';
       shellExec(
         `cd ${repoPath} && git push https://${process.env.GITHUB_TOKEN}@github.com/${gitUri}${gExtension}${
@@ -138,6 +146,25 @@ class UnderpostRepository {
         .concat(diffUntrackOutput.toString().split('\n').filter(Boolean))
         .filter((f) => !deleteFiles.includes(f));
     },
+    privateConfUpdate(deployId) {
+      shellCd(`/home/dd/engine`);
+      const privateRepoName = `engine-${deployId.split('dd-')[1]}-private`;
+      const privateRepoPath = `../${privateRepoName}`;
+      if (fs.existsSync(privateRepoPath)) fs.removeSync(privateRepoPath);
+      shellExec(`cd .. && underpost clone ${process.env.GITHUB_USERNAME}/${privateRepoName}`);
+      shellExec(`cd ${privateRepoPath} && underpost pull . ${process.env.GITHUB_USERNAME}/${privateRepoName}`);
+      const packageJsonDeploy = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/package.json`, 'utf8'));
+      const packageJsonEngine = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
+      if (packageJsonDeploy.version !== packageJsonEngine.version) {
+        logger.warn(
+          `Version mismatch: deploy-version:${packageJsonDeploy.version} !== engine-version:${packageJsonEngine.version},
+Prevent build private config repo.`,
+        );
+        return { validVersion: false };
+      }
+      shellExec(`node bin/build ${deployId} conf`);
+      return { validVersion: true };
+    },
   };
 }
 

package/src/cli/run.js

@@ -7,6 +7,7 @@ import fs from 'fs-extra';
 import { range, setPad, timer } from '../client/components/core/CommonJs.js';
 import UnderpostDeploy from './deploy.js';
 import UnderpostRootEnv from './env.js';
+import UnderpostRepository from './repository.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -26,9 +27,9 @@ class UnderpostRun {
       shellExec(`sudo rm -rf ${dir}`);
       shellCd('/home/dd');
 
-      // pbcopy(`cd /home/dd && sbt new underpostnet/spark-template.g8`);
+      // pbcopy(`cd /home/dd && sbt new ${process.env.GITHUB_USERNAME}/spark-template.g8`);
       // await read({ prompt: 'Command copy to clipboard, press enter to continue.\n' });
-      shellExec(`cd /home/dd && sbt new underpostnet/spark-template.g8 '--name=spark-template'`);
+      shellExec(`cd /home/dd && sbt new ${process.env.GITHUB_USERNAME}/spark-template.g8 '--name=spark-template'`);
 
       shellCd(dir);
 
@@ -106,7 +107,7 @@ class UnderpostRun {
       shellCd('/home/dd/engine');
       shellExec(`git reset`);
       shellExec(`${baseCommand} cmt . --empty ci package-pwa-microservices-template`);
-      shellExec(`${baseCommand} push . underpostnet/engine`);
+      shellExec(`${baseCommand} push . ${process.env.GITHUB_USERNAME}/engine`);
     },
     clean: (path, options = UnderpostRun.DEFAULT_OPTION) => {
       shellCd(path ?? `/home/dd/engine`);
@@ -115,8 +116,8 @@ class UnderpostRun {
     pull: (path, options = UnderpostRun.DEFAULT_OPTION) => {
       shellCd(`/home/dd/engine`);
       shellExec(`node bin/deploy clean-core-repo`);
-      shellExec(`underpost pull . underpostnet/engine`);
-      shellExec(`underpost pull engine-private underpostnet/engine-private`, { silent: true });
+      shellExec(`underpost pull . ${process.env.GITHUB_USERNAME}/engine`);
+      shellExec(`underpost pull ./engine-private ${process.env.GITHUB_USERNAME}/engine-private`);
     },
     'release-deploy': (path, options = UnderpostRun.DEFAULT_OPTION) => {
       actionInitLog();
@@ -131,10 +132,9 @@ class UnderpostRun {
       actionInitLog();
       const baseCommand = options.dev || true ? 'node bin' : 'underpost';
       shellCd('/home/dd/engine');
-      shellExec(`node bin/build dd-${path.split('engine-')[1]} conf`);
       shellExec(`git reset`);
       shellExec(`${baseCommand} cmt . --empty cd ssh-${path}`);
-      shellExec(`${baseCommand} push . underpostnet/engine`);
+      shellExec(`${baseCommand} push . ${process.env.GITHUB_USERNAME}/engine`);
     },
     ide: (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const { underpostRoot } = options;
@@ -303,6 +303,8 @@ class UnderpostRun {
     },
     deploy: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const deployId = path;
+      const { validVersion } = UnderpostRepository.API.privateConfUpdate(deployId);
+      if (!validVersion) throw new Error('Version mismatch');
       const currentTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId);
       const targetTraffic = currentTraffic === 'blue' ? 'green' : 'blue';
       const env = 'production';

package/src/index.js

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

package/src/server/backup.js

@@ -61,10 +61,10 @@ class BackUp {
         }
       shellExec(
         `cd ./engine-private/cron-backups` +
-          ` && underpost pull . underpostnet/cron-backups` +
+          ` && underpost pull . ${process.env.GITHUB_USERNAME}/cron-backups` +
           ` && git add .` +
           ` && underpost cmt . backup cron-job '${new Date().toLocaleDateString()}'` +
-          ` && underpost push . underpostnet/cron-backups`,
+          ` && underpost push . ${process.env.GITHUB_USERNAME}/cron-backups`,
         {
           disableLog: true,
         },

package/src/server/conf.js

@@ -918,7 +918,7 @@ const buildCliDoc = (program, oldVersion, newVersion) => {
       baseOptions +
       `
       
-<a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
+<a target="_top" href="https://github.com/${process.env.GITHUB_USERNAME}/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
       
 `
     ).replaceAll(oldVersion, newVersion),

package/src/server/start.js

@@ -86,9 +86,9 @@ class UnderpostStartUp {
     async build(deployId = 'dd-default', env = 'development') {
       const buildBasePath = `/home/dd`;
       const repoName = `engine-${deployId.split('-')[1]}`;
-      shellExec(`cd ${buildBasePath} && underpost clone underpostnet/${repoName}`);
+      shellExec(`cd ${buildBasePath} && underpost clone ${process.env.GITHUB_USERNAME}/${repoName}`);
       shellExec(`cd ${buildBasePath} && sudo mv ./${repoName} ./engine`);
-      shellExec(`cd ${buildBasePath}/engine && underpost clone underpostnet/${repoName}-private`);
+      shellExec(`cd ${buildBasePath}/engine && underpost clone ${process.env.GITHUB_USERNAME}/${repoName}-private`);
       shellExec(`cd ${buildBasePath}/engine && sudo mv ./${repoName}-private ./engine-private`);
       shellCd(`${buildBasePath}/engine`);
       shellExec(`npm install`);