cyberia 3.0.2 → 3.1.3

package/bin/deploy.js

@@ -6,24 +6,18 @@ import dotenv from 'dotenv';
 import { pbcopy, shellCd, shellExec } from '../src/server/process.js';
 import { loggerFactory } from '../src/server/logger.js';
 import {
-  Config,
   addApiConf,
   addClientConf,
   buildApiSrc,
   buildClientSrc,
   cloneConf,
-  loadConf,
-  loadReplicas,
   addWsConf,
   buildWsSrc,
   cloneSrcComponents,
-  getDataDeploy,
-  buildReplicaId,
-  Cmd,
   writeEnv,
   buildCliDoc,
+  loadConf,
 } from '../src/server/conf.js';
-import { buildClient } from '../src/server/client-build.js';
 import colors from 'colors';
 import { program } from '../src/cli/index.js';
 import { timer } from '../src/client/components/core/CommonJs.js';
@@ -120,19 +114,6 @@ try {
         buildWsSrc({ toOptions, fromOptions });
       }
       break;
-    case 'conf': {
-      let subConf = process.argv[5] ?? '';
-
-      if (!['current', 'clean', 'root'].includes(process.argv[3])) {
-        const path = fs.existsSync(`./engine-private/replica/${process.argv[3]}`)
-          ? `./engine-private/replica/${process.argv[3]}/.env.${process.argv[4]}`
-          : `./engine-private/conf/${process.argv[3]}/.env.${process.argv[4]}`;
-        dotenv.config({ path, override: true });
-      }
-
-      loadConf(process.argv[3], subConf);
-      break;
-    }
 
     case 'new-nodejs-app':
       {
@@ -143,7 +124,7 @@ try {
 
         shellExec(`node bin/deploy build-nodejs-src-app ${deployId} ${clientId}`);
 
-        shellExec(`node bin/deploy build-full-client ${deployId}`);
+        await Underpost.repo.client(deployId);
 
         shellExec(`npm run dev ${deployId}`);
       }
@@ -180,8 +161,6 @@ try {
         shellExec(`node bin/deploy build-nodejs-conf-api ${apiId} ${deployId} ${clientId}`);
 
         shellExec(`node bin/deploy build-nodejs-src-api ${apiId} ${deployId} ${clientId}`);
-
-        // shellExec(`npm run dev ${deployId}`);
       }
       break;
     case 'new-nodejs-ws':
@@ -198,42 +177,6 @@ try {
         shellExec(`npm run dev ${deployId}`);
       }
       break;
-    case 'build-full-client':
-      {
-        dotenv.config({ override: true });
-        if (!process.argv[3]) process.argv[3] = 'dd-default';
-        const { deployId } = loadConf(process.argv[3], process.argv[4] ?? '');
-
-        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'))
-          : Config.default.server;
-        for (const host of Object.keys(serverConf)) {
-          for (const path of Object.keys(serverConf[host])) {
-            if (argHost.length && argPath.length && (!argHost.includes(host) || !argPath.includes(path))) {
-              delete serverConf[host][path];
-            } else {
-              serverConf[host][path].liteBuild = false;
-              serverConf[host][path].minifyBuild = process.env.NODE_ENV === 'production' ? true : false;
-              if (serverConf[host][path].singleReplica && serverConf[host][path].replicas) {
-                deployIdSingleReplicas = deployIdSingleReplicas.concat(
-                  serverConf[host][path].replicas.map((replica) => buildReplicaId({ deployId, replica })),
-                );
-              }
-            }
-          }
-        }
-        fs.writeFileSync(`./conf/conf.server.json`, JSON.stringify(serverConf, null, 4), 'utf-8');
-        await buildClient();
-
-        for (const replicaDeployId of deployIdSingleReplicas) {
-          shellExec(Cmd.conf(replicaDeployId, process.env.NODE_ENV));
-          shellExec(Cmd.build(replicaDeployId));
-        }
-      }
-      break;
 
     case 'update-dependencies':
       const files = await fs.readdir(`./engine-private/conf`, { recursive: true });
@@ -244,102 +187,12 @@ try {
           const deployPackage = JSON.parse(fs.readFileSync(filePah, 'utf8'));
           deployPackage.dependencies = originPackage.dependencies;
           deployPackage.devDependencies = originPackage.devDependencies;
+          deployPackage.overrides = originPackage.overrides;
           fs.writeFileSync(filePah, JSON.stringify(deployPackage, null, 4), 'utf8');
         }
       }
       break;
 
-    case 'sync-env-port':
-      const dataDeploy = getDataDeploy({ disableSyncEnvPort: true });
-      const dataEnv = [
-        { env: 'production', port: 3000 },
-        { env: 'development', port: 4000 },
-        { env: 'test', port: 5000 },
-      ];
-      let portOffset = 0;
-      for (const deployIdObj of dataDeploy) {
-        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 + portOffset}`;
-
-          writeEnv(envPath, envObj);
-        }
-        const serverConf = loadReplicas(
-          deployId,
-          JSON.parse(fs.readFileSync(`${baseConfPath}/${deployId}/conf.server.json`, 'utf8')),
-        );
-        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;
-
-    case 'build-single-replica': {
-      const deployId = process.argv[3];
-      const host = process.argv[4];
-      const path = process.argv[5];
-      const serverConf = loadReplicas(
-        deployId,
-        JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
-      );
-
-      if (serverConf[host][path].replicas) {
-        {
-          let replicaIndex = -1;
-          for (const replica of serverConf[host][path].replicas) {
-            replicaIndex++;
-            const replicaDeployId = `${deployId}-${serverConf[host][path].replicas[replicaIndex].slice(1)}`;
-            // fs.mkdirSync(`./engine-private/replica/${deployId}${replicaIndex}`, { recursive: true });
-            await fs.copy(`./engine-private/conf/${deployId}`, `./engine-private/replica/${replicaDeployId}`);
-            fs.writeFileSync(
-              `./engine-private/replica/${replicaDeployId}/package.json`,
-              fs
-                .readFileSync(`./engine-private/replica/${replicaDeployId}/package.json`, 'utf8')
-                .replaceAll(`${deployId}`, `${replicaDeployId}`),
-              'utf8',
-            );
-          }
-        }
-        {
-          let replicaIndex = -1;
-          for (const replica of serverConf[host][path].replicas) {
-            replicaIndex++;
-            const replicaDeployId = `${deployId}-${serverConf[host][path].replicas[replicaIndex].slice(1)}`;
-            let replicaServerConf = JSON.parse(
-              fs.readFileSync(`./engine-private/replica/${replicaDeployId}/conf.server.json`, 'utf8'),
-            );
-
-            const singleReplicaConf = replicaServerConf[host][path];
-            singleReplicaConf.replicas = undefined;
-            singleReplicaConf.singleReplica = undefined;
-
-            replicaServerConf = {};
-            replicaServerConf[host] = {};
-            replicaServerConf[host][replica] = singleReplicaConf;
-
-            fs.writeFileSync(
-              `./engine-private/replica/${replicaDeployId}/conf.server.json`,
-              JSON.stringify(replicaServerConf, null, 4),
-              'utf8',
-            );
-          }
-        }
-      }
-      break;
-    }
-
     case 'rename-package': {
       const name = process.argv[3];
       const originPackage = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
@@ -373,11 +226,10 @@ try {
       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 install && echo "\nENABLE_FILE_LOGS=true" >> .env.development`,
-      );
-      shellExec(`cd ../pwa-microservices-template && npm run build && timeout 5s npm run dev`, {
+      shellExec(`npm run update:template`);
+      shellExec(`cd ../pwa-microservices-template && npm install && npm run build`);
+      console.log(fs.existsSync(`../pwa-microservices-template/engine-private/conf/dd-default`));
+      shellExec(`cd ../pwa-microservices-template && ENABLE_FILE_LOGS=true timeout 5s npm run dev`, {
         async: true,
       });
       await timer(5500);
@@ -392,7 +244,6 @@ try {
       Underpost.repo.clean({ paths: ['/home/dd/engine', '/home/dd/engine/engine-private '] });
       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');
@@ -449,30 +300,16 @@ try {
       shellExec(`node bin/deploy cli-docs ${version} ${newVersion}`);
       shellExec(`node bin/deploy update-dependencies`);
       shellExec(`node bin/build dd`);
-      shellExec(
-        `node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd production`,
-      );
-      shellExec(
-        `node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd development `,
-      );
-      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(`node bin new --dev --default-conf --deploy-id ${deployId}`);
-      }
+      shellExec(`node bin deploy --build-manifest --sync --info-router --replicas 1 dd production`);
+      shellExec(`node bin deploy --build-manifest --sync --info-router --replicas 1 dd development`);
+      shellExec(`node bin/deploy build-default-confs`);
       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`);
       shellExec(`node bin cron --dev --setup-start`);
-      shellExec(`node bin/deploy build-envs`);
       shellExec(`node bin cmt --changelog-build`);
+      process.exit(0);
       break;
     }
 
@@ -481,7 +318,6 @@ try {
       shellExec(
         `underpost secret underpost --create-from-file /home/dd/engine/engine-private/conf/dd-cron/.env.production`,
       );
-      shellExec(`node bin/deploy sync-envs`);
       shellExec(`node bin/build dd conf`);
       shellExec(`git add . && cd ./engine-private && git add .`);
       shellExec(`node bin cmt . ci package-pwa-microservices-template 'New release v:${process.argv[3]}'`);
@@ -491,6 +327,31 @@ try {
       break;
     }
 
+    case 'build-default-confs': {
+      for (const deployId of fs
+        .readFileSync(`./engine-private/deploy/dd.router`, 'utf8')
+        .split(`,`)
+        .concat(['dd-cron'])) {
+        if (fs.existsSync(`./engine-private/conf/${deployId}/build/development/deployment.yaml`))
+          fs.copySync(
+            `./engine-private/conf/${deployId}/build/development/deployment.yaml`,
+            `./manifests/deployment/${deployId}-development/deployment.yaml`,
+          );
+        if (fs.existsSync(`./engine-private/conf/${deployId}/build/development/proxy.yaml`))
+          fs.copySync(
+            `./engine-private/conf/${deployId}/build/development/proxy.yaml`,
+            `./manifests/deployment/${deployId}-development/proxy.yaml`,
+          );
+        if (fs.existsSync(`./engine-private/conf/${deployId}/build/development/pv-pvc.yaml`))
+          fs.copySync(
+            `./engine-private/conf/${deployId}/build/development/pv-pvc.yaml`,
+            `./manifests/deployment/${deployId}-development/pv-pvc.yaml`,
+          );
+        shellExec(`node bin new --dev --default-conf --deploy-id ${deployId}`);
+      }
+      break;
+    }
+
     case 'update-authors': {
       // #### Ordered by first contribution.
       fs.writeFileSync(
@@ -507,31 +368,6 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       break;
     }
 
-    case 'heb': {
-      // https://besu.hyperledger.org/
-      // https://github.com/hyperledger/besu/archive/refs/tags/24.9.1.tar.gz
-
-      shellCd(`..`);
-
-      // Download the Linux binary
-      shellExec(`wget https://github.com/hyperledger/besu/releases/download/24.9.1/besu-24.9.1.tar.gz`);
-
-      // Unzip the file:
-      shellExec(`tar -xvzf besu-24.9.1.tar.gz`);
-
-      shellCd(`besu-24.9.1`);
-
-      shellExec(`bin/besu --help`);
-
-      // Set env path
-      // export PATH=$PATH:/home/dd/besu-24.9.1/bin
-
-      // Open src
-      // shellExec(`sudo code /home/dd/besu-24.9.1 --user-data-dir="/root/.vscode-root" --no-sandbox`);
-
-      break;
-    }
-
     case 'maas-db': {
       // DROP, ALTER, CREATE, WITH ENCRYPTED
       // sudo -u <user> -h <host> psql <db-name>
@@ -873,71 +709,6 @@ nvidia/gpu-operator \
       break;
     }
 
-    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(
-        `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;
-    }
-
     case 'tls': {
       fs.mkdirSync(`./engine-private/ssl/localhost`, { recursive: true });
       const targetDir = `./engine-private/ssl/${process.argv[3] ? process.argv[3] : 'localhost'}`;
@@ -988,12 +759,18 @@ nvidia/gpu-operator \
     }
 
     case 'sync-start': {
+      const targetDeployId = process.argv[3] || 'dd';
+      const deployIds =
+        targetDeployId === 'dd'
+          ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',')
+          : [targetDeployId];
       const originPackageJson = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
-      for (const deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',')) {
+      for (const deployId of deployIds) {
         const packageJsonPath = `./engine-private/conf/${deployId}/package.json`;
         const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-        packageJson.scripts.start = `${originPackageJson.scripts.start} ${deployId}`;
+        packageJson.scripts = { start: `${originPackageJson.scripts.start} ${deployId}` };
         fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 4), 'utf8');
+        logger.info(`sync-start`, { deployId, start: packageJson.scripts.start });
       }
       break;
     }
@@ -1013,9 +790,31 @@ nvidia/gpu-operator \
       break;
     }
 
-    case 'envs': {
-      shellExec(`node bin/deploy sync-envs`);
-      shellExec(`node bin/deploy build-envs`);
+    case 'sync-conf': {
+      const originPackageJson = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
+      for (const deployId of ['dd-cron'].concat(
+        fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(','),
+      )) {
+        for (const file of fs.readdirSync(`./engine-private/conf/${deployId}/`)) {
+          const deployPackage = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/package.json`, 'utf8'));
+          deployPackage.overrides = originPackageJson.overrides;
+          fs.writeFileSync(
+            `./engine-private/conf/${deployId}/package.json`,
+            JSON.stringify(deployPackage, null, 4),
+            'utf8',
+          );
+          if (file.startsWith('conf.server') && file.endsWith('.json')) {
+            const filePath = `./engine-private/conf/${deployId}/${file}`;
+            const confObj = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+            for (const host of Object.keys(confObj)) {
+              for (const path of Object.keys(confObj[host])) {
+              }
+            }
+            fs.writeFileSync(filePath, JSON.stringify(confObj, null, 4), 'utf8');
+            logger.info(`sync-conf`, { deployId, file });
+          }
+        }
+      }
       break;
     }
 
@@ -1073,6 +872,40 @@ nvidia/gpu-operator \
 `);
       break;
     }
+
+    case 'dependabot': {
+      shellExec(`git fetch origin`);
+
+      const { stdout: branchOutput } = shellExec(`git branch -r`, { silent: true });
+      const dependabotBranches = branchOutput
+        .split('\n')
+        .map((b) => b.trim())
+        .filter((b) => b.startsWith('remotes/origin/dependabot/') || b.startsWith('origin/dependabot/'))
+        .map((b) => b.replace(/^remotes\//, '').replace(/^origin\//, ''));
+
+      if (dependabotBranches.length === 0) {
+        logger.info('No remote dependabot branches found');
+        break;
+      }
+
+      logger.info('Found dependabot branches:', dependabotBranches);
+
+      for (const branch of dependabotBranches) {
+        logger.info(`Checking out branch: ${branch}`);
+        shellExec(`git checkout -B ${branch} origin/${branch}`);
+      }
+
+      logger.info('Checking out master');
+      shellExec(`git checkout master`);
+
+      for (const branch of dependabotBranches) {
+        logger.info(`Merging branch: ${branch}`);
+        shellExec(`git merge ${branch}`);
+      }
+
+      logger.info('All dependabot branches merged into master');
+      break;
+    }
   }
 } catch (error) {
   logger.error(error, error.stack);

package/bin/file.js

@@ -99,6 +99,7 @@ try {
           './src/server/atlas-sprite-sheet-generator.js',
           './src/server/shape-generator.js',
           './src/server/semantic-layer-generator.js',
+          './src/server/besu-genesis-generator.js',
           './test/shape-generator.test.js',
           'bin/cyberia.js',
         ]) {
@@ -141,7 +142,7 @@ try {
         templatePackageJson.keywords = uniqueArray(
           ['pwa', 'microservices', 'template', 'builder'].concat(templatePackageJson.keywords),
         );
-        delete templatePackageJson.scripts['update-template'];
+        delete templatePackageJson.scripts['update:template'];
         fs.writeFileSync(
           '../pwa-microservices-template/package.json',
           JSON.stringify(templatePackageJson, null, 4),