xcodebuild
diff --git a/‎.babelrc‎
Lines changed: 12 additions & 7 deletions b/‎.babelrc‎
Lines changed: 12 additions & 7 deletions
diff --git a/‎.eslintrc‎
Lines changed: 51 additions & 48 deletions b/‎.eslintrc‎
Lines changed: 51 additions & 48 deletions
diff --git a/‎.npmignore‎
Lines changed: 1 addition & 0 deletions b/‎.npmignore‎
Lines changed: 1 addition & 0 deletions
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: 76 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 76 additions & 0 deletions
diff --git a/‎assets/js/log.js‎
Lines changed: 22 additions & 20 deletions b/‎assets/js/log.js‎
Lines changed: 22 additions & 20 deletions
diff --git a/‎assets/launcher/mac/README.md‎
Lines changed: 1 addition & 1 deletion b/‎assets/launcher/mac/README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bin/status.js‎
Lines changed: 1 addition & 0 deletions b/‎bin/status.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎bin/use.js‎
Lines changed: 2 additions & 2 deletions b/‎bin/use.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎bin/util.js‎
Lines changed: 15 additions & 7 deletions b/‎bin/util.js‎
Lines changed: 15 additions & 7 deletions
@@ -1,8 +1,13 @@
 {
-    "presets": [
-      "react"
-    ],
-    "ignore": [
-      "./biz/webui/htdocs/src/js/components/json/eval.js"
-    ]
-  }
+  "presets": [
+    "env",
+    "react"
+  ],
+  "plugins": [
+    "transform-class-properties",
+    "transform-object-rest-spread"
+  ],
+  "ignore": [
+    "./biz/webui/htdocs/src/js/components/json/eval.js"
+  ]
+}
@@ -1,52 +1,55 @@
 {
-    "env": {
-        "browser": true,
-        "node": true
-    },
-    "extends": [
-      "eslint:recommended",
-      "plugin:react/recommended"
+  "env": {
+    "browser": true,
+    "node": true,
+    "es6": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended"
+  ],
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "indent": [
+      "error",
+      2
     ],
-    "parser": "babel-eslint",
-    "parserOptions": {
-        "ecmaFeatures": {
-            "experimentalObjectRestSpread": true,
-            "jsx": true
-        }
-    },
-    "plugins": [
-        "react"
+    "react/prop-types": 0,
+    "react/no-direct-mutation-state": 0,
+    "linebreak-style": [
+      "error",
+      "unix"
     ],
-    "rules": {
-        "indent": [
-            "error",
-            2
-        ],
-        "react/prop-types": 0,
-        "react/no-direct-mutation-state": 0,
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "no-unused-vars": [
-          "error",
-          {
-            "vars": "all",
-            "args": "none"
-          }
-        ],
-        "no-empty": [
-              "error",
-              { "allowEmptyCatch": true }
-        ],
-        "no-cond-assign": "off"
-    }
+    "quotes": [
+      "error",
+      "single"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ],
+    "no-unused-vars": [
+      "error",
+      {
+        "vars": "all",
+        "args": "none"
+      }
+    ],
+    "no-empty": [
+      "error",
+      {
+        "allowEmptyCatch": true
+      }
+    ],
+    "no-cond-assign": "off"
+  }
 }
@@ -62,6 +62,7 @@ assets/launcher
 /biz/webui/htdocs/src
 /docs
 /.history
+CHANGELOG.md
 
 
 # Coveralls
 
@@ -6,6 +6,7 @@ node_js:
   - "13"
   - "14"
   - "15"
+  - "16"
 
 install:
   - npm install
 
@@ -1,3 +1,79 @@
+# v2.7.7
+1. fix: [pipe](https://wproxy.org/whistle/rules/pipe.html) 无法直接透传 WebSocket 的二进制包问题
+2. style: 支持显示自定义根证书及删除自定义证书导引
+3. style: `pipe` 支持智能提示
+
+# v2.7.6
+1. feat: 支持通过类似 `--dnsServer http://dns.alidns.com/resolve` 自定义 `dns-over-https` 服务： https://github.com/avwo/whistle/issues/439
+2. style: 优化错误提示
+
+# v2.7.5
+1. feat: 支持通过 `disable://interceptConsole` 禁止 `log://` 拦截 `console` 的请求，用户只能通过代码 `window._whistleConsole && _whistleConsole.xxx(a, b, ...)` 记录日志
+2. feat: 支持在规则里面同时设置多个s `%plugin-name=xxxx` （最多 10 个），Whistle 会自带将这些值带到插件的对象： `req.originalReq.pluginVars`
+3. refactor: 显示插件转发的 HTTP 协议 
+
+# v2.7.4
+1. refactor: 调整 `delete://reqH.xxxx` 的时机
+
+# v2.7.3
+1. style: 优化左侧菜单
+2. styl: 修复 Values 右键菜单 Copy / Key 弹出创建新 key 输入框问题
+3. feat: 支持设置 `-M shadowRules` （抓包 + 设置 shadowRules） 或 `-M shadowRulesOnly` （无法查看抓包）
+
+# v2.7.2
+1. feat: 支持通过命令行参数 `--dnsServer "1.1.1.1,8.8.8.8,10.3.2.1:8080"` 自定义 DNS server
+		> 如果需要请求自定义 DNS server 出错时自动转成默认可以用: `--dnsServer "1.1.1.1,8.8.8.8,10.3.2.1:8080,default"`
+		> 自定义 DNS server，默认是获取 IPv4，如果需要获取 IPv6，要手动指定 `--dnsServer "2001:4860:4860::8888,[2001:4860:4860::8888]:1053,ipv6"`
+2. fix: 修复 List View 通过表头排序后无法 Reset 的问题
+
+# 2.7.1
+1. fix: Tree View 抓包数据满了后无法自动更新问题
+# v2.7.0
+1. feat: Network 支持 Tree View 展示
+2. feat: `pac` 支持设置用户名密码：`pac://user:pass@pacPath`
+3. style: 支持显示 `Raw Url` 详见：https://github.com/avwo/whistle/issues/572
+
+# v2.6.16
+1. fix: 解决规则文件名称过长保存失败的问题
+2. feat: 域名统配也支持获取子匹配内容 
+
+# v2.6.15
+1. refactor: 优化命令行启动输出的信息
+2. feat: 编辑器 `Show Line Number` 时，双击行数可以注释或取消注释
+3. feat: `Network / Tools / Toolbox` 支持将对象转成 `Query` 参数
+4. style: 支持扩展 `util.openEditor(value)` 方法 
+
+# v2.6.14
+1. chore: https://github.com/avwo/whistle/issues/559
+
+# v2.6.13
+1. style: Network 搜索框支持最多3个关键字过滤
+2. style: Network 右键菜单新增 `Open/Source` 查看当前抓包数据的源码
+3. refactor: `onSocketEnd` 添加 `timeout` 事件，兼容各种诡异行为
+4. refactor: 优化内部连接管理
+
+# v2.6.12
+1. feat: 支持通过 url 参数的 clientId 过来抓包数据
+2. feat: 支持通过 `disable://proxyConnection` 将代理转发头改为 `Proxy-Connection: close`
+
+# v2.6.11
+1. perf: 确保及时关闭无用连接，减少内存占用
+2. style: Online 支持显示 QPS，及 内存、CPU、QPS 的最大值
+3. refactor: 处理处理请求过程中无法捕获的异常
+
+# v2.6.10
+1. feat: 支持导出 har 文件
+2. feat: 支持设置 `-M "disabledBackOption|disabledMultipleOption|notAllowDisableRules"`
+3. feat: 内部路径 `/...whistle-path.5b6af7b9884e1165...///` 支持设置域名 `/...whistle-path.5b6af7b9884e1165...///__domain__port__/path/to` (`port__` 可选) 或 `/...whistle-path.5b6af7b9884e1165...///path/to?_whistleInternalHost_=__domain__port__` (`port__` 可选) 
+
+# v2.6.9
+1. feat: 支持通过 `--shadowRules jsonString` 导入规则到 Rules
+2. style: 支持通过设置请求参数 `disabledEditor=1` 将 Rules & Values 编辑框设置为只读模式
+
+# v2.6.8
+1. fix: `excludeFilter` `includeFilter` 混合配置时结果错乱问题
+2. feat: 支持 -M `rulesOnly` 及 `pluginsOnly`
+
 # v2.6.7
 1. fix: https://github.com/avwo/whistle/issues/540
 
 
@@ -327,26 +327,28 @@
         result = stringifyObj(result);
         result && addLog(level, result);
       };
-      console[level] = function() {
-        if (pending) {
-          return;
-        }
-        pending = true;
-        var weinreFn = console['_weinre_' + level];
-        if (typeof weinreFn === 'function') {
+      if ($INTERCEPT_CONSOLE) {
+        console[level] = function() {
+          if (pending) {
+            return;
+          }
+          pending = true;
+          var weinreFn = console['_weinre_' + level];
+          if (typeof weinreFn === 'function') {
+            try {
+              weinreFn.apply(this, arguments);
+            } catch (e) {}
+          }
+          wFn.apply(null, arguments);
           try {
-            weinreFn.apply(this, arguments);
-          } catch (e) {}
-        }
-        wFn.apply(null, arguments);
-        try {
-          fn.apply(this, arguments);
-        } catch(e) {
-          fn(arguments.length < 2 ? arguments[0] : slice.apply(arguments));
-        } finally {
-          pending = false;
-        }
-      };
+            fn.apply(this, arguments);
+          } catch(e) {
+            fn(arguments.length < 2 ? arguments[0] : slice.apply(arguments));
+          } finally {
+            pending = false;
+          }
+        };
+      }
     })(levels[i]);
   }
   /*eslint no-console: "off"*/
@@ -371,7 +373,7 @@
     var curConsole = window.console;
     if (!curConsole) {
       window.console = console;
-    } else if (isWeinreConsole(curConsole)) {
+    } else if ($INTERCEPT_CONSOLE && isWeinreConsole(curConsole)) {
       for (var i = 0, len = levels.length; i < len; i++) {
         var level = levels[i];
         var fn = console[level];
 
@@ -1,5 +1,5 @@
 # Mac上配置开机重启whistle
-首先，下载Mac上的whistle脚步文件：[whistle.zip](https://github.com/avwo/whistle/raw/avenwu/assets/launcher/mac/whistle.zip)。
+首先，下载Mac上的whistle脚步文件：[whistle.zip](https://github.com/avwo/whistle/blob/master/assets/launcher/mac/whistle.zip)。
 
 1. 解压whistle.zip获取whistle脚本文件，把该脚本文件拷贝一份到**应用程序**，打开桌面即可看到whistle这个脚本文件，这样可以直接在Mac的桌面上刊登whistle的启动脚本，点击该文件即可重启whistle;
 
 
@@ -30,6 +30,7 @@ function showAll() {
         ++i;
         var options = conf.options;
         tips.push('  ' + i + '. port: ' + (options.port || pkg.port)
+          + (options.host ? ', host: ' + options.host : '')
           + (options.storage ? ', storage: ' + options.storage : ''));
       });
       info(tips.join('\n'));
 
@@ -51,7 +51,7 @@ function existsPlugin(name) {
 var reqOptions;
 function request(body, callback) {
   if (!reqOptions) {
-    reqOptions = url.parse('http://127.0.0.1:' + options.port + '/cgi-bin/rules/project');
+    reqOptions = url.parse('http://' + (options.host || '127.0.0.1') + ':' + options.port + '/cgi-bin/rules/project');
     reqOptions.headers = {
       'content-type': 'application/x-www-form-urlencoded'
     };
@@ -113,7 +113,7 @@ module.exports = function(filepath, storage, force) {
           'rules=' + encodeURIComponent(rules)
         ].join('&');
         request(body, function() {
-          info('Setting whistle[127.0.0.1:' + port + '] rules successful.');
+          info('Setting whistle[' + (options.host || '127.0.0.1') + ':' + port + '] rules successful.');
         });
       };
       if (force) {
 
@@ -62,6 +62,7 @@ function showKillError() {
 exports.showKillError = showKillError;
 
 function showUsage(isRunning, options, restart) {
+  options = formatOptions(options);
   if (isRunning) {
     if (restart) {
       showKillError();
@@ -90,24 +91,31 @@ function showUsage(isRunning, options, restart) {
 
 exports.showUsage = showUsage;
 
-function getHomedir() {
-  //默认设置为`~`，防止Linux在开机启动时Node无法获取homedir
-  return (typeof os.homedir == 'function' ? os.homedir() :
-    process.env[process.platform == 'win32' ? 'USERPROFILE' : 'HOME']) || '~';
+function getDataDir() {
+  return path.resolve(config.getHomedir(), '.startingAppData');
 }
 
-function getDataDir() {
-  return path.resolve(getHomedir(), '.startingAppData');
+function formatOptions(options) {
+  if (!options || !/^(?:([\w.-]+):)?([1-9]\d{0,4})$/.test(options.port)) {
+    return options;
+  }
+  options.host = options.host || RegExp.$1;
+  options.port = parseInt(RegExp.$2, 10);
+  return options;
 }
 
+exports.formatOptions = formatOptions;
+
 function readConfig(storage) {
   var dataDir = getDataDir();
   var configFile = path.join(dataDir, encodeURIComponent('#' + (storage ? storage + '#' : '')));
   if (!fs.existsSync(configFile)) {
     return;
   }
   try {
-    return fse.readJsonSync(configFile);
+    var conf = fse.readJsonSync(configFile);
+    conf && formatOptions(conf.options);
+    return conf;
   } catch(e) {}
 }