underpost 2.8.47 → 2.8.51

package/src/server/conf.js

@@ -40,21 +40,26 @@ const logger = loggerFactory(import.meta);
 
 const Config = {
   default: DefaultConf,
-  build: async function (options = { folder: '' }) {
+  build: async function (options = { folder: '' }, deployContext, deployList, subConf) {
+    if (!deployContext) deployContext = process.argv[2];
     if (!fs.existsSync(`./tmp`)) fs.mkdirSync(`./tmp`, { recursive: true });
     fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
-    if (fs.existsSync(`./engine-private/conf/${process.argv[2]}`)) return loadConf(process.argv[2]);
-    if (fs.existsSync(`./engine-private/replica/${process.argv[2]}`)) return loadConf(process.argv[2]);
+    if (fs.existsSync(`./engine-private/conf/${deployContext}`))
+      return loadConf(deployContext, process.env.NODE_ENV, subConf);
+    if (fs.existsSync(`./engine-private/replica/${deployContext}`))
+      return loadConf(deployContext, process.env.NODE_ENV, subConf);
 
-    if (process.argv[2] === 'deploy') return;
+    if (deployContext === 'deploy') return;
 
-    if (process.argv[2] === 'proxy') {
+    if (deployContext === 'proxy') {
+      if (!deployList) deployList = process.argv[3];
+      if (!subConf) subConf = process.argv[4];
       this.default.server = {};
-      for (const deployId of process.argv[3].split(',')) {
+      for (const deployId of deployList.split(',')) {
         let confPath = `./engine-private/conf/${deployId}/conf.server.json`;
         const privateConfDevPath = fs.existsSync(`./engine-private/replica/${deployId}/conf.server.json`)
           ? `./engine-private/replica/${deployId}/conf.server.json`
-          : `./engine-private/conf/${deployId}/conf.server.dev.${process.argv[4]}.json`;
+          : `./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`;
         const confDevPath = fs.existsSync(privateConfDevPath)
           ? privateConfDevPath
           : `./engine-private/conf/${deployId}/conf.server.dev.json`;
@@ -62,7 +67,7 @@ const Config = {
         if (process.env.NODE_ENV === 'development' && fs.existsSync(confDevPath)) confPath = confDevPath;
         const serverConf = JSON.parse(fs.readFileSync(confPath, 'utf8'));
 
-        for (const host of Object.keys(loadReplicas(serverConf))) {
+        for (const host of Object.keys(loadReplicas(serverConf, deployContext, subConf))) {
           if (serverConf[host]['/'])
             this.default.server[host] = {
               ...this.default.server[host],
@@ -92,7 +97,15 @@ const Config = {
   },
 };
 
-const loadConf = (deployId, envInput) => {
+const loadConf = (deployId, envInput, subConf) => {
+  if (deployId === 'clean') {
+    shellExec(`git checkout package.json`);
+    shellExec(`git checkout .env.production`);
+    shellExec(`git checkout .env.development`);
+    shellExec(`git checkout .env.test`);
+    shellExec(`git checkout jsdoc.json`);
+    return;
+  }
   const folder = fs.existsSync(`./engine-private/replica/${deployId}`)
     ? `./engine-private/replica/${deployId}`
     : `./engine-private/conf/${deployId}`;
@@ -109,7 +122,8 @@ const loadConf = (deployId, envInput) => {
       ? fs.readFileSync(`${folder}/conf.${typeConf}.json`, 'utf8')
       : JSON.stringify(Config.default[typeConf]);
     if (process.env.NODE_ENV === 'development' && typeConf === 'server') {
-      const devConfPath = `${folder}/conf.${typeConf}.dev${process.argv[3] ? `.${process.argv[3]}` : ''}.json`;
+      if (!subConf) subConf = process.argv[3];
+      const devConfPath = `${folder}/conf.${typeConf}.dev${subConf ? `.${subConf}` : ''}.json`;
       if (fs.existsSync(devConfPath)) srcConf = fs.readFileSync(devConfPath, 'utf8');
     }
     if (typeConf === 'server') srcConf = JSON.stringify(loadReplicas(JSON.parse(srcConf)), null, 4);
@@ -135,15 +149,17 @@ const loadConf = (deployId, envInput) => {
   return { folder, deployId };
 };
 
-const loadReplicas = (confServer) => {
+const loadReplicas = (confServer, deployContext, subConf) => {
+  if (!deployContext) deployContext = process.argv[2];
+  if (!subConf) subConf = process.argv[3];
   for (const host of Object.keys(confServer)) {
     for (const path of Object.keys(confServer[host])) {
       const { replicas, singleReplica } = confServer[host][path];
       if (
         replicas &&
-        (process.argv[2] === 'proxy' ||
+        (deployContext === 'proxy' ||
           !singleReplica ||
-          (singleReplica && process.env.NODE_ENV === 'development' && !process.argv[3]))
+          (singleReplica && process.env.NODE_ENV === 'development' && !subConf))
       )
         for (const replicaPath of replicas) {
           confServer[host][replicaPath] = newInstance(confServer[host][path]);
@@ -513,14 +529,16 @@ const buildPortProxyRouter = (port, proxyRouter) => {
   // build router
   Object.keys(hosts).map((hostKey) => {
     let { host, path, target, proxy, peer } = hosts[hostKey];
-    if (process.env.NODE_ENV === 'development') host = `localhost`;
+    if (process.argv.includes('localhost') && process.env.NODE_ENV === 'development') host = `localhost`;
 
     if (!proxy.includes(port)) return;
     const absoluteHost = [80, 443].includes(port)
       ? `${host}${path === '/' ? '' : path}`
       : `${host}:${port}${path === '/' ? '' : path}`;
 
-    if (!(absoluteHost in router)) router[absoluteHost] = target;
+    if (process.argv.includes('localhost')) {
+      if (!(absoluteHost in router)) router[absoluteHost] = target;
+    } else router[absoluteHost] = target;
   }); // order router
 
   if (Object.keys(router).length === 0) return router;
@@ -580,9 +598,25 @@ const cliSpinner = async (time = 5000, message0, message1, color, type = 'dots')
 const buildReplicaId = ({ deployId, replica }) => `${deployId}-${replica.slice(1)}`;
 
 const getDataDeploy = (
-  options = { buildSingleReplica: false, deployGroupId: '', deployId: '', disableSyncEnvPort: false },
+  options = {
+    buildSingleReplica: false,
+    deployGroupId: '',
+    deployId: '',
+    disableSyncEnvPort: false,
+    deployIdConcat: [],
+  },
 ) => {
-  let dataDeploy = JSON.parse(fs.readFileSync(`./engine-private/deploy/${options.deployGroupId}.json`, 'utf8'));
+  let dataDeploy =
+    options.deployGroupId === 'dd'
+      ? fs.readFileSync(`./engine-private/deploy/${options.deployGroupId}.router`, 'utf8')
+      : fs.readFileSync(`./engine-private/deploy/${options.deployGroupId}`, 'utf8');
+
+  dataDeploy = dataDeploy
+    .split(',')
+    .map((deployId) => deployId.trim())
+    .filter((deployId) => deployId);
+
+  if (options.deployIdConcat) dataDeploy = dataDeploy.concat(options.deployIdConcat);
 
   if (options.deployId) dataDeploy = dataDeploy.filter((d) => d === options.deployId);
 
@@ -817,7 +851,7 @@ const deployRun = async (dataDeploy, currentAttempt = 1) => {
   if (failed.length > 0) {
     for (const deploy of failed) logger.error(deploy.deployId, Cmd.run(deploy.deployId));
     if (currentAttempt === maxAttempts) return logger.error(`max deploy attempts exceeded`);
-    if (process.argv.includes('manual')) await read({ prompt: 'Press enter to retry failed processes\n' });
+    await read({ prompt: 'Press enter to retry failed processes\n' });
     currentAttempt++;
     await deployRun(failed, currentAttempt);
   } else logger.info(`Deploy process successfully`);
@@ -963,15 +997,15 @@ const getPathsSSR = (conf) => {
 
 const Cmd = {
   delete: (deployId) => `pm2 delete ${deployId}`,
-  run: (deployId) => `node bin/deploy run ${deployId}`,
+  run: () => `npm start`,
   build: (deployId) => `node bin/deploy build-full-client ${deployId}${process.argv.includes('l') ? ' l' : ''}`,
   conf: (deployId, env) => `node bin/deploy conf ${deployId} ${env ? env : 'production'}`,
   replica: (deployId, host, path) => `node bin/deploy build-single-replica ${deployId} ${host} ${path}`,
   syncPorts: (deployGroupId) => `node bin/deploy sync-env-port ${deployGroupId}`,
-  cron: (deployId, job, expression) => {
-    shellExec(Cmd.delete(`${deployId}-${job}`));
-    return `env-cmd -f .env.production pm2 start bin/cron.js --no-autorestart --instances 1 --cron "${expression}" --name ${deployId}-${job} -- ${job} ${deployId}`;
-  },
+  cron: (deployList, jobList, name, expression, options) =>
+    `pm2 start ./bin/index.js --no-autorestart --instances 1 --cron "${expression}" --name ${name} -- cron ${
+      options?.disableKindCluster ? `--disable-kind-cluster ` : ''
+    }${deployList} ${jobList}`,
 };
 
 const fixDependencies = async () => {
@@ -1038,7 +1072,7 @@ const setUpProxyMaintenanceServer = ({ deployGroupId }) => {
   shellExec(`node bin/deploy valkey-service`);
   const proxyDeployId = fs.readFileSync(`./engine-private/deploy/${deployGroupId}.proxy`, 'utf8').trim();
   shellExec(`node bin/deploy conf ${proxyDeployId} production`);
-  shellExec(`node bin/deploy run ${proxyDeployId} maintenance`);
+  shellExec(`npm start ${proxyDeployId} maintenance`);
 };
 
 const getNpmRootPath = () =>

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/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';
 
@@ -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,7 +114,7 @@ const saveRuntimeCron = async () => {
 
     if (closeConn) await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
   } catch (error) {
-    logger.error(error);
+    logger.error(error, error.stack);
   }
 };
 
@@ -134,7 +134,10 @@ const listenServerFactory = (logic = async () => {}) => {
 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/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);