cyberia 3.0.3 → 3.2.5

package/bin/deploy.js

@@ -3,27 +3,21 @@ import axios from 'axios';
 
 import dotenv from 'dotenv';
 
-import { pbcopy, shellCd, shellExec } from '../src/server/process.js';
+import { pbcopy, 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'));
@@ -365,129 +218,28 @@ try {
       break;
     }
 
-    case 'version-build': {
-      dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
-      shellCd(`/home/dd/engine`);
-      Underpost.repo.clean({ paths: ['/home/dd/engine', '/home/dd/engine/engine-private '] });
-      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`);
-      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`, {
-        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);
-      if (!templateRunnerResult || templateRunnerResult.toLowerCase().match('error')) {
-        logger.error('Test template runner result failed');
-        break;
-      }
-      shellCd(`/home/dd/engine`);
-      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');
-
-      const originPackageLockJson = JSON.parse(fs.readFileSync(`package-lock.json`, 'utf8'));
-      originPackageLockJson.version = newVersion;
-      originPackageLockJson.packages[''].version = newVersion;
-      fs.writeFileSync(`package-lock.json`, JSON.stringify(originPackageLockJson, null, 4), 'utf8');
-
-      if (fs.existsSync(`./engine-private/conf`)) {
-        const files = await fs.readdir(`./engine-private/conf`, { recursive: true });
-        for (const relativePath of files) {
-          const filePah = `./engine-private/conf/${relativePath.replaceAll(`\\`, '/')}`;
-          if (filePah.split('/').pop() === 'package.json') {
-            const originPackage = JSON.parse(fs.readFileSync(filePah, 'utf8'));
-            originPackage.version = newVersion;
-            fs.writeFileSync(filePah, JSON.stringify(originPackage, null, 4), 'utf8');
-          }
-          if (filePah.split('/').pop() === 'deployment.yaml') {
-            fs.writeFileSync(
-              filePah,
-              fs
-                .readFileSync(filePah, 'utf8')
-                .replaceAll(`v${version}`, `v${newVersion}`)
-                .replaceAll(`engine.version: ${version}`, `engine.version: ${newVersion}`),
-              'utf8',
-            );
-          }
-        }
-      }
-
-      fs.writeFileSync(
-        `./manifests/deployment/dd-default-development/deployment.yaml`,
-        fs
-          .readFileSync(`./manifests/deployment/dd-default-development/deployment.yaml`, 'utf8')
-          .replaceAll(`underpost:v${version}`, `underpost:v${newVersion}`),
-        'utf8',
-      );
-
-      if (fs.existsSync(`./.github/workflows/docker-image.ci.yml`))
-        fs.writeFileSync(
-          `./.github/workflows/docker-image.ci.yml`,
-          fs
-            .readFileSync(`./.github/workflows/docker-image.ci.yml`, 'utf8')
-            .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
-          'utf8',
-        );
-
-      fs.writeFileSync(
-        `./src/index.js`,
-        fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
-        'utf8',
-      );
-      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`,
-        );
+    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}`);
       }
-      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`);
-      break;
-    }
-
-    case 'version-deploy': {
-      dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
-      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]}'`);
-      shellExec(`node bin cmt ./engine-private ci package-pwa-microservices-template`);
-      shellExec(`node bin push . ${process.env.GITHUB_USERNAME}/engine`);
-      shellExec(`cd ./engine-private && node ../bin push . ${process.env.GITHUB_USERNAME}/engine-private`);
       break;
     }
 
@@ -507,31 +259,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>
@@ -639,7 +366,10 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
         `${path}/.env`,
         fs
           .readFileSync(`${path}/.env`, 'utf8')
-          .replace(`FIRST_SUPERUSER=admin@example.com`, `FIRST_SUPERUSER=development@underpost.net`)
+          .replace(
+            `FIRST_SUPERUSER=admin@example.com`,
+            `FIRST_SUPERUSER=${process.env.GITHUB_EMAIL || 'development@underpost.net'}`,
+          )
           .replace(`FIRST_SUPERUSER_PASSWORD=changethis`, `FIRST_SUPERUSER_PASSWORD=${password}`)
           .replace(`SECRET_KEY=changethis`, `SECRET_KEY=${password}`)
           .replace(`POSTGRES_DB=app`, `POSTGRES_DB=postgresdb`)
@@ -725,7 +455,7 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
           shellExec(
             `sudo kubectl create secret generic ${secretSelector}` +
               ` --from-file=SECRET_KEY=/home/dd/engine/engine-private/postgresql-password` +
-              ` --from-literal=FIRST_SUPERUSER=development@underpost.net` +
+              ` --from-literal=FIRST_SUPERUSER=${process.env.GITHUB_EMAIL || 'development@underpost.net'}` +
               ` --from-file=FIRST_SUPERUSER_PASSWORD=/home/dd/engine/engine-private/postgresql-password` +
               ` --dry-run=client -o yaml | kubectl apply -f - -n ${namespace}`,
           );
@@ -873,71 +603,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 +653,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 +684,32 @@ 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;
+          deployPackage.dependencies = originPackageJson.dependencies;
+          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;
     }
 
@@ -1040,7 +734,7 @@ nvidia/gpu-operator \
       if (fs.existsSync(toPath)) fs.removeSync(toPath);
       shellExec(`node bin/deploy pw-conf ${scriptPath}`);
       shellExec(`kubectl delete deployment playwright-server --ignore-not-found`);
-      while (Underpost.deploy.get('playwright-server').length > 0) {
+      while (Underpost.kubectl.get('playwright-server').length > 0) {
         logger.info(`Waiting for playwright-server deployment to be deleted...`);
         await timer(1000);
       }
@@ -1048,13 +742,13 @@ nvidia/gpu-operator \
       const id = 'playwright-server';
       await Underpost.test.statusMonitor(id);
       const nameSpace = 'default';
-      const [pod] = Underpost.deploy.get(id);
+      const [pod] = Underpost.kubectl.get(id);
       const podName = pod.NAME;
       shellExec(`kubectl logs -f ${podName} -n ${nameSpace}`, {
         async: true,
       });
       (async () => {
-        while (!Underpost.deploy.existsContainerFile({ podName, path: fromPath })) {
+        while (!Underpost.kubectl.existsFile({ podName, path: fromPath })) {
           await timer(1000);
           logger.info(`Waiting for file ${fromPath} in pod ${podName}...`);
         }
@@ -1073,6 +767,198 @@ nvidia/gpu-operator \
 `);
       break;
     }
+
+    case 'dependabot': {
+      dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
+      shellExec(`git fetch origin --prune`);
+
+      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);
+
+      // Stash local changes to prevent checkout/merge conflicts
+      const stashResult = shellExec(`git stash --include-untracked`, { silent: true });
+      const hasStash = !stashResult.stdout.includes('No local changes to save');
+
+      // Checkout master
+      const checkoutResult = shellExec(`git checkout master`);
+      if (checkoutResult.code !== 0) {
+        logger.error('Failed to checkout master');
+        if (hasStash) shellExec(`git stash pop`);
+        break;
+      }
+
+      // Pull latest master
+      shellExec(`git pull origin master`);
+
+      // Get repo URI from remote
+      const remoteUrl = shellExec(`git config --get remote.origin.url`, { stdout: true, silent: true }).trim();
+      const gitUri = remoteUrl.replace(/.*github\.com[:/]/, '').replace(/\.git$/, '');
+
+      const mergedBranches = [];
+      const failedBranches = [];
+
+      for (const branch of dependabotBranches) {
+        logger.info(`Merging branch: ${branch}`);
+        const mergeResult = shellExec(`git merge origin/${branch}`);
+        if (mergeResult.code === 0) {
+          const isAlreadyMerged = mergeResult.stdout && mergeResult.stdout.includes('Already up to date');
+          mergedBranches.push({ branch, isAlreadyMerged });
+        } else {
+          logger.error(`Failed to merge branch: ${branch}`);
+          shellExec(`git merge --abort`, { silent: true });
+          failedBranches.push(branch);
+        }
+      }
+
+      // Delete merged local and remote branches
+      for (const { branch, isAlreadyMerged } of mergedBranches) {
+        shellExec(`git branch -D ${branch}`, { silent: true });
+        // logger.info(`Deleting remote branch: ${branch}${isAlreadyMerged ? ' (already merged)' : ''}`);
+        // shellExec(`git push https://${process.env.GITHUB_TOKEN}@github.com/${gitUri}.git --delete ${branch}`, {
+        //   disableLog: true,
+        // });
+      }
+
+      // Restore stashed changes
+      if (hasStash) shellExec(`git stash pop`);
+
+      logger.info(
+        'Merged branches:',
+        mergedBranches.map((m) => m.branch),
+      );
+      if (failedBranches.length > 0) logger.warn('Failed branches:', failedBranches);
+      logger.info('Dependabot merge completed');
+      break;
+    }
+
+    case 'add-api': {
+      // node bin/deploy add-api <apiId> <deployId> [clientId] [host]
+      // Example: node bin/deploy add-api cyberia-dialogue dd-cyberia cyberia-portal
+      // Example: node bin/deploy add-api cyberia-dialogue dd-cyberia cyberia-portal underpost.net
+      //
+      // Adds an API to server conf files (main + dev variants) and client conf.
+      // - conf.server.json: adds apiId to every host/path that has an `apis` array
+      //   (or only to the specified host if [host] is provided)
+      // - conf.server.dev.*.json: same treatment for all dev variants
+      // - conf.client.json: adds apiId to the specified clientId's `services` array
+      // Idempotent: skips if the API is already present.
+
+      const apiId = process.argv[3];
+      const deployId = process.argv[4];
+      const clientId = process.argv[5];
+      const targetHost = process.argv[6];
+
+      if (!apiId || !deployId) {
+        logger.error('Usage: node bin/deploy add-api <apiId> <deployId> [clientId] [host]');
+        logger.error('Example: node bin/deploy add-api cyberia-dialogue dd-cyberia cyberia-portal');
+        logger.error('Example: node bin/deploy add-api cyberia-dialogue dd-cyberia cyberia-portal underpost.net');
+        process.exit(1);
+      }
+
+      const confFolder = `./engine-private/conf/${deployId}`;
+      if (!fs.existsSync(confFolder)) {
+        logger.error(`Config folder not found: ${confFolder}`);
+        process.exit(1);
+      }
+
+      // Helper: add apiId to apis[] arrays in a server conf file (idempotent)
+      // When targetHost is set, only entries under that host are modified.
+      const addApiToServerConf = (filePath) => {
+        if (!fs.existsSync(filePath)) return 0;
+        const conf = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        let count = 0;
+        const hosts = targetHost ? (conf[targetHost] ? [targetHost] : []) : Object.keys(conf);
+        for (const host of hosts) {
+          for (const path of Object.keys(conf[host])) {
+            const entry = conf[host][path];
+            if (Array.isArray(entry.apis) && entry.apis.length > 0 && !entry.apis.includes(apiId)) {
+              entry.apis.push(apiId);
+              count++;
+            }
+          }
+        }
+        if (count > 0) {
+          fs.writeFileSync(filePath, JSON.stringify(conf, null, 4), 'utf8');
+        }
+        return count;
+      };
+
+      // 1. Main conf.server.json
+      const mainPath = `${confFolder}/conf.server.json`;
+      const mainCount = addApiToServerConf(mainPath);
+      logger.info(`conf.server.json: added "${apiId}" to ${mainCount} path(s)`);
+
+      // 2. All dev variants: conf.server.dev.*.json
+      const devFiles = fs
+        .readdirSync(confFolder)
+        .filter((f) => f.startsWith('conf.server.dev.') && f.endsWith('.json'));
+      for (const devFile of devFiles) {
+        const devPath = `${confFolder}/${devFile}`;
+        const devCount = addApiToServerConf(devPath);
+        logger.info(`${devFile}: added "${apiId}" to ${devCount} path(s)`);
+      }
+
+      // Helper: add apiId to a client conf file's clientId services (idempotent)
+      const addApiToClientConf = (filePath, label) => {
+        if (!clientId || !fs.existsSync(filePath)) return;
+        const confClient = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        if (confClient[clientId] && Array.isArray(confClient[clientId].services)) {
+          if (!confClient[clientId].services.includes(apiId)) {
+            confClient[clientId].services.push(apiId);
+            fs.writeFileSync(filePath, JSON.stringify(confClient, null, 4), 'utf8');
+            logger.info(`${label}: added "${apiId}" to "${clientId}" services`);
+          } else {
+            logger.info(`${label}: "${apiId}" already in "${clientId}" services`);
+          }
+        } else {
+          logger.warn(`${label}: clientId "${clientId}" not found or has no services array`);
+        }
+      };
+
+      // 3. Client conf.client.json
+      addApiToClientConf(`${confFolder}/conf.client.json`, 'conf.client.json');
+
+      // 4. Replicas: engine-private/replica/<deployId>-*
+      const replicaBase = './engine-private/replica';
+      if (fs.existsSync(replicaBase)) {
+        const replicaDirs = fs
+          .readdirSync(replicaBase)
+          .filter((d) => d.startsWith(`${deployId}-`) && fs.statSync(`${replicaBase}/${d}`).isDirectory());
+        for (const replicaDir of replicaDirs) {
+          const replicaFolder = `${replicaBase}/${replicaDir}`;
+          // Server conf
+          const rMainCount = addApiToServerConf(`${replicaFolder}/conf.server.json`);
+          logger.info(`replica/${replicaDir}/conf.server.json: added "${apiId}" to ${rMainCount} path(s)`);
+          // Dev variants
+          const rDevFiles = fs
+            .readdirSync(replicaFolder)
+            .filter((f) => f.startsWith('conf.server.dev.') && f.endsWith('.json'));
+          for (const rDevFile of rDevFiles) {
+            const rDevCount = addApiToServerConf(`${replicaFolder}/${rDevFile}`);
+            logger.info(`replica/${replicaDir}/${rDevFile}: added "${apiId}" to ${rDevCount} path(s)`);
+          }
+          // Client conf
+          addApiToClientConf(`${replicaFolder}/conf.client.json`, `replica/${replicaDir}/conf.client.json`);
+        }
+      }
+
+      // 5. Rebuild default conf
+      shellExec(`node bin new --default-conf --deploy-id ${deployId}`);
+      logger.info(`Rebuilt default conf for ${deployId}`);
+
+      break;
+    }
   }
 } catch (error) {
   logger.error(error, error.stack);