Merge commit 'd0f652e3be157d5cfa4666eec97515af80decaa9'

Author: xcodebuild

vendor/whistle/.eslintignore

@@ -4,3 +4,4 @@ node_modules
 /test/assets/values
 /test/plugins/whistle.test/assets
 /bin/import.js
+/test/all_whistles

vendor/whistle/.gitignore

@@ -65,3 +65,4 @@ _book
 dist
 /.history
 /test/temp_files
+/test/all_whistles

vendor/whistle/CHANGELOG.md

@@ -1,3 +1,18 @@
+# v2.9.97
+1. feat: 导入 Rules 和 Values 的交互调整，允许用户手动选择需要导入的内容
+2. feat: 安装插件功能优化
+3. feat: 支持通过 `lineProps://internal` 将规则作用于 Whistle 内部请求（只支持 host、proxy 等部分规则）
+
+# v2.9.96
+1. feat: 支持导出指定规则项
+
+# v2.9.95
+1. feat: JSON Viewer 的右键菜单支持 Copy 选中的文本
+2. feat: Composer 历史列表添加右键菜单
+3. feat: 优化界面及性能
+4. feat: 支持通过插件安装插件，实现方式参考：https://github.com/whistle-plugins/whistle.installer
+5. feat: 支持通过界面卸载插件
+
 # v2.9.94
 1. fix: https://github.com/avwo/whistle/pull/1192
 

vendor/whistle/README-en_US.md

@@ -14,7 +14,7 @@
 
 [中文](./README-zh_CN.md) · English
 
-Whistle is a simple and powerful cross-platform packet capture and debugging tool based on Node.JS. It can be used as **HTTP proxy (default)**, **HTTPS proxy**, **Socks proxy**, **reverse proxy**, etc., for **packet capture analysis** or **modification through configuration rules** of HTTP, HTTPS, HTTP/2, WebSocket, TCP requests. It also has built-in **Weinre**, **Log**, **Composer** and other tools to view the DOM structure of remote pages, view console output content, replay and edit construction requests, etc. It also supports **plug-in extension functions** or **referenced by projects as NPM packages**.
+Whistle is a powerful and easy-to-use cross-platform packet capture and debugging tool developed based on Node.js. It supports multiple proxy modes (such as HTTP, HTTPS, Socks, reverse proxy, etc.), which can be used for packet capture analysis or modifying HTTP, HTTPS, HTTP/2, WebSocket, TCP requests through configuration rules. Whistle also has built-in tools such as Weinre, Log, Composer, etc., which support viewing the DOM structure of remote pages, debugging console output, replaying or editing requests, etc. In addition, Whistle supports plug-in extensions and can also be referenced by other projects as NPM packages.
 
 # Installation
 

vendor/whistle/README.md

@@ -4,7 +4,7 @@
   </a>
 </p>
 
-# Whistle
+# whistle
 
 [![NPM version](https://img.shields.io/npm/v/whistle.svg?style=flat-square)](https://npmjs.org/package/whistle)
 [![node version](https://img.shields.io/badge/node.js->=_8-green.svg?style=flat-square)](http://nodejs.org/download/)
@@ -15,7 +15,7 @@
 
 中文 · [English](./README-en_US.md)
 
-Whistle 是基于 Node.JS 实现的操作简单、功能强大的跨平台抓包调试工具，可作为 **HTTP 代理（默认）**、**HTTPS 代理**、**Socks 代理**、**反向代理**等，用于**抓包分析**或**通过配置规则修改** HTTP、HTTPS、HTTP/2、WebSocket、TCP 请求，且内置 **Weinre**、**Log** 、**Composer** 等工具可查看远程页面的 DOM 结构、查看 console 输出内容、重放编辑构造请求等，并支持 **插件扩展功能** 或 **作为 NPM 包被项目引用**。
+Whistle 是一个基于 Node.js 开发的功能强大、操作简单的跨平台抓包调试工具。它支持多种代理模式（如 HTTP、HTTPS、Socks、反向代理等），可用于抓包分析或通过配置规则修改 HTTP、HTTPS、HTTP/2、WebSocket、TCP 请求。Whistle 还内置了 Weinre、Log、Composer 等工具，支持查看远程页面的 DOM 结构、调试 console 输出、重放或编辑请求等。此外，Whistle 支持插件扩展，也可作为 NPM 包被其他项目引用。
 
 # 安装
 

vendor/whistle/assets/js/log.js

@@ -268,7 +268,7 @@
   }
 
   function getPageInfo() {
-    return '\r\nPage Url: ' + location.href + '\r\nUser Agent: ' + navigator.userAgent;
+    return '\r\nPage URL: ' + location.href + '\r\nUser Agent: ' + navigator.userAgent;
   }
 
   function getErrorStack(error, message) {

vendor/whistle/assets/menu.html

@@ -162,7 +162,7 @@
           return;
       }
     }
-    
+
     var whistleBridge = {
       config: config,
       toast: toast,
@@ -202,8 +202,11 @@
         whistleBridge.download = options.download;
         whistleBridge.setNetworkSettings = options.setNetworkSettings;
         whistleBridge.setComposerData = options.setComposerData;
+        whistleBridge.showHttpsSettings = options.showHttpsSettings;
+        whistleBridge.showCustomCerts = options.showCustomCerts;
         whistleBridge.request = options.request;
         whistleBridge.createRequest = options.createRequest;
+        whistleBridge.parseRules = options.parseRules;
         whistleBridge.showModal = options.showModal;
         whistleBridge.createModal = options.createModal;
         whistleBridge.importRules = options.importRules;

vendor/whistle/assets/modal.html

@@ -25,8 +25,11 @@
         whistleBridge.download = options.download;
         whistleBridge.setNetworkSettings = options.setNetworkSettings;
         whistleBridge.setComposerData = options.setComposerData;
+        whistleBridge.showHttpsSettings = options.showHttpsSettings;
+        whistleBridge.showCustomCerts = options.showCustomCerts;
         whistleBridge.request = options.request;
         whistleBridge.createRequest = options.createRequest;
+        whistleBridge.parseRules = options.parseRules;
         whistleBridge.showModal = options.showModal;
         whistleBridge.importRules = options.importRules;
         whistleBridge.importValues = options.importValues;

vendor/whistle/assets/tab.html

@@ -154,7 +154,7 @@
     var addSessionCompleteListener = getAddEventHandler(3);
     var removeSessionCompleteListener = getRemoveEventListener(3);
     var removeSessionCompleteListeners = getRemoveEventListeners(3);
-  
+
     function on(type, l) {
       if (typeof l !== 'function') {
         return;
@@ -295,8 +295,11 @@
         whistleBridge.download = options.download;
         whistleBridge.setNetworkSettings = options.setNetworkSettings;
         whistleBridge.setComposerData = options.setComposerData;
+        whistleBridge.showHttpsSettings = options.showHttpsSettings;
+        whistleBridge.showCustomCerts = options.showCustomCerts;
         whistleBridge.request = options.request;
         whistleBridge.createRequest = options.createRequest;
+        whistleBridge.parseRules = options.parseRules;
         whistleBridge.showModal = options.showModal;
         whistleBridge.getSelectedSessionList = getSelectedSessionList;
         whistleBridge.getActiveSession = whistleBridge.getSession = whistleBridge.getSelectedSession = getActiveSession;

vendor/whistle/bin/plugin.js

@@ -45,14 +45,43 @@ function formatCmdOpions(options) {
   return options;
 }
 
+function getValue(str) {
+  if (str[0] !== '"') {
+    return str;
+  }
+  var len = str.length - 1;
+  return str[len] === '"' ? str.substring(1, len) : str;
+}
+
+function parseDir(dir) {
+  if (!dir) {
+    return;
+  }
+  dir = getValue(dir);
+  if (/^~(~)?(?:$|[\/])/.test(dir)) {
+    var wave = RegExp.$1;
+    var all = RegExp['$&'];
+    return path.resolve(wave ? getWhistlePath() : commonUtil.getHomedir(), dir.substring(all.length));
+  }
+  if (commonUtil.isWhistleName(dir)) {
+    return path.resolve(getWhistlePath(), 'all_whistles/' + dir + '/custom_plugins');
+  }
+  return path.resolve(dir);
+}
+
 function getInstallDir(argv) {
   argv = argv.slice();
   var result = { argv: argv };
   for (var i = 0, len = argv.length; i < len; i++) {
     var option = argv[i];
+    if (option === '--dir') {
+      result.dir = parseDir(argv[i + 1]);
+      argv.splice(i, 2);
+      return result;
+    }
     if (option && option.indexOf('--dir=') === 0) {
       var dir = option.substring(option.indexOf('=') + 1);
-      result.dir = dir && path.resolve(dir);
+      result.dir = parseDir(dir);
       argv.splice(i, 1);
       return result;
     }
@@ -222,7 +251,7 @@ exports.install = function(cmd, argv) {
   argv = argv.filter(function(name) {
     return plugins.indexOf(name) === -1;
   });
-  
+
   cmd += CMD_SUFFIX;
   argv.push('--no-package-lock');
   installPlugins(cmd, plugins, argv, {});