Squashed 'vendor/whistle/' changes from 826e040c9..d70edcf1a

d70edcf1a refactor: refine filter
ff9057d89 Release v2.7.11
4199c35e1 feat: self <=> clientIp + clientId
94806503c Release v2.7.11
00f9e498f feat: add composer client id
084e85238 Release v2.7.11
97141bf73 refactor: refine code
78dfff7da feat: add async await
66edff85e feat: send rule value to pipe server
404c1850b refactor: refine code
a6359c0c2 refactor: refine fullUrl
9ab9a344e style: refine tips
5f69ac741 feat: export baseUrl to plugin
4828aa739 Release v2.7.10
11e5a5ba1 refactor: onPluginLoad -> pluginLoad
b8a7a3615 Merge branch 'v2.x'
3257eb7a3 docs: https
cd74f1d0c refactor: info -> data
06d1d379e refactor: refine plugin hooks
0e3b788e3 Release v2.7.10
1a9a1c3e9 feat: add proxy.on('perfChange')
05f384348 docs: mode-options.md
7d3a56225 Release v2.7.10
c46db1549 feat: add -M disableForwardedHost|disableForwardedProto
1eeb44d0a style: Raw Url -> Original Url
b94220350 refactor: refine code
ab0332b73 docs: update linux docs
2d20fd519 feat(zh/https.md): 添加 Linux 添加根证书的方法
d809d8530 refactor: update iconv-lite
7cf23836e Release v2.7.9
b39ca4ed5 feat: add /cgi-bin/top
f1c5b4367 feat: add onPluginLoadError onPluginLoad events
45893fb77 refactor: refine code
e5b2cdbd3 refactor: refine code
a4e578e05 feat: emit plugin events
d2d472aa4 feat: add tpl var whistle.xxx.[g][all]var
af1693c06 Release v2.7.9
ec7e79196 refactor: refine code
01890e59f test: pluginVars
e1b2741cf refactor: refine code
fd496b19e refactor: pluginVar -> pluginVars
77ad47138 refactor: pluginVars -> globalPluginVars
3e0a965da refactor: refine code
125a2ecc4 feat: add pluginVar
23bd9f54f fix:remove ADD command, using ENTRYPOINT
2bdb5ec29 refactor: refine code
f8aa063f4 Release v2.7.8
bcf3145ee Release v2.7.8
cb2f5b7ed refactor: refine code
40d792214 feat: add Dockerfile
f4572a340 Create Dockerfile
cafa8f47f refactor: res.flushHeaders
ccfffa798 refactor: automatically load all plug-ins in the upper directory of the plug-in in debug mode
8daf8f97c style: refine code
534c16659 refactor: cors ignores requests without origin

git-subtree-dir: vendor/whistle
git-subtree-split: d70edcf1ae915a27af8fd2ada280b4fa4a886430

Author: shejinxin

.npmignore

@@ -63,6 +63,7 @@ assets/launcher
 /docs
 /.history
 CHANGELOG.md
+Dockerfile
 
 
 # Coveralls

CHANGELOG.md

@@ -1,3 +1,30 @@
+
+# v2.7.11
+1. feat: 插件 hook 支持 `async-await`：
+
+		``` js
+		module.exports = async (server, options) => {
+			// ... do sth
+		};
+		```
+2. feat: `pipe://xxx` 支持插件内部通过 `req.originalReq.ruleValue` 获取 `xxx://value` 的 `value` 值
+
+# v2.7.10
+1. feat: 支持通过 `-M disableForwardedHost` 禁止 Whistle 使用 `x-forwarded-host` 请求头，默认 Whistle 会用该请求头作为请求 URL 的域名
+2. feat: 支持通过 `-M disableForwardedProto` 禁止 Whistle 使用 `x-forwarded-proto` 请求头，默认当该请求头值为 `https` 时， Whistle 会把请求当成 HTTPS 处理
+3. feat: 第三方通过 `const proxy = startWhistle(options);` 启动 Whistle 时，可以通过 `proxy.on('perfDataChange', (perfData) => {})` 获取 cpu、内存、请求量等数据
+4. refactor: 第三方通过 `const proxy = startWhistle(options);` 启动 Whistle 时，可以通过 `proxy.on('pluginLoad', child, name, moduleName);`、`proxy.on('pluginLoadError', err, name, moduleName);` 监听插件启动信息
+
+# v2.7.9
+1. feat: 支持 `pattern %plugin=xxx`
+2. feat: 支持插件通过 `options.getTop(data => data && console.log(data))` 获取所在 Whistle 的 CPU、内存及请求量等信息
+
+# v2.7.8
+1. feat: 源码目录添加 Dockerfile: https://github.com/avwo/whistle/pull/601
+2. feat: 支持在插件的根目录执行 `w2 run` 时自动加载该插件
+3. refactor: 设置 `resCors://enable` 如果请求头不存在 `origin` 则自动忽略该设置
+4. fix: https://github.com/avwo/whistle/issues/600
+
 # v2.7.7
 1. fix: [pipe](https://wproxy.org/whistle/rules/pipe.html) 无法直接透传 WebSocket 的二进制包问题
 2. style: 支持显示自定义根证书及删除自定义证书导引

Dockerfile

@@ -0,0 +1,7 @@
+FROM alpine
+EXPOSE 8899
+RUN apk add --no-cache nodejs npm \
+    && npm install whistle -g \
+    && apk del npm \
+    && mkdir /whistle
+ENTRYPOINT ["w2", "run", "-M","prod", "-D","/whistle"]

biz/index.js

@@ -50,13 +50,13 @@ module.exports = function(req, res, next) {
         var realPath = RegExp.$1;
         var realPort = RegExp.$3;
         realHost = RegExp.$2 + (realPort ? ':' + realPort : '');
-        req.headers['x-whistle-real-host'] = realHost;
+        req.headers[config.REAL_HOST_HEADER] = realHost;
         req.url = req.url.replace(realPath, '');
         fullUrl = util.getFullUrl(req);
       } else {
         req.curUrl = fullUrl;
         if (realHost = rules.resolveInternalHost(req)) {
-          req.headers['x-whistle-real-host'] = realHost;
+          req.headers[config.REAL_HOST_HEADER] = realHost;
           fullUrl = util.getFullUrl(req);
         }
       }

biz/webui/cgi-bin/composer.js

@@ -20,17 +20,21 @@ var PROXY_OPTS = {
   port: config.port
 };
 
-function parseHeaders(headers, rawHeaderNames) {
+function parseHeaders(headers, rawHeaderNames, clientId) {
   if (!headers || typeof headers != 'string') {
     return {};
   }
 
   var reqHeaders = util.parseRawJson(headers);
   if (reqHeaders) {
-    return util.lowerCaseify(reqHeaders, rawHeaderNames);
+    reqHeaders = util.lowerCaseify(reqHeaders, rawHeaderNames);
+  } else {
+    reqHeaders = util.parseHeaders(headers, rawHeaderNames);
   }
-
-  return util.parseHeaders(headers, rawHeaderNames);
+  if (clientId && reqHeaders[config.CLIENT_ID_HEADER] !== clientId) {
+    reqHeaders[config.COMPOSER_CLIENT_ID_HEADER] = clientId;
+  }
+  return reqHeaders;
 }
 
 function isWebSocket(options) {
@@ -105,7 +109,7 @@ function handleWebSocket(options, cb) {
         var body = '';
         if (index !== -1) {
           socket.removeListener('data', handleResponse);
-          socket.headers = parseHeaders(resData.slice(0, index) + '');
+          socket.headers = parseHeaders(resData.slice(0, index) + '', null, options.clientId);
           body = resData.slice(index + 4);
           var sender = getSender(socket);
           var data = options.body;
@@ -218,10 +222,12 @@ module.exports = function(req, res) {
     options.protocol = protocol = protocol.toLowerCase();
   }
   var rawHeaderNames = {};
-  var headers = parseHeaders(req.body.headers, rawHeaderNames);
+  var clientId = req.headers[config.CLIENT_ID_HEADER];
+  var headers = parseHeaders(req.body.headers, rawHeaderNames, clientId);
   delete headers[config.WEBUI_HEAD];
   headers[config.WHISTLE_REQ_FROM_HEADER] = 'W2COMPOSER';
   headers.host = options.host;
+  options.clientId = clientId;
   var clientIp = util.getClientIp(req);
   if (!util.isLocalAddress(clientIp)) {
     headers[config.CLIENT_IP_HEAD] = clientIp;

biz/webui/cgi-bin/top.js

@@ -0,0 +1,5 @@
+var proc = require('../../../lib/util/process');
+
+module.exports = function(req, res) {
+  res.json(proc);
+};

biz/webui/htdocs/index.html

@@ -8,6 +8,6 @@
 </head>
 <body>
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.7.7"></script>
+<script src="js/index.js?v=2.7.11"></script>
 </body>
 </html>

biz/webui/htdocs/js/index.js

@@ -599,7 +599,7 @@ function startLoadData() {
     inited = true;
     $.extend(options, hashFilterObj);
     if (onlyViewOwnData) {
-      options.ip = 'self,clientId';
+      options.ip = 'self';
     }
     cgi.getData(options, function (data) {
       var hasNewData = data && data.data && data.data.hasNew;

biz/webui/htdocs/src/js/data-center.js

@@ -180,7 +180,7 @@ var FilesDialog = React.createClass({
   },
   remove: function(e) {
     var name = e.target.getAttribute('data-name');
-    if (!confirm('Are you sure to delete this file \'' + name + '\'.')) {
+    if (!confirm('Are you sure to delete \'' + name + '\'.')) {
       return;
     }
     var self = this;