whistle 2.9.91 → 2.9.92

package/lib/https/h2.js

@@ -327,7 +327,6 @@ function requestH2(client, req, res, callback) {
 }
 
 function bindListner(server, listener) {
-  server.timeout = config.timeout;
   if (typeof listener === 'function') {
     server.on('request', listener);
   } else if (listener) {
@@ -348,6 +347,7 @@ exports.getServer = function (options, listener) {
   } else {
     server = https.createServer(options);
   }
+  server.requestTimeout = 0;
   return bindListner(server, listener);
 };
 
@@ -358,6 +358,7 @@ exports.getHttpServer = function (_, listener) {
     settings: H2_SVR_SETTINGS,
     allowHTTP1: true
   });
+  server.requestTimeout = 0;
   return bindListner(server, listener);
 };
 

package/lib/https/index.js

@@ -1257,7 +1257,7 @@ module.exports = function (socket, next, isWebPort) {
         };
         var useNoSNIServer = function () {
           serverKey = requestCert ? ':' + domain : domain;
-          serverAgent.createServer(serverKey, handlers, handleConnect);
+          serverAgent.createServer(serverKey, handlers, handleConnect, 0, 0);
         };
 
         var handleRequest = function () {

package/lib/index.js

@@ -44,6 +44,7 @@ function proxy(callback, _server) {
     .concat(config.middlewares)
     .concat(require('./handlers'));
   server.timeout = config.timeout;
+  server.requestTimeout = 0;
   proxyEvents.config = config;
   proxyEvents.server = server;
   app.disable('x-powered-by');
@@ -103,6 +104,8 @@ function proxy(callback, _server) {
     var optionServer = httpModule.createServer(opts);
     var isHttps = !!opts;
     proxyEvents[isHttps ? 'httpsServer' : 'httpServer'] = optionServer;
+    optionServer.timeout = config.timeout;
+    optionServer.requestTimeout = 0;
     optionServer.on('request', function (req, res) {
       req.isHttps = isHttps;
       app.handle(req, res);

package/lib/init.js

@@ -207,6 +207,8 @@ module.exports = function (req, res, next) {
     if (index > 0) {
       req._h2ReqId = alpn.substring(index + 1);
       alpn = alpn.substring(0, index);
+      // 如果保留 h2 session，则删除默认的 Timeout 逻辑
+      req.setTimeout(0);
     }
     if (alpn === 'httpH2') {
       req.isH2 = !req.isHttps;

package/lib/plugins/load-plugin.js

@@ -2020,7 +2020,6 @@ module.exports = async function (options, callback) {
         await startTunnelResWrite(tunnelResWrite, options);
         tunnelResWritePort = _port;
       }
-      server.timeout = config.timeout;
       server.on('request', function (req, res) {
         delete req.headers['x-whistle-internal-id'];
         switch (getHookName(req)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.9.91",
+  "version": "2.9.92",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,
@@ -40,7 +40,7 @@
     "express": "^4.21.2",
     "extend": "^3.0.2",
     "fs-extra2": "^1.0.0",
-    "hagent": "^0.9.2",
+    "hagent": "^0.9.3",
     "hparser": "^0.5.0",
     "iconv-lite": "^0.4.24",
     "json5": "^2.2.3",