underpost 2.8.853 → 2.8.854

package/.env.development

@@ -1,4 +1,4 @@
-DEPLOY_ID=dd-template
+DEPLOY_ID=dd-default
 NODE_ENV=development
 PORT=4000
 JWT_SECRET=test

package/.env.production

@@ -1,4 +1,4 @@
-DEPLOY_ID=dd-template
+DEPLOY_ID=dd-default
 NODE_ENV=production
 PORT=3000
 JWT_SECRET=test

package/.env.test

@@ -1,4 +1,4 @@
-DEPLOY_ID=dd-template
+DEPLOY_ID=dd-default
 NODE_ENV=test
 PORT=5000
 JWT_SECRET=test

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

@@ -54,7 +54,7 @@ jobs:
           npm install -g underpost
           npm 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
+          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
       # git lfs ls-files

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

@@ -0,0 +1,35 @@
+name: CD | Release deployment | remote ssh
+
+on:
+  workflow_run:
+    workflows: ['CI | Publish npm package']
+    types:
+      - completed
+
+jobs:
+  after-publish:
+    if: github.repository == 'underpostnet/pwa-microservices-template'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run remote deploy via SSH
+        uses: appleboy/ssh-action@v1.2.2
+        with:
+          # Remote host (secret)
+          host: ${{ secrets.SSH_HOST }}
+          # Remote user (secret)
+          username: ${{ secrets.SSH_USERNAME }}
+          # Private key (secret) — the PEM contents (not a path)
+          key: ${{ secrets.SSH_PRIV_KEY }}
+          # Remote port (optional)
+          port: ${{ secrets.SSH_PORT }}
+          # Optional: if your private key has a passphrase, add:
+          # passphrase: ${{ secrets.SSH_KEY_PASSPHRASE }}
+          # Commands to run on the remote VM
+          script: |
+            set -e
+            echo "Starting remote release deploy"
+            cd /home/dd/engine
+            node bin run --dev upgrade
+            underpost run deploy dd-core
+            underpost run deploy dd-cyberia
+            underpost run deploy dd-lampp

package/README.md

@@ -1,16 +1,10 @@
 <p align="center">
-  <img src="https://underpost.net/assets/splash/apple-touch-icon-precomposed.png" alt="underpost.net"/>
+  <img src="https://underpost.net/assets/splash/apple-touch-icon-precomposed.png" alt="underpost engine core server"/>
 </p>
 
 <div align="center">
 
-### underpost.net
-
-</div>
-
-<div align="center">
-
-template
+<h1>underpost</h1>
 
 </div>
 
@@ -24,79 +18,23 @@ template
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 <!-- 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.853)](https://socket.dev/npm/package/underpost/overview/2.8.853) [![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.854)](https://socket.dev/npm/package/underpost/overview/2.8.854) [![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 -->
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 </div>
 
 <div align="center">
 
 #### Base template for pwa/api-rest projects.
 
-Develop, build, deploy, test, monitor, and manage multiple runtime applications on virtual machines or container instances.
+<div style="font-size: 20px;"><em>End2end</em> continuous integration and continuous deployment cloud to applications federation tools. Develop, build, deploy, test, monitor, and manage multiple runtime applications on virtual machines or container instances.</div>
 
 </div>
 
@@ -134,7 +72,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.853
+## underpost ci/cd cli v2.8.854
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/db.js

@@ -4,7 +4,7 @@ import { loggerFactory } from '../src/server/logger.js';
 import { MariaDB } from '../src/db/mariadb/MariaDB.js';
 import { Xampp } from '../src/runtime/xampp/Xampp.js';
 import { Lampp } from '../src/runtime/lampp/Lampp.js';
-import { getCapVariableName, getRestoreCronCmd, loadConf, splitFileFactory } from '../src/server/conf.js';
+import { getCapVariableName, loadConf, splitFileFactory } from '../src/server/conf.js';
 import { DataBaseProvider } from '../src/db/DataBaseProvider.js';
 import { hashPassword } from '../src/server/auth.js';
 
@@ -104,7 +104,6 @@ try {
           }
           break;
         case 'import':
-          shellExec(await getRestoreCronCmd({ host, path, conf: confServer, deployId }));
           break;
         case 'init-xampp-service':
           await Xampp.initService();
@@ -182,7 +181,6 @@ try {
           break;
         case 'import':
           // mongorestore -d <database_name> <directory_backup>
-          shellExec(await getRestoreCronCmd({ host, path, conf: confServer, deployId }));
           break;
         case 'init-service':
           break;

package/bin/deploy.js

@@ -17,31 +17,17 @@ import {
   addWsConf,
   buildWsSrc,
   cloneSrcComponents,
-  getDeployGroupId,
-  deployRun,
   getDataDeploy,
   buildReplicaId,
   Cmd,
-  restoreMacroDb,
-  fixDependencies,
-  setUpProxyMaintenanceServer,
   writeEnv,
-  getUnderpostRootPath,
   buildCliDoc,
 } from '../src/server/conf.js';
 import { buildClient } from '../src/server/client-build.js';
-import { range, s4, setPad, timer, uniqueArray } from '../src/client/components/core/CommonJs.js';
-import { MongooseDB } from '../src/db/mongo/MongooseDB.js';
-import { Lampp } from '../src/runtime/lampp/Lampp.js';
 import { DefaultConf } from '../conf.js';
-import { JSONweb } from '../src/server/client-formatted.js';
-
-import { Xampp } from '../src/runtime/xampp/Xampp.js';
-import { ejs } from '../src/server/json-schema.js';
-import { getLocalIPv4Address, ip } from '../src/server/dns.js';
-import { Downloader } from '../src/server/downloader.js';
 import colors from 'colors';
 import { program } from '../src/cli/index.js';
+import { getLocalIPv4Address, ip } from '../src/server/dns.js';
 
 colors.enable();
 
@@ -55,7 +41,8 @@ try {
   switch (operator) {
     case 'save':
       {
-        const deployId = process.argv[3];
+        let deployId = process.argv[3] ?? 'dd-default';
+        if (!deployId.startsWith('dd-')) deployId = 'dd-' + deployId;
         const folder = `./engine-private/conf/${deployId}`;
         if (fs.existsSync(folder)) fs.removeSync(folder);
         await Config.build({ folder });
@@ -258,176 +245,6 @@ try {
       }
       break;
 
-    case 'xampp': {
-      const directory = 'c:/xampp/htdocs';
-      const host = 'localhost';
-      const port = 80;
-      Xampp.removeRouter();
-      Xampp.appendRouter(`  Listen ${port} 
-               <VirtualHost *:${port}>
-                DocumentRoot "${directory}"
-                ServerName ${host}:${port}
-      
-                <Directory "${directory}">
-                  Options Indexes FollowSymLinks MultiViews
-                  AllowOverride All
-                  Require all granted
-                </Directory>
-      
-              </VirtualHost>
-              `);
-      if (Xampp.enabled() && Xampp.router) Xampp.initService({ daemon: true });
-      break;
-    }
-
-    case 'adminer': {
-      const directory = '/home/dd/engine/public/adminer';
-      // const host = '127.0.0.1';
-      const host = 'localhost';
-      const port = 80;
-      if (!process.argv.includes('server')) {
-        if (fs.existsSync(directory)) fs.removeSync(directory);
-        fs.mkdirSync(directory, { recursive: true });
-        shellExec(`cd ${directory} && wget https://www.adminer.org/latest.php -O adminer.php`);
-      }
-      Lampp.removeRouter();
-      Lampp.appendRouter(`  Listen ${port} 
-         <VirtualHost *:${port}>
-          DocumentRoot "${directory}"
-          ServerName ${host}:${port}
-
-          <Directory "${directory}">
-            Options Indexes FollowSymLinks MultiViews
-            AllowOverride All
-            Require all granted
-          </Directory>
-
-        </VirtualHost>
-        `);
-      if (Lampp.enabled() && Lampp.router) Lampp.initService({ daemon: true });
-      shellExec(`open /opt/lampp/apache2/conf/httpd.conf`);
-      break;
-    }
-
-    case 'pma':
-      {
-        const directory = '/home/dd/engine/public/phpmyadmin';
-        // const host = '127.0.0.1';
-        const host = 'localhost';
-        const port = 80;
-        // data config path: /etc/phpmyadmin
-
-        // The config.inc.php file is not required, and only needed for custom configurations
-
-        // phpmyadmin will first refer to ./libraries/config.default.php to retrieve the default values.
-
-        // If for some reason you need to modify the default values, and the ./config.inc.php
-        // file doesn't exist, you will need to create one as per the Installation documentation.
-
-        // You will also need to configure pmadb for some of phpmyadmin's special features such as bookmarks.
-
-        // CREATE USER 'pma'@'localhost' IDENTIFIED VIA mysql_native_password USING 'pmapass';
-        // GRANT SELECT, INSERT, UPDATE, DELETE ON `<pma_db>`.* TO 'pma'@'localhost';
-
-        if (!process.argv.includes('server')) {
-          // if (fs.existsSync(directory)) fs.removeSync(directory);
-          shellExec(`sudo apt install phpmyadmin php-mbstring php-zip php-gd php-json php-curl`);
-          shellExec(`sudo phpenmod mbstring`);
-          shellExec(
-            `cd /usr/share/phpmyadmin && git init && git add . && git commit -m "Base phpMyAdmin implementation"`,
-          );
-        }
-
-        // if (!fs.existsSync(directory)) fs.mkdirSync(directory, { recursive: true });
-        // if (!fs.existsSync('./public/phpmyadmin/phpmyadmin'))
-        //   fs.copySync('/usr/share/phpmyadmin', './public/phpmyadmin/phpmyadmin');
-
-        Lampp.removeRouter();
-        Lampp.appendRouter(`  Listen ${port} `);
-        if (Lampp.enabled() && Lampp.router) Lampp.initService({ daemon: true });
-        // shellExec(`open /opt/lampp/apache2/conf/httpd.conf`);
-
-        // Create a link in /var/www like this:
-
-        // sudo ln -s /usr/share/phpmyadmin /var/www/
-
-        // Note: since 14.04 you may want to use /var/www/html/ instead of /var/www/
-
-        // If that's not working for you, you need to include PHPMyAdmin inside apache configuration.
-
-        // Open apache.conf using your favorite editor, mine is vim :)
-
-        // sudo vim /etc/apache2/apache2.conf
-
-        // Then add the following line:
-
-        // Include /etc/phpmyadmin/apache.conf
-
-        // For Ubuntu 15.04 and 16.04
-
-        // sudo ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
-        // sudo a2enconf phpmyadmin.conf
-        // sudo service apache2 reload
-        break;
-        Lampp.appendRouter(`   Listen ${port}
-
-        <VirtualHost *:${port}>
-            DocumentRoot "${directory}"
-            ServerName ${host}:${port}
-
-            <Directory "${directory}">
-              Options Indexes FollowSymLinks MultiViews
-              AllowOverride All
-              Require all granted
-            </Directory>
-
-          </VirtualHost>`);
-        // phpMyAdmin default Apache configuration:
-        Lampp.appendRouter(`
-
-          Listen ${port}
-
-          Alias /phpmyadmin /usr/share/phpmyadmin
-
-<Directory /usr/share/phpmyadmin>
-    Options Indexes FollowSymLinks
-    DirectoryIndex index.php
-
-    <IfModule mod_php5.c>
-        AddType application/x-httpd-php .php
-
-        php_flag magic_quotes_gpc Off
-        php_flag track_vars On
-        php_flag register_globals Off
-        php_value include_path .
-    </IfModule>
-
-</Directory>
-
-# Authorize for setup
-<Directory /usr/share/phpmyadmin/setup>
-    <IfModule mod_authn_file.c>
-    AuthType Basic
-    AuthName "phpMyAdmin Setup"
-    AuthUserFile /etc/phpmyadmin/htpasswd.setup
-    </IfModule>
-    Require valid-user
-</Directory>
-
-# Disallow web access to directories that don't need it
-<Directory /usr/share/phpmyadmin/libraries>
-    Order Deny,Allow
-    Deny from All
-</Directory>
-<Directory /usr/share/phpmyadmin/setup/lib>
-    Order Deny,Allow
-    Deny from All
-</Directory>
-
-          `);
-      }
-      break;
-
     case 'update-dependencies':
       const files = await fs.readdir(`./engine-private/conf`, { recursive: true });
       const originPackage = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
@@ -442,64 +259,6 @@ try {
       }
       break;
 
-    case 'run-macro':
-      {
-        if (fs.existsSync(`./tmp/await-deploy`)) fs.remove(`./tmp/await-deploy`);
-        const dataDeploy = getDataDeploy({
-          deployGroupId: process.argv[3],
-          buildSingleReplica: true,
-          deployIdConcat: ['dd-proxy', 'dd-cron'],
-        });
-        if (!process.argv[4]) await setUpProxyMaintenanceServer({ deployGroupId: process.argv[3] });
-        await deployRun(process.argv[4] ? dataDeploy.filter((d) => d.deployId.match(process.argv[4])) : dataDeploy);
-      }
-      break;
-
-    case 'build-macro':
-      {
-        const dataDeploy = getDataDeploy({ deployGroupId: process.argv[3], buildSingleReplica: true });
-        for (const deploy of dataDeploy) {
-          if (!process.argv[4] || (process.argv[4] && process.argv[4] === deploy.deployId)) {
-            shellExec(Cmd.conf(deploy.deployId));
-            shellExec(Cmd.build(deploy.deployId));
-          }
-        }
-      }
-      break;
-    case 'macro': {
-      shellExec(`git checkout .`);
-      shellExec(`node bin/deploy build-macro ${process.argv.slice(3).join(' ')}`);
-      shellExec(`git checkout .`);
-      shellExec(`node bin/deploy run-macro ${process.argv.slice(3).join(' ')}`);
-      break;
-    }
-
-    case 'keep-server': {
-      await setUpProxyMaintenanceServer({ deployGroupId: process.argv[3] });
-      break;
-    }
-    case 'prometheus':
-    case 'prom':
-      {
-        const rangePort = [1, 20];
-        const promConfigPath = `./engine-private/prometheus/prometheus-service-config.yml`;
-        const rawConfig = fs
-          .readFileSync(promConfigPath, 'utf8')
-          .replaceAll(
-            `['']`,
-            JSON.stringify(range(...rangePort).map((i) => `host.docker.internal:30${setPad(i, '0', 2)}`)).replaceAll(
-              `"`,
-              `'`,
-            ),
-          );
-        console.log(rawConfig);
-
-        fs.writeFileSync(promConfigPath, rawConfig, 'utf8');
-
-        shellExec(`docker-compose -f engine-private/prometheus/prometheus-service.yml up -d`);
-      }
-      break;
-
     case 'sync-env-port':
       const dataDeploy = getDataDeploy({ deployGroupId: process.argv[3], disableSyncEnvPort: true });
       const dataEnv = [
@@ -584,9 +343,6 @@ try {
       }
       break;
     }
-    case 'build-macro-replica':
-      getDataDeploy({ deployGroupId: process.argv[3], buildSingleReplica: true });
-      break;
 
     case 'rename-package': {
       const name = process.argv[3];
@@ -613,7 +369,7 @@ try {
       break;
     }
 
-    case 'version-build': {
+    case 'clean-core-repo': {
       shellCd(`/home/dd/engine`);
       shellExec(`git reset`);
       shellExec(`git checkout .`);
@@ -623,6 +379,12 @@ try {
       shellExec(`git checkout .`);
       shellExec(`git clean -f -d`);
       shellCd(`/home/dd/engine`);
+      break;
+    }
+
+    case 'version-build': {
+      shellExec(`node bin clean-core-repo`);
+      shellCd(`/home/dd/engine`);
       const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
       const newVersion = process.argv[3] ?? originPackageJson.version;
       const { version } = originPackageJson;
@@ -657,16 +419,9 @@ try {
       }
 
       fs.writeFileSync(
-        `./docker-compose.yml`,
-        fs
-          .readFileSync(`./docker-compose.yml`, 'utf8')
-          .replaceAll(`engine.version: '${version}'`, `engine.version: '${newVersion}'`),
-        'utf8',
-      );
-      fs.writeFileSync(
-        `./manifests/deployment/dd-template-development/deployment.yaml`,
+        `./manifests/deployment/dd-default-development/deployment.yaml`,
         fs
-          .readFileSync(`./manifests/deployment/dd-template-development/deployment.yaml`, 'utf8')
+          .readFileSync(`./manifests/deployment/dd-default-development/deployment.yaml`, 'utf8')
           .replaceAll(`underpost:v${version}`, `underpost:v${newVersion}`),
         'utf8',
       );
@@ -723,25 +478,6 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       break;
     }
 
-    case 'restore-macro-db':
-      {
-        const deployGroupId = process.argv[3];
-        const deployId = process.argv[4];
-        await restoreMacroDb(deployGroupId, deployId);
-      }
-
-      break;
-
-    case 'mongo': {
-      await MongooseDB.server();
-      break;
-    }
-
-    case 'lampp': {
-      await Lampp.install();
-      break;
-    }
-
     case 'heb': {
       // https://besu.hyperledger.org/
       // https://github.com/hyperledger/besu/archive/refs/tags/24.9.1.tar.gz
@@ -777,11 +513,6 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       break;
     }
 
-    case 'fix-deps': {
-      await fixDependencies();
-      break;
-    }
-
     case 'update-default-conf': {
       const defaultServer = DefaultConf.server['default.net']['/'];
       let confName = process.argv[3];
@@ -984,37 +715,6 @@ EOF`);
       break;
     }
 
-    case 'valkey': {
-      if (!process.argv.includes('server')) {
-        if (process.argv.includes('rocky')) {
-          // shellExec(`yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm`);
-          // shellExec(`sudo percona-release enable valkey experimental`);
-          shellExec(`sudo dnf install valkey`);
-          shellExec(`chown -R valkey:valkey /etc/valkey`);
-          shellExec(`chown -R valkey:valkey /var/lib/valkey`);
-          shellExec(`chown -R valkey:valkey /var/log/valkey`);
-          shellExec(`sudo systemctl enable valkey.service`);
-          shellExec(`sudo systemctl start valkey`);
-          shellExec(`valkey-cli ping`);
-        } else {
-          shellExec(`cd /home/dd && git clone https://github.com/valkey-io/valkey.git`);
-          shellExec(`cd /home/dd/valkey && make`);
-          shellExec(`apt install valkey-tools`); // valkey-cli
-        }
-      }
-      if (process.argv.includes('rocky')) {
-        shellExec(`sudo systemctl stop valkey`);
-        shellExec(`sudo systemctl start valkey`);
-      } else shellExec(`cd /home/dd/valkey && ./src/valkey-server`);
-
-      break;
-    }
-
-    case 'valkey-service': {
-      shellExec(`pm2 start bin/deploy.js --node-args=\"--max-old-space-size=8192\" --name valkey -- valkey server`);
-      break;
-    }
-
     case 'cli-docs': {
       buildCliDoc(program, process.argv[3], process.argv[4]);
       break;

package/bin/file.js

@@ -83,6 +83,7 @@ try {
           './manifests/deployment/dd-lampp-development',
           './manifests/deployment/dd-cyberia-development',
           './manifests/deployment/dd-core-development',
+          './manifests/deployment/dd-template-development',
           'bin/web3.js',
           'bin/cyberia.js',
         ]) {
@@ -98,6 +99,7 @@ try {
           `./.github/workflows/npmpkg.ci.yml`,
           `./.github/workflows/ghpkg.ci.yml`,
           `./.github/workflows/publish.ci.yml`,
+          `./.github/workflows/release.cd.yml`,
         ])
           fs.copyFileSync(_path, `../pwa-microservices-template/${_path}`);
 

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.853
+## underpost ci/cd cli v2.8.854
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -236,6 +236,9 @@ Options:
                           specified namespace.
   --kubeadm               Initializes the cluster using kubeadm for control
                           plane management.
+  --grafana               Initializes the cluster with a Grafana deployment.
+  --prom [hosts]          Initializes the cluster with a Prometheus Operator
+                          deployment and monitor scrap for specified hosts.
   --dev                   Initializes a development-specific cluster
                           configuration.
   --list-pods             Displays detailed information about all pods.
@@ -588,7 +591,7 @@ Options:
 Runs a script from the specified path.
 
 Arguments:
-  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, cyberia-ide, engine-ide, template-deploy, ssh-deploy, ide, monitor, db-client, cluster, deploy, tf-vae-test, deploy-job.
+  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, cyberia-ide, engine-ide, template-deploy, clean, upgrade, ssh-deploy, ide, monitor, db-client, cluster, deploy, tf-vae-test, deploy-job.
   path                                     The absolute or relative directory path where the script is located.
 
 Options: