underpost 2.8.635 → 2.8.641

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/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();
 };