underpost 2.8.861 → 2.8.867

package/.env.development

@@ -1,7 +1,12 @@
 DEPLOY_ID=dd-default
+DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=development
 PORT=4000
 JWT_SECRET=test
 EXPIRE=168
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+BASE_API=api
+DEFAULT_DEPLOY_HOST=default.net
+DEFAULT_DEPLOY_PATH=/
+DEFAULT_ADMIN_EMAIL=admin@default.net
+DEFAULT_ADMIN_PASSWORD=changethis

package/.env.production

@@ -1,7 +1,12 @@
 DEPLOY_ID=dd-default
+DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=production
 PORT=3000
 JWT_SECRET=test
 EXPIRE=168
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+BASE_API=api
+DEFAULT_DEPLOY_HOST=default.net
+DEFAULT_DEPLOY_PATH=/
+DEFAULT_ADMIN_EMAIL=admin@default.net
+DEFAULT_ADMIN_PASSWORD=changethis

package/.env.test

@@ -1,7 +1,12 @@
 DEPLOY_ID=dd-default
+DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=test
 PORT=5000
 JWT_SECRET=test
 EXPIRE=168
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+BASE_API=api
+DEFAULT_DEPLOY_HOST=default.net
+DEFAULT_DEPLOY_PATH=/
+DEFAULT_ADMIN_EMAIL=admin@default.net
+DEFAULT_ADMIN_PASSWORD=changethis

package/README.md

@@ -27,10 +27,13 @@
 
 
 
+
+
+
 <!-- 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.861)](https://socket.dev/npm/package/underpost/overview/2.8.861) [![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.867)](https://socket.dev/npm/package/underpost/overview/2.8.867) [![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 -->
@@ -46,6 +49,9 @@
 
 
 
+
+
+
 </div>
 
 <div align="center">
@@ -90,44 +96,44 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.861
+## underpost ci/cd cli v2.8.867
 
 ### Usage: `underpost [options] [command]`
-
-```
-Options:
--V, --version                                              output the version number
--h, --help                                                 display help for command
+  ```
+ Options:
+  -V, --version                                              output the version number
+  -h, --help                                                 display help for command
 
 Commands:
-new [options] <app-name>                                   Initializes a new Underpost project with a predefined structure.
-start [options] <deploy-id> [env]                          Initiates application servers, build pipelines, or other defined services based on the deployment ID.
-clone [options] <uri>                                      Clones a specified GitHub repository into the current directory.
-pull [options] <path> <uri>                                Pulls the latest changes from a specified GitHub repository.
-cmt [options] <path> <commit-type> [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
-push [options] <path> <uri>                                Pushes committed changes from a local repository to a remote GitHub repository.
-env <deploy-id> [env]                                      Sets environment variables and configurations related to a specific deployment ID.
-config [options] <operator> [key] [value]                  Manages Underpost configurations using various operators.
-root                                                       Displays the root path of the npm installation.
-cluster [options] [pod-name]                               Manages Kubernetes clusters, defaulting to Kind cluster initialization.
-deploy [options] [deploy-list] [env]                       Manages application deployments, defaulting to deploying development pods.
-secret [options] <platform>                                Manages secrets for various platforms.
-dockerfile-image-build [options]                           Builds a Docker image from a specified Dockerfile with various options for naming, saving, and loading.
-dockerfile-pull-base-images [options]                      Pulls required Underpost Dockerfile base images and optionally loads them into clusters.
-install                                                    Quickly imports Underpost npm dependencies by copying them.
-db [options] <deploy-list>                                 Manages database operations, including import, export, and collection management.
-metadata [options] [deploy-id] [host] [path]               Manages cluster metadata operations, including import and export.
-script [options] <operator> <script-name> [script-value]   Supports a variety of built-in Underpost global scripts, their preset lifecycle events, and arbitrary custom scripts.
-cron [options] [deploy-list] [job-list]                    Manages cron jobs, including initialization, execution, and configuration updates.
-fs [options] [path]                                        Manages file storage, defaulting to file upload operations.
-test [options] [deploy-list]                               Manages and runs tests, defaulting to the current Underpost default test suite.
-monitor [options] <deploy-id> [env]                        Manages health server monitoring for specified deployments.
-ssh [options]                                              Import and start ssh server and client based on current default deployment ID.
-run [options] <runner-id> [path]                           Runs a script from the specified path.
-lxd [options]                                              Manages LXD containers and virtual machines.
-baremetal [options] [workflow-id] [hostname] [ip-address]  Manages baremetal server operations, including installation, database setup, commissioning, and user management.
-help [command]                                             display help for command
-
+  new [options] <app-name>                                   Initializes a new Underpost project with a predefined structure.
+  start [options] <deploy-id> [env]                          Initiates application servers, build pipelines, or other defined services based on the deployment ID.
+  clone [options] <uri>                                      Clones a specified GitHub repository into the current directory.
+  pull [options] <path> <uri>                                Pulls the latest changes from a specified GitHub repository.
+  cmt [options] <path> <commit-type> [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
+  push [options] <path> <uri>                                Pushes committed changes from a local repository to a remote GitHub repository.
+  env <deploy-id> [env]                                      Sets environment variables and configurations related to a specific deployment ID.
+  config [options] <operator> [key] [value]                  Manages Underpost configurations using various operators.
+  root                                                       Displays the root path of the npm installation.
+  cluster [options] [pod-name]                               Manages Kubernetes clusters, defaulting to Kind cluster initialization.
+  deploy [options] [deploy-list] [env]                       Manages application deployments, defaulting to deploying development pods.
+  secret [options] <platform>                                Manages secrets for various platforms.
+  dockerfile-image-build [options]                           Builds a Docker image from a specified Dockerfile with various options for naming, saving, and loading.
+  dockerfile-pull-base-images [options]                      Pulls required Underpost Dockerfile base images and optionally loads them into clusters.
+  install                                                    Quickly imports Underpost npm dependencies by copying them.
+  db [options] <deploy-list>                                 Manages database operations, including import, export, and collection management.
+  metadata [options] [deploy-id] [host] [path]               Manages cluster metadata operations, including import and export.
+  script [options] <operator> <script-name> [script-value]   Supports a variety of built-in Underpost global scripts, their preset lifecycle events, and arbitrary custom scripts.
+  cron [options] [deploy-list] [job-list]                    Manages cron jobs, including initialization, execution, and configuration updates.
+  fs [options] [path]                                        Manages file storage, defaulting to file upload operations.
+  test [options] [deploy-list]                               Manages and runs tests, defaulting to the current Underpost default test suite.
+  monitor [options] <deploy-id> [env]                        Manages health server monitoring for specified deployments.
+  ssh [options]                                              Import and start ssh server and client based on current default deployment ID.
+  run [options] <runner-id> [path]                           Runs a script from the specified path.
+  lxd [options]                                              Manages LXD containers and virtual machines.
+  baremetal [options] [workflow-id] [hostname] [ip-address]  Manages baremetal server operations, including installation, database setup, commissioning, and user management.
+  help [command]                                             display help for command
+ 
 ```
-
+      
 <a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
+      

package/bin/deploy.js

@@ -28,6 +28,7 @@ import { DefaultConf } from '../conf.js';
 import colors from 'colors';
 import { program } from '../src/cli/index.js';
 import { getLocalIPv4Address, ip } from '../src/server/dns.js';
+import { timer } from '../src/client/components/core/CommonJs.js';
 
 colors.enable();
 
@@ -39,31 +40,6 @@ const [exe, dir, operator] = process.argv;
 
 try {
   switch (operator) {
-    case 'save':
-      {
-        let deployId = process.argv[3] ?? 'dd-default';
-        if (!deployId.startsWith('dd-')) deployId = 'dd-default';
-        const folder = `./engine-private/conf/${deployId}`;
-        if (fs.existsSync(folder)) fs.removeSync(folder);
-        await Config.build({ folder });
-        fs.writeFileSync(
-          `${folder}/.env.production`,
-          fs.readFileSync('./.env.production', 'utf8').replace('dd-default', deployId),
-          'utf8',
-        );
-        fs.writeFileSync(
-          `${folder}/.env.development`,
-          fs.readFileSync('./.env.development', 'utf8').replace('dd-default', deployId),
-          'utf8',
-        );
-        fs.writeFileSync(
-          `${folder}/.env.test`,
-          fs.readFileSync('./.env.test', 'utf8').replace('dd-default', deployId),
-          'utf8',
-        );
-        fs.writeFileSync(`${folder}/package.json`, fs.readFileSync('./package.json', 'utf8'), 'utf8');
-      }
-      break;
     case 'add-nodejs-app-client-conf':
       {
         const toOptions = {
@@ -283,23 +259,20 @@ try {
       for (const deployIdObj of dataDeploy) {
         const { deployId, replicaHost } = deployIdObj;
         if (replicaHost && !singleReplicaHosts.includes(replicaHost)) singleReplicaHosts.push(replicaHost);
-        const proxyInstance = deployId.match('proxy') || deployId.match('cron');
         const baseConfPath = fs.existsSync(`./engine-private/replica/${deployId}`)
           ? `./engine-private/replica`
           : `./engine-private/conf`;
         for (const envInstanceObj of dataEnv) {
           const envPath = `${baseConfPath}/${deployId}/.env.${envInstanceObj.env}`;
           const envObj = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-          envObj.PORT = proxyInstance
-            ? envInstanceObj.port
-            : envInstanceObj.port + port - singleReplicaHosts.length - (replicaHost ? 1 : 0);
+          envObj.PORT = envInstanceObj.port + port - singleReplicaHosts.length - (replicaHost ? 1 : 0);
 
           writeEnv(envPath, envObj);
         }
         const serverConf = loadReplicas(
           JSON.parse(fs.readFileSync(`${baseConfPath}/${deployId}/conf.server.json`, 'utf8')),
         );
-        if (!proxyInstance) for (const host of Object.keys(serverConf)) port += Object.keys(serverConf[host]).length;
+        for (const host of Object.keys(serverConf)) port += Object.keys(serverConf[host]).length;
       }
       break;
 
@@ -395,10 +368,22 @@ try {
     }
 
     case 'version-build': {
+      shellExec(`node bin run kill 4001`);
+      shellExec(`node bin run kill 4002`);
+      shellExec(`node bin run kill 4003`);
+      shellExec(`npm run update-template`);
+      shellExec(`cd ../pwa-microservices-template && npm run build && timeout 5s npm run dev`, {
+        async: true,
+      });
+      await timer(5500);
+      const templateRunnerResult = fs.readFileSync(`../pwa-microservices-template/logs/start.js/all.log`, 'utf8');
+      logger.info('Test template runner result');
+      console.log(templateRunnerResult);
       shellExec(`node bin/deploy clean-core-repo`);
       shellCd(`/home/dd/engine`);
       const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
       const newVersion = process.argv[3] ?? originPackageJson.version;
+      const node = process.argv[4] ?? 'kind-control-plane';
       const { version } = originPackageJson;
       originPackageJson.version = newVersion;
       fs.writeFileSync(`package.json`, JSON.stringify(originPackageJson, null, 4), 'utf8');
@@ -456,8 +441,23 @@ try {
       shellExec(`node bin/deploy update-dependencies`);
       shellExec(`auto-changelog`);
       shellExec(`node bin/build dd`);
-      shellExec(`node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 dd`);
-      shellExec(`node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 dd production`);
+      shellExec(
+        `node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd production`,
+      );
+      for (const deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(`,`)) {
+        fs.copySync(
+          `./engine-private/conf/${deployId}/build/development/deployment.yaml`,
+          `./manifests/deployment/${deployId}-development/deployment.yaml`,
+        );
+        fs.copySync(
+          `./engine-private/conf/${deployId}/build/development/proxy.yaml`,
+          `./manifests/deployment/${deployId}-development/proxy.yaml`,
+        );
+      }
+      shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
+      shellExec(`node bin new --deploy-id dd-default`);
+      console.log(fs.existsSync(`./engine-private/conf/dd-default`));
+      shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
       break;
     }
 

package/bin/file.js

@@ -60,6 +60,8 @@ try {
         else {
           shellExec(`cd ${toPath} && git reset && git checkout . && git clean -f -d`);
           shellExec(`underpost pull ${toPath} underpostnet/pwa-microservices-template`);
+          shellExec(`sudo rm -rf ${toPath}/engine-private`);
+          shellExec(`sudo rm -rf ${toPath}/logs`);
         }
       } else {
         fs.removeSync(toPath);
@@ -94,6 +96,7 @@ try {
           './manifests/deployment/dd-template-development',
           'bin/web3.js',
           'bin/cyberia.js',
+          'bin/cyberia0.js',
         ]) {
           if (fs.existsSync(deletePath)) fs.removeSync('../pwa-microservices-template/' + deletePath);
         }