whistle 2.9.109 → 2.10.1

package/lib/plugins/load-plugin.js

@@ -1,6 +1,8 @@
 var listenerCount = require('../util/patch').listenerCount;
 var path = require('path');
 var fs = require('fs');
+var net = require('net');
+var qs = require('querystring');
 var express = require('express');
 var os = require('os');
 var format = require('util').format;
@@ -22,15 +24,19 @@ var rootRequire = require('../../require');
 var extractSaz = require('../service/extract-saz');
 var generateSaz = require('../service/generate-saz');
 var getSharedStorage = require('./shared-storage');
+var compat = require('./compat');
 
 var getEncodeTransform = transproto.getEncodeTransform;
 var getDecodeTransform = transproto.getDecodeTransform;
 var setInternalOptions = common.setInternalOptions;
+var toBuffer = common.toBuffer;
+var readStream = common.readStream;
 
 var LEVELS = ['log', 'error', 'warn', 'info', 'debug', 'trace'];
 var HTTPS_RE = /^(?:https|wss):\/\//;
 var MAX_BODY_SIZE = 1024 * 256;
 var PING_INTERVAL = 22000;
+var LOCALHOST = '127.0.0.1';
 var sessionStorage = new LRU({
   maxAge: 1000 * 60 * 12,
   max: 1600
@@ -42,6 +48,10 @@ 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');
+var remoteAddrKey = Symbol('remoteAddr');
+var remotePortKey = Symbol('remotePort');
 var pluginName;
 
 var QUERY_RE = /\?.*$/;
@@ -59,19 +69,15 @@ var MAX_BUF_LEN = 1024 * 1024;
 var TIMEOUT = 300;
 var REQ_INTERVAL = 16;
 var pluginOpts, storage, sharedStorage;
-var pluginKeyMap = {};
 var MASK_OPTIONS = { mask: true };
 var BINARY_MASK_OPTIONS = { mask: true, binary: true };
 var BINARY_OPTIONS = { binary: true };
 /* eslint-disable no-undef */
-var REQ_ID_KEY =
-  typeof Symbol === 'undefined' ? '$reqId_' + Date.now() : Symbol();
-var SESSION_KEY =
-  typeof Symbol === 'undefined' ? '$session_' + Date.now() : Symbol();
-var FRAME_KEY =
-  typeof Symbol === 'undefined' ? '$frame_' + Date.now() : Symbol();
-var REQ_KEY = typeof Symbol === 'undefined' ? '$req_' + Date.now() : Symbol();
-var CLOSED = typeof Symbol === 'undefined' ? '$colsed_' + Date.now() : Symbol();
+var REQ_ID_KEY = Symbol('reqId');
+var SESSION_KEY = Symbol('session');
+var FRAME_KEY = Symbol('frame');
+var REQ_KEY = Symbol('req');
+var CLOSED = Symbol('closed');
 var NOT_NAME_RE = /[^\w.-]/;
 /* eslint-enable no-undef */
 var index = 1000;
@@ -81,19 +87,16 @@ var certsCache = new LRU({ max: 256 });
 var certsCallbacks = {};
 var ctx;
 var PLUGIN_HOOK_NAME_HEADER;
-var UPGRADE_HEADER;
-var GLOBAL_PLUGIN_VARS_HEAD;
-var PLUGIN_VARS_HEAD;
-var FROM_TUNNEL_HEADER;
-var REMOTE_ADDR_HEAD;
-var REMOTE_PORT_HEAD;
-var SNI_TYPE_HEADER;
+var CLIENT_INFO_HEADER;
 var PROXY_ID_HEADER;
-var REQ_FROM_HEADER;
 var debugMode;
 var pluginInited;
 var writeDevLog;
 
+var addRemoteInfo = function(req, headers) {
+  headers[CLIENT_INFO_HEADER] = [req[clientIpKey], req[clientPortKey], req[remoteAddrKey], req[remotePortKey]].join();
+};
+
 process._handlePforkUncaughtException = function (msg, e) {
   msg = [
     'From: ' + pluginName + pluginVersion,
@@ -154,13 +157,6 @@ var requestData = function (options, callback) {
   });
 };
 
-var getValue = function (req, name) {
-  var value = req.headers[name] || '';
-  try {
-    return value ? decodeURIComponent(value) : '';
-  } catch (e) {}
-  return String(value);
-};
 var setContext = function (req) {
   if (ctx) {
     req.ctx = ctx;
@@ -168,7 +164,81 @@ var setContext = function (req) {
   req.localStorage = storage;
   req.Storage = Storage;
   req.sharedStorage = sharedStorage;
-  req.clientIp = getValue(req, pluginOpts.CLIENT_IP_HEADER) || '127.0.0.1';
+  // 原始请求信息 (Original request information)
+  var oReq = (req.originalReq = {});
+  var oRes = (req.originalRes = {});
+  var headers = req.headers;
+  var sessionInfo = common.getSessionInfo(headers);
+  if (!sessionInfo) {
+    var clientIp = headers[common.CLIENT_IP_HEADER];
+    req.clientIp = net.isIP(clientIp) ? clientIp : LOCALHOST;
+    req.clientPort = +headers[common.CLIENT_PORT_HEADER] || 0;
+    return;
+  }
+  var fullUrl = sessionInfo.fullUrl;
+  oReq.url = oReq.fullUrl = req.fullUrl = fullUrl;
+  oReq.extraUrl = sessionInfo._extraUrl;
+  oReq.ruleProtocol = sessionInfo._ruleProtocol;
+  req.isHttps = oReq.isHttps = HTTPS_RE.test(fullUrl);
+  req._isUpgrade = sessionInfo._isUpgrade === '1';
+  req.notDecompressed = oReq.notDecompressed = sessionInfo._noDecompress === '1';
+  req.fromTunnel = oReq.fromTunnel = sessionInfo.fromTunnel === '1';
+  req.fromComposer = oReq.fromComposer = sessionInfo.fromComposer === '1';
+  oReq.existsCustomCert = sessionInfo._existsCustomCert == '1';
+  oReq.isUIRequest = req.isUIRequest = sessionInfo._isUIRequest == '1';
+  oReq.enableCapture = sessionInfo._enableCapture == '1';
+  oReq.isFromPlugin = req.fromPlugin = oReq.fromPlugin = sessionInfo.isPluginReq == '1';
+  req[clientIpKey] = req.clientIp = oReq.clientIp = sessionInfo.clientIp || LOCALHOST;
+  req[clientPortKey] = req.clientPort = oReq.clientPort = +sessionInfo.clientPort || 0;
+  req[remoteAddrKey] = oReq.remoteAddress = sessionInfo._remoteAddr || LOCALHOST;
+  req[remotePortKey] = oReq.remotePort = +sessionInfo._remotePort || 0;
+  oReq.isHttp2 = oReq.isH2 = !!headers[common.ALPN_PROTOCOL_HEADER];
+  oReq.relativeUrl = sessionInfo._relativeUrl;
+  oReq.ruleUrl = sessionInfo._ruleUrl;
+  oReq.realUrl = sessionInfo._finalUrl || oReq.url;
+  oReq.sniValue = sessionInfo.sniRuleValue;
+  oReq.pipeValue = sessionInfo._pipeValue;
+  oReq.hostValue = sessionInfo.host;
+  oReq.proxyValue = sessionInfo.proxy;
+  oReq.pacValue = sessionInfo.pac;
+  oReq.globalValue = sessionInfo.globalValue;
+  oReq.servername = oReq.serverName = sessionInfo.serverName;
+  oReq.commonName = sessionInfo.commonName;
+  oReq.method = sessionInfo.method || 'GET';
+  oReq.serverIp = oRes.serverIp = sessionInfo.hostIp;
+  oReq.statusCode = oRes.statusCode = sessionInfo._statusCode;
+  oReq.ruleValue = sessionInfo._ruleValue;
+  oReq.pluginVars = getPluginVars(sessionInfo._pluginVarsValue);
+  oReq.globalPluginVars = getPluginVars(sessionInfo._globalPluginVarsValue);
+
+  var originHost = headers[common.ORIGIN_HOST_HEADER]; // for web ui;
+  oReq.originHost = common.isString(originHost) ? originHost : '';
+
+  var pattern = sessionInfo._rawPattern;
+  if (pattern && pattern[1] === ',') {
+    oReq.isRexExp = oReq.isRegExp = pattern[0] === '1';
+    oReq.pattern = pattern.substring(2);
+  }
+  var sniType = sessionInfo._sniType;
+  var isSNI = !sniType;
+  if (sniType && sniType === '1') {
+    isSNI = true;
+    req.isHttpsServer = true;
+  }
+  req.useSNI = oReq.useSNI = req.isSNI = oReq.isSNI = isSNI;
+  oReq.headers = headers;
+
+  var certCacheInfo = sessionInfo.hasCertCache;
+  oReq.certCacheName = certCacheInfo;
+  oReq.certCacheTime = 0;
+  if (certCacheInfo) {
+    var sepIndex = certCacheInfo.indexOf('+');
+    if (sepIndex !== -1) {
+      oReq.certCacheName = certCacheInfo.substring(0, sepIndex);
+      oReq.certCacheTime = parseInt(certCacheInfo.substring(sepIndex + 1)) || 0;
+    }
+  }
+  return compat.compatHeaders(req, sessionInfo);
 };
 
 var initState = function (req, name) {
@@ -410,11 +480,9 @@ var ADDITIONAL_FIELDS = [
   'sessionStorage'
 ];
 
-function getPluginVars(req, key) {
-  var value = req.headers[key];
+function getPluginVars(value) {
   value = base64ToBuffer(value);
   if (value) {
-    delete req.headers[key];
     try {
       value = JSON.parse(value.toString());
       if (Array.isArray(value)) {
@@ -448,92 +516,17 @@ var initReq = function (req, res, isServer) {
     return getFrames(req, cb);
   };
 
-  var reqId = getValue(req, pluginOpts.REQ_ID_HEADER);
-  var oReq = (req.originalReq = {});
-  var oRes = (req.originalRes = {});
-  setContext(req);
-  oReq.clientIp = req.clientIp;
+  var sessionInfo = setContext(req) || {};
+  var oReq = req.originalReq;
+  var reqId = sessionInfo.reqId;
   if (isServer) {
-    var parseStatus = req.headers[pluginOpts.CUSTOM_PARSER_HEADER];
-    req.customParser = oReq.customParser = notEmptyStr(parseStatus);
+    var parseStatus = sessionInfo.customParser;
+    req.customParser = oReq.customParser = !!parseStatus;
     req.customParser && addParserApi(req, res, parseStatus, reqId);
   }
-  var conf = pluginOpts.config;
   req[REQ_ID_KEY] = oReq.id = reqId;
   addSessionStorage(req, reqId);
-  oReq.isHttp2 = oReq.isH2 = !!req.headers[conf.ALPN_PROTOCOL_HEADER];
-  oReq.existsCustomCert = req.headers[pluginOpts.CUSTOM_CERT_HEADER] == '1';
-  oReq.isUIRequest = req.isUIRequest =
-    req.headers[pluginOpts.UI_REQUEST_HEADER] == '1';
-  oReq.enableCapture = req.headers[pluginOpts.ENABLE_CAPTURE_HEADER] == '1';
-  oReq.isFromPlugin = req.fromPlugin = oReq.fromPlugin = req.headers[pluginOpts.PLUGIN_REQUEST_HEADER] == '1';
-  oReq.ruleValue = getValue(req, pluginOpts.RULE_VALUE_HEADER);
-  oReq.ruleUrl = getValue(req, pluginOpts.RULE_URL_HEADER);
-  oReq.pipeValue = getValue(req, pluginOpts.PIPE_VALUE_HEADER);
-  oReq.sniValue = getValue(req, pluginOpts.SNI_VALUE_HEADER);
-  oReq.hostValue = getValue(req, pluginOpts.HOST_VALUE_HEADER);
-  oReq.extraUrl = getValue(req, pluginOpts.EXTRA_URL_HEADER);
-  var fullUrl = getValue(req, pluginOpts.FULL_URL_HEADER);
-  var pattern = getValue(req, 'x-whistle-raw-pattern_');
-  oReq.url = oReq.fullUrl = req.fullUrl = fullUrl;
-  req.isHttps = oReq.isHttps = HTTPS_RE.test(fullUrl);
-  oReq.remoteAddress = req.headers[REMOTE_ADDR_HEAD] || '127.0.0.1';
-  oReq.remotePort = parseInt(req.headers[REMOTE_PORT_HEAD], 10) || 0;
-  req.notDecompressed = oReq.notDecompressed = req.headers['x-whistle-disable-ws-decompress'] === '1';
-  req.fromTunnel = oReq.fromTunnel = req.headers[FROM_TUNNEL_HEADER] === '1';
-  delete req.headers[FROM_TUNNEL_HEADER];
-  delete req.headers[REMOTE_ADDR_HEAD];
-  delete req.headers[REMOTE_PORT_HEAD];
-  if (pattern) {
-    delete req.headers['x-whistle-raw-pattern_'];
-    if (pattern[1] === ',') {
-      oReq.isRexExp = oReq.isRegExp = pattern[0] === '1';
-      oReq.pattern = pattern.substring(2);
-    }
-  }
-  var from = req.headers[REQ_FROM_HEADER];
-  req.fromComposer = oReq.fromComposer = from === 'W2COMPOSER';
-  req.fromInternalPath = oReq.fromInternalPath = from === 'W2INTERNAL_PATH';
-  oReq.originHost = req.headers['x-whistle-origin-host']; // for web ui
-  oReq.servername = oReq.serverName = getValue(
-    req,
-    pluginOpts.SERVER_NAME_HEAD
-  );
-  var certCacheInfo = getValue(req, pluginOpts.CERT_CACHE_INFO);
-  oReq.certCacheName = certCacheInfo;
-  oReq.certCacheTime = 0;
-  if (certCacheInfo) {
-    var sepIndex = certCacheInfo.indexOf('+');
-    if (sepIndex !== -1) {
-      oReq.certCacheName = certCacheInfo.substring(0, sepIndex);
-      oReq.certCacheTime = parseInt(certCacheInfo.substring(sepIndex + 1)) || 0;
-    }
-  }
-  var sniType = req.headers[SNI_TYPE_HEADER];
-  var isSNI;
-  if (sniType) {
-    delete req.headers[SNI_TYPE_HEADER];
-    if (sniType === '1') {
-      isSNI = true;
-      req.isHttpsServer = true;
-    }
-  } else {
-    isSNI = true;
-  }
-  req.useSNI = oReq.useSNI = req.isSNI = oReq.isSNI = isSNI;
-  oReq.commonName = getValue(req, pluginOpts.COMMON_NAME_HEAD);
-  oReq.realUrl = getValue(req, pluginOpts.REAL_URL_HEADER) || oReq.url;
-  oReq.relativeUrl = getValue(req, pluginOpts.RELATIVE_URL_HEADER);
-  oReq.method = getValue(req, pluginOpts.METHOD_HEADER) || 'GET';
-  oReq.clientPort = getValue(req, pluginOpts.CLIENT_PORT_HEAD);
-  oReq.globalValue = getValue(req, pluginOpts.GLOBAL_VALUE_HEAD);
-  oReq.proxyValue = getValue(req, pluginOpts.PROXY_VALUE_HEADER);
-  oReq.pacValue = getValue(req, pluginOpts.PAC_VALUE_HEADER);
-  oReq.pluginVars = getPluginVars(req, PLUGIN_VARS_HEAD);
-  oReq.globalPluginVars = getPluginVars(req, GLOBAL_PLUGIN_VARS_HEAD);
-  oReq.serverIp = oRes.serverIp = getValue(req, pluginOpts.HOST_IP_HEADER) || '';
-  oReq.statusCode = oRes.statusCode = getValue(req, pluginOpts.STATUS_CODE_HEADER);
-  oReq.headers = extractHeaders(req, pluginKeyMap);
+  oReq.clientId = String(req.headers[common.CLIENT_ID_HEADER] || '');
 };
 var getOptions = function (opts, binary, toServer) {
   if (opts) {
@@ -821,7 +814,7 @@ var initConnectReq = function (req, res) {
       'Content-Length: ' + length,
       'Proxy-Agent: ' + pluginOpts.shortName
     ];
-    if (err || !cb || !req.headers['x-whistle-request-tunnel-ack']) {
+    if (err || !cb || !req.headers[common.ACK_HEADER]) {
       resCtn.push('\r\n', body);
       res.write(resCtn.join('\r\n'));
       return cb && cb();
@@ -865,13 +858,6 @@ function getHookName(req) {
   return typeof name === 'string' ? name : null;
 }
 
-function isUpgrade(req) {
-  if (req.headers[UPGRADE_HEADER]) {
-    delete req.headers[UPGRADE_HEADER];
-    return true;
-  }
-}
-
 function handleError(socket, sender, receiver) {
   var emitError = function (err) {
     if (socket._emittedError) {
@@ -903,7 +889,10 @@ function getCustomBody(body, req, cb) {
     return handleCb();
   }
   var encoding = headers['content-encoding'];
-  body = common.toBuffer(body, req) || '';
+  if (body && typeof body === 'object' && common.isUrlEncoded(req)) {
+    body = qs.stringify(body);
+  }
+  body = toBuffer(body) || '';
   if (!GZIP_RE.test(encoding)) {
     return handleCb();
   }
@@ -919,7 +908,7 @@ function wrapTunnelWriter(socket, toServer) {
   var sender = wsParser.getSender(socket, toServer);
   handleError(socket, sender);
   socket.write = function (chunk, encoding, cb) {
-    if ((chunk = common.toBuffer(chunk))) {
+    if ((chunk = toBuffer(chunk))) {
       if (encoding === 'binary') {
         return write.call(this, chunk, encoding, cb);
       }
@@ -932,7 +921,7 @@ function wrapTunnelWriter(socket, toServer) {
   };
   if (toServer) {
     socket.write = function (chunk, opts, cb) {
-      if ((chunk = common.toBuffer(chunk))) {
+      if ((chunk = toBuffer(chunk))) {
         if (opts === 'binary') {
           return write.call(this, chunk, opts, cb);
         }
@@ -940,12 +929,12 @@ function wrapTunnelWriter(socket, toServer) {
       }
     };
     socket.writeText = function (chunk) {
-      if ((chunk = common.toBuffer(chunk))) {
+      if ((chunk = toBuffer(chunk))) {
         sender.send(chunk, getOptions(null, false, true));
       }
     };
     socket.writeBin = function (chunk) {
-      if ((chunk = common.toBuffer(chunk))) {
+      if ((chunk = toBuffer(chunk))) {
         sender.send(chunk, getOptions(null, true, true));
       }
     };
@@ -957,7 +946,7 @@ function wrapTunnelWriter(socket, toServer) {
     };
   } else {
     socket.write = function (chunk, encoding, cb) {
-      if ((chunk = common.toBuffer(chunk))) {
+      if ((chunk = toBuffer(chunk))) {
         if (encoding === 'binary') {
           return write.call(this, chunk, encoding, cb);
         }
@@ -1048,7 +1037,7 @@ function addFrameHandler(req, socket, maxWsPayload, fromClient, toServer) {
     emit.call(socket, 'data', chunk, opts);
   };
   socket.write = function (chunk, opts, cb) {
-    if ((chunk = common.toBuffer(chunk))) {
+    if ((chunk = toBuffer(chunk))) {
       if (opts === 'binary') {
         return write.call(this, chunk, opts, cb);
       }
@@ -1056,12 +1045,12 @@ function addFrameHandler(req, socket, maxWsPayload, fromClient, toServer) {
     }
   };
   socket.writeText = function (chunk) {
-    if ((chunk = common.toBuffer(chunk))) {
+    if ((chunk = toBuffer(chunk))) {
       sender.send(chunk, getOptions(null, false, toServer));
     }
   };
   socket.writeBin = function (chunk) {
-    if ((chunk = common.toBuffer(chunk))) {
+    if ((chunk = toBuffer(chunk))) {
       sender.send(chunk, getOptions(null, true, toServer));
     }
   };
@@ -1090,16 +1079,6 @@ function formatRawHeaders(headers, req) {
   return formatHeaders(headers, rawNames);
 }
 
-function extractHeaders(req, exlucdekyes) {
-  var headers = {};
-  Object.keys(req.headers).forEach(function (key) {
-    if (!exlucdekyes[key]) {
-      headers[key] = req.headers[key];
-    }
-  });
-  return headers;
-}
-
 function addErrorHandler(req, client) {
   var done;
   client.on('error', function (err) {
@@ -1137,6 +1116,7 @@ function isBodyData(result) {
 
 module.exports = async function (options, callback) {
   var root = options.value;
+  options.CLIENT_ID_HEADER = common.CLIENT_ID_HEADER;
   options.extractSaz = extractSaz;
   options.generateSaz = generateSaz;
   options.zipBody = getCustomBody;
@@ -1162,7 +1142,6 @@ module.exports = async function (options, callback) {
   options.parseUrl = parseUrl;
   options.formatHeaders = formatRawHeaders;
   options.wsParser = wsParser;
-  options.RULE_PROTO_HEADER = 'x-whistle-rule-proto';
   pluginVersion = '@' + options.version;
   var wrapWsReader = function (socket, maxPayload) {
     wrapTunnelReader(socket, true, maxPayload);
@@ -1206,6 +1185,7 @@ module.exports = async function (options, callback) {
   var boundPort = config.port;
   var PLUGIN_HOOKS = config.PLUGIN_HOOKS;
   var RES_RULES_HEAD = config.RES_RULES_HEAD;
+  var SHOW_LOGIN_BOX = config.SHOW_LOGIN_BOX;
   var setResRules = function(headers, obj) {
     var rules = formatRules(obj);
     if (!rules) {
@@ -1218,34 +1198,19 @@ module.exports = async function (options, callback) {
     });
     headers[RES_RULES_HEAD] =  encodeURIComponent(obj);
   };
-  var SHOW_LOGIN_BOX = options.SHOW_LOGIN_BOX;
-  FROM_TUNNEL_HEADER = options.FROM_TUNNEL_HEADER;
-  SNI_TYPE_HEADER = config.SNI_TYPE_HEADER;
-  REMOTE_ADDR_HEAD = config.REMOTE_ADDR_HEAD;
-  REMOTE_PORT_HEAD = config.REMOTE_PORT_HEAD;
+  CLIENT_INFO_HEADER = config.CLIENT_INFO_HEADER;
   PROXY_ID_HEADER = config.PROXY_ID_HEADER;
-  REQ_FROM_HEADER = config.REQ_FROM_HEADER;
-  options.REQ_FROM_HEADER = REQ_FROM_HEADER; // 兼容老逻辑
   options.getTempFilePath = function(filePath) {
     if (common.TEMP_PATH_RE.test(filePath)) {
       return path.join(config.TEMP_FILES_PATH, RegExp.$1);
     }
   };
 
-  GLOBAL_PLUGIN_VARS_HEAD = options.GLOBAL_PLUGIN_VARS_HEAD;
-  PLUGIN_VARS_HEAD = options.PLUGIN_VARS_HEAD;
-  UPGRADE_HEADER = config.UPGRADE_HEADER;
-  delete config.UPGRADE_HEADER;
   delete config.PLUGIN_HOOKS;
   delete config.PROXY_ID_HEADER;
-  delete config.REMOTE_ADDR_HEAD;
-  delete config.REMOTE_PORT_HEAD;
+  delete config.CLIENT_INFO_HEADER;
   delete config.RES_RULES_HEAD;
-  delete config.SNI_TYPE_HEADER;
-  delete options.GLOBAL_PLUGIN_VARS_HEAD;
-  delete options.PLUGIN_VARS_HEAD;
-  delete options.FROM_TUNNEL_HEADER;
-  delete options.SHOW_LOGIN_BOX;
+  delete config.SHOW_LOGIN_BOX;
 
   PLUGIN_HOOK_NAME_HEADER = config.PLUGIN_HOOK_NAME_HEADER;
   options.shortName = pluginName.substring(pluginName.indexOf('/') + 1);
@@ -1264,12 +1229,6 @@ module.exports = async function (options, callback) {
   sharedStorage = getSharedStorage(sharedFilePath);
   options.sharedStorage = sharedStorage;
   pluginOpts = options;
-  Object.keys(options).forEach(function (key) {
-    key = options[key];
-    if (typeof key === 'string' && !key.indexOf('x-whistle-')) {
-      pluginKeyMap[key] = 1;
-    }
-  });
   var authKey = config.authKey;
   delete config.authKey;
   var headers = {
@@ -1296,7 +1255,7 @@ module.exports = async function (options, callback) {
     alpnProtocol
   ) {
     var type = uri && typeof uri;
-    var headers, method;
+    var headers, method, body;
     if (type !== 'string') {
       if (type === 'object') {
         if (uri.headers) {
@@ -1304,6 +1263,7 @@ module.exports = async function (options, callback) {
         }
         method = typeof uri.method === 'string' ? uri.method : null;
         opts = opts || uri;
+        body = common.hasRequestBody(req) ? toBuffer(uri.body || uri.data) : null;
         uri = uri.uri || uri.url || uri.href || curUrl;
       } else {
         if (type === 'function') {
@@ -1317,7 +1277,7 @@ module.exports = async function (options, callback) {
       }
     }
     uri = parseUrl(uri);
-    headers = headers || extractHeaders(req, pluginKeyMap);
+    headers = headers || req.headers;
     if (isWs) {
       headers.upgrade = headers.upgrade || 'websocket';
       headers.connection = 'Upgrade';
@@ -1335,14 +1295,11 @@ module.exports = async function (options, callback) {
       headers[PROXY_ID_HEADER] = 1;
       uri.host = boundIp;
       uri.port = boundPort;
-      if (req.originalReq) {
-        headers[REMOTE_ADDR_HEAD] = req.originalReq.remoteAddress;
-        headers[REMOTE_PORT_HEAD] = req.originalReq.remotePort;
-      }
+      addRemoteInfo(req, headers);
       if (isHttps) {
-        headers[config.HTTPS_FIELD] = 1;
+        headers[common.HTTPS_FIELD] = 1;
         if (alpnProtocol) {
-          headers[config.ALPN_PROTOCOL_HEADER] = alpnProtocol;
+          headers[common.ALPN_PROTOCOL_HEADER] = alpnProtocol;
         }
       }
       isHttps = false;
@@ -1352,7 +1309,7 @@ module.exports = async function (options, callback) {
       if (isHttps) {
         if (opts.internalRequest) {
           isHttps = false;
-          headers[config.HTTPS_FIELD] = 1;
+          headers[common.HTTPS_FIELD] = 1;
         } else {
           uri.protocol = 'https:';
         }
@@ -1361,7 +1318,7 @@ module.exports = async function (options, callback) {
     delete uri.hostname;
     uri.headers = formatRawHeaders(headers, req);
     uri.agent = false;
-    return [uri, cb, isHttps, opts];
+    return [uri, cb, isHttps, opts, body];
   };
 
   var authPort,
@@ -1852,12 +1809,11 @@ module.exports = async function (options, callback) {
               customHeaders[SHOW_LOGIN_BOX] = '1';
             }
             if (result === false) {
-              customHeaders['x-auth-status'] = '1';
+              customHeaders[common.AUTH_STATUS] = '1';
               if (location) {
                 customHeaders.location = location;
               } else if (htmlUrl) {
-                customHeaders['x-auth-html-url'] =
-                    encodeURIComponent(htmlUrl);
+                customHeaders[common.AUTH_URL] = encodeURIComponent(htmlUrl);
               } else if (typeof htmlBody === 'string') {
                 htmlBody = Buffer.from(htmlBody);
                 if (htmlBody.length > MAX_BODY_SIZE) {
@@ -2052,13 +2008,11 @@ module.exports = async function (options, callback) {
         switch (getHookName(req)) {
         case PLUGIN_HOOKS.AUTH:
           if (authServer) {
-            setContext(req);
             authServer.emit('request', req, res);
           }
           break;
         case PLUGIN_HOOKS.SNI:
           if (sniServer) {
-            setContext(req);
             sniServer.emit('request', req, res);
           }
           break;
@@ -2071,7 +2025,7 @@ module.exports = async function (options, callback) {
         case PLUGIN_HOOKS.HTTP:
           if (httpServer) {
             initReq(req, res, true);
-            var alpnProtocol = req.headers[config.ALPN_PROTOCOL_HEADER];
+            var alpnProtocol = req.headers[common.ALPN_PROTOCOL_HEADER];
             var curUrl = req.originalReq.realUrl;
             var svrRes = '';
             var reqRules, resRules;
@@ -2115,25 +2069,30 @@ module.exports = async function (options, callback) {
               uri = args[0];
               cb = args[1];
               opts = args[3];
+              var reqBuff = args[4];
               req.setRules = req.setReqRules = res.setReqRules = noop;
               setReqRules(uri, getReqRules(opts, reqRules));
               reqRules = null;
-              var client = (args[2] ? httpsRequest : httpRequest)(
-                    uri,
-                    function (_res) {
-                      svrRes = _res;
-                      res.once('_wroteHead', function () {
-                        appendTrailers(_res, res, opts && opts.trailers, req);
-                      });
-                      if (typeof cb === 'function') {
-                        cb.call(this, _res);
-                      } else {
-                        res.writeHead();
-                        _res.pipe(res);
-                      }
-                    }
+              if (reqBuff && (!uri.headers || uri.headers['content-length'] != null)) {
+                uri.headers = uri.headers || {};
+                uri.headers['content-length'] = reqBuff.length;
+              }
+              var request = args[2] ? httpsRequest : httpRequest;
+              var client = request(uri, function (_res) {
+                svrRes = _res;
+                res.once('_wroteHead', function () {
+                  appendTrailers(_res, res, opts && opts.trailers, req);
+                });
+                if (typeof cb === 'function') {
+                  cb.call(this, _res);
+                } else {
+                  res.writeHead();
+                  _res.pipe(res);
+                }
+              }
                   );
               addErrorHandler(req, client);
+              reqBuff && client.end(reqBuff);
               return client;
             };
             req.passThrough = function (uri, newTrailers) {
@@ -2158,11 +2117,7 @@ module.exports = async function (options, callback) {
               var _request = function(reqBody, _uri) {
                 var client = req.request(_uri || uri, function (_res) {
                   var _response = function(resBody, trailers) {
-                    res.writeHead(
-                      _res.statusCode,
-                      _res.statusMessage,
-                      _res.headers
-                    );
+                    res.writeHead(_res.statusCode,  _res.statusMessage, _res.headers);
                     appendTrailers(_res, res, trailers || newTrailers, req);
                     if (resBody === undefined) {
                       _res.pipe(res);
@@ -2186,7 +2141,7 @@ module.exports = async function (options, callback) {
                   if (transformRes) {
                     transformRes(common.wrapReadStream(_res), handleNextRes);
                   } else if (handleRes) {
-                    common.readStream(_res, function(rawBuffer) {
+                    readStream(_res, function(rawBuffer) {
                       resBuf = rawBuffer;
                       handleRes(rawBuffer, handleNextRes, _res);
                     });
@@ -2215,7 +2170,7 @@ module.exports = async function (options, callback) {
               if (transformReq) {
                 transformReq(common.wrapReadStream(req), handleNextReq);
               } else if (handleReq) {
-                common.readStream(req, function(rawBuffer) {
+                readStream(req, function(rawBuffer) {
                   reqBuf = rawBuffer;
                   handleReq(rawBuffer, handleNextReq, req);
                 });
@@ -2285,11 +2240,7 @@ module.exports = async function (options, callback) {
               resRules = rules;
               return true;
             };
-            req.writeHead = socket.writeHead = function (
-                  code,
-                  msg,
-                  headers
-                ) {
+            req.writeHead = socket.writeHead = function (code, msg, headers) {
               code = code > 0 ? code : svrRes.statusCode || 101;
               if (msg && typeof msg !== 'string') {
                 headers = headers || msg;
@@ -2443,7 +2394,6 @@ module.exports = async function (options, callback) {
       }
 
       server.on('connect', function (req, socket, head) {
-        var isUp = isUpgrade(req);
         var pipeServer;
         switch (getHookName(req)) {
         case PLUGIN_HOOKS.REQ_READ:
@@ -2482,7 +2432,7 @@ module.exports = async function (options, callback) {
               socket.setRules = req.setResRules = socket.setResRules = noop;
               req.writeHead = socket.writeHead = noop;
               req.connect = function (uri, cb, opts) {
-                var headers = extractHeaders(req, pluginKeyMap);
+                var headers = req.headers;
                 var policy = headers['x-whistle-policy'];
                 if (common.isTunnelHost(uri)) {
                   headers.host = uri;
@@ -2518,11 +2468,7 @@ module.exports = async function (options, callback) {
                   headers[PROXY_ID_HEADER] = req[REQ_ID_KEY];
                   uri.host = boundIp;
                   uri.port = boundPort;
-                  if (req.originalReq) {
-                    headers[REMOTE_ADDR_HEAD] =
-                          req.originalReq.remoteAddress;
-                    headers[REMOTE_PORT_HEAD] = req.originalReq.remotePort;
-                  }
+                  addRemoteInfo(req, headers);
                 } else {
                   uri.host = opts.host;
                   uri.port = opts.port > 0 ? opts.port : 80;
@@ -2542,7 +2488,7 @@ module.exports = async function (options, callback) {
                     });
                     return;
                   }
-                  if (_res.headers['x-whistle-allow-tunnel-ack']) {
+                  if (_res.headers[common.ALLOW_ACK]) {
                     svrSock.write('1');
                   }
                   if (typeof cb === 'function') {
@@ -2567,12 +2513,12 @@ module.exports = async function (options, callback) {
           }
           break;
         case PLUGIN_HOOKS.TUNNEL_REQ_READ:
-          pipeServer = isUp ? wsReqRead : tunnelReqRead;
+          initConnectReq(req, socket);
+          pipeServer = req._isUpgrade ? wsReqRead : tunnelReqRead;
           if (pipeServer) {
-            initConnectReq(req, socket);
             req.sendEstablished(function () {
               socket.headers = req.headers;
-              if (isUp ? wsReqWrite : tunnelReqWrite) {
+              if (req._isUpgrade ? wsReqWrite : tunnelReqWrite) {
                 wrapTunnelWriter(socket);
               }
               pipeServer.emit('connect', req, socket, head);
@@ -2580,11 +2526,11 @@ module.exports = async function (options, callback) {
           }
           break;
         case PLUGIN_HOOKS.TUNNEL_REQ_WRITE:
-          pipeServer = isUp ? wsReqWrite : tunnelReqWrite;
+          initConnectReq(req, socket);
+          pipeServer = req._isUpgrade ? wsReqWrite : tunnelReqWrite;
           if (pipeServer) {
-            initConnectReq(req, socket);
             req.sendEstablished(function () {
-              if (isUp ? wsReqRead : tunnelReqRead) {
+              if (req._isUpgrade ? wsReqRead : tunnelReqRead) {
                 wrapTunnelReader(socket);
               }
               pipeServer.emit('connect', req, socket, head);
@@ -2592,12 +2538,12 @@ module.exports = async function (options, callback) {
           }
           break;
         case PLUGIN_HOOKS.TUNNEL_RES_READ:
-          pipeServer = isUp ? wsResRead : tunnelResRead;
+          initConnectReq(req, socket);
+          pipeServer = req._isUpgrade ? wsResRead : tunnelResRead;
           if (pipeServer) {
-            initConnectReq(req, socket);
             req.sendEstablished(function () {
               socket.headers = req.headers;
-              if (isUp ? wsResWrite : tunnelResWrite) {
+              if (req._isUpgrade ? wsResWrite : tunnelResWrite) {
                 wrapTunnelWriter(socket);
               }
               pipeServer.emit('connect', req, socket, head);
@@ -2605,11 +2551,11 @@ module.exports = async function (options, callback) {
           }
           break;
         case PLUGIN_HOOKS.TUNNEL_RES_WRITE:
-          pipeServer = isUp ? wsResWrite : tunnelResWrite;
+          initConnectReq(req, socket);
+          pipeServer = req._isUpgrade ? wsResWrite : tunnelResWrite;
           if (pipeServer) {
-            initConnectReq(req, socket);
             req.sendEstablished(function () {
-              if (isUp ? wsResRead : tunnelResRead) {
+              if (req._isUpgrade ? wsResRead : tunnelResRead) {
                 wrapTunnelReader(socket);
               }
               pipeServer.emit('connect', req, socket, head);
@@ -2627,6 +2573,40 @@ module.exports = async function (options, callback) {
   initProxy(async function(proxy) {
     options.connect = proxy.connect;
     options.request = proxy.request;
+    options.streamUtils = {
+      readRawBuffer: readStream,
+      readBuffer: function(stream, cb) {
+        readStream(stream, function() {
+          stream.getBuffer(function(err, buffer) {
+            if (err) {
+              return stream.emit('error', err);
+            }
+            cb(buffer);
+          });
+        });
+      },
+      readText: function(stream, cb) {
+        readStream(stream, function() {
+          stream.getText(function(err, buffer) {
+            if (err) {
+              return stream.emit('error', err);
+            }
+            cb(buffer);
+          });
+        });
+      },
+      readJson: function(stream, cb) {
+        readStream(stream, function() {
+          stream.getJson(function(err, data) {
+            if (err) {
+              return stream.emit('error', err);
+            }
+            cb(data);
+          });
+        });
+      }
+    };
+    options.readStream = readStream;
     options.requestInternal = function(options, cb) {
       if (typeof options === 'string') {
         options = { url: options };
@@ -2641,6 +2621,8 @@ module.exports = async function (options, callback) {
         port: config.port
       }), cb);
     };
+    compat.compatKeys(options);
+    compat.compatKeys(config);
     var initial = loadModule(path.join(options.value, 'initial.js')) ||
     loadModule(path.join(options.value, 'initialize.js'));
     if (initial && typeof initial !== 'function') {