@abtnode/router-provider 1.7.6 → 1.7.9

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/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,
@@ -302,6 +303,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 });
 
@@ -690,7 +696,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.7.6",
+  "version": "1.7.9",
   "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.6",
-    "@abtnode/logger": "1.7.6",
-    "@abtnode/router-templates": "1.7.6",
-    "@abtnode/util": "1.7.6",
-    "axios": "^0.25.0",
+    "@abtnode/constant": "1.7.9",
+    "@abtnode/logger": "1.7.9",
+    "@abtnode/router-templates": "1.7.9",
+    "@abtnode/util": "1.7.9",
+    "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": "47a9dbd6ea74419ff586336824ebb9b2fe7694aa"
+  "gitHead": "285f4fedd41fcb8e1814ce5d8250ac10616e67e0"
 }