underpost 2.8.44 → 2.8.46

package/src/cli/env.js

@@ -0,0 +1,52 @@
+import { getNpmRootPath, writeEnv } from '../server/conf.js';
+import fs from 'fs-extra';
+import { loggerFactory } from '../server/logger.js';
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+const logger = loggerFactory(import.meta);
+
+class UnderpostRootEnv {
+  static API = {
+    set(key, value) {
+      const exeRootPath = `${getNpmRootPath()}/underpost`;
+      const envPath = `${exeRootPath}/.env`;
+      let env = {};
+      if (fs.existsSync(envPath)) env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
+      env[key] = value;
+      writeEnv(envPath, env);
+    },
+    delete(key) {
+      const exeRootPath = `${getNpmRootPath()}/underpost`;
+      const envPath = `${exeRootPath}/.env`;
+      let env = {};
+      if (fs.existsSync(envPath)) env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
+      delete env[key];
+      writeEnv(envPath, env);
+    },
+    get(key) {
+      const exeRootPath = `${getNpmRootPath()}/underpost`;
+      const envPath = `${exeRootPath}/.env`;
+      if (!fs.existsSync(envPath)) return logger.error(`Unable to find underpost root environment`);
+      const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
+      logger.info('underpost root', { [key]: env[key] });
+      return env[key];
+    },
+    list() {
+      const exeRootPath = `${getNpmRootPath()}/underpost`;
+      const envPath = `${exeRootPath}/.env`;
+      if (!fs.existsSync(envPath)) return logger.error(`Unable to find underpost root environment`);
+      const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
+      logger.info('underpost root', env);
+      return env;
+    },
+    clean() {
+      const exeRootPath = `${getNpmRootPath()}/underpost`;
+      const envPath = `${exeRootPath}/.env`;
+      fs.removeSync(envPath);
+    },
+  };
+}
+
+export default UnderpostRootEnv;

package/src/cli/image.js

@@ -0,0 +1,118 @@
+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';
+
+dotenv.config();
+
+class UnderpostImage {
+  static API = {
+    dockerfile: {
+      pullBaseImages() {
+        shellExec(`sudo podman pull docker.io/library/debian:buster`);
+      },
+      build(deployId = 'default', env = 'development', path = '.', imageArchive = false) {
+        const imgName = `${deployId}-${env}:${Underpost.version}`;
+        const podManImg = `localhost/${imgName}`;
+        const imagesStoragePath = `./images`;
+        const tarFile = `${imagesStoragePath}/${imgName.replace(':', '_')}.tar`;
+
+        let secrets = ' ';
+        let secretDockerInput = '';
+
+        const envObj = dotenv.parse(fs.readFileSync(`${getNpmRootPath()}/underpost/.env`, 'utf8'));
+
+        for (const key of Object.keys(envObj)) {
+          continue;
+          secrets += ` && export ${key}="${envObj[key]}" `; // $(cat gitlab-token.txt)
+          secretDockerInput += ` --secret id=${key},env=${key} \ `;
+        }
+        // --rm --no-cache
+        if (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}`,
+          );
+          fs.removeSync(`${path}/.env.underpost`);
+          shellExec(`cd ${path} && podman save -o ${tarFile} ${podManImg}`);
+        }
+        shellExec(`cd ${path} && sudo kind load image-archive ${tarFile}`);
+      },
+      async script(deployId = 'default', env = 'development') {
+        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}`);
+
+              {
+                shellExec(
+                  `cd ${lamppPublicPath} && git clone https://${process.env.GITHUB_TOKEN}@github.com/${process.env.DD_LAMPP_REPO_0}`,
+                );
+
+                shellExec(`cd ${lamppPublicPath} && sudo ${process.env.DD_LAMPP_SCRIPT_0}`);
+
+                shellExec(
+                  `sudo sed -i -e "s@define( 'DB_HOST', 'localhost' );@define( 'DB_HOST', '${process.env.MARIADB_HOST}' );@g" ${lamppPublicPath}/${process.env.DD_LAMPP_REPO_0_FOLDER}/wp-config.php`,
+                );
+              }
+              {
+                shellExec(
+                  `cd ${lamppPublicPath} && git clone https://${process.env.GITHUB_TOKEN}@github.com/${process.env.DD_LAMPP_REPO_1}`,
+                );
+              }
+            }
+            break;
+
+          default:
+            {
+              {
+                const originPath = `./src/db/mongo/MongooseDB.js`;
+                fs.writeFileSync(
+                  originPath,
+                  fs.readFileSync(originPath, 'utf8').replaceAll(
+                    `connect: async (host, name) => {`,
+                    `connect: async (host, name) => {
+    host = 'mongodb://mongodb-0.mongodb-service:27017';
+        `,
+                  ),
+                  'utf8',
+                );
+              }
+
+              {
+                const originPath = `./src/server/valkey.js`;
+                fs.writeFileSync(
+                  originPath,
+                  fs.readFileSync(originPath, 'utf8').replaceAll(
+                    `    // port: 6379,
+    // host: 'service-valkey.default.svc.cluster.local',`,
+                    `     port: 6379,
+    host: 'service-valkey.default.svc.cluster.local',`,
+                  ),
+                  'utf8',
+                );
+              }
+            }
+            break;
+        }
+        shellExec(`node bin/deploy conf ${deployId} ${env}`);
+        shellExec(`node bin/deploy build-full-client ${deployId}`);
+      },
+    },
+  };
+}
+export default UnderpostImage;

package/src/cli/repository.js

@@ -0,0 +1,108 @@
+import { commitData } from '../client/components/core/CommonJs.js';
+import dotenv from 'dotenv';
+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';
+
+dotenv.config();
+
+const logger = loggerFactory(import.meta);
+
+class UnderpostRepository {
+  static API = {
+    clone(gitUri = 'underpostnet/pwa-microservices-template', options = { bare: false }) {
+      const repoName = gitUri.split('/').pop();
+      if (fs.existsSync(`./${repoName}`)) fs.removeSync(`./${repoName}`);
+      return shellExec(
+        `git clone ${options?.bare === true ? ` --bare ` : ''}https://${
+          process.env.GITHUB_TOKEN ? `${process.env.GITHUB_TOKEN}@` : ''
+        }github.com/${gitUri}.git`,
+        {
+          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(
+        `cd ${repoPath} && git pull https://${
+          process.env.GITHUB_TOKEN ? `${process.env.GITHUB_TOKEN}@` : ''
+        }github.com/${gitUri}.git`,
+        {
+          disableLog: true,
+        },
+      );
+    },
+    commit(
+      repoPath = './',
+      commitType = 'feat',
+      subModule = '',
+      message = '',
+      options = {
+        copy: false,
+        info: false,
+        empty: false,
+      },
+    ) {
+      if (options.info) return logger.info('', commitData);
+      const _message = `${commitType}${subModule ? `(${subModule})` : ''}${process.argv.includes('!') ? '!' : ''}: ${
+        commitData[commitType].emoji
+      } ${message ? message : commitData[commitType].description}`;
+      if (options.copy) return pbcopy(_message);
+      shellExec(`cd ${repoPath} && git commit ${options?.empty ? `--allow-empty ` : ''}-m "${_message}"`);
+    },
+
+    push(repoPath = './', gitUri = 'underpostnet/pwa-microservices-template', options = { f: false }) {
+      shellExec(
+        `cd ${repoPath} && git push https://${process.env.GITHUB_TOKEN}@github.com/${gitUri}.git${
+          options?.f === true ? ' --force' : ''
+        }`,
+        {
+          disableLog: true,
+        },
+      );
+      logger.info(
+        'commit url',
+        `http://github.com/${gitUri}/commit/${shellExec(`cd ${repoPath} && git rev-parse --verify HEAD`, {
+          stdout: true,
+        }).trim()}`,
+      );
+    },
+
+    new(repositoryName) {
+      return new Promise(async (resolve, reject) => {
+        try {
+          const exeRootPath = `${getNpmRootPath()}/underpost`;
+          actionInitLog();
+          await logger.setUpInfo();
+          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);
+          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} && npm run build`);
+          shellExec(`cd ${destFolder} && npm run dev`);
+          return resolve();
+        } catch (error) {
+          logger.error(error, error.stack);
+          return reject(error.message);
+        }
+      });
+    },
+  };
+}
+
+export default UnderpostRepository;

package/src/cli/script.js

@@ -0,0 +1,29 @@
+import { getNpmRootPath } from '../server/conf.js';
+import { loggerFactory } from '../server/logger.js';
+import { shellExec } from '../server/process.js';
+import fs from 'fs-extra';
+
+const logger = loggerFactory(import.meta);
+
+class UnderpostScript {
+  static API = {
+    set(key, value) {
+      const npmRoot = `${getNpmRootPath()}/underpost`;
+      const packageJson = JSON.parse(fs.readFileSync(`${npmRoot}/package.json`, 'utf8'));
+      packageJson.scripts[key] = value;
+      fs.writeFileSync(`${npmRoot}/package.json`, JSON.stringify(packageJson, null, 4));
+    },
+    run(key) {
+      const npmRoot = `${getNpmRootPath()}/underpost`;
+      shellExec(`cd ${npmRoot} && npm run ${key}`);
+    },
+    get(key) {
+      const npmRoot = `${getNpmRootPath()}/underpost`;
+      const packageJson = JSON.parse(fs.readFileSync(`${npmRoot}/package.json`, 'utf8'));
+      logger.info('[get] ' + key, packageJson.scripts[key]);
+      return packageJson.scripts[key];
+    },
+  };
+}
+
+export default UnderpostScript;

package/src/cli/secrets.js

@@ -0,0 +1,37 @@
+import dotenv from 'dotenv';
+import { shellExec } from '../server/process.js';
+import fs from 'fs-extra';
+import UnderpostRootEnv from './env.js';
+
+class UnderpostSecret {
+  static API = {
+    docker: {
+      init() {
+        shellExec(`docker swarm init`);
+      },
+      createFromEnvFile(envPath) {
+        const envObj = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
+        for (const key of Object.keys(envObj)) {
+          UnderpostSecret.API.docker.set(key, envObj[key]);
+        }
+      },
+      set(key, value) {
+        shellExec(`docker secret rm ${key}`);
+        shellExec(`echo "${value}" | docker secret create ${key} -`);
+      },
+      list() {
+        shellExec(`docker secret ls`);
+      },
+    },
+    underpost: {
+      createFromEnvFile(envPath) {
+        const envObj = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
+        for (const key of Object.keys(envObj)) {
+          UnderpostRootEnv.API.set(key, envObj[key]);
+        }
+      },
+    },
+  };
+}
+
+export default UnderpostSecret;

package/src/cli/test.js

@@ -0,0 +1,32 @@
+import { getNpmRootPath } from '../server/conf.js';
+import { actionInitLog, loggerFactory } from '../server/logger.js';
+import { shellExec } from '../server/process.js';
+
+const logger = loggerFactory(import.meta);
+
+class UnderpostTest {
+  static API = {
+    /**
+     * Logs information about the current process environment to the console.
+     *
+     * This function is used to log details about
+     * the execution context, such as command-line arguments,
+     * environment variables, the process's administrative privileges,
+     * and the maximum available heap space size.
+     *
+     * @static
+     * @method setUpInfo
+     * @returns {Promise<void>}
+     * @memberof Underpost
+     */
+    async setUpInfo() {
+      return await setUpInfo(logger);
+    },
+    run() {
+      actionInitLog();
+      shellExec(`cd ${getNpmRootPath()}/underpost && npm run test`);
+    },
+  };
+}
+
+export default UnderpostTest;

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

@@ -811,6 +811,77 @@ const generateRandomPasswordSelection = (length) => {
 // 0b = Binary
 // 0o = Octal
 
+const commitData = {
+  feat: {
+    description: 'A new feature',
+    title: 'Features',
+    emoji: '✨',
+  },
+  fix: {
+    description: 'A bug fix',
+    title: 'Bug Fixes',
+    emoji: '🐛',
+  },
+  docs: {
+    description: 'Documentation only changes',
+    title: 'Documentation',
+    emoji: '📚',
+  },
+  style: {
+    description:
+      'Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)',
+    title: 'Styles',
+    emoji: '💎',
+  },
+  refactor: {
+    description: 'A code change that neither fixes a bug nor adds a feature',
+    title: 'Code Refactoring',
+    emoji: '📦',
+  },
+  perf: {
+    description: 'A code change that improves performance',
+    title: 'Performance Improvements',
+    emoji: '⚡️',
+  },
+  cd: {
+    description:
+      'Changes to our Continuous Delivery configuration files and scripts (example scopes: Jenkins, Spinnaker, ArgoCD)',
+    title: 'Continuous Delivery',
+    emoji: '🚀',
+  },
+  test: {
+    description: 'Adding missing tests or correcting existing tests',
+    title: 'Tests',
+    emoji: '🚨',
+  },
+  build: {
+    description: 'Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)',
+    title: 'Builds',
+    emoji: '🛠',
+  },
+  ci: {
+    description:
+      'Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)',
+    title: 'Continuous Integrations',
+    emoji: '⚙️',
+  },
+  chore: {
+    description: "Other changes that don't modify src or test files",
+    title: 'Chores',
+    emoji: '♻️',
+  },
+  revert: {
+    description: 'Reverts a previous commit',
+    title: 'Reverts',
+    emoji: '🗑',
+  },
+  backup: {
+    description: 'Changes related to backups, including creation, restoration, and maintenance.',
+    title: 'Backups',
+    emoji: '💾',
+  },
+};
+
 const userRoleEnum = ['admin', 'moderator', 'user', 'guest'];
 
 const commonAdminGuard = (role) => userRoleEnum.indexOf(role) === userRoleEnum.indexOf('admin');
@@ -869,8 +940,9 @@ export {
   hexToNumber,
   numberToHex,
   generateRandomPasswordSelection,
-  userRoleEnum,
   commonAdminGuard,
   commonModeratorGuard,
   isChileanIdentityDocument,
+  userRoleEnum,
+  commitData,
 };

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

@@ -100,7 +100,7 @@ const Input = {
       </div>
     </div>`;
   },
-  parseJsonEval: (selector) => {
+  parseJson: (selector) => {
     try {
       return JSON.parse(s(selector).value);
     } catch (error) {

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

@@ -39,6 +39,7 @@ const Scroll = {
     delete this.topRefreshEvents[id];
   },
   pullTopRefresh: function () {
+    return;
     append(
       'body',
       html` <style>

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

@@ -4,10 +4,14 @@
  * @namespace Underpost
  */
 
-import { runTest } from './server/conf.js';
-import { loggerFactory, setUpInfo } from './server/logger.js';
-
-const logger = loggerFactory(import.meta);
+import UnderpostCluster from './cli/cluster.js';
+import UnderpostDB from './cli/db.js';
+import UnderpostRootEnv from './cli/env.js';
+import UnderpostImage from './cli/image.js';
+import UnderpostRepository from './cli/repository.js';
+import UnderpostScript from './cli/script.js';
+import UnderpostSecret from './cli/secrets.js';
+import UnderpostTest from './cli/test.js';
 
 /**
  * Underpost main module methods
@@ -21,30 +25,63 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.44';
-
-  constructor() {}
-
+  static version = 'v2.8.46';
   /**
-   * Logs information about the current process environment to the console.
-   *
-   * This function is used to log details about
-   * the execution context, such as command-line arguments,
-   * environment variables, the process's administrative privileges,
-   * and the maximum available heap space size.
-   *
+   * Repository cli API
    * @static
-   * @method setUpInfo
-   * @returns {Promise<void>}
+   * @type {UnderpostRepository.API}
    * @memberof Underpost
    */
-  static async setUpInfo() {
-    return await setUpInfo(logger);
-  }
-
-  static runTest() {
-    return runTest(Underpost.version);
-  }
+  static repo = UnderpostRepository.API;
+  /**
+   * Root Env cli API
+   * @static
+   * @type {UnderpostRootEnv.API}
+   * @memberof Underpost
+   */
+  static env = UnderpostRootEnv.API;
+  /**
+   * Test cli API
+   * @static
+   * @type {UnderpostTest.API}
+   * @memberof Underpost
+   */
+  static test = UnderpostTest.API;
+  /**
+   * Cluster cli API
+   * @static
+   * @type {UnderpostCluster.API}
+   * @memberof Underpost
+   */
+  static cluster = UnderpostCluster.API;
+  /**
+   * Image cli API
+   * @static
+   * @type {UnderpostImage.API}
+   * @memberof Underpost
+   */
+  static image = UnderpostImage.API;
+  /**
+   * Secrets cli API
+   * @static
+   * @type {UnderpostSecret.API}
+   * @memberof Underpost
+   */
+  static secret = UnderpostSecret.API;
+  /**
+   * Scripts cli API
+   * @static
+   * @type {UnderpostScript.API}
+   * @memberof Underpost
+   */
+  static script = UnderpostScript.API;
+  /**
+   * Database cli API
+   * @static
+   * @type {UnderpostDB.API}
+   * @memberof Underpost
+   */
+  static db = UnderpostDB.API;
 }
 
 const up = Underpost;