whistle 2.10.5 → 2.10.7

package/biz/webui/lib/index.js

@@ -36,7 +36,6 @@ var uploadJsonParser = bodyParser.json(UPLOAD_PARSE_CONF);
 var GET_METHOD_RE = /^get$/i;
 var WEINRE_RE = /^\/weinre\/.*/;
 var ALLOW_PLUGIN_PATHS = ['/cgi-bin/rules/list2', '/cgi-bin/values/list2', '/cgi-bin/get-custom-certs-info'];
-var SPECIAL_PATHS = ['/cgi-bin/rules/project'];
 var DONT_CHECK_PATHS = ['/cgi-bin/server-info', '/cgi-bin/plugins/is-enable', '/cgi-bin/plugins/get-plugins',
   '/preview.html', '/cgi-bin/rootca', '/cgi-bin/check-update', '/cgi-bin/log/set', '/cgi-bin/status'];
 var GUEST_PATHS = ['/cgi-bin/composer', '/cgi-bin/socket/data', '/cgi-bin/abort', '/cgi-bin/socket/abort',
@@ -196,8 +195,7 @@ function checkAuth(req, res) {
   if (verifyLogin(req, res, auth)) {
     return true;
   }
-  if (config.specialAuth && SPECIAL_PATHS.indexOf(req.path) !== -1 &&
-    config.specialAuth === req.headers['x-whistle-special-auth']) {
+  if (config.specialAuth && config.specialAuth === req.headers['x-whistle-special-auth']) {
     return true;
   }
   requireLogin(req, res);

package/lib/https/index.js

@@ -198,7 +198,7 @@ function resolveWebsocket(socket, wss) {
       var delay = reqDelay + resDelay;
       if (delay > 0) {
         clearTimeout(timeout);
-        setTimeout(end, delay);
+        timeout = setTimeout(end, delay);
       } else {
         end();
       }
@@ -304,7 +304,7 @@ function resolveWebsocket(socket, wss) {
                 var reqDelay = util.getMatcherValue(_rules.reqDelay);
                 if (reqDelay > 0) {
                   clearTimeout(timeout);
-                  setTimeout(function () {
+                  timeout = setTimeout(function () {
                     timeout = setTimeout(function () {
                       destroy(util.TIMEOUT_ERR);
                     }, CONN_TIMEOUT);
@@ -779,7 +779,7 @@ function resolveWebsocket(socket, wss) {
         var curResHeaders = (reqSocket.headers = res.headers);
         socket.resHeaders = curResHeaders;
         getResRules(socket, res, function () {
-          util.delay(util.getMatcherValue(_rules.resDelay), function () {
+          util.setDelayTimer(socket, util.delay(util.getMatcherValue(_rules.resDelay), function () {
             if (util.needAbortRes(socket)) {
               socket.__statusCode = res.statusCode;
               return destroy();
@@ -812,7 +812,7 @@ function resolveWebsocket(socket, wss) {
             resData.statusCode = code;
             reqEmitter.emit('response', data);
             execCallback(null, reqSocket);
-          });
+          }));
         });
       },
       true
@@ -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/init.js

@@ -49,6 +49,7 @@ function addErrorEvents(req, res) {
     }
     countdown();
     req._hasError = true;
+    util.clearDelayTimer(req);
     clientReq = req._clientReq || clientReq;
     if (clientReq) {
       if (clientReq.destroy) {

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);
@@ -442,13 +445,14 @@ function emitDataEvents(req, res, proxy) {
 
   function handleError(err) {
     req._hasError = true;
+    util.clearDelayTimer(req);
     if (!data || endTime || data.endTime || (data.responseTime && !err)) {
       return;
     }
     !endTime && setEndTime();
     delete data.abort;
-    var msg = err && err.message;
-    if (msg !== 'Aborted') {
+    // 不能乱优化，跟 var msg = err && err.message; if (msg !== 'Aborted' && msg !== 'aborted') 不一样
+    if (err && err.message !== 'Aborted' && err.message !== 'aborted') {
       data.resError = true;
       if (resData.body) {
         data.errMsg = util.getErrorStack(err);
@@ -531,10 +535,11 @@ function emitDataEvents(req, res, proxy) {
 
 module.exports = function (req, res, next) {
   emitDataEvents(req, res, this);
-  util.delay(util.getMatcherValue(req.rules.reqDelay), function () {
+  var reqDelay = util.getMatcherValue(req.rules.reqDelay);
+  util.setDelayTimer(req, util.delay(reqDelay, function () {
     if (util.needAbortReq(req)) {
       return res.destroy();
     }
     next();
-  });
+  }));
 };

package/lib/inspectors/req.js

@@ -10,7 +10,6 @@ var handleWeinre = require('./weinre');
 var handleLog = require('./log');
 
 var Transform = require('pipestream').Transform;
-var WhistleTransform = util.WhistleTransform;
 var ReplacePatternTransform = util.ReplacePatternTransform;
 var ReplaceStringTransform = util.ReplaceStringTransform;
 var FileWriterTransform = util.FileWriterTransform;
@@ -127,7 +126,7 @@ function handleReq(req, data, reqRules, delType) {
   }
 
   util.isWhistleTransformData(data) &&
-    req.addZipTransform(new WhistleTransform(data));
+    req.addZipTransform(new util.WhistleTransform(data, req));
   var opList = util.parseHeaderReplace(req.rules.headerReplace).req;
   if (opList) {
     var host = req.headers.host;
@@ -159,6 +158,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 +171,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 +391,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

@@ -11,10 +11,6 @@ var pluginMgr = require('../plugins');
 var hparser = require('hparser');
 var config = require('../config');
 
-var WhistleTransform = util.WhistleTransform;
-var SpeedTransform = util.SpeedTransform;
-var ReplacePatternTransform = util.ReplacePatternTransform;
-var ReplaceStringTransform = util.ReplaceStringTransform;
 var FileWriterTransform = util.FileWriterTransform;
 var formatHeaders = hparser.formatHeaders;
 var getRawHeaderNames = hparser.getRawHeaderNames;
@@ -89,10 +85,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 +101,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);
         }
@@ -137,9 +133,9 @@ function handleReplace(res, replacement) {
       util.isOriginalRegExp(pattern) &&
       (pattern = util.toOriginalRegExp(pattern))
     ) {
-      res.addTextTransform(new ReplacePatternTransform(pattern, value, util.isSSE(res)));
+      res.addTextTransform(new util.ReplacePatternTransform(pattern, value, util.isSSE(res)));
     } else if (pattern) {
-      res.addTextTransform(new ReplaceStringTransform(pattern, value, util.isSSE(res)));
+      res.addTextTransform(new util.ReplaceStringTransform(pattern, value, util.isSSE(res)));
     }
   });
 }
@@ -1008,7 +1004,7 @@ module.exports = function (req, res, next) {
                 data.top = resPrepend;
                 data.bottom = resAppend;
 
-                var speedTransform = data.speed || data.delay ? new SpeedTransform(data) : null;
+                var speedTransform = data.speed || data.delay ? new util.SpeedTransform(data, req) : null;
                 delete data.headers;
                 delete data.speed;
                 delete data.delay;
@@ -1113,7 +1109,7 @@ module.exports = function (req, res, next) {
                 }
                 if (util.isWhistleTransformData(data)) {
                   data.noDoctype = util.isDisable(req, 'doctype');
-                  res.addZipTransform(new WhistleTransform(data));
+                  res.addZipTransform(new util.WhistleTransform(data, req));
                 }
                 if (hasResBody) {
                   handleReplace(res, replacement);
@@ -1166,7 +1162,7 @@ module.exports = function (req, res, next) {
                       if (_resHeaders[config.ALPN_PROTOCOL_HEADER] === 'h2') {
                         req.useH2 = true;
                       }
-                      util.delay(
+                      util.setDelayTimer(req, util.delay(
                         util.getMatcherValue(resRules.resDelay),
                         function () {
                           if (req._hasError) {
@@ -1299,7 +1295,7 @@ module.exports = function (req, res, next) {
                             util.emitError(res, e);
                           }
                         }
-                      );
+                      ));
                     },
                     util.isEnable(req, 'forceReqWrite')
                   );

package/lib/plugins/index.js

@@ -516,8 +516,8 @@ var delayTimer;
 
 function refreshPlugins() {
   updating = true;
-  delayTimer && clearTimeout(delayTimer);
-  updateTimer && clearTimeout(updateTimer);
+  clearTimeout(delayTimer);
+  clearTimeout(updateTimer);
   delayTimer = null;
   updateTimer = null;
   getPlugin(function (result) {

package/lib/plugins/load-plugin.js

@@ -46,7 +46,6 @@ var httpRequest = http.request;
 var httpsRequest = https.request;
 var formatHeaders = hparser.formatHeaders;
 var getRawHeaderNames = hparser.getRawHeaderNames;
-var getRawHeaders = hparser.getRawHeaders;
 var STATUS_CODES = http.STATUS_CODES || {};
 var clientIpKey = Symbol('clientIp');
 var clientPortKey = Symbol('clientPort');
@@ -333,7 +332,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 +541,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) {}
   }
 };
@@ -906,6 +905,9 @@ function wrapTunnelWriter(socket, toServer) {
   var write = socket.write;
   var end = socket.end;
   var sender = wsParser.getSender(socket, toServer);
+  var notNeedDrain = function() {
+    return socket.writableNeedDrain !== true;
+  };
   handleError(socket, sender);
   socket.write = function (chunk, encoding, cb) {
     if ((chunk = toBuffer(chunk))) {
@@ -917,6 +919,7 @@ function wrapTunnelWriter(socket, toServer) {
       } else {
         sender.send(chunk);
       }
+      return notNeedDrain();
     }
   };
   if (toServer) {
@@ -926,16 +929,19 @@ function wrapTunnelWriter(socket, toServer) {
           return write.call(this, chunk, opts, cb);
         }
         sender.send(chunk, getOptions(opts, false, true));
+        return notNeedDrain();
       }
     };
     socket.writeText = function (chunk) {
       if ((chunk = toBuffer(chunk))) {
         sender.send(chunk, getOptions(null, false, true));
+        return notNeedDrain();
       }
     };
     socket.writeBin = function (chunk) {
       if ((chunk = toBuffer(chunk))) {
         sender.send(chunk, getOptions(null, true, true));
+        return notNeedDrain();
       }
     };
     socket.closeWebSocket = function (code, data, cb) {
@@ -951,6 +957,7 @@ function wrapTunnelWriter(socket, toServer) {
           return write.call(this, chunk, encoding, cb);
         }
         sender.send(chunk);
+        return notNeedDrain();
       }
     };
   }
@@ -1021,6 +1028,9 @@ function addFrameHandler(req, socket, maxWsPayload, fromClient, toServer) {
   var end = socket.end;
   var lastOpts;
   var sender = wsParser.getSender(socket, toServer);
+  var notNeedDrain = function() {
+    return socket.writableNeedDrain !== true;
+  };
 
   handleError(socket, sender, receiver);
   socket.emit = function (type, chunk) {
@@ -1042,16 +1052,19 @@ function addFrameHandler(req, socket, maxWsPayload, fromClient, toServer) {
         return write.call(this, chunk, opts, cb);
       }
       sender.send(chunk, getOptions(opts || lastOpts, false, toServer));
+      return notNeedDrain();
     }
   };
   socket.writeText = function (chunk) {
     if ((chunk = toBuffer(chunk))) {
       sender.send(chunk, getOptions(null, false, toServer));
+      return notNeedDrain();
     }
   };
   socket.writeBin = function (chunk) {
     if ((chunk = toBuffer(chunk))) {
       sender.send(chunk, getOptions(null, true, toServer));
+      return notNeedDrain();
     }
   };
   socket.end = function (chunk, opts, cb) {
@@ -2253,11 +2266,9 @@ module.exports = async function (options, callback) {
                 socket.setRules = req.setResRules = socket.setResRules = noop;
                 resRules = null;
               }
-              var rawData = 'HTTP/1.1 ' + code + ' ' + (msg || svrRes.statusMessage || STATUS_CODES[code] || '');
-              if (headers = headers && getRawHeaders(formatRawHeaders(headers, svrRes))) {
-                rawData += '\r\n' + headers;
-              }
-              socket.write(rawData + '\r\n\r\n', 'binary');
+              headers = headers && formatRawHeaders(headers, svrRes);
+              msg = msg || svrRes.statusMessage || STATUS_CODES[code] || '';
+              socket.write(common.getHttpMeta('HTTP/1.1', code, msg, headers), 'binary');
             };
             req.request = function (uri, cb, opts) {
               var args = normalizeArgs(uri, cb, req, curUrl, true, opts);

package/lib/rules/util.js

@@ -166,14 +166,19 @@ function unselectRulesFile(file, force, all) {
   }
   var selectedList = getSelectedRulesList();
   var hasChanged;
-  all = all || [file];
-  all.forEach(function(name) {
-    var index = selectedList.indexOf(name);
-    if (index != -1) {
-      selectedList.splice(index, 1);
-      hasChanged = true;
-    }
-  });
+  if (file === false) {
+    hasChanged = selectedList.length;
+    selectedList = [];
+  } else {
+    all = all || [file];
+    all.forEach(function(name) {
+      var index = selectedList.indexOf(name);
+      if (index != -1) {
+        selectedList.splice(index, 1);
+        hasChanged = true;
+      }
+    });
+  }
   if (hasChanged) {
     rulesStorage.setProperty('selectedList', selectedList);
     parseRules();
@@ -185,7 +190,7 @@ function unselectRulesFile(file, force, all) {
 function allowMultipleChoice() {
   return (
     !config.disabledMultipleOption &&
-    propertiesStorage.getProperty('allowMultipleChoice')
+    !!propertiesStorage.getProperty('allowMultipleChoice')
   );
 }
 
@@ -290,8 +295,10 @@ exports.rules = {
       }
     });
     return {
+      laterRulesFirst: propertiesStorage.getProperty('backRulesFirst') === true,
       pluginsDisabled: propertiesStorage.getProperty('disabledAllPlugins'),
       disabled: !config.notAllowedDisableRules && propertiesStorage.getProperty('disabledAllRules'),
+      multiSelect: allowMultipleChoice(),
       list: list
     };
   },
@@ -320,6 +327,9 @@ exports.rules = {
   exists: function(name) {
     return rulesStorage.existsFile(name);
   },
+  isSelected: function(name) {
+    return getSelectedRulesList().indexOf(name) !== -1;
+  },
   recycleBin: rulesStorage.recycleBin,
   enableBackRulesFirst: function (backRulesFirst) {
     var curFlag = propertiesStorage.getProperty('backRulesFirst') === true;
@@ -338,7 +348,7 @@ exports.rules = {
     });
     return {
       backRulesFirst: propertiesStorage.getProperty('backRulesFirst') === true,
-      allowMultipleChoice: !!propertiesStorage.getProperty('allowMultipleChoice'),
+      allowMultipleChoice: allowMultipleChoice(),
       list: list
     };
   },

package/lib/service/composer.js

@@ -11,7 +11,6 @@ var Storage = require('../rules/storage');
 var dataCenter = require('./data-center');
 
 var formatHeaders = hparser.formatHeaders;
-var getRawHeaders = hparser.getRawHeaders;
 var getRawHeaderNames = hparser.getRawHeaderNames;
 var config = {};
 var noop = common.noop;
@@ -68,10 +67,8 @@ function handleComposerHistory(data, isConn) {
     body: body.length > MAX_BODY_LEN ? body.substring(0, MAX_BODY_LEN) : body,
     isHexText: !!data.isHexText,
     base64: base64,
-    enableProxyRules: !!data.enableProxyRules
+    enableProxyRules: data.enableProxyRules
   };
-  var dataHash;
-  var base64Hash;
   for (var i = 0, len = composerHistory.length; i < len; i++) {
     var item = composerHistory[i];
     if (
@@ -81,16 +78,12 @@ function handleComposerHistory(data, isConn) {
         item.body === result.body &&
         item.base64 === result.base64 &&
         !item.useH2 !== result.useH2 &&
-        !item.enableProxyRules !== result.enableProxyRules
+        item.enableProxyRules === result.enableProxyRules
       ) {
-      dataHash = item.dataHash;
-      base64Hash = item.base64Hash;
       composerHistory.splice(i, 1);
       break;
     }
   }
-  result.dataHash = dataHash;
-  result.base64Hash = base64Hash;
   composerHistory.unshift(result);
   var overflow = composerHistory.length - MAX_HISTORY_LEN;
   if (overflow > 0) {
@@ -183,16 +176,6 @@ function handleConnect(options, cb, count, testId) {
   }
 }
 
-function getReqRaw(options) {
-  var headers = options.headers;
-  var statusLine = options.method +' ' + (options.path || '/') +' ' + 'HTTP/1.1';
-  var raw = statusLine;
-  if (headers = getRawHeaders(headers)) {
-    raw += '\r\n' + headers;
-  }
-  return raw + '\r\n\r\n';
-}
-
 function handleWebSocket(options, cb, count, testId) {
   count = getReqCount(count);
   if (options.protocol === 'https:' || options.protocol === 'wss:') {
@@ -213,7 +196,7 @@ function handleWebSocket(options, cb, count, testId) {
       if (err) {
         handleCallback(execCb, err, null, testId);
       } else {
-        socket.write(getReqRaw(options));
+        socket.write(common.getHttpMeta(options.method, options.path || '/', 'HTTP/1.1', options.headers));
         var data = options.body;
         if ((!data || !data.length) && !cb) {
           return drain(socket);
@@ -293,7 +276,7 @@ function handleHttp(options, cb, count, reqId, testId) {
         if (buffer === null) {
           return;
         }
-        timer && clearTimeout(timer);
+        clearTimeout(timer);
         var headers = svrRes.headers;
         if (typeof headers.trailer === 'string' && headers.trailer.indexOf(',') !== -1) {
           headers.trailer = headers.trailer.split(',');
@@ -397,7 +380,9 @@ exports.handleRequest = function(req, res) {
   headers[config.FROM_COM_HEADER] = '1';
   var isTest = reqBody.isTest;
   var testId;
-  if (reqBody.enableProxyRules === false || isTest) {
+  var enableProxyRules = reqBody.enableProxyRules !== false && !reqBody.disabledGlobalRules;
+  reqBody.enableProxyRules = enableProxyRules;
+  if (!enableProxyRules || isTest) {
     headers[config.DISABLE_RULES_HEADER] = '1';
     if (isTest) {
       testId = ++testIndex + '';