whistle 2.10.2 → 2.10.3

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/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/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/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, em: 'success'});
+};
+

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.3"></script>
 </body>
 </html>