whistle 2.10.3 → 2.10.5

package/assets/menu.html

@@ -200,7 +200,6 @@
         whistleBridge.compose = options.compose;
         whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.getWhistleId = options.getWhistleId;
-        whistleBridge.hasWhistleToken = options.hasWhistleToken;
         whistleBridge.decodeBase64 = options.decodeBase64;
         whistleBridge.joinBase64 = options.joinBase64;
         whistleBridge.getReqId = options.getReqId;

package/assets/modal.html

@@ -23,7 +23,6 @@
         whistleBridge.compose = options.compose;
         whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.getWhistleId = options.getWhistleId;
-        whistleBridge.hasWhistleToken = options.hasWhistleToken;
         whistleBridge.decodeBase64 = options.decodeBase64;
         whistleBridge.joinBase64 = options.joinBase64;
         whistleBridge.getReqId = options.getReqId;

package/assets/tab.html

@@ -292,7 +292,6 @@
         whistleBridge.compose = options.compose;
         whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.getWhistleId = options.getWhistleId;
-        whistleBridge.hasWhistleToken = options.hasWhistleToken;
         whistleBridge.decodeBase64 = options.decodeBase64;
         whistleBridge.joinBase64 = options.joinBase64;
         whistleBridge.getReqId = options.getReqId;

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/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/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

@@ -2,6 +2,6 @@ var clearDnsCache = require('../../../../lib/rules/dns').clearCache;
 
 module.exports = function(req, res) {
   clearDnsCache();
-  res.json({ec: 0, em: 'success'});
+  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/util.js

@@ -27,7 +27,6 @@ exports.getServerInfo = function(req) {
   var info = {
     whistleId: config.whistleId,
     hasUpdater: config.hasUpdater,
-    hasWhistleToken: config.hasWhistleToken,
     pid: PID,
     pInfo: proc,
     verbatim: config.verbatim,

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.3"></script>
+<script src="js/index.js?v=2.10.5"></script>
 </body>
 </html>