whistle 2.10.10 → 2.10.11

package/index.js

@@ -8,7 +8,6 @@ var os = require('os');
 var assert = require('assert');
 var common = require('./lib/util/common');
 
-var ver = process.version.substring(1).split('.');
 var PROD_RE = /(^|\|)prod(uction)?($|\|)/;
 var noop = function () {};
 var state = {};
@@ -16,21 +15,20 @@ var INTERVAL = 1000;
 var TIMEOUT = 10000;
 var MASTER_TIMEOUT = 12000;
 
-if (ver[0] >= 7 && ver[1] >= 7) {
-  var connect = net.Socket.prototype.connect;
-  if (typeof connect === 'function') {
-    //fix: Node v7.7.0+引入的 `"listener" argument must be a function` 问题
-    net.Socket.prototype.connect = function (options, cb) {
-      if (options && typeof options === 'object' && typeof cb !== 'function') {
-        return connect.call(this, options, null);
-      }
-      return connect.apply(this, arguments);
-    };
-  }
+var connect = net.Socket.prototype.connect;
+if (typeof connect === 'function') {
+  //fix: Node v7.7.0+引入的 `"listener" argument must be a function` 问题
+  net.Socket.prototype.connect = function (options, cb) {
+    if (options && typeof options === 'object' && typeof cb !== 'function') {
+      return connect.call(this, options, null);
+    }
+    return connect.apply(this, arguments);
+  };
 }
 
 var env = process.env || '';
 env.WHISTLE_ROOT = __dirname;
+env.PFORK_MAX_HTTP_HEADER_SIZE = 1024 * 1024;
 if (typeof tls.checkServerIdentity == 'function') {
   var checkServerIdentity = tls.checkServerIdentity;
   tls.checkServerIdentity = function () {

package/lib/config.js

@@ -1,12 +1,11 @@
 var path = require('path');
-var http = require('http');
 var fs = require('fs');
 var net = require('net');
 var dns = require('dns');
 var qs = require('querystring');
 var LRU = require('lru-cache');
-var httpAgent = http.Agent;
-var httpsAgent = require('https').Agent;
+var HttpAgent = require('http').Agent;
+var HttpsAgent = require('https').Agent;
 var parseUrl = require('./util/parse-url-safe');
 var fse = require('fs-extra2');
 var extend = require('extend');
@@ -25,13 +24,11 @@ var CMD_RE = /^[\w]{1,12}(?:\s+-g)?$/;
 var httpsAgents = new LRU({ max: 360 });
 var socksAgents = new LRU({ max: 100 });
 var version = process.version.substring(1).split('.');
-var disableAgent = version[0] > 10;
-var hasIPv6First = version[0] >= 22 && version[1] >= 1;
+var hasIPv6First = (version[0] === 22 && version[1] >= 1) || version[0] > 22;
 var hasDnsOrder = typeof dns.setDefaultResultOrder === 'function';
 var uid = Date.now().toString(16) + (process.pid * 10000 + Math.floor(Math.random() * 10000)).toString(16);
 var IPV4_RE = /^([\d.]+)(:\d{1,5})?$/;
 var IPV6_RE = /^\[([\w:]+)\](:\d{1,5})?$/;
-var noop = function () {};
 var DATA_KEY_RE = /^(clientip|clientid|tunneldata)([=.])([\w.-]+)$/i;
 var DNS_ORDERS = ['ipv4First', 'ipv4first', 'ipv6first', 'ipv6First', 'verbatim'];
 var LOCAL_UI_HOST_LIST = [
@@ -66,7 +63,6 @@ if (hasDnsOrder) {
 config.appName = common.upperFirst(config.name);
 config.uid = uid;
 config.rejectUnauthorized = false;
-config.enableH2 = version[0] > 12; // 支持 HTTP2 要求的最低 Node 版本
 config.ASSESTS_PATH = path.join(__dirname, '../assets');
 config.WHISTLE_POLICY_HEADER = 'x-whistle-policy';
 config.CLIENT_IP_HEADER = common.CLIENT_IP_HEADER;
@@ -120,9 +116,11 @@ config.CONN_TIMEOUT = CONN_TIMEOUT;
 
 var getWhistlePath = common.getWhistlePath;
 var getHostPort = common.getHostPort;
+var WHISTLE_PATH = getWhistlePath();
 
-var ALL_WHISTLES_PATH = path.join(getWhistlePath(), 'all_whistles');
+var ALL_WHISTLES_PATH = path.join(WHISTLE_PATH, 'all_whistles');
 
+config.WHISTLE_PATH = WHISTLE_PATH;
 
 function domainToRegExp(_, star, dot) {
   var len = star.length;
@@ -137,16 +135,16 @@ function domainToRegExp(_, star, dot) {
 }
 
 function getDataDir(dirname) {
-  var dir = path.join(getWhistlePath(), dirname || '.' + config.name);
+  var dir = path.join(WHISTLE_PATH, dirname || '.' + config.name);
   fse.ensureDirSync(dir);
   return dir;
 }
 
 config.baseDir = getDataDir();
-config.CUSTOM_PLUGIN_PATH = path.join(getWhistlePath(), 'custom_plugins');
-config.CUSTOM_CERTS_DIR = path.resolve(getWhistlePath(), 'custom_certs');
-config.SAVED_SESSIONS_PATH = path.resolve(getWhistlePath(), 'saved_sessions');
-config.DEV_PLUGINS_PATH = path.resolve(getWhistlePath(), 'dev_plugins');
+config.CUSTOM_PLUGIN_PATH = path.join(WHISTLE_PATH, 'custom_plugins');
+config.CUSTOM_CERTS_DIR = path.resolve(WHISTLE_PATH, 'custom_certs');
+config.SAVED_SESSIONS_PATH = path.resolve(WHISTLE_PATH, 'saved_sessions');
+config.DEV_PLUGINS_PATH = path.resolve(WHISTLE_PATH, 'dev_plugins');
 config.rulesDir = path.join(config.baseDir, 'rules');
 config.valuesDir = path.join(config.baseDir, 'values');
 config.propertiesDir = path.join(config.baseDir, 'properties');
@@ -167,55 +165,6 @@ try {
 
 exports.getWhistlePath = getWhistlePath;
 exports.getDataDir = getDataDir;
-var async_id_symbol;
-if (version[0] < 16) {
-  try {
-    async_id_symbol = process.binding('async_wrap').async_id_symbol;
-  } catch (e) {}
-}
-var emptyHandle = {
-  asyncReset: noop,
-  getAsyncId: noop
-};
-
-function createAgent(agentConfig, https) {
-  var agent = new (https ? httpsAgent : httpAgent)(agentConfig);
-  if (async_id_symbol) {
-    var addRequest = agent.addRequest;
-    agent.addRequest = function (req, options) {
-      // fix: https://github.com/nodejs/node/issues/13539
-      var freeSockets = this.freeSockets[this.getName(options)];
-      if (freeSockets && freeSockets.length) {
-        var socket = freeSockets[0];
-        var handle = socket._handle;
-        if (!handle) {
-          socket._handle = emptyHandle;
-        } else if (typeof handle.asyncReset !== 'function') {
-          handle.asyncReset = noop;
-        }
-        var originalRef = socket.ref;
-        socket.ref = function () {
-          socket.ref = originalRef;
-          if (socket._handle === emptyHandle) {
-            delete socket._handle;
-          } else if (socket._handle.asyncReset === noop) {
-            delete socket._handle.asyncReset;
-          }
-          socket.ref();
-        };
-      }
-      var onSocket = req.onSocket;
-      req.onSocket = function (socket) {
-        try {
-          socket[async_id_symbol] = socket._handle.getAsyncId();
-        } catch (e) {}
-        onSocket.apply(this, arguments);
-      };
-      addRequest.apply(this, arguments);
-    };
-  }
-  return agent;
-}
 
 function getHttpsAgent(options, reqOpts) {
   var key = getCacheKey(options);
@@ -1093,10 +1042,10 @@ exports.extend = function (newConf) {
     keepAliveMsecs: KEEP_ALIVE_MSECS,
     maxFreeSockets: 0
   };
-  // node 11及以上版本缓存连接有问题，先禁掉
-  disableAgent = !newAgentConf && !useAgent && (disableAgent || config.debug);
-  config.httpAgent = disableAgent ? false : createAgent(agentConfig);
-  config.httpsAgent = disableAgent ? false : createAgent(agentConfig, true);
+  // node 11及以上版本缓存连接有问题，默认禁掉
+  var disableAgent = !newAgentConf && !useAgent;
+  config.httpAgent = disableAgent ? false : new HttpAgent(agentConfig);
+  config.httpsAgent = disableAgent ? false : new HttpsAgent(agentConfig);
   config.getSocksAgent = function (options) {
     var key = getCacheKey(options, true);
     var agent = socksAgents.get(key);

package/lib/https/ca.js

@@ -691,7 +691,7 @@ exports.getHttp2Server = function (listener, callback) {
 };
 
 exports.getSNIServer = function (listener, callback, disableH2, requestCert) {
-  var enableH2 = config.enableH2 && !disableH2;
+  var enableH2 = !disableH2;
   var name = (enableH2 ? 'h2Sni' : 'sni') + (requestCert ? 'WithCert' : '');
   var curPort = ports[name];
   if (curPort) {

package/lib/https/h2.js

@@ -5,7 +5,7 @@ var sockx = require('sockx');
 var util = require('../util');
 var config = require('../config');
 var extend = require('extend');
-var http2 = config.enableH2 ? require('http2') : null;
+var http2 = require('http2');
 
 var SUPPORTED_PROTOS = ['h2', 'http/1.1', 'http/1.0'];
 var H2_SETTINGS = { enablePush: false };

package/lib/https/index.js

@@ -8,6 +8,7 @@ var EventEmitter = require('events').EventEmitter;
 var LRU = require('lru-cache');
 var checkSNI = require('sni');
 var util = require('../util');
+var common = require('../util/common');
 var extend = require('extend');
 var config = require('../config');
 var rules = require('../rules');
@@ -17,7 +18,7 @@ var hparser = require('hparser');
 var properties = require('../rules/util').properties;
 var ca = require('./ca');
 var loadCert = require('./load-cert');
-var h2Consts = config.enableH2 ? require('http2').constants : {};
+var h2Consts = require('http2').constants;
 
 var STATUS_CODES = http.STATUS_CODES || {};
 var getRawHeaders = hparser.getRawHeaders;
@@ -1108,36 +1109,39 @@ var handlers = {
     server.emit('upgrade', req, socket);
   }
 };
-var h2Handlers = config.enableH2
-  ? {
-    request: toHttp1,
-    upgrade: handlers.upgrade
-  }
-  : handlers;
+var h2Handlers = {
+  request: toHttp1,
+  upgrade: handlers.upgrade
+};
 
 var HTTP_RE = /^(\w+)\s+(\S+)\s+HTTP\/1.\d$/im;
 var HTTP2_RE = /^PRI\s\*\s+HTTP\/2.0$/im;
 var CONNECT_RE = /^CONNECT$/i;
 
-function addClientInfo(socket, chunk, statusLine, clientIp, clientPort) {
-  var len = Buffer.byteLength(statusLine);
-  chunk = chunk.slice(len);
-  statusLine +=
-    '\r\n' +
-    config.CLIENT_INFO_HEADER +
-    ': ' +
-    clientIp +
-    ',' +
-    clientPort +
-    ',' +
-    socket._remoteAddr +
-    ',' +
-    socket._remotePort;
+function getTunnelHeaders(socket, statusLine, clientIp, clientPort, newHost) {
+  var clientInfo = clientIp + ',' + clientPort + ',' + socket._remoteAddr + ',' + socket._remotePort;
+  var headers = newHost ? {} : null;
+  if (headers) {
+    headers.host = newHost;
+    headers[config.CLIENT_INFO_HEADER] = clientInfo;
+  } else {
+    statusLine += '\r\n' + config.CLIENT_INFO_HEADER + ': ' + clientInfo;
+  }
   var tunnelData = getTunnelData(socket, clientIp, clientPort);
   if (tunnelData) {
-    statusLine += '\r\n' + util.TEMP_TUNNEL_DATA_HEADER + ': ' + encodeURIComponent(JSON.stringify(tunnelData));
+    tunnelData = encodeURIComponent(JSON.stringify(tunnelData));
+    if (headers) {
+      headers[util.TEMP_TUNNEL_DATA_HEADER] = tunnelData;
+    } else {
+      statusLine += '\r\n' + util.TEMP_TUNNEL_DATA_HEADER + ': ' + tunnelData;
+    }
   }
-  return Buffer.concat([Buffer.from(statusLine), chunk]);
+  return headers || Buffer.from(statusLine);
+}
+
+function addClientInfo(socket, chunk, statusLine, clientIp, clientPort) {
+  chunk = chunk.slice(Buffer.byteLength(statusLine));
+  return Buffer.concat([getTunnelHeaders(socket, statusLine, clientIp, clientPort), chunk]);
 }
 
 module.exports = function (socket, next, isWebPort) {
@@ -1215,37 +1219,37 @@ module.exports = function (socket, next, isWebPort) {
             addClientInfo(socket, chunk, statusLine, clientIp, clientPort)
           );
       }
-    } else if (isEnable('forHttp') || disable.captureHttps) {
+      return;
+    }
+    if (isEnable('forHttp') || disable.captureHttps) {
       return next(chunk);
-    } else {
-      var isHttpH2 = HTTP2_RE.test(headersStr);
-      if (!isHttpH2 && chunk[0] != 22) {
-        return next(chunk);
-      }
-      var useSNI, domain, serverKey;
-      var handleConnect = function (port) {
-        var promise =
+    }
+    var isHttpH2 = HTTP2_RE.test(headersStr);
+    if (!isHttpH2 && chunk[0] != 22) {
+      return next(chunk);
+    }
+    var useSNI, domain, serverKey;
+    var handleConnect = function (port) {
+      var promise =
             !isHttpH2 && !useSNI && serverAgent.existsServer(serverKey);
-        var httpsServer = promise && promise.cert && promise.server;
-        if (httpsServer && httpsServer.setSecureContext) {
-          var cert = serverAgent.createCertificate(domain);
-          if (
-              cert.key !== promise.cert.key ||
-              cert.cert !== promise.cert.cert
-            ) {
-            try {
-              cert._ctx = cert._ctx || ca.createSecureContext(cert);
-              httpsServer.setSecureContext(cert._ctx);
-              promise.cert = cert;
-            } catch (e) {}
-          }
+      var oldCert = promise && promise.cert;
+      var httpsServer = oldCert && promise.server;
+      if (httpsServer && httpsServer.setSecureContext) {
+        var cert = serverAgent.createCertificate(domain);
+        if (cert.key !== oldCert.key || cert.cert !== oldCert.cert) {
+          try {
+            cert._ctx = cert._ctx || ca.createSecureContext(cert);
+            httpsServer.setSecureContext(cert._ctx);
+            promise.cert = cert;
+          } catch (e) {}
         }
-        util.connect(
-          {
-            port: port,
-            host: LOCALHOST,
-            localAddress: LOCALHOST
-          },
+      }
+      util.connect(
+        {
+          port: port,
+          host: LOCALHOST,
+          localAddress: LOCALHOST
+        },
             function (err, s) {
               reqSocket = s;
               if (err || socket._hasError) {
@@ -1257,61 +1261,73 @@ module.exports = function (socket, next, isWebPort) {
               handlePipe();
             }
           );
-      };
-      var useNoSNIServer = function () {
-        serverKey = requestCert ? ':' + domain : domain;
-        serverAgent.createServer(serverKey, handlers, handleConnect, 0, 0);
-      };
+    };
+    var useNoSNIServer = function () {
+      serverKey = requestCert ? ':' + domain : domain;
+      serverAgent.createServer(serverKey, handlers, handleConnect, 0, 0);
+    };
 
-      var handleRequest = function () {
-        if (useSNI) {
-          var disableH2 = !properties.isEnableHttp2();
-          if (disable.http2) {
-            disableH2 = true;
-          } else if (enable.http2) {
-            disableH2 = false;
-          }
-          getSNIServer(h2Handlers, handleConnect, disableH2, requestCert);
-        } else if (isHttpH2) {
-          getHttp2Server(h2Handlers, handleConnect);
-        } else {
-          useNoSNIServer();
+    var handleRequest = function () {
+      if (useSNI) {
+        var disableH2 = !properties.isEnableHttp2();
+        if (disable.http2) {
+          disableH2 = true;
+        } else if (enable.http2) {
+          disableH2 = false;
         }
-      };
-      if (isHttpH2) {
-        return handleRequest();
+        getSNIServer(h2Handlers, handleConnect, disableH2, requestCert);
+      } else if (isHttpH2) {
+        getHttp2Server(h2Handlers, handleConnect);
+      } else {
+        useNoSNIServer();
       }
-      useSNI = checkSNI(chunk);
-      var servername = useSNI || socket.tunnelHostname;
-      if (
-          !servername ||
+    };
+    if (isHttpH2) {
+      return handleRequest();
+    }
+    useSNI = checkSNI(chunk);
+    var servername = useSNI || socket.tunnelHostname;
+    if (useSNI && socket._useSniAsTunnelDomain && useSNI !== socket.tunnelHostname) {
+      var tunnelPort = socket.tunnelPort || 443;
+      return common.connectInner({
+        host: useSNI,
+        port: tunnelPort,
+        proxyHost: config.host || LOCALHOST,
+        proxyPort: config.port,
+        headers: getTunnelHeaders(socket, statusLine, clientIp, clientPort, useSNI + ':' + tunnelPort)
+      }, function(s) {
+        reqSocket = s;
+        handlePipe();
+      }, config).on('error', destroy);
+    }
+    if (
+          !servername || socket._noCaptureW2 ||
           (useSNI ? disable.captureSNI : (disable.captureNoSNI || (net.isIP(servername) && !isCaptureIp()))) ||
           (socket.useProxifier && !ca.existsCustomCert(servername))
         ) {
-        return next(chunk);
-      }
-      var requestCert =
+      return next(chunk);
+    }
+    var requestCert =
           (enable.clientCert || enable.requestCert) &&
           !disable.clientCert &&
           !disable.requestCert;
-      domain = getDomain(servername);
-      socket.curUrl = socket.fullUrl = 'https://' + servername;
-      socket.useSNI = useSNI;
-      socket.serverName = socket.servername = servername;
-      socket.commonName = domain;
-      loadCert(socket, function (cert) {
-        if (socket._hasError) {
-          return destroy();
-        }
-        if (cert === false) {
-          return next(chunk);
-        }
-        if (cert) {
-          domain = servername;
-        }
-        handleRequest();
-      });
-    }
+    domain = getDomain(servername);
+    socket.curUrl = socket.fullUrl = 'https://' + servername;
+    socket.useSNI = useSNI;
+    socket.serverName = socket.servername = servername;
+    socket.commonName = domain;
+    loadCert(socket, function (cert) {
+      if (socket._hasError) {
+        return destroy();
+      }
+      if (cert === false) {
+        return next(chunk);
+      }
+      if (cert) {
+        domain = servername;
+      }
+      handleRequest();
+    });
   },
     isWebPort ? 0 : TIMEOUT
   );

package/lib/inspectors/data.js

@@ -197,6 +197,7 @@ function emitDataEvents(req, res, proxy) {
   var setRequestTime = function (time) {
     data.requestTime = time;
     data.connectTime = req._connectTime;
+    reqData.size = reqData.size || 0;
   };
   var setEndTime = function () {
     if (data.requestTime || !requestTime) {
@@ -205,6 +206,7 @@ function emitDataEvents(req, res, proxy) {
     } else if (endTime == null) {
       endTime = endTime || Date.now();
     }
+    resData.size = resData.size || 0;
   };
   var updateVersion = function () {
     if (req.useH2 != null) {

package/lib/inspectors/req.js

@@ -502,8 +502,7 @@ module.exports = function (req, res, next) {
       }
 
       if (reqRules.method) {
-        var method = util.getMatcherValue(reqRules.method);
-        data.method = method;
+        data.method = util.getMatcherValue(reqRules.method);
       }
 
       if (reqRules.reqCharset) {
@@ -511,13 +510,11 @@ module.exports = function (req, res, next) {
       }
 
       if (reqRules.referer) {
-        var referer = util.getMatcherValue(reqRules.referer);
-        util.setHeader(data, 'referer', referer);
+        util.setHeader(data, 'referer', util.getMatcherValue(reqRules.referer));
       }
 
       if (reqRules.ua) {
-        var ua = util.getMatcherValue(reqRules.ua);
-        util.setHeader(data, 'user-agent', ua);
+        util.setHeader(data, 'user-agent', util.getMatcherValue(reqRules.ua));
       }
 
       var reqSpeed = util.getMatcherValue(reqRules.reqSpeed);

package/lib/inspectors/res.js

@@ -168,9 +168,6 @@ function readFirstChunk(req, res, src, cb) {
 }
 
 function checkH2(req, isHttps) {
-  if (!config.enableH2) {
-    return;
-  }
   req.useH2 = req.isH2;
   var d = req.disable;
   var e = req.enable;

package/lib/plugins/index.js

@@ -1237,7 +1237,7 @@ function getPipe(type, hookName) {
         }
       }
       var done;
-      var handleConnect = function (socket, _res) {
+      var handleConnect = function (socket) {
         if (!done) {
           done = true;
           if (isClosed(req)) {

package/lib/rules/index.js

@@ -387,6 +387,7 @@ function getScriptContext(req, res, body, pattern, frameOpts) {
   }
   if (frameOpts) {
     ctx.ctx = {
+      destroy: frameOpts.destroy,
       sendToServer: frameOpts.sendToServer,
       sendToClient: frameOpts.sendToClient,
       handleSendToClientFrame: null,
@@ -435,7 +436,7 @@ function getReqPayload(req, res, cb) {
 
 function execRulesScript(script, req, res, body, pattern, frameOpts) {
   var context = getScriptContext(req, res, body, pattern, frameOpts);
-  if (!util.execScriptSync(script, context)) {
+  if (!util.runInContext(script, context)) {
     return '';
   }
   if (frameOpts) {

package/lib/rules/protocols.js

@@ -272,12 +272,10 @@ function isWebProtocol(protocol) {
 
 exports.isWebProtocol = isWebProtocol;
 
-function isWebsocketProtocol(protocol) {
+function isWsProtocol(protocol) {
   return protocol == 'ws:' || protocol == 'wss:';
 }
 
-exports.isWebsocketProtocol = isWebsocketProtocol;
-
 function isFileProxy(protocol) {
   return RULE_RE.test(protocol) || LOC_RE.test(protocol);
 }
@@ -298,7 +296,7 @@ function contains(name) {
   }
   name += ':';
   return (
-    isWebsocketProtocol(name) ||
+    isWsProtocol(name) ||
     isWebProtocol(name) ||
     isFileProxy(name) ||
     name == 'tunnel:'

package/lib/rules/rules.js

@@ -54,10 +54,8 @@ var REG_URL_SYMBOL_RE = /^(\^+)/;
 var PATTERN_FILTER_RE = /^(?:filter|ignore):\/\/(.+)\/(i)?$/;
 var LINE_PROPS_RE = /^lineProps:\/\/(.*)$/;
 var FILTER_RE = /^(?:excludeFilter|includeFilter):\/\/(.*)$/;
-var PROPS_FILTER_RE =
-  /^(?:filter|excludeFilter|includeFilter|ignore):\/\/(m(?:ethod)?|i(?:p)?|h(?:eader)?|env|s(?:tatusCode)?|from|b(?:ody)?|clientIp|clientIP|clientPort|remoteAddress|remotePort|serverIp|serverIP|serverPort|chance|probability|re[qs](?:H(?:eaders?)?)?):(.+)$/;
-var PURE_FILTER_RE =
-  /^(?:excludeFilter|includeFilter):\/\/(statusCode|from|env|clientIp|clientIP|clientPort|remoteAddress|remotePort|serverIp|serverIP|chance|probability|serverPort|host|re[qs](?:H(?:eaders?)?)?)[.=](.+)$/;
+var PROPS_FILTER_RE = /^(?:filter|excludeFilter|includeFilter|ignore):\/\/(m(?:ethod)?|i(?:p)?|h(?:eader)?|env|s(?:tatusCode)?|sni|from|b(?:ody)?|clientIp|clientIP|clientPort|remoteAddress|remotePort|serverIp|serverIP|serverPort|chance|probability|host|re[qs](?:H(?:eaders?)?)?)[:=](.+)$/;
+var PURE_FILTER_RE = /^(?:excludeFilter|includeFilter):\/\/(re[qs](?:H(?:eaders?)?)?)\.(.+)$/;
 var PATTERN_WILD_FILTER_RE = /^(?:filter|ignore):\/\/(!)?(\*+\/)/;
 var INLINE_RE = /^((?:filter|excludeFilter|includeFilter|ignore):\/\/)(\(.*\)|\<.*\>)$/;
 var CHROME_PATH_RE = /^file:\/\/\/[A-Z]:\//;

package/lib/service/compose-data.js

@@ -22,8 +22,9 @@ exports = module.exports = function(req, res) {
       } else {
         cache.set(reqId, '');
       }
+      curBuf = curBuf.toString('base64');
     }
-    result[reqId] = curBuf ? curBuf.toString('base64') : curBuf;
+    result[reqId] = curBuf;
   });
   res.json(result);
 };

package/lib/service/composer.js

@@ -154,10 +154,7 @@ function handleConnect(options, cb, count, testId) {
       proxyHost: PROXY_OPTS.host,
       proxyPort: PROXY_OPTS.port,
       headers: options.headers
-    }, function(socket, svrRes, err) {
-      if (err) {
-        return handleCallback(execCb, err, null, testId);
-      }
+    }, function(socket, svrRes) {
       if (TLS_PROTOS.indexOf(options.protocol) !== -1) {
         socket = tls.connect({
           rejectUnauthorized: config.rejectUnauthorized,
@@ -171,7 +168,7 @@ function handleConnect(options, cb, count, testId) {
         socket.write(data);
         options.body = data = null;
       }
-      handleCallback(execCb, err, svrRes, testId);
+      handleCallback(execCb, null, svrRes, testId);
     }, config).on('error', execCb || noop);
   }
 }
@@ -277,8 +274,9 @@ function handleHttp(options, cb, count, reqId, testId) {
         }
         clearTimeout(timer);
         var headers = svrRes.headers;
-        if (typeof headers.trailer === 'string' && headers.trailer.indexOf(',') !== -1) {
-          headers.trailer = headers.trailer.split(',');
+        var trailer = headers.trailer;
+        if (typeof trailer === 'string' && trailer.indexOf(',') !== -1) {
+          headers.trailer = trailer.split(',');
         }
         var result = {
           statusCode: svrRes.statusCode,

package/lib/socket-mgr.js

@@ -657,6 +657,9 @@ function getFrameSender(options, toServer) {
 function getFrameCtx(options, callback) {
   var req = options.req;
   rules.getFrameScriptCtx(req.rules.frameScript, req, options.res, {
+    destroy: function() {
+      destroy(options.reqId);
+    },
     sendToClient: getFrameSender(options),
     sendToServer: getFrameSender(options, true)
   }, callback);
@@ -703,7 +706,7 @@ exports.handleUpgrade = function (req, res) {
   resTrans.on('error', emitError);
   res.headers = res.headers || {};
   req.wsExts = res.headers['sec-websocket-extensions'] || '';
-  var options = { req: req, res: res };
+  var options = { req: req, res: res, reqId: reqId };
   pluginMgr.getWsPipe(
     req,
     res,