whistle 2.10.1 → 2.10.2

package/assets/js/log.js

@@ -237,34 +237,31 @@
     return prefixPath;
   }
 
-  var index = 0;
-  var MAX_LEN = 1024 * 56;
-  function addLog(level, text) {
-    var img = new Image();
-    var timer;
-    if (index > 9999) {
-      index = 0;
-    }
-    var logStr = encodeURIComponent(text && (text + ''));
-    if (logStr.length > MAX_LEN) {
-      logStr = logStr.substring(0, MAX_LEN);
-      var percIndex = logStr.indexOf('%', MAX_LEN - 3);
-      if (percIndex !== -1) {
-        logStr = logStr.substring(0, percIndex);
-      }
+  var MAX_SIZE = 1024 * 512;
+  var MAX_VAL_SIZE = 1024 * 64;
+  var LOG_ID = '$LOG_ID';
+  var cacheList = [];
+  var origin = (location.origin || (location.protocol + '//' + location.host)) + '/';
+
+  function setLog() {
+    if (!cacheList.length) {
+      return;
     }
-    var baseUrl = '$BASE_URL' + getPathPrefix();
-    img.src = baseUrl + '$LOG_CGI?id=$LOG_ID&level=' + level + '&text=' + logStr
-      + '&t=' + new Date().getTime() + '&' + ++index;
-    var preventGC = function() {
-      img.onload = img.onerror = null;
-      clearTimeout(timer);
-    };
-    img.onload = img.onerror = preventGC;
-    timer = setTimeout(preventGC, 3000);
+    var list = cacheList.splice(0, 10);
+    var xhr = new XMLHttpRequest();
+    var url = '$BASE_URL' + getPathPrefix() + '$LOG_CGI';
+    xhr.open('POST', url);
+    xhr.setRequestHeader('Content-Type', url.indexOf(origin) ? 'text/plain' : 'application/json');
+    xhr.onload = function() {};
+    xhr.send(JSON.stringify({ list: list }));
+  }
+
+  function addLog(level, text) {
+    cacheList.push([new Date().getTime(), level, LOG_ID, text].join('\r'));
     if (typeof window.onWhistleLogSend === 'function') {
       window.onWhistleLogSend(level, text);
     }
+    setTimeout(setLog, 60);
   }
 
   function getPageInfo() {
@@ -295,18 +292,37 @@
     return -1;
   }
 
+  function fomatText(str, size) {
+    var len = str.length;
+    if (len <= size + 9) {
+      return str;
+    }
+    return str.substring(0, size) + '...(' + (len - size) + ')';
+  }
+
   function stringifyObj(obj) {
     if (typeof obj === 'string') {
       return obj;
     }
+    var str;
     try {
-      return JSON.stringify(obj);
+      str = JSON.stringify(obj);
+      if (str.length <= MAX_SIZE) {
+        return str;
+      }
     } catch(e) {}
     try {
       var keyList = [];
       var valList = [];
-      return JSON.stringify(obj, function(key, value) {
-        if (value && typeof value === 'object') {
+      str = JSON.stringify(obj, function(key, value) {
+        if (!value) {
+          return value;
+        }
+        var type = typeof value;
+        if (type === 'string' && value.length > MAX_VAL_SIZE) {
+          return fomatText(value, MAX_VAL_SIZE);
+        }
+        if (type === 'object') {
           var index = arrayIndexOf(valList, value);
           valList.push(value);
           keyList.push(key);
@@ -316,6 +332,7 @@
         }
         return value;
       });
+      return fomatText(str, MAX_SIZE);
     } catch(e) {}
   }
 

package/bin/use.js

@@ -1,6 +1,7 @@
 var path = require('path');
 var http = require('http');
 var url = require('url');
+var fs = require('fs');
 var util = require('./util');
 var importModule = require('./import');
 var pkg = require('../package.json');
@@ -10,26 +11,20 @@ var isRunning = util.isRunning;
 var error = util.error;
 var warn = util.warn;
 var info = util.info;
-var readConfig = util.readConfig;
 var MAX_RULES_LEN = 1024 * 256;
 var DEFAULT_OPTIONS = util.DEFAULT_OPTIONS;
-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');
-  } else {
-    error('No running Whistle instances. Execute `w2 start' + (storage ? ' -S ' + storage : '') + '` to start Whistle on the cli');
+function handleRules(options, filepath, callback) {
+  if (typeof filepath === 'object') {
+    return callback(filepath);
   }
-}
-
-function handleRules(filepath, callback, port) {
   importModule(filepath, function(getRules) {
     if (typeof getRules !== 'function') {
       return callback(getRules);
     }
     var opts = {
-      port: port,
+      host: options.host,
+      port: options.port,
       existsPlugin: existsPlugin
     };
     if (options && options.host) {
@@ -43,45 +38,77 @@ function getString(str) {
   return typeof str !== 'string' ? '' : str.trim();
 }
 
-function existsPlugin(name) {
+function existsPlugin(name, callback, pluginPaths) {
+  if (typeof callback !== 'function') {
+    callback = null;
+    pluginPaths = null;
+  }
   if (!name || typeof name !== 'string') {
-    return false;
+    return callback ? callback(false) : false;
+  }
+  pluginPaths = pluginPaths || require('../lib/plugins/module-paths').getPaths().slice();
+  var len = pluginPaths.length;
+  if (len === 0) {
+    return callback ? callback(false) : false;
+  }
+  if (callback) {
+    var pkgFile = path.join(pluginPaths.shift(), name, 'package.json');
+    common.getStat(pkgFile, function(err, stats) {
+      if (err || !stats.isFile()) {
+        return existsPlugin(name, callback, pluginPaths);
+      }
+      callback(true);
+    });
+    return;
   }
-  var pluginPaths = require('../lib/plugins/module-paths').getPaths();
-  for (var i = 0, len = pluginPaths.length; i < len; i++) {
-    var stats = common.getStatSync(path.join(pluginPaths[i], name));
-    if (stats && stats.isDirectory()) {
+  for (var i = 0; i < len; i++) {
+    var stats = common.getStatSync(path.join(pluginPaths[i], name, 'package.json'));
+    if (stats && stats.isFile()) {
       return true;
     }
   }
   return false;
 }
 
-var reqOptions;
-function request(body, callback) {
-  if (!reqOptions) {
-    reqOptions = url.parse('http://' + util.joinIpPort(options.host || '127.0.0.1', options.port) + '/cgi-bin/rules/project');
-    reqOptions.headers = {
-      'content-type': 'application/x-www-form-urlencoded'
-    };
-    if (options.specialAuth) {
-      reqOptions.headers['x-whistle-special-auth'] = options.specialAuth;
+function getHost(options) {
+  return util.joinIpPort(options.host || DEFAULT_OPTIONS.host, options.port);
+}
+
+function getReqOptions(options) {
+  var reqOptions = url.parse('http://' + getHost(options) + '/cgi-bin/rules/project');
+  reqOptions.headers = {
+    'content-type': 'application/x-www-form-urlencoded'
+  };
+  if (options.specialAuth) {
+    reqOptions.headers['x-whistle-special-auth'] = options.specialAuth;
+  }
+  reqOptions.method = 'POST';
+  if (options.username || options.password) {
+    var auth = [options.username || '', options.password || ''].join(':');
+    reqOptions.headers.authorization = 'Basic ' + new Buffer.from(auth).toString('base64');
+  }
+  return reqOptions;
+}
+
+function request(reqOptions, body, cb) {
+  var done;
+  var handleCb = function(err, data) {
+    if (done) {
+      return;
     }
-    reqOptions.method = 'POST';
-    if (options.username || options.password) {
-      var auth = [options.username || '', options.password || ''].join(':');
-      reqOptions.headers.authorization = 'Basic ' + new Buffer.from(auth).toString('base64');
+    done = true;
+    if (err) {
+      if (typeof err !== 'string') {
+        err = err.message || String(err);
+      }
+      return cb(err);
     }
-  }
+    cb(null, data);
+  };
   var req = http.request(reqOptions, function(res) {
-    util.getBody(res, function(err, data) {
-      if (err) {
-        throw err;
-      }
-      callback(data);
-    });
+    util.getBody(res, handleCb);
   });
-  // 不处理错误，直接抛出终止进程
+  req.on('error', handleCb);
   req.end(body);
 }
 
@@ -96,7 +123,7 @@ function checkDefault(running, storage, isClient, callback) {
     callback && callback(err);
     callback = null;
   };
-  var req = http.get('http://' + DEFAULT_OPTIONS.host + ':' + DEFAULT_OPTIONS.port + '/cgi-bin/status', function(res) {
+  var req = http.get('http://' + getHost(DEFAULT_OPTIONS) + '/cgi-bin/status', function(res) {
     res.on('error', execCallback);
     util.getBody(res, function(err, data) {
       if (err || !data || data.name !== pkg.name || data.storage !== storage) {
@@ -109,85 +136,193 @@ function checkDefault(running, storage, isClient, callback) {
   req.end();
 }
 
-function readClientConfig() {
-  var procPath = path.join(common.getHomedir(), '.whistle_client.pid');
-  var info = (common.readFileTextSync(procPath) || '').split(',');
-  if (info && info.length === 4) {
-    return {
-      pid: info[0],
+function handleClientConfig(text, callback) {
+  text = text.split(',');
+  if (text.length === 4) {
+    return callback(null, {
+      pid: text[0],
       options: {
-        host: info[1],
-        port: info[2],
-        specialAuth: info[3]
+        host: text[1],
+        port: text[2],
+        specialAuth: text[3]
       }
-    };
+    });
   }
+  callback(new Error('Invalid client config'));
 }
 
-module.exports = function(filepath, storage, force, isClient) {
-  var config;
+function readConfig(storage, isClient, callback) {
+  var configFile = isClient ? path.join(common.getHomedir(), '.whistle_client.pid') : util.getConfigFile(storage);
+  fs.readFile(configFile, { encoding: 'utf8' }, function(err, text) {
+    if (err) {
+      return callback(err);
+    }
+    if (isClient) {
+      return handleClientConfig(text || '', callback);
+    }
+    try {
+      text = JSON.parse(text);
+      if (text) {
+        util.formatOptions(text.options);
+        callback(null, text);
+      } else {
+        callback(new Error('Invalid config'));
+      }
+    } catch(e) {
+      callback(e);
+    }
+  });
+}
+
+function removeSpecialAuth(config) {
+  if (!config) {
+    return config;
+  }
+  delete config.options.specialAuth;
+  return config.options;
+}
+
+var getNoRunningError = function(storage, isClient) {
+  if (isClient) {
+    return new Error('No running Whistle client. Please install and start the latest Whistle client: https://github.com/avwo/whistle-client');
+  }
+  return new Error('No running Whistle instances. Execute `w2 start' + (storage ? ' -S ' + storage : '') + '` to start Whistle on the cli');
+};
+
+function getConfig(filepath, storage, force, isClient, cb) {
   var dir = '';
+  var result;
+  var callback;
+  if (typeof storage === 'boolean') {
+    var temp = force;
+    force = storage;
+    storage = temp;
+  }
+  if (typeof storage === 'function') {
+    callback = storage;
+    storage = '';
+  }
+  if (filepath && typeof filepath === 'object') {
+    storage = storage || filepath.storage;
+    isClient = isClient || filepath.isClient || filepath.client;
+    force = force || filepath.force;
+    if (common.isString(filepath.name) && common.isString(filepath.rules)) {
+      result = filepath;
+    }
+    filepath = filepath.filepath;
+  }
   if (isClient) {
     storage = '';
-    config = readClientConfig() || '';
   } else {
     storage = storage || '';
     dir = encodeURIComponent(storage);
-    config = readConfig(dir) || '';
-    if (config.options) {
-      delete config.options.specialAuth;
-    }
   }
-  options = config.options || '';
-  isRunning(options && config.pid, function(running) {
-    checkDefault(running, dir, isClient, function(err, port) {
-      if (err) {
-        return showStartWhistleTips(storage, isClient);
+  readConfig(dir, isClient, function(err, config) {
+    if (err) {
+      return cb(err.code === 'ENOENT' ? getNoRunningError(storage, isClient) : err);
+    }
+    !isClient && removeSpecialAuth(config);
+    config.dir = dir;
+    config.filepath = filepath;
+    config.force = force;
+    config.isClient = isClient;
+    config.result = result;
+    isRunning(config.options && config.pid, function(running) {
+      checkDefault(running, config.dir, isClient, function(e, port) {
+        if (e) {
+          return cb(getNoRunningError(storage, isClient));
+        }
+        var options = config.options || {};
+        if (port) {
+          options = DEFAULT_OPTIONS;
+        } else {
+          options.host = options.host || DEFAULT_OPTIONS.host;
+          options.port = options.port > 0 ? options.port : pkg.port;
+        }
+        config.options = options;
+        cb(e, config, callback);
+      });
+    });
+  });
+}
+
+module.exports = function(filepath, storage, force, isClient) {
+  getConfig(filepath, storage, force, isClient, function(err, config, callback) {
+    if (err) {
+      return callback ? callback(err) : error(err.message);
+    }
+    var options = config.options;
+    isClient = config.isClient;
+    var handleError = function(msg) {
+      if (callback) {
+        callback(new Error(msg));
+      } else {
+        error(msg);
       }
-      filepath = path.resolve(filepath || '.whistle.js');
-      if (port) {
-        options = DEFAULT_OPTIONS;
+    };
+    var handleEnd = function(warning, name) {
+      var warnTips = warning ? 'Warning: \'' + name + '\' already exists. Use \'--force\' to override' : null;
+      if (callback) {
+        callback(warnTips ? new Error(warnTips) : null, warning);
+      } else if (warnTips) {
+        info('Successfully enabled');
+        warn(warnTips);
       } else {
-        port = options.port = options.port > 0 ? options.port : pkg.port;
+        info('Successfully configured rules for Whistle' + (isClient ? ' client' : '') + ' (' + getHost(options) + ')');
       }
-      handleRules(filepath, function(result) {
-        if (!result) {
-          error('The name and rules are required');
-          return;
-        }
-        var name = getString(result.name);
-        if (!name || name.length > 64) {
-          error('The name must be 1-64 characters');
-          return;
-        }
-        var rules = getString(result.rules);
-        if (rules.length > MAX_RULES_LEN) {
-          error('Maximum rules size: 256KB');
-          return;
-        }
-        var groupName = getString(result.groupName) || getString(result.group);
-        var setRules = function() {
-          var body = [
-            'name=' + encodeURIComponent(name),
-            'rules=' + encodeURIComponent(rules),
-            'groupName=' + encodeURIComponent(groupName.trim())
-          ].join('&');
-          request(body, function() {
-            info('Successfully configured rules for Whistle' + (isClient ? ' client' : '') + ' (' + util.joinIpPort(options.host || '127.0.0.1', port) + ')');
-          });
-        };
-        if (force) {
-          return setRules();
-        }
-        request('name=' + encodeURIComponent(name) + '&enable=1&top=1', function(data) {
-          if (data.rules) {
-            info('Successfully enabled');
-            warn('Warning: Rule already exists. Use \'--force\' to override');
-            return;
+    };
+    filepath = config.result || path.resolve(config.filepath || '.whistle.js');
+    handleRules(options, filepath, function(result) {
+      if (!result) {
+        return handleError('The name and rules are required');
+      }
+      var name = getString(result.name);
+      if (!name || name.length > 64) {
+        return handleError('The name must be 1-64 characters');
+      }
+      var rules = getString(result.rules);
+      if (rules.length > MAX_RULES_LEN) {
+        return handleError('Maximum rules size: 256KB');
+      }
+      var groupName = getString(result.groupName) || getString(result.group);
+      var reqOptions = getReqOptions(options);
+      var setRules = function() {
+        var body = [
+          'name=' + encodeURIComponent(name),
+          'rules=' + encodeURIComponent(rules),
+          'groupName=' + encodeURIComponent(groupName.trim())
+        ].join('&');
+        request(reqOptions, body, function(em) {
+          if (em) {
+            return handleError(em);
           }
-          setRules();
+          handleEnd();
         });
-      }, port);
+      };
+      if (config.force) {
+        return setRules();
+      }
+      request(reqOptions, 'name=' + encodeURIComponent(name) + '&enable=1&top=1', function(em, data) {
+        if (em) {
+          return handleError(em);
+        }
+        if (data.rules) {
+          return handleEnd(true, name);
+        }
+        setRules();
+      });
     });
   });
 };
+
+module.exports.existsPlugin = existsPlugin;
+module.exports.getOptions = function(cb, storage, isClient) {
+  if (typeof cb !== 'function') {
+    var temp = storage;
+    storage = cb;
+    cb = temp;
+  }
+  return getConfig(null, storage, null, isClient, function(err, config) {
+    return cb(err, removeSpecialAuth(config));
+  });
+};

package/bin/util.js

@@ -134,11 +134,16 @@ function formatOptions(options) {
   return options;
 }
 
+function getConfigFile(storage) {
+  var dataDir = getDataDir();
+  return path.join(dataDir, encodeURIComponent('#' + (storage ? storage + '#' : '')));
+}
+
+exports.getConfigFile = getConfigFile;
 exports.formatOptions = formatOptions;
 
 function readConfig(storage) {
-  var dataDir = getDataDir();
-  var configFile = path.join(dataDir, encodeURIComponent('#' + (storage ? storage + '#' : '')));
+  var configFile = getConfigFile(storage);
   var conf = common.readJsonSync(configFile);
   conf && formatOptions(conf.options);
   return conf;
@@ -179,18 +184,16 @@ exports.getDefaultPort = function () {
   return port > 0 ? port : 8899;
 };
 
-function getBody(res, callback) {
+exports.getBody = function (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');
+      callback('Bad response (' + res.statusCode + ')');
     } else {
       callback(null, JSON.parse(resBody + ''));
     }
   });
-}
-
-exports.getBody = getBody;
+};

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

@@ -22,10 +22,8 @@ module.exports = function(req, res) {
     data.ids = null;
   }
   var clientIp = util.getClientIp(req);
-  var stopRecordConsole = data.startLogTime == -3;
   var stopRecordSvrLog = data.startSvrLogTime == -3;
   var h = req.headers;
-  var curLogId = proxy.getLatestId();
   var curSvrLogId = logger.getLatestId();
   util.sendGzip(req, res, {
     ec: 0,
@@ -46,11 +44,8 @@ module.exports = function(req, res) {
     mvaluesClientId: config.mvaluesClientId,
     mvaluesTime: config.mvaluesTime,
     server: util.getServerInfo(req),
-    curLogId: stopRecordConsole ? undefined : curLogId,
     curSvrLogId: stopRecordSvrLog ? undefined : curSvrLogId,
-    lastLogId: stopRecordConsole ? curLogId : undefined,
     lastSvrLogId: stopRecordSvrLog ? curSvrLogId : undefined,
-    log: stopRecordConsole ? [] : proxy.getLogs(data.startLogTime, data.count, data.logId),
     svrLog: stopRecordSvrLog ? [] : logger.getLogs(data.startSvrLogTime, data.count),
     plugins: pluginMgr.getPlugins(),
     disabledPlugins: !config.notAllowedDisablePlugins && properties.get('disabledPlugins') || {},

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

@@ -11,7 +11,6 @@ var logger = proxy.logger;
 var pluginMgr = proxy.pluginMgr;
 
 module.exports = function(req, res) {
-  var lastLog = proxy.getLogs(0, 1)[0];
   var lastSvrLog = logger.getLogs(0, 1)[0];
 
   util.sendGzip(req, res, {
@@ -23,7 +22,6 @@ module.exports = function(req, res) {
     custom2: properties.get('Custom2'),
     hasInvalidCerts: ca.hasInvalidCerts,
     supportH2: config.enableH2,
-    lastLogId: lastLog && lastLog.id,
     lastSvrLogId: lastSvrLog && lastSvrLog.id,
     lastDataId: proxy.getLastDataId(),
     clientId: util.getClientId(),

package/biz/webui/htdocs/index.html

@@ -6,8 +6,8 @@
 <link rel="shortcut icon" href="img/favicon.ico" />
 <title>Whistle Web Debugging Proxy</title>
 </head>
-<body style="overscroll-behavior-x: none;">
+<body>
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.10.1"></script>
+<script src="js/index.js?v=2.10.2"></script>
 </body>
 </html>