whistle 2.9.97 → 2.9.98

package/assets/menu.html

@@ -204,6 +204,13 @@
         whistleBridge.setComposerData = options.setComposerData;
         whistleBridge.showHttpsSettings = options.showHttpsSettings;
         whistleBridge.showCustomCerts = options.showCustomCerts;
+        whistleBridge.showService = options.showService;
+        whistleBridge.hideService = options.hideService;
+        whistleBridge.showInstallPlugins = options.showInstallPlugins;
+        whistleBridge.showUpdatePlugins = options.showUpdatePlugins;
+        whistleBridge.readFileAsText = options.readFileAsText;
+        whistleBridge.readFileAsBase64 = options.readFileAsBase64;
+        whistleBridge.getVersion = options.getVersion;
         whistleBridge.request = options.request;
         whistleBridge.createRequest = options.createRequest;
         whistleBridge.parseRules = options.parseRules;

package/assets/modal.html

@@ -27,6 +27,13 @@
         whistleBridge.setComposerData = options.setComposerData;
         whistleBridge.showHttpsSettings = options.showHttpsSettings;
         whistleBridge.showCustomCerts = options.showCustomCerts;
+        whistleBridge.showService = options.showService;
+        whistleBridge.hideService = options.hideService;
+        whistleBridge.showInstallPlugins = options.showInstallPlugins;
+        whistleBridge.showUpdatePlugins = options.showUpdatePlugins;
+        whistleBridge.readFileAsText = options.readFileAsText;
+        whistleBridge.readFileAsBase64 = options.readFileAsBase64;
+        whistleBridge.getVersion = options.getVersion;
         whistleBridge.request = options.request;
         whistleBridge.createRequest = options.createRequest;
         whistleBridge.parseRules = options.parseRules;

package/assets/tab.html

@@ -297,6 +297,13 @@
         whistleBridge.setComposerData = options.setComposerData;
         whistleBridge.showHttpsSettings = options.showHttpsSettings;
         whistleBridge.showCustomCerts = options.showCustomCerts;
+        whistleBridge.showService = options.showService;
+        whistleBridge.hideService = options.hideService;
+        whistleBridge.showInstallPlugins = options.showInstallPlugins;
+        whistleBridge.showUpdatePlugins = options.showUpdatePlugins;
+        whistleBridge.readFileAsText = options.readFileAsText;
+        whistleBridge.readFileAsBase64 = options.readFileAsBase64;
+        whistleBridge.getVersion = options.getVersion;
         whistleBridge.request = options.request;
         whistleBridge.createRequest = options.createRequest;
         whistleBridge.parseRules = options.parseRules;

package/bin/ca/cli.js

@@ -16,9 +16,9 @@ var MAX_LEN = 1024 * 1024;
 function installCert(certFile, url) {
   try {
     installRootCA(fileMgr.convertSlash(certFile));
-    util.info('Install root CA (' + (url || certFile) + ') successful.');
+    util.info('Successfully installed Root CA from (' + (url || certFile) + ').');
   } catch (e) {
-    util.error(e.message);
+    util.error('Certificate installation failed: ' + e.message);
   }
 }
 
@@ -39,7 +39,7 @@ function install(addr) {
       return util.error('Bad response (' + res.statusCode + ').');
     }
     if (!body || !body.length) {
-      return util.error('No content.');
+      return util.error('Empty certificate content.');
     }
     var tempFile = path.join(commonUtil.getWhistlePath(), Date.now() + '-' + util.getHash(addr.url) + '.crt');
     fs.writeFileSync(tempFile, body);

package/bin/ca/index.js

@@ -39,5 +39,5 @@ module.exports = function(certFile) {
   if (platform === 'win32') {
     return installWin(certFile);
   }
-  throw new Error('Platform ' + platform + ' is unsupported to install root CA for now.');
+  throw new Error('Platform ' + platform + ' is currently unsupported for Root CA installation.');
 };

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('Setting global proxy (' + host + ') successful.');
+      showInfo('Successfully set system proxy (' + host + ').');
     } else {
-      showError('Failed to set global proxy (' + host + ').');
+      showError('Failed to set system proxy (' + host + ').');
     }
   } catch (e) {
     showError(e.message);
@@ -36,9 +36,9 @@ function enableProxy(options) {
 function disableProxy(sudo) {
   try {
     if (proxy.disableProxy(sudo)) {
-      showInfo('Turn off global proxy successful.');
+      showInfo('Successfully disabled system proxy.');
     } else {
-      showError('Failed to turn off global proxy.');
+      showError('Failed to disable system proxy.');
     }
   } catch (e) {
     showError(e.message);

package/bin/status.js

@@ -22,9 +22,9 @@ function showAll(byStop) {
     });
     var len = confList.length;
     if (!len) {
-      warn('[!] No running whistle.');
+      warn('[!] No running Whistle instances.');
     } else {
-      var tips = ['[i] All running whistle:'];
+      var tips = ['[i] All running Whistle instances:'];
       confList.forEach(function(conf, i) {
         ++i;
         var options = conf.options;
@@ -34,7 +34,7 @@ function showAll(byStop) {
           + (options.storage ? ', Storage: ' + options.storage : '')
           + (byStop ? colors.red(' (Stop cmd: ' + (options.storage ? 'w2 stop -S ' + options.storage : 'w2 stop') + ')') : ''));
       });
-      byStop && warn('[!] This whistle is not running.');
+      byStop && warn('[!] This Whistle instance is not running.');
       info(tips.join('\n'));
     }
   });

package/bin/use.js

@@ -19,9 +19,9 @@ var options;
 
 function showStartWhistleTips(storage, isClient) {
   if (isClient) {
-    error('No running whistle client, please install and start the latest whistle client: https://github.com/avwo/whistle-client');
+    error('No running Whistle client. Please install and start the latest Whistle client: https://github.com/avwo/whistle-client');
   } else {
-    error('No running whistle, execute `w2 start' + (storage ? ' -S ' + storage : '') + '` to start whistle on the cli.');
+    error('No running Whistle instances. Execute `w2 start' + (storage ? ' -S ' + storage : '') + '` to start Whistle on the cli.');
   }
 }
 
@@ -172,17 +172,17 @@ module.exports = function(filepath, storage, force, isClient) {
       }
       handleRules(filepath, function(result) {
         if (!result) {
-          error('The name and rules cannot be empty.');
+          error('The name and rules are required.');
           return;
         }
         var name = getString(result.name);
         if (!name || name.length > 64) {
-          error('The name cannot be empty and the length cannot exceed 64 characters.');
+          error('The name must be 1-64 characters.');
           return;
         }
         var rules = getString(result.rules);
         if (rules.length > MAX_RULES_LEN) {
-          error('The rules cannot be empty and the size cannot exceed 256k.');
+          error('Maximum rules size: 256KB.');
           return;
         }
         var groupName = getString(result.groupName) || getString(result.group);
@@ -193,7 +193,7 @@ module.exports = function(filepath, storage, force, isClient) {
             'groupName=' + encodeURIComponent(groupName.trim())
           ].join('&');
           request(body, function() {
-            info('Setting whistle' + (isClient ? ' client' : '') + ' (' + util.joinIpPort(options.host || '127.0.0.1', port) + ') rules successful.');
+            info('Successfully configured rules for Whistle' + (isClient ? ' client' : '') + ' (' + util.joinIpPort(options.host || '127.0.0.1', port) + ').');
           });
         };
         if (force) {
@@ -202,7 +202,7 @@ module.exports = function(filepath, storage, force, isClient) {
         request('name=' + encodeURIComponent(name) + '&enable=1&top=1', function(data) {
           if (data.rules) {
             info('Successfully enabled.');
-            warn('Warning: The rule already exists, to override the content, add CLI option --force.');
+            warn('Warning: Rule already exists. Use \'--force\' to override.');
             return;
           }
           setRules();
@@ -210,4 +210,4 @@ module.exports = function(filepath, storage, force, isClient) {
       }, port);
     });
   });
-};
+};

package/bin/util.js

@@ -14,13 +14,13 @@ var joinIpPort = common.joinIpPort;
 
 exports.joinIpPort = joinIpPort;
 /*eslint no-console: "off"*/
-var CHECK_RUNNING_CMD = process.platform === 'win32' ? 
+var CHECK_RUNNING_CMD = process.platform === 'win32' ?
   'tasklist /fi "PID eq %s" | findstr /i "node.exe"'
   : 'ps -f -p %s | grep "node"';
 var isWin = process.platform === 'win32';
 
 function isRunning(pid, callback) {
-  pid ? cp.exec(util.format(CHECK_RUNNING_CMD, pid), 
+  pid ? cp.exec(util.format(CHECK_RUNNING_CMD, pid),
     function (err, stdout, stderr) {
       callback(!err && !!stdout.toString().trim());
     }) : callback();
@@ -64,7 +64,7 @@ exports.info = info;
 
 function showKillError() {
   error('[!] Cannot kill ' + config.name + ' owned by root');
-  info('[i] Try to run command ' + (isWin ? 'as an administrator' : 'with `sudo`'));
+  info('[i] Try to run command ' + (isWin ? 'as an administrator' : 'with sudo'));
 }
 
 exports.showKillError = showKillError;
@@ -87,13 +87,13 @@ function showUsage(isRunning, options, restart) {
     return '       http://' + colors.bold(joinIpPort(ip, port != 80 && port)) + '/';
   }).join('\n'));
 
-  warn('       Note: If all the above URLs are unable to access, check the firewall settings');
+  warn('       Note: If all URLs are inaccessible, check firewall settings');
   warn('             For help see ' + colors.bold('https://github.com/avwo/whistle'));
   info('[i] 2. set the HTTP proxy on your device with ' + colors.bold((list.length === 1 ? 'IP(' + list[0] + ')' : 'the above IP') + ' & PORT(' + port + ')'));
   info('[i] 3. use ' + colors.bold('Chrome') + ' to visit ' + colors.bold('http://' + (options.localUIHost || config.localUIHost) + '/') + ' to get started');
 
   if (parseInt(process.version.slice(1), 10) < 6) {
-    warn(colors.bold('\nWarning: The current Node version is too low, access https://nodejs.org to install the latest version, or may not be able to Capture HTTPS CONNECTS\n'));
+    warn(colors.bold('\nWarning: Node version too low. Update at https://nodejs.org to capture HTTPS connections\n'));
   }
   var bypass = program.init;
   if (bypass == null) {

package/bin/whistle.js

@@ -34,12 +34,12 @@ function showStartupInfo(err, options, debugMode, restart) {
   if (/listen EADDRINUSE/.test(err)) {
     options = util.formatOptions(options);
     var port = options.port || config.port;
-    error('[!] Failed to bind proxy port ' + (options.host ? util.joinIpPort(options.host, port) : port) + ': The port is already in use');
-    info('[i] Please check if ' + config.name + ' is already running, you can ' + (debugMode ? 'stop whistle with `w2 stop` first' : 'restart whistle with `w2 restart`'));
-    info('    or if another application is using the port, you can change the port with ' + (debugMode ? '`w2 run -p newPort`\n' : '`w2 start -p newPort`\n'));
+    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('    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('[!] Cannot start ' + config.name + ' owned by root');
-    info('[i] Try to run command with `sudo`\n');
+    error('[!] Permission denied: Cannot start ' + config.name + ' as root');
+    info('[i] Try running with sudo\n');
   }
 
   error(err.stack ? 'Date: ' + new Date().toLocaleString() + '\n' + err.stack : err);
@@ -55,9 +55,9 @@ program.setConfig({
   main: function(options) {
     var cmd = process.argv[2];
     if ((cmd === 'start' || cmd === 'restart') && (options.inspect || options.inspectBrk)) {
-      error('[!] Only support running command `w2 run` to activate inspector on whistle.');
+      error('[!] Inspector mode only supported with `w2 run` command.');
       var argv = Array.prototype.slice.call(process.argv, 3);
-      info('[i] Try to run command `w2 run' + (argv.length ? ' ' + argv.join(' ') : '') + '` instead of.');
+      info('[i] Usage: w2 run' + (argv.length ? ' ' + argv.join(' ') : ''));
       return process.exit(1);
     }
     var hash = options && options.storage && encodeURIComponent(options.storage);
@@ -94,58 +94,58 @@ program.setConfig({
 
 program
   .command('status')
-  .description('Show the running status');
+  .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 (.whistle.js by default)');
 program.command('proxy')
-  .description('Set global proxy');
+  .description('Configure system proxy settings');
 program.command('ca')
-  .description('Install root CA');
+  .description('Manage Root CA certificates');
 program.command('install')
-  .description('Install whistle plugin');
+  .description('Install Whistle plugin');
 program.command('uninstall')
-  .description('Uninstall whistle plugin');
+  .description('Uninstall Whistle plugin');
 program.command('exec')
-  .description('Exec whistle plugin cmd');
+  .description('Execute plugin command');
 
 program
-  .option('-D, --baseDir [baseDir]', 'set the configured storage root path', String, undefined)
-  .option('-z, --certDir [directory]', 'set custom certificate store directory', String, undefined)
-  .option('-l, --localUIHost [hostname]', 'set the domain for the web ui (' + config.localUIHost + ' by default)', String, undefined)
-  .option('-L, --pluginHost [hostname]', 'set the domain for the web ui of plugin  (as: "script=a.b.com&vase=x.y.com")', String, undefined)
-  .option('-n, --username [username]', 'set the username to access the web ui', String, undefined)
-  .option('-w, --password [password]', 'set the password to access the web ui', String, undefined)
-  .option('-N, --guestName [username]', 'set the the guest name to access the web ui (can only view the data)', String, undefined)
-  .option('-W, --guestPassword [password]', 'set the guest password to access the web ui (can only view the data)', String, undefined)
-  .option('-s, --sockets [number]', 'set the max number of cached connections on each domain (' + config.sockets + ' by default)', parseInt, undefined)
-  .option('-S, --storage [newStorageDir]', 'set the configured storage directory', String, undefined)
-  .option('-C, --copy [storageDir]', 'copy the configuration of the specified directory to a new directory', String, undefined)
-  .option('-c, --dnsCache [time]', 'set the cache time of DNS (60000ms by default)', String, undefined)
-  .option('-H, --host [boundHost]', 'set the bound host (INADDR_ANY by default)', String, undefined)
-  .option('-p, --port [proxyPort]', 'set the proxy port (' + config.port + ' by default)', String, undefined)
-  .option('-P, --uiport [uiport]', 'set the webui port', String, undefined)
-  .option('-m, --middlewares [script path or module name]', 'set the express middlewares loaded at startup (as: xx,yy/zz.js)', String, undefined)
-  .option('-M, --mode [mode]', 'set the starting mode (as: pureProxy|debug|multiEnv|capture|disableH2|network|rules|plugins|prod)', String, undefined)
-  .option('-t, --timeout [ms]', 'set the request timeout (' + config.timeout + 'ms by default)', parseInt, undefined)
-  .option('-e, --extra [extraData]', 'set the extra parameters for plugin', String, undefined)
-  .option('-f, --secureFilter [secureFilter]', 'set the path of secure filter', String, undefined)
-  .option('-r, --shadowRules [shadowRules]', 'set the shadow (default) rules', String, undefined)
-  .option('-R, --reqCacheSize [reqCacheSize]', 'set the cache size of request data (600 by default)', String, undefined)
-  .option('-F, --frameCacheSize [frameCacheSize]', 'set the cache size of webSocket and socket\'s frames (512 by default)', String, undefined)
+  .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('-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, --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, --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)
+  .option('-t, --timeout [ms]', 'set request timeout (default: ' + config.timeout, parseInt, undefined)
+  .option('-e, --extra [extraData]', 'set plugin extra parameters', String, undefined)
+  .option('-f, --secureFilter [secureFilter]', 'set secure filter path', String, undefined)
+  .option('-r, --shadowRules [shadowRules]', 'set default shadow rules', String, undefined)
+  .option('-R, --reqCacheSize [reqCacheSize]', 'set request data cache size (default: 600)', String, undefined)
+  .option('-F, --frameCacheSize [frameCacheSize]', 'set WebSocket frame cache size (default: 512)', String, undefined)
   .option('-A, --addon [pluginPaths]', 'add custom plugin paths', String, undefined)
-  .option('--init [bypass]', 'auto set global proxy (and bypass) and install root CA')
-  .option('--cluster [workers]', 'start the cluster server and set worker number (os.cpus().length by default)', String, undefined)
-  .option('--config [config]', 'load the startup config from a local file', String, undefined)
-  .option('--dnsServer [dnsServer]', 'set custom dns servers', String, undefined)
-  .option('--socksPort [socksPort]', 'set the socksv5 server port', String, undefined)
-  .option('--httpPort [httpPort]', 'set the http server port', String, undefined)
-  .option('--httpsPort [httpsPort]', 'set the https server port', String, undefined)
-  .option('--allowOrigin [originList]', 'list of cross origin allowed to access webui (as: a.b.c,x.y.z or *)', String, undefined)
-  .option('--no-global-plugins', 'do not load any globally installed plugins')
-  .option('--no-prev-options', 'do not reuse the previous options when restarting')
-  .option('--inspect [[host:]port]', 'activate inspector on host:port (127.0.0.1:9229 by default)')
-  .option('--inspectBrk [[host:]port]', 'activate inspector on host:port and break at start of user script (127.0.0.1:9229 by default)');
+  .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('--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)
+  .option('--httpsPort [httpsPort]', 'set HTTPS server port', String, undefined)
+  .option('--allowOrigin [originList]', 'set allowed CORS origins (format: a.b.c,x.y.z or *)', String, undefined)
+  .option('--no-global-plugins', 'disable global plugins')
+  .option('--no-prev-options', 'ignore previous options on restart')
+  .option('--inspect [[host:]port]', 'enable inspector (default: 127.0.0.1:9229)')
+  .option('--inspectBrk [[host:]port]', 'enable inspector with breakpoint (default: 127.0.0.1:9229)');
 
 var argv = process.argv;
 var cmd = argv[2];

package/biz/index.js

@@ -19,6 +19,7 @@ var CUSTOM_INTERNAL_APP = new RegExp('^/[\\w.-]*\\.whistle-path\\.5b6af7b9884e11
 var CUSTOM_PLUGIN_RE = new RegExp('^/[\\w.-]*\\.whistle-path\\.5b6af7b9884e1165[\\w.-]*/+whistle\\.([a-z\\d_-]+)/');
 var REAL_WEBUI_HOST_PARAM = /_whistleInternalHost_=(__([a-z\d.-]+)(?:__(\d{1,5}))?__)/;
 var OUTER_PLUGIN_RE = /^(?:\/whistle)?\/((?:whistle|plugin)\.[a-z\\d_-]+)::(\d{1,5})\//;
+var SERVICE_HOST = 'admin.wiso.pro';
 
 
 function transformUI(req, res) {
@@ -28,6 +29,22 @@ function transformUI(req, res) {
   return handleUIReq(req, res);
 }
 
+function setServiceUrl(req) {
+  var isService = req.path.indexOf('/whistle/service/') === 0;
+  if (isService || req.path.indexOf('/service/') === 0) {
+    if (isService) {
+      req.url = req.url.replace('/whistle/', '/');
+    }
+    req.headers.host = SERVICE_HOST;
+    req.headers[config.REAL_HOST_HEADER] = SERVICE_HOST;
+    req.isHttps = true;
+    req.isPluginReq = true;
+    req._isInternalReq = true;
+    req._isPureInternalReq = true;
+    return true;
+  }
+}
+
 module.exports = function(req, res, next) {
   var config = this.config;
   var pluginMgr = this.pluginMgr;
@@ -122,6 +139,7 @@ module.exports = function(req, res, next) {
       isWebUI = true;
     }
   }
+  isWebUI = isWebUI && !setServiceUrl(req);
   // 后续有用到
   fullUrl = req.fullUrl = util.getFullUrl(req);
   if (bypass) {

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

@@ -1,10 +1,7 @@
 var config = require('../../../lib/config');
 
-var pid = process.pid;
-
-module.exports = function(req, res) {
+module.exports = function(_, res) {
   res.json({
-    pid: pid,
     storage: config.storage || '',
     client: config.client,
     whistleName: config.whistleName,

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