whistle 2.9.103 → 2.9.105

package/bin/util.js

@@ -8,6 +8,7 @@ var config = require('../lib/config');
 var common = require('../lib/util/common');
 var colors = require('colors/safe');
 var path = require('path');
+var extend = require('extend');
 var createHmac = require('crypto').createHmac;
 
 var joinIpPort = common.joinIpPort;
@@ -72,7 +73,7 @@ function showKillError() {
 exports.showKillError = showKillError;
 
 function showUsage(isRunning, options, restart) {
-  options = formatOptions(options);
+  var rcConf;
   if (isRunning) {
     if (restart) {
       showKillError();
@@ -80,10 +81,20 @@ function showUsage(isRunning, options, restart) {
       warn('[!] ' + config.appName + '@' + config.version + ' is running');
     }
   } else {
+    rcConf = common.readWhistleRc(options);
+    if (rcConf) {
+      var rcStr = JSON.stringify(rcConf);
+      if (rcStr.length > 30) {
+        rcStr = rcStr.substring(0, 27) + '...';
+      }
+      info('[i] Load configuration from ~/.whistlerc: ' + rcStr);
+    }
     info('[i] ' + config.appName + '@' + config.version + (restart ? ' restarted' : ' started'));
   }
+  options = options ? extend({}, rcConf, options) : rcConf;
+  options = formatOptions(options);
   var port = /^\d+$/.test(options.port) && options.port > 0 ?  options.port : config.port;
-  var list = options.host && typeof options.host === 'string' ? [options.host] : getIpList();
+  var list = common.isString(options.host) ? [options.host] : getIpList();
   var oneIp = list.length === 1;
   var index = 0;
   if (!oneIp) {

package/bin/whistle.js

@@ -169,6 +169,7 @@ program
   .option('--init [bypass]', 'auto configure proxy and install Root CA')
   .option('--cluster [workers]', 'start cluster with worker count (default: CPU cores)', String, undefined)
   .option('--config [config]', 'load startup config from file', String, undefined)
+  .option('--rcPath [rcPath]', 'load configuration from file (default: ～/.whistlerc)', String, undefined)
   .option('--dnsServer [dnsServer]', 'set custom DNS servers', String, undefined)
   .option('--socksPort [socksPort]', 'set SOCKSv5 server port', String, undefined)
   .option('--httpPort [httpPort]', 'set HTTP server port', String, undefined)

package/biz/webui/cgi-bin/get-data.js

@@ -57,6 +57,7 @@ module.exports = function(req, res) {
     disabledPlugins: !config.notAllowedDisablePlugins && properties.get('disabledPlugins') || {},
     allowMultipleChoice: properties.get('allowMultipleChoice'),
     backRulesFirst: properties.get('backRulesFirst'),
+    enabledCount: rules.getEnabledRules().length,
     disabledAllPlugins: !config.notAllowedDisablePlugins && properties.get('disabledAllPlugins'),
     disabledAllRules: !config.notAllowedDisableRules && properties.get('disabledAllRules'),
     interceptHttpsConnects: properties.isEnableCapture(),

package/biz/webui/cgi-bin/import-remote.js

@@ -27,7 +27,7 @@ module.exports = function(req, res) {
       if (err) {
         res.type('text').status(500).send(err.stack || err);
       } else {
-        req.url = '/cgi-bin/sessions/get-temp-file?filename=' + encodeURIComponent(url);
+        req.url = '/cgi-bin/temp/get?filename=' + encodeURIComponent(url);
         util.transformReq(req, res, options.port);
       }
     });

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

@@ -0,0 +1,10 @@
+var rules = require('../../../../lib/rules/util').rules;
+var util = require('../util');
+
+module.exports = function(req, res) {
+  util.sendGzip(req, res, {
+    ec: 0,
+    mflag: rules.getMFlag(),
+    list: rules.getEnabledRules()
+  });
+};

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

@@ -26,5 +26,6 @@ module.exports = function(req, res) {
   } else {
     filename = 'rules_' + util.formatDate() + '.txt';
   }
-  res.attachment(filename).send(JSON.stringify(result, null, '  '));
+  res.attachment(filename);
+  util.sendGzipText(req, res, null, JSON.stringify(result, null, '  '));
 };

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

@@ -1,14 +1,14 @@
 var get = require('./index');
-var getReqData = require('../util').getReqData;
 var addRules = require('../../../../lib/rules/util').addRules;
+var util = require('../util');
 
 module.exports = function(req, res) {
-  getReqData(req, function(err, result) {
+  util.getReqData(req, function(err, result) {
     if (err) {
       res.status(200).json({ ec: 2, em: err.message });
     } else {
       addRules(result.data, result.replace, req.query.clientId);
-      res.json(get());
+      util.sendGzip(req, res, get());
     }
   });
 };

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

@@ -4,6 +4,7 @@ var properties = require('../../../../lib/rules/util').properties;
 module.exports = function get() {
   return {
     ec: 0,
+    enabledCount: rules.getEnabledRules().length,
     defaultRulesIsDisabled: rules.defaultRulesIsDisabled(),
     defaultRules: rules.getDefault(),
     allowMultipleChoice: properties.get('allowMultipleChoice'),

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

@@ -1,5 +1,6 @@
 var get = require('./index');
+var util = require('../util');
 
 module.exports = function(req, res) {
-  res.json(get());
+  util.sendGzip(req, res, get());
 };

package/biz/webui/cgi-bin/rules/recycle/list.js

@@ -1,7 +1,8 @@
 var recycleBin = require('../../../../../lib/rules/util').rules.recycleBin;
+var util = require('../../util');
 
 module.exports = function(req, res) {
-  res.json({
+  util.sendGzip(req, res, {
     ec: 0,
     list: recycleBin.list()
   });

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

@@ -2,8 +2,10 @@ var gzip = require('zlib').gzip;
 var util = require('../../../lib/util');
 var config = require('../../../lib/config');
 var proc = require('../../../lib/util/process');
-var properties = require('../../../lib/rules/util').properties;
+var rulesUtil = require('../../../lib/rules/util');
 
+var properties = rulesUtil.properties;
+var rules = rulesUtil.rules;
 var PID = process.pid;
 var MAX_OBJECT_SIZE = 1024 * 1024 * 6;
 var index = 0;
@@ -31,6 +33,7 @@ exports.getServerInfo = function(req) {
     ipv6Only: config.ipv6Only,
     dcc: config.disableCustomCerts,
     dns: dnsOverHttps || config.dnsServer,
+    rulesMFlag: rules.getMFlag(),
     doh: doh,
     bip: config.host,
     df: config.dnsOptional,
@@ -151,6 +154,19 @@ function sendError(res, err) {
 
 exports.sendError = sendError;
 
+function sendGzipData(res, headers, buffer) {
+  if (headers) {
+    headers['Content-Encoding'] = 'gzip';
+    headers['Content-Length'] = buffer.length;
+    res.writeHead(200, headers);
+    res.end(buffer);
+  } else {
+    res.setHeader('Content-Encoding', 'gzip');
+    res.setHeader('Content-Length', buffer.length);
+    res.send(buffer);
+  }
+}
+
 exports.sendGzip = function(req, res, data) {
   if (!util.canGzip(req)) {
     return res.json(data);
@@ -164,11 +180,25 @@ exports.sendGzip = function(req, res, data) {
       }
       return;
     }
-    res.writeHead(200, {
-      'Content-Type': 'application/json; charset=utf-8',
-      'Content-Encoding': 'gzip',
-      'Content-Length': result.length
-    });
-    res.end(result);
+    sendGzipData(res, {
+      'Content-Type': 'application/json; charset=utf-8'
+    }, result);
+  });
+};
+
+exports.sendGzipText = function(req, res, headers, text, gzipText) {
+  if (!text || !util.canGzip(req)) {
+    headers && res.writeHead(200, headers);
+    return headers ? res.end(text) : res.send(text);
+  }
+  if (gzipText) {
+    return sendGzipData(res, headers, gzipText);
+  }
+  gzip(text, function(err, result) {
+    if (err) {
+      headers && res.writeHead(200, headers);
+      return headers ? res.end(text) : res.send(text);
+    }
+    sendGzipData(res, headers, result);
   });
 };

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

@@ -1,14 +1,14 @@
 var get = require('./index');
-var getReqData = require('../util').getReqData;
+var util = require('../util');
 var addValues = require('../../../../lib/rules/util').addValues;
 
 module.exports = function(req, res) {
-  getReqData(req, function(err, result) {
+  util.getReqData(req, function(err, result) {
     if (err) {
       res.status(200).json({ ec: 2, em: err.message });
     } else {
       addValues(result.data, result.replace, req.query.clientId);
-      res.json(get());
+      util.sendGzip(req, res, get());
     }
   });
 };

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

@@ -1,5 +1,6 @@
 var get = require('./index');
+var util = require('../util');
 
 module.exports = function(req, res) {
-  res.json(get());
+  util.sendGzip(req, res, get());
 };

package/biz/webui/cgi-bin/values/recycle/list.js

@@ -1,7 +1,8 @@
 var recycleBin = require('../../../../../lib/rules/util').values.recycleBin;
+var util = require('../../util');
 
 module.exports = function(req, res) {
-  res.json({
+  util.sendGzip(req, res, {
     ec: 0,
     list: recycleBin.list()
   });

package/biz/webui/htdocs/index.html

@@ -8,6 +8,6 @@
 </head>
 <body style="overscroll-behavior-x: none;">
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.9.103"></script>
+<script src="js/index.js?v=2.9.104"></script>
 </body>
 </html>