underpost 2.8.884 → 2.8.886

package/bin/deploy.js

@@ -122,7 +122,12 @@ try {
       }
       break;
     case 'conf': {
-      loadConf(process.argv[3], process.argv[4]);
+      let subConf = process.argv[5] ?? '';
+
+      if (!['current', 'clean'].includes(process.argv[3]))
+        dotenv.config({ path: `./engine-private/conf/${process.argv[3]}/.env.${process.argv[4]}`, override: true });
+
+      loadConf(process.argv[3], subConf);
       break;
     }
 
@@ -194,10 +199,10 @@ try {
       {
         dotenv.config({ override: true });
         if (!process.argv[3]) process.argv[3] = 'dd-default';
-        const { deployId, folder } = loadConf(process.argv[3]);
+        const { deployId } = loadConf(process.argv[3], process.argv[4] ?? '');
 
-        let argHost = process.argv[4] ? process.argv[4].split(',') : [];
-        let argPath = process.argv[5] ? process.argv[5].split(',') : [];
+        let argHost = process.argv[5] ? process.argv[5].split(',') : [];
+        let argPath = process.argv[6] ? process.argv[6].split(',') : [];
         let deployIdSingleReplicas = [];
         const serverConf = deployId
           ? JSON.parse(fs.readFileSync(`./conf/conf.server.json`, 'utf8'))
@@ -209,16 +214,10 @@ try {
             } else {
               serverConf[host][path].liteBuild = process.argv.includes('l') ? true : false;
               serverConf[host][path].minifyBuild = process.env.NODE_ENV === 'production' ? true : false;
-              if (process.env.NODE_ENV === 'development' && process.argv.includes('static')) {
-                serverConf[host][path].apiBaseProxyPath = '/';
-                serverConf[host][path].apiBaseHost = `localhost:${parseInt(process.env.PORT) + 1}`;
-              }
               if (serverConf[host][path].singleReplica && serverConf[host][path].replicas) {
                 deployIdSingleReplicas = deployIdSingleReplicas.concat(
                   serverConf[host][path].replicas.map((replica) => buildReplicaId({ deployId, replica })),
                 );
-
-                // shellExec(Cmd.replica(deployId, host, path));
               }
             }
           }
@@ -254,25 +253,32 @@ try {
         { env: 'development', port: 4000 },
         { env: 'test', port: 5000 },
       ];
-      let port = 0;
-      const singleReplicaHosts = [];
+      let portOffset = 0;
       for (const deployIdObj of dataDeploy) {
-        const { deployId, replicaHost } = deployIdObj;
-        if (replicaHost && !singleReplicaHosts.includes(replicaHost)) singleReplicaHosts.push(replicaHost);
+        const { deployId } = deployIdObj;
         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 = envInstanceObj.port + port - singleReplicaHosts.length - (replicaHost ? 1 : 0);
+          envObj.PORT = `${envInstanceObj.port + portOffset}`;
 
           writeEnv(envPath, envObj);
         }
         const serverConf = loadReplicas(
           JSON.parse(fs.readFileSync(`${baseConfPath}/${deployId}/conf.server.json`, 'utf8')),
         );
-        for (const host of Object.keys(serverConf)) port += Object.keys(serverConf[host]).length;
+        for (const host of Object.keys(serverConf)) {
+          for (const path of Object.keys(serverConf[host])) {
+            if (serverConf[host][path].singleReplica) {
+              portOffset--;
+              continue;
+            }
+            portOffset++;
+            if (serverConf[host][path].peer) portOffset++;
+          }
+        }
       }
       break;
 
@@ -431,11 +437,11 @@ try {
         'utf8',
       );
 
-      if (fs.existsSync(`./.github/workflows/docker-image.yml`))
+      if (fs.existsSync(`./.github/workflows/docker-image.ci.yml`))
         fs.writeFileSync(
-          `./.github/workflows/docker-image.yml`,
+          `./.github/workflows/docker-image.ci.yml`,
           fs
-            .readFileSync(`./.github/workflows/docker-image.yml`, 'utf8')
+            .readFileSync(`./.github/workflows/docker-image.ci.yml`, 'utf8')
             .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
           'utf8',
         );
@@ -924,82 +930,6 @@ EOF`);
       break;
     }
 
-    case 'nfs': {
-      // Daemon RPC  NFSv3. ports:
-
-      // 2049 (TCP/UDP) – nfsd standard port.
-      // 111 (TCP/UDP) – rpcbind/portmapper.
-      // 20048 (TCP/UDP) – rpc.mountd.
-      // 32765 (TCP/UDP) – rpc.statd.
-      // 32766 (TCP/UDP) – lockd (NLM).
-
-      // Configure export and permissions:
-      // /etc/exports
-
-      // Configure ports:
-      // /etc/nfs.conf
-
-      fs.writeFileSync(
-        `/etc/nfs.conf`,
-        `
-[mountd]
-port = 20048
-
-[statd]
-port = 32765
-outgoing-port = 32765
-
-[nfsd]
-rdma=y
-rdma-port=20049
-
-[lockd]
-port = 32766
-udp-port = 32766
-        `,
-        'utf8',
-      );
-
-      // Client users have read-only access to resources and are identified as anonymous on the server.
-      // /share ip-client(ro,all_squash)
-
-      // Client users can modify resources and keep their UID on the server. Only root is identified as anonymous.
-      // /share ip-client(rw)
-
-      // Users on client workstation 1 can modify resources, while those on client workstation 2 have read-only access.
-      // UIDs are kept on the server, and only root is identified as anonymous.
-      // /share ip-client1(rw) ip-client2(ro)
-
-      // Client1 users can modify resources. Their UID is changed to 1001 and their GID to 100 on the server.
-      // /share ip-client(rw,all_squash,anonuid=1001,anongid=100)
-
-      // sudo dnf install nfs-utils
-      // sudo systemctl enable --now rpcbind    // RPC map service
-      // sudo systemctl enable --now nfs-server // nfs domains nfsd
-
-      // Update exports:
-      // shellExec(`sudo exportfs -a -r`);
-      // shellExec(`sudo exportfs -v`);
-
-      // Active nfs
-      shellExec(`sudo exportfs -s`);
-
-      shellExec(`sudo exportfs -rav`);
-
-      // Rocky enable virt_use_nfs
-      // sudo setsebool -P virt_use_nfs 1
-
-      // Disable share:
-      // sudo exportfs -u <client-ip>:${process.env.NFS_EXPORT_PATH}/rpi4mb
-
-      // Nfs client:
-      // mount -t nfs <server-ip>:/server-mnt /mnt
-      // umount /mnt
-
-      shellExec(`sudo systemctl restart nfs-server`);
-      break;
-    }
-
     case 'mount': {
       const mounts = shellExec(`mount`).split(`\n`);
       console.table(
@@ -1030,102 +960,6 @@ udp-port = 32766
       break;
     }
 
-    case 'maas-ports': {
-      // Configure firewall:
-
-      // systemctl stop firewalld
-      // systemctl mask firewalld
-
-      // ufw disable
-      // ufw enable
-
-      // sudo snap install ufw
-      // const ports = ['80', '443', '22', '3000-3100'];
-      const ports = [
-        '43',
-        '53',
-        '60',
-        '66',
-        '67',
-        '69',
-        '4011',
-        '111',
-        '2049',
-        '20048',
-        '20049',
-        '32765',
-        '32766',
-        '5248',
-        '5240',
-      ];
-      for (const port of ports) {
-        shellExec(`ufw allow ${port}/tcp`);
-        shellExec(`ufw allow ${port}/udp`);
-      }
-
-      shellExec(`sudo systemctl mask firewalld`);
-
-      break;
-    }
-
-    case 'iptables': {
-      shellExec(`sudo systemctl enable nftables`);
-      shellExec(`sudo systemctl restart nftables`);
-
-      shellExec(`sudo tee /etc/nftables.conf <<EOF
-table inet filter {
-  chain input {
-    type filter hook input priority 0;
-    policy drop;
-    tcp dport 22 accept
-  }
-}
-EOF`);
-      shellExec(`sudo nft -f /etc/nftables.conf`);
-
-      // sudo systemctl stop nftables
-      // sudo systemctl disable nftables
-
-      break;
-    }
-
-    case 'rpi4': {
-      // Rpi4 Run Bootloader:
-
-      // 1) create boot.conf
-
-      // 2) Run lite RPiOs from rpi-imager
-      // with boot.conf files in root disk path
-
-      // 3) cd /boot/firmware && sudo rpi-eeprom-config --apply boot.conf
-
-      // 4) sudo reboot
-
-      // 5) check: 'vcgencmd bootloader_version'
-      // 6) check: 'vcgencmd bootloader_config'
-
-      // 7) shutdown and restart without sd card
-
-      // sudo apt update
-      // sudo apt install git
-
-      break;
-    }
-
-    case 'blue': {
-      // lsusb | grep blue -i
-      // rfkill list
-      // sudo service bluetooth start
-      // bluetoothctl show
-      // sudo rfkill unblock bluetooth
-      // dmesg | grep -i bluetooth
-      // journalctl -u bluetooth -f
-      // sudo dnf update bluez bluez-libs bluez-utils
-      // sudo rmmod btusb
-      // sudo modprobe btusb
-      break;
-    }
-
     case 'fastapi-models': {
       shellExec(`chmod +x ../full-stack-fastapi-template/backend/initial_data.sh`);
       shellExec(`../full-stack-fastapi-template/backend/initial_data.sh`);
@@ -1380,13 +1214,84 @@ nvidia/gpu-operator \
       break;
     }
 
-    case 'sbt': {
-      // https://www.scala-sbt.org/1.x/docs/Installing-sbt-on-Linux.html
+    case 'udpate-version-files': {
+      const oldNpmVersion = process.argv[3];
+      const oldNodeVersion = process.argv[4];
+      const oldNodeMajorVersion = oldNodeVersion.split('.')[0];
+      const nodeVersion = shellExec(`node --version`, { stdout: true }).trim().replace('v', '');
+      const newNodeMajorVersion = nodeVersion.split('.')[0];
+      const npmVersion = shellExec(`npm --version`, { stdout: true }).trim();
+
+      fs.writeFileSync(
+        `README.md`,
+        fs
+          .readFileSync(`README.md`, 'utf8')
+          .replaceAll(oldNodeVersion, nodeVersion)
+          .replaceAll(oldNpmVersion, npmVersion),
+      );
+      fs.writeFileSync(
+        `manifests/lxd/underpost-setup.sh`,
+        fs
+          .readFileSync(`manifests/lxd/underpost-setup.sh`, 'utf8')
+          .replaceAll(oldNodeVersion, nodeVersion)
+          .replaceAll(oldNpmVersion, npmVersion),
+      );
+      fs.writeFileSync(
+        `src/client/public/nexodev/docs/references/Getting started.md`,
+        fs
+          .readFileSync(`src/client/public/nexodev/docs/references/Getting started.md`, 'utf8')
+          .replaceAll(oldNodeVersion, nodeVersion)
+          .replaceAll(oldNpmVersion, npmVersion),
+      );
+
+      const workflowFiles = [
+        `./.github/workflows/coverall.ci.yml`,
+
+        `./.github/workflows/engine-core.ci.yml`,
+
+        `./.github/workflows/engine-cyberia.ci.yml`,
+
+        `./.github/workflows/engine-lampp.ci.yml`,
+
+        `./.github/workflows/engine-test.ci.yml`,
+
+        `./.github/workflows/ghpkg.ci.yml`,
+
+        `./.github/workflows/npmpkg.ci.yml`,
+
+        `./.github/workflows/publish.ci.yml`,
+
+        `./.github/workflows/pwa-microservices-template-page.cd.yml`,
+
+        `./.github/workflows/pwa-microservices-template-test.ci.yml`,
+
+        `./.github/workflows/test-api-rest.cd.yml`,
+
+        `./src/runtime/lampp/Dockerfile`,
+
+        `./Dockerfile`,
+      ];
+
+      workflowFiles.forEach((file) => {
+        fs.writeFileSync(
+          file,
+          fs
+            .readFileSync(file, 'utf8')
+            .replaceAll(oldNodeMajorVersion + '.x', newNodeMajorVersion + '.x')
+            .replaceAll(oldNodeVersion, nodeVersion)
+            .replaceAll(oldNpmVersion, npmVersion),
+        );
+      });
+      pbcopy(`nvm alias default v${nodeVersion}`);
+      break;
+    }
 
-      // sudo rm -f /etc/yum.repos.d/bintray-rpm.repo
-      // curl -L https://www.scala-sbt.org/sbt-rpm.repo > sbt-rpm.repo
-      // sudo mv sbt-rpm.repo /etc/yum.repos.d/
-      // sudo yum install sbt
+    case 'tls': {
+      fs.mkdirSync(`./engine-private/ssl/localhost`, { recursive: true });
+      const targetDir = `./engine-private/ssl/localhost`;
+      const domains = ['localhost', '127.0.0.1', '::1'];
+      shellExec(`chmod +x ./scripts/ssl.sh`);
+      shellExec(`./scripts/ssl.sh ${targetDir} "${domains.join(' ')}"`);
       break;
     }
   }

package/bin/file.js

@@ -112,6 +112,8 @@ try {
           `./.github/workflows/ghpkg.ci.yml`,
           `./.github/workflows/publish.ci.yml`,
           `./.github/workflows/release.cd.yml`,
+          './src/ws/IoInterface.js',
+          './src/ws/IoServer.js',
         ])
           fs.copyFileSync(_path, `../pwa-microservices-template/${_path}`);
 
@@ -165,13 +167,9 @@ try {
 
         originMd =
           originMd.split(`<!-- badges -->`)[0] +
-          `
-<!-- badges -->
-` +
+          `<!-- badges -->` +
           badges +
-          `
-<!-- end-badges -->
-` +
+          `<!-- end-badges -->` +
           originMd.split(`<!-- end-badges -->`)[1];
 
         const splitKeyword = '## underpost ci/cd cli';

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.884
+## underpost ci/cd cli v2.8.886
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -7,13 +7,13 @@
   -h, --help                                                 display help for command
 
 Commands:
-  new [options] <app-name>                                   Initializes a new Underpost project with a predefined structure.
+  new [options] <app-name>                                   Initializes a new Underpost project, service, or configuration.
   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.
+  env [deploy-id] [env] [subConf]                            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.
@@ -44,16 +44,18 @@ Commands:
 ```
  Usage: underpost new [options] <app-name>
 
-Initializes a new Underpost project with a predefined structure.
+Initializes a new Underpost project, service, or configuration.
 
 Arguments:
-  app-name     The name or deploy-id of the application to create.
+  app-name               The name or deploy-id of the application to create.
 
 Options:
-  --deploy-id  Crete deploy ID conf env files
-  --cluster    Create deploy ID cluster files and sync to current cluster
-  --dev        Sets the development cli context
-  -h, --help   display help for command
+  --deploy-id            Crete deploy ID conf env files
+  --cluster              Create deploy ID cluster files and sync to current
+                         cluster
+  --dev                  Sets the development cli context
+  --sub-conf <sub-conf>  Create sub conf env files
+  -h, --help             display help for command
  
 ```
   
@@ -157,16 +159,18 @@ Options:
 
 ### `env` :
 ```
- Usage: underpost env [options] <deploy-id> [env]
+ Usage: underpost env [options] [deploy-id] [env] [subConf]
 
 Sets environment variables and configurations related to a specific deployment
 ID.
 
 Arguments:
   deploy-id   The deployment configuration ID. Use 'clean' to restore default
-              environment settings.
+              environment settings. User 'root' to load root env. User
+              'current' to get plain current deploy Id.
   env         Optional: The environment to set (e.g., "production",
               "development"). Defaults to "production".
+  subConf     Optional: The sub configuration to set.
 
 Options:
   -h, --help  display help for command
@@ -603,7 +607,7 @@ Options:
 Runs a script from the specified path.
 
 Arguments:
-  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, underpost-config, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, cyberia-ide, engine-ide, template-deploy, clean, pull, release-deploy, ssh-deploy, ide, dev-client, dev-api, sync, ls-deployments, monitor, db-client, promote, metrics, cluster, deploy, tf-vae-test, deploy-job.
+  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, underpost-config, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, cyberia-ide, engine-ide, cluster-build, template-deploy, clean, pull, release-deploy, ssh-deploy, ide, sync, ls-deployments, monitor, db-client, promote, metrics, cluster, deploy, sync-replica, tf-vae-test, deploy-job.
   path                                     The absolute or relative directory path where the script is located.
 
 Options:

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.884
+          image: localhost/rockylinux9-underpost:v2.8.886
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.884
+          image: localhost/rockylinux9-underpost:v2.8.886
           #          resources:
           #            requests:
           #              memory: "124Ki"

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

@@ -17,13 +17,13 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.884
+          image: localhost/rockylinux9-underpost:v2.8.886
 #          resources:
 #            requests:
-#              memory: "96294Ki"
+#              memory: "94Ki"
 #              cpu: "75m"
 #            limits:
-#              memory: "1540709Ki"
+#              memory: "1504Ki"
 #              cpu: "1200m"
           command:
             - /bin/sh
@@ -49,41 +49,41 @@ spec:
   selector:
     app: dd-test-development-blue
   ports:
-    - name: 'tcp-4021'
+    - name: 'tcp-4041'
       protocol: TCP
-      port: 4021
-      targetPort: 4021
-    - name: 'udp-4021'
+      port: 4041
+      targetPort: 4041
+    - name: 'udp-4041'
       protocol: UDP
-      port: 4021
-      targetPort: 4021
+      port: 4041
+      targetPort: 4041
 
-    - name: 'tcp-4022'
+    - name: 'tcp-4042'
       protocol: TCP
-      port: 4022
-      targetPort: 4022
-    - name: 'udp-4022'
+      port: 4042
+      targetPort: 4042
+    - name: 'udp-4042'
       protocol: UDP
-      port: 4022
-      targetPort: 4022
+      port: 4042
+      targetPort: 4042
 
-    - name: 'tcp-4023'
+    - name: 'tcp-4043'
       protocol: TCP
-      port: 4023
-      targetPort: 4023
-    - name: 'udp-4023'
+      port: 4043
+      targetPort: 4043
+    - name: 'udp-4043'
       protocol: UDP
-      port: 4023
-      targetPort: 4023
+      port: 4043
+      targetPort: 4043
 
-    - name: 'tcp-4024'
+    - name: 'tcp-4044'
       protocol: TCP
-      port: 4024
-      targetPort: 4024
-    - name: 'udp-4024'
+      port: 4044
+      targetPort: 4044
+    - name: 'udp-4044'
       protocol: UDP
-      port: 4024
-      targetPort: 4024
+      port: 4044
+      targetPort: 4044
   type: LoadBalancer
 ---
 apiVersion: apps/v1
@@ -104,13 +104,13 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.8.884
+          image: localhost/rockylinux9-underpost:v2.8.886
 #          resources:
 #            requests:
-#              memory: "96294Ki"
+#              memory: "94Ki"
 #              cpu: "75m"
 #            limits:
-#              memory: "1540709Ki"
+#              memory: "1504Ki"
 #              cpu: "1200m"
           command:
             - /bin/sh
@@ -136,39 +136,39 @@ spec:
   selector:
     app: dd-test-development-green
   ports:
-    - name: 'tcp-4021'
+    - name: 'tcp-4041'
       protocol: TCP
-      port: 4021
-      targetPort: 4021
-    - name: 'udp-4021'
+      port: 4041
+      targetPort: 4041
+    - name: 'udp-4041'
       protocol: UDP
-      port: 4021
-      targetPort: 4021
+      port: 4041
+      targetPort: 4041
 
-    - name: 'tcp-4022'
+    - name: 'tcp-4042'
       protocol: TCP
-      port: 4022
-      targetPort: 4022
-    - name: 'udp-4022'
+      port: 4042
+      targetPort: 4042
+    - name: 'udp-4042'
       protocol: UDP
-      port: 4022
-      targetPort: 4022
+      port: 4042
+      targetPort: 4042
 
-    - name: 'tcp-4023'
+    - name: 'tcp-4043'
       protocol: TCP
-      port: 4023
-      targetPort: 4023
-    - name: 'udp-4023'
+      port: 4043
+      targetPort: 4043
+    - name: 'udp-4043'
       protocol: UDP
-      port: 4023
-      targetPort: 4023
+      port: 4043
+      targetPort: 4043
 
-    - name: 'tcp-4024'
+    - name: 'tcp-4044'
       protocol: TCP
-      port: 4024
-      targetPort: 4024
-    - name: 'udp-4024'
+      port: 4044
+      targetPort: 4044
+    - name: 'udp-4044'
       protocol: UDP
-      port: 4024
-      targetPort: 4024
+      port: 4044
+      targetPort: 4044
   type: LoadBalancer