whistle 2.10.1 → 2.10.2

package/lib/rules/rules.js

@@ -98,6 +98,7 @@ var FILE_PROTO_RE = /^x?((raw)?file|tpl|jsonp|dust):\/\//;
 var NO_PROTO_RE = /[^\w!*|.-]/;
 var SKIP_RE = /^skip:\/\//;
 var SUB_VAR_RE = /\$\{RegExp\.\$([&\d])\}/g;
+var TOOL_RE = /^(?:log|weinre):\/\//;
 var mIndex = 0;
 var mNow = Date.now();
 var IS_JSON = Symbol('isJson');
@@ -799,18 +800,12 @@ function getValueFor(key, vals, file) {
   return val;
 }
 
-function getRule(req, list, vals, index, isFilter, host) {
-  var rule = resolveRuleList(req, list, vals, index || 0, isFilter, null, host);
+function getRule(req, list, vals, index, isFilter, host, isReq) {
+  var rule = resolveRuleList(req, list, vals, index || 0, isFilter, null, host, isReq);
   resolveValue(rule, vals, req);
   return rule;
 }
 
-function getRuleList(req, list, vals, isEnableProxy) {
-  return resolveRuleList(req, list, vals, isEnableProxy).map(function (rule) {
-    return resolveValue(rule, vals, req);
-  });
-}
-
 function resolveValue(rule, vals, req) {
   if (!rule) {
     return;
@@ -924,7 +919,7 @@ function checkInternal(req, rule) {
   return props.internalOnly;
 }
 
-function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host) {
+function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host, isReq) {
   var curUrl = util.formatUrl(req.curUrl);
   var notHttp = list.isRuleProto && curUrl[0] !== 'h';
   //支持域名匹配
@@ -986,6 +981,9 @@ function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host)
     if (notHttp && protoMgr.isFileProxy(rule.matcher)) {
       return false;
     }
+    if (isReq && TOOL_RE.test(rule.matcher)) {
+      return true;
+    }
     return (isFilter || !matchExcludeFilters(curUrl, rule, req)) && (host == null || util.checkProxyHost(rule, host));
   };
 
@@ -1155,7 +1153,7 @@ function resolveProps(req, rules, vals, isIgnore) {
       return result;
     }
   }
-  return util.resolveProperties(list, result);
+  return util.parseRuleProps(list, result);
 }
 
 function parseWildcard(pattern, not) {
@@ -1967,7 +1965,7 @@ function matchFilter(url, filter, req) {
   return false;
 }
 
-function matchExcludeFilters(url, rule, options) {
+function matchExcludeFilters(url, rule, req) {
   var filters = rule.filters;
   if (!filters) {
     return;
@@ -1980,7 +1978,7 @@ function matchExcludeFilters(url, rule, options) {
     hasIncludeFilter = hasIncludeFilter || filter.isInclude;
     if (
       (filter.isInclude ? !include : !exclude) &&
-      matchFilter(url, filter, options)
+      matchFilter(url, filter, req)
     ) {
       if (filter.isInclude) {
         include = true;
@@ -2249,7 +2247,7 @@ function resolveRules(req, isReq, isRes) {
         name === 'rule' ||
         name === 'plugin' ||
         !filter[name]) &&
-      (rule = self.getRule(req, rules[name], vals))
+      (rule = self.getRule(req, rules[name], vals, null, null, null, isReq))
     ) {
       _rules[name] = rule;
     }
@@ -2283,15 +2281,17 @@ function resolveRules(req, isReq, isRes) {
   return _rules;
 }
 
-proto.getRule = function(req, list, vals, index, isFilter, host) {
+proto.getRule = function(req, list, vals, index, isFilter, host, isReq) {
   if (!this._isGlobal || !req._disabledProxyRules) {
-    return getRule(req, list, vals, index, isFilter, host);
+    return getRule(req, list, vals, index, isFilter, host, isReq);
   }
 };
 
 proto.getRuleList = function(req, list, vals, isEnableProxy) {
   if (!this._isGlobal || !req._disabledProxyRules) {
-    return getRuleList(req, list, vals, isEnableProxy);
+    return resolveRuleList(req, list, vals, null, false, isEnableProxy).map(function (rule) {
+      return resolveValue(rule, vals, req);
+    });
   }
   return [];
 };
@@ -2341,8 +2341,8 @@ proto.resolveProxyProps = function (req) {
   }
   mergeRule(req.rules, enable, 'enable');
   mergeRule(req.rules, disable, 'disable');
-  enable = util.resolveProperties(enable);
-  disable = util.resolveProperties(disable);
+  enable = util.parseRuleProps(enable);
+  disable = util.parseRuleProps(disable);
   if (disable.clientId || disable.clientID || disable.clientid) {
     req.disable.clientId = true;
   }
@@ -2417,7 +2417,7 @@ proto.hasReqScript = function (req) {
     : this.getRule(req, this._rules.rulesFile, this._values);
 };
 
-proto.resolveProxy = function resolveProxy(req, host) {
+proto.resolveProxy = function (req, host) {
   var proxy = this.getRule(req, this._rules.proxy, this._values, null, null, host);
   var matcher = proxy && proxy.matcher;
   var name = matcher && matcher.substring(0, matcher.indexOf(':'));

package/lib/{util/log-server.js → service/console-log.js}

@@ -1,6 +1,6 @@
 var MAX_LENGTH = 800;
 var MIN_LENGTH = 720;
-var SIZE = 1024 * 64;
+var SIZE = 1024 * 512;
 var COUNT = 100;
 var logIndex = 0;
 var logs = [];
@@ -45,40 +45,43 @@ function getLogs(startTime, count, logId) {
   return sliceLogs(0, count, logId);
 }
 
-module.exports = function init(proxy) {
-  proxy.addLog = function set(log) {
-    if (!log) {
-      return;
-    }
+function getLogIndex() {
+  ++logIndex;
+  if (logIndex > 999999) {
+    logIndex = 0;
+  }
+  return logIndex;
+}
 
-    var now = Date.now();
-    var text = log.text;
-    if (text == null) {
-      text = '';
-    } else if (typeof text != 'string') {
-      text += '';
-    }
-    var overflow = text.length - SIZE;
-    logs.push({
-      id: now + '-' + ++logIndex,
-      logId: log.id,
-      date: (log.t && parseInt(log.t, 10)) || now,
-      level: LEVEL_RE.test(log.level)
+exports.addLog = function set(log) {
+  if (!log) {
+    return;
+  }
+
+  var now = Date.now();
+  var text = log.text;
+  if (text == null) {
+    text = '';
+  } else if (typeof text != 'string') {
+    text += '';
+  }
+  var overflow = text.length - SIZE;
+  logs.push({
+    id: now + '-' + getLogIndex(),
+    logId: log.id,
+    date: (log.t && parseInt(log.t, 10)) || now,
+    level: LEVEL_RE.test(log.level)
         ? log.level
         : 'info',
-      text: overflow > 9 ? text.substring(0, SIZE) + '...(' + overflow + ')' : text
-    });
-    var len = logs.length;
-    if (len > MAX_LENGTH) {
-      logs = logs.slice(len - MIN_LENGTH, len);
-      if (logIndex > 100000) {
-        logIndex = 0;
-      }
-    }
-  };
-  proxy.getLogs = getLogs;
-  proxy.getLatestId = function () {
-    var last = logs[logs.length - 1];
-    return last && last.id;
-  };
+    text: overflow > 9 ? text.substring(0, SIZE) + '...(' + overflow + ')' : text
+  });
+  var len = logs.length;
+  if (len > MAX_LENGTH) {
+    logs = logs.slice(len - MIN_LENGTH, len);
+  }
+};
+exports.getLogs = getLogs;
+exports.getLatestId = function () {
+  var last = logs[logs.length - 1];
+  return last && last.id;
 };

package/lib/service/index.js

@@ -170,9 +170,7 @@ var saveData = function(type, data) {
       method: 'POST',
       url: 'http://127.0.0.1:' + curOptions.port + '/cgi-bin/service/save',
       strictMode: true,
-      headers: {
-        'content-type': 'application/json'
-      },
+      headers: { 'content-type': 'application/json' },
       body: body
     }, function (err) {
       if (err) {
@@ -213,7 +211,7 @@ function sendData() {
   });
 }
 
-process.nextTick(sendData);
+process.on('whistleStarted', sendData);
 
 module.exports = loadService;
 

package/lib/service/service.js

@@ -16,6 +16,7 @@ var composer = require('./composer');
 var handleComposeData = require('./compose-data');
 var Limiter = require('async-limiter');
 var common = require('../util/common');
+var logger = require('./console-log');
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '1';
 
@@ -26,7 +27,7 @@ var forwardRequest = dataCenter.forwardRequest;
 
 var INSTALL_SCRIPT = path.join(__dirname, 'install.js');
 var installChild;
-
+var LOG_RE = /^(\d+)\r(fatal|error|warn|info|debug|log)\r([^\s]*)\r/;
 var TEMP_PLUGINS_PATH = path.join(common.getWhistlePath(), '.temp_plugins');
 var SESSIONS_FILE_RE = /\.(txt|json|saz)$/i;
 var limiter = new Limiter({ concurrency: 10 });
@@ -37,10 +38,8 @@ var LIMIT_SIZE = 1024 * 1024 * 128;
 var MAX_TEMP_SIZE = 1024 * 1024 * 12;
 var MAX_PLUGIN_SIZE = MAX_TEMP_SIZE;
 var MAX_TEMP_PLUGINS_AGE = 1000 * 60 * 10; // 10 minutes
-var TEMP_FILE_RE = /^[\da-f]{64}$/;
 var CR = '\r';
 var jsonParser = bodyParser.json({ limit: LIMIT_SIZE });
-var urlencodedParser = bodyParser.urlencoded({ extended: true, limit: '1mb'});
 var PLUGIN_SEP = /\s*,\s*/;
 var config;
 var curWhistleId;
@@ -67,6 +66,19 @@ var ensureTempPluginsDir = function() {
 
 ensureTempPluginsDir();
 
+function parseLog(log) {
+  if (!log || typeof log !== 'string') {
+    return;
+  }
+  var match = LOG_RE.exec(log);
+  return match && {
+    t: match[1],
+    level: match[2],
+    id: match[3],
+    text: log.substring(match[0].length)
+  };
+}
+
 process.on('data', function(data) {
   if (data) {
     if (data.type === 'whistleId') {
@@ -155,7 +167,7 @@ function getTempFiles(list, cb) {
     }
   };
   list = list.forEach(function(filename) {
-    if (!TEMP_FILE_RE.test(filename)) {
+    if (!common.isTempFile(filename)) {
       return execCb();
     }
     filename = path.join(TEMP_FILES_PATH, filename);
@@ -336,7 +348,7 @@ function sessionsHandler() {
       } catch (e) {}
     });
   });
-  app.post('/cgi-bin/plugins/install', urlencodedParser, function(req, res) {
+  app.post('/cgi-bin/plugins/install', bodyParser.urlencoded({ extended: true, limit: '1mb'}), function(req, res) {
     var plugins = req.body.plugins;
     var clientId = req.body.clientId;
     plugins = common.isString(plugins) ? plugins.trim().split(PLUGIN_SEP) : null;
@@ -444,7 +456,7 @@ function sessionsHandler() {
       });
     }
     var filename = req.query.filename;
-    if (TEMP_FILE_RE.test(filename)) {
+    if (common.isTempFile(filename)) {
       filename = path.join(TEMP_FILES_PATH, filename);
     }
     getFile(filename, function(em, data) {
@@ -491,8 +503,12 @@ function sessionsHandler() {
       }
     }
   );
+  app.use('/cgi-bin/log/set', function(req, _, next) {
+    req.headers['content-type'] = 'application/json';
+    next();
+  });
   app.use(bodyParser.urlencoded({ extended: true, limit: LIMIT_SIZE }));
-  app.use(bodyParser.json());
+  app.use(jsonParser);
   app.use('/cgi-bin/sessions/export', function (req, res) {
     var body = req.body;
     var type = body.exportFileType;
@@ -509,6 +525,35 @@ function sessionsHandler() {
       download(body);
     });
   });
+
+  app.use('/cgi-bin/log/set', function(req, res) {
+    res.setHeader('content-type', 'image/png');
+    if (req.method === 'POST') {
+      var list = req.body.list;
+      if (Array.isArray(list)) {
+        var len = Math.min(list.length, 20);
+        for (var i = 0; i < len; i++) {
+          logger.addLog(parseLog(list[i]));
+        }
+      }
+    } else {
+      logger.addLog(req.query);
+    }
+    res.end();
+  });
+  app.use('/cgi-bin/log/get', function(req, res) {
+    var query = req.query;
+    var startLogTime = query.startLogTime;
+    var init = startLogTime == -4;
+    var stopRecordConsole = startLogTime == -3;
+    var curLogId = logger.getLatestId();
+    common.sendGzip(req, res, {
+      ec: 0,
+      log: init || stopRecordConsole ? [] : logger.getLogs(startLogTime, query.count, query.logId),
+      curLogId: stopRecordConsole ? undefined : curLogId,
+      lastLogId: init ? (curLogId || -2) : (stopRecordConsole ? curLogId : undefined)
+    });
+  });
   return app;
 }
 

package/lib/tunnel.js

@@ -47,8 +47,7 @@ function tunnelProxy(server, proxy, type) {
     var headers = req.headers;
     if (headers[config.WEBUI_HEAD]) {
       delete headers[config.WEBUI_HEAD];
-      reqSocket.destroy();
-      return;
+      return reqSocket.destroy();
     }
     req.fromHttpServer = reqSocket.fromHttpServer = fromHttpServer;
     req.fromHttpsServer = reqSocket.fromHttpsServer = fromHttpsServer;
@@ -83,8 +82,7 @@ function tunnelProxy(server, proxy, type) {
     var clientInfo = util.parseClientInfo(req);
     reqSocket._disabledProxyRules = req._disabledProxyRules;
     reqSocket.clientIp = req.clientIp = util.getClientIp(req, clientInfo[0]);
-    reqSocket.clientPort = req.clientPort =
-      clientInfo[1] || util.getClientPort(req);
+    reqSocket.clientPort = req.clientPort = clientInfo[1] || util.getClientPort(req);
     req._remoteAddr = clientInfo[2] || util.getRemoteAddr(req);
     req._remotePort = clientInfo[3] || util.getRemotePort(req);
     delete headers[config.CLIENT_PORT_HEADER];

package/lib/upgrade.js

@@ -105,7 +105,7 @@ function upgradeHandler(req, socket) {
   util.addTunnelData(socket, headers);
   socket._clientId = util.getComposerClientId(headers);
   var getBuffer = function (method, newHeaders, path) {
-    var rawData = (method || 'GET') + ' ' + (path || socket.url || req.url) + ' ' + 'HTTP/1.1';
+    var rawData = (method || 'GET') + ' ' + (path || socket.url || req.url) + ' HTTP/1.1';
     newHeaders = formatHeaders(newHeaders || headers, req.rawHeaders);
     if (newHeaders = getRawHeaders(newHeaders)) {
       rawData += '\r\n' + newHeaders;

package/lib/util/common.js

@@ -67,6 +67,73 @@ var PATH_SEP_RE = /[\\/]/;
 var CUR_PATH_RE = /^\.[\\/]/;
 var CLIENT_PORT_HEADER = 'x-whistle-client-port';
 var ALLOW_ACK = 'x-whistle-allow-tunnel-ack';
+var PLUS_RE = /\+/g;
+var TOKEN = '\r\u0000\n\u0003\r';
+var PROP_SEP_RE = /(\\*)([|&]|\\[stnrfv])/g;
+var TEMP_FILE_RE = /^[\da-f]{64}$/;
+
+exports.isTempFile = function(str) {
+  return TEMP_FILE_RE.test(str);
+};
+
+var PROPS_CHAR = {
+  s: ' ',
+  t: '\t',
+  n: '\n',
+  r: '\r',
+  f: '\f',
+  v: '\v'
+};
+
+function replaceToken(s, val) {
+  return s.split(TOKEN).join(val);
+}
+
+exports.parseProps = function(str) {
+  return str.replace(PROP_SEP_RE, function(_, slash, val) {
+    var isChar = val.length > 1;
+    if (isChar) {
+      slash += '/';
+      val = val.substring(1);
+    } else if (!slash) {
+      return TOKEN;
+    }
+    var len = slash.length;
+    slash = slash.substring(0, Math.floor(len / 2));
+    if (isChar) {
+      return slash + (len % 2 ? PROPS_CHAR[val] : val);
+    }
+    return slash + (len % 2 ? val : TOKEN);
+  }).split(TOKEN);
+};
+
+var decoder = {
+  decodeURIComponent: function (s) {
+    s = replaceToken(s, '+');
+    return qs.unescape(s);
+  }
+};
+var rawDecoder = {
+  decodeURIComponent: function (s) {
+    return replaceToken(s, '+');
+  }
+};
+var rawDecoder2 = {
+  decodeURIComponent: function (s) {
+    return s;
+  }
+};
+
+exports.parseQuery = function (str, sep, eq, escape) {
+  try {
+    if (str.indexOf('+') === -1 || str.indexOf(TOKEN) !== -1) {
+      return qs.parse(str, sep, eq, escape ? rawDecoder2 : undefined);
+    }
+    str = str.replace(PLUS_RE, TOKEN);
+    return qs.parse(str, sep, eq, escape ? rawDecoder : decoder);
+  } catch (e) {}
+  return '';
+};
 
 exports.ALLOW_ACK = ALLOW_ACK;
 exports.CONN_TIMEOUT = CONN_TIMEOUT;
@@ -894,7 +961,6 @@ var DIG_RE = /^([+-]?)([1-9]\d{0,15})$/;
 var NUM_RE = /^(?:0|[1-9]\d*)$/;
 var ARR_RE = /\[(0|[1-8]\d{0,15}|9\d{0,14})\]$/;
 var DOT_RE = /(\\+)\./g;
-var CR_RE = /\r/g;
 
 function isString(str) {
   return str && typeof str === 'string';
@@ -963,12 +1029,6 @@ function parseKey(key) {
   return list;
 }
 
-function replaceDot(_, slash) {
-  var len = slash.length;
-  slash = slash.substring(0, Math.floor(len / 2));
-  return slash + (len % 2 ? '\r' : '.');
-}
-
 function parseKeys(key) {
   if (!isString(key)) {
     return key;
@@ -977,13 +1037,17 @@ function parseKeys(key) {
   if (key.indexOf('.') === -1) {
     return parseKey(key);
   }
-  key = key.replace(DOT_RE, replaceDot);
+  key = key.replace(DOT_RE, function (_, slash) {
+    var len = slash.length;
+    slash = slash.substring(0, Math.floor(len / 2));
+    return slash + (len % 2 ? TOKEN : '.');
+  });
   if (key.indexOf('.') === -1) {
-    return parseKey(key.replace(CR_RE, '.'));
+    return parseKey(replaceToken(key, '.'));
   }
   var result = [];
   key.split('.').forEach(function(k) {
-    k = parseKey(k.trim().replace(CR_RE, '.'));
+    k = parseKey(replaceToken(k.trim(), '.'));
     if (Array.isArray(k)) {
       result = result.concat(k);
     } else {

package/lib/util/index.js

@@ -15,20 +15,21 @@ var dns = require('dns');
 var mime = require('mime');
 var PipeStream = require('pipestream');
 var protoMgr = require('../rules/protocols');
-var protocols = protoMgr.protocols;
 var logger = require('./logger');
 var config = require('../config');
 var isUtf8 = require('./is-utf8');
 var fileMgr = require('./file-mgr');
 var httpMgr = require('./http-mgr');
 var ReplacePatternTransform = require('./replace-pattern-transform');
-var parseQuery = require('./parse-query');
 var common = require('./common');
 var proc = require('./process');
 var parseUrl = require('./parse-url');
 var h2Consts = config.enableH2 ? require('http2').constants : {};
 
+var protocols = protoMgr.protocols;
+var resProtocols = protoMgr.resProtocols;
 var uid = config.uid;
+var parseQuery = common.parseQuery;
 var supportsBr = common.supportsBr;
 var isLocalIp = common.isLocalIp;
 var getStat = common.getStat;
@@ -1855,23 +1856,21 @@ function joinPath(root, dir) {
 
 exports.joinPath = joinPath;
 
-function resolveProperties(list, result) {
+function parseRuleProps(list, result) {
   result = result || {};
   if (list) {
-    list
-      .map(getMatcherValue)
-      .join('|')
-      .split(SEP_RE)
-      .forEach(function (action) {
-        if (action) {
+    list.forEach(function(rule) {
+      if (rule = getMatcherValue(rule)) {
+        common.parseProps(rule).forEach(function (action) {
           result[action] = true;
-        }
-      });
+        });
+      }
+    });
   }
   return result;
 }
 
-exports.resolveProperties = resolveProperties;
+exports.parseRuleProps = parseRuleProps;
 
 exports.parseLineProps = function (str) {
   str = str && removeProtocol(str, true);
@@ -1998,17 +1997,7 @@ exports.checkSkip = function(skip, rule, curUrl) {
 };
 
 function resolveRuleProps(rule, result) {
-  result = result || {};
-  if (rule) {
-    rule.list.forEach(function (rule) {
-      getMatcherValue(rule)
-        .split(SEP_RE)
-        .forEach(function (action) {
-          result[action] = true;
-        });
-    });
-  }
-  return result;
+  return parseRuleProps(rule && rule.list, result);
 }
 
 var PLUGIN_RE = /^(?:plugin|whistle)\.[a-z\d_\-]+$/;
@@ -2089,7 +2078,7 @@ function ignoreRules(rules, ignore, isResRules) {
     if (name === 'filter' || name === 'ignore' || exclude[name]) {
       return;
     }
-    if (!isResRules || protoMgr.resProtocols.indexOf(name) !== -1) {
+    if (!isResRules || resProtocols.indexOf(name) !== -1) {
       if (
         ignorePlugins(rules, name, exclude) ||
         ignoreProxy(rules, name, exclude) ||
@@ -2191,7 +2180,7 @@ function mergeRules(req, add, isResRules) {
   };
   if (origAdd) {
     if (isResRules) {
-      protoMgr.resProtocols.forEach(merge);
+      resProtocols.forEach(merge);
     } else {
       Object.keys(origAdd).forEach(merge);
     }
@@ -2680,12 +2669,12 @@ var REQ_HEADER_RE = /^req\.?H(?:eaders?)?\.(.+)$/i;
 var RES_HEADER_RE = /^res\.?H(?:eaders?)?\.(.+)$/i;
 var TRAILER_RE = /trailer\.(.+)$/;
 var HEADER_RE = /^headers\.(.+)$/;
-var REQ_COOKIE_RE = /^req\.?C(?:ookies?)?\.(.+)$/i;
-var RES_COOKIE_RE = /^res\.?C(?:ookies?)?\.(.+)$/i;
-var REQ_BODY_RE = /^req\.?B(?:ody?)?\.(.+)$/i;
-var RES_BODY_RE = /^res\.?B(?:ody?)?\.(.+)$/i;
-var COOKIE_RE = /^cookies?\.(.+)$/i;
-var QUERY_RE = /^(?:query|params|url\.?Params?)\.(.+)$/i;
+var REQ_COOKIE_RE = /^req\.?C(?:ookies?)?\.([\s\S]+)$/i;
+var RES_COOKIE_RE = /^res\.?C(?:ookies?)?\.([\s\S]+)$/i;
+var REQ_BODY_RE = /^req\.?B(?:ody?)?\.([\s\S]+)$/i;
+var RES_BODY_RE = /^res\.?B(?:ody?)?\.([\s\S]+)$/i;
+var COOKIE_RE = /^cookies?\.([\s\S]+)$/i;
+var QUERY_RE = /^(?:query|params|url\.?Params?)\.([\s\S]+)$/i;
 var QUERY_STRING_RE = /^(?:query|params|url\.?Params?)$/i;
 var PATH_INDEX_RE = /^pathname(?:\.?(-?\d+|first|last))?$/i;
 
@@ -2766,12 +2755,11 @@ exports.parseDelResBody = function(req) {
 
 exports.deleteProps = function(obj, keys) {
   keys = obj && keys && Object.keys(keys);
-  if (!keys || !keys.length) {
-    return;
+  if (keys && keys.length) {
+    keys.forEach(function(key) {
+      common.deleteProps(obj, key);
+    });
   }
-  keys.forEach(function(key) {
-    common.deleteProps(obj, key);
-  });
 };
 
 function getDomain(req) {

package/package.json

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

package/biz/webui/cgi-bin/log/set.js

@@ -1,7 +0,0 @@
-var proxy = require('../../lib/proxy');
-
-module.exports = function(req, res) {
-  proxy.addLog(req.query);
-  res.setHeader('content-type', 'image/png');
-  res.end();
-};

package/lib/util/parse-query.js

@@ -1,35 +0,0 @@
-var qs = require('querystring');
-
-var TOKEN_RE = /\r\u0000\n\u0003\r/g;
-var PLUS_RE = /\+/g;
-var TOKEN = '\r\u0000\n\u0003\r';
-
-var decoder = {
-  decodeURIComponent: function (s) {
-    s = s.replace(TOKEN_RE, '+');
-    return qs.unescape(s);
-  }
-};
-var rawDecoder = {
-  decodeURIComponent: function (s) {
-    return s.replace(TOKEN_RE, '+');
-  }
-};
-var rawDecoder2 = {
-  decodeURIComponent: function (s) {
-    return s;
-  }
-};
-
-function parse(str, sep, eq, escape) {
-  try {
-    if (str.indexOf('+') === -1 || str.indexOf(TOKEN) !== -1) {
-      return qs.parse(str, sep, eq, escape ? rawDecoder2 : undefined);
-    }
-    str = str.replace(PLUS_RE, TOKEN);
-    return qs.parse(str, sep, eq, escape ? rawDecoder : decoder);
-  } catch (e) {}
-  return '';
-}
-
-module.exports = parse;