whistle 2.10.7 → 2.10.9

package/biz/webui/lib/index.js

@@ -301,9 +301,10 @@ app.use(function(req, res, next) {
       if (referer) {
         var refOpts = parseUrl(referer);
         var pathname = refOpts.pathname;
-        if (PLUGIN_PATH_RE.test(pathname) && RegExp.$3) {
-          var name = RegExp.$2;
-          req.url = '/' + RegExp.$1 + '.' + name + path;
+        var match = PLUGIN_PATH_RE.exec(pathname);
+        if (match && match[3]) {
+          var name = match[2];
+          req.url = '/' + match[1] + '.' + name + path;
           PLUGIN_NAMES.set(path, name);
         } else {
           pluginName = config.getPluginNameByHost(refOpts.hostname);
@@ -400,9 +401,9 @@ function cgiHandler(req, res) {
       var notFound = err ? err.code === 'ENOENT' : !stat.isFile();
       var msg;
       if (config.debugMode) {
-        msg = util.THEME_STYLE + '<pre>' + (err ? util.encodeHtml(util.getErrorStack(err)) : 'No such File') + '</pre>';
+        msg = util.THEME_STYLE + '<pre>' + (err ? util.encodeHtml(util.getErrorStack(err)) : 'No such file') + '</pre>';
       } else {
-        msg = notFound ? 'Not Found' : 'Internal Server Error';
+        msg = notFound ? 'Not found' : 'Internal server error';
       }
       return common.sendRes(res, notFound ? 404 : 500, msg);
     }

package/lib/config.js

@@ -223,10 +223,6 @@ function createAgent(agentConfig, https) {
   return agent;
 }
 
-function capitalize(str) {
-  return (str && str[0].toUpperCase()) + str.substring(1);
-}
-
 function getHttpsAgent(options, reqOpts) {
   var key = getCacheKey(options);
   var agent = httpsAgents.get(key);
@@ -234,7 +230,7 @@ function getHttpsAgent(options, reqOpts) {
     var headers = options.headers || {};
     var proxyHeaders = {};
     Object.keys(headers).forEach(function (key) {
-      var rawKey = key.split('-').map(capitalize).join('-');
+      var rawKey = key.split('-').map(common.upperFirst).join('-');
       proxyHeaders[rawKey] = headers[key];
     });
     reqOpts._tunnelProxyHeaders = proxyHeaders;

package/lib/index.js

@@ -250,7 +250,7 @@ function handleGlobalException(err) {
     code === 'ERR_HTTP_TRAILER_INVALID' ||
     code === 'ERR_INTERNAL_ASSERTION' ||
     code === 'ERR_INVALID_ARG_TYPE' ||
-    (err && /finishwrite|'_hadError'/i.test(err.message)))
+    (err && /finishwrite|'_hadError'|shouldUpgradeCallback/i.test(err.message)))
   ) {
     return;
   }

package/lib/inspectors/data.js

@@ -332,7 +332,7 @@ function emitDataEvents(req, res, proxy) {
       var headers = info.headers;
       captureStream = requestTime == null || enable.captureStream;
       if (headers) {
-        isSse = headers['content-type'] === 'text/event-stream';
+        isSse = util.trimType(headers['content-type']) === 'text/event-stream';
         captureStream = captureStream || isSse;
         resSepInfo = parseFrameSep(headers);
         if (resSepInfo && resSepInfo.sep) {

package/lib/service/composer.js

@@ -378,16 +378,15 @@ exports.handleRequest = function(req, res) {
   }
   delete headers[config.WEBUI_HEAD];
   headers[config.FROM_COM_HEADER] = '1';
-  var isTest = reqBody.isTest;
   var testId;
   var enableProxyRules = reqBody.enableProxyRules !== false && !reqBody.disabledGlobalRules;
   reqBody.enableProxyRules = enableProxyRules;
-  if (!enableProxyRules || isTest) {
+  if (!enableProxyRules) {
     headers[config.DISABLE_RULES_HEADER] = '1';
-    if (isTest) {
-      testId = ++testIndex + '';
-      headers[config.TEST_HEADER] = testId;
-    }
+  }
+  if (reqBody.isTest) {
+    testId = ++testIndex + '';
+    headers[config.TEST_HEADER] = testId;
   }
   headers.host = options.host;
   options.clientId = clientId;

package/lib/util/index.js

@@ -1478,9 +1478,11 @@ 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']);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.10.7",
+  "version": "2.10.9",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,
@@ -37,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",
@@ -51,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",