@underpostnet/underpost 2.8.1 → 2.8.5

package/README.md

@@ -16,7 +16,7 @@ template
 
 <div align="center">
 
-<a target="_top"  href='https://www.npmjs.com/package/npm/v/10.2.3' ><img alt='npm' src='https://img.shields.io/badge/npm v10.2.3-100000?style=flat&logo=npm&logoColor=white&labelColor=CB3837&color=727273'/></a> <a target="_top"  href='https://nodejs.org/download/release/v22.9.0/' ><img alt='nodedotjs' src='https://img.shields.io/badge/node v22.9.0-100000?style=flat&logo=nodedotjs&logoColor=white&labelColor=5FA04E&color=727273'/></a> <a target="_top"  href='https://pgp.mongodb.com/' ><img alt='mongodb' src='https://img.shields.io/badge/mongodb_server v7.0-100000?style=flat&logo=mongodb&logoColor=white&labelColor=47A248&color=727273'/></a>
+<a target="_top"  href='https://www.npmjs.com/package/npm/v/11.1.0' ><img alt='npm' src='https://img.shields.io/badge/npm v11.1.0-100000?style=flat&logo=npm&logoColor=white&labelColor=CB3837&color=727273'/></a> <a target="_top"  href='https://nodejs.org/download/release/v22.9.0/' ><img alt='nodedotjs' src='https://img.shields.io/badge/node v23.8.0-100000?style=flat&logo=nodedotjs&logoColor=white&labelColor=5FA04E&color=727273'/></a> <a target="_top"  href='https://pgp.mongodb.com/' ><img alt='mongodb' src='https://img.shields.io/badge/mongodb_server v7.0-100000?style=flat&logo=mongodb&logoColor=white&labelColor=47A248&color=727273'/></a>
 
 </div>
 
@@ -67,30 +67,3 @@ Run dev client server
 ```bash
 npm run dev
 ```
-
-Run dev api server
-
-```bash
-npm run dev-api
-```
-
-Run on `pm2`
-
-```bash
-npm run pm2
-```
-
-Run on `docker-compose`
-
-```bash
-npm run start:docker
-```
-
-Run on `docker`
-
-```bash
-# build image
-docker build . -t app-name
-# run image
-docker run --name app-name-instance -p 41061:3001 -p 41062:3002 app-name
-```

package/bin/build.js

@@ -0,0 +1,161 @@
+import fs from 'fs-extra';
+import { loggerFactory } from '../src/server/logger.js';
+import { shellExec } from '../src/server/process.js';
+import dotenv from 'dotenv';
+import { getCapVariableName } from '../src/client/components/core/CommonJs.js';
+import { getPathsSSR } from '../src/server/conf.js';
+
+const baseConfPath = './engine-private/conf/dd-cron/.env.production';
+if (fs.existsSync(baseConfPath)) dotenv.config({ path: baseConfPath, override: true });
+
+const logger = loggerFactory(import.meta);
+
+// (async () => {
+//   return;
+//   const files = await fs.readdir(`./src`);
+//   for (const relativePath of files) {
+//   }
+// })();
+
+const confName = process.argv[2];
+const basePath = '../pwa-microservices-template';
+const repoName = `engine-${confName.split('dd-')[1]}`;
+
+logger.info('', {
+  confName,
+  repoName,
+  basePath,
+});
+
+if (process.argv.includes('clean')) {
+  if (fs.existsSync(`${basePath}/images`)) fs.copySync(`${basePath}/images`, `./images`);
+  shellExec(`cd ${basePath} && git checkout .`);
+  shellExec(`cd ${basePath} && git clean -f -d`);
+  process.exit(0);
+}
+
+if (process.argv.includes('conf')) {
+  for (const _confName of (confName === 'dd'
+    ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8')
+    : confName
+  ).split(',')) {
+    const _repoName = `engine-${_confName.split('dd-')[1]}`;
+    const privateRepoName = `${_repoName}-private`;
+    const privateGitUri = `${process.env.GITHUB_USERNAME}/${privateRepoName}`;
+
+    if (!fs.existsSync(`../${privateRepoName}`)) {
+      shellExec(`cd .. && underpost clone ${privateGitUri}`, { silent: true });
+    } else {
+      shellExec(`cd ../${privateRepoName} && underpost pull . ${privateGitUri}`);
+    }
+    const toPath = `../${privateRepoName}/conf/${_confName}`;
+    fs.removeSync(toPath);
+    fs.mkdirSync(toPath, { recursive: true });
+    fs.copySync(`./engine-private/conf/${_confName}`, toPath);
+    if (fs.existsSync(`./engine-private/replica`)) {
+      const replicas = await fs.readdir(`./engine-private/replica`);
+      for (const replica of replicas)
+        if (replica.match(_confName))
+          fs.copySync(`./engine-private/replica/${replica}`, `../${privateRepoName}/replica/${replica}`);
+    }
+    shellExec(
+      `cd ../${privateRepoName}` +
+        ` && git add .` +
+        ` && underpost cmt . ci engine-core-conf 'Update ${_confName} conf'` +
+        ` && underpost push . ${privateGitUri}`,
+    );
+  }
+  process.exit(0);
+}
+
+const { DefaultConf } = await import(`../conf.${confName}.js`);
+
+{
+  for (const host of Object.keys(DefaultConf.server)) {
+    for (const path of Object.keys(DefaultConf.server[host])) {
+      const { apis, ws } = DefaultConf.server[host][path];
+      if (apis)
+        for (const api of apis) {
+          {
+            const originPath = `./src/api/${api}`;
+            logger.info(`Build`, originPath);
+            fs.copySync(originPath, `${basePath}/src/api/${api}`);
+          }
+          {
+            const originPath = `./src/client/services/${api}`;
+            logger.info(`Build`, originPath);
+            fs.copySync(originPath, `${basePath}/src/client/services/${api}`);
+          }
+        }
+
+      if (ws && ws !== 'core' && ws !== 'default') {
+        fs.copySync(`./src/ws/${ws}`, `${basePath}/src/ws/${ws}`);
+      }
+    }
+  }
+}
+
+{
+  for (const client of Object.keys(DefaultConf.client)) {
+    const capName = getCapVariableName(client);
+    for (const component of Object.keys(DefaultConf.client[client].components)) {
+      const originPath = `./src/client/components/${component}`;
+      if (fs.existsSync(originPath)) {
+        logger.info(`Build`, originPath);
+        fs.copySync(originPath, `${basePath}/src/client/components/${component}`);
+      }
+    }
+    {
+      const originPath = `./src/client/${capName}.index.js`;
+      if (fs.existsSync(originPath)) {
+        logger.info(`Build`, originPath);
+        fs.copyFileSync(originPath, `${basePath}/src/client/${capName}.index.js`);
+      }
+    }
+    {
+      const originPath = `./src/client/public/${client}`;
+      if (fs.existsSync(originPath)) {
+        logger.info(`Build`, originPath);
+        fs.copySync(originPath, `${basePath}/src/client/public/${client}`);
+      }
+    }
+  }
+}
+
+{
+  for (const client of Object.keys(DefaultConf.ssr)) {
+    const ssrPaths = getPathsSSR(DefaultConf.ssr[client]);
+    for (const originPath of ssrPaths) {
+      if (fs.existsSync(originPath)) {
+        logger.info(`Build`, originPath);
+        fs.copySync(originPath, `${basePath}/${originPath}`);
+      }
+    }
+  }
+
+  fs.copyFileSync(`./conf.${confName}.js`, `${basePath}/conf.js`);
+  fs.copyFileSync(
+    `./.github/workflows/engine.${confName.split('dd-')[1]}.ci.yml`,
+    `${basePath}/.github/workflows/engine.${confName.split('dd-')[1]}.ci.yml`,
+  );
+
+  const packageJson = JSON.parse(fs.readFileSync(`${basePath}/package.json`, 'utf8'));
+  packageJson.name = repoName;
+  fs.writeFileSync(
+    `${basePath}/package.json`,
+    JSON.stringify(packageJson, null, 4).replaceAll('pwa-microservices-template', repoName),
+    'utf8',
+  );
+
+  fs.copySync(`./src/cli`, `${basePath}/src/cli`);
+  if (!fs.existsSync(`${basePath}/images`)) fs.mkdirSync(`${basePath}/images`);
+
+  const env = process.argv.includes('development') ? 'development' : 'production';
+  const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml', 'secret.yaml'];
+  // remove engine-private of .dockerignore for local testing
+  for (const file of deploymentsFiles) {
+    if (fs.existsSync(`./manifests/deployment/${confName}-${env}/${file}`)) {
+      fs.copyFileSync(`./manifests/deployment/${confName}-${env}/${file}`, `${basePath}/${file}`);
+    }
+  }
+}

package/bin/db.js

@@ -4,10 +4,9 @@ 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 } from '../src/server/conf.js';
+import { getCapVariableName, getRestoreCronCmd, loadConf, splitFileFactory } from '../src/server/conf.js';
 import { DataBaseProvider } from '../src/db/DataBaseProvider.js';
 import { hashPassword } from '../src/server/auth.js';
-import splitFile from 'split-file';
 
 const logger = loggerFactory(import.meta);
 
@@ -101,28 +100,7 @@ try {
 
             cmd = `mysqldump -u ${user} -p${password} ${name} > ${cmdBackupPath}`;
             shellExec(cmd);
-            const stats = fs.statSync(cmdBackupPath);
-            const maxSizeInBytes = 1024 * 1024 * 50; // 50 mb
-            const fileSizeInBytes = stats.size;
-            if (fileSizeInBytes > maxSizeInBytes) {
-              await new Promise((resolve) => {
-                splitFile
-                  .splitFileBySize(cmdBackupPath, maxSizeInBytes) // 50 mb
-                  .then((names) => {
-                    fs.writeFileSync(
-                      `${cmdBackupPath.split('/').slice(0, -1).join('/')}/${name}-parths.json`,
-                      JSON.stringify(names, null, 4),
-                      'utf8',
-                    );
-                    resolve();
-                  })
-                  .catch((err) => {
-                    console.log('Error: ', err);
-                    resolve();
-                  });
-              });
-              fs.removeSync(cmdBackupPath);
-            }
+            await splitFileFactory(name, cmdBackupPath);
           }
           break;
         case 'import':

package/bin/deploy.js

@@ -2,9 +2,8 @@ import fs from 'fs-extra';
 import axios from 'axios';
 
 import dotenv from 'dotenv';
-import plantuml from 'plantuml';
 
-import { shellCd, shellExec } from '../src/server/process.js';
+import { pbcopy, shellCd, shellExec } from '../src/server/process.js';
 import { loggerFactory } from '../src/server/logger.js';
 import {
   Config,
@@ -26,10 +25,10 @@ import {
   restoreMacroDb,
   fixDependencies,
   setUpProxyMaintenanceServer,
+  writeEnv,
 } from '../src/server/conf.js';
 import { buildClient } from '../src/server/client-build.js';
 import { range, setPad, timer, uniqueArray } from '../src/client/components/core/CommonJs.js';
-import simpleGit from 'simple-git';
 import { MongooseDB } from '../src/db/mongo/MongooseDB.js';
 import { Lampp } from '../src/runtime/lampp/Lampp.js';
 import { DefaultConf } from '../conf.js';
@@ -139,8 +138,7 @@ try {
       }
       break;
     case 'conf': {
-      loadConf(process.argv[3]);
-      if (process.argv[4]) fs.writeFileSync(`.env`, fs.readFileSync(`.env.${process.argv[4]}`, 'utf8'), 'utf8');
+      loadConf(process.argv[3], process.argv[4]);
       break;
     }
     case 'run':
@@ -161,10 +159,6 @@ try {
       }
       break;
 
-    case 'remove-await-deploy': {
-      if (fs.existsSync(`./tmp/await-deploy`)) fs.remove(`./tmp/await-deploy`);
-      break;
-    }
     case 'new-nodejs-app':
       {
         const deployId = process.argv[3];
@@ -231,6 +225,7 @@ try {
       break;
     case 'build-full-client':
       {
+        dotenv.config({ override: true });
         if (!process.argv[3]) process.argv[3] = 'default';
         const { deployId, folder } = loadConf(process.argv[3]);
 
@@ -256,20 +251,7 @@ try {
                   serverConf[host][path].replicas.map((replica) => buildReplicaId({ deployId, replica })),
                 );
 
-                shellExec(Cmd.replica(deployId, host, path));
-              }
-              if (serverConf[host][path].db) {
-                switch (serverConf[host][path].db.provider) {
-                  case 'mariadb':
-                    {
-                      shellExec(`node bin/db ${host}${path} create ${deployId}`);
-                    }
-
-                    break;
-
-                  default:
-                    break;
-                }
+                // shellExec(Cmd.replica(deployId, host, path));
               }
             }
           }
@@ -278,7 +260,7 @@ try {
         await buildClient();
 
         for (const replicaDeployId of deployIdSingleReplicas) {
-          shellExec(Cmd.conf(replicaDeployId));
+          shellExec(Cmd.conf(replicaDeployId, process.env.NODE_ENV));
           shellExec(Cmd.build(replicaDeployId));
         }
       }
@@ -307,7 +289,7 @@ try {
     }
 
     case 'adminer': {
-      const directory = '/dd/engine/public/adminer';
+      const directory = '/home/dd/engine/public/adminer';
       // const host = '127.0.0.1';
       const host = 'localhost';
       const port = 80;
@@ -337,7 +319,7 @@ try {
 
     case 'pma':
       {
-        const directory = '/dd/engine/public/phpmyadmin';
+        const directory = '/home/dd/engine/public/phpmyadmin';
         // const host = '127.0.0.1';
         const host = 'localhost';
         const port = 80;
@@ -454,14 +436,16 @@ try {
       }
       break;
 
-    case 'update-package':
+    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') {
-          originPackage.scripts.start = JSON.parse(fs.readFileSync(filePah), 'utf8').scripts.start;
-          fs.writeFileSync(filePah, JSON.stringify(originPackage, null, 4), 'utf8');
+          const deployPackage = JSON.parse(fs.readFileSync(filePah), 'utf8');
+          deployPackage.dependencies = originPackage.dependencies;
+          deployPackage.devDependencies = originPackage.devDependencies;
+          fs.writeFileSync(filePah, JSON.stringify(deployPackage, null, 4), 'utf8');
         }
       }
       break;
@@ -546,13 +530,7 @@ try {
             ? envInstanceObj.port
             : envInstanceObj.port + port - singleReplicaHosts.length - (replicaHost ? 1 : 0);
 
-          fs.writeFileSync(
-            envPath,
-            Object.keys(envObj)
-              .map((key) => `${key}=${envObj[key]}`)
-              .join(`\n`),
-            'utf8',
-          );
+          writeEnv(envPath, envObj);
         }
         const serverConf = loadReplicas(
           JSON.parse(fs.readFileSync(`${baseConfPath}/${deployId}/conf.server.json`, 'utf8')),
@@ -596,6 +574,7 @@ try {
     }
     case 'build-uml':
       {
+        const plantuml = await import('plantuml');
         const folder = process.argv[3] ? process.argv[3] : `./src/client/public/default/plantuml`;
         const confData = Config.default;
 
@@ -731,6 +710,16 @@ try {
               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',
+              );
+            }
           }
         }
 
@@ -757,41 +746,32 @@ try {
           'utf8',
         );
 
-        shellExec(`node bin/deploy update-package`);
+        shellExec(`node bin/deploy update-dependencies`);
         shellExec(`auto-changelog`);
       }
       break;
 
     case 'update-authors': {
-      // shellExec(`git log --reverse --format='%aN (<%aE>)' | sort -u`, { stdout: true });
-      const logs = await simpleGit().log();
-
+      // #### Ordered by first contribution.
       fs.writeFileSync(
         './AUTHORS.md',
         `# Authors
 
-#### Ordered by first contribution.
 
-${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}](mailto:${log.author_email}))`)).join(`
-`)}
+${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).join(`\n\n\n`)}
 
 #### Generated by [underpost.net](https://underpost.net)`,
         'utf8',
       );
 
-      // hash: '1c7418ad2f49c7798a6d28d370b34c69d31dce46',
-      // date: '2024-09-16T17:10:13-03:00',
-      // message: 'update',
-      // refs: '',
-      // body: '',
-      // author_name: 'fcoverdugo',
-      // author_email: 'fcoverdugoa@underpost.net'
+      break;
     }
 
     case 'restore-macro-db':
       {
         const deployGroupId = process.argv[3];
-        await restoreMacroDb(deployGroupId);
+        const deployId = process.argv[4];
+        await restoreMacroDb(deployGroupId, deployId);
       }
 
       break;
@@ -826,10 +806,10 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
             shellExec(`bin/besu --help`);
 
             // Set env path
-            // export PATH=$PATH:/dd/besu-24.9.1/bin
+            // export PATH=$PATH:/home/dd/besu-24.9.1/bin
 
             // Open src
-            // shellExec(`sudo code /dd/besu-24.9.1 --user-data-dir="/root/.vscode-root" --no-sandbox`);
+            // shellExec(`sudo code /home/dd/besu-24.9.1 --user-data-dir="/root/.vscode-root" --no-sandbox`);
           }
 
           break;
@@ -847,23 +827,43 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
     }
 
     case 'update-default-conf': {
-      const host = process.argv[3] ? process.argv[3] : 'underpostnet.github.io';
-      const path = process.argv[4] ? process.argv[4] : '/pwa-microservices-template-ghpkg';
-      DefaultConf.server = {
-        [host]: { [path]: DefaultConf.server['default.net']['/'] },
-      };
-      DefaultConf.server[host][path].apiBaseProxyPath = '/';
-      DefaultConf.server[host][path].apiBaseHost = 'www.nexodev.org';
-      fs.writeFileSync(
-        './conf.js',
-        `
-        const DefaultConf = ${JSONweb(DefaultConf)};
-        
-        export { DefaultConf }
-
-        `,
-        'utf8',
-      );
+      const defaultServer = DefaultConf.server['default.net']['/'];
+      let confName = process.argv[3];
+      if (confName === 'ghpkg') {
+        confName = undefined;
+        const host = 'underpostnet.github.io';
+        const path = '/pwa-microservices-template-ghpkg';
+        DefaultConf.server = {
+          [host]: { [path]: defaultServer },
+        };
+        DefaultConf.server[host][path].apiBaseProxyPath = '/';
+        DefaultConf.server[host][path].apiBaseHost = 'www.nexodev.org';
+      } else if (confName) {
+        DefaultConf.client = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.client.json`, 'utf8'));
+        DefaultConf.server = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
+        DefaultConf.ssr = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.ssr.json`, 'utf8'));
+        DefaultConf.cron = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.cron.json`, 'utf8'));
+
+        for (const host of Object.keys(DefaultConf.server)) {
+          for (const path of Object.keys(DefaultConf.server[host])) {
+            DefaultConf.server[host][path].db = defaultServer.db;
+            DefaultConf.server[host][path].mailer = defaultServer.mailer;
+
+            delete DefaultConf.server[host][path]._wp_client;
+            delete DefaultConf.server[host][path]._wp_git;
+            delete DefaultConf.server[host][path]._wp_directory;
+            delete DefaultConf.server[host][path].wp;
+            delete DefaultConf.server[host][path].git;
+            delete DefaultConf.server[host][path].directory;
+          }
+        }
+      }
+      const sepRender = '/**/';
+      const confRawPaths = fs.readFileSync('./conf.js', 'utf8').split(sepRender);
+      confRawPaths[1] = `${JSON.stringify(DefaultConf)};`;
+      const targetConfPath = `./conf${confName ? `.${confName}` : ''}.js`;
+      fs.writeFileSync(targetConfPath, confRawPaths.join(sepRender), 'utf8');
+      shellExec(`prettier --write ${targetConfPath}`);
 
       break;
     }
@@ -879,7 +879,11 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
     }
     case 'ssh-import-client-keys': {
       const host = process.argv[3];
-      shellExec(`node bin/deploy set-ssh-keys ./engine-private/deploy/ssh_host_rsa_key${host ? ` ${host}` : ``} clean`);
+      shellExec(
+        `node bin/deploy set-ssh-keys ./engine-private/deploy/ssh_host_rsa_key ${host ? ` ${host}` : ``} ${
+          process.argv.includes('clean') ? 'clean' : ''
+        }`,
+      );
       break;
     }
     case 'ssh-keys': {
@@ -944,14 +948,24 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
     }
 
     case 'ssh': {
-      if (!process.argv.includes('server')) {
-        shellExec(`sudo apt update`);
-        shellExec(`sudo apt install openssh-server -y`);
-        shellExec(`sudo apt install ssh-askpass`);
+      if (process.argv.includes('rocky')) {
+        shellExec(`sudo systemctl enable sshd`);
+
+        shellExec(`sudo systemctl start sshd`);
+
+        shellExec(`sudo systemctl status sshd`);
+
+        shellExec(`sudo ss -lt`);
+      } else {
+        if (!process.argv.includes('server')) {
+          shellExec(`sudo apt update`);
+          shellExec(`sudo apt install openssh-server -y`);
+          shellExec(`sudo apt install ssh-askpass`);
+        }
+        shellExec(`sudo systemctl enable ssh`);
+        shellExec(`sudo systemctl restart ssh`);
+        shellExec(`sudo systemctl status ssh`);
       }
-      shellExec(`sudo systemctl enable ssh`);
-      shellExec(`sudo systemctl restart ssh`);
-      shellExec(`sudo systemctl status ssh`);
       // sudo service ssh restart
       shellExec(`ip a`);
 
@@ -1009,11 +1023,26 @@ ${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}]
 
     case 'valkey': {
       if (!process.argv.includes('server')) {
-        shellExec(`cd /dd && git clone https://github.com/valkey-io/valkey.git`);
-        shellExec(`cd /dd/valkey && make`);
-        shellExec(`apt install valkey-tools`); // valkey-cli
+        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
+        }
       }
-      shellExec(`cd /dd/valkey && ./src/valkey-server`);
+      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;
     }