whistle 2.10.8 → 2.10.10

package/lib/util/http-mgr.js

@@ -143,7 +143,11 @@ function sendReq(options, callback) {
 
   var timer, client;
   var handleCallback = function (err, res) {
+    if (timer == null) {
+      return;
+    }
     clearTimeout(timer);
+    timer = null;
     if (httpModule) {
       httpModule = null;
       callback(err, res);
@@ -249,7 +253,7 @@ function request(options, callback) {
           handleCallback(err, res, getBody(body, len));
         }
       });
-      res.on('end', function() {
+      res.once('end', function() {
         handleCallback(null, res, getBody(body, len));
       });
     };
@@ -325,7 +329,7 @@ function readFile(url, callback) {
       }
     });
     stream.on('error', listener);
-    stream.on('end', listener);
+    stream.once('end', listener);
   });
 }
 

package/lib/util/index.js

@@ -967,8 +967,6 @@ function getPath(url, noProtocol) {
   return url;
 }
 
-exports.getPath = getPath;
-
 function getFilename(url) {
   if (typeof url == 'string' && (url = getPath(url).trim())) {
     var index = url.lastIndexOf('/');
@@ -1478,57 +1476,58 @@ exports.getUrlValue = function(rule) {
 };
 
 function _getRawType(type) {
-  return typeof type === 'string' ? type.split(';')[0].toLowerCase() : '';
+  return typeof type === 'string' ? type.split(';')[0].trim().toLowerCase() : '';
 }
 
+exports.trimType = _getRawType;
+
 function getRawType(data) {
   return _getRawType(data.headers && data.headers['content-type']);
 }
 
 exports.getRawType = getRawType;
 
-function getContentType(contentType) {
-  if (contentType && typeof contentType != 'string') {
-    contentType = contentType['content-type'] || contentType.contentType;
+function getContentType(type) {
+  if (type && typeof type != 'string') {
+    type = type['content-type'] || type.contentType;
   }
-  contentType = _getRawType(contentType);
-  if (!contentType) {
+  type = _getRawType(type);
+  if (!type) {
     return;
   }
-  if (contentType.indexOf('javascript') != -1) {
+  if (type.indexOf('image/') != -1) {
+    return 'IMG';
+  }
+  if (type.indexOf('javascript') != -1) {
     return 'JS';
   }
 
-  if (contentType.indexOf('css') != -1) {
+  if (type.indexOf('css') != -1) {
     return 'CSS';
   }
 
-  if (contentType.indexOf('html') != -1) {
+  if (type.indexOf('html') != -1) {
     return 'HTML';
   }
 
-  if (contentType.indexOf('json') != -1) {
+  if (type.indexOf('json') != -1) {
     return 'JSON';
   }
 
-  if (contentType.indexOf('xml') != -1) {
+  if (type.indexOf('xml') != -1) {
     return 'XML';
   }
 
-  if (contentType.indexOf('text/') != -1) {
+  if (type.indexOf('text/') != -1) {
     return 'TEXT';
   }
-
-  if (contentType.indexOf('image/') != -1) {
-    return 'IMG';
-  }
 }
 
 exports.getContentType = getContentType;
 
-function isText(contentType) {
-  contentType = contentType && getContentType(contentType);
-  return contentType && contentType !== 'IMG';
+function isText(type) {
+  type = type && getContentType(type);
+  return type && type !== 'IMG';
 }
 
 exports.isText = isText;
@@ -1652,7 +1651,7 @@ function getPipeIconvStream(headers) {
       };
 
       res.on('data', resolveCharset);
-      res.on('end', resolveCharset);
+      onReadEnd(res, resolveCharset);
     });
 
     pipeStream.addTail(function (src, next) {
@@ -2647,7 +2646,10 @@ exports.getReqId = function (now) {
 };
 
 exports.onSocketEnd = common.onSocketEnd;
-exports.onResEnd = common.onResEnd;
+
+var onReadEnd = common.onReadEnd;
+exports.onReadEnd = onReadEnd;
+exports.onWriteEnd = common.onWriteEnd;
 
 exports.getEmptyRes = function getRes() {
   var res = common.createTransform();
@@ -3621,7 +3623,7 @@ function readOneChunk(stream, callback, timeout) {
     timer = setTimeout(handler, timeout);
   }
   stream.on('data', handler);
-  stream.on('end', handler);
+  onReadEnd(stream, handler);
 }
 
 exports.readOneChunk = readOneChunk;
@@ -4029,3 +4031,9 @@ exports.joinBuffer = function(buf, chunk) {
 exports.formatBuffer = function(buf, len) {
   return Array.isArray(buf) ? Buffer.concat(buf, len) : buf;
 };
+
+exports.endSocket = function (socket) {
+  if (!socket.destroyed && !socket.writableEnded) {
+    socket.end();
+  }
+};

package/lib/util/speed-transform.js

@@ -6,11 +6,11 @@ function SpeedTransform(options, req) {
   Transform.call(this);
   options = options || {};
   this._req = req;
-  var value = parseInt((options.speed * 1000) / 8);
+  var value = parseInt((options.speed * 1000) / 8, 10);
   if (value > 0) {
     this._speed = value;
   }
-  if ((value = parseInt(options.delay)) > 0) {
+  if ((value = parseInt(options.delay, 10)) > 0) {
     this._delay = value;
   }
 }

package/lib/util/transproto.js

@@ -71,15 +71,15 @@ function Parser() {
     }
     var data = parseChunk();
     if (data === false) {
-      return self.onEnd && self.onEnd();
+      return self.onEnd();
     }
     if (!data) {
       if (chunk === false) {
         return;
       }
-      return self.onContinue && self.onContinue();
+      return self.onContinue();
     }
-    self.onData && self.onData(data);
+    self.onData(data);
     self.write(false);
   };
 }
@@ -91,6 +91,7 @@ exports.getDecodeTransform = function () {
   parser.onEnd = function () {
     data && trans.push(data);
     trans.push(null);
+    data = null;
   };
   parser.onContinue = function () {
     if (transCb) {

package/lib/util/whistle-transform.js

@@ -9,11 +9,11 @@ var DOCTYPE = Buffer.from('<!DOCTYPE html>\r\n');
 function WhistleTransform(options, req) {
   Transform.call(this);
   options = options || {};
-  var value = parseInt((options.speed * 1000) / 8);
+  var value = parseInt((options.speed * 1000) / 8, 10);
   if (value > 0) {
     this._speed = value;
   }
-  if ((value = parseInt(options.delay)) > 0) {
+  if ((value = parseInt(options.delay, 10)) > 0) {
     this._delay = value;
   }
   this._noDoctype = options.noDoctype;

package/lib/util/zlib.js

@@ -19,7 +19,7 @@ function zlibBuffer(engine, buffer, callback) {
   engine.cb = callback;
   engine.on('data', zlibBufferOnData);
   engine.on('error', zlibBufferOnError);
-  engine.on('end', zlibBufferOnEnd);
+  engine.once('end', zlibBufferOnEnd);
   engine.end(buffer);
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.10.8",
+  "version": "2.10.10",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,
@@ -75,7 +75,7 @@
     "docs": "vitepress build docs"
   },
   "engines": {
-    "node": ">= 8.8"
+    "node": ">= 14.0.0"
   },
   "devDependencies": {
     "babel-core": "^6.7.6",
@@ -102,7 +102,7 @@
     "react": "^15.6.2",
     "react-base16-styling": "^0.5.1",
     "react-dom": "^15.6.2",
-    "react-virtualized": "^9.21.2",
+    "react-virtualized": "~9.21.2",
     "request": "^2.74.0",
     "should": "^13.2.3",
     "should-http": "^0.1.1",