underpost 2.8.42 → 2.8.44

package/.vscode/settings.json

@@ -113,5 +113,8 @@
     "editor.defaultFormatter": "foxundermoon.shell-format"
   },
   "docwriter.progress.trackTypes": true,
-  "docwriter.hotkey.mac": "⌘ + ."
+  "docwriter.hotkey.mac": "⌘ + .",
+  "[dotenv]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  }
 }

package/Dockerfile

@@ -32,7 +32,7 @@ COPY supervisord-openssh-server.conf /etc/supervisor/conf.d/supervisord-openssh-
 RUN apt-get install -yq --no-install-recommends libssl-dev curl wget git gnupg
 
 # install nodejs https://github.com/nodesource/distributions/blob/master/README.md#deb
-RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash -
 RUN apt-get install -y nodejs build-essential
 RUN node --version
 RUN npm --version

package/bin/deploy.js

@@ -26,6 +26,7 @@ import {
   restoreMacroDb,
   fixDependencies,
   setUpProxyMaintenanceServer,
+  writeEnv,
 } from '../src/server/conf.js';
 import { buildClient } from '../src/server/client-build.js';
 import { range, setPad, timer, uniqueArray } from '../src/client/components/core/CommonJs.js';
@@ -546,13 +547,7 @@ try {
             ? envInstanceObj.port
             : envInstanceObj.port + port - singleReplicaHosts.length - (replicaHost ? 1 : 0);
 
-          fs.writeFileSync(
-            envPath,
-            Object.keys(envObj)
-              .map((key) => `${key}=${envObj[key]}`)
-              .join(`\n`),
-            'utf8',
-          );
+          writeEnv(envPath, envObj);
         }
         const serverConf = loadReplicas(
           JSON.parse(fs.readFileSync(`${baseConfPath}/${deployId}/conf.server.json`, 'utf8')),

package/bin/index.js

@@ -1,12 +1,24 @@
 #! /usr/bin/env node
 
 import dotenv from 'dotenv';
-import { shellCd, shellExec } from '../src/server/process.js';
 import { Command } from 'commander';
-import { actionInitLog, loggerFactory } from '../src/server/logger.js';
+import { loggerFactory } from '../src/server/logger.js';
 import Underpost from '../src/index.js';
+import {
+  getNpmRootPath,
+  loadConf,
+  newProject,
+  repoClone,
+  repoCommit,
+  repoPull,
+  repoPush,
+  UnderpostRootEnv,
+} from '../src/server/conf.js';
+import fs from 'fs-extra';
 
-dotenv.config();
+const npmRoot = getNpmRootPath();
+const underpostRoot = `${npmRoot}/underpost/.env`;
+fs.existsSync(underpostRoot) ? dotenv.config({ path: underpostRoot, override: true }) : dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
@@ -17,17 +29,17 @@ program.name('underpost').description(`underpost.net ci/cd cli ${Underpost.versi
 program
   .command('new <app-name>')
   .description('Create a new project')
-  .action((...args) => ((args[1] = Underpost.version), new Underpost.project(...args)));
+  .action((...args) => ((args[1] = Underpost.version), newProject(...args)));
 
 program
   .command('clone <uri>')
   .description('Clone github repository, if your GITHUB_TOKEN environment exists, it will be used')
-  .action(Underpost.project.clone);
+  .action(repoClone);
 
 program
   .command('pull <path> <uri>')
   .description('Pull github repository, if your GITHUB_TOKEN environment exists, it will be used')
-  .action(Underpost.project.pull);
+  .action(repoPull);
 
 program
   .option('--copy')
@@ -37,17 +49,27 @@ program
   .description(
     'Commit github repository, if your GITHUB_TOKEN environment exists, it will be used, use --copy will copy to clipboard message, use --info will see info commit types, use --empty will allow empty files',
   )
-  .action((...args) => ((args[4] = options), Underpost.project.commit(...args)));
+  .action((...args) => ((args[4] = options), repoCommit(...args)));
 
 program
   .command('push <path> <uri>')
   .description('Push github repository, if your GITHUB_TOKEN environment exists, it will be used')
-  .action(Underpost.project.push);
+  .action(repoPush);
 
 program
   .command('env <deploy-id> [env]')
   .description('Set environment variables files and conf related to <deploy-id>')
-  .action(Underpost.project.useEnv);
+  .action(loadConf);
+
+program
+  .command('config <operator> [key] [value]')
+  .description(`Manage configuration, operators available: ${Object.keys(UnderpostRootEnv)}`)
+  .action((...args) => UnderpostRootEnv[args[0]](args[1], args[2]));
+
+program
+  .command('root')
+  .description('Get npm root path')
+  .action(() => console.log(getNpmRootPath()));
 
 program.command('test').description('Run tests').action(Underpost.runTest);
 

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.42'
+      engine.version: '2.8.44'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.42",
+    "version": "2.8.44",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/client/ssr/body/CacheControl.js

@@ -106,10 +106,10 @@ SrrComponent = ({ ttiLoadTimeLimit }) => {
     </style>
     ${borderChar(1, 'black', ['.clean-cache-container'])}
     <script>
-      window._VERSION = '${process.env.npm_package_version}';
+      window._VERSION = '${npm_package_version}';
       const CacheControl = ${CacheControl};
       CacheControl({ ttiLoadTimeLimit: ${ttiLoadTimeLimit ? ttiLoadTimeLimit : 1000 * 70 * 1} });
     </script>
-    <div class="clean-cache-container">${process.env.npm_package_version}</div>
+    <div class="clean-cache-container">${npm_package_version}</div>
   `;
 };

package/src/index.js

@@ -6,7 +6,6 @@
 
 import { runTest } from './server/conf.js';
 import { loggerFactory, setUpInfo } from './server/logger.js';
-import Project from './server/project.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -22,8 +21,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.42';
-  static project = Project;
+  static version = 'v2.8.44';
 
   constructor() {}
 

package/src/server/client-build.js

@@ -191,8 +191,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
 
       if (redirect || disabledRebuild) continue;
 
-      if (fullBuildEnabled) {
-        //  !(confServer[host]['/'] && confServer[host]['/'].liteBuild)
+      if (fullBuildEnabled)
         await fullBuild({
           path,
           logger,
@@ -205,14 +204,6 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
           iconsBuild,
           metadata,
         });
-        if (apis && false)
-          for (const apiBuildScript of apis) {
-            const scriptPath = `src/api/${apiBuildScript}/${apiBuildScript}.build.js`;
-            if (fs.existsSync(`./${scriptPath}`)) {
-              shellExec(`node ${scriptPath}`);
-            }
-          }
-      }
 
       if (components)
         for (const module of Object.keys(components)) {

package/src/server/client-formatted.js

@@ -1,6 +1,7 @@
 'use strict';
 
 import fs from 'fs-extra';
+import vm from 'node:vm';
 
 const srcFormatted = (src) =>
   src
@@ -48,9 +49,10 @@ const viewFormatted = (src, dists, proxyPath, baseHost = '') => {
 };
 
 const ssrFactory = async (componentPath = `./src/client/ssr/Render.js`) => {
-  let SrrComponent = () => {};
-  eval(await srcFormatted(fs.readFileSync(componentPath, 'utf8')));
-  return SrrComponent;
+  const context = { SrrComponent: () => {}, npm_package_version: process.env.npm_package_version };
+  vm.createContext(context);
+  vm.runInContext(await srcFormatted(fs.readFileSync(componentPath, 'utf8')), context);
+  return context.SrrComponent;
 };
 
 export { srcFormatted, JSONweb, componentFormatted, viewFormatted, ssrFactory };

package/src/server/conf.js

@@ -127,7 +127,11 @@ const loadConf = (deployId, envInput) => {
       ...env,
     };
   }
-  fs.writeFileSync(`./package.json`, fs.readFileSync(`${folder}/package.json`, 'utf8'), 'utf8');
+  const originPackageJson = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
+  const packageJson = JSON.parse(fs.readFileSync(`${folder}/package.json`, 'utf8'));
+  originPackageJson.scripts.start = packageJson.scripts.start;
+  packageJson.scripts = originPackageJson.scripts;
+  fs.writeFileSync(`./package.json`, JSON.stringify(packageJson, null, 4), 'utf8');
   return { folder, deployId };
 };
 
@@ -1164,6 +1168,8 @@ const repoPush = (repoPath = './', gitUri = 'underpostnet/pwa-microservices-temp
 const getNpmRootPath = () =>
   shellExec(`npm root -g`, {
     stdout: true,
+    disableLog: true,
+    silent: true,
   }).trim();
 
 const newProject = (repositoryName, version) => {
@@ -1197,6 +1203,55 @@ const runTest = (version) => {
   shellExec(`cd ${getNpmRootPath()}/underpost && npm run test`);
 };
 
+const writeEnv = (envPath, envObj) =>
+  fs.writeFileSync(
+    envPath,
+    Object.keys(envObj)
+      .map((key) => `${key}=${envObj[key]}`)
+      .join(`\n`),
+    'utf8',
+  );
+
+const UnderpostRootEnv = {
+  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, value) => {
+    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 {
   Cmd,
   Config,
@@ -1239,4 +1294,6 @@ export {
   newProject,
   runTest,
   getNpmRootPath,
+  writeEnv,
+  UnderpostRootEnv,
 };

package/src/server/logger.js

@@ -112,10 +112,10 @@ const loggerFactory = (meta = { url: '' }) => {
     // Allow the use the terminal to print the messages
     new winston.transports.Console(),
     // Allow to print all the error level messages inside the error.log file
-    new winston.transports.File({
-      filename: `logs/${meta}/error.log`,
-      level: 'error',
-    }),
+    // new winston.transports.File({
+    //   filename: `logs/${meta}/error.log`,
+    //   level: 'error',
+    // }),
     // Allow to print all the error message inside the all.log file
     // (also the error log that are also printed inside the error.log(
     new winston.transports.File({ filename: `logs/${meta}/all.log` }),

package/src/server/runtime.js

@@ -15,7 +15,7 @@ import { getCapVariableName, newInstance } from '../client/components/core/Commo
 import { Xampp } from '../runtime/xampp/Xampp.js';
 import { MailerProvider } from '../mailer/MailerProvider.js';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
-import { createProxyMiddleware } from 'http-proxy-middleware';
+// import { createProxyMiddleware } from 'http-proxy-middleware';
 import { createPeerServer } from './peer.js';
 import { Lampp } from '../runtime/lampp/Lampp.js';
 import { getDeployId } from './conf.js';
@@ -31,20 +31,6 @@ const buildRuntime = async () => {
   const collectDefaultMetrics = promClient.collectDefaultMetrics;
   collectDefaultMetrics();
 
-  if (fs.existsSync(`/root/.bashrc`) && !fs.readFileSync(`/root/.bashrc`, 'utf8').match(`underpost-engine`)) {
-    fs.writeFileSync(
-      `/root/.bashrc`,
-      `${fs.readFileSync(`/root/.bashrc`, 'utf8')}
-` +
-        `export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm underpost-engine bash_completion
-
-export PATH=$PATH:/opt/lampp/bin`,
-      'utf8',
-    );
-  }
-
   const promCounterOption = {
     name: `${deployId.replaceAll('-', '_')}_http_requests_total`,
     help: 'Total number of HTTP requests',
@@ -54,7 +40,6 @@ export PATH=$PATH:/opt/lampp/bin`,
   // logger.info('promCounterOption', promCounterOption);
 
   const requestCounter = new promClient.Counter(promCounterOption);
-
   const ipInstance = ''; // await ip.public.ipv4();
   const initPort = parseInt(process.env.PORT) + 1;
   let currentPort = initPort;
@@ -101,12 +86,13 @@ export PATH=$PATH:/opt/lampp/bin`,
         apis,
       };
 
-      let redirectUrl;
-      let redirectTarget;
-      if (redirect) {
-        redirectUrl = new URL(redirect);
-        redirectTarget = redirect[redirect.length - 1] === '/' ? redirect.slice(0, -1) : redirect;
-      }
+      const redirectTarget = redirect
+        ? redirect[redirect.length - 1] === '/'
+          ? redirect.slice(0, -1)
+          : redirect
+        : undefined;
+
+      // if (redirect) logger.info('redirect', new URL(redirect));
 
       switch (runtime) {
         case 'lampp':

package/src/server/project.js

@@ -1,39 +0,0 @@
-import { loadConf, newProject, repoClone, repoCommit, repoPull, repoPush } from './conf.js';
-
-class Project {
-  constructor(repositoryName, version) {
-    return newProject(repositoryName, version);
-  }
-
-  static clone(gitUri = 'underpostnet/pwa-microservices-template') {
-    return repoClone(gitUri);
-  }
-
-  static useEnv(deployId = 'default', env = 'production') {
-    return loadConf(deployId, env);
-  }
-
-  static pull(repoPath = './', gitUri = 'underpostnet/pwa-microservices-template') {
-    return repoPull(repoPath, gitUri);
-  }
-
-  static commit(
-    repoPath = './',
-    commitType = 'feat',
-    subModule = '',
-    message = '',
-    options = {
-      copy: false,
-      info: false,
-      empty: false,
-    },
-  ) {
-    return repoCommit(repoPath, commitType, subModule, message, options);
-  }
-
-  static push(repoPath = './', gitUri = 'underpostnet/pwa-microservices-template') {
-    return repoPush(repoPath, gitUri);
-  }
-}
-
-export default Project;