whistle 2.10.2 → 2.10.4

package/assets/menu.html

@@ -189,6 +189,8 @@
           toast[name] = options.msgBox[name];
         });
         whistleBridge.getSelectedSessionList = options.getSelectedSessionList;
+        whistleBridge.getRawRequest = options.getRawRequest;
+        whistleBridge.getRawResponse = options.getRawResponse;
         whistleBridge.getActiveSession = whistleBridge.getSession = whistleBridge.getSelectedSession = options.getActiveSession;
         whistleBridge.showOption = options.showOption;
         whistleBridge.hideOption = options.hideOption;

package/assets/modal.html

@@ -12,6 +12,8 @@
           toast[name] = options.msgBox[name];
         });
         whistleBridge.getSelectedSessionList = options.getSelectedSessionList;
+        whistleBridge.getRawRequest = options.getRawRequest;
+        whistleBridge.getRawResponse = options.getRawResponse;
         whistleBridge.getActiveSession = whistleBridge.getSession = whistleBridge.getSelectedSession = options.getActiveSession;
         whistleBridge.showOption = options.showOption;
         whistleBridge.hideOption = options.hideOption;

package/assets/tab.html

@@ -5,7 +5,6 @@
     var activeList = [];
     var stateList = [1];
     var getActiveSession;
-    var getSelectedSessionList;
     var listenersList = [];
     var frameChangeListeners = [];
     var composeListeners = [];
@@ -282,7 +281,9 @@
           toast[name] = options.msgBox[name];
         });
         getActiveSession = options.getActiveSession;
-        getSelectedSessionList = options.getSelectedSessionList;
+        whistleBridge.getSelectedSessionList = options.getSelectedSessionList;
+        whistleBridge.getRawRequest = options.getRawRequest;
+        whistleBridge.getRawResponse = options.getRawResponse;
         whistleBridge.showOption = options.showOption;
         whistleBridge.hideOption = options.hideOption;
         whistleBridge.updateUI = options.updateUI;
@@ -324,7 +325,6 @@
         whistleBridge.createRequest = options.createRequest;
         whistleBridge.parseRules = options.parseRules;
         whistleBridge.showModal = options.showModal;
-        whistleBridge.getSelectedSessionList = getSelectedSessionList;
         whistleBridge.getActiveSession = whistleBridge.getSession = whistleBridge.getSelectedSession = getActiveSession;
         whistleBridge.importRules = options.importRules;
         whistleBridge.importValues = options.importValues;

package/bin/proxy.js

@@ -24,9 +24,9 @@ function enableProxy(options) {
   try {
     var host = util.joinIpPort(options.host, options.port);
     if (proxy.enableProxy(options)) {
-      showInfo('Successfully set system proxy (' + host + ')');
+      showInfo('Successfully enabled system proxy (' + host + ')');
     } else {
-      showError('Failed to set system proxy (' + host + ')');
+      showError('Failed to enable system proxy (' + host + ')');
     }
   } catch (e) {
     showError(e.message);

package/bin/whistle.js

@@ -129,7 +129,7 @@ program
   .description('Display running status');
 program
   .command('add')
-  .description('Add rules from local JS file (.whistle.js by default)');
+  .description('Add rules from local JS file (default: .whistle.js in current directory)');
 program.command('proxy')
   .description('Configure system proxy settings');
 program.command('ca')
@@ -144,18 +144,18 @@ program.command('exec')
 program
   .option('-D, --baseDir [baseDir]', 'set storage root path', String, undefined)
   .option('-z, --certDir [directory]', 'set custom certificate directory', String, undefined)
-  .option('-l, --localUIHost [hostname]', 'set web UI domain (' + config.localUIHost + ' by default)', String, undefined)
-  .option('-L, --pluginHost [hostname]', 'set plugin UI domains  (as: "script=a.b.com&vase=x.y.com")', String, undefined)
+  .option('-l, --localUIHost [hostname]', 'set web UI domain (default: ' + config.localUIHost + ')', String, undefined)
+  .option('-L, --pluginHost [hostname]', 'set plugin UI domains  (e.g., "script=a.b.com&vase=x.y.com")', String, undefined)
   .option('-n, --username [username]', 'set web UI username', String, undefined)
   .option('-w, --password [password]', 'set web UI password', String, undefined)
   .option('-N, --guestName [username]', 'set web UI guest username (read-only)', String, undefined)
   .option('-W, --guestPassword [password]', 'set web UI guest password (read-only)', String, undefined)
-  .option('-s, --sockets [number]', 'set max cached connections per domain (' + config.sockets + ' by default)', parseInt, undefined)
+  .option('-s, --sockets [number]', 'set max cached connections per domain (default: ' + config.sockets + ')', parseInt, undefined)
   .option('-S, --storage [newStorageDir]', 'set configuration storage directory', String, undefined)
   .option('-C, --copy [storageDir]', 'copy configuration from specified directory', String, undefined)
   .option('-c, --dnsCache [time]', 'set DNS cache time (default: 60000ms)', String, undefined)
   .option('-H, --host [boundHost]', 'set bound host (default: INADDR_ANY)', String, undefined)
-  .option('-p, --port [proxyPort]', 'set proxy port (default: ' + config.port + ' by default)', String, undefined)
+  .option('-p, --port [proxyPort]', 'set proxy port (default: ' + config.port + ')', String, undefined)
   .option('-P, --uiport [uiport]', 'set web UI port', String, undefined)
   .option('-m, --middlewares [script path or module name]', 'set startup middlewares (format: xx,yy/zz.js)', String, undefined)
   .option('-M, --mode [mode]', 'set startup mode (options: pureProxy|debug|multiEnv|capture|disableH2|network|rules|plugins|prod)', String, undefined)

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

@@ -18,5 +18,5 @@ module.exports = function(req, res) {
   if (valuesData) {
     values.add(valuesData.name, valuesData.value, clientId);
   }
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };

package/biz/webui/cgi-bin/check-update.js

@@ -11,7 +11,6 @@ module.exports = function(req, res) {
 
   res.json({
     ec: 0,
-    em: 'success',
     showUpdate: !config.disableUpdateTips && hasNewVersion > 1 && common.compareVersion(latestVersion, doNotShowAgainVersion) > 1,
     hasNewVersion: hasNewVersion > 0,
     hasUpdater: config.hasUpdater,

package/biz/webui/cgi-bin/do-not-show-again.js

@@ -2,7 +2,7 @@ var properties = require('../../../lib/rules/util').properties;
 
 module.exports = function(req, res) {
   properties.set('doNotShowAgainVersion', properties.getLatestVersion('latestVersion'));
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };
 
 

package/biz/webui/cgi-bin/download.js

@@ -17,7 +17,7 @@ module.exports = function(req, res) {
   }
 
   if (!filename || typeof filename !== 'string') {
-    filename = (type === 'mock' ? 'mock_' : 'text_') + util.formatDate() + suffix;
+    filename = (type === 'mock' ? 'rules_items_' : 'text_') + util.formatDate() + suffix;
   } else if (!/\.\w+$/.test(filename)) {
     filename += suffix;
   }

package/biz/webui/cgi-bin/enable-http2.js

@@ -2,6 +2,6 @@ var properties = require('../../../lib/rules/util').properties;
 
 module.exports = function(req, res) {
   properties.setEnableHttp2(req.body.enableHttp2 == 1);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };
 

package/biz/webui/cgi-bin/get-matched-rules.js

@@ -0,0 +1,14 @@
+var proxy = require('../lib/proxy');
+var util = require('./util');
+
+module.exports = function(req, res) {
+  var testId = req.query.testId;
+  var item = testId && proxy.getTestItem(testId);
+  if (!item) {
+    return res.json({});
+  }
+  util.sendGzip(req, res, {
+    realUrl: item.realUrl,
+    rules: item.rules
+  });
+};

package/biz/webui/cgi-bin/hide-https-connects.js

@@ -1,4 +1,4 @@
 module.exports = function(req, res) {
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };
 

package/biz/webui/cgi-bin/intercept-https-connects.js

@@ -2,6 +2,6 @@ var properties = require('../../../lib/rules/util').properties;
 
 module.exports = function(req, res) {
   properties.setEnableCapture(req.body.interceptHttpsConnects == 1);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };
 

package/biz/webui/cgi-bin/plugins/disable-all-plugins.js

@@ -2,5 +2,5 @@ var pluginMgr = require('../../lib/proxy').pluginMgr;
 
 module.exports = function(req, res) {
   pluginMgr.disableAllPlugins(req.body.disabledAllPlugins == 1);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };

package/biz/webui/cgi-bin/reset-local-address.js

@@ -2,5 +2,5 @@ var util = require('../../../lib/util');
 
 module.exports = function(req, res) {
   util.localIpCache.reset();
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };

package/biz/webui/cgi-bin/rules/allow-multiple-choice.js

@@ -5,7 +5,7 @@ module.exports = function(req, res) {
   var enable = req.body.allowMultipleChoice == 1;
   properties.set('allowMultipleChoice', enable);
   proxy.emit('rulesDataChange', 'allowMultipleChoice', enable);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };
 
 

package/biz/webui/cgi-bin/rules/clear-dns-cache.js

@@ -0,0 +1,7 @@
+var clearDnsCache = require('../../../../lib/rules/dns').clearCache;
+
+module.exports = function(req, res) {
+  clearDnsCache();
+  res.json({ec: 0});
+};
+

package/biz/webui/cgi-bin/rules/disable-all-rules.js

@@ -2,6 +2,6 @@ var rules = require('../../../../lib/rules/util').rules;
 
 module.exports = function(req, res) {
   rules.disableAllRules(req.body.disabledAllRules == 1);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };
 

package/biz/webui/cgi-bin/rules/disable-default.js

@@ -2,5 +2,5 @@ var rules = require('../../../../lib/rules/util').rules;
 
 module.exports = function(req, res) {
   rules.disableDefault();
-  res.json({ec: 0, em: 'success', defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList()});
+  res.json({ec: 0, defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList()});
 };

package/biz/webui/cgi-bin/rules/enable-back-rules-first.js

@@ -2,5 +2,5 @@ var rules = require('../../../../lib/rules/util').rules;
 
 module.exports = function(req, res) {
   rules.enableBackRulesFirst(req.body.backRulesFirst === '1');
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };

package/biz/webui/cgi-bin/rules/enable-default.js

@@ -3,5 +3,5 @@ var rules = require('../../../../lib/rules/util').rules;
 module.exports = function(req, res) {
   rules.enableDefault();
   rules.setDefault(req.body.value, req.body.clientId);
-  res.json({ec: 0, em: 'success', defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList()});
+  res.json({ec: 0, defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList()});
 };

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

@@ -3,5 +3,5 @@ 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, body.group === 'true', body.toTop === 'true');
-  res.json({ec: result ? 0 : 2, em: 'success'});
+  res.json({ec: result ? 0 : 2});
 };

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

@@ -2,5 +2,5 @@ var util = require('../../../../lib/rules/util');
 
 module.exports = function(req, res) {
   util.removeBatch(util.rules, req.body);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };

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

@@ -3,5 +3,5 @@ var rules = require('../../../../lib/rules/util').rules;
 module.exports = function(req, res) {
   var body = req.body;
   rules.rename(body.name, body.newName, body.clientId);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };

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

@@ -12,5 +12,5 @@ module.exports = function(req, res) {
     }
   }
   rules.select(req.body.name);
-  res.json({ec: 0, em: 'success', defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList(), changed: changed});
+  res.json({ec: 0, defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList(), changed: changed});
 };

package/biz/webui/cgi-bin/rules/set-sys-hosts.js

@@ -2,6 +2,6 @@ var rules = require('../../../../lib/rules/util').rules;
 
 module.exports = function(req, res) {
   rules.setSysHosts(req.body.hosts, function(err) {
-    res.json({ec: err ? 2 : 0, em: err ? err.stack : 'success'});
+    res.json({ec: err ? 2 : 0, em: err ? err.stack : undefined});
   });
 };

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

@@ -3,5 +3,5 @@ var rules = require('../../../../lib/rules/util').rules;
 module.exports = function(req, res) {
   rules.add(req.body.name, req.body.value);
   rules.unselect(req.body.name);
-  res.json({ec: 0, em: 'success', defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList()});
+  res.json({ec: 0, defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList()});
 };

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

@@ -3,5 +3,5 @@ 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, body.group === 'true');
-  res.json({ec: result ? 0 : 2, em: 'success'});
+  res.json({ec: result ? 0 : 2});
 };

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

@@ -2,5 +2,5 @@ var util = require('../../../../lib/rules/util');
 
 module.exports = function(req, res) {
   util.removeBatch(util.values, req.body);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };

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

@@ -3,5 +3,5 @@ var values = require('../../../../lib/rules/util').values;
 module.exports = function(req, res) {
   var body = req.body;
   values.rename(body.name, body.newName, body.clientId);
-  res.json({ec: 0, em: 'success'});
+  res.json({ec: 0});
 };

package/biz/webui/htdocs/index.html

@@ -8,6 +8,6 @@
 </head>
 <body>
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.10.2"></script>
+<script src="js/index.js?v=2.10.4"></script>
 </body>
 </html>