underpost 2.8.62 → 2.8.64

package/src/client/services/default/default.management.js

@@ -80,36 +80,40 @@ const DefaultManagement = {
             class: `in fll section-mp management-table-btn-mini management-table-btn-remove-${id}-${cellRenderId}`,
           })}`;
           setTimeout(() => {
-            EventsUI.onClick(`.management-table-btn-remove-${id}-${cellRenderId}`, async () => {
-              const confirmResult = await Modal.RenderConfirm({
-                html: async () => {
-                  return html`
-                    <div class="in section-mp" style="text-align: center">
-                      ${Translate.Render('confirm-delete-item')}
-                      ${Object.keys(params.data).length > 0
-                        ? html`<br />
-                            "${options.defaultColKeyFocus
-                              ? getValueFromJoinString(params.data, options.defaultColKeyFocus)
-                              : params.data[Object.keys(params.data)[0]]}"`
-                        : ''}
-                    </div>
-                  `;
-                },
-                id: `delete-${params.data._id}`,
-              });
-              if (confirmResult.status !== 'confirm') return;
-              let result;
-              if (params.data._id) result = await ServiceProvider.delete({ id: params.data._id });
-              else result = { status: 'success' };
+            EventsUI.onClick(
+              `.management-table-btn-remove-${id}-${cellRenderId}`,
+              async () => {
+                const confirmResult = await Modal.RenderConfirm({
+                  html: async () => {
+                    return html`
+                      <div class="in section-mp" style="text-align: center">
+                        ${Translate.Render('confirm-delete-item')}
+                        ${Object.keys(params.data).length > 0
+                          ? html`<br />
+                              "${options.defaultColKeyFocus
+                                ? getValueFromJoinString(params.data, options.defaultColKeyFocus)
+                                : params.data[Object.keys(params.data)[0]]}"`
+                          : ''}
+                      </div>
+                    `;
+                  },
+                  id: `delete-${params.data._id}`,
+                });
+                if (confirmResult.status !== 'confirm') return;
+                let result;
+                if (params.data._id) result = await ServiceProvider.delete({ id: params.data._id });
+                else result = { status: 'success' };
 
-              NotificationManager.Push({
-                html: result.status === 'error' ? result.message : Translate.Render('item-success-delete'),
-                status: result.status,
-              });
-              if (result.status === 'success') {
-                AgGrid.grids[gridId].applyTransaction({ remove: [params.data] });
-              }
-            });
+                NotificationManager.Push({
+                  html: result.status === 'error' ? result.message : Translate.Render('item-success-delete'),
+                  status: result.status,
+                });
+                if (result.status === 'success') {
+                  AgGrid.grids[gridId].applyTransaction({ remove: [params.data] });
+                }
+              },
+              { context: 'modal' },
+            );
           });
         }
 
@@ -220,16 +224,19 @@ const DefaultManagement = {
         });
       });
       EventsUI.onClick(`.management-table-btn-clean-${id}`, async () => {
-        const confirmResult = await Modal.RenderConfirm({
-          html: async () => {
-            return html`
-              <div class="in section-mp" style="text-align: center;">
-                <strong>${Translate.Render('confirm-delete-all-data')}</strong>
-              </div>
-            `;
+        const confirmResult = await Modal.RenderConfirm(
+          {
+            html: async () => {
+              return html`
+                <div class="in section-mp" style="text-align: center;">
+                  <strong>${Translate.Render('confirm-delete-all-data')}</strong>
+                </div>
+              `;
+            },
+            id: `clean-table-${id}`,
           },
-          id: `clean-table-${id}`,
-        });
+          { context: 'modal' },
+        );
         if (confirmResult.status === 'cancelled') return;
         const result = await ServiceProvider.delete();
         NotificationManager.Push({

package/src/client/ssr/Render.js

@@ -133,6 +133,8 @@ SrrComponent = ({ title, ssrPath, buildId, ssrHeadComponents, ssrBodyComponents,
           border: none;
           padding-block: 0;
           padding-inline: 0;
+          height: 30px;
+          line-height: 30px;
         }
         input::file-selector-button {
           outline: none !important;

package/src/index.js

@@ -11,6 +11,7 @@ import UnderpostDeploy from './cli/deploy.js';
 import UnderpostRootEnv from './cli/env.js';
 import UnderpostFileStorage from './cli/fs.js';
 import UnderpostImage from './cli/image.js';
+import UnderpostMonitor from './cli/monitor.js';
 import UnderpostRepository from './cli/repository.js';
 import UnderpostScript from './cli/script.js';
 import UnderpostSecret from './cli/secrets.js';
@@ -28,7 +29,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.62';
+  static version = 'v2.8.64';
   /**
    * Repository cli API
    * @static
@@ -92,6 +93,13 @@ 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
@@ -103,9 +111,16 @@ class Underpost {
    * File Storage cli API
    * @static
    * @type {UnderpostFileStorage.API}
-   * @memberof UnderpostFileStorage
+   * @memberof Underpost
    */
   static fs = UnderpostFileStorage.API;
+  /**
+   * Monitor cli API
+   * @static
+   * @type {UnderpostMonitor.API}
+   * @memberof Underpost
+   */
+  static monitor = UnderpostMonitor.API;
 }
 
 const up = Underpost;

package/src/runtime/lampp/Dockerfile

@@ -0,0 +1,65 @@
+ARG BASE_DEBIAN=buster
+
+USER root
+
+FROM debian:${BASE_DEBIAN}
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Set root password to root, format is 'user:password'.
+RUN echo 'root:root' | chpasswd
+
+RUN apt-get update --fix-missing
+RUN apt-get upgrade -y
+# install sudo
+RUN apt-get -y install sudo
+# net-tools provides netstat commands
+RUN apt-get -y install curl net-tools
+RUN apt-get -yq install openssh-server supervisor
+# Few handy utilities which are nice to have
+RUN apt-get -y install nano vim less --no-install-recommends
+RUN apt-get clean
+
+# install ssh
+RUN mkdir -p /var/run/sshd
+# Allow root login via password
+RUN sed -ri 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
+
+# install open ssl git and others tools
+RUN apt-get install -yq --no-install-recommends libssl-dev curl wget git gnupg
+
+# install lampp
+RUN curl -Lo xampp-linux-installer.run https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/7.4.33/xampp-linux-x64-7.4.33-0-installer.run?from_af=true
+RUN chmod +x xampp-linux-installer.run
+RUN bash -c './xampp-linux-installer.run'
+RUN ln -sf /opt/lampp/lampp /usr/bin/lampp
+# Enable XAMPP web interface(remove security checks)
+RUN sed -i.bak s'/Require local/Require all granted/g' /opt/lampp/etc/extra/httpd-xampp.conf
+# Enable error display in php
+RUN sed -i.bak s'/display_errors=Off/display_errors=On/g' /opt/lampp/etc/php.ini
+# Enable includes of several configuration files
+RUN mkdir /opt/lampp/apache2/conf.d
+RUN echo "IncludeOptional /opt/lampp/apache2/conf.d/*.conf" >>/opt/lampp/etc/httpd.conf
+# Create a /www folder and a symbolic link to it in /opt/lampp/htdocs. It'll be accessible via http://localhost:[port]/www/
+# This is convenient because it doesn't interfere with xampp, phpmyadmin or other tools in /opt/lampp/htdocs
+# /opt/lampp/etc/httpd.conf
+RUN mkdir /www
+RUN ln -s /www /opt/lampp/htdocs
+
+# install nodejs https://github.com/nodesource/distributions/blob/master/README.md#deb
+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
+
+WORKDIR /home/dd
+
+EXPOSE 22
+
+EXPOSE 80
+
+EXPOSE 443
+
+EXPOSE 3000-3100
+
+EXPOSE 4000-4100

package/src/server/conf.js

@@ -499,6 +499,40 @@ const buildProxyRouter = () => {
   return proxyRouter;
 };
 
+const pathPortAssignmentFactory = (router, confServer) => {
+  const pathPortAssignmentData = {};
+  for (const host of Object.keys(confServer)) {
+    const pathPortAssignment = [];
+    for (const path of Object.keys(confServer[host])) {
+      const { peer } = confServer[host][path];
+      if (!router[`${host}${path === '/' ? '' : path}`]) continue;
+      const port = parseInt(router[`${host}${path === '/' ? '' : path}`].split(':')[2]);
+      // logger.info('', { host, port, path });
+      pathPortAssignment.push({
+        port,
+        path,
+      });
+
+      if (peer) {
+        //  logger.info('', { host, port: port + 1, path: '/peer' });
+        pathPortAssignment.push({
+          port: port + 1,
+          path: '/peer',
+        });
+      }
+    }
+    pathPortAssignmentData[host] = pathPortAssignment;
+  }
+  return pathPortAssignmentData;
+};
+
+const deployRangePortFactory = (router) => {
+  const ports = Object.values(router).map((p) => parseInt(p.split(':')[2]));
+  const fromPort = Math.min(...ports);
+  const toPort = Math.max(...ports);
+  return { ports, fromPort, toPort };
+};
+
 const buildKindPorts = (from, to) =>
   range(parseInt(from), parseInt(to))
     .map(
@@ -729,7 +763,7 @@ const validateTemplatePath = (absolutePath = '') => {
   return true;
 };
 
-const deployTest = async (dataDeploy) => {
+const deployTest = async (dataDeploy = [{ deployId: 'default' }]) => {
   const failed = [];
   for (const deploy of dataDeploy) {
     const deployServerConfPath = fs.existsSync(`./engine-private/replica/${deploy.deployId}/conf.server.json`)
@@ -773,6 +807,12 @@ const deployTest = async (dataDeploy) => {
   return { failed };
 };
 
+const awaitDeployMonitor = async (init = false, deltaMs = 1000) => {
+  if (init) fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
+  await timer(deltaMs);
+  if (fs.existsSync(`./tmp/await-deploy`)) return await awaitDeployMonitor();
+};
+
 const getDeployGroupId = () => {
   const deployGroupIndexArg = process.argv.findIndex((a) => a.match(`deploy-group:`));
   if (deployGroupIndexArg > -1) return process.argv[deployGroupIndexArg].split(':')[1].trim();
@@ -1122,4 +1162,8 @@ export {
   getNpmRootPath,
   getUnderpostRootPath,
   writeEnv,
+  deployTest,
+  pathPortAssignmentFactory,
+  deployRangePortFactory,
+  awaitDeployMonitor,
 };

package/src/server/dns.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import dotenv from 'dotenv';
 import fs from 'fs';
 import validator from 'validator';
-import { ip } from './network.js';
+import { publicIp, publicIpv4, publicIpv6 } from 'public-ip';
 import { loggerFactory } from './logger.js';
 import UnderpostRootEnv from '../cli/env.js';
 
@@ -10,6 +10,14 @@ dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
+const ip = {
+  public: {
+    get: async () => await publicIp(), // => 'fe80::200:f8ff:fe21:67cf'
+    ipv4: async () => await publicIpv4(), // => '46.5.21.123'
+    ipv6: async () => await publicIpv6(), // => 'fe80::200:f8ff:fe21:67cf'
+  },
+};
+
 class Dns {
   static callback = async function (deployList) {
     // Network topology configuration:

package/src/server/network.js

@@ -1,123 +1,18 @@
-import fs from 'fs-extra';
-
-import { publicIp, publicIpv4, publicIpv6 } from 'public-ip';
+import Underpost from '../index.js';
 import { actionInitLog, loggerFactory } from './logger.js';
-import { DataBaseProvider } from '../db/DataBaseProvider.js';
-import { getDeployId } from './conf.js';
-
-// Network Address Translation Management
-
-// import dotenv from 'dotenv';
-// dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
-const ip = {
-  public: {
-    get: async () => await publicIp(), // => 'fe80::200:f8ff:fe21:67cf'
-    ipv4: async () => await publicIpv4(), // => '46.5.21.123'
-    ipv6: async () => await publicIpv6(), // => 'fe80::200:f8ff:fe21:67cf'
-  },
-};
-
-let ipInstance = '';
-const networkRouter = {};
-
 const logRuntimeRouter = () => {
   const displayLog = {};
 
-  for (const host of Object.keys(networkRouter))
-    for (const path of Object.keys(networkRouter[host]))
-      displayLog[networkRouter[host][path].publicHost] = networkRouter[host][path].local;
+  for (const host of Object.keys(Underpost.deployNetwork))
+    for (const path of Object.keys(Underpost.deployNetwork[host]))
+      displayLog[Underpost.deployNetwork[host][path].publicHost] = Underpost.deployNetwork[host][path].local;
 
   logger.info('Runtime network', displayLog);
 };
 
-const saveRuntimeRouter = async () => {
-  try {
-    const deployId = process.env.DEFAULT_DEPLOY_ID;
-    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 || !fs.existsSync(confServerPath)) {
-      // logger.warn('default deploy instance not found');
-      return;
-    }
-    const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
-    const { db } = confServer[host][path];
-
-    let closeConn;
-    if (!DataBaseProvider.instance[`${host}${path}`]) {
-      await DataBaseProvider.load({ apis: ['instance'], host, path, db });
-      closeConn = true;
-    }
-
-    /** @type {import('../api/instance/instance.model.js').InstanceModel} */
-    const Instance = DataBaseProvider.instance[`${host}${path}`].mongoose.models.Instance;
-
-    for (const _host of Object.keys(networkRouter)) {
-      for (const _path of Object.keys(networkRouter[_host])) {
-        const body = {
-          host: _host,
-          path: _path,
-          deployId: getDeployId(),
-          client: networkRouter[_host][_path].client,
-          runtime: networkRouter[_host][_path].runtime,
-          port: networkRouter[_host][_path].port,
-          apis: networkRouter[_host][_path].apis,
-        };
-        const instance = await Instance.findOne({ deployId: body.deployId, host: _host, path: _path });
-        if (instance) {
-          await Instance.findByIdAndUpdate(instance._id, body);
-        } else {
-          await new Instance(body).save();
-        }
-      }
-    }
-
-    if (closeConn) await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
-  } catch (error) {
-    logger.error(error, error.stack);
-  }
-};
-
-const netWorkCron = [];
-
-const saveRuntimeCron = async () => {
-  try {
-    const deployId = process.env.DEFAULT_DEPLOY_ID;
-    const host = process.env.DEFAULT_DEPLOY_HOST;
-    const path = process.env.DEFAULT_DEPLOY_PATH;
-    const confServerPath = `./engine-private/conf/${deployId}/conf.server.json`;
-    const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
-    const { db } = confServer[host][path];
-
-    let closeConn;
-    if (!DataBaseProvider.instance[`${host}${path}`]) {
-      await DataBaseProvider.load({ apis: ['cron'], host, path, db });
-      closeConn = true;
-    }
-
-    /** @type {import('../api/cron/cron.model.js').CronModel} */
-    const Cron = DataBaseProvider.instance[`${host}${path}`].mongoose.models.Cron;
-
-    // await Cron.insertMany(netWorkCron);
-
-    for (const cronInstance of netWorkCron) {
-      const cron = await Cron.findOne({ deployId: cronInstance.deployId, jobId: cronInstance.jobId });
-      if (cron) {
-        await Cron.findByIdAndUpdate(cron._id, cronInstance);
-      } else {
-        await new Cron(cronInstance).save();
-      }
-    }
-
-    if (closeConn) await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
-  } catch (error) {
-    logger.error(error, error.stack);
-  }
-};
-
 const listenServerFactory = (logic = async () => {}) => {
   return {
     listen: async (...args) => (
@@ -150,13 +45,12 @@ const listenPortController = async (server, port, metadata) =>
       if (error.length > 0) throw new Error('Listen port controller requires values: ' + error.join(', '));
 
       server.listen(port, () => {
-        if (!networkRouter[host]) networkRouter[host] = {};
-        networkRouter[host][path] = {
+        if (!Underpost.deployNetwork[host]) Underpost.deployNetwork[host] = {};
+        Underpost.deployNetwork[host][path] = {
           meta,
           client,
           runtime,
           port,
-          public: `http://${ipInstance}:${port}${path}`,
           publicHost:
             port === 80
               ? `http://${host}${path}`
@@ -175,13 +69,4 @@ const listenPortController = async (server, port, metadata) =>
     }
   });
 
-export {
-  ip,
-  listenPortController,
-  networkRouter,
-  netWorkCron,
-  saveRuntimeRouter,
-  logRuntimeRouter,
-  listenServerFactory,
-  saveRuntimeCron,
-};
+export { listenPortController, logRuntimeRouter, listenServerFactory };

package/src/server/runtime.js

@@ -9,7 +9,7 @@ import compression from 'compression';
 
 import { createServer } from 'http';
 import { getRootDirectory } from './process.js';
-import { listenPortController, saveRuntimeRouter, logRuntimeRouter, listenServerFactory } from './network.js';
+import { listenPortController, logRuntimeRouter, listenServerFactory } from './network.js';
 import { loggerFactory, loggerMiddleware } from './logger.js';
 import { getCapVariableName, newInstance } from '../client/components/core/CommonJs.js';
 import { Xampp } from '../runtime/xampp/Xampp.js';
@@ -41,7 +41,6 @@ const buildRuntime = async () => {
   // 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;
   const confServer = JSON.parse(fs.readFileSync(`./conf/conf.server.json`, 'utf8'));
@@ -484,7 +483,6 @@ const buildRuntime = async () => {
   if (Xampp.enabled() && Xampp.router) Xampp.initService();
   if (Lampp.enabled() && Lampp.router) Lampp.initService();
 
-  saveRuntimeRouter();
   logRuntimeRouter();
 };