@underpostnet/cyberia 3.2.90 → 3.3.73

package/bin/deploy.js

@@ -3,8 +3,8 @@ import axios from 'axios';
 
 import dotenv from 'dotenv';
 
-import { pbcopy, shellExec } from '../src/server/process.js';
-import { loggerFactory } from '../src/server/logger.js';
+import { pbcopy, shellExec } from '../src/server/runtime/process.js';
+import { loggerFactory } from '../src/server/ops/logger.js';
 import {
   addApiConf,
   addClientConf,
@@ -14,10 +14,11 @@ import {
   addWsConf,
   buildWsSrc,
   cloneSrcComponents,
-  writeEnv,
   buildCliDoc,
   loadConf,
-} from '../src/server/conf.js';
+} from '../src/server/runtime/conf.js';
+import { writeEnv } from '../src/server/runtime/environment.js';
+import { readDeployRoutes, resolveDeployList } from '../src/server/network/router.js';
 import colors from 'colors';
 import { program } from '../src/cli/index.js';
 import { timer, getCapVariableName } from '../src/client/components/core/CommonJs.js';
@@ -124,7 +125,7 @@ try {
 
         shellExec(`node bin/deploy build-nodejs-src-app ${deployId} ${clientId}`);
 
-        await Underpost.repo.client(deployId);
+        await Underpost.client.callback(deployId);
 
         shellExec(`npm run dev ${deployId}`);
       }
@@ -178,73 +179,6 @@ try {
       }
       break;
 
-    case 'update-dependencies':
-      const files = await fs.readdir(`./engine-private/conf`, { recursive: true });
-      const originPackage = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
-      for (const relativePath of files) {
-        const filePah = `./engine-private/conf/${relativePath.replaceAll(`\\`, '/')}`;
-        if (filePah.split('/').pop() === 'package.json') {
-          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 'rename-package': {
-      const name = process.argv[3];
-      const originPackage = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
-      originPackage.name = name;
-      fs.writeFileSync(`./package.json`, JSON.stringify(originPackage, null, 4), 'utf8');
-
-      const originPackageLockJson = JSON.parse(fs.readFileSync(`./package-lock.json`, 'utf8'));
-      originPackageLockJson.name = name;
-      originPackageLockJson.packages[''].name = name;
-      fs.writeFileSync(`./package-lock.json`, JSON.stringify(originPackageLockJson, null, 4), 'utf8');
-
-      break;
-    }
-
-    case 'set-repo': {
-      const originPackage = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
-      originPackage.repository = {
-        type: 'git',
-        url: `git+https://github.com/${process.argv[3]}.git`,
-      };
-      fs.writeFileSync(`./package.json`, JSON.stringify(originPackage, null, 4), 'utf8');
-
-      break;
-    }
-
-    case 'build-default-confs': {
-      for (const deployId of fs
-        .readFileSync(`./engine-private/deploy/dd.router`, 'utf8')
-        .split(`,`)
-        .concat(['dd-cron'])) {
-        // The same set `deploy --build-manifest` mirrors. Anything missing here
-        // is a manifest the project repo silently stops carrying while the
-        // private build dir still has it.
-        for (const file of [
-          'deployment.yaml',
-          'proxy.yaml',
-          'gateway.yaml',
-          'httproute.yaml',
-          'pv-pvc.yaml',
-          'traffic-service.yaml',
-          'grpc-service.yaml',
-        ]) {
-          const source = `./engine-private/conf/${deployId}/build/development/${file}`;
-          const target = `./manifests/deployment/${deployId}-development/${file}`;
-          if (fs.existsSync(source)) fs.copySync(source, target);
-          else fs.removeSync(target);
-        }
-        shellExec(`node bin new --dev --default-conf --deploy-id ${deployId}`);
-      }
-      break;
-    }
-
     case 'update-authors': {
       // #### Ordered by first contribution.
       fs.writeFileSync(
@@ -365,7 +299,7 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
         shellExec(`cd .. && git clone https://github.com/fastapi/full-stack-fastapi-template.git`);
 
       shellExec(`cd ${path} && git checkout . && git clean -f -d`);
-      const password = fs.readFileSync(`/home/dd/engine/engine-private/postgresql-password`, 'utf8');
+      const password = fs.readFileSync(Underpost.secret.seedSources('postgres-secret').password, 'utf8');
 
       fs.writeFileSync(
         `${path}/.env`,
@@ -444,24 +378,26 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       if (process.argv.includes('secret')) {
         const namespace = process.argv.find((arg) => arg.startsWith('--namespace='))?.split('=')[1] || 'default';
         {
+          const postgresPasswordPath = Underpost.secret.seedSources('postgres-secret').password;
           const secretSelector = `fastapi-postgres-credentials`;
           shellExec(`sudo kubectl delete secret ${secretSelector} -n ${namespace} --ignore-not-found`);
           shellExec(
             `sudo kubectl create secret generic ${secretSelector}` +
               ` --from-literal=POSTGRES_DB=postgresdb` +
               ` --from-literal=POSTGRES_USER=admin` +
-              ` --from-file=POSTGRES_PASSWORD=/home/dd/engine/engine-private/postgresql-password` +
+              ` --from-file=POSTGRES_PASSWORD=${postgresPasswordPath}` +
               ` --dry-run=client -o yaml | kubectl apply -f - -n ${namespace}`,
           );
         }
         {
+          const postgresPasswordPath = Underpost.secret.seedSources('postgres-secret').password;
           const secretSelector = `fastapi-backend-config-secret`;
           shellExec(`sudo kubectl delete secret ${secretSelector} -n ${namespace} --ignore-not-found`);
           shellExec(
             `sudo kubectl create secret generic ${secretSelector}` +
-              ` --from-file=SECRET_KEY=/home/dd/engine/engine-private/postgresql-password` +
+              ` --from-file=SECRET_KEY=${postgresPasswordPath}` +
               ` --from-literal=FIRST_SUPERUSER=${process.env.GITHUB_EMAIL || 'development@underpost.net'}` +
-              ` --from-file=FIRST_SUPERUSER_PASSWORD=/home/dd/engine/engine-private/postgresql-password` +
+              ` --from-file=FIRST_SUPERUSER_PASSWORD=${postgresPasswordPath}` +
               ` --dry-run=client -o yaml | kubectl apply -f - -n ${namespace}`,
           );
         }
@@ -659,10 +595,7 @@ 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 deployIds = resolveDeployList(targetDeployId);
       const originPackageJson = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
       for (const deployId of deployIds) {
         const packageJsonPath = `./engine-private/conf/${deployId}/package.json`;
@@ -675,9 +608,7 @@ nvidia/gpu-operator \
     }
 
     case 'sync-envs': {
-      for (const deployId of ['dd-cron'].concat(
-        fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(','),
-      )) {
+      for (const deployId of ['dd-cron'].concat(readDeployRoutes())) {
         for (const env of ['production', 'development', 'test']) {
           const _envObj = dotenv.parse(fs.readFileSync(`./engine-private/conf/${deployId}/.env.${env}`, 'utf8'));
           for (const env of []) {
@@ -691,9 +622,7 @@ nvidia/gpu-operator \
 
     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 deployId of ['dd-cron'].concat(readDeployRoutes())) {
         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;
@@ -718,15 +647,6 @@ nvidia/gpu-operator \
       break;
     }
 
-    case 'cyberia': {
-      const { CyberiaDependencies } = await import(`../src/api/cyberia-server-defaults/cyberia-server-defaults.js`);
-      for (const dep of Object.keys(CyberiaDependencies)) {
-        const ver = CyberiaDependencies[dep];
-        shellExec(`npm install ${dep}@${ver}`);
-      }
-      break;
-    }
-
     case 'pw': {
       const help = `node bin/deploy pw <script-path> <from-path-in-pod> [to-path-on-local]`;
       const scriptPath = process.argv[3];
@@ -1378,7 +1298,7 @@ nvidia/gpu-operator \
       // Example: node bin/deploy add-component ColorPaletteElement dd-cyberia
       // Example: node bin/deploy add-component ColorPaletteElement
       // Adds a component to client conf.main and related replicas.
-      // - if deployId is omitted: iterates deploys in engine-private/deploy/dd.router
+      // - if deployId is omitted: iterates deploys in engine-private/deploy/dd.routes
       // - if clientId is omitted: iterates all clients in each conf.client.json
       // - if submoduleId is omitted: iterates all available components.<submoduleId> arrays per client
       // - validates src/client/components/<submoduleId>/<componentId>.js exists before adding
@@ -1396,13 +1316,7 @@ nvidia/gpu-operator \
         process.exit(1);
       }
 
-      const deployIds = deployIdArg
-        ? [deployIdArg]
-        : fs
-            .readFileSync(`./engine-private/deploy/dd.router`, 'utf8')
-            .split(',')
-            .map((d) => d.trim())
-            .filter(Boolean);
+      const deployIds = deployIdArg ? [deployIdArg] : readDeployRoutes();
 
       const addComponentToClientConf = ({ filePath, label, targetClientId, targetSubmoduleId }) => {
         if (!fs.existsSync(filePath)) return { added: 0, checked: 0, hasComponentFile: false };
@@ -1539,7 +1453,7 @@ nvidia/gpu-operator \
         console.log('Cleaning up existing dd-default config for VM template environment setup');
         fs.removeSync('./engine-private/conf/dd-default');
       }
-      shellExec(`node bin env clean`);
+      shellExec(`node bin app clean`);
       shellExec(`sed -i "s/127.0.0.1/$(underpost ip --dhcp)/g" .env.example`);
       break;
     }