whistle 2.9.109 → 2.10.1

package/lib/plugins/module-paths.js

@@ -1,4 +1,5 @@
 var path = require('path');
+var common = require('../util/common');
 var config = require('../config');
 
 var PLUGIN_DIR_RE = /[/\\]whistle\.[a-z\d_-]+[/\\]?$/;
@@ -117,11 +118,9 @@ function formatPath(dir, prefix) {
     return null;
   }
   if (/(?:^|\/|\\)node_modules[\\\/]?$/.test(dir)) {
-    return dir.replace(/\\/g, '/');
+    return common.formatPathSep(dir);
   }
-  return path
-    .resolve(dir, typeof prefix === 'string' ? prefix : '', 'node_modules')
-    .replace(/\\/g, '/');
+  return common.formatPathSep(path.resolve(dir, typeof prefix === 'string' ? prefix : '', 'node_modules'));
 }
 
 function getGlobalDir() {

package/lib/plugins/proxy.js

@@ -93,12 +93,12 @@ function createSocket(opts, cb) {
   var clientIp = common.removeIPV6Prefix(opts.clientIp);
   var clientPort = opts.clientPort;
   if (clientIp && net.isIP(clientIp)) {
-    headers['x-forwarded-for'] = clientIp;
+    headers[common.CLIENT_IP_HEADER] = clientIp;
   }
   if (clientPort > 0 && clientPort < 65536) {
     headers['x-whistle-client-port'] = clientPort;
   }
-  headers['x-whistle-request-tunnel-ack'] = '1';
+  headers[common.ACK_HEADER] = '1';
   client = http.request({
     host: proxyIp,
     port: proxyPort,
@@ -110,15 +110,12 @@ function createSocket(opts, cb) {
   client.once('connect', function (res, socket) {
     socket.on('error', handleCb);
     if (res.statusCode !== 200) {
-      var err = new Error(
-        'Tunneling socket could not be established, statusCode=' +
-          res.statusCode
-      );
+      var err = new Error('Tunneling socket could not be established, statusCode=' + res.statusCode);
       err.statusCode = res.statusCode;
       socket.destroy();
       return handleCb(err);
     }
-    if (res.headers['x-whistle-allow-tunnel-ack']) {
+    if (res.headers[common.ALLOW_ACK]) {
       socket.write('1');
     }
     handleCb(null, socket, res);

package/lib/rules/index.js

@@ -55,6 +55,7 @@ exports.parse = rules.parse.bind(rules);
 exports.append = rules.append.bind(rules);
 exports.resolveSNICallback = rules.resolveSNICallback.bind(rules);
 exports.resolveHost = rules.resolveHost.bind(rules);
+exports.getGRuleList = rules.getGRuleList.bind(rules);
 exports.resolveInternalHost = rules.resolveInternalHost.bind(rules);
 exports.resolveProxy = rules.resolveProxy.bind(rules);
 exports.resolveEnable = rules.resolveEnable.bind(rules);
@@ -153,12 +154,11 @@ exports.getProxy = function (url, req, callback) {
   } else {
     proxy = resolveRulesFromList([pRules, rules, fRules, hRules], 'resolveProxy', req, hostValue);
   }
-  var proxyHostOnly = isLineProp(proxy, 'proxyHostOnly');
-  var proxyHost =
-    proxyHostOnly ||
-    util.isEnable(req, 'proxyHost') ||
-    isProxyEnable(req, 'proxyHost');
+  var proxyHostOnly;
+  var proxyHost = util.isEnable(req, 'proxyHost') || isProxyEnable(req, 'proxyHost');
   if (proxy) {
+    proxyHostOnly = isLineProp(proxy, 'proxyHostOnly');
+    proxyHost = proxyHost || proxyHostOnly;
     var protocol = proxy.matcher.substring(0, proxy.matcher.indexOf(':'));
     ignoreProxy =
       !filter['ignore:' + protocol] &&
@@ -252,14 +252,15 @@ exports.getProxy = function (url, req, callback) {
   if (!pacUrl) {
     return setHost() || callback();
   }
+  var auth;
   if (AUTH_RE.test(pacUrl)) {
-    var auth = RegExp.$1;
-    req._pacAuth = auth;
+    auth = RegExp.$1;
     pacUrl = pacUrl.substring(auth.length + 1);
   }
-  pacUrl = util.isUrl(pacUrl)
-    ? pacUrl
-    : util.join(pacRule.root, pacUrl);
+  if (!util.isUrl(pacUrl) && !(pacUrl = util.joinPath(pacRule.root, pacUrl))) {
+    return setHost() || callback();
+  }
+  req._pacAuth = auth;
   var pac = cachedPacs[pacUrl];
   if (pac) {
     delete cachedPacs[pacUrl];
@@ -476,43 +477,49 @@ function handleDynamicRules(script, req, res, cb) {
   }, null, null, null, req);
 }
 
-function resolveRulesFile(req, callback) {
-  if (req.rules.G) {
-    var varMap = {};
-    var globalValue;
-    var pList;
-    req.rules.G.list.forEach(function (item) {
-      if (item.matcher[0] !== 'P') {
-        if (!globalValue) {
-          globalValue = item;
-        }
+function resolvePluginVars(req, list) {
+  var varMap = {};
+  var globalValue;
+  var pList;
+  list.forEach(function (item) {
+    if (item.matcher[0] !== 'P') {
+      if (!globalValue) {
+        globalValue = item;
+      }
+      return;
+    }
+    var value = util.getMatcherValue(item);
+    var index = value.indexOf(PLUGIN_VAR_RE.test(value) ? '.' : '=');
+    if (index !== -1) {
+      var name = value.substring(0, index);
+      var plugin = getPluginName(name);
+      if (!plugin) {
         return;
       }
-      var value = util.getMatcherValue(item);
-      var index = value.indexOf(PLUGIN_VAR_RE.test(value) ? '.' : '=');
-      if (index !== -1) {
-        var name = value.substring(0, index);
-        var plugin = exports.getPlugin(name);
-        if (!plugin || !plugin.pluginVars) {
-          return;
-        }
-        value = value.substring(index + 1);
-        if (value) {
-          pList = pList || [];
-          pList.push(item);
-          var list = varMap[name] || [];
-          varMap[name] = list;
-          if (list.indexOf(value) === -1) {
-            list.push(value);
-          }
+      value = value.substring(index + 1);
+      if (value) {
+        pList = pList || [];
+        pList.push(item);
+        var list = varMap[name] || [];
+        varMap[name] = list;
+        if (list.indexOf(value) === -1) {
+          list.push(value);
         }
       }
-    });
-    req._pluginVars = varMap;
-    req.rules.P = pList;
-    req.rules.G = globalValue;
-    req.globalValue = util.getMatcherValue(globalValue);
-  }
+    }
+  });
+  req.rules = req.rules || {};
+  req._pluginVars = varMap;
+  req.rules.P = pList;
+  req.rules.G = globalValue;
+  req.globalValue = util.getMatcherValue(globalValue);
+}
+
+exports.resolvePluginVars = resolvePluginVars;
+
+exports.resolveRulesFile = function (req, callback) {
+  !req._resolvedG && req.rules.G && resolvePluginVars(req, req.rules.G.list);
+  req._resolvedG = true;
   var rule = req.rules.rulesFile;
   handleDynamicRules(rule, req, null, function (text, vals) {
     if (text) {
@@ -528,9 +535,8 @@ function resolveRulesFile(req, callback) {
     util.mergeRules(req, text);
     callback();
   });
-}
+};
 
-exports.resolveRulesFile = resolveRulesFile;
 exports.resolveResRulesFile = function (req, res, callback) {
   var rule = req.rules && req.rules.resScript;
   handleDynamicRules(
@@ -553,7 +559,7 @@ exports.resolveResRulesFile = function (req, res, callback) {
 function getValue(req, key, keep) {
   var value = req.headers[key];
   if (value) {
-    if (!keep && config.strict) {
+    if (!req.fromComposer && !keep && (config.strict || (!config.enableRequestHeaderRules && !config.multiEnv))) {
       value = null;
     } else {
       req.rulesHeaders[key] = value;
@@ -566,6 +572,10 @@ function getValue(req, key, keep) {
   return value;
 }
 
+function getPluginName(key) {
+  return exports.getPlugin(key);
+}
+
 function initHeaderRules(req, needBodyFilters) {
   if (req._bodyFilters !== undefined) {
     return;
@@ -597,8 +607,15 @@ function initHeaderRules(req, needBodyFilters) {
     }
   }
   var curVars = rules._globalPluginVars;
+  var globalVars = {};
   var value;
-  req._globalPluginVars = {};
+  req._globalPluginVars = globalVars;
+  Object.keys(curVars).forEach(function (key) {
+    if (getPluginName(key)) {
+      value = curVars[key];
+      globalVars[key] = value;
+    }
+  });
   if (ruleValue) {
     var file = 'Header Rules';
     var vals = util.toPrivateValues(util.parseJSON(kvHeader), file);
@@ -611,25 +628,11 @@ function initHeaderRules(req, needBodyFilters) {
       req._bodyFilters = rules._rules._bodyFilters.concat(bodyFilters);
     }
     var headerVars = rulesMgr._globalPluginVars;
-    var vars = extend({}, curVars, headerVars);
-    Object.keys(vars).forEach(function (key) {
-      var plugin = exports.getPlugin(key);
-      if (!plugin || !plugin.pluginVars) {
-        return;
-      }
-      var headerVal = headerVars[key];
-      var curVal = curVars[key];
-      if (curVal && headerVal) {
-        vars[key] = headerVal.concat(curVal);
-      }
-      value = vars[key];
-      req._globalPluginVars[key] = value;
-    });
-  } else {
-    Object.keys(curVars).forEach(function (key) {
-      if (!exports.getPlugin || exports.getPlugin(key)) {
-        value = curVars[key];
-        req._globalPluginVars[key] = value;
+    Object.keys(headerVars).forEach(function (key) {
+      var headerVal = getPluginName(key) && headerVars[key];
+      if (headerVal) {
+        var curVal = curVars[key];
+        globalVars[key] = curVal ? curVal.concat(headerVal) : headerVal;
       }
     });
   }

package/lib/rules/protocols.js

@@ -152,9 +152,13 @@ var aliasProtocols = {
   includeFilter: 'filter',
   P: 'G'
 };
+var protocolsWithoutG = protocols.slice(1);
 var reqProtocols = protocols.filter(function (name) {
   return pureResProtocols.indexOf(name) === -1;
 });
+var reqProtosWithoutG = reqProtocols.filter(function (name) {
+  return name !== 'G';
+});
 
 var RULE_PROTO_RE = /^([\w.-]+):\/\//;
 
@@ -222,8 +226,10 @@ exports.multiMatchs = [
   'resScript'
 ];
 exports.protocols = protocols;
+exports.protocolsWithoutG = protocolsWithoutG;
 exports.pureResProtocols = pureResProtocols;
 exports.reqProtocols = reqProtocols;
+exports.reqProtosWithoutG = reqProtosWithoutG;
 exports.resProtocols = resProtocols;
 exports.aliasProtocols = aliasProtocols;
 

package/lib/rules/rules.js

@@ -27,7 +27,9 @@ var ROOT_PLUGIN_RE = /[\\/]whistle\.([a-z\d_-]+)$/;
 var TPL_KEY_RE = /\{\{\s*%?ruleValue\s*\}\}/g;
 var END_RE = /\$$/;
 var protocols = protoMgr.protocols;
+var protocolsWithoutG = protoMgr.protocolsWithoutG;
 var reqProtocols = protoMgr.reqProtocols;
+var reqProtosWithoutG = protoMgr.reqProtosWithoutG;
 var pureResProtocols = protoMgr.pureResProtocols;
 var multiMatchs = protoMgr.multiMatchs;
 var aliasProtocols = protoMgr.aliasProtocols;
@@ -36,7 +38,7 @@ var PROXY_RE =
   /^x?(socks|proxy|https?-proxy|internal-proxy|internal-https?-proxy|https2http-proxy|http2https-proxy):\/\//;
 var VAR_RE = /\${([^{}]+)}/g;
 var NO_SCHEMA_RE = /^\/\/[^/]/;
-var WILDCARD_RE = /^(\$?((?:https?|wss?|tunnel):\/\/)?([^/?]+))/;
+var WILDCARD_RE = /^(\$?((?:[a-z*]+):\/\/)?([^/?]*))/;
 var RULE_KEY_RE = /^\$\{(\S+)\}$/;
 var VALUE_KEY_RE = /^\{(\S+)\}$/;
 var LINE_END_RE = /\n|\r\n|\r/;
@@ -44,10 +46,9 @@ var LOCAL_RULE_RE =
   /^https?:\/\/local\.(?:whistlejs\.com|wproxy\.org)(:realPort)?(?:\/|\?|$)/;
 var PATH_RE = /^<.*>$/;
 var VALUE_RE = /^\(.*\)$/;
-var REG_URL_RE = /^((?:[\w.*-]+:|\*+)?\/\/)?([^/?]*)/;
-var LIKE_REG_URL_RE = /^(?:(?:https?|wss?|tunnel):\/\/)?\*+\/[^?*]*\*/;
-var LIKE_REG_URL_RE2 =
-  /^(?:(?:https?|wss?|tunnel):\/\/)?\.[^./?]+\.[^/?]+\/[^?*]*\*/;
+var REG_URL_RE = /^((?:[a-z*]+:)?\/\/)?([^/?]*)/;
+var LIKE_REG_URL_RE = /^(?:(?:(?:https?|wss?|tunnel):)?\/\/)?\*+\/[^?*]*\*/;
+var LIKE_REG_URL_RE2 = /^(?:(?:(?:https?|wss?|tunnel):)?\/\/)?\.[^./?]+\.[^/?]+\/[^?*]*\*/;
 var DOT_DOMAIN_RE = /^\.[^./?]+\.[^/?]/;
 var REG_URL_SYMBOL_RE = /^(\^+)/;
 var PATTERN_FILTER_RE = /^(?:filter|ignore):\/\/(.+)\/(i)?$/;
@@ -93,13 +94,13 @@ var ENABLE_PROXY_RE =
 var PLUGIN_VAR_RE = /^%([a-z\d_\-]+)([=.])([^\s]*)/;
 var EXACT_IGNORE_RE = /^ignore:\/\/(pattern|matcher|operator|operation)[=:](.+)$/;
 var EXACT_SKIP_RE = /^(pattern|matcher|operator|operation)[=:](.+)$/;
-var FILE_RPOTO_RE = /^x?((raw)?file|tpl|jsonp|dust):\/\//;
+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 mIndex = 0;
 var mNow = Date.now();
-var IS_JSON = typeof Symbol === 'undefined' ? '_isJson' : Symbol('_isJson'); // eslint-disable-line
+var IS_JSON = Symbol('isJson');
 
 function getMFlag() {
   if (mIndex === Number.MAX_SAFE_INTEGER) {
@@ -181,7 +182,7 @@ function isRegUrl(url, isCheck) {
   if (!protocol || protocol === '//') {
     protocol = '[a-z]+://';
   } else {
-    protocol = util.escapeRegExp(protocol).replace(/\*+/, '([a-z:]+)');
+    protocol = util.escapeRegExp(protocol).replace(/\*+/, '([a-z:]*)');
   }
   if (startWithDot) {
     domain = domain.substring(1);
@@ -290,7 +291,7 @@ function getValue(url, start, end, lineProps) {
 }
 
 function getFiles(path) {
-  return FILE_RPOTO_RE.test(path) ? util.removeProtocol(path, true).split('|') : null;
+  return FILE_PROTO_RE.test(path) ? util.removeProtocol(path, true).split('|') : null;
 }
 
 function setProtocol(target, source) {
@@ -333,7 +334,7 @@ function joinQuery(query1, query2) {
       : '&';
   return query1 + sep + query2;
 }
-function join(a, b) {
+function joinUrl(a, b) {
   if (!a || !b) {
     return a + b;
   }
@@ -789,7 +790,7 @@ function getValueFor(key, vals, file) {
     return;
   }
   var key1 = util.getInlineKey(key, file);
-  var val = vals && vals[key1];
+  var val = vals ? vals[key1] : undefined;
   if (val !== undefined) {
     val = vals[key1] = val && typeof val == 'object' ? JSON.stringify(val) : val;
   } else {
@@ -945,13 +946,13 @@ function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host)
     result = extend(
       {
         files: files,
-        url: join(matcher, filePath)
+        url: joinUrl(matcher, filePath)
       },
       rule
     );
     if (files && filePath) {
       result.files = files.map(function (file) {
-        return join(file, filePath);
+        return joinUrl(file, filePath);
       });
       result.rawFiles = files;
     }
@@ -1027,17 +1028,13 @@ function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host)
       }
     } else if (rule.wildcard) {
       var wildcard = rule.wildcard;
-      var hostname = null; // 不能去掉
-      var regObj;
-      if (wildcard.preMatch.test(curUrl)) {
-        hostname = RegExp.$1;
-        regObj = { 0: hostname };
-        for (var k = 1; k < 9; k++) {
-          regObj[k] = RegExp['$' + (k + 1)];
+      var matched = wildcard.preMatch.exec(curUrl);
+      if (matched && checkFilter()) {
+        var regObj = {};
+        for (var k = 0; k < 9; k++) {
+          regObj[k] = matched[k + 1] || '';
         }
-      }
-      if (hostname != null && checkFilter()) {
-        filePath = curUrl.substring(hostname.length);
+        filePath = curUrl.substring(regObj[0].length);
         var wPath = wildcard.path;
         if (wildcard.isExact) {
           if (
@@ -1171,6 +1168,7 @@ function parseWildcard(pattern, not) {
   var startWithDot = DOT_DOMAIN_RE.test(domain);
   if (
     !startWithDot &&
+    protocol.indexOf('*') === -1 &&
     domain.indexOf('*') === -1 &&
     domain.indexOf('~') === -1
   ) {
@@ -1179,8 +1177,8 @@ function parseWildcard(pattern, not) {
   if (not) {
     return false;
   }
-
-  var path = pattern.substring(preMatch.length) || '/';
+  var restPath = pattern.substring(preMatch.length);
+  var path = restPath || '/';
   var isExact = preMatch.indexOf('$') === 0;
   if (isExact) {
     preMatch = preMatch.substring(1);
@@ -1190,7 +1188,8 @@ function parseWildcard(pattern, not) {
   if (hasQuery && index === 0) {
     path = '/' + path;
   }
-  var allowMatchPath = domain.length > 2 && !NON_STAR_RE.test(domain);
+  var dLen = domain.length;
+  var allowMatchPath = dLen > 2 && !NON_STAR_RE.test(domain);
   if (allowMatchPath) {
     preMatch = '[^?]*';
   } else {
@@ -1201,11 +1200,10 @@ function parseWildcard(pattern, not) {
     ) {
       preMatch += '*';
     }
-    var dLen = domain.length;
     preMatch = util
       .escapeRegExp(preMatch)
       .replace(DOMAIN_STAR_RE, domainToRegExp);
-    if (domain[dLen - 1] !== '*' && domain.indexOf(':') === -1) {
+    if (dLen && domain[dLen - 1] !== '*' && domain.indexOf(':') === -1) {
       preMatch += '(?::\\d+)?';
     }
     if (startWithDot) {
@@ -1218,7 +1216,7 @@ function parseWildcard(pattern, not) {
     preMatch = '[a-z]+:' + preMatch;
   }
   preMatch =
-    '^(' + preMatch + ')' + (allowMatchPath ? util.escapeRegExp(path, true) : '');
+    '^(' + preMatch + (restPath ? '' : '[^/?]*') + ')' + (allowMatchPath ? util.escapeRegExp(path, true) : '');
 
   return {
     preMatch: new RegExp(preMatch),
@@ -1411,9 +1409,9 @@ function parseRule(rulesMgr, pattern, matcher, raw, root, options, file) {
 function isPattern(item) {
   return (
     PORT_PATTERN_RE.test(item) ||
-    NO_SCHEMA_RE.test(item) ||
     isExactPattern(item) ||
-    isRegUrl(item, true) ||
+    isRegUrl(item, true) || // 缓存 regUrl
+    NO_SCHEMA_RE.test(item) ||
     isNegativePattern(item) ||
     WEB_PROTOCOL_RE.test(item) ||
     util.isRegExp(item)
@@ -1655,6 +1653,9 @@ function resolveMatchFilter(list) {
       } else {
         var isHeader = propName !== 'env' && propName !== 'chance' && propName !== 'probability';
         var index = value.indexOf('=');
+        if (isHeader && index === -1) {
+          index = value.indexOf(':');
+        }
         var key = index === -1 ? value : value.substring(0, index);
         if (isHeader) {
           key = key.toLowerCase();
@@ -1843,6 +1844,9 @@ function matchFilter(url, filter, req) {
     if (filter.from === 'composer') {
       return filter.not ? !req.fromComposer : req.fromComposer;
     }
+    if (filter.from === 'internalPath') {
+      return filter.not ? !req.fromInternalPath : req.fromInternalPath;
+    }
     if (filter.from === 'sni') {
       return filter.not ? !req.useSNI : req.useSNI;
     }
@@ -2230,8 +2234,12 @@ function resolveRules(req, isReq, isRes) {
   var protos;
   if (req.isPluginReq) {
     protos = req._isProxyReq ? proxyProtocols : pluginProtocols;
+  } else if (isRes) {
+    protos = pureResProtocols;
+  } else if (isReq) {
+    protos = req._resolvedG ? reqProtosWithoutG : reqProtocols;
   } else {
-    protos = isRes ? pureResProtocols : isReq ? reqProtocols : protocols;
+    protos = req._resolvedG ? protocolsWithoutG : protocols;
   }
   req._inlineValues = vals;
   protos.forEach(function (name) {
@@ -2377,6 +2385,10 @@ proto.resolvePipe = function (req) {
   return req.isPluginReq ? null : resolveSingleRule.call(this, req, 'pipe');
 };
 
+proto.getGRuleList = function (req) {
+  return resolveSingleRule.call(this, req, 'G', true);
+};
+
 proto.resolvePac = function (req) {
   return resolveSingleRule.call(this, req, 'pac');
 };

package/lib/rules/util.js

@@ -487,6 +487,36 @@ if (config.persistentCapture && config.isEnableCapture) {
   setEnableCapture(true);
 }
 
+exports.setDisabledCertFile = function(filename, disabled) {
+  var len = util.isString(filename) ? filename.length : 0;
+  if (!len || len > 100) {
+    return;
+  }
+  var list = propertiesStorage.getProperty('disabledCertFiles');
+  if (!Array.isArray(list)) {
+    list = [];
+  }
+  var index = list.indexOf(filename);
+  if (disabled) {
+    if (index !== -1) {
+      list.splice(index, 1);
+    }
+    list.push(filename);
+    if (list.length > 256) {
+      list = list.slice(-256);
+    }
+    propertiesStorage.setProperty('disabledCertFiles', list);
+  } else if (index !== -1) {
+    list.splice(index, 1);
+    propertiesStorage.setProperty('disabledCertFiles', list);
+  }
+};
+
+exports.isDisabledCertFile = function(filename) {
+  var list = propertiesStorage.getProperty('disabledCertFiles');
+  return Array.isArray(list) && list.indexOf(filename) !== -1;
+};
+
 exports.properties = {
   setIPv6Only: function(checked) {
     checked = !!checked;

package/lib/service/composer.js

@@ -176,7 +176,7 @@ function getReqRaw(options) {
 function handleWebSocket(options, cb, count) {
   count = getReqCount(count);
   if (options.protocol === 'https:' || options.protocol === 'wss:') {
-    options.headers[config.HTTPS_FIELD] = 1;
+    options.headers[common.HTTPS_FIELD] = 1;
   }
   var binary = !!options.headers['x-whistle-frame-binary'];
   delete options.headers['x-whistle-frame-binary'];
@@ -234,7 +234,7 @@ function handleWebSocket(options, cb, count) {
 function handleHttp(options, cb, count, reqId) {
   count = getReqCount(count);
   if (options.protocol === 'https:') {
-    options.headers[config.HTTPS_FIELD] = 1;
+    options.headers[common.HTTPS_FIELD] = 1;
   }
   options.protocol = null;
   options.hostname = null;
@@ -353,14 +353,14 @@ exports.handleRequest = function(req, res) {
   var method = common.getMethod(req.body.method);
   var isWebSocket = method === 'WEBSOCKET';
   delete headers[config.WEBUI_HEAD];
-  headers[config.REQ_FROM_HEADER] = 'W2COMPOSER';
+  headers[config.FROM_COM_HEADER] = '1';
   if (req.body.enableProxyRules === false) {
     headers[config.DISABLE_RULES_HEADER] = '1';
   }
   headers.host = options.host;
   options.clientId = clientId;
-  headers[config.CLIENT_IP_HEAD] = req.headers[config.CLIENT_IP_HEAD] || '127.0.0.1';
-  headers[config.CLIENT_PORT_HEAD] = common.getClientPort(req, config);
+  headers[config.CLIENT_IP_HEADER] = req.headers[config.CLIENT_IP_HEADER] || '127.0.0.1';
+  headers[config.CLIENT_PORT_HEADER] = common.getClientPort(req, config);
   options.method = method;
 
   var isConn = common.isConnect(options);

package/lib/service/util.js

@@ -256,30 +256,16 @@ function parseJSON(str) {
 
 exports.parseJSON = parseJSON;
 
-function padding(num) {
-  return num < 10 ? '0' + num : num;
-}
-
-function paddingMS(ms) {
-  if (ms > 99) {
-    return ms;
-  }
-  if (ms > 9) {
-    return '0' + ms;
-  }
-  return '00' + ms;
-}
-
 function formatDate() {
   var date = new Date();
   var result = [];
   result.push(date.getFullYear());
-  result.push(padding(date.getMonth() + 1));
-  result.push(padding(date.getDate()));
-  result.push(padding(date.getHours()));
-  result.push(padding(date.getMinutes()));
-  result.push(padding(date.getSeconds()));
-  result.push(paddingMS(date.getMilliseconds()));
+  result.push(common.padLeft(date.getMonth() + 1));
+  result.push(common.padLeft(date.getDate()));
+  result.push(common.padLeft(date.getHours()));
+  result.push(common.padLeft(date.getMinutes()));
+  result.push(common.padLeft(date.getSeconds()));
+  result.push(common.padLeft(date.getMilliseconds(), 3));
   return result.join('');
 }
 
@@ -331,7 +317,7 @@ function toISOString(time) {
     time.toISOString().slice(0, -1) +
     '0000' +
     (offet >= 0 ? '+' : '-') +
-    padding(Math.abs(offet)) +
+    common.padLeft(Math.abs(offet)) +
     ':00'
   );
 }