whistle 2.10.6 → 2.10.8

package/lib/util/patch.js

@@ -4,6 +4,7 @@ var Socket = require('net').Socket;
 var http = require('http');
 var https = require('https');
 var hparser = require('hparser');
+var common = require('./common');
 
 var httpRequest = http.request;
 var httpsRequest = https.request;
@@ -133,12 +134,7 @@ http.request = function (options) {
         headers['x-whistle-policy'] = 'intercept';
         delete headers['X-Whistle-Policy'];
       }
-      headers = hparser.getRawHeaders(headers);
-      var rawData = 'CONNECT ' + tunnelPath + ' HTTP/1.1';
-      if (headers) {
-        rawData += '\r\n' + headers;
-      }
-      rawData += '\r\n\r\n';
+      var rawData = common.getHttpMeta('CONNECT', tunnelPath, 'HTTP/1.1', headers);
       if (res.statusCode === 200 && res.headers['x-whistle-allow-tunnel-ack']) {
         rawData = '1' + rawData;
       }

package/lib/util/speed-transform.js

@@ -1,9 +1,11 @@
 var Transform = require('pipestream').Transform;
-var util = require('util');
+var inherits = require('util').inherits;
+var setDelayTimer = require('./common').setDelayTimer;
 
-function SpeedTransform(options) {
+function SpeedTransform(options, req) {
   Transform.call(this);
   options = options || {};
+  this._req = req;
   var value = parseInt((options.speed * 1000) / 8);
   if (value > 0) {
     this._speed = value;
@@ -13,13 +15,22 @@ function SpeedTransform(options) {
   }
 }
 
-util.inherits(SpeedTransform, Transform);
+inherits(SpeedTransform, Transform);
 
-SpeedTransform.prototype._transform = function (chunk, encoding, callback) {
+var proto = SpeedTransform.prototype;
+
+proto._setTimeout = function (callback, delay) {
+  var timer = setTimeout(callback, delay);
+  if (this._req) {
+    setDelayTimer(this._req, timer);
+  }
+};
+
+proto._transform = function (chunk, encoding, callback) {
   var self = this;
   var cb = function () {
     if (chunk && self._speed) {
-      setTimeout(function () {
+      self._setTimeout(function () {
         callback(null, chunk);
       }, Math.round((chunk.length * 1000) / self._speed));
     } else {
@@ -30,7 +41,7 @@ SpeedTransform.prototype._transform = function (chunk, encoding, callback) {
   if (self._delay) {
     var delay = self._delay;
     self._delay = null;
-    return setTimeout(cb, delay);
+    return self._setTimeout(cb, delay);
   }
 
   cb();

package/lib/util/whistle-transform.js

@@ -1,11 +1,12 @@
 var Transform = require('pipestream').Transform;
-var util = require('util');
+var inherits = require('util').inherits;
 var iconv = require('iconv-lite');
 var fileMgr = require('./file-mgr');
+var setDelayTimer = require('./common').setDelayTimer;
 
 var DOCTYPE = Buffer.from('<!DOCTYPE html>\r\n');
 
-function WhistleTransform(options) {
+function WhistleTransform(options, req) {
   Transform.call(this);
   options = options || {};
   var value = parseInt((options.speed * 1000) / 8);
@@ -21,6 +22,7 @@ function WhistleTransform(options) {
   if (!iconv.encodingExists(charset)) {
     charset = 'utf8';
   }
+  this._req = req;
   this._isHtml = options.isHtml;
   this._body = getBuffer(options, 'body', charset);
   this._top = getBuffer(options, 'top', charset);
@@ -42,7 +44,16 @@ function getBuffer(options, name, charset) {
   return iconv.encode(buf + '', charset);
 }
 
-util.inherits(WhistleTransform, Transform);
+inherits(WhistleTransform, Transform);
+
+var proto = WhistleTransform.prototype;
+
+proto._setTimeout = function (callback, delay) {
+  var timer = setTimeout(callback, delay);
+  if (this._req) {
+    setDelayTimer(this._req, timer);
+  }
+};
 
 function filterHtml(list, isSafe) {
   if (!Array.isArray(list)) {
@@ -64,7 +75,7 @@ function joinData(list) {
   return Array.isArray(list) ? fileMgr.joinData(list) : list;
 }
 
-WhistleTransform.prototype.allowInject = function (chunk) {
+proto.allowInject = function (chunk) {
   if (!this._isHtml) {
     return true;
   }
@@ -88,7 +99,7 @@ WhistleTransform.prototype.allowInject = function (chunk) {
   return true;
 };
 
-WhistleTransform.prototype._transform = function (chunk, encoding, callback) {
+proto._transform = function (chunk, encoding, callback) {
   var self = this;
   var cb = function () {
     if (self._allowInject && self._ended && self._bottom) {
@@ -96,7 +107,7 @@ WhistleTransform.prototype._transform = function (chunk, encoding, callback) {
       self._bottom = null;
     }
     if (chunk && self._speed) {
-      setTimeout(function () {
+      self._setTimeout(function () {
         callback(null, chunk);
       }, Math.round((chunk.length * 1000) / self._speed));
     } else {
@@ -126,7 +137,7 @@ WhistleTransform.prototype._transform = function (chunk, encoding, callback) {
         self._top = null;
       }
     }
-    return self._delay ? setTimeout(cb, self._delay) : cb();
+    return self._delay ? self._setTimeout(cb, self._delay) : cb();
   }
 
   if (self._ended) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.10.6",
+  "version": "2.10.8",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,
@@ -15,14 +15,17 @@
   },
   "homepage": "https://wproxy.org",
   "keywords": [
-    "proxy",
-    "fiddler",
-    "charles",
+    "http-proxy",
+    "https-proxy",
+    "web-debugging",
+    "network-debugging",
+    "http-interceptor",
+    "api-mocking",
     "websocket",
     "http2",
-    "hosts",
-    "debug",
-    "mock"
+    "mitm",
+    "fiddler-alternative",
+    "charles-alternative"
   ],
   "bin": {
     "whistle": "./bin/whistle.js",
@@ -34,9 +37,9 @@
     "url": "https://github.com/avwo/whistle.git"
   },
   "dependencies": {
-    "adm-zip": "0.5.16",
+    "adm-zip": "^0.6.0",
     "async-limiter": "2.0.0",
-    "body-parser": "^1.20.3",
+    "body-parser": "^1.20.6",
     "colors": "1.1.2",
     "express": "^4.21.2",
     "extend": "^3.0.2",
@@ -48,7 +51,7 @@
     "lru-cache": "^4.1.1",
     "mime": "^1.6.0",
     "multer2": "^1.1.1",
-    "node-forge": "^1.3.1",
+    "node-forge": "^1.4.0",
     "node-pac": "^0.5.1",
     "parseurl": "^1.3.1",
     "pfork": "^0.6.3",