underpost 2.8.641 → 2.8.646

package/bin/index.js

@@ -22,6 +22,15 @@ program
   .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')
@@ -125,15 +134,6 @@ program
     if (args[1].init) return Underpost.secret[args[0]].init();
   });
 
-program
-  .command('dockerfile-node-script')
-  .argument('<deploy-id>', 'Deploy configuration id')
-  .argument('[env]', 'Optional environment, for default is development')
-  .option('--run', 'Run custom entry point script')
-  .option('--build', 'Build custom image container scripts')
-  .description('Dockerfile custom node build script')
-  .action(Underpost.image.dockerfile.script);
-
 program
   .command('dockerfile-image-build')
   .option('--path [path]', 'Dockerfile path')

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.641'
+      engine.version: '2.8.646'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.641",
+    "version": "2.8.646",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -118,12 +118,7 @@
         "vanilla-jsoneditor": "^2.3.2",
         "winston": "^3.11.0"
     },
-    "devDependencies": {
-        "clean-jsdoc-theme": "^4.3.0",
-        "mocha": "^10.8.2",
-        "plantuml": "^0.0.2",
-        "swagger-autogen": "^2.23.7"
-    },
+    "devDependencies": {},
     "publishConfig": {
         "provenance": true,
         "access": "public",

package/src/cli/deploy.js

@@ -88,7 +88,7 @@ spec:
               npm install -g npm@11.2.0 &&
               npm install -g underpost &&
               underpost secret underpost --create-from-file /etc/config/.env.${env} &&
-              underpost dockerfile-node-script --build --run ${deployId} ${env}
+              underpost start --build --run ${deployId} ${env}
           volumeMounts:
             - name: config-volume
               mountPath: /etc/config

package/src/cli/image.js

@@ -60,74 +60,6 @@ class UnderpostImage {
         if (podmanSave === true) shellExec(`podman save -o ${tarFile} ${podManImg}`);
         if (kindLoad === true) shellExec(`sudo kind load image-archive ${tarFile}`);
       },
-      async script(deployId = 'default', env = 'development', options = { run: false, build: false }) {
-        if (options.build === true) {
-          const buildBasePath = `/home/dd`;
-          const repoName = `engine-${deployId.split('-')[1]}`;
-          shellExec(`cd ${buildBasePath} && underpost clone underpostnet/${repoName}`);
-          shellExec(`cd ${buildBasePath} && sudo mv ./${repoName} ./engine`);
-          shellExec(`cd ${buildBasePath}/engine && underpost clone underpostnet/${repoName}-private`);
-          shellExec(`cd ${buildBasePath}/engine && sudo mv ./${repoName}-private ./engine-private`);
-          shellCd(`${buildBasePath}/engine`);
-          shellExec(`npm install`);
-          shellExec(`node bin/deploy conf ${deployId} ${env}`);
-          if (fs.existsSync('./engine-private/itc-scripts')) {
-            const itcScripts = await fs.readdir('./engine-private/itc-scripts');
-            for (const itcScript of itcScripts)
-              if (itcScript.match(deployId)) shellExec(`node ./engine-private/itc-scripts/${itcScript}`);
-          }
-          switch (deployId) {
-            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 build-full-client ${deployId}`);
-        }
-        if (options.run === true) {
-          const runCmd = env === 'production' ? 'run prod-img' : 'run dev-img';
-          if (fs.existsSync(`./engine-private/replica`)) {
-            const replicas = await fs.readdir(`./engine-private/replica`);
-            for (const replica of replicas) {
-              if (!replica.match(deployId)) continue;
-              shellExec(`node bin/deploy conf ${replica} ${env}`);
-              shellExec(`npm ${runCmd} deploy deploy-id:${replica}`, { async: true });
-              await awaitDeployMonitor(true);
-            }
-          }
-          shellExec(`node bin/deploy conf ${deployId} ${env}`);
-          shellExec(`npm ${runCmd} deploy deploy-id:${deployId}`, { async: true });
-          await awaitDeployMonitor(true);
-          await UnderpostMonitor.API.callback(deployId, env, { itc: true });
-        }
-      },
     },
   };
 }

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

@@ -16,6 +16,7 @@ import UnderpostRepository from './cli/repository.js';
 import UnderpostScript from './cli/script.js';
 import UnderpostSecret from './cli/secrets.js';
 import UnderpostTest from './cli/test.js';
+import UnderpostStartUp from './server/start.js';
 
 /**
  * Underpost main module methods
@@ -29,7 +30,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.641';
+  static version = 'v2.8.646';
   /**
    * Repository cli API
    * @static
@@ -51,6 +52,13 @@ class Underpost {
    * @memberof Underpost
    */
   static test = UnderpostTest.API;
+  /**
+   * Underpost Start Up cli API
+   * @static
+   * @type {UnderpostStartUp.API}
+   * @memberof Underpost
+   */
+  static start = UnderpostStartUp.API;
   /**
    * Cluster cli API
    * @static
@@ -93,13 +101,6 @@ class Underpost {
    * @memberof Underpost
    */
   static deploy = UnderpostDeploy.API;
-  /**
-   * Deployment cli NETWORK
-   * @static
-   * @type {UnderpostDeploy.NETWORK}
-   * @memberof Underpost
-   */
-  static deployNetwork = UnderpostDeploy.NETWORK;
   /**
    * Cron cli API
    * @static

package/src/server/peer.js

@@ -2,7 +2,7 @@ import { PeerServer } from 'peer';
 import dotenv from 'dotenv';
 import { loggerFactory } from './logger.js';
 import fs from 'fs-extra';
-import { listenServerFactory } from './network.js';
+import UnderpostStartUp from './start.js';
 
 dotenv.config();
 
@@ -25,7 +25,7 @@ const createPeerServer = async ({ port, devPort, origins, host, path }) => {
     // cert: fs.readFileSync(''),
     // ca: fs.readFileSync(''),
   };
-  const peerServer = listenServerFactory(() => PeerServer(options));
+  const peerServer = UnderpostStartUp.API.listenServerFactory(() => PeerServer(options));
 
   return { options, peerServer, meta: import.meta };
 };

package/src/server/proxy.js

@@ -5,9 +5,9 @@ import dotenv from 'dotenv';
 
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { loggerFactory, loggerMiddleware } from './logger.js';
-import { listenPortController } from './network.js';
 import { createSslServer, sslRedirectMiddleware } from './ssl.js';
 import { buildPortProxyRouter, buildProxyRouter, maintenanceMiddleware } from './conf.js';
+import UnderpostStartUp from './start.js';
 
 dotenv.config();
 
@@ -71,11 +71,11 @@ const buildProxy = async () => {
         switch (port) {
           case 443:
             const { ServerSSL } = await createSslServer(app, hosts);
-            await listenPortController(ServerSSL, port, runningData);
+            await UnderpostStartUp.API.listenPortController(ServerSSL, port, runningData);
             break;
 
           default:
-            await listenPortController(app, port, runningData);
+            await UnderpostStartUp.API.listenPortController(app, port, runningData);
 
             break;
         }
@@ -83,7 +83,7 @@ const buildProxy = async () => {
         break;
 
       default:
-        await listenPortController(app, port, runningData);
+        await UnderpostStartUp.API.listenPortController(app, port, runningData);
 
         break;
     }

package/src/server/runtime.js

@@ -9,7 +9,7 @@ import compression from 'compression';
 
 import { createServer } from 'http';
 import { getRootDirectory } from './process.js';
-import { listenPortController, logRuntimeRouter, listenServerFactory } from './network.js';
+import UnderpostStartUp from './start.js';
 import { loggerFactory, loggerMiddleware } from './logger.js';
 import { getCapVariableName, newInstance } from '../client/components/core/CommonJs.js';
 import { Xampp } from '../runtime/xampp/Xampp.js';
@@ -182,7 +182,11 @@ const buildRuntime = async () => {
           // RewriteCond %{HTTP_HOST} ^(?:www\.)?(.+)$ [NC]
           // RewriteRule ^ https://%1%{REQUEST_URI} [L,NE,R=301]
 
-          await listenPortController(listenServerFactory(), port, runningData);
+          await UnderpostStartUp.API.listenPortController(
+            UnderpostStartUp.API.listenServerFactory(),
+            port,
+            runningData,
+          );
           break;
         case 'xampp':
           if (!Xampp.enabled()) continue;
@@ -229,7 +233,11 @@ const buildRuntime = async () => {
           // if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
           //   $_SERVER['HTTPS'] = 'on';
           // }
-          await listenPortController(listenServerFactory(), port, runningData);
+          await UnderpostStartUp.API.listenPortController(
+            UnderpostStartUp.API.listenServerFactory(),
+            port,
+            runningData,
+          );
           break;
         case 'nodejs':
           const app = express();
@@ -282,7 +290,7 @@ const buildRuntime = async () => {
             currentPort += 2;
             const staticPort = newInstance(currentPort);
 
-            await listenPortController(app, staticPort, runningData);
+            await UnderpostStartUp.API.listenPortController(app, staticPort, runningData);
             currentPort++;
             continue;
           }
@@ -333,7 +341,7 @@ const buildRuntime = async () => {
             //   }),
             // );
 
-            await listenPortController(app, port, runningData);
+            await UnderpostStartUp.API.listenPortController(app, port, runningData);
             break;
           }
 
@@ -441,7 +449,7 @@ const buildRuntime = async () => {
                 port,
                 origins,
               });
-              await listenPortController(listenServerFactory(), port, {
+              await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), port, {
                 runtime: 'nodejs',
                 client: null,
                 host,
@@ -461,7 +469,7 @@ const buildRuntime = async () => {
               path,
             });
 
-            await listenPortController(peerServer, peerPort, {
+            await UnderpostStartUp.API.listenPortController(peerServer, peerPort, {
               runtime: 'nodejs',
               client: null,
               host,
@@ -470,7 +478,7 @@ const buildRuntime = async () => {
             });
           }
 
-          await listenPortController(server, port, runningData);
+          await UnderpostStartUp.API.listenPortController(server, port, runningData);
 
           break;
         default:
@@ -483,7 +491,7 @@ const buildRuntime = async () => {
   if (Xampp.enabled() && Xampp.router) Xampp.initService();
   if (Lampp.enabled() && Lampp.router) Lampp.initService();
 
-  logRuntimeRouter();
+  UnderpostStartUp.API.logRuntimeRouter();
 };
 
 export { buildRuntime };

package/src/server/start.js

@@ -0,0 +1,116 @@
+import UnderpostDeploy from '../cli/deploy.js';
+import UnderpostMonitor from '../cli/monitor.js';
+import fs from 'fs-extra';
+import { awaitDeployMonitor } from './conf.js';
+import { actionInitLog, loggerFactory } from './logger.js';
+import { shellCd, shellExec } from './process.js';
+
+const logger = loggerFactory(import.meta);
+
+class UnderpostStartUp {
+  static API = {
+    logRuntimeRouter: () => {
+      const displayLog = {};
+
+      for (const host of Object.keys(UnderpostDeploy.NETWORK))
+        for (const path of Object.keys(UnderpostDeploy.NETWORK[host]))
+          displayLog[UnderpostDeploy.NETWORK[host][path].publicHost] = UnderpostDeploy.NETWORK[host][path].local;
+
+      logger.info('Runtime network', displayLog);
+    },
+    listenServerFactory: (logic = async () => {}) => {
+      return {
+        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]())
+        ),
+      };
+    },
+    listenPortController: async (server, port, metadata) =>
+      new Promise((resolve) => {
+        try {
+          if (port === ':') {
+            server.listen(port, actionInitLog);
+            return resolve(true);
+          }
+
+          const { host, path, client, runtime, meta } = metadata;
+          const error = [];
+          if (port === undefined) error.push(`port`);
+          if (host === undefined) error.push(`host`);
+          if (path === undefined) error.push(`path`);
+          if (client === undefined) error.push(`client`);
+          if (runtime === undefined) error.push(`runtime`);
+          if (meta === undefined) error.push(`meta`);
+          if (error.length > 0) throw new Error('Listen port controller requires values: ' + error.join(', '));
+
+          server.listen(port, () => {
+            if (!UnderpostDeploy.NETWORK[host]) UnderpostDeploy.NETWORK[host] = {};
+            UnderpostDeploy.NETWORK[host][path] = {
+              meta,
+              client,
+              runtime,
+              port,
+              publicHost:
+                port === 80
+                  ? `http://${host}${path}`
+                  : port === 443
+                  ? `https://${host}${path}`
+                  : `http://${host}:${port}${path}`,
+              local: `http://localhost:${port}${path}`,
+              apis: metadata.apis,
+            };
+
+            return resolve(true);
+          });
+        } catch (error) {
+          logger.error(error, { metadata, port, stack: error.stack });
+          resolve(false);
+        }
+      }),
+
+    async callback(deployId = 'default', env = 'development', options = { build: false, run: false }) {
+      if (options.build === true) await UnderpostStartUp.API.build(deployId, env);
+      if (options.run === true) await UnderpostStartUp.API.run(deployId, env);
+    },
+    async build(deployId = 'default', env = 'development') {
+      const buildBasePath = `/home/dd`;
+      const repoName = `engine-${deployId.split('-')[1]}`;
+      shellExec(`cd ${buildBasePath} && underpost clone underpostnet/${repoName}`);
+      shellExec(`cd ${buildBasePath} && sudo mv ./${repoName} ./engine`);
+      shellExec(`cd ${buildBasePath}/engine && underpost clone underpostnet/${repoName}-private`);
+      shellExec(`cd ${buildBasePath}/engine && sudo mv ./${repoName}-private ./engine-private`);
+      shellCd(`${buildBasePath}/engine`);
+      shellExec(`npm install`);
+      shellExec(`node bin/deploy conf ${deployId} ${env}`);
+      if (fs.existsSync('./engine-private/itc-scripts')) {
+        const itcScripts = await fs.readdir('./engine-private/itc-scripts');
+        for (const itcScript of itcScripts)
+          if (itcScript.match(deployId)) shellExec(`node ./engine-private/itc-scripts/${itcScript}`);
+      }
+      shellExec(`node bin/deploy build-full-client ${deployId}`);
+    },
+    async run(deployId = 'default', env = 'development') {
+      const runCmd = env === 'production' ? 'run prod-img' : 'run dev-img';
+      if (fs.existsSync(`./engine-private/replica`)) {
+        const replicas = await fs.readdir(`./engine-private/replica`);
+        for (const replica of replicas) {
+          if (!replica.match(deployId)) continue;
+          shellExec(`node bin/deploy conf ${replica} ${env}`);
+          shellExec(`npm ${runCmd} deploy deploy-id:${replica}`, { async: true });
+          await awaitDeployMonitor(true);
+        }
+      }
+      shellExec(`node bin/deploy conf ${deployId} ${env}`);
+      shellExec(`npm ${runCmd} deploy deploy-id:${deployId}`, { async: true });
+      await awaitDeployMonitor(true);
+      return await UnderpostMonitor.API.callback(deployId, env);
+    },
+  };
+}
+
+export default UnderpostStartUp;