whistle 2.10.10 → 2.10.11

package/bin/api.js

@@ -527,90 +527,8 @@ function getTimings(session) {
   };
 }
 
-var PATTERN_FIELDS = ['url', 'm', 'method', 'reqH', 'reqHeader', 'reqHeaders',
-  'b', 'body', 'reqBody', 's', 'statusCode', 'status', 'resH', 'resHeader', 'resHeaders'];
-
-function getHeaderKey(key) {
-  return !key || typeof key !== 'string' || /[^\w!#$%&'*+.^`|~-]/.test(key) ? '' : key.toLowerCase();
-}
-
-function createFilter(item, name, key) {
-  var protocol = (item.exclude ? 'ex' : 'in') + 'cludeFilter://';
-  name = name ? name + (key ? '.' : ':') : '';
-  key = key ? key + ':' : '';
-  return protocol + name + key + item.value;
-}
-
-function createPattern(list) {
-  if (!list) {
-    return '';
-  }
-  if (!Array.isArray(list)) {
-    list = [list];
-  }
-  var len = list.length;
-  if (!len) {
-    return '';
-  }
-  var result = [];
-  var urlPattern;
-  var key;
-  var add = function(item, name, key) {
-    var p = createFilter(item, name, key);
-    if (result.indexOf(p) === -1) {
-      result.push(p);
-    }
-  };
-  list.forEach(function(item) {
-    if (!item || !item.value || PATTERN_FIELDS.indexOf(item.name) === -1) {
-      return;
-    }
-    var value = item.value;
-    if (typeof value !== 'string') {
-      value = String(value);
-    }
-    if (/\s/.test(item.value)) {
-      return;
-    }
-    switch(item.name) {
-    case 'url':
-      if (urlPattern) {
-        add(item);
-      } else {
-        urlPattern = item.value;
-      }
-      return;
-    case 'm':
-    case 'method':
-      return add(item, 'm');
-    case 'reqH':
-    case 'reqHeader':
-    case 'reqHeaders':
-      key = getHeaderKey(item.key);
-      return key && add(item, 'reqH', key);
-    case 'b':
-    case 'body':
-    case 'reqBody':
-      return add(item, 'b');
-    case 's':
-    case 'statusCode':
-    case 'status':
-      return add(item, 's');
-    case 'resH':
-    case 'resHeader':
-    case 'resHeaders':
-      key = getHeaderKey(item.key);
-      return key && add(item, 'resH', key);
-    }
-  });
-  if (urlPattern || result.length) {
-    result.unshift(urlPattern || '*');
-  }
-  return result.join(' ');
-}
-
 exports.utils = {
-  createPattern: createPattern,
+  createPattern: common.createPattern,
   isUtf8: isUtf8,
   getText: getText,
   getUtf8Buf: getUtf8Buf,

package/bin/whistle.js

@@ -15,6 +15,11 @@ var colors = require('colors');
 var error = util.error;
 var info = util.info;
 var OPTIONS = util.DEFAULT_OPTIONS;
+var version = process.version;
+
+if (+version.substring(1).split('.')[0] < 16) {
+  error('[!] Node.js@' + version + ' is too old, please upgrade to v16 or above: https://nodejs.org/');
+}
 
 function getLatestVersion(options, cb, index) {
   var done;

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

@@ -36,7 +36,6 @@ module.exports = function(req, res) {
     custom2: properties.get('Custom2'),
     custom1Key: properties.get('Custom1Key'),
     custom2Key: properties.get('Custom2Key'),
-    supportH2: config.enableH2,
     hasInvalidCerts: ca.hasInvalidCerts,
     clientIp: clientIp,
     mrulesClientId: config.mrulesClientId,

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

@@ -21,7 +21,6 @@ module.exports = function(req, res) {
     custom1: properties.get('Custom1'),
     custom2: properties.get('Custom2'),
     hasInvalidCerts: ca.hasInvalidCerts,
-    supportH2: config.enableH2,
     lastSvrLogId: lastSvrLog && lastSvrLog.id,
     lastDataId: proxy.getLastDataId(),
     clientId: util.getClientId(),

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

@@ -2,9 +2,10 @@ var config = require('../../../lib/config');
 
 module.exports = function(_, res) {
   res.json({
+    whistlePath: config.WHISTLE_PATH,
+    whistleName: config.whistleName,
     storage: config.storage || '',
     client: config.client,
-    whistleName: config.whistleName,
     name: config.name,
     version: config.version
   });

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