underpost 2.8.453 → 2.8.481

package/src/cli/deploy.js

@@ -0,0 +1,277 @@
+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 = {
+    sync(deployList) {
+      const deployGroupId = '_dd';
+      fs.writeFileSync(`./engine-private/deploy/${deployGroupId}.json`, JSON.stringify(deployList.split(',')), '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;
+
+        shellExec(`sudo kubectl delete svc ${deployId}-${env}-service`);
+        shellExec(`sudo kubectl delete deployment ${deployId}-${env}`);
+
+        const etcHost = (
+          concat,
+        ) => `127.0.0.1  ${concat} localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6`;
+        let concatHots = '';
+
+        const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
+        for (const host of Object.keys(confServer)) {
+          shellExec(`sudo kubectl delete HTTPProxy ${host}`);
+          if (!options.remove === true && env === 'development') concatHots += ` ${host}`;
+        }
+
+        if (!options.remove === true) {
+          shellExec(`sudo kubectl apply -f ./manifests/deployment/${deployId}-${env}/deployment.yaml`);
+          shellExec(`sudo kubectl apply -f ./manifests/deployment/${deployId}-${env}/proxy.yaml`);
+        }
+
+        let renderHosts;
+
+        switch (process.platform) {
+          case 'linux':
+            {
+              switch (env) {
+                case 'development':
+                  renderHosts = etcHost(concatHots);
+                  fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
+
+                  break;
+
+                default:
+                  break;
+              }
+            }
+            break;
+
+          default:
+            break;
+        }
+        logger.info(
+          `
+` + renderHosts,
+        );
+      }
+    },
+    getPods(deployId) {
+      const raw = shellExec(`sudo kubectl get pods --all-namespaces -o wide`, {
+        stdout: true,
+        disableLog: false,
+        silent: true,
+      });
+
+      const heads = raw
+        .split(`\n`)[0]
+        .split(' ')
+        .filter((_r) => _r.trim());
+
+      const pods = raw
+        .split(`\n`)
+        .filter((r) => (deployId ? r.match(deployId) : r.trim() && !r.match('NAME')))
+        .map((r) => r.split(' ').filter((_r) => _r.trim()));
+
+      const result = [];
+
+      for (const row of pods) {
+        const pod = {};
+        let index = -1;
+        for (const head of heads) {
+          index++;
+          pod[head] = row[index];
+        }
+        result.push(pod);
+      }
+
+      return result;
+    },
+  };
+}
+
+export default UnderpostDeploy;

package/src/cli/image.js

@@ -1,9 +1,9 @@
 import fs from 'fs-extra';
 import Underpost from '../index.js';
 import { shellExec } from '../server/process.js';
-import { MariaDB } from '../db/mariadb/MariaDB.js';
 import dotenv from 'dotenv';
 import { getNpmRootPath } from '../server/conf.js';
+import { timer } from '../client/components/core/CommonJs.js';
 
 dotenv.config();
 
@@ -40,22 +40,11 @@ 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':
             {
               const lamppPublicPath = '/xampp/htdocs/online';
-              if (process.argv.includes('test')) {
-                const { MARIADB_HOST, MARIADB_USER, MARIADB_PASSWORD, DD_LAMPP_TEST_DB_0 } = process.env;
-
-                await MariaDB.query({
-                  host: MARIADB_HOST,
-                  user: MARIADB_USER,
-                  password: MARIADB_PASSWORD,
-                  query: `SHOW TABLES FROM ${DD_LAMPP_TEST_DB_0}`,
-                });
-                process.exit(0);
-              }
               shellExec(`sudo mkdir -p ${lamppPublicPath}`);
 
               {
@@ -111,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(
@@ -54,6 +45,10 @@ class UnderpostRepository {
         empty: false,
       },
     ) {
+      if (commitType === 'reset') {
+        shellExec(`cd ${repoPath} && git reset --soft HEAD~${isNaN(parseInt(subModule)) ? 1 : parseInt(subModule)}`);
+        return;
+      }
       if (options.info) return logger.info('', commitData);
       const _message = `${commitType}${subModule ? `(${subModule})` : ''}${process.argv.includes('!') ? '!' : ''}: ${
         commitData[commitType].emoji
@@ -82,19 +77,18 @@ class UnderpostRepository {
     new(repositoryName) {
       return new Promise(async (resolve, reject) => {
         try {
-          const exeRootPath = `${getNpmRootPath()}/underpost`;
-          // const exeRootPath = '/home/dd/pwa-microservices-template';
-          actionInitLog();
           await logger.setUpInfo();
-          const destFolder = `${process.cwd()}/${repositoryName}`;
+          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 });
+          if (fs.existsSync(destFolder)) fs.removeSync(destFolder);
           fs.mkdirSync(destFolder, { recursive: true });
           fs.copySync(exeRootPath, destFolder);
-          if (fs.existsSync(`${destFolder}/node_modules`)) fs.removeSync(`${destFolder}/node_modules`);
           fs.writeFileSync(`${destFolder}/.gitignore`, fs.readFileSync(`${exeRootPath}/.dockerignore`, 'utf8'), 'utf8');
           shellExec(`cd ${destFolder} && git init && git add . && git commit -m "Base template implementation"`);
-          shellExec(`cd ${destFolder} && underpost install`);
           shellExec(`cd ${destFolder} && npm run build`);
           shellExec(`cd ${destFolder} && npm run dev`);
           return resolve();

package/src/cli/test.js

@@ -1,6 +1,8 @@
+import { MariaDB } from '../db/mariadb/MariaDB.js';
 import { getNpmRootPath } from '../server/conf.js';
 import { actionInitLog, loggerFactory } from '../server/logger.js';
-import { shellExec } from '../server/process.js';
+import { pbcopy, shellExec } from '../server/process.js';
+import UnderpostDeploy from './deploy.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -26,6 +28,55 @@ class UnderpostTest {
       actionInitLog();
       shellExec(`cd ${getNpmRootPath()}/underpost && npm run test`);
     },
+    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) {
+          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) {
+        for (const _deployId of deployList.split(',')) {
+          const deployId = _deployId.trim();
+          if (!deployId) continue;
+          if (options.insideContainer === true)
+            switch (deployId) {
+              case 'dd-lampp':
+                {
+                  const { MARIADB_HOST, MARIADB_USER, MARIADB_PASSWORD, DD_LAMPP_TEST_DB_0 } = process.env;
+
+                  await MariaDB.query({
+                    host: MARIADB_HOST,
+                    user: MARIADB_USER,
+                    password: MARIADB_PASSWORD,
+                    query: `SHOW TABLES FROM ${DD_LAMPP_TEST_DB_0}`,
+                  });
+                }
+                break;
+
+              default:
+                {
+                  shellExec('npm run test');
+                }
+
+                break;
+            }
+          else {
+            const pods = UnderpostDeploy.API.getPods(deployId);
+            if (pods.length > 0)
+              for (const deployData of pods) {
+                const { NAME } = deployData;
+                shellExec(
+                  `sudo kubectl exec -i ${NAME} -- sh -c "cd /home/dd/engine && underpost test ${deployId} --inside-container"`,
+                );
+              }
+            else logger.warn(`Couldn't find pods in deployment`, { deployId });
+          }
+        }
+      } else return UnderpostTest.API.run();
+    },
   };
 }
 

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

@@ -3,7 +3,10 @@ import { Account } from './Account.js';
 import { loggerFactory } from './Logger.js';
 import { LogIn } from './LogIn.js';
 import { LogOut } from './LogOut.js';
+import { NotificationManager } from './NotificationManager.js';
 import { SignUp } from './SignUp.js';
+import { Translate } from './Translate.js';
+import { s } from './VanillaJs.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -65,6 +68,7 @@ const Auth = {
               const _result = await UserService.get({ id: 'auth' });
               return {
                 status: _result.status,
+                message: _result.message,
                 data: {
                   user: _result.data,
                 },
@@ -77,6 +81,15 @@ const Auth = {
           await Account.updateForm(data.user);
           return { user: data.user };
         }
+        if (message && message.match('expired'))
+          setTimeout(() => {
+            s(`.main-btn-log-in`).click();
+            NotificationManager.Push({
+              html: Translate.Render(`expired-session`),
+              status: 'warning',
+            });
+          });
+        return await Auth.sessionOut();
       }
 
       // anon guest session
@@ -92,20 +105,25 @@ const Auth = {
 
       this.setGuestToken(guestToken);
       let { data, status, message } = await UserService.get({ id: 'auth' });
-      if (status === 'error') throw new Error(message);
+      if (status === 'error') {
+        if (message && message.match('expired')) {
+          localStorage.removeItem('jwt.g');
+          return await Auth.sessionOut();
+        } else throw new Error(message);
+      }
       await Account.updateForm(data);
       return { user: data };
     } catch (error) {
       logger.error(error);
-      localStorage.removeItem('jwt');
-      localStorage.removeItem('jwt.g');
       return { user: UserMock.default };
     }
   },
   sessionOut: async function () {
     this.deleteToken();
     localStorage.removeItem('jwt');
-    await LogOut.Trigger(await this.sessionIn());
+    const result = await this.sessionIn();
+    await LogOut.Trigger(result);
+    return result;
   },
 };
 

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/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/Translate.js

@@ -508,6 +508,10 @@ const TranslateCore = {
       en: 'Invalid identity document',
       es: 'Documento de identidad inválido',
     };
+    Translate.Data['expired-session'] = {
+      en: 'Your session has expired. Please log in again.',
+      es: 'Su sesión ha expirado. Por favor, inicie sesión de nuevo.',
+    };
   },
 };
 

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();