whistle 2.9.101 → 2.9.102

package/bin/ca/cli.js

@@ -29,7 +29,7 @@ function install(addr, useDefault) {
   addr.needRawData = true;
   addr.maxLength = MAX_LEN;
   addr.headers = {
-    'user-agent': 'whistle/' + config.name
+    'user-agent': config.appName + '/' + config.version
   };
   httpMgr.request(addr, function(err, body, res) {
     if (err) {

package/bin/use.js

@@ -14,7 +14,7 @@ var warn = util.warn;
 var info = util.info;
 var readConfig = util.readConfig;
 var MAX_RULES_LEN = 1024 * 256;
-var DEFAULT_OPTIONS = { host: '127.0.0.1', port: 8899 };
+var DEFAULT_OPTIONS = util.DEFAULT_OPTIONS;
 var options;
 
 function showStartWhistleTips(storage, isClient) {
@@ -60,21 +60,6 @@ function existsPlugin(name) {
   return false;
 }
 
-function getBody(res, callback) {
-  var resBody = '';
-  res.setEncoding('utf8');
-  res.on('data', function(data) {
-    resBody += data;
-  });
-  res.on('end', function() {
-    if (res.statusCode != 200) {
-      callback(resBody || 'response ' + res.statusCode + ' error');
-    } else {
-      callback(null, JSON.parse(resBody));
-    }
-  });
-}
-
 var reqOptions;
 function request(body, callback) {
   if (!reqOptions) {
@@ -92,7 +77,7 @@ function request(body, callback) {
     }
   }
   var req = http.request(reqOptions, function(res) {
-    getBody(res, function(err, data) {
+    util.getBody(res, function(err, data) {
       if (err) {
         throw err;
       }
@@ -116,7 +101,7 @@ function checkDefault(running, storage, isClient, callback) {
   };
   var req = http.get('http://' + DEFAULT_OPTIONS.host + ':' + DEFAULT_OPTIONS.port + '/cgi-bin/status', function(res) {
     res.on('error', execCallback);
-    getBody(res, function(err, data) {
+    util.getBody(res, function(err, data) {
       if (err || !data || data.name !== pkg.name || data.storage !== storage) {
         return execCallback(true);
       }

package/bin/util.js

@@ -11,8 +11,10 @@ var path = require('path');
 var createHmac = require('crypto').createHmac;
 
 var joinIpPort = common.joinIpPort;
+var DEFAULT_OPTIONS = { host: '127.0.0.1', port: 8899 };
 
 exports.joinIpPort = joinIpPort;
+exports.DEFAULT_OPTIONS = DEFAULT_OPTIONS;
 /*eslint no-console: "off"*/
 var CHECK_RUNNING_CMD = process.platform === 'win32' ?
   'tasklist /fi "PID eq %s" | findstr /i "node.exe"'
@@ -63,7 +65,7 @@ exports.warn = warn;
 exports.info = info;
 
 function showKillError() {
-  error('[!] Cannot kill ' + config.name + ' owned by root');
+  error('[!] Cannot kill ' + config.appName + ' owned by root');
   info('[i] Try to run command ' + (isWin ? 'as an administrator' : 'with sudo'));
 }
 
@@ -75,10 +77,10 @@ function showUsage(isRunning, options, restart) {
     if (restart) {
       showKillError();
     } else {
-      warn('[!] ' + config.name + '@' + config.version + ' is running');
+      warn('[!] ' + config.appName + '@' + config.version + ' is running');
     }
   } else {
-    info('[i] ' + config.name + '@' + config.version + (restart ? ' restarted' : ' started'));
+    info('[i] ' + config.appName + '@' + config.version + (restart ? ' restarted' : ' started'));
   }
   var port = /^\d+$/.test(options.port) && options.port > 0 ?  options.port : config.port;
   var list = options.host && typeof options.host === 'string' ? [options.host] : getIpList();
@@ -92,8 +94,8 @@ function showUsage(isRunning, options, restart) {
     warn('       Note: If none are accessible, check your firewall settings');
     warn('             For help, see ' + colors.bold('https://github.com/avwo/whistle'));
   }
-  info('[i] ' + (++index) + '. set your device\'s HTTP PROXY to ' + colors.bold((oneIp ? 'IP(' + list[0] + ')' : 'the working IP') + ' & PORT(' + port + ')'));
-  info('[i] ' + (++index) + '. open ' + colors.bold('Chrome') + ' and visit ' + colors.bold('http://' + (options.localUIHost || config.localUIHost) + '/') + ' to begin');
+  info('[i] ' + (++index) + '. Set your device\'s HTTP PROXY to ' + colors.bold((oneIp ? 'IP(' + list[0] + ')' : 'the working IP') + ' & PORT(' + port + ')'));
+  info('[i] ' + (++index) + '. Open ' + colors.bold('Chrome') + ' and visit ' + colors.bold('http://' + (options.localUIHost || config.localUIHost) + '/') + ' to begin');
 
   var bypass = program.init;
   if (bypass == null) {
@@ -171,3 +173,19 @@ exports.getDefaultPort = function () {
   var port = conf && conf.port;
   return port > 0 ? port : 8899;
 };
+
+function getBody(res, callback) {
+  var resBody;
+  res.on('data', function(data) {
+    resBody = resBody ? Buffer.concat([resBody, data]) : data;
+  });
+  res.on('end', function() {
+    if (res.statusCode != 200) {
+      callback(resBody || 'response ' + res.statusCode + ' error');
+    } else {
+      callback(null, JSON.parse(resBody + ''));
+    }
+  });
+}
+
+exports.getBody = getBody;

package/bin/whistle.js

@@ -2,6 +2,7 @@
 /*eslint no-console: "off"*/
 var program = require('starting');
 var path = require('path');
+var http = require('http');
 var config = require('../lib/config');
 var useRules = require('./use');
 var showStatus = require('./status');
@@ -9,19 +10,51 @@ var util = require('./util');
 var plugin = require('./plugin');
 var setProxy = require('./proxy');
 var installCA = require('./ca/cli');
+var colors = require('colors');
 
 var error = util.error;
 var info = util.info;
+var OPTIONS = util.DEFAULT_OPTIONS;
 
-function handleEnd(err, options, restart) {
-  options = util.showUsage(err, options, restart);
-  if (!options) {
+function getLatestVersion(options, cb, index) {
+  var done;
+  var handleCb = function(err, data) {
+    if (done) {
+      return;
+    }
+    index = index || 0;
+    if (index < 5 && (err || !data)) {
+      return setTimeout(function() {
+        getLatestVersion(options, cb, index + 1);
+      }, 300);
+    }
+    done = true;
+    cb(data && data.hasNewVersion ? data.latestVersion : '');
+  };
+  options = options || OPTIONS;
+  var req = http.get('http://' + util.joinIpPort(options.host || OPTIONS.host, options.port || OPTIONS.port) + '/cgi-bin/check-update', function(res) {
+    res.on('error', handleCb);
+    util.getBody(res, handleCb);
+  });
+  req.on('error', handleCb);
+  req.end();
+}
+
+function handleEnd(err, options, restart, run) {
+  var result = util.showUsage(err, options, restart);
+  getLatestVersion(options, function(latestVersion) {
+    if (latestVersion) {
+      error('[!] A new version is available (v' + latestVersion + '). Run \'' + colors.bold('npm i -g ' + config.name) + '\' to update');
+    }
+    run && console.log('Press [Ctrl+C] to stop ' + config.appName + '...');
+  });
+  if (!result) {
     return;
   }
-  var host = util.joinIpPort(options.host, options.port);
+  var host = util.joinIpPort(result.host, result.port);
   var argv = [host];
-  if (options.bypass) {
-    argv.push('-x', options.bypass);
+  if (result.bypass) {
+    argv.push('-x', result.bypass);
   }
   setProxy(argv);
   installCA([host]);
@@ -35,10 +68,10 @@ function showStartupInfo(err, options, debugMode, restart) {
     options = util.formatOptions(options);
     var port = options.port || config.port;
     error('[!] Failed to bind proxy port ' + (options.host ? util.joinIpPort(options.host, port) : port) + ': Port already in use');
-    info('[i] ' + config.name + ' may already be running. Try: ' + (debugMode ? 'w2 stop' : 'w2 restart') + ' to ' + (debugMode ? 'stop' : 'restart') + ' the ' + config.name);
+    info('[i] ' + config.appName + ' may already be running. Try: ' + (debugMode ? 'w2 stop' : 'w2 restart') + ' to ' + (debugMode ? 'stop' : 'restart') + ' ' + config.appName);
     info('    or use a different port with: ' + (debugMode ? '`w2 run -p newPort`\n' : '`w2 start -p newPort`\n'));
   } else if (err.code == 'EACCES' || err.code == 'EPERM') {
-    error('[!] Permission denied: Cannot start ' + config.name + ' as root');
+    error('[!] Permission denied: Cannot start ' + config.appName + ' as root');
     info('[i] Try running with sudo\n');
   }
 
@@ -70,8 +103,7 @@ program.setConfig({
       showStartupInfo(err, options, true);
       return;
     }
-    handleEnd(false, options);
-    console.log('Press [Ctrl+C] to stop ' + config.name + '...');
+    handleEnd(false, options, false, true);
   },
   startCallback: showStartupInfo,
   restartCallback: function(err, options) {
@@ -79,7 +111,7 @@ program.setConfig({
   },
   stopCallback: function(err) {
     if (err === true) {
-      info('[i] ' + config.name + ' killed');
+      info('[i] ' + config.appName + ' killed');
     } else if (err) {
       if (err.code === 'EPERM') {
         util.showKillError();

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

@@ -1,38 +1,18 @@
 var properties = require('../../../lib/rules/util').properties;
 var config = require('../../../lib/config');
-
-function compare(v1, v2) {
-  if (typeof v1 != 'string') {
-    return false;
-  }
-  if (typeof v2 != 'string') {
-    return true;
-  }
-  v1 = v1.split('.');
-  v2 = v2.split('.');
-  var v1Major = parseInt(v1[0], 10) || 0;
-  var v2Major = parseInt(v2[0], 10) || 0;
-
-  if (v1Major < v2Major) {
-    return false;
-  }
-
-  if (v1Major > v2Major) {
-    return true;
-  }
-
-  return parseInt(v1[1], 10) > parseInt(v2[1], 10);
-}
+var common = require('../../../lib/util/common');
 
 module.exports = function(req, res) {
   var version = config.version;
   var doNotShowAgainVersion = properties.get('doNotShowAgainVersion');
   var latestVersion = properties.getLatestVersion('latestVersion');
+  var hasNewVersion = common.compareVersion(latestVersion, version);
 
   res.json({
     ec: 0,
     em: 'success',
-    showUpdate: !config.disableUpdateTips && compare(latestVersion, version) && compare(latestVersion, doNotShowAgainVersion),
+    showUpdate: !config.disableUpdateTips && hasNewVersion > 1 && common.compareVersion(latestVersion, doNotShowAgainVersion) > 1,
+    hasNewVersion: hasNewVersion > 0,
     version: config.version,
     latestVersion: latestVersion
   });

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

@@ -1,8 +1,6 @@
-var properties = require('../../../../lib/rules/util').properties;
 var pluginMgr = require('../../lib/proxy').pluginMgr;
 
 module.exports = function(req, res) {
-  properties.set('disabledAllPlugins', req.body.disabledAllPlugins == 1);
-  pluginMgr.updateRules();
+  pluginMgr.disableAllPlugins(req.body.disabledAllPlugins == 1);
   res.json({ec: 0, em: 'success'});
 };

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

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

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