@abtnode/router-provider 1.7.7 → 1.7.10

package/lib/default/daemon.js

@@ -329,3 +329,10 @@ config.sites.forEach((site) => {
 config.sites.filter((x) => x.port).forEach((x) => ensureInternalServer(x.port));
 
 logger.info(`Default routing engine ready on ${httpPort} and ${httpsPort}`);
+
+['exit', 'SIGINT', 'SIGUSR1', 'SIGUSR2', 'uncaughtException', 'SIGTERM'].forEach((e) => {
+  process.on(e, () => {
+    main.close();
+    Object.keys(internalServers).forEach((key) => internalServers[key].close());
+  });
+});

package/lib/default/proxy.js

@@ -2,6 +2,7 @@
 /* eslint-disable consistent-return */
 const fs = require('fs');
 const http = require('http');
+const https = require('https');
 const httpProxy = require('http-proxy');
 const validUrl = require('valid-url');
 const path = require('path');
@@ -119,8 +120,7 @@ module.exports = class ReverseProxy {
   }
 
   setupHttpProxy(proxy, websocketUpgrade, opts) {
-    const httpServerModule = opts.serverModule || http;
-    const server = httpServerModule.createServer((req, res) => {
+    const server = http.createServer((req, res) => {
       const src = this._getSource(req);
       if (this.opts.corsHandler(req, res) === false) {
         return;
@@ -163,8 +163,6 @@ module.exports = class ReverseProxy {
   }
 
   setupHttpsProxy(proxy, websocketUpgrade, sslOpts) {
-    let https;
-
     let ssl = {
       SNICallback: (hostname, cb) => {
         if (cb) {
@@ -187,17 +185,6 @@ module.exports = class ReverseProxy {
       ssl = _.defaults(ssl, sslOpts.opts);
     }
 
-    if (sslOpts.http2) {
-      // eslint-disable-next-line
-      https = sslOpts.serverModule || require('spdy');
-      if (_.isObject(sslOpts.http2)) {
-        sslOpts.spdy = sslOpts.http2;
-      }
-    } else {
-      // eslint-disable-next-line global-require
-      https = sslOpts.serverModule || require('https');
-    }
-
     this.httpsServer = https.createServer(ssl, (req, res) => {
       const src = this._getSource(req);
       if (this.opts.corsHandler(req, res) === false) {

package/lib/nginx/includes/proxy

@@ -15,3 +15,5 @@ proxy_set_header Upgrade $http_upgrade;
 proxy_set_header Connection $connection_upgrade;
 
 proxy_read_timeout 3600;
+
+proxy_pass_header server;

package/lib/nginx/index.js

@@ -105,6 +105,7 @@ class NginxProvider extends BaseProvider {
     this.httpPort = decideHttpPort(httpPort);
     this.httpsPort = decideHttpsPort(httpsPort);
     this.cacheDisabled = !!cacheDisabled;
+    this.isHttp2Supported = this._isHttp2Supported();
 
     logger.info('nginx provider config', {
       configDir,
@@ -125,7 +126,7 @@ class NginxProvider extends BaseProvider {
     this.initialize();
   }
 
-  async update({ routingTable = [], certificates = [], globalHeaders, services = [], nodeInfo = {} } = {}) {
+  async update({ routingTable = [], certificates = [], commonHeaders, services = [], nodeInfo = {} } = {}) {
     if (!Array.isArray(routingTable)) {
       throw new Error('routingTable must be an array');
     }
@@ -162,7 +163,7 @@ class NginxProvider extends BaseProvider {
 
         this._addCorsMap(conf, siteCorsConfigs);
         conf.nginx.http._add('server_tokens', 'off');
-        this._addGlobalHeaders(conf, globalHeaders);
+        this._addCommonResHeaders(conf.nginx.http, commonHeaders);
         this._addExposeServices(conf, services);
 
         logger.info('routing sites:', sites);
@@ -190,6 +191,7 @@ class NginxProvider extends BaseProvider {
               serverName: parsedServerName,
               corsAllowedOrigins,
               daemonPort: nodeInfo.port,
+              commonHeaders,
             });
           } else {
             this._addHttpServer({
@@ -199,6 +201,7 @@ class NginxProvider extends BaseProvider {
               corsAllowedOrigins,
               port,
               daemonPort: nodeInfo.port,
+              commonHeaders,
             });
           }
         }
@@ -302,6 +305,11 @@ class NginxProvider extends BaseProvider {
     return result;
   }
 
+  _isHttp2Supported() {
+    const configArgs = this.readNginxConfigParams();
+    return typeof configArgs['with-http_v2_module'] !== 'undefined';
+  }
+
   readNginxConfigParams() {
     const result = shelljs.exec(`${this.binPath} -V`, { silent: true });
 
@@ -374,6 +382,7 @@ class NginxProvider extends BaseProvider {
     target,
     ruleId,
     type,
+    commonHeaders,
   }) {
     server._add('location', concatPath(prefix, suffix));
 
@@ -396,6 +405,7 @@ class NginxProvider extends BaseProvider {
       location._add('include', 'includes/security');
     }
 
+    this._addCommonResHeaders(location, commonHeaders);
     this._addTailSlashRedirection(location, prefix); // Note: 末尾 "/" 的重定向要放在 CORS(OPTIONS) 响应之后, 这样不会影响 OPTIONS 的响应
 
     if (did) {
@@ -612,13 +622,13 @@ class NginxProvider extends BaseProvider {
     }
   }
 
-  _addGlobalHeaders(conf, headers) {
+  _addCommonResHeaders(block, headers) {
     if (!headers || Object.prototype.toString.call(headers) !== '[object Object]') {
       return;
     }
 
     Object.keys(headers).forEach((key) => {
-      conf.nginx.http._add('add_header', `${key} ${headers[key]}`);
+      block._add('add_header', `${key} ${headers[key]}`);
     });
   }
 
@@ -650,14 +660,14 @@ class NginxProvider extends BaseProvider {
       : conf.nginx.stream.server;
   }
 
-  _addHttpServer({ locations = [], serverName, conf, corsAllowedOrigins, port, daemonPort }) {
+  _addHttpServer({ locations = [], serverName, conf, corsAllowedOrigins, port, daemonPort, commonHeaders }) {
     const httpServerUnit = this._addHttpServerUnit({ conf, serverName, port });
     this._addDefaultLocations(httpServerUnit, daemonPort);
     // eslint-disable-next-line max-len
-    locations.forEach((x) => this._addReverseProxy({ server: httpServerUnit, ...x, serverName, corsAllowedOrigins })); // prettier-ignore
+    locations.forEach((x) => this._addReverseProxy({ server: httpServerUnit, ...x, serverName, corsAllowedOrigins, commonHeaders })); // prettier-ignore
   }
 
-  _addHttpsServer({ conf, locations, certificateFileName, serverName, corsAllowedOrigins, daemonPort }) {
+  _addHttpsServer({ conf, locations, certificateFileName, serverName, corsAllowedOrigins, daemonPort, commonHeaders }) {
     const httpsServerUnit = this._addHttpsServerUnit({ conf, serverName, certificateFileName });
 
     const httpServerUnit = this._addHttpServerUnit({ conf, serverName });
@@ -665,7 +675,7 @@ class NginxProvider extends BaseProvider {
 
     this._addDefaultLocations(httpsServerUnit, daemonPort);
     // eslint-disable-next-line max-len
-    locations.forEach((x) => this._addReverseProxy({ server: httpsServerUnit, ...x, serverName, corsAllowedOrigins })); // prettier-ignore
+    locations.forEach((x) => this._addReverseProxy({ server: httpsServerUnit, ...x, serverName, corsAllowedOrigins,commonHeaders })); // prettier-ignore
   }
 
   _addHttpServerUnit({ conf, serverName, port }) {
@@ -690,7 +700,7 @@ class NginxProvider extends BaseProvider {
     const crtPath = `${path.join(this.certDir, certificateFileName)}.crt`;
     const keyPath = `${path.join(this.certDir, certificateFileName)}.key`;
 
-    let listen = `${this.httpsPort} ssl`;
+    let listen = `${this.httpsPort} ssl ${this.isHttp2Supported ? 'http2' : ''}`.trim();
     if (serverName === '_') {
       listen = `${listen} default_server`;
     }

package/lib/nginx/util.js

@@ -12,7 +12,7 @@ const { MAX_UPLOAD_FILE_SIZE } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('router:nginx:util');
 
-const WORKER_CONNECTIONS = 1000 * 10; // 10K
+const MAX_WORKER_CONNECTIONS = 10240;
 const CLIENT_MAX_BODY_SIZE = process.env.MAX_UPLOAD_FILE_SIZE || MAX_UPLOAD_FILE_SIZE;
 
 const formatError = (errStr) => {
@@ -130,6 +130,17 @@ const getUserGroup = (username) => {
   return res.stdout.trim();
 };
 
+const getWorkerConnectionCount = (maxWorkerConnections, workerProcess) => {
+  const { stdout, code } = shelljs.exec('ulimit -n', { silent: true });
+  if (code !== 0) {
+    return maxWorkerConnections;
+  }
+
+  const ulimit = Number(stdout.trim());
+
+  return Math.min(maxWorkerConnections, Math.floor(ulimit / workerProcess));
+};
+
 const getMainTemplate = ({
   logDir,
   tmpDir,
@@ -145,7 +156,7 @@ user ${os.userInfo().username} ${getUserGroup(os.userInfo().username)};
 pid nginx.pid;
 
 events {
-    worker_connections  ${WORKER_CONNECTIONS};
+    worker_connections  ${getWorkerConnectionCount(MAX_WORKER_CONNECTIONS, workerProcess)};
 }
 
 http {
@@ -270,4 +281,5 @@ module.exports = {
   getNginxStatus,
   rotateNginxLogFile,
   getUserGroup,
+  getWorkerConnectionCount,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.7.7",
+  "version": "1.7.10",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,11 +32,11 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.7.7",
-    "@abtnode/logger": "1.7.7",
-    "@abtnode/router-templates": "1.7.7",
-    "@abtnode/util": "1.7.7",
-    "axios": "^0.25.0",
+    "@abtnode/constant": "1.7.10",
+    "@abtnode/logger": "1.7.10",
+    "@abtnode/router-templates": "1.7.10",
+    "@abtnode/util": "1.7.10",
+    "axios": "^0.26.1",
     "debug": "^4.3.3",
     "find-process": "^1.4.3",
     "fkill": "^7.0.1",
@@ -62,5 +62,5 @@
     "fs-extra": "^10.0.1",
     "needle": "^3.0.0"
   },
-  "gitHead": "619db37ea7a91c64a9bf30836a55c70d55325e73"
+  "gitHead": "8eab10fd39b6183a2fa4d2706f52e8b2ecaa059a"
 }