@underpostnet/underpost 2.8.4 → 2.8.5

package/src/server/dns.js

@@ -17,10 +17,8 @@ dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
-const Dns = {
-  repoUrl: `https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_USERNAME}/${process.env.GITHUB_DNS_REPO}.git`,
-  callback: () => null,
-  InitIpDaemon: async function ({ deployId }) {
+class Dns {
+  static callback = async function (deployList) {
     // NAT-VPS modem/router device configuration:
     // LAN --> [NAT-VPS] --> WAN
     // enabled DMZ Host to proxy IP 80-443 (79-444) sometimes router block first port
@@ -30,56 +28,55 @@ const Dns = {
     // LAN server or device's local servers port ->  3000-3100 (2999-3101)
     // DNS Records: [ANAME](Address Dynamic) -> [A](ipv4) host | [AAAA](ipv6) host -> [public-ip]
     // Forward the router's TCP/UDP ports to the LAN device's IP address
-
+    for (const _deployId of deployList.split(',')) {
+      const deployId = _deployId.trim();
     const privateCronConfPath = `./engine-private/conf/${deployId}/conf.cron.json`;
-
     const confCronPath = fs.existsSync(privateCronConfPath) ? privateCronConfPath : './conf/conf.cron.json';
-    let confCronData = JSON.parse(fs.readFileSync(confCronPath, 'utf8'));
-    if (confCronData.ipDaemon.disabled) return;
-    Dns.ip = confCronData.ipDaemon.ip;
-    logger.info(`Current ip`, Dns.ip);
-    const callback = async () => {
-      logger.info('init dns ip callback');
-      await logger.setUpInfo();
-      let testIp;
-      try {
-        testIp = await ip.public.ipv4();
-      } catch (error) {
-        logger.error(error, { testIp, stack: error.stack });
-      }
-      if (testIp && typeof testIp === 'string' && validator.isIP(testIp) && Dns.ip !== testIp) {
-        logger.info(`New ip`, testIp);
-        for (const recordType of Object.keys(confCronData.records)) {
-          switch (recordType) {
-            case 'A':
-              for (const dnsProvider of confCronData.records[recordType]) {
-                if (typeof Dns.services.updateIp[dnsProvider.dns] === 'function')
-                  await Dns.services.updateIp[dnsProvider.dns]({ ...dnsProvider, ip: testIp });
-              }
-              break;
+    const confCronData = JSON.parse(fs.readFileSync(confCronPath, 'utf8'));
+
+    let testIp;
+
+    try {
+      testIp = await ip.public.ipv4();
+    } catch (error) {
+      logger.error(error, { testIp, stack: error.stack });
+    }
+      const ipFileName = `${deployId}.ip`;
+      const currentIp = fs.existsSync(`./engine-private/deploy/${ipFileName}`)
+        ? fs.readFileSync(`./engine-private/deploy/${ipFileName}`, 'utf8')
+      : undefined;
 
-            default:
-              break;
-          }
+    if (testIp && typeof testIp === 'string' && validator.isIP(testIp) && currentIp !== testIp) {
+      logger.info(`new ip`, testIp);
+      for (const recordType of Object.keys(confCronData.records)) {
+        switch (recordType) {
+          case 'A':
+            for (const dnsProvider of confCronData.records[recordType]) {
+              if (typeof Dns.services.updateIp[dnsProvider.dns] === 'function')
+                await Dns.services.updateIp[dnsProvider.dns]({ ...dnsProvider, ip: testIp });
+            }
+            break;
+
+          default:
+            break;
         }
-        try {
-          const ipUrlTest = `https://${process.env.DEFAULT_DEPLOY_HOST}`;
-          const response = await axios.get(ipUrlTest);
-          const verifyIp = response.request.socket.remoteAddress;
-          logger.info(ipUrlTest + ' IP', verifyIp);
-          if (verifyIp === testIp) {
-            await this.saveIp(confCronPath, confCronData, testIp);
-          } else logger.error('ip not updated');
-        } catch (error) {
-          logger.error(error), 'ip not updated';
+      }
+      try {
+        const ipUrlTest = `https://${process.env.DEFAULT_DEPLOY_HOST}`;
+        const response = await axios.get(ipUrlTest);
+        const verifyIp = response.request.socket.remoteAddress;
+        logger.info(ipUrlTest + ' IP', verifyIp);
+        if (verifyIp === testIp) {
+            fs.writeFileSync(`./engine-private/deploy/${ipFileName}`, testIp, 'utf8');
+        } else logger.error('ip not updated');
+      } catch (error) {
+        logger.error(error), 'ip not updated';
         }
       }
-    };
-    await callback();
-    this.callback = callback;
-    return callback;
-  },
-  services: {
+    }
+  };
+
+  static services = {
     updateIp: {
       dondominio: (options) => {
         const { user, api_key, host, dns, ip } = options;
@@ -100,21 +97,7 @@ const Dns = {
         });
       },
     },
-  },
-  saveIp: async (confCronPath, confCronData, ip) => {
-    Dns.ip = ip;
-    confCronData.ipDaemon.ip = ip;
-    fs.writeFileSync(confCronPath, JSON.stringify(confCronData, null, 4), 'utf8');
-    shellExec(
-      `cd ./engine-private` +
-        ` && git pull ${Dns.repoUrl}` +
-        ` && git add . && git commit -m "update ip ${new Date().toLocaleDateString()}"` +
-        ` && git push ${Dns.repoUrl}`,
-      {
-        disableLog: true,
-      },
-    );
-  },
-};
+  };
+}
 
-export { Dns };
+export default Dns;

package/src/server/logger.js

@@ -84,8 +84,8 @@ const format = (meta) =>
  * @memberof Logger
  */
 const setUpInfo = async (logger = new winston.Logger()) => {
-  logger.info('npm_package_version', process.env.npm_package_version);
   logger.info('argv', process.argv);
+  logger.info('cwd', process.cwd());
   logger.info('platform', process.platform);
   logger.info('env', process.env.NODE_ENV);
   logger.info('--max-old-space-size', {
@@ -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` }),
@@ -186,11 +186,11 @@ const underpostASCI = () => `
 ░╚═════╝░╚═╝░░╚══╝╚═════╝░╚══════╝╚═╝░░╚═╝╚═╝░░░░░░╚════╝░╚═════╝░░░░╚═╝░░░
                                                 `;
 
-const actionInitLog = (version = '0.0.0') =>
+const actionInitLog = () =>
   console.log(
     underpostASCI() +
       `
-    ${version} https://www.nexodev.org/docs
+    https://www.nexodev.org/docs
 `,
   );
 

package/src/server/network.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 
 import { publicIp, publicIpv4, publicIpv6 } from 'public-ip';
-import { loggerFactory } from './logger.js';
+import { actionInitLog, loggerFactory } from './logger.js';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
 import { getDeployId } from './conf.js';
 
@@ -39,8 +39,8 @@ const saveRuntimeRouter = async () => {
     const host = process.env.DEFAULT_DEPLOY_HOST;
     const path = process.env.DEFAULT_DEPLOY_PATH;
     const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
-    if (!deployId || !host || !path) {
-      logger.warn('default deploy instance not found');
+    if (!deployId || !host || !path || !fs.existsSync(confServerPath)) {
+      // logger.warn('default deploy instance not found');
       return;
     }
     const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
@@ -77,7 +77,7 @@ const saveRuntimeRouter = async () => {
 
     if (closeConn) await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
   } catch (error) {
-    logger.error(error);
+    logger.error(error, error.stack);
   }
 };
 
@@ -114,20 +114,30 @@ const saveRuntimeCron = async () => {
 
     if (closeConn) await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
   } catch (error) {
-    logger.error(error);
+    logger.error(error, error.stack);
   }
 };
 
 const listenServerFactory = (logic = async () => {}) => {
   return {
-    listen: async (...args) => (logic ? await logic(...args) : undefined, args[1]()),
+    listen: async (...args) => (
+      setTimeout(() => {
+        const message = 'Listen server factory timeout';
+        logger.error(message);
+        throw new Error(message);
+      }, 80000000), // ~ 55 days
+      (logic ? await logic(...args) : undefined, args[1]())
+    ),
   };
 };
 
 const listenPortController = async (server, port, metadata) =>
   new Promise((resolve) => {
     try {
-      if (!server) server = listenServerFactory();
+      if (port === ':') {
+        server.listen(port, actionInitLog);
+        return resolve(true);
+      }
 
       const { host, path, client, runtime, meta } = metadata;
       const error = [];

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

@@ -1,22 +0,0 @@
-'use strict';
-
-// https://nodejs.org/api
-// https://expressjs.com/en/4x/api.html
-
-import dotenv from 'dotenv';
-import { loggerFactory } from './server/logger.js';
-import { Dns } from './server/dns.js';
-import { ProcessController } from './server/process.js';
-import { Config } from './server/conf.js';
-
-dotenv.config();
-
-await Config.build();
-
-const logger = loggerFactory(import.meta);
-
-await logger.setUpInfo();
-
-await Dns.InitIpDaemon();
-
-ProcessController.init(logger);

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;

package/startup.cjs

@@ -1,12 +0,0 @@
-const shell = require('shelljs');
-
-// /usr/bin/supervisord -n
-// /usr/sbin/sshd -D
-
-shell.exec(`/usr/bin/supervisord -n`, { async: true });
-
-// shell.exec(`sudo /opt/lampp/lampp start`, { async: true });
-
-// shell.exec(`/usr/bin/mongod -f /etc/mongod.conf`, { async: true });
-
-shell.exec(`underpost new app`);