underpost 2.8.47 → 2.8.51

package/src/cli/deploy.js

@@ -1,12 +1,194 @@
+import {
+  buildKindPorts,
+  buildPortProxyRouter,
+  buildProxyRouter,
+  Config,
+  getDataDeploy,
+  loadReplicas,
+} from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
+import dotenv from 'dotenv';
+import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
 class UnderpostDeploy {
   static API = {
-    callback: (deployList = 'default', env = 'development', options = { remove: false }) => {
+    sync(deployList) {
+      const deployGroupId = 'dd.tmp';
+      fs.writeFileSync(`./engine-private/deploy/${deployGroupId}`, deployList, 'utf8');
+      return getDataDeploy({
+        buildSingleReplica: true,
+        deployGroupId,
+      });
+    },
+    async routerFactory(deployList, env) {
+      const initEnvPath = `./engine-private/conf/${deployList.split(',')[0]}/.env.${env}`;
+      const initEnvObj = dotenv.parse(fs.readFileSync(initEnvPath, 'utf8'));
+      process.env.PORT = initEnvObj.PORT;
+      process.env.NODE_ENV = env;
+      await Config.build(undefined, 'proxy', deployList);
+      return buildPortProxyRouter(env === 'development' ? 80 : 443, buildProxyRouter());
+    },
+    async buildManifest(deployList, env) {
+      for (const _deployId of deployList.split(',')) {
+        const deployId = _deployId.trim();
+        if (!deployId) continue;
+
+        const router = await UnderpostDeploy.API.routerFactory(deployId, env);
+        const ports = Object.values(router).map((p) => parseInt(p.split(':')[2]));
+        const fromPort = Math.min(...ports);
+        const toPort = Math.max(...ports);
+        const confServer = loadReplicas(
+          JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
+          'proxy',
+        );
+
+        fs.mkdirSync(`./engine-private/conf/${deployId}/build/${env}`, { recursive: true });
+        if (env === 'development') fs.mkdirSync(`./manifests/deployment/${deployId}-${env}`, { recursive: true });
+
+        logger.info('port range', { deployId, fromPort, toPort });
+
+        const deploymentYamlParts = `apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ${deployId}-${env}
+  labels:
+    app: ${deployId}-${env}
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: ${deployId}-${env}
+  template:
+    metadata:
+      labels:
+        app: ${deployId}-${env}
+    spec:
+      containers:
+        - name: ${deployId}-${env}
+          image: localhost/${deployId}-${env}:${Underpost.version}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ${deployId}-${env}-service
+spec:
+  selector:
+    app: ${deployId}-${env}
+  ports:
+  type: LoadBalancer`.split('ports:');
+        deploymentYamlParts[1] =
+          buildKindPorts(fromPort, toPort) +
+          `  type: LoadBalancer
+`;
+
+        fs.writeFileSync(
+          `./engine-private/conf/${deployId}/build/${env}/deployment.yaml`,
+          deploymentYamlParts.join(`ports:
+`),
+        );
+
+        let proxyYaml = '';
+        let secretYaml = '';
+
+        for (const host of Object.keys(confServer)) {
+          if (env === 'production')
+            secretYaml += `
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: ${host}
+spec:
+  commonName: ${host}
+  dnsNames:
+    - ${host}
+  issuerRef:
+    name: letsencrypt-prod
+    kind: ClusterIssuer
+  secretName: ${host}`;
+
+          const pathPortConditions = [];
+          for (const path of Object.keys(confServer[host])) {
+            const { peer } = confServer[host][path];
+            if (!router[`${host}${path === '/' ? '' : path}`]) continue;
+            const port = parseInt(router[`${host}${path === '/' ? '' : path}`].split(':')[2]);
+            // logger.info('', { host, port, path });
+            pathPortConditions.push({
+              port,
+              path,
+            });
+
+            if (peer) {
+              //  logger.info('', { host, port: port + 1, path: '/peer' });
+              pathPortConditions.push({
+                port: port + 1,
+                path: '/peer',
+              });
+            }
+          }
+
+          // logger.info('', { host, pathPortConditions });
+          proxyYaml += `
+---
+apiVersion: projectcontour.io/v1
+kind: HTTPProxy
+metadata:
+  name: ${host}
+spec:
+  virtualhost:
+    fqdn: ${host}${
+            env === 'development'
+              ? ''
+              : `
+    tls:
+      secretName: ${host}`
+          }
+  routes:`;
+          for (const conditionObj of pathPortConditions) {
+            const { path, port } = conditionObj;
+            proxyYaml += `
+    - conditions:
+        - prefix: ${path}
+      enableWebsockets: true
+      services:
+        - name: ${deployId}-${env}-service
+          port: ${port}`;
+          }
+        }
+        const yamlPath = `./engine-private/conf/${deployId}/build/${env}/proxy.yaml`;
+        fs.writeFileSync(yamlPath, proxyYaml, 'utf8');
+        if (env === 'production') {
+          const yamlPath = `./engine-private/conf/${deployId}/build/${env}/secret.yaml`;
+          fs.writeFileSync(yamlPath, secretYaml, 'utf8');
+        } else {
+          const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml'];
+          for (const file of deploymentsFiles) {
+            if (fs.existsSync(`./engine-private/conf/${deployId}/build/${env}/${file}`)) {
+              fs.copyFileSync(
+                `./engine-private/conf/${deployId}/build/${env}/${file}`,
+                `./manifests/deployment/${deployId}-${env}/${file}`,
+              );
+            }
+          }
+        }
+      }
+    },
+    async callback(
+      deployList = 'default',
+      env = 'development',
+      options = { remove: false, infoRouter: false, sync: false, buildManifest: false },
+    ) {
+      if (deployList === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`))
+        deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
+      if (options.sync) UnderpostDeploy.API.sync(deployList);
+      if (options.buildManifest === true) await UnderpostDeploy.API.buildManifest(deployList, env);
+      if (options.infoRouter === true)
+        return logger.info('router', await UnderpostDeploy.API.routerFactory(deployList, env));
+
       for (const _deployId of deployList.split(',')) {
         const deployId = _deployId.trim();
         if (!deployId) continue;

package/src/cli/image.js

@@ -3,6 +3,7 @@ import Underpost from '../index.js';
 import { shellExec } from '../server/process.js';
 import dotenv from 'dotenv';
 import { getNpmRootPath } from '../server/conf.js';
+import { timer } from '../client/components/core/CommonJs.js';
 
 dotenv.config();
 
@@ -12,7 +13,7 @@ class UnderpostImage {
       pullBaseImages() {
         shellExec(`sudo podman pull docker.io/library/debian:buster`);
       },
-      build(deployId = 'default', env = 'development', path = '.', imageArchive = false) {
+      build(deployId = 'default', env = 'development', path = '.', options = { imageArchive: false }) {
         const imgName = `${deployId}-${env}:${Underpost.version}`;
         const podManImg = `localhost/${imgName}`;
         const imagesStoragePath = `./images`;
@@ -29,7 +30,7 @@ class UnderpostImage {
           secretDockerInput += ` --secret id=${key},env=${key} \ `;
         }
         // --rm --no-cache
-        if (imageArchive !== true) {
+        if (options.imageArchive !== true) {
           fs.copyFile(`${getNpmRootPath()}/underpost/.env`, `${path}/.env.underpost`);
           shellExec(
             `cd ${path}${secrets}&& sudo podman build -f ./Dockerfile -t ${imgName} --pull=never --cap-add=CAP_AUDIT_WRITE${secretDockerInput}`,
@@ -39,7 +40,7 @@ class UnderpostImage {
         }
         shellExec(`cd ${path} && sudo kind load image-archive ${tarFile}`);
       },
-      async script(deployId = 'default', env = 'development') {
+      async script(deployId = 'default', env = 'development', options = { run: false }) {
         switch (deployId) {
           case 'dd-lampp':
             {
@@ -99,6 +100,24 @@ class UnderpostImage {
         }
         shellExec(`node bin/deploy conf ${deployId} ${env}`);
         shellExec(`node bin/deploy build-full-client ${deployId}`);
+        if (options.run === true) {
+          const runCmd = env === 'production' ? 'prod-img' : 'dev-img';
+          if (fs.existsSync(`./engine-private/replica`)) {
+            const replicas = await fs.readdir(`./engine-private/replica`);
+            for (const replica of replicas) {
+              shellExec(`node bin/deploy conf ${replica} ${env}`);
+              shellExec(`npm run ${runCmd} ${replica} deploy`, { async: true });
+              fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
+              const monitor = async () => {
+                await timer(1000);
+                if (fs.existsSync(`./tmp/await-deploy`)) return await monitor();
+              };
+              await monitor();
+            }
+            shellExec(`node bin/deploy conf ${deployId} ${env}`);
+          }
+          shellExec(`npm run ${runCmd} ${deployId} deploy`);
+        }
       },
     },
   };

package/src/cli/repository.js

@@ -4,6 +4,7 @@ import { pbcopy, shellExec } from '../server/process.js';
 import { actionInitLog, loggerFactory } from '../server/logger.js';
 import fs from 'fs-extra';
 import { getNpmRootPath } from '../server/conf.js';
+import { listenPortController, listenServerFactory } from '../server/network.js';
 
 dotenv.config();
 
@@ -14,7 +15,7 @@ class UnderpostRepository {
     clone(gitUri = 'underpostnet/pwa-microservices-template', options = { bare: false }) {
       const repoName = gitUri.split('/').pop();
       if (fs.existsSync(`./${repoName}`)) fs.removeSync(`./${repoName}`);
-      return shellExec(
+      shellExec(
         `git clone ${options?.bare === true ? ` --bare ` : ''}https://${
           process.env.GITHUB_TOKEN ? `${process.env.GITHUB_TOKEN}@` : ''
         }github.com/${gitUri}.git`,
@@ -22,16 +23,6 @@ class UnderpostRepository {
           disableLog: true,
         },
       );
-      if (process.env.GITHUB_TOKEN) {
-        shellExec(
-          `git clone https://${
-            process.env.GITHUB_TOKEN ? `${process.env.GITHUB_TOKEN}@` : ''
-          }github.com/${gitUri}-private.git`,
-        );
-        fs.moveSync(`./${repoName}-private`, `./${repoName}/engine-private`, {
-          overwrite: true,
-        });
-      }
     },
     pull(repoPath = './', gitUri = 'underpostnet/pwa-microservices-template') {
       shellExec(
@@ -86,9 +77,10 @@ class UnderpostRepository {
     new(repositoryName) {
       return new Promise(async (resolve, reject) => {
         try {
-          const exeRootPath = `${getNpmRootPath()}/underpost`;
-          actionInitLog();
           await logger.setUpInfo();
+          if (repositoryName === 'service') return resolve(await listenPortController(listenServerFactory(), ':'));
+          else actionInitLog();
+          const exeRootPath = `${getNpmRootPath()}/underpost`;
           const destFolder = `./${repositoryName}`;
           logger.info('Note: This process may take several minutes to complete');
           logger.info('build app', { destFolder });

package/src/cli/test.js

@@ -1,6 +1,6 @@
 import { MariaDB } from '../db/mariadb/MariaDB.js';
 import { getNpmRootPath } from '../server/conf.js';
-import { actionInitLog, loggerFactory } from '../server/logger.js';
+import { actionInitLog, loggerFactory, setUpInfo } from '../server/logger.js';
 import { pbcopy, shellExec } from '../server/process.js';
 import UnderpostDeploy from './deploy.js';
 
@@ -28,10 +28,13 @@ class UnderpostTest {
       actionInitLog();
       shellExec(`cd ${getNpmRootPath()}/underpost && npm run test`);
     },
-    async callback(deployList = '', options = { insideContainer: false, sh: false }) {
-      if (options.sh === true) {
+    async callback(deployList = '', options = { insideContainer: false, sh: false, logs: false }) {
+      if (options.sh === true || options.logs === true) {
         const [pod] = UnderpostDeploy.API.getPods(deployList);
-        if (pod) return pbcopy(`sudo kubectl exec -it ${pod.NAME} -- sh`);
+        if (pod) {
+          if (options.sh) return pbcopy(`sudo kubectl exec -it ${pod.NAME} -- sh`);
+          if (options.logs) return shellExec(`sudo kubectl logs -f ${pod.NAME}`);
+        }
         return logger.warn(`Couldn't find pods in deployment`, deployList);
       }
       if (deployList) {

package/src/client/components/core/CommonJs.js

@@ -573,6 +573,14 @@ const isValidFormat = (value, format) => {
   }
 };
 
+const getCurrentTrace = () => {
+  try {
+    _stack;
+  } catch (error) {
+    return error.stack.split('is not defined')[1];
+  }
+};
+
 /**
  * Returns the time difference between UTC time and local time, in minutes.
  * @memberof CommonJS
@@ -943,6 +951,7 @@ export {
   commonAdminGuard,
   commonModeratorGuard,
   isChileanIdentityDocument,
+  getCurrentTrace,
   userRoleEnum,
   commitData,
 };

package/src/client/components/core/Css.js

@@ -761,6 +761,7 @@ const renderWave = ({ id }) => {
 const cssTokensEffect = {};
 const cssTokensContainer = {};
 const cssEffect = async (containerSelector, event) => {
+  return;
   // Array.from(event.target.classList)
   let offsetX, offsetY;
   if (Array.from(event.srcElement.classList).includes('ripple') && cssTokensContainer[containerSelector]) {

package/src/client/components/core/Modal.js

@@ -9,7 +9,6 @@ import {
   htmls,
   sa,
   getAllChildNodes,
-  getCurrentTrace,
   isActiveElement,
 } from './VanillaJs.js';
 import { BtnIcon } from './BtnIcon.js';

package/src/client/components/core/VanillaJs.js

@@ -419,14 +419,6 @@ const isActiveTab = () => document.hasFocus();
 const isActiveElement = (classSearch = '') =>
   document.activeElement?.classList?.value?.match(classSearch) ? true : false;
 
-const getCurrentTrace = () => {
-  try {
-    _stack;
-  } catch (error) {
-    return error.stack.split('is not defined')[1];
-  }
-};
-
 const isDevInstance = () => location.origin.match('localhost') && location.port;
 
 const getDataFromInputFile = async (file) => Array.from(new Uint8Array(await file.arrayBuffer()));
@@ -460,7 +452,6 @@ export {
   isNavigator,
   getTimeZone,
   getAllChildNodes,
-  getCurrentTrace,
   isActiveTab,
   isActiveElement,
   isDevInstance,

package/src/client/components/core/Worker.js

@@ -22,41 +22,44 @@ const Worker = {
     setTimeout(() => {
       if ('onLine' in navigator && navigator.onLine) window.ononline();
     });
-    navigator.serviceWorker.addEventListener('controllerchange', () => {
-      logger.info('The controller of current browsing context has changed.');
-    });
-    navigator.serviceWorker.ready.then((worker) => {
-      logger.info('Ready', worker);
-      // event message
-      navigator.serviceWorker.addEventListener('message', (event) => {
-        logger.info('Received event message', event.data);
-        const { status } = event.data;
+    if ('serviceWorker' in navigator) {
+      navigator.serviceWorker.addEventListener('controllerchange', () => {
+        logger.info('The controller of current browsing context has changed.');
+      });
+      navigator.serviceWorker.ready.then((worker) => {
+        logger.info('Ready', worker);
+        // event message
+        navigator.serviceWorker.addEventListener('message', (event) => {
+          logger.info('Received event message', event.data);
+          const { status } = event.data;
 
-        switch (status) {
-          case 'loader':
-            {
-              LoadingAnimation.RenderCurrentSrcLoad(event);
-            }
-            break;
+          switch (status) {
+            case 'loader':
+              {
+                LoadingAnimation.RenderCurrentSrcLoad(event);
+              }
+              break;
 
-          default:
-            break;
-        }
-      });
+            default:
+              break;
+          }
+        });
 
-      // if (navigator.serviceWorker.controller)
-      //   navigator.serviceWorker.controller.postMessage({
-      //     title: 'Hello from Client event message',
-      //   });
+        // if (navigator.serviceWorker.controller)
+        //   navigator.serviceWorker.controller.postMessage({
+        //     title: 'Hello from Client event message',
+        //   });
+
+        // broadcast message
+        // const channel = new BroadcastChannel('sw-messages');
+        // channel.addEventListener('message', (event) => {
+        //   logger.info('Received broadcast message', event.data);
+        // });
+        // channel.postMessage({ title: 'Hello from Client broadcast message' });
+        // channel.close();
+      });
+    }
 
-      // broadcast message
-      // const channel = new BroadcastChannel('sw-messages');
-      // channel.addEventListener('message', (event) => {
-      //   logger.info('Received broadcast message', event.data);
-      // });
-      // channel.postMessage({ title: 'Hello from Client broadcast message' });
-      // channel.close();
-    });
     this.RouterInstance = router();
     const isInstall = await this.status();
     if (!isInstall) await this.install();

package/src/index.js

@@ -5,6 +5,7 @@
  */
 
 import UnderpostCluster from './cli/cluster.js';
+import UnderpostCron from './cli/cron.js';
 import UnderpostDB from './cli/db.js';
 import UnderpostDeploy from './cli/deploy.js';
 import UnderpostRootEnv from './cli/env.js';
@@ -26,7 +27,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.47';
+  static version = 'v2.8.51';
   /**
    * Repository cli API
    * @static
@@ -90,6 +91,13 @@ class Underpost {
    * @memberof Underpost
    */
   static deploy = UnderpostDeploy.API;
+  /**
+   * Cron cli API
+   * @static
+   * @type {UnderpostCron.API}
+   * @memberof Underpost
+   */
+  static cron = UnderpostCron.API;
 }
 
 const up = Underpost;

package/src/server/backup.js

@@ -1,120 +1,76 @@
 import fs from 'fs-extra';
 import { loggerFactory } from './logger.js';
-import { shellCd, shellExec } from './process.js';
-import { getCronBackUpFolder, getDataDeploy } from './conf.js';
+import { shellExec } from './process.js';
+import { getCronBackUpFolder } from './conf.js';
 import dotenv from 'dotenv';
 
 dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
-const BackUpManagement = {
-  repoUrl: `https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_USERNAME}/${process.env.GITHUB_BACKUP_REPO}.git`,
-  Init: async function ({ deployId }) {
-    const Callback = async function () {
-      const privateCronConfPath = `./engine-private/conf/${deployId}/conf.cron.json`;
+class BackUp {
+  static callback = async function (deployList, options = { disableKindCluster: false }) {
+    if ((!deployList || deployList === 'dd') && fs.existsSync(`./engine-private/deploy/dd.router`))
+      deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
 
-      const confCronPath = fs.existsSync(privateCronConfPath) ? privateCronConfPath : './conf/conf.cron.json';
+    logger.info('init backups callback', deployList);
+    await logger.setUpInfo();
+    const currentDate = new Date().getTime();
+    const maxBackupRetention = 5;
 
-      const { backups } = JSON.parse(fs.readFileSync(confCronPath, 'utf8'));
+    if (!fs.existsSync('./engine-private/cron-backups'))
+      fs.mkdirSync('./engine-private/cron-backups', { recursive: true });
 
-      if (!backups) return;
+    for (const _deployId of deployList.split(',')) {
+      const deployId = _deployId.trim();
+      if (!deployId) continue;
 
-      logger.info('init backups callback');
-      await logger.setUpInfo();
-
-      const currentDate = new Date().getTime();
-
-      if (!fs.existsSync('./engine-private/cron-backups'))
-        fs.mkdirSync('./engine-private/cron-backups', { recursive: true });
-
-      for (const deployGroupData of backups) {
-        const { deployGroupId } = deployGroupData;
-        const dataDeploy = getDataDeploy({ deployGroupId });
-
-        for (const deployObj of dataDeploy) {
-          const { deployId, replicaHost } = deployObj;
-
-          if (replicaHost) continue;
-
-          const confServer = JSON.parse(
-            fs.existsSync(`./engine-private/replica/${deployId}/conf.server.json`)
-              ? fs.readFileSync(`./engine-private/replica/${deployId}/conf.server.json`, 'utf8')
-              : fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
-          );
-
-          for (const host of Object.keys(confServer))
-            for (const path of Object.keys(confServer[host])) {
-              // retention policy
-              let { db, backupFrequency, maxBackupRetention, singleReplica, wp, git, directory } =
-                confServer[host][path];
-
-              if (!db || singleReplica) continue;
-
-              if (!backupFrequency) backupFrequency = 'daily';
-              if (!maxBackupRetention) maxBackupRetention = 5;
-
-              const backUpPath = `${process.cwd()}/engine-private/cron-backups/${getCronBackUpFolder(host, path)}`;
-              if (!fs.existsSync(backUpPath)) fs.mkdirSync(`${backUpPath}`, { recursive: true });
-              // .isDirectory()
-              const files = await fs.readdir(backUpPath, { withFileTypes: true });
-
-              const currentBackupsDirs = files
-                .map((fileObj) => parseInt(fileObj.name))
-                .sort((a, b) => a - b)
-                .reverse();
+      if (options.disableKindCluster !== true) {
+        shellExec(`underpost db --export ${deployId}`);
+        continue;
+      }
 
-              switch (backupFrequency) {
-                case 'daily':
+      const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
 
-                default:
-                  // if (currentBackupsDirs[0] && currentDate - currentBackupsDirs[0] < 1000 * 60 * 60 * 24) continue;
-                  break;
-              }
+      for (const host of Object.keys(confServer))
+        for (const path of Object.keys(confServer[host])) {
+          // retention policy
+          const { db } = confServer[host][path];
+          if (!db) continue;
+          logger.info('Init backup', { host, path, db });
 
-              for (const retentionPath of currentBackupsDirs.filter((t, i) => i >= maxBackupRetention - 1)) {
-                const removePathRetention = `${backUpPath}/${retentionPath}`;
-                logger.info('Remove backup folder', removePathRetention);
-                fs.removeSync(removePathRetention);
-              }
+          const backUpPath = `${process.cwd()}/engine-private/cron-backups/${getCronBackUpFolder(host, path)}`;
+          if (!fs.existsSync(backUpPath)) fs.mkdirSync(`${backUpPath}`, { recursive: true });
+          // .isDirectory()
+          const files = await fs.readdir(backUpPath, { withFileTypes: true });
 
-              fs.mkdirSync(`${backUpPath}/${currentDate}`, { recursive: true });
+          const currentBackupsDirs = files
+            .map((fileObj) => parseInt(fileObj.name))
+            .sort((a, b) => a - b)
+            .reverse();
 
-              shellExec(`node bin/db ${host}${path} export ${deployId} ${backUpPath}/${currentDate}`);
+          for (const retentionPath of currentBackupsDirs.filter((t, i) => i >= maxBackupRetention - 1)) {
+            const removePathRetention = `${backUpPath}/${retentionPath}`;
+            logger.info('Remove backup folder', removePathRetention);
+            fs.removeSync(removePathRetention);
+          }
 
-              if (wp) {
-                const repoUrl = `https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_USERNAME}/${git
-                  .split('/')
-                  .pop()}.git`;
+          fs.mkdirSync(`${backUpPath}/${currentDate}`, { recursive: true });
 
-                shellExec(
-                  `cd ${directory}` +
-                    ` && git pull ${repoUrl}` +
-                    ` && git add . && git commit -m "backup ${new Date().toLocaleDateString()}"` +
-                    ` && git push ${repoUrl}`,
-                  {
-                    disableLog: true,
-                  },
-                );
-              }
-            }
+          shellExec(`node bin/db ${host}${path} export ${deployId} ${backUpPath}/${currentDate}`);
         }
-      }
       shellExec(
         `cd ./engine-private/cron-backups` +
-          ` && git pull ${BackUpManagement.repoUrl}` +
-          ` && git add . && git commit -m "backup ${new Date().toLocaleDateString()}"` +
-          ` && git push ${BackUpManagement.repoUrl}`,
+          ` && underpost pull . underpostnet/cron-backups` +
+          ` && git add .` +
+          ` && underpost cmt . backup cron-job '${new Date().toLocaleDateString()}'` +
+          ` && underpost push . underpostnet/cron-backups`,
         {
           disableLog: true,
         },
       );
-    };
-    await Callback();
-    BackUpManagement.Callback = Callback;
-    return Callback;
-  },
-  Callback: async function (params) {},
-};
+    }
+  };
+}
 
-export { BackUpManagement };
+export default BackUp;