whistle 2.9.20 → 2.9.23

package/README.md

@@ -28,6 +28,7 @@ Whistle 是基于 Node 实现的跨平台抓包调试工具，其主要特点：
 	* 项目可以自带代理规则配置并一键设置到本地 Whistle 代理，也可以通过定制插件简化操作
 
 # 一键安装
+> 如果电脑上安装  [Homebrew](https://brew.sh/) 也可以通过 `brew install whistle && w2 start --init` 一键安装，无需手动安装 Node
 1. 安装 Node（建议安装**最新的 LTS 版本**，如已安装忽略此步骤）：https://nodejs.org/
 2. 一键安装，在命令行执行以下命令：
 	``` sh
@@ -65,5 +66,17 @@ Whistle 是基于 Node 实现的跨平台抓包调试工具，其主要特点：
 
 ### 详细用法参见：[Whistle 帮助文档](https://wproxy.org/whistle/quickstart.html)
 
+# 通过 SwitchyOmega 设置代理
+全局代理如果会影响到某些客户端的请求（客户端设置了 ssl pinning），也可以使用 Chrome 插件设置代理（只对 Chrome 生效）：
+> 可以通过 `w2 proxy off` 关闭全局代理
+
+1. 设置 Whistle 代理
+
+    <img src="https://user-images.githubusercontent.com/11450939/36636618-132bb09e-1a05-11e8-8514-813fd34a5454.png" width="800" />
+2. 选择 Whistle 代理
+
+    <img width="180" alt="image" src="https://user-images.githubusercontent.com/11450939/173984519-143615b2-2a99-4486-a22a-fec71fe00423.png">
+
+
 # License
 [MIT](./LICENSE)

package/bin/{proxy/cli.js → proxy.js}

@@ -1,6 +1,6 @@
 var net = require('net');
-var proxy = require('./index');
-var util = require('../util');
+var proxy = require('set-global-proxy');
+var util = require('./util');
 
 var OFF_RE = /^(?:o|0|-{0,2}off)$/i;
 var BYPASS_RE = /^(?:-{0,2}bypass|-x|-b)$/i;
@@ -39,6 +39,7 @@ module.exports = function(argv) {
   }
   var options = {};
   var skip;
+  var sudo = true;
   argv.forEach(function(arg) {
     if (skip) {
       options.bypass = arg;
@@ -66,11 +67,14 @@ module.exports = function(argv) {
       if (host && (net.isIP(host) || HOST_RE.test(host))) {
         options.host = host || options.host;
       }
+    } else if (arg === '--no-sudo') {
+      sudo = false;
     }
   });
   if (!options.port) {
     options.port = util.getDefaultPort();
   }
   options.host = options.host || '127.0.0.1';
+  options.sudo = sudo;
   enableProxy(options);
 };

package/bin/use.js

@@ -145,10 +145,12 @@ module.exports = function(filepath, storage, force) {
           error('The rules cannot be empty and the size cannot exceed 256k.');
           return;
         }
+        var groupName = getString(result.groupName) || getString(result.group);
         var setRules = function() {
           var body = [
             'name=' + encodeURIComponent(name),
-            'rules=' + encodeURIComponent(rules)
+            'rules=' + encodeURIComponent(rules),
+            'groupName=' + encodeURIComponent(groupName.trim())
           ].join('&');
           request(body, function() {
             info('Setting whistle (' + (options.host || '127.0.0.1') + ':' + port + ') rules successful.');

package/bin/whistle.js

@@ -7,7 +7,7 @@ var useRules = require('./use');
 var showStatus = require('./status');
 var util = require('./util');
 var plugin = require('./plugin');
-var setProxy = require('./proxy/cli');
+var setProxy = require('./proxy');
 var installCA = require('./ca/cli');
 
 var error = util.error;

package/biz/webui/cgi-bin/rules/add.js

@@ -1,12 +1,20 @@
 var rules = require('../../../../lib/rules/util').rules;
 var recycleBin = require('../../../../lib/rules/util').rules.recycleBin;
+var isGroup = require('../../../../lib/util/common').isGroup;
 
 module.exports = function(req, res) {
   var body = req.body;
   var list;
-  rules.add(body.name, body.value, body.clientId);
-  if (body.addToTop) {
-    rules.moveToTop(body.name, body.clientId);
+  var exists = rules.exists(body.name);
+  if (rules.add(body.name, body.value, body.clientId) != null && !isGroup(body.name)) {
+    if (body.groupName) {
+      rules.moveToGroup(body.name, body.groupName, body.addToTop);
+    } else if (body.addToTop) {
+      rules.moveToTop(body.name, body.clientId);
+    } else if (!exists) {
+      var group = rules.getFirstGroup();
+      group && rules.moveTo(body.name, group.name, body.clientId);
+    }
   }
   if (req.body.recycleFilename) {
     recycleBin.remove(req.body.recycleFilename);

package/biz/webui/cgi-bin/rules/move-to.js

@@ -2,6 +2,6 @@ var rules = require('../../../../lib/rules/util').rules;
 
 module.exports = function(req, res) {
   var body = req.body;
-  var result = rules.moveTo(body.from, body.to, body.clientId);
+  var result = rules.moveTo(body.from, body.to, body.clientId, body.group === 'true', body.toTop === 'true');
   res.json({ec: result ? 0 : 2, em: 'success'});
 };

package/biz/webui/cgi-bin/rules/project.js

@@ -1,20 +1,37 @@
 var rules = require('../../../../lib/rules/util').rules;
 
+var DEFAULT_GROUP = '\rothers';
+
 module.exports = function(req, res) {
   var body = req.body;
-  var name = body.name;
+  var name = typeof body.name === 'string' ? body.name.trim() : null;
+  if (!name) {
+    return res.json({ ec: 0 });
+  }
   var rulesText = body.rules || body.value;
   if (!rulesText || !name || typeof rulesText !== 'string') {
     if (body.enable == 1) {
       rules.select(name);
     }
-    if (body.top == 1) {
+    return res.json({ ec: 0, rules: !!rules.get(name) });
+  }
+  if (rules.add(name, rulesText) != null) {
+    var groupName = typeof body.groupName === 'string' ? body.groupName.trim() : '';
+    rules.select(name);
+    if (groupName) {
+      groupName = '\r' + groupName;
+      var group = rules.getFirstGroup();
+      if (rules.add(groupName) != null) {
+        if (!group && groupName !== DEFAULT_GROUP) {
+          rules.add(DEFAULT_GROUP);
+          rules.moveToTop(DEFAULT_GROUP);
+        }
+        rules.moveToGroup(name, groupName, true);
+        rules.moveGroupToTop(groupName);
+      }
+    } else {
       rules.moveToTop(name);
     }
-    return res.json({ ec: 0, rules: !!rules.get(name) });
   }
-  rules.add(name, rulesText);
-  rules.select(name);
-  rules.moveToTop(name);
   res.json({ ec: 0 });
 };

package/biz/webui/cgi-bin/values/add.js

@@ -1,10 +1,19 @@
 var values = require('../../../../lib/rules/util').values;
 var recycleBin = require('../../../../lib/rules/util').values.recycleBin;
+var isGroup = require('../../../../lib/util/common').isGroup;
 
 module.exports = function(req, res) {
   var body = req.body;
   var list;
-  values.add(body.name, body.value, body.clientId);
+  var exists = values.exists(body.name);
+  if (values.add(body.name, body.value, body.clientId) != null && !isGroup(body.name)) {
+    if (body.groupName) {
+      values.moveToGroup(body.name, body.groupName);
+    } else if (!exists) {
+      var group = values.getFirstGroup();
+      group && values.moveTo(body.name, group.name, body.clientId);
+    }
+  }
   if (req.body.recycleFilename) {
     recycleBin.remove(req.body.recycleFilename);
     list = recycleBin.list();

package/biz/webui/cgi-bin/values/move-to.js

@@ -2,6 +2,6 @@ var values = require('../../../../lib/rules/util').values;
 
 module.exports = function(req, res) {
   var body = req.body;
-  var result = values.moveTo(body.from, body.to, body.clientId);
+  var result = values.moveTo(body.from, body.to, body.clientId, body.group === 'true');
   res.json({ec: result ? 0 : 2, em: 'success'});
 };

package/biz/webui/htdocs/index.html

@@ -8,6 +8,6 @@
 </head>
 <body style="overscroll-behavior-x: none;">
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.9.19"></script>
+<script src="js/index.js?v=2.9.22"></script>
 </body>
 </html>