whistle 2.10.8 → 2.10.10

package/assets/js/log.js

@@ -243,6 +243,10 @@
   var cacheList = [];
   var origin = (location.origin || (location.protocol + '//' + location.host)) + '/';
 
+  try {
+    LOG_ID = decodeURIComponent(LOG_ID);
+  } catch(e) {}
+
   function setLog() {
     if (!cacheList.length) {
       return;

package/bin/api.js

@@ -139,7 +139,8 @@ exports.network = {
    *                                  - `Font`：字体文件
    *                                  - `Img`：图片资源
    *                                  - `Media`：音视频媒体
-   *                                  - `WS`：WebSocket 帧数据
+   *                                  - `WS`：WebSocket 请求
+   *                                  - `SSE`：Server-Sent Events 请求
    *                                  - `Tunnel`：隧道连接（如 WebSocket 升级）
    *                                  - `Wasm`：WebAssembly 模块
    *                                  - `Mock`：Mock 数据
@@ -526,7 +527,90 @@ 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,
   isUtf8: isUtf8,
   getText: getText,
   getUtf8Buf: getUtf8Buf,

package/bin/util.js

@@ -193,7 +193,7 @@ exports.getBody = function (res, callback, isRaw) {
   res.on('data', function(data) {
     resBody.push(data);
   });
-  res.on('end', function() {
+  res.once('end', function() {
     resBody = Buffer.concat(resBody);
     try {
       callback(null, isRaw ? resBody : JSON.parse(resBody.toString()));

package/bin/whistle.js

@@ -199,7 +199,7 @@ if (cmd === 'root') {
   if (file) {
     root = path.join(root, file);
   }
-  process.stdout.write(root);
+  console.log(root);
 } else if (cmd === 'status') {
   var all = argv[3] === '--all' || argv[3] === '-l';
   if (argv[3] === '-S') {

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

@@ -104,7 +104,7 @@ exports.getReqData = function(req, callback) {
     }
   });
   req.on('error', handleCb);
-  req.on('end', function() {
+  req.once('end', function() {
     if (done) {
       return;
     }

package/biz/webui/cgi-bin/values/add.js

@@ -6,21 +6,23 @@ module.exports = function(req, res) {
   var body = req.body;
   var list;
   var exists = values.exists(body.name);
-  if (values.add(body.name, body.value, body.clientId) != null) {
-    if (isGroup(body.name)) {
-      if (body.focusName) {
-        values.moveTo(body.name, body.focusName, body.clientId);
+  if (!exists || !body.graceful) {
+    if (values.add(body.name, body.value, body.clientId) != null) {
+      if (isGroup(body.name)) {
+        if (body.focusName) {
+          values.moveTo(body.name, body.focusName, body.clientId);
+        }
+      } else if (body.groupName) {
+        values.moveToGroup(body.name, body.groupName);
+      } else if (!exists) {
+        var group = values.getFirstGroup();
+        group && values.moveTo(body.name, group.name, body.clientId, null, true);
       }
-    } else if (body.groupName) {
-      values.moveToGroup(body.name, body.groupName);
-    } else if (!exists) {
-      var group = values.getFirstGroup();
-      group && values.moveTo(body.name, group.name, body.clientId, null, true);
     }
-  }
-  if (req.body.recycleFilename) {
-    recycleBin.remove(req.body.recycleFilename);
-    list = recycleBin.list();
+    if (body.recycleFilename) {
+      recycleBin.remove(body.recycleFilename);
+      list = recycleBin.list();
+    }
   }
   res.json({
     ec: 0,

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