whistle 2.10.9 → 2.10.11

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 数据
@@ -527,6 +528,7 @@ function getTimings(session) {
 }
 
 exports.utils = {
+  createPattern: common.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

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