xcodebuild
diff --git a/‎.eslintignore‎
Lines changed: 1 addition & 0 deletions b/‎.eslintignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.npmignore‎
Lines changed: 1 addition & 0 deletions b/‎.npmignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 28 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 28 additions & 0 deletions
diff --git a/‎assets/inspector.html‎
Lines changed: 0 additions & 124 deletions b/‎assets/inspector.html‎
Lines changed: 0 additions & 124 deletions
diff --git a/‎assets/menu.html‎
Lines changed: 96 additions & 42 deletions b/‎assets/menu.html‎
Lines changed: 96 additions & 42 deletions
@@ -2,3 +2,4 @@ node_modules
 /biz/webui/htdocs/js
 /biz/webui/htdocs/src/js/components
 /test/assets/values
+/test/plugins/whistle.test/assets
@@ -65,6 +65,7 @@ assets/launcher
 /.history
 CHANGELOG.md
 Dockerfile
+/README-zh_CN.md
 
 
 # Coveralls
 
@@ -1,3 +1,31 @@
+# v2.9.3
+1. feat: `redirect` 归类为 `rule` 与 `file`、`statusCode` 等协议同级别
+2. refactor: 添加 ts 描述文件
+3. refactor:`w2 i plugin` 支持 `w2 i plugin@version`
+4. fix: Node 16 引入 `req.filter` 方法引发的问题
+
+# v2.9.2
+1. feat: 支持启动参数设置 `options.server` 方便第三方服务集成
+	> `server` 可以为 `http.Server` 或 `events.EventEmitter` 对象，在第三方应用中可以通过 `server.emit('request'| 'upgrade' | 'connect', req, res)` 将请求交给 Whistle 处理
+2. feat: 支持通过插件引入远程 Value：`protocol://$plugin/xxx`，这种配置会自动从插件 whistle.plugin uiServer 的 `/api/key/value?key=xxx` 获取对应的值
+3. refactor: 优化错误日志路径 & `w2 status --all` 显示进程 id
+4. refactor: 支持 HTTP2 的 Node 最低版本有 12 调整为 14（低版本的 HTTP2 模块存在一些 bug） 
+5. fix: https://github.com/avwo/whistle/issues/697
+
+# v2.9.1
+1. feat: 支持通过 `pattern enable://clientIp` 让 Whistle 自动设置 `x-forwarded-for` 请求头
+2. style: Values 编辑器支持 JSON 对象折叠，详见：https://github.com/avwo/whistle/pull/683
+3. refactor: Whistle 的日志统一放 `$WHISTLE_PATH/whistle.log` 文件，默认为 `~/.WhistleAppData/whistle.log`
+
+# v2.9.0
+1. style: 修复禁用所有插件编辑器对应插件规则无法显示插件已失效的问题
+2. style: `Frames` 移入 `Inspectors`
+3. feat: 将请求匹配的 pattern 传给插件，可以通过 `req.originalReq.isRegExp` 及 `req.originalReq.pattern` 获取
+4. feat: 支持自定义 Inspectors tab，详见：https://github.com/whistle-plugins/examples/tree/master/whistle.view-md5
+5. feat: 支持自定义 Composer tab，详见：https://github.com/whistle-plugins/examples/tree/master/whistle.view-md5
+6. refactor: 插件全局异常也会写入启动目录的日志文件 `whistle.log`，且支持插件通过 `process.handleUncaughtPluginErrorMessage = (errMsg) => {}` 获取全局异常信息，且可以通过 `return false` 来禁止插件自动退出
+
+
 # v2.8.10
 1. fix: 插件的 sniCallback 返回 `false` 请求没有重新走 TUNNEL 代理问题
 2. refactor: 如果插件接收到的请求是 https，则 `req.url` 将为完整的路径
 
@@ -53,58 +53,112 @@
       window.addEventListener('load', delayOnLoad);
     } catch (e) {}
     var toast = {};
+    var addNetworkListener = function(l) {
+      if (typeof l === 'function' && networkListeners.indexOf(l) === -1) {
+        networkListeners.push(l);
+      }
+    };
+    var removeNetworkListener = function(l) {
+      l = networkListeners.indexOf(l);
+      if (l !== -1) {
+        networkListeners.splice(l, 1);
+      }
+    };
+    var removeAllNetworkListeners = function() {
+      networkListeners = [];
+    };
+    var addRulesListener = function(l) {
+      if (typeof l === 'function' && rulesListeners.indexOf(l) === -1) {
+        rulesListeners.push(l);
+      }
+    };
+    var removeRulesListener = function(l) {
+      l = rulesListeners.indexOf(l);
+      if (l !== -1) {
+        rulesListeners.splice(l, 1);
+      }
+    };
+    var removeAllRulesListeners = function() {
+      rulesListeners = [];
+    };
+    var addValuesListener = function(l) {
+      if (typeof l === 'function' && valuesListeners.indexOf(l) === -1) {
+        valuesListeners.push(l);
+      }
+    };
+    var removeValuesListener = function(l) {
+      l = valuesListeners.indexOf(l);
+      if (l !== -1) {
+        valuesListeners.splice(l, 1);
+      }
+    };
+    var removeAllValuesListeners = function() {
+      valuesListeners = [];
+    };
+
+    function on(type, l) {
+      if (typeof l !== 'function') {
+        return;
+      }
+      switch(type) {
+        case 'network':
+          return addNetworkListener(l);
+        case 'rules':
+          return addRulesListener(l);
+        case 'values':
+          return addValuesListener(l);
+      }
+    }
+
+    function off(type, l) {
+      switch(type) {
+        case 'network':
+          if (l) {
+            removeNetworkListener(l);
+          } else {
+            removeAllNetworkListeners();
+          }
+          return;
+        case 'rules':
+          if (l) {
+            removeRulesListener(l);
+          } else {
+            removeAllRulesListeners();
+          }
+          return;
+        case 'values':
+          if (l) {
+            removeValuesListener(l);
+          } else {
+            removeAllValuesListeners();
+          }
+          return;
+      }
+    }
+    
     var whistleBridge = {
       config: config,
       toast: toast,
-      addNetworkListener: function(l) {
-        if (typeof l === 'function' && networkListeners.indexOf(l) === -1) {
-          networkListeners.push(l);
-        }
-      },
-      removeNetworkListener: function(l) {
-        l = networkListeners.indexOf(l);
-        if (l !== -1) {
-          networkListeners.splice(l, 1);
-        }
-      },
-      removeAllNetworkListeners: function() {
-        networkListeners = [];
-      },
-      addRulesListener: function(l) {
-        if (typeof l === 'function' && rulesListeners.indexOf(l) === -1) {
-          rulesListeners.push(l);
-        }
-      },
-      removeRulesListener: function(l) {
-        l = rulesListeners.indexOf(l);
-        if (l !== -1) {
-          rulesListeners.splice(l, 1);
-        }
-      },
-      removeAllRulesListeners: function() {
-        rulesListeners = [];
-      },
-      addValuesListener: function(l) {
-        if (typeof l === 'function' && valuesListeners.indexOf(l) === -1) {
-          valuesListeners.push(l);
-        }
-      },
-      removeValuesListener: function(l) {
-        l = valuesListeners.indexOf(l);
-        if (l !== -1) {
-          valuesListeners.splice(l, 1);
-        }
-      },
-      removeAllValuesListeners: function() {
-        valuesListeners = [];
-      }
+      on: on,
+      off: off,
+      addNetworkListener: addNetworkListener,
+      removeNetworkListener: removeNetworkListener,
+      removeAllNetworkListeners: removeAllNetworkListeners,
+      addRulesListener: addRulesListener,
+      removeRulesListener: removeRulesListener,
+      removeAllRulesListeners: removeAllRulesListeners,
+      addValuesListener: addValuesListener,
+      removeValuesListener: removeValuesListener,
+      removeAllValuesListeners: removeAllValuesListeners
     };
     try {
       window.initWhistleBridge = function(options) {
         window.initWhistleBridge = function() {};
         Object.keys(options.msgBox).forEach(function(name) {
           toast[name] = options.msgBox[name];
         });
+        whistleBridge.pageId = options.pageId;
+        whistleBridge.compose = options.compose;
         whistleBridge.decodeBase64 = options.decodeBase64;
         whistleBridge.importSessions = options.importSessions;
         whistleBridge.request = options.request;