whistle 2.10.4 → 2.10.6

package/lib/https/index.js

@@ -1015,8 +1015,10 @@ function toHttp1(req, res) {
   var handleAbort = function () {
     if (client) {
       client.abort();
-      res.destroy();
       client = null;
+      if (!res.writableEnded && !res.finished) {
+        res.destroy();
+      }
     }
   };
   addReqInfo(req);

package/lib/inspectors/data.js

@@ -19,7 +19,7 @@ function getZipType(options) {
 }
 
 function unzipBody(options, body, callback) {
-  return zlib.unzip(getZipType(options), body, callback);
+  return zlib.unzip(getZipType(options), util.formatBuffer(body), callback);
 }
 
 function checkType(res) {
@@ -244,7 +244,8 @@ function emitDataEvents(req, res, proxy) {
   var captureReqStream;
   var maxReqSize;
   var reqInfo;
-  var setReqBody = function (body, end) {
+  var setReqBody = function (end) {
+    reqBody = util.formatBuffer(reqBody);
     if (captureReqStream && cseSep) {
       reqBody = parseFrame(reqBody, false, end);
     } else {
@@ -257,7 +258,7 @@ function emitDataEvents(req, res, proxy) {
       maxReqSize = useBigData ? BIG_DATA_SIZE : (captureReqStream ? MAX_REQ_BODY_SIZE : MAX_SIZE);
       if (captureReqStream) {
         data.isCse = !!cseSep;
-        reqBody && !reqData.body && setReqBody(reqBody);
+        reqBody && !reqData.body && setReqBody();
       }
     }
   };
@@ -277,32 +278,33 @@ function emitDataEvents(req, res, proxy) {
     var end = stream.end;
     stream.write = function (chunk) {
       if (chunk) {
+        reqData.size += chunk.length;
         if (reqBody || reqBody === null) {
           if (useFrames) {
             reqBody = '';
           } else {
-            reqBody = reqBody ? Buffer.concat([reqBody, chunk]) : chunk;
+            reqBody = util.joinBuffer(reqBody, chunk);
             if (captureReqStream) {
-              setReqBody(reqBody);
-            }
-            if (reqBody.length > maxReqSize) {
+              setReqBody();
+              if (reqBody && reqBody.length > maxReqSize) {
+                reqBody = false;
+              }
+            } else if (reqData.size > maxReqSize) {
               reqBody = false;
             }
           }
         }
-        reqData.size += chunk.length;
       }
       updateEvent && proxy.emit(updateEvent, req.fullUrl, false);
       return write.apply(this, arguments);
     };
     stream.end = function (chunk) {
-      if (chunk) {
-        reqData.size += chunk.length;
-        reqBody = reqBody ? Buffer.concat([reqBody, chunk]) : chunk;
-      }
       requestTime = Date.now();
       if (useFrames) {
         reqBody = '';
+      } else if (chunk) {
+        reqData.size += chunk.length;
+        reqBody = util.joinBuffer(reqBody, chunk);
       }
       unzipBody(reqInfo, reqBody, function (err, body) {
         setRequestTime(requestTime);
@@ -310,7 +312,7 @@ function emitDataEvents(req, res, proxy) {
           data.endTime = endTime;
         }
         reqBody = err ? util.getErrorStack(err) : body;
-        setReqBody(reqBody, true);
+        setReqBody(true);
         !data.isCse && setUnzipSize(body, reqData);
         checkBodySize(reqData, useBigData);
       });
@@ -339,6 +341,14 @@ function emitDataEvents(req, res, proxy) {
       }
     }
     var maxResSize = useBigData ? BIG_DATA_SIZE : (captureStream ? MAX_RES_BODY_SIZE : MAX_SIZE);
+    var setResBody = function (end) {
+      resBody = util.formatBuffer(resBody);
+      if (isSse) {
+        resBody = parseFrame(resBody, true, end);
+      } else {
+        resData.body = resBody;
+      }
+    };
     data.isSse = isSse;
     captureStream && updateReqInfo();
     if (!cleared && util.hasBody(info, req) && checkType(info)) {
@@ -353,46 +363,39 @@ function emitDataEvents(req, res, proxy) {
     var end = stream.end;
     stream.write = function (chunk) {
       if (chunk) {
+        resData.size += chunk.length;
         if (resBody || resBody === null) {
           if (useFrames) {
             resBody = '';
           } else {
-            resBody = resBody ? Buffer.concat([resBody, chunk]) : chunk;
+            resBody = util.joinBuffer(resBody, chunk);
             if (captureStream) {
-              if (isSse) {
-                resBody = parseFrame(resBody, true);
-              } else {
-                resData.body = resBody;
+              setResBody();
+              if (resBody && resBody.length > maxResSize) {
+                resBody = false;
               }
-            }
-            if (resBody && resBody.length > maxResSize) {
+            } else if (resData.size > maxResSize) {
               resBody = false;
             }
           }
         }
-        resData.size += chunk.length;
       }
       updateEvent && proxy.emit(updateEvent, req.fullUrl, true);
       return write.apply(this, arguments);
     };
     stream.end = function (chunk) {
-      if (chunk) {
-        resData.size += chunk.length;
-        resBody = resBody ? Buffer.concat([resBody, chunk]) : chunk;
-      }
       endTime = Date.now();
       delete data.abort;
       if (useFrames) {
         resBody = '';
+      } else if (chunk) {
+        resData.size += chunk.length;
+        resBody = util.joinBuffer(resBody, chunk);
       }
       resData.hasGzipError = unzipBody(info, resBody, function (err, body) {
         if (!data.resError) {
           resBody = err ? util.getErrorStack(err) : body;
-          if (isSse) {
-            resBody = parseFrame(resBody, true, true);
-          } else {
-            resData.body = resBody;
-          }
+          setResBody(true);
         }
         !isSse && setUnzipSize(body, resData);
         checkBodySize(resData, useBigData);
@@ -418,7 +421,7 @@ function emitDataEvents(req, res, proxy) {
   req.once('dest', function (_req) {
     _req.once('finish', function () {
       if (!requestTime) {
-        setRequestTime(requestTime);
+        setRequestTime(Date.now());
       }
     });
     setReqStatus();

package/lib/inspectors/req.js

@@ -159,6 +159,7 @@ function handleParams(req, params, urlParams, enableBigData) {
   var delProps = util.parseDelReqBody(req);
   var hasBody;
   var buffer;
+  var len = 0;
   if (params || delProps) {
     var maxReqSize = enableBigData || util.isEnable(req, 'reqMergeBigData') ? BIG_MAX_REQ_SIZE : MAX_REQ_SIZE;
     var transform;
@@ -171,15 +172,18 @@ function handleParams(req, params, urlParams, enableBigData) {
       transform._transform = function (chunk, _, callback) {
         if (chunk) {
           if (!interrupt) {
-            buffer = buffer ? Buffer.concat([buffer, chunk]) : chunk;
+            len += chunk.length;
+            buffer = buffer || [];
+            buffer.push(chunk);
             chunk = null;
-            if (buffer.length > maxReqSize) {
+            if (len > maxReqSize) {
               interrupt = true;
-              chunk = buffer;
+              chunk = Buffer.concat(buffer, len);
               buffer = null;
             }
           }
         } else if (buffer && buffer.length) {
+          buffer = util.formatBuffer(buffer, len);
           var body;
           var isGBK = !util.isUtf8(buffer);
           if (isGBK) {
@@ -388,7 +392,7 @@ function handleParams(req, params, urlParams, enableBigData) {
         lastChunk = !chunk;
         if (chunk && preBuffer !== null) {
           preBuffer = preBuffer ? Buffer.concat([preBuffer, chunk]) : chunk;
-          if (!preBuffer || preBuffer.length <= length) {
+          if (preBuffer.length <= length) {
             return callback(null, lastChunk ? preBuffer : null);
           }
           if (!util.startWithList(preBuffer, startBoundary)) {

package/lib/inspectors/res.js

@@ -89,10 +89,10 @@ function showDnsError(res, err) {
 function setCookies(headers, data) {
   var newCookies = data.headers['set-cookie'];
   if (!Array.isArray(newCookies)) {
-    if (!newCookies || typeof newCookies !== 'string') {
+    if (!util.isString(newCookies)) {
       return;
     }
-    newCookies = newCookies.split(',');
+    newCookies = [newCookies];
   }
   if (newCookies.length) {
     var cookies = headers['set-cookie'];
@@ -105,12 +105,12 @@ function setCookies(headers, data) {
       var newNameMap = {};
       newCookies.forEach(function (cookie) {
         var index = cookie.indexOf('=');
-        var name = index == -1 ? name : cookie.substring(0, index);
+        var name = index == -1 ? cookie : cookie.substring(0, index);
         newNameMap[name] = 1;
       });
       cookies.forEach(function (cookie) {
         var index = cookie.indexOf('=');
-        var name = index == -1 ? name : cookie.substring(0, index);
+        var name = index == -1 ? cookie : cookie.substring(0, index);
         if (!newNameMap[name]) {
           newCookies.push(cookie);
         }

package/lib/plugins/load-plugin.js

@@ -333,7 +333,7 @@ var pushFrame = function (reqId, data, opts, isClient) {
   addFrame(opts);
 };
 var addParserApi = function (req, conn, state, reqId) {
-  state = state.split(',').forEach(function (name) {
+  state.split(',').forEach(function (name) {
     initState(req, name);
   });
   req.on('clientFrame', function (data, opts) {
@@ -542,7 +542,7 @@ var getOptions = function (opts, binary, toServer) {
 var base64ToBuffer = function (base64) {
   if (base64) {
     try {
-      return new Buffer(base64, 'base64');
+      return Buffer.from(base64, 'base64');
     } catch (e) {}
   }
 };

package/lib/service/service.js

@@ -165,7 +165,7 @@ function getTempFiles(list, cb) {
       cb(result);
     }
   };
-  list = list.forEach(function(filename) {
+  list.forEach(function(filename) {
     filename = common.getTempFile(filename);
     if (!filename) {
       return execCb();
@@ -504,7 +504,7 @@ function sessionsHandler() {
           common.sendGzip(req, res, data);
         });
       } catch (e) {
-        common.sendRes(req, 500, e.stack);
+        common.sendRes(res, 500, e.stack);
       }
     }
   );

package/lib/util/common.js

@@ -697,9 +697,9 @@ function isUrlEncoded(req) {
 exports.isUrlEncoded = isUrlEncoded;
 
 function readStream(stream, callback) {
-  var buffer = null;
+  var buffer = [];
   stream.on('data', function(chunk) {
-    buffer = buffer ? Buffer.concat([buffer, chunk]) : chunk;
+    buffer.push(chunk);
   });
   stream.once('end', function() {
     var buf;
@@ -708,6 +708,7 @@ function readStream(stream, callback) {
     var err;
     var jsonErr;
     stream.zlib = zlibx;
+    buffer = buffer.length > 1 ? Buffer.concat(buffer) : (buffer[0] || null);
     var encoding = stream.headers && stream.headers['content-encoding'];
     var getBuffer = function(cb) {
       if (err || buf !== undefined) {

package/lib/util/file-mgr.js

@@ -36,21 +36,24 @@ function readSingleFile(path, callback) {
     return callback();
   }
   var stream = fs.createReadStream(convertSlash(path));
-  var done, buf;
+  var done;
+  var buf = [];
+  var len = 0;
   var execCallback = function (err) {
     if (done) {
       return;
     }
     done = true;
     stream.close();
-    callback(err ? null : buf);
+    callback(buf.length > 1 ? Buffer.concat(buf) : buf[0]);
   };
   stream.on('data', function (data) {
     if (done) {
       return;
     }
-    buf = buf ? Buffer.concat([buf, data]) : data;
-    if (buf.length > MAX_SIZE) {
+    len += data.length;
+    buf.push(data);
+    if (len > MAX_SIZE) {
       execCallback();
     }
   });

package/lib/util/http-mgr.js

@@ -182,6 +182,10 @@ function gunzip(err, res, body, callback) {
   }
 }
 
+function getBody(body, len) {
+  return body.length > 1 ? Buffer.concat(body, len) : (body[0] || '');
+}
+
 function request(options, callback) {
   loadPlugin(options, function (err) {
     if (err) {
@@ -230,21 +234,23 @@ function request(options, callback) {
         return callback(null, res, res);
       }
       addTimeout();
-      var body = '';
+      var body = [];
+      var len = 0;
       res.on('data', function (data) {
-        body = body ? Buffer.concat([body, data]) : data;
+        len += data.length;
+        body.push(data);
         addTimeout();
-        if (maxLength && body.length > maxLength) {
+        if (maxLength && len > maxLength) {
           var err;
           if (!options.ignoreExceedError) {
             err = new Error('The response body exceeded length limit');
             err.code = EXCEED;
           }
-          handleCallback(err, res, body);
+          handleCallback(err, res, getBody(body, len));
         }
       });
       res.on('end', function() {
-        handleCallback(null, res, body);
+        handleCallback(null, res, getBody(body, len));
       });
     };
     client = sendReq(options, function (err, res) {
@@ -293,7 +299,8 @@ function readFile(url, callback) {
 
     var stream = fs.createReadStream(filePath, OPTIONS);
     var done;
-    var body = '';
+    var body = [];
+    var len = 0;
     var listener = function (err) {
       if (done) {
         return;
@@ -305,14 +312,15 @@ function readFile(url, callback) {
       done = true;
       data.mtime = time;
       stream.close();
-      triggerChange(data, body);
+      triggerChange(data, body.join(''));
     };
     stream.on('data', function (text) {
       if (done) {
         return;
       }
-      body += text;
-      if (body.length > MAX_FILE_LEN) {
+      len += text.length;
+      body.push(text);
+      if (len > MAX_FILE_LEN) {
         listener();
       }
     });

package/lib/util/index.js

@@ -747,24 +747,38 @@ exports.disableCSP = disableCSP;
 
 var interfaces = os.networkInterfaces();
 var hostname = os.hostname();
+var serverInfo;
 var simpleHostname = '';
 var cpus = os.cpus();
 var addressList = [];
 var usiTimer;
 
-function updateSystyemInfo() {
+function updateServerInfo() {
+  serverInfo = {ipv4: [], ipv6: []};
+  Object.keys(interfaces).forEach(function(ifname) {
+    interfaces[ifname].forEach(function (iface) {
+      if (iface.internal) {
+        return;
+      }
+      serverInfo[iface.family == 'IPv4' || iface.family === 4 ? 'ipv4' : 'ipv6'].push(iface.address);
+    });
+  });
+}
+
+function updateSysInfo() {
   clearTimeout(usiTimer);
   interfaces = os.networkInterfaces();
+  updateServerInfo();
   hostname = os.hostname();
   addressList = [];
   common.walkInterfaces(function (info) {
     addressList.push(info.address.toLowerCase());
   });
-  usiTimer = setTimeout(updateSystyemInfo, 36000);
+  usiTimer = setTimeout(updateSysInfo, 36000);
 }
 
-updateSystyemInfo();
-process.on('w2NetworkInterfacesChange', updateSystyemInfo);
+updateSysInfo();
+process.on('w2NetworkInterfacesChange', updateSysInfo);
 
 if (isString(hostname)) {
   simpleHostname = hostname.replace(/[^\w.-]+/g, '').substring(0, 20);
@@ -874,15 +888,13 @@ exports.removeClientId = function (headers) {
   delete headers[config.CLIENT_ID_HEADER];
 };
 
-function networkInterfaces() {
-  return interfaces;
-}
-
 function getHostname() {
   return hostname;
 }
 
-exports.networkInterfaces = networkInterfaces;
+exports.getServerInfo = function() {
+  return serverInfo;
+};
 exports.hostname = getHostname;
 
 function getProxyTunnelPath(req, isHttps) {
@@ -1613,35 +1625,35 @@ function getPipeIconvStream(headers) {
     pipeStream.addTail(iconv.encodeStream(charset));
   } else {
     pipeStream.addHead(function (res, next) {
-      var buffer, iconvDecoder;
-
-      res.on('data', function (chunk) {
-        buffer = buffer ? Buffer.concat([buffer, chunk]) : chunk;
-        resolveCharset(buffer);
-      });
-      res.on('end', resolveCharset);
-
-      function resolveCharset(chunk) {
-        if (!charset) {
-          if (chunk && buffer.length < 25600) {
+      var buf = [];
+      var len = 0;
+      var resolveCharset = function(chunk) {
+        if (chunk) {
+          len += chunk.length;
+          buf.push(chunk);
+          if (len < 25600) {
             return;
           }
-          charset = !buffer || isUtf8(buffer) ? 'utf8' : 'GB18030';
-        }
-        if (!iconvDecoder) {
-          iconvDecoder = iconv.decodeStream(charset);
-          next(iconvDecoder);
         }
-        if (buffer) {
-          iconvDecoder.write(buffer);
-          buffer = null;
+        res.removeListener('data', resolveCharset);
+        res.removeListener('end', resolveCharset);
+        buf = buf.length > 1 ? Buffer.concat(buf, len) : buf[0];
+        if (!buf) {
+          return next(res);
         }
-        !chunk && iconvDecoder.end();
-      }
+        charset = isUtf8(buf) ? 'utf8' : 'GB18030';
+        var decoder = iconv.decodeStream(charset);
+        decoder.write(buf);
+        next(res.pipe(decoder));
+        buf = null;
+      };
+
+      res.on('data', resolveCharset);
+      res.on('end', resolveCharset);
     });
 
     pipeStream.addTail(function (src, next) {
-      next(src.pipe(iconv.encodeStream(charset)));
+      next(charset ? src.pipe(iconv.encodeStream(charset)) : src);
     });
   }
 
@@ -3357,7 +3369,7 @@ exports.parseRange = function (req, size) {
   }
   var start = size;
   var end = -1;
-  range = range.split(',').forEach(function (item) {
+  range.split(',').forEach(function (item) {
     item = item.split('-');
     var s = parseInt(item[0], 10);
     var e = parseInt(item[1], 10);
@@ -4016,3 +4028,18 @@ exports.getFrameId = function() {
   }
   return Date.now() + '-00' + frameIndex;
 };
+
+exports.joinBuffer = function(buf, chunk) {
+  if (!buf) {
+    return chunk;
+  }
+  if (!Array.isArray(buf)) {
+    return [buf, chunk];
+  }
+  buf.push(chunk);
+  return buf;
+};
+
+exports.formatBuffer = function(buf, len) {
+  return Array.isArray(buf) ? Buffer.concat(buf, len) : buf;
+};

package/lib/util/parse-url.js

@@ -5,19 +5,21 @@ var URL_RE = /^([a-z0-9.+-]+:)\/\/([^/?#]*)(\/[^?#]*)?(\?[^#]*)?(#[\s\S]*)?$/i;
 var HOST_RE = /^(.+)(?::(\d*))$/;
 
 module.exports = function (url) {
-  if (!URL_RE.test(url)) {
+  var urlMatch = URL_RE.exec(url);
+  if (!urlMatch) {
     return parseUrl(url);
   }
-  var protocol = RegExp.$1;
-  var host = RegExp.$2;
-  var pathname = RegExp.$3 || '/';
-  var search = RegExp.$4;
-  var hash = RegExp.$5 || null;
+  var protocol = urlMatch[1];
+  var host = urlMatch[2];
+  var pathname = urlMatch[3] || '/';
+  var search = urlMatch[4] || '';
+  var hash = urlMatch[5] || null;
   var port = null;
   var hostname = host;
-  if (HOST_RE.test(host)) {
-    hostname = RegExp.$1;
-    port = RegExp.$2;
+  var hostMatch = HOST_RE.exec(host);
+  if (hostMatch) {
+    hostname = hostMatch[1];
+    port = hostMatch[2];
   }
 
   return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.10.4",
+  "version": "2.10.6",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,