whistle 2.9.45 → 2.9.46

package/README.md

@@ -7,7 +7,6 @@
 # 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-%3E=_8-green.svg?style=flat-square)](http://nodejs.org/download/)
-[![build status](https://img.shields.io/travis/avwo/whistle.svg?style=flat-square)](https://travis-ci.org/avwo/whistle)
 [![Test coverage](https://codecov.io/gh/avwo/whistle/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/avwo/whistle)
 [![npm download](https://img.shields.io/npm/dm/whistle.svg?style=flat-square)](https://npmjs.org/package/whistle)
 [![NPM count](https://img.shields.io/npm/dt/whistle.svg?style=flat-square)](https://www.npmjs.com/package/whistle)
@@ -70,6 +69,10 @@ Whistle 是基于 Node 实现的跨平台抓包调试工具，其主要特点：
 ### 详细用法参见：[Whistle 帮助文档](https://wproxy.org/whistle/quickstart.html)
 
 # 通过 SwitchyOmega 设置代理
+### 安装 SwitchyOmega
+打开 Chrome 扩展商店进行安装 https://chrome.google.com/webstore/detail/proxy-switchyomega/padekgcemlokbadohgkifijomclgjgif
+
+### 配置 SwitchyOmega
 全局代理如果会影响到某些客户端的请求（客户端设置了 ssl pinning），也可以使用 Chrome 插件设置代理（只对 Chrome 生效）：
 > 可以通过 `w2 proxy off` 关闭全局代理
 

package/assets/tab.html

@@ -282,6 +282,7 @@
         });
         getActiveSession = options.getActiveSession;
         getSelectedSessionList = options.getSelectedSessionList;
+        whistleBridge.copyText = options.copyText;
         whistleBridge.pageId = options.pageId;
         whistleBridge.compose = options.compose;
         whistleBridge.decodeBase64 = options.decodeBase64;

package/lib/handlers/file-proxy.js

@@ -5,6 +5,7 @@ var mime = require('mime');
 var qs = require('querystring');
 var Buffer = require('safe-buffer').Buffer;
 var PassThrough = require('stream').PassThrough;
+var rulesMgr = require('../rules');
 var protoMgr = require('../rules/protocols');
 var pluginMgr = require('../plugins');
 
@@ -13,6 +14,8 @@ var RAW_FILE_RE = /rawfile/;
 var HEADERS_SEP_RE = /(\r?\n(?:\r\n|\r|\n)|\r\r\n?)/;
 var MAX_HEADERS_SIZE = 256 * 1024;
 var TPL_RE = /(?:dust|tpl|jsonp):$/;
+var VAR_RE = /\{\S+\}/;
+var QUERY_VAR_RE = /\$?(?:\{\{([\w$-]+)\}\}|\{([\w$-]+)\})/g;
 
 function isRawFileProtocol(protocol) {
   return RAW_FILE_RE.test(protocol);
@@ -283,18 +286,20 @@ module.exports = function (req, res, next) {
 
   function render(reader) {
     if (reader.body) {
-      var data = qs.parse(util.getQueryString(req.fullUrl));
-      if (Object.keys(data).length) {
-        reader.body = reader.body.replace(
-          /\{\{([\w\-$]+)\}\}|\$?\{([\w\-$]+)\}/g,
-          function (all, matched1, matched2) {
-            var value = data[matched1 || matched2];
-            if (value === undefined) {
+      if (VAR_RE.test(reader.body)) {
+        var data = util.getQueryString(req.fullUrl);
+        data = data && qs.parse(data);
+        if (data) {
+          reader.body = reader.body.replace(QUERY_VAR_RE, function (all, matched1, matched2) {
+            if (all[0] === '$') {
               return all;
             }
-            return util.getQueryValue(value);
+            var value = data[matched1 || matched2];
+            return value === undefined ? all : util.getQueryValue(value);
           }
-        );
+          );
+        }
+        reader.body = rulesMgr.resolveTplVar(reader.body, req);
       }
       addLength(reader, Buffer.byteLength(reader.body));
     } else {

package/lib/rules/index.js

@@ -60,6 +60,7 @@ exports.resolveBodyFilter = rules.resolveBodyFilter.bind(rules);
 exports.lookupHost = rules.lookupHost.bind(rules);
 exports.resolveLocalRule = rules.resolveLocalRule.bind(rules);
 exports.clearAppend = rules.clearAppend.bind(rules);
+exports.resolveTplVar = Rules.resolveTplVar;
 
 exports.disableDnsCache = function () {
   Rules.disableDnsCache();

package/lib/rules/rules.js

@@ -729,17 +729,18 @@ function resolveTplVar(value, req) {
   });
 }
 
+Rules.resolveTplVar = resolveTplVar;
+
 function renderTpl(rule, req) {
   var matcher = rule.matcher;
   if (rule.isTpl === false) {
     return matcher;
   }
   rule.isTpl = false;
-  matcher = matcher.replace(TPL_RE, function (_, proto, value) {
+  return matcher.replace(TPL_RE, function (_, proto, value) {
     rule.isTpl = true;
     return (proto || '') + resolveTplVar(value.slice(1, -1), req);
   });
-  return matcher;
 }
 
 function resolveVar(rule, vals, req) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.9.45",
+  "version": "2.9.46",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,