xcodebuild
diff --git a/‎.travis.yml‎
Lines changed: 1 addition & 0 deletions b/‎.travis.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 85 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 85 additions & 0 deletions
diff --git a/‎Dockerfile‎
Lines changed: 0 additions & 7 deletions b/‎Dockerfile‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎README-zh_CN.md‎
Lines changed: 2 additions & 2 deletions b/‎README-zh_CN.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎assets/fiddler/meta.xml‎
Lines changed: 1 addition & 0 deletions b/‎assets/fiddler/meta.xml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎bin/status.js‎
Lines changed: 12 additions & 7 deletions b/‎bin/status.js‎
Lines changed: 12 additions & 7 deletions
diff --git a/‎bin/use.js‎
Lines changed: 85 additions & 46 deletions b/‎bin/use.js‎
Lines changed: 85 additions & 46 deletions
diff --git a/‎bin/util.js‎
Lines changed: 1 addition & 1 deletion b/‎bin/util.js‎
Lines changed: 1 addition & 1 deletion
@@ -7,6 +7,7 @@ node_js:
   - "14"
   - "15"
   - "16"
+  - "17"
 
 install:
   - npm install
 
@@ -1,3 +1,88 @@
+# v2.8.2
+1. feat: `resMerge://json1 resMerge://json2` 默认采用 `extend({}, json1, json2)`，新版支持通过 `resMerge://json1 resMerge://json2 resMerge://true` 开启  `extend(true, {}, json1, json2)`
+2. refactor: 插件规则里面的 req 和 res rules 分开执行
+
+# v2.8.1
+1. refactor: 优化获取证书逻辑，合并多次相同请求
+2. refactor: 处理 `unhandledRejection` 事件
+3. feat: 支持通过请求头设置响应规则
+4. fix: sniCallback 内存泄露问题
+
+# v2.8.0
+1. feat: 支持启动 `--cluster [workers]` 模式，通过该方式可以启动多进程模式（worker 为 Whistle headless）
+2. fix: 启动时绑定非 `127.0.0.1` 网卡，插件远程规则访问失败问题
+
+# v2.7.29
+1. fix: https://github.com/avwo/whistle/issues/643
+
+# v2.7.28
+1. fix: WebSocket 无法抓包问题
+
+# v2.7.27
+1. fix: 插件用到 `storage.setProperties` 失效问题
+2. feat: 插件 `whistleConfig` 支持配置 `inheritAuth` 复用 Whistle 的登录账号
+
+# v2.7.26
+1. feat: 支持通过插件 `sniCallback(req, options)` hook 获取远程证书
+2. feat: 支持通过 `--config localFile` 加载启动配置，优先级高于命令行
+
+# v2.7.25
+1. fix: 某些情况下响应 stream pause 问题
+2. refactor: 优化 `w2 stop`，找不到指定实例时自动显示当前所有运行的实例
+3. style: 支持将 Rules 添加到最前面
+
+# v2.7.24
+1. refactor: 优化 `lineProps://proxyHost|proxyTunnel|proxyFirst`
+
+# v2.7.23
+1. style: 优化显示 Composer 历史记录列表
+2. style: 禁用 Rules、Plugins 显示小黄条提醒
+
+# v2.7.22
+1. feat: 插件 auth 方法支持 `req.setRedirect(url);`
+2. perf: 优化启动速度
+3. fix: 修复第三方集成时，一些内部请求转发问题
+
+# v2.7.21
+1. fix: 清除搜索框历史记录 js 报错问题
+2. feat: 普通 HTTP 请求也支持 `customParser`（或 `customFrames`）：https://github.com/whistle-plugins/whistle.custom-parser
+
+# v2.7.20
+1. fix: Cannot read property 'headers' of undefined
+
+# v2.7.19
+1. feat: HTTP2 支持非 HTTPS 请求
+2. feat: 插件支持通过 `options.getCert(domain, (cert || '') => {})` 获取指定域名证书
+3. refactor: 优化 `reqDelay` 和 `resDelay` 实现
+# v2.7.18
+1. feat: 支持插件设置 `tunnelKey` 将指定的隧道代理请求头带到解开后的 http/https/ws 请求头
+2. feat: 插件 `auth` 方法支持处理 Whistle 的内部请求
+3. feat: 插件 `auth` 支持设置 `req.showLoginBox` 弹出登录框
+4. style: 显示 UI 请求情况
+5. refactor: 优化内部请求转发逻辑的实现方式
+
+# v2.7.17
+1. feat: WebSocket 和 Tunnel 请求支持 `replaceStatus`
+
+# v2.7.16
+1. fix: Maximum call stack size exceeded
+
+# v2.7.15
+1. perf: 去掉 `Empty Request`，减少内存及 CPU 占用
+2. style: Network 的  `Body` 支持显示请求内容大小
+
+# v2.7.14
+1. feat: 插件支持通过 `options.require` 直接引用 Whistle 里面的第三方模块或文件
+2. refacto: 插件在不同实例使用不同的存储目录
+
+# v2.7.13
+1. fix: 特殊情况下 Whistle 无法展示 WebSocket 前几个请求帧问题
+2. feat: 支持在模板字符串里面通过 `clientPort` 和 `serverPort` 分别获取客户端和服务端端口
+3. refactor: `alert`、`confirm`、`prompt` 等浏览器内置的窗口改用自定义实现，防止 https://www.chromestatus.com/feature/5148698084376576
+
+# v2.7.12
+1. fix: `reqReplace` 及 `resReplace` 可能因为拆包导致匹配不准确问题
+2. fix: Rules 编辑器行首字母输入 `!` 报错问题
 
 # v2.7.11
 1. feat: 插件 hook 支持 `async-await`：
 
@@ -182,9 +182,9 @@ w2 restart
 	更多匹配模式参考：[匹配模式](https://avwo.github.io/whistle/pattern.html)
 5. 调试远程页面
 
-	利用whistle提供的[weinre](rules/weinre.html)和[log](rules/log.html)两个协议，可以实现修改远程页面DOM结构及自动捕获页面js错误及console打印的信息，还可以在页面顶部或js文件底部注入指定的脚步调试页面信息。
+	利用whistle提供的[weinre](http://wproxy.org/whistle/webui/weinre.html)和[log](http://wproxy.org/whistle/webui/log.html)两个协议，可以实现修改远程页面DOM结构及自动捕获页面js错误及console打印的信息，还可以在页面顶部或js文件底部注入指定的脚步调试页面信息。
 
-	使用whistle的功能前，先把要相应的系统代理或浏览器代理指向whistle，如何设置可以参考：[安装启动](install.html)
+	使用whistle的功能前，先把要相应的系统代理或浏览器代理指向whistle，如何设置可以参考：[安装启动](http://wproxy.org/whistle/install.html)
 
 	weinre：
 
 
@@ -199,7 +199,7 @@ For more details, please visit [install and start](https://avwo.github.io/whistl
 
 3. in mobiles, configure the proxy of current Wi-Fi in `Setting`
 
-PS: The mobile may failed to use network after configuration because the fireworks of the PC has forbidden remote visit to the whistle's port. you can try to close the fireworks or configure white list ：[ http://jingyan.baidu.com/article/870c6fc317cae7b03ee4be48.html]( http://jingyan.baidu.com/article/870c6fc317cae7b03ee4be48.html)
+PS: The mobile may failed to use network after configuration because the firewall of the PC has forbidden remote visit to the whistle's port. you can try to close the firewall or configure white list ：[ http://jingyan.baidu.com/article/870c6fc317cae7b03ee4be48.html]( http://jingyan.baidu.com/article/870c6fc317cae7b03ee4be48.html)
 
 For more details, please vsit [install and start](https://avwo.github.io/whistle/install.html)
 
 
@@ -17,5 +17,6 @@
     <SessionFlag N="x-ttlb" V="${ttlb}" />
     <SessionFlag N="x-hostip" V="${hostip}" />
     <SessionFlag N="x-clientport" V="${clientport}" />
+    <SessionFlag N="x-serverport" V="${serverport}" />
   </SessionFlags>
 </Session>
@@ -1,15 +1,16 @@
 var Q = require('q');
+
 var util = require('./util');
 var pkg = require('../package.json');
-
+var colors = require('colors/safe');
 var isRunning = util.isRunning;
 var showUsage = util.showUsage;
 var readConfig = util.readConfig;
 var readConfigList = util.readConfigList;
-var error = util.error;
+var warn = util.warn;
 var info = util.info;
 
-function showAll() {
+function showAll(byStop) {
   var list = readConfigList().map(function(config) {
     var deferred = Q.defer();
     isRunning(config.pid, function(running) {
@@ -23,16 +24,18 @@ function showAll() {
     });
     var len = confList.length;
     if (!len) {
-      error('No running whistle.');
+      warn('[!] No running whistle.');
     } else {
-      var tips = ['All running whistle:'];
+      var tips = [byStop ? '[i] Other running whistle:' : '[i] All running whistle:'];
       confList.forEach(function(conf, i) {
         ++i;
         var options = conf.options;
         tips.push('  ' + i + '. port: ' + (options.port || pkg.port)
           + (options.host ? ', host: ' + options.host : '')
-          + (options.storage ? ', storage: ' + options.storage : ''));
+          + (options.storage ? ', storage: ' + options.storage : '')
+          + (byStop ? colors.red(' (stop cmd: ' + (options.storage ? 'w2 stop -S ' + options.storage : 'w2 stop') + ')') : ''));
       });
+      byStop && warn('[!] This whistle is not running.');
       info(tips.join('\n'));
     }
   });
@@ -58,4 +61,6 @@ module.exports = function(all, storage) {
     }
   }
   showAll();
-};
+};
+
+module.exports.showAll = showAll;
@@ -11,6 +11,7 @@ var warn = util.warn;
 var info = util.info;
 var readConfig = util.readConfig;
 var MAX_RULES_LEN = 1024 * 16;
+var DEFAULT_OPTIONS = { host: '127.0.0.1', port: 8899 };
 var options;
 
 function showStartWhistleTips(storage) {
@@ -48,6 +49,21 @@ function existsPlugin(name) {
   return false;
 }
 
+function getBody(res, callback) {
+  var resBody = '';
+  res.setEncoding('utf8');
+  res.on('data', function(data) {
+    resBody += data;
+  });
+  res.on('end', function() {
+    if (res.statusCode != 200) {
+      callback(resBody || 'response ' + res.statusCode + ' error');
+    } else {
+      callback(null, JSON.parse(resBody));
+    }
+  });
+}
+
 var reqOptions;
 function request(body, callback) {
   if (!reqOptions) {
@@ -62,23 +78,40 @@ function request(body, callback) {
     }
   }
   var req = http.request(reqOptions, function(res) {
-    res.setEncoding('utf8');
-    var resBody = '';
-    res.on('data', function(data) {
-      resBody += data;
-    });
-    res.on('end', function() {
-      if (res.statusCode != 200) {
-        throw resBody || 'response ' + res.statusCode + ' error';
+    getBody(res, function(err, data) {
+      if (err) {
+        throw err;
       }
-      callback(JSON.parse(resBody));
+      callback(data);
     });
   });
   // 不处理错误，直接抛出终止进程
   req.end(body);
 }
 
+function checkDefault(running, storage, callback) {
+  if (running) {
+    return callback();
+  }
+  var execCallback = function(err) {
+    callback && callback(err);
+    callback = null;
+  };
+  var req = http.get('http://' + DEFAULT_OPTIONS.host + ':' + DEFAULT_OPTIONS.port + '/cgi-bin/status', function(res) {
+    res.on('error', execCallback);
+    getBody(res, function(err, data) {
+      if (err || !data || data.name !== pkg.name || data.storage !== storage) {
+        return execCallback(true);
+      }
+      callback(null, DEFAULT_OPTIONS.port);
+    });
+  });
+  req.on('error', execCallback);
+  req.end();
+}
+
 module.exports = function(filepath, storage, force) {
+  storage = storage || '';
   var config = readConfig(storage) || '';
   options = config.options; 
   var pid = options && config.pid;
@@ -87,46 +120,52 @@ module.exports = function(filepath, storage, force) {
   conf.addon = addon && typeof addon === 'string' ? addon.split(/[|,]/) : null;
   conf.noGlobalPlugins = options && options.noGlobalPlugins;
   isRunning(pid, function(running) {
-    if (!running) {
-      return showStartWhistleTips(storage);
-    }
-    filepath = path.resolve(filepath || '.whistle.js');
-    var port = options.port = options.port > 0 ? options.port : pkg.port;
-    handleRules(filepath, function(result) {
-      if (!result) {
-        error('The name and rules cannot be empty.');
-        return;
-      }
-      var name = getString(result.name);
-      if (!name || name.length > 64) {
-        error('The name cannot be empty and the length cannot exceed 64 characters.');
-        return;
-      }
-      var rules = getString(result.rules);
-      if (rules.length > MAX_RULES_LEN) {
-        error('The rules cannot be empty and the size cannot exceed 16k.');
-        return;
+    checkDefault(running, storage, function(err, port) {
+      if (err) {
+        return showStartWhistleTips(storage);
       }
-      var setRules = function() {
-        var body = [
-          'name=' + encodeURIComponent(name),
-          'rules=' + encodeURIComponent(rules)
-        ].join('&');
-        request(body, function() {
-          info('Setting whistle[' + (options.host || '127.0.0.1') + ':' + port + '] rules successful.');
-        });
-      };
-      if (force) {
-        return setRules();
+      filepath = path.resolve(filepath || '.whistle.js');
+      if (port) {
+        options = DEFAULT_OPTIONS;
+      } else {
+        port = options.port = options.port > 0 ? options.port : pkg.port;
       }
-      request('name=' + encodeURIComponent(name) + '&enable=1&top=1', function(data) {
-        if (data.rules) {
-          info('Successfully enabled.');
-          warn('Warning: The rule already exists, to override the content, add CLI option --force.');
+      handleRules(filepath, function(result) {
+        if (!result) {
+          error('The name and rules cannot be empty.');
+          return;
+        }
+        var name = getString(result.name);
+        if (!name || name.length > 64) {
+          error('The name cannot be empty and the length cannot exceed 64 characters.');
           return;
         }
-        setRules();
-      });
-    }, port);
+        var rules = getString(result.rules);
+        if (rules.length > MAX_RULES_LEN) {
+          error('The rules cannot be empty and the size cannot exceed 16k.');
+          return;
+        }
+        var setRules = function() {
+          var body = [
+            'name=' + encodeURIComponent(name),
+            'rules=' + encodeURIComponent(rules)
+          ].join('&');
+          request(body, function() {
+            info('Setting whistle[' + (options.host || '127.0.0.1') + ':' + port + '] rules successful.');
+          });
+        };
+        if (force) {
+          return setRules();
+        }
+        request('name=' + encodeURIComponent(name) + '&enable=1&top=1', function(data) {
+          if (data.rules) {
+            info('Successfully enabled.');
+            warn('Warning: The rule already exists, to override the content, add CLI option --force.');
+            return;
+          }
+          setRules();
+        });
+      }, port);
+    });
   });
 };
@@ -81,7 +81,7 @@ function showUsage(isRunning, options, restart) {
 
   warn('       Note: If all the above URLs are unable to access, check the firewall settings');
   warn('             For help see ' + colors.bold('https://github.com/avwo/whistle'));
-  info('[i] 2. configure your device to use ' + config.name + ' as its HTTP and HTTPS proxy on ' + colors.bold('IP:') + port);
+  info('[i] 2. set the HTTP proxy on your device with ' + colors.bold((list.length === 1 ? 'IP(' + list[0] + ')' : 'the above IP') + ' & PORT(' + port + ')'));
   info('[i] 3. use ' + colors.bold('Chrome') + ' to visit ' + colors.bold('http://' + (options.localUIHost || config.localUIHost) + '/') + ' to get started');
 
   if (parseInt(process.version.slice(1), 10) < 6) {