underpost 2.8.64 → 2.8.67

package/src/cli/index.js

@@ -0,0 +1,312 @@
+import dotenv from 'dotenv';
+import { Command } from 'commander';
+import Underpost from '../index.js';
+import { getUnderpostRootPath, loadConf } from '../server/conf.js';
+import fs from 'fs-extra';
+import { commitData } from '../client/components/core/CommonJs.js';
+import { shellExec } from '../server/process.js';
+
+const underpostRootPath = getUnderpostRootPath();
+fs.existsSync(`${underpostRootPath}/.env`)
+  ? dotenv.config({ path: `${underpostRootPath}/.env`, override: true })
+  : dotenv.config();
+
+const program = new Command();
+
+program.name('underpost').description(`underpost ci/cd cli ${Underpost.version}`).version(Underpost.version);
+
+program
+  .command('new')
+  .argument('<app-name>', 'Application name')
+  .description('Create a new project')
+  .action(Underpost.repo.new);
+
+program
+  .command('start')
+  .argument('<deploy-id>', 'Deploy configuration id')
+  .argument('[env]', 'Optional environment, for default is development')
+  .option('--run', 'Run app servers and monitor health server')
+  .option('--build', 'Build app client')
+  .action(Underpost.start.callback)
+  .description('Start up server, build pipelines, or services');
+
+program
+  .command('clone')
+  .argument(`<uri>`, 'e.g. username/repository')
+  .option('--bare', 'Clone only .git files')
+  .description('Clone github repository')
+  .action(Underpost.repo.clone);
+
+program
+  .command('pull')
+  .argument('<path>', 'Absolute or relative directory')
+  .argument(`<uri>`, 'e.g. username/repository')
+  .description('Pull github repository')
+  .action(Underpost.repo.pull);
+
+program
+  .command('cmt')
+  .argument('<path>', 'Absolute or relative directory')
+  .argument(`<commit-type>`, `Options: ${Object.keys(commitData)}`)
+  .argument(`[module-tag]`, 'Optional set module tag')
+  .argument(`[message]`, 'Optional set additional message')
+  .option('--empty', 'Allow empty files')
+  .option('--copy', 'Copy to clipboard message')
+  .option('--info', 'Info commit types')
+  .description('Commit github repository')
+  .action(Underpost.repo.commit);
+
+program
+  .command('push')
+  .argument('<path>', 'Absolute or relative directory')
+  .argument(`<uri>`, 'e.g. username/repository')
+  .option('-f', 'Force push overwriting repository')
+  .description('Push github repository')
+  .action(Underpost.repo.push);
+
+program
+  .command('env')
+  .argument('<deploy-id>', `deploy configuration id, if 'clean' restore default`)
+  .argument('[env]', 'Optional environment, for default is production')
+  .description('Set environment variables files and conf related to <deploy-id>')
+  .action(loadConf);
+
+program
+  .command('config')
+  .argument('operator', `Options: ${Object.keys(Underpost.env)}`)
+  .argument('[key]', 'Config key')
+  .argument('[value]', 'Config value')
+  .description(`Manage configuration, operators`)
+  .action((...args) => Underpost.env[args[0]](args[1], args[2]));
+
+program
+  .command('root')
+  .description('Get npm root path')
+  .action(() => console.log(getNpmRootPath()));
+
+program
+  .command('cluster')
+  .argument('[pod-name]', 'Optional pod name filter')
+  .option('--reset', `Delete all clusters and prune all data and caches`)
+  .option('--mariadb', 'Init with mariadb statefulset')
+  .option('--mongodb', 'Init with mongodb statefulset')
+  .option('--postgresql', 'Init with postgresql statefulset')
+  .option('--mongodb4', 'Init with mongodb 4.4 service')
+  .option('--istio', 'Init base istio cluster')
+  .option('--valkey', 'Init with valkey service')
+  .option('--contour', 'Init with project contour base HTTPProxy and envoy')
+  .option('--cert-manager', 'Init with letsencrypt-prod ClusterIssuer')
+  .option('--info', 'Get all kinds objects deployed')
+  .option('--full', 'Init with all statefulsets and services available')
+  .option('--ns-use <ns-name>', 'Switches current context to namespace')
+  .option('--dev', 'init with dev cluster')
+  .option('--list-pods', 'Display list pods information')
+  .option('--info-capacity', 'display current total machine capacity info')
+  .option('--info-capacity-pod', 'display current machine capacity pod info')
+  .option('--pull-image', 'Set optional pull associated image')
+  .action(Underpost.cluster.init)
+  .description('Manage cluster, for default initialization base kind cluster');
+
+program
+  .command('deploy')
+  .argument('<deploy-list>', 'Deploy id list, e.g. default-a,default-b')
+  .argument('[env]', 'Optional environment, for default is development')
+  .option('--remove', 'Delete deployments and services')
+  .option('--sync', 'Sync deployments env, ports, and replicas')
+  .option('--info-router', 'Display router structure')
+  .option('--expose', 'Expose service match deploy-list')
+  .option('--info-util', 'Display kubectl util management commands')
+  .option('--cert', 'Reset tls/ssl certificate secrets')
+  .option('--build-manifest', 'Build kind yaml manifests: deployments, services, proxy and secrets')
+  .option('--dashboard-update', 'Update dashboard instance data with current router config')
+  .option('--replicas <replicas>', 'Set custom number of replicas')
+  .option('--versions <deployment-versions>', 'Comma separated custom deployment versions')
+  .option('--traffic <traffic-versions>', 'Comma separated custom deployment traffic')
+  .option('--disable-update-deployment', 'Disable update deployments')
+  .option('--info-traffic', 'get traffic conf form current resources deployments')
+  .option(
+    '--rebuild-clients-bundle',
+    'Inside container, rebuild clients bundle, only static public or storage client files',
+  )
+  .description('Manage deployment, for default deploy development pods')
+  .action(Underpost.deploy.callback);
+
+program
+  .command('secret')
+  .argument('<platform>', `Options: ${Object.keys(Underpost.secret)}`)
+  .option('--init', 'Init secrets platform environment')
+  .option('--create-from-file <path-env-file>', 'Create secret from env file')
+  .option('--list', 'Lists secrets')
+  // .option('--delete [secret-key]', 'Delete key secret, if not set, are default delete all')
+  // .option('--create [secret-key] [secret-value]', 'Create secret key, with secret value')
+  .description(`Manage secrets`)
+  .action((...args) => {
+    if (args[1].createFromFile) return Underpost.secret[args[0]].createFromEnvFile(args[1].createFromFile);
+    if (args[1].list) return Underpost.secret[args[0]].list();
+    if (args[1].init) return Underpost.secret[args[0]].init();
+  });
+
+program
+  .command('dockerfile-image-build')
+  .option('--path [path]', 'Dockerfile path')
+  .option('--image-name [image-name]', 'Set image name')
+  .option('--image-path [image-path]', 'Set tar image path')
+  .option('--dockerfile-name [dockerfile-name]', 'set Dockerfile name')
+  .option('--podman-save', 'Export tar file from podman')
+  .option('--kind-load', 'Import tar image to Kind cluster')
+  .option('--secrets', 'Dockerfile env secrets')
+  .option('--secrets-path [secrets-path]', 'Dockerfile custom path env secrets')
+  .option('--no-cache', 'Build without using cache')
+  .description('Build image from Dockerfile')
+  .action(Underpost.image.dockerfile.build);
+
+program
+  .command('dockerfile-pull-base-images')
+  .description('Pull underpost dockerfile images requirements')
+  .action(Underpost.image.dockerfile.pullBaseImages);
+
+program
+  .command('install')
+  .description('Fast import underpost npm dependencies')
+  .action(() => {
+    fs.copySync(`${underpostRootPath}/node_modules`, './node_modules');
+  });
+
+program
+  .command('db')
+  .argument('<deploy-list>', 'Deploy id list, e.g. default-a,default-b')
+  .option('--import', 'Import container backups from repositories')
+  .option('--export', 'Export container backups to repositories')
+  .option('--pod-name <pod-name>', 'Optional pod context')
+  .option('--collections <collections>', 'Comma separated collections')
+  .option('--out-path <out-path>', 'Custom out path backup')
+  .option('--drop', 'Drop databases')
+  .option('--preserveUUID', 'Preserve Ids')
+  .option('--git', 'Upload to github')
+  .option('--hosts <hosts>', 'Comma separated hosts')
+  .option('--paths <paths>', 'Comma separated paths')
+  .option('--ns <ns-name>', 'Optional name space context')
+  .description('Manage databases')
+  .action(Underpost.db.callback);
+
+program
+  .command('script')
+  .argument('operator', `Options: ${Object.keys(Underpost.script)}`)
+  .argument('<script-name>', 'Script name')
+  .argument('[script-value]', 'Literal command, or path')
+  .option('--itc', 'Inside container execution context')
+  .option('--itc-path', 'Inside container path options')
+  .option('--ns <ns-name>', 'Options name space context')
+  .option('--pod-name <pod-name>')
+  .description(
+    'Supports a number of built-in underpost global scripts and their preset life cycle events as well as arbitrary scripts',
+  )
+  .action((...args) => Underpost.script[args[0]](args[1], args[2], args[3]));
+
+program
+  .command('cron')
+  .argument('[deploy-list]', 'Deploy id list, e.g. default-a,default-b')
+  .argument('[job-list]', `Deploy id list, e.g. ${Object.keys(Underpost.cron)}, for default all available jobs`)
+  .option('--itc', 'Inside container execution context')
+  .option('--init', 'Init cron jobs for cron job default deploy id')
+  .option('--git', 'Upload to github')
+  .option('--dashboard-update', 'Update dashboard cron data with current jobs config')
+  .description('Cron jobs management')
+  .action(Underpost.cron.callback);
+
+program
+  .command('fs')
+  .argument('[path]', 'Absolute or relative directory')
+  .option('--rm', 'Remove file')
+  .option('--git', 'Current git changes')
+  .option('--recursive', 'Upload files recursively')
+  .option('--deploy-id <deploy-id>', 'Deploy configuration id')
+  .option('--pull', 'Download file')
+  .option('--force', 'Force action')
+  .option('--storage-file-path <storage-file-path>', 'custom file storage path')
+  .description('File storage management, for default upload file')
+  .action(Underpost.fs.callback);
+
+program
+  .command('test')
+  .argument('[deploy-list]', 'Deploy id list, e.g. default-a,default-b')
+  .description('Manage Test, for default run current underpost default test')
+  .option('--itc', 'Inside container execution context')
+  .option('--sh', 'Copy to clipboard, container entrypoint shell command')
+  .option('--logs', 'Display container logs')
+  .option('--pod-name <pod-name>')
+  .option('--pod-status <pod-status>')
+  .option('--kind-type <kind-type>')
+  .action(Underpost.test.callback);
+
+program
+  .command('monitor')
+  .argument('<deploy-id>', 'Deploy configuration id')
+  .argument('[env]', 'Optional environment, for default is development')
+  .option('--ms-interval <ms-interval>', 'Custom ms interval delta time')
+  .option('--now', 'Exec immediately monitor script')
+  .option('--single', 'Disable recurrence')
+  .option('--replicas <replicas>', 'Set custom number of replicas')
+  .option('--type <type>', 'Set custom monitor type')
+  .option('--sync', 'Sync with current proxy deployments proxy traffic')
+  .description('Monitor health server management')
+  .action(Underpost.monitor.callback);
+
+const buildCliDoc = () => {
+  let md = shellExec(`node bin help`, { silent: true, stdout: true }).split('Options:');
+  const baseOptions =
+    `## ${md[0].split(`\n`)[2]}
+
+### Usage: ` +
+    '`' +
+    md[0].split(`\n`)[0].split('Usage: ')[1] +
+    '`' +
+    `
+  ` +
+    '```\n Options:' +
+    md[1] +
+    ' \n```';
+  md =
+    baseOptions +
+    `
+
+## Commands:
+    `;
+  program.commands.map((o) => {
+    md +=
+      `
+
+` +
+      '### `' +
+      o._name +
+      '` :' +
+      `
+` +
+      '```\n ' +
+      shellExec(`node bin help ${o._name}`, { silent: true, stdout: true }) +
+      ' \n```' +
+      `
+  `;
+  });
+  fs.writeFileSync(`./src/client/public/nexodev/docs/references/Command Line Interface.md`, md, 'utf8');
+  fs.writeFileSync(`./cli.md`, md, 'utf8');
+  const readmeSplit = `pwa-microservices-template</a>`;
+  const readme = fs.readFileSync(`./README.md`, 'utf8').split(readmeSplit);
+  fs.writeFileSync(
+    './README.md',
+    readme[0] +
+      readmeSplit +
+      `
+
+` +
+      baseOptions +
+      `
+      
+<a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
+      
+`,
+    'utf8',
+  );
+};
+
+export { program, buildCliDoc };

package/src/cli/monitor.js

@@ -4,13 +4,33 @@ import UnderpostDeploy from './deploy.js';
 import axios from 'axios';
 import UnderpostRootEnv from './env.js';
 import fs from 'fs-extra';
+import { shellExec } from '../server/process.js';
+import { isInternetConnection } from '../server/dns.js';
 
 const logger = loggerFactory(import.meta);
 
 class UnderpostMonitor {
   static API = {
-    async callback(deployId, env = 'development', options = { now: false, single: false, msInterval: '' }) {
-      const router = await UnderpostDeploy.API.routerFactory(deployId, env);
+    async callback(
+      deployId,
+      env = 'development',
+      options = { now: false, single: false, msInterval: '', type: '', replicas: '', sync: false },
+      commanderOptions,
+      auxRouter,
+    ) {
+      if (deployId === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`)) {
+        for (const _deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(','))
+          UnderpostMonitor.API.callback(
+            _deployId.trim(),
+            env,
+            options,
+            commanderOptions,
+            await UnderpostDeploy.API.routerFactory(_deployId, env),
+          );
+        return;
+      }
+
+      const router = auxRouter ?? (await UnderpostDeploy.API.routerFactory(deployId, env));
 
       const confServer = loadReplicas(
         JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
@@ -19,20 +39,58 @@ class UnderpostMonitor {
 
       const pathPortAssignmentData = pathPortAssignmentFactory(router, confServer);
 
-      logger.info('', pathPortAssignmentData);
+      let errorPayloads = [];
+      if (options.sync === true) {
+        const currentTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId);
+        if (currentTraffic) UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, currentTraffic);
+      }
+      let traffic = UnderpostRootEnv.API.get(`${deployId}-${env}-traffic`) ?? 'blue';
+      const maxAttempts = parseInt(
+        Object.keys(pathPortAssignmentData)
+          .map((host) => pathPortAssignmentData[host].length)
+          .reduce((accumulator, value) => accumulator + value, 0) * 2.5,
+      );
+
+      logger.info(`Init deploy monitor`, {
+        pathPortAssignmentData,
+        maxAttempts,
+        deployId,
+        env,
+        traffic,
+      });
 
-      const errorPayloads = [];
-      const maxAttempts = Object.keys(pathPortAssignmentData)
-        .map((host) => pathPortAssignmentData[host].length)
-        .reduce((accumulator, value) => accumulator + value, 0);
+      const switchTraffic = () => {
+        if (traffic === 'blue') traffic = 'green';
+        else traffic = 'blue';
+        UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, traffic);
+        shellExec(
+          `node bin deploy --info-router --build-manifest --traffic ${traffic} --replicas ${
+            options.replicas ? options.replicas : 1
+          } ${deployId} ${env}`,
+        );
+        shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml`);
+      };
 
       const monitor = async (reject) => {
-        logger.info('Check server health');
+        if (UnderpostRootEnv.API.get(`monitor-init-callback-script`))
+          shellExec(UnderpostRootEnv.API.get(`monitor-init-callback-script`));
+        const currentTimestamp = new Date().getTime();
+        errorPayloads = errorPayloads.filter((e) => currentTimestamp - e.timestamp < 60 * 1000 * 5);
+        logger.info(`[${deployId}-${env}] Check server health`);
         for (const host of Object.keys(pathPortAssignmentData)) {
           for (const instance of pathPortAssignmentData[host]) {
             const { port, path } = instance;
             if (path.match('peer') || path.match('socket')) continue;
-            const urlTest = `http://localhost:${port}${path}`;
+            let urlTest = `http://localhost:${port}${path}`;
+            switch (options.type) {
+              case 'remote':
+              case 'blue-green':
+                urlTest = `https://${host}${path}`;
+                break;
+
+              default:
+                break;
+            }
             // logger.info('Test instance', urlTest);
             await axios.get(urlTest, { timeout: 10000 }).catch((error) => {
               // console.log(error);
@@ -45,15 +103,48 @@ class UnderpostMonitor {
                 status: error.status,
                 code: error.code,
                 errors: error.errors,
+                timestamp: new Date().getTime(),
               };
               if (errorPayload.status !== 404) {
                 errorPayloads.push(errorPayload);
                 if (errorPayloads.length >= maxAttempts) {
                   const message = JSON.stringify(errorPayloads, null, 4);
-                  if (reject) reject(message);
-                  else throw new Error(message);
+                  logger.error(
+                    `Deployment ${deployId} ${env} has been reached max attempts error payloads`,
+                    errorPayloads,
+                  );
+                  switch (options.type) {
+                    case 'blue-green':
+                      {
+                        const confServer = JSON.parse(
+                          fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
+                        );
+
+                        shellExec(`kubectl delete configmap underpost-config`);
+                        shellExec(
+                          `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env}`,
+                        );
+
+                        for (const host of Object.keys(confServer)) {
+                          shellExec(`sudo kubectl delete HTTPProxy ${host}`);
+                        }
+                        shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${traffic}`);
+
+                        switchTraffic();
+                      }
+
+                      break;
+
+                    case 'remote':
+                      break;
+
+                    default:
+                      if (reject) reject(message);
+                      else throw new Error(message);
+                  }
+                  errorPayloads = [];
                 }
-                logger.error('Error accumulator', errorPayloads.length);
+                logger.error(`Error accumulator ${deployId}-${env}-${traffic}`, errorPayloads.length);
               }
             });
           }
@@ -62,29 +153,82 @@ class UnderpostMonitor {
       if (options.now === true) await monitor();
       if (options.single === true) return;
       let optionsMsTimeout = parseInt(options.msInterval);
-      if (isNaN(optionsMsTimeout)) optionsMsTimeout = 30000;
+      if (isNaN(optionsMsTimeout)) optionsMsTimeout = 60250; // 60.25 seconds
+      let monitorTrafficName;
+      let monitorPodName;
       const monitorCallBack = (resolve, reject) => {
-        const envMsTimeout = UnderpostRootEnv.API.get('monitor-ms');
+        const envMsTimeout = UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-ms`);
         setTimeout(
           async () => {
-            switch (UnderpostRootEnv.API.get('monitor-input')) {
-              case 'pause':
-                monitorCallBack(resolve, reject);
-                return;
-              case 'restart':
-                return reject();
-              case 'stop':
-                return resolve();
+            const isOnline = await isInternetConnection();
+            if (!isOnline) {
+              logger.warn('No internet connection');
+              monitorCallBack(resolve, reject);
+              return;
+            }
+            switch (options.type) {
+              case 'blue-green':
+                {
+                  if (monitorTrafficName !== traffic) {
+                    monitorTrafficName = undefined;
+                    monitorPodName = undefined;
+                  }
+                  const cmd = `underpost config get container-status`;
+                  const checkDeploymentReadyStatus = () => {
+                    const pods = UnderpostDeploy.API.get(`${deployId}-${env}-${traffic}`);
+                    if (pods && pods[0]) {
+                      const { NAME } = pods[0];
+                      if (
+                        shellExec(`sudo kubectl exec -i ${NAME} -- sh -c "${cmd}"`, { stdout: true }).match(
+                          `${deployId}-${env}-running-deployment`,
+                        )
+                      ) {
+                        monitorPodName = NAME;
+                        monitorTrafficName = `${traffic}`;
+                      }
+                    }
+                  };
+                  if (!monitorPodName) {
+                    checkDeploymentReadyStatus();
+                    monitorCallBack(resolve, reject);
+                    return;
+                  }
+                }
+
+                break;
+
               default:
-                await monitor(reject);
-                monitorCallBack(resolve, reject);
-                return;
+                break;
             }
+            for (const monitorStatus of [
+              { key: `monitor-input`, value: UnderpostRootEnv.API.get(`monitor-input`) },
+              {
+                key: `${deployId}-${env}-monitor-input`,
+                value: UnderpostRootEnv.API.get(`${deployId}-${env}-monitor-input`),
+              },
+            ])
+              switch (monitorStatus.value) {
+                case 'pause':
+                  monitorCallBack(resolve, reject);
+                  return;
+                case 'restart':
+                  UnderpostRootEnv.API.delete(monitorStatus.key);
+                  return reject();
+                case 'stop':
+                  UnderpostRootEnv.API.delete(monitorStatus.key);
+                  return resolve();
+                case 'blue-green-switch':
+                  UnderpostRootEnv.API.delete(monitorStatus.key);
+                  switchTraffic();
+              }
+            await monitor(reject);
+            monitorCallBack(resolve, reject);
+            return;
           },
           !isNaN(envMsTimeout) ? envMsTimeout : optionsMsTimeout,
         );
       };
-      return await new Promise((...args) => monitorCallBack(...args));
+      return new Promise((...args) => monitorCallBack(...args));
     },
   };
 }

package/src/cli/repository.js

@@ -4,7 +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';
+import UnderpostStartUp from '../server/start.js';
 
 dotenv.config();
 
@@ -78,7 +78,10 @@ class UnderpostRepository {
       return new Promise(async (resolve, reject) => {
         try {
           await logger.setUpInfo();
-          if (repositoryName === 'service') return resolve(await listenPortController(listenServerFactory(), ':'));
+          if (repositoryName === 'service')
+            return resolve(
+              await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), ':'),
+            );
           else actionInitLog();
           const exeRootPath = `${getNpmRootPath()}/underpost`;
           const destFolder = `./${repositoryName}`;

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

@@ -204,7 +204,7 @@ const Account = {
             disabled: false,
             extension: async () =>
               html`${await BtnIcon.Render({
-                class: `wfa btn-input-extension btn-account-update-username`,
+                class: `in wfa btn-input-extension btn-account-update-username`,
                 type: 'button',
                 style: 'text-align: left',
                 label: html`${Translate.Render(`update`)}`,
@@ -223,7 +223,7 @@ const Account = {
             extension: !(options && options.disabled && options.disabled.includes('emailConfirm'))
               ? async () => html`<div class="in verify-email-status"></div>
                   ${await BtnIcon.Render({
-                    class: `wfa btn-input-extension btn-confirm-email`,
+                    class: `in wfa btn-input-extension btn-confirm-email`,
                     type: 'button',
                     style: 'text-align: left',
                     label: html`<div class="in">
@@ -246,7 +246,7 @@ const Account = {
             disabledEye: true,
             extension: async () =>
               html`${await BtnIcon.Render({
-                class: `wfa btn-input-extension btn-account-change-password`,
+                class: `in wfa btn-input-extension btn-account-change-password`,
                 type: 'button',
                 style: 'text-align: left',
                 label: html`${Translate.Render(`change-password`)}`,

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

@@ -446,7 +446,6 @@ const CalendarCore = {
         .calendar-buttons-container {
           padding-bottom: 15px;
           height: 60px;
-          z-index: 4;
         }
       </style>
       <div class="in calendar-container hide">

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

@@ -761,7 +761,6 @@ 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/CssCore.js

@@ -524,6 +524,7 @@ const CssCoreDark = {
           margin: 5px 0 0 0;
           padding: 5px;
           font-size: 16px;
+          min-height: 40px;
         }
         .btn-input-extension:hover {
         }
@@ -843,6 +844,7 @@ const CssCoreLight = {
           margin: 5px 0 0 0;
           padding: 5px;
           font-size: 16px;
+          min-height: 40px;
         }
         .btn-input-extension:hover {
         }

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

@@ -12,7 +12,7 @@ const EventsUI = {
     if (!s(id)) return;
     let complete = true;
     s(id)[type] = async function (e) {
-      cssEffect(id, e);
+      if (options.clickEffect) cssEffect(id, e);
       if (complete) {
         complete = false;
         await LoadingAnimation.spinner.play(loadingContainer ? loadingContainer : id);

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

@@ -19,8 +19,8 @@ const JoyStick = {
             /* border: 2px solid red; */
             left: 5px;
             bottom: 5px;
-            height: 200px;
-            width: 200px;
+            height: 175px;
+            width: 175px;
             z-index: 3;
           }
           .joy-img-background-${id} {

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

@@ -1629,6 +1629,7 @@ const Modal = {
   currentTopModalId: '',
   zIndexSync: function ({ idModal }) {
     setTimeout(() => {
+      if (!this.Data[idModal]) return;
       const cleanTopModal = () => {
         Object.keys(this.Data).map((_idModal) => {
           if (this.Data[_idModal].options.zIndexSync && s(`.${_idModal}`)) s(`.${_idModal}`).style.zIndex = '3';