whistle 2.9.69 → 2.9.70

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v2.9.70
+1. feat: 插件列表添加自定义右键菜单
+2. feat: 支持通过 `pattern jsAppend://[value|file|url] linePropslineProps://nomodule lineProps://module lineProps://defer lineProps://async lineProps://crossorigin`  设置标签属性
+
 # v2.9.69
 1. fix: https://github.com/avwo/whistle/issues/1064
 2. feat: 支持通过 `http://local.whistlejs.com/?dataUrl=encodeURIComponent(dataUrl)` 导入 `dataUrl` 返回的数据

package/assets/menu.html

@@ -5,6 +5,7 @@
     var networkListeners = [];
     var rulesListeners = [];
     var valuesListeners = [];
+    var pluginsListeners = [];
     var handleOnLoad = function() {
       timer = null;
       list.forEach(emit);
@@ -30,6 +31,9 @@
         case 'values':
           execListeners(valuesListeners, options);
           break;
+        case 'plugins':
+          execListeners(pluginsListeners, options);
+          break;
         default:
           execListeners(networkListeners, options);
       }
@@ -95,6 +99,20 @@
     var removeAllValuesListeners = function() {
       valuesListeners = [];
     };
+    var addPluginsListener = function(l) {
+      if (typeof l === 'function' && pluginsListeners.indexOf(l) === -1) {
+        pluginsListeners.push(l);
+      }
+    };
+    var removePluginsListener = function(l) {
+      l = pluginsListeners.indexOf(l);
+      if (l !== -1) {
+        pluginsListeners.splice(l, 1);
+      }
+    };
+    var removeAllPluginsListeners = function(l) {
+      pluginsListeners = [];
+    };
 
     function on(type, l) {
       if (typeof l !== 'function') {
@@ -107,6 +125,8 @@
           return addRulesListener(l);
         case 'values':
           return addValuesListener(l);
+        case 'plugins':
+          return addPluginsListener(l);
       }
     }
 
@@ -133,6 +153,13 @@
             removeAllValuesListeners();
           }
           return;
+        case 'plugins':
+          if (l) {
+            removePluginsListener(l);
+          } else {
+            removeAllPluginsListeners();
+          }
+          return;
       }
     }
     
@@ -149,7 +176,10 @@
       removeAllRulesListeners: removeAllRulesListeners,
       addValuesListener: addValuesListener,
       removeValuesListener: removeValuesListener,
-      removeAllValuesListeners: removeAllValuesListeners
+      removeAllValuesListeners: removeAllValuesListeners,
+      addPluginsListener: addPluginsListener,
+      removePluginsListener: removePluginsListener,
+      removeAllPluginsListeners: removeAllPluginsListeners
     };
     try {
       window.initWhistleBridge = function(options) {

package/bin/plugin.js

@@ -9,7 +9,7 @@ var commonUtil = require('../lib/util/common');
 var getWhistlePath = commonUtil.getWhistlePath;
 var REMOTE_URL_RE = commonUtil.REMOTE_URL_RE;
 var WHISTLE_PLUGIN_RE = commonUtil.WHISTLE_PLUGIN_RE;
-const getPlugins = commonUtil.getPlugins;
+var getPlugins = commonUtil.getPlugins;
 var CMD_SUFFIX = process.platform === 'win32' ? '.cmd' : '';
 var CUSTOM_PLUGIN_PATH = path.join(getWhistlePath(), 'custom_plugins');
 var DEFAULT_PATH = commonUtil.getDefaultWhistlePath();

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

@@ -46,6 +46,7 @@ module.exports = function(req, res) {
     log: stopRecordConsole ? [] : proxy.getLogs(data.startLogTime, data.count, data.logId),
     svrLog: stopRecordSvrLog ? [] : logger.getLogs(data.startSvrLogTime, data.count),
     plugins: pluginMgr.getPlugins(),
+    pluginsRoot: config.PLUGIN_INSTALL_ROOT,
     disabledPlugins: !config.notAllowedDisablePlugins && properties.get('disabledPlugins') || {},
     allowMultipleChoice: properties.get('allowMultipleChoice'),
     backRulesFirst: properties.get('backRulesFirst'),

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

@@ -38,6 +38,7 @@ module.exports = function(req, res) {
     interceptHttpsConnects: properties.isEnableCapture(),
     enableHttp2: properties.isEnableHttp2(),
     plugins: pluginMgr.getPlugins(),
+    pluginsRoot: config.PLUGIN_INSTALL_ROOT,
     disabledPlugins: !config.notAllowedDisablePlugins && properties.get('disabledPlugins') || {},
     disabledAllPlugins: !config.notAllowedDisablePlugins && properties.get('disabledAllPlugins'),
     disabledAllRules: !config.notAllowedDisableRules && properties.get('disabledAllRules'),

package/biz/webui/htdocs/index.html

@@ -8,6 +8,6 @@
 </head>
 <body style="overscroll-behavior-x: none;">
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.9.69"></script>
+<script src="js/index.js?v=2.9.70"></script>
 </body>
 </html>