underpost 2.8.637 → 2.8.646

package/src/client/components/default/RoutesDefault.js

@@ -1,4 +1,5 @@
 import { loggerFactory } from '../core/Logger.js';
+import { Modal } from '../core/Modal.js';
 import { getProxyPath, s } from '../core/VanillaJs.js';
 
 const logger = loggerFactory(import.meta);
@@ -10,10 +11,10 @@ const RoutesDefault = () => {
   return {
     '/': {
       title: 'Home',
-      render: () => s(`.main-btn-home`).click(),
+      render: () => Modal.onHomeRouterEvent(),
       upperCase: false,
     },
-    '/home': { title: 'home', render: () => s(`.main-btn-home`).click() },
+    '/home': { title: 'home', render: () => Modal.onHomeRouterEvent() },
     '/settings': { title: 'settings', render: () => s(`.main-btn-settings`).click(), translateTitle: true },
     '/log-in': { title: 'log-in', render: () => s(`.main-btn-log-in`).click(), translateTitle: true },
     '/sign-up': { title: 'sign-up', render: () => s(`.main-btn-sign-up`).click(), translateTitle: true },

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/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.637';
+  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
@@ -104,14 +112,14 @@ 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 UnderpostMonitor
+   * @memberof Underpost
    */
   static monitor = UnderpostMonitor.API;
 }

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/json-schema.js

@@ -0,0 +1,77 @@
+function isPlainObject(obj) {
+  return obj ? typeof obj === 'object' && Object.getPrototypeOf(obj) === Object.prototype : false;
+}
+
+const supportType = ['string', 'number', 'array', 'object', 'boolean', 'integer'];
+
+function getType(type) {
+  if (!type) type = 'string';
+  if (supportType.indexOf(type) !== -1) {
+    return type;
+  }
+  return typeof type;
+}
+
+function isSchema(object) {
+  if (supportType.indexOf(object.type) !== -1) {
+    return true;
+  }
+  return false;
+}
+
+function handleSchema(json, schema) {
+  Object.assign(schema, json);
+  if (schema.type === 'object') {
+    delete schema.properties;
+    parse(json.properties, schema);
+  }
+  if (schema.type === 'array') {
+    delete schema.items;
+    schema.items = {};
+    parse(json.items, schema.items);
+  }
+}
+
+function handleArray(arr, schema) {
+  schema.type = 'array';
+  let props = (schema.items = {});
+  parse(arr[0], props);
+}
+
+function handleObject(json, schema) {
+  if (isSchema(json)) {
+    return handleSchema(json, schema);
+  }
+  schema.type = 'object';
+  schema.required = [];
+  let props = (schema.properties = {});
+  for (let key in json) {
+    let item = json[key];
+    let curSchema = (props[key] = {});
+    if (key[0] === '*') {
+      delete props[key];
+      key = key.substr(1);
+      schema.required.push(key);
+      curSchema = props[key] = {};
+    }
+    parse(item, curSchema);
+  }
+}
+
+function parse(json, schema) {
+  if (Array.isArray(json)) {
+    handleArray(json, schema);
+  } else if (isPlainObject(json)) {
+    handleObject(json, schema);
+  } else {
+    schema.type = getType(json);
+  }
+}
+
+function ejs(data) {
+  let JsonSchema = {};
+  parse(data, JsonSchema);
+  return JsonSchema;
+}
+
+export { ejs };

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/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, saveRuntimeRouter, 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';
@@ -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'));
@@ -183,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;
@@ -230,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();
@@ -283,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;
           }
@@ -334,7 +341,7 @@ const buildRuntime = async () => {
             //   }),
             // );
 
-            await listenPortController(app, port, runningData);
+            await UnderpostStartUp.API.listenPortController(app, port, runningData);
             break;
           }
 
@@ -442,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,
@@ -462,7 +469,7 @@ const buildRuntime = async () => {
               path,
             });
 
-            await listenPortController(peerServer, peerPort, {
+            await UnderpostStartUp.API.listenPortController(peerServer, peerPort, {
               runtime: 'nodejs',
               client: null,
               host,
@@ -471,7 +478,7 @@ const buildRuntime = async () => {
             });
           }
 
-          await listenPortController(server, port, runningData);
+          await UnderpostStartUp.API.listenPortController(server, port, runningData);
 
           break;
         default:
@@ -484,8 +491,7 @@ const buildRuntime = async () => {
   if (Xampp.enabled() && Xampp.router) Xampp.initService();
   if (Lampp.enabled() && Lampp.router) Lampp.initService();
 
-  saveRuntimeRouter();
-  logRuntimeRouter();
+  UnderpostStartUp.API.logRuntimeRouter();
 };
 
 export { buildRuntime };