whistle 2.10.5 → 2.10.7

package/bin/use.js

@@ -27,9 +27,6 @@ function handleRules(options, filepath, callback) {
       port: options.port,
       existsPlugin: existsPlugin
     };
-    if (options && options.host) {
-      opts.host = options.host;
-    }
     getRules(callback, opts);
   });
 }
@@ -74,22 +71,27 @@ 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');
+function getReqOpts(options, path, jsJson) {
+  var reqOptions = url.parse('http://' + getHost(options) + '/cgi-bin/' + path);
   reqOptions.headers = {
-    'content-type': 'application/x-www-form-urlencoded'
+    'content-type': 'application/' + (jsJson ? 'json' : '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');
+    reqOptions.headers.authorization = 'Basic ' + Buffer.from(auth).toString('base64');
   }
   return reqOptions;
 }
 
+function getReqOptions(options) {
+  var reqOptions = getReqOpts(options, 'rules/project');
+  reqOptions.method = 'POST';
+  return reqOptions;
+}
+
 function request(reqOptions, body, cb) {
   var done;
   var handleCb = function(err, data) {
@@ -198,6 +200,7 @@ function getConfig(filepath, storage, force, isClient, cb) {
     force = storage;
     storage = temp;
   }
+  // getConfig(options, callback)
   if (typeof storage === 'function') {
     callback = storage;
     storage = '';
@@ -315,6 +318,17 @@ module.exports = function(filepath, storage, force, isClient) {
   });
 };
 
+module.exports.getConfig = function(options, cb) {
+  if (typeof options === 'function') {
+    cb = options;
+    options = {};
+  } else if (options === true) {
+    options = { client: true };
+  }
+  return getConfig(options, null, null, null, cb);
+};
+
+module.exports.getReqOpts = getReqOpts;
 module.exports.existsPlugin = existsPlugin;
 module.exports.getOptions = function(cb, storage, isClient) {
   if (typeof cb !== 'function') {

package/bin/util.js

@@ -184,16 +184,21 @@ exports.getDefaultPort = function () {
   return port > 0 ? port : 8899;
 };
 
-exports.getBody = function (res, callback) {
-  var resBody;
+exports.getBody = function (res, callback, isRaw) {
+  if (res.statusCode != 200) {
+    res.destroy();
+    return callback('Bad response (' + res.statusCode + ')');
+  }
+  var resBody = [];
   res.on('data', function(data) {
-    resBody = resBody ? Buffer.concat([resBody, data]) : data;
+    resBody.push(data);
   });
   res.on('end', function() {
-    if (res.statusCode != 200) {
-      callback('Bad response (' + res.statusCode + ')');
-    } else {
-      callback(null, JSON.parse(resBody + ''));
+    resBody = Buffer.concat(resBody);
+    try {
+      callback(null, isRaw ? resBody : JSON.parse(resBody.toString()));
+    } catch(e) {
+      callback(e);
     }
   });
 };

package/bin/whistle.js

@@ -124,6 +124,9 @@ program.setConfig({
   }
 });
 
+program
+  .command('root')
+  .description('Output the install root (code directory) of Whistle');
 program
   .command('status')
   .description('Display running status');
@@ -190,7 +193,14 @@ var removeItem = function(list, name) {
 if (argv.indexOf('--init') !== -1) {
   process.env.WHISTLE_MODE = (process.env.WHISTLE_MODE || '') + '|persistentCapture';
 }
-if (cmd === 'status') {
+if (cmd === 'root') {
+  var root = path.join(__dirname, '../');
+  var file = typeof argv[3] === 'string' ? argv[3].trim() : '';
+  if (file) {
+    root = path.join(root, file);
+  }
+  process.stdout.write(root);
+} else if (cmd === 'status') {
   var all = argv[3] === '--all' || argv[3] === '-l';
   if (argv[3] === '-S') {
     storage = argv[4];

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

@@ -1,15 +1,24 @@
 var proxy = require('../lib/proxy');
 var socketMgr = proxy.socketMgr;
 
-function abort(reqId) {
-  proxy.abortRequest(reqId);
-  socketMgr.abort(reqId);
-}
+var MAX_COUNT = 1200;
 
 module.exports = function(req, res) {
   var list = req.body.list;
   if (list && typeof list === 'string') {
-    list.split(',').forEach(abort);
+    list = list.split(',');
+    var len = list.length;
+    if (len > MAX_COUNT) {
+      len = MAX_COUNT;
+      list = list.slice(0, MAX_COUNT);
+    }
+    for (var i = 0; i < len; i++) {
+      var reqId = list[i];
+      if (reqId) {
+        proxy.abortRequest(reqId);
+        socketMgr.abort(reqId);
+      }
+    }
   }
   res.json({ ec: 0 });
 };

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

@@ -0,0 +1,12 @@
+var util = require('./util');
+var common = require('../../../lib/util/common');
+var proxy = require('../lib/proxy');
+
+module.exports = function(req, res) {
+  var body = req.body;
+  if (!common.isString(body.reqId)) {
+    res.statusCode = 400;
+    return res.end('reqId is required');
+  }
+  util.sendGzip(req, res, proxy.getFramesForApi(body));
+};

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

@@ -13,7 +13,8 @@ module.exports = function(req, res) {
   var reqList = parseArray(req.query.reqList);
   var resList = parseArray(req.query.resList);
   var result = {};
-  reqList.concat(resList).forEach(function(id) {
+  var isReq;
+  var appendResult = function(id) {
     if (result[id] != null) {
       return;
     }
@@ -22,9 +23,12 @@ module.exports = function(req, res) {
       result[id] = 0;
       return;
     }
-    if ((item.requestTime && reqList.indexOf(id) !== -1) || item.endTime) {
+    if ((item.requestTime && isReq) || item.endTime) {
       result[id] = item;
     }
-  });
+  };
+  resList.forEach(appendResult);
+  isReq = true;
+  reqList.forEach(appendResult);
   res.json(result);
 };

package/biz/webui/cgi-bin/is-enabled-https.js

@@ -0,0 +1,6 @@
+var properties = require('../../../lib/rules/util').properties;
+
+module.exports = function(req, res) {
+  res.json({ec: 0, enabled: properties.isEnableCapture()});
+};
+

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

@@ -2,13 +2,22 @@ var properties = require('../../../../lib/rules/util').properties;
 var pluginMgr = require('../../lib/proxy').pluginMgr;
 
 module.exports = function(req, res) {
+  var name = req.body.name;
   var disabledPlugins = properties.get('disabledPlugins') || {};
-  if (req.body.disabled == 1) {
-    disabledPlugins[req.body.name] = 1;
-  } else {
-    delete disabledPlugins[req.body.name];
+  var exists = false;
+  if (typeof name === 'string') {
+    name = name.trim();
+    name = name.substring(name.lastIndexOf('.') + 1);
+    exists = !!pluginMgr.getPluginByName(name);
+    if (exists) {
+      if (req.body.disabled == 1) {
+        disabledPlugins[name] = 1;
+      } else {
+        delete disabledPlugins[name];
+      }
+      properties.set('disabledPlugins', disabledPlugins);
+      pluginMgr.updateRules();
+    }
   }
-  properties.set('disabledPlugins', disabledPlugins);
-  pluginMgr.updateRules();
-  res.json({ec: 0, data: disabledPlugins});
+  res.json({ec: 0, data: disabledPlugins, exists: exists});
 };

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

@@ -0,0 +1,17 @@
+var pluginMgr = require('../../lib/proxy').pluginMgr;
+var sortPlugins = require('../util').sortPlugins;
+var properties = require('../../../../lib/rules/util').properties;
+var extend = require('extend');
+
+module.exports = function(req, res) {
+  var disabledPlugins = properties.get('disabledPlugins');
+  var list = sortPlugins(pluginMgr.getPlugins()).map(function(plugin) {
+    var name = plugin.moduleName;
+    name = name.substring(name.lastIndexOf('.') + 1);
+    plugin = extend({}, plugin);
+    plugin.name = name;
+    plugin.selected = !disabledPlugins[name];
+    return plugin;
+  });
+  res.json(list);
+};

package/biz/webui/cgi-bin/plugins/plugin.js

@@ -0,0 +1,21 @@
+var pluginMgr = require('../../lib/proxy').pluginMgr;
+var properties = require('../../../../lib/rules/util').properties;
+var extend = require('extend');
+
+module.exports = function(req, res) {
+  var name = req.query.name;
+  var plugin;
+  if (typeof name === 'string') {
+    name = name.trim();
+    name = name.substring(name.lastIndexOf('.') + 1);
+    plugin = pluginMgr.getPluginByName(name);
+    if (plugin) {
+      var disabledPlugins = properties.get('disabledPlugins');
+      if (disabledPlugins) {
+        plugin = extend({}, plugin);
+        plugin.selected = !disabledPlugins[name];
+      }
+    }
+  }
+  res.json({ ec: 0, plugin: plugin || undefined });
+};

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

@@ -0,0 +1,21 @@
+var properties = require('../../../../lib/rules/util').properties;
+var pluginMgr = require('../../lib/proxy').pluginMgr;
+var sortPlugins = require('../util').sortPlugins;
+
+module.exports = function(req, res) {
+  var plugins = pluginMgr.getPlugins();
+  var disabledPlugins = properties.get('disabledPlugins') || {};
+  res.json({
+    disabled: !!properties.get('disabledAllPlugins'),
+    list: sortPlugins(plugins).map(function(plugin) {
+      name = plugin.moduleName;
+      name = name.substring(name.lastIndexOf('.') + 1);
+      return {
+        name: name,
+        moduleName: plugin.moduleName,
+        version: plugin.version,
+        selected: !disabledPlugins[name]
+      };
+    })
+  });
+};

package/biz/webui/cgi-bin/rules/is-multi-select.js

@@ -0,0 +1,7 @@
+var properties = require('../../../../lib/rules/util').properties;
+
+module.exports = function(req, res) {
+  res.json({multiSelect: !!properties.get('allowMultipleChoice')});
+};
+
+

package/biz/webui/cgi-bin/rules/move-top.js

@@ -0,0 +1,11 @@
+var rules = require('../../../../lib/rules/util').rules;
+
+module.exports = function(req, res) {
+  var name = req.body.name;
+  var ec = 2;
+  if (name !== 'Default' && rules.exists(name)) {
+    ec = 0;
+    rules.moveToTop(name);
+  }
+  res.json({ ec: ec });
+};

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

@@ -11,6 +11,6 @@ module.exports = function(req, res) {
       changed = true;
     }
   }
-  rules.select(req.body.name);
+  rules.select(body.name);
   res.json({ec: 0, defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList(), changed: changed});
 };

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

@@ -0,0 +1,16 @@
+var rules = require('../../../../lib/rules/util').rules;
+
+module.exports = function(req, res) {
+  var name = req.body.name;
+  var isDefault = name === 'Default';
+  var ec = 2;
+  if (isDefault || rules.exists(name)) {
+    ec = 0;
+    if (isDefault) {
+      rules.enableDefault();
+    } else {
+      rules.select(name);
+    }
+  }
+  res.json({ec: ec});
+};

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

@@ -0,0 +1,6 @@
+var getConfig = require('../../../../lib/rules/util').rules.getConfig;
+var util = require('../util');
+
+module.exports = function(req, res) {
+  util.sendGzip(req, res, getConfig());
+};

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

@@ -1,7 +1,8 @@
 var rules = require('../../../../lib/rules/util').rules;
 
 module.exports = function(req, res) {
-  rules.add(req.body.name, req.body.value);
-  rules.unselect(req.body.name);
+  var body = req.body;
+  rules.add(body.name, body.value);
+  rules.unselect(body.name);
   res.json({ec: 0, defaultRulesIsDisabled: rules.defaultRulesIsDisabled(), list: rules.getSelectedList()});
 };

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

@@ -0,0 +1,18 @@
+var rules = require('../../../../lib/rules/util').rules;
+
+module.exports = function(req, res) {
+  var name = req.body.name;
+  var ec = 2;
+  var isDefault = name === 'Default';
+  var unselectAll = name === false;
+  if (isDefault || unselectAll || rules.exists(name)) {
+    ec = 0;
+    if (isDefault || unselectAll) {
+      rules.disableDefault();
+    }
+    if (!isDefault) {
+      rules.unselect(name);
+    }
+  }
+  res.json({ec: ec});
+};

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

@@ -0,0 +1,19 @@
+var rules = require('../../../../lib/rules/util').rules;
+
+module.exports = function(req, res) {
+  var name = req.query.name;
+  if (name === 'Default') {
+    return res.json({ value: {
+      value: rules.getDefault(),
+      selected: !rules.defaultRulesIsDisabled()
+    }});
+  }
+  var value = rules.get(name);
+  if (value == null) {
+    return res.json({ value: null });
+  }
+  res.json({ value: {
+    value: value,
+    selected: rules.isSelected(name)
+  }});
+};

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

@@ -0,0 +1,6 @@
+var util = require('./util');
+var proxy = require('../lib/proxy');
+
+module.exports = function(req, res) {
+  util.sendGzip(req, res, proxy.getSessionsForApi(req.body));
+};

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

@@ -71,47 +71,58 @@ exports.getServerInfo = function(req) {
     ipv6: [],
     mac: req.ip + (config.storage ? '\n' + config.storage : '')
   };
-  var ifaces = util.networkInterfaces();
-  Object.keys(ifaces).forEach(function(ifname) {
-    ifaces[ifname].forEach(function (iface) {
-      if (iface.internal) {
-        return;
-      }
-      info[iface.family == 'IPv4' || iface.family === 4 ? 'ipv4' : 'ipv6'].push(iface.address);
-    });
-  });
-
+  var serverInfo = util.getServerInfo();
+  info.ipv4 = serverInfo.ipv4;
+  info.ipv6 = serverInfo.ipv6;
   return info;
 };
 
 var DATA_RE = /[\r\n]\s*(\{[\s\S]*\})[\r\n]/;
 var REPLACE_RE = /[\r\n]1[\r\n]/;
+var EXCEED_SIZE_ERR = new Error('The file size can not exceed 6MB');
+var INVALID_CONTENT_ERR = new Error('The file content is not a JSON object');
+
 exports.getReqData = function(req, callback) {
-  var result = '';
+  var result = [];
+  var len = 0;
+  var done;
+  var handleCb = function(err, data) {
+    if (!done) {
+      done = true;
+      callback(err, data);
+      result = null;
+    }
+  };
   req.on('data', function(chunk) {
-    result = result ? Buffer.concat([result, chunk]) : chunk;
-    if (result.length > MAX_OBJECT_SIZE) {
-      req.removeAllListeners('data');
-      callback(new Error('The file size can not exceed 6MB'));
+    if (done) {
+      return;
+    }
+    len += chunk.length;
+    result.push(chunk);
+    if (len > MAX_OBJECT_SIZE) {
+      handleCb(EXCEED_SIZE_ERR);
     }
   });
-  req.on('error', callback);
+  req.on('error', handleCb);
   req.on('end', function() {
-    result += '';
+    if (done) {
+      return;
+    }
     var data;
+    result = Buffer.concat(result).toString();
     result = result.replace(DATA_RE, function(all, match) {
       data = match;
       return '';
     });
     if (!data) {
-      return callback(new Error('The file content is not a JSON object'));
+      return handleCb(INVALID_CONTENT_ERR);
     }
     try {
       data = JSON.parse(data);
     } catch(err) {
-      return callback(err);
+      return handleCb(err);
     }
-    callback(null, {
+    handleCb(null, {
       data: data,
       replace: REPLACE_RE.test(result)
     });
@@ -145,3 +156,17 @@ exports.sendError = sendError;
 exports.sendGzip = util.sendGzip;
 
 exports.sendGzipText = util.sendGzipText;
+
+function compare(v1, v2) {
+  return v1 == v2 ? 0 : v1 > v2 ? -1 : 1;
+}
+
+exports.sortPlugins = function(plugins) {
+  return Object.keys(plugins).sort(function(k1, k2) {
+    var p1 = plugins[k1];
+    var p2 = plugins[k2];
+    return compare(p1.priority, p2.priority) || compare(p2.mtime, p1.mtime) || (k1 > k2 ? 1 : (k1 == k2 ? 0 : -1));
+  }).map(function(name) {
+    return plugins[name];
+  });
+};

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