xcodebuild
diff --git a/‎.npmignore‎
Lines changed: 2 additions & 1 deletion b/‎.npmignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎CHANGELOG.md‎
Lines changed: 40 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 40 additions & 0 deletions
diff --git a/‎assets/inspector.html‎
Lines changed: 124 additions & 0 deletions b/‎assets/inspector.html‎
Lines changed: 124 additions & 0 deletions
diff --git a/‎assets/menu.html‎
Lines changed: 13 additions & 10 deletions b/‎assets/menu.html‎
Lines changed: 13 additions & 10 deletions
diff --git a/‎bin/plugin.js‎
Lines changed: 7 additions & 0 deletions b/‎bin/plugin.js‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎bin/util.js‎
Lines changed: 1 addition & 1 deletion b/‎bin/util.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎biz/webui/cgi-bin/certs/all.js‎
Lines changed: 8 additions & 0 deletions b/‎biz/webui/cgi-bin/certs/all.js‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎biz/webui/cgi-bin/certs/remove.js‎
Lines changed: 8 additions & 0 deletions b/‎biz/webui/cgi-bin/certs/remove.js‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎biz/webui/cgi-bin/certs/upload.js‎
Lines changed: 8 additions & 0 deletions b/‎biz/webui/cgi-bin/certs/upload.js‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎biz/webui/cgi-bin/composer.js‎
Lines changed: 1 addition & 1 deletion b/‎biz/webui/cgi-bin/composer.js‎
Lines changed: 1 addition & 1 deletion
@@ -54,7 +54,8 @@ node_modules
 .gitignore
 .npmignore
 .travis.yml
-.eslintrc.js
+.eslintrc
+.editorconfig
 .eslintignore
 .babelrc
 test
 
@@ -1,3 +1,43 @@
+# v2.8.10
+1. fix: 插件的 sniCallback 返回 `false` 请求没有重新走 TUNNEL 代理问题
+2. refactor: 如果插件接收到的请求是 https，则 `req.url` 将为完整的路径
+
+# v2.8.9
+1. feat: 支持自定义 `inspectors tab`，详见：https://github.com/whistle-plugins/examples/tree/master/whistle.view-md5
+2. feat: 支持通过 `disable://abort` 禁用 `enable://abort`
+3. feat: Whistle 默认显示的抓包数据不超过 1.5m，可以通过 `enable://bigData` 扩大到 `2.5m`
+
+# v2.8.8
+1. feat: 支持通过 `enable://useLocalHost` 和 `enable://useSafePort` 修改 log 和 weinre 请求 URL 的域名或端口
+2. style: 界面提供 `api.selectIndex` 选中指定下标的抓包数据
+3. feat: 支持插件获取 `originalReq.remoteAddress` 与 `originalReq.remotePort`
+
+# v2.8.7
+1. feat: `--httpsPort` 启动的 HTTPS Server 支持从插件获取证书
+2. feat: 支持通过 `excludeFilter://from=httpServer`、`includeFilter://from=httpsServer`、`excludeFilter://from=httpServer`、`includeFilter://from=httpsServer` 过滤请求
+
+# v2.8.6
+1. refactor: 禁止通过页面上传根证书 `root.key & root.crt`
+2. refactor: Whistle 自动生成的证书过期时自动续期（有效期一年）
+
+# v2.8.5
+1. feat: 支持通过 `ignore://-*` 过滤 `ignore://*`
+2. feat: 支持 `proxy` 和 `pac` 配置 `lineProps://proxyHostOnly`，当用户配置了 `host` 代理才会生效
+3. feat: 非 SNI 请求也支持通过插件自定义证书，且支持直接上传和删除用户自定义证书
+
+# v2.8.4
+1. fix: 可能无法导入 saz 文件问题
+
+# v2.8.3
+1. fix: https://github.com/avwo/whistle/pull/657
+2. feat: 插件 `server` 钩子支持通过 `req.setReqRules & req.setResRules` 设置动态规则
+3. feat: 支持通过 `enable://forceReqWrite` 和 `enable://forceResWrite` 强制 `reqWrite`、`reqWriteRaw` 和 `resWrite`、`resWriteRaw`
+4. feat: `reqWrite:///path/to/` 和 `reqWrite:///path/to` 加以区别，前者会自动把根路径补成 `index.html`
+5. feat: 插件的 auth hook 默认情况下如果开启了捕获 https，则对这部分请求只会对解析后的 https 请求生效，如果需要对隧道代理生效可以设置 `enable://authCapture`
+6. feat: 默认不启用 `x-forwarded-host` 和 `x-forwarded-proto` 直接放过，可以通过以下方式启用：
+	- 启动参数 `-M x-forwarded-host|x-forwarded-proto`
+	- 请求进入 Whistle 之前设置请求头 `x-whistle-forwarded-props: host,proto,for,clientIp,ip`
+
 # v2.8.2
 1. feat: `resMerge://json1 resMerge://json2` 默认采用 `extend({}, json1, json2)`，新版支持通过 `resMerge://json1 resMerge://json2 resMerge://true` 开启  `extend(true, {}, json1, json2)`
 2. refactor: 插件规则里面的 req 和 res rules 分开执行
 
@@ -0,0 +1,124 @@
+<script>
+  ;(function() {
+    var config = window.whistleInspectorConfig;
+    var activeList = [];
+    var stateList = [1];
+    var getActiveSession;
+    var getSelectedSessionList;
+    var listenersList = [];
+
+    function initState(flag) {
+      stateList[1] = flag;
+      stateList[2] = flag;
+      stateList[3] = flag;
+    }
+
+    function updateState(item) {
+      if (!item || item.lost || item.endTime) {
+        return  initState(1);
+      }
+      initState();
+      if (item.responseTime) {
+        stateList[2] = 1;
+      }
+      if (item.requestTime) {
+        stateList[1] = 1;
+      }
+    }
+
+    function emitListeners(item, state) {
+      if (stateList[state] && item !== activeList[state]) {
+        activeList[state] = item;
+        var listeners = listenersList[state];
+        listeners.forEach(function(l) {
+          l(item);
+        });
+      }
+    }
+
+    function emitAll(item) {
+      updateState(item);
+      emitListeners(item, 0);
+      emitListeners(item, 1);
+      emitListeners(item, 2);
+      emitListeners(item, 3);
+    }
+
+    window.__pushWhistle5b6af7b9884e1165SessionActive__ = emitAll;
+
+    function getAddEventHandler(state) {
+      state = state || 0;
+      listenersList[state] = [];
+      return function(l) {
+        if (typeof l !== 'function') {
+          return;
+        }
+        var item = getActiveSession();
+        emitAll(item);
+        activeList[state] = item;
+        if (stateList[state]) {
+          l(item);
+        }
+        var listeners = listenersList[state];
+        listeners.indexOf(l) === -1 && listeners.push(l);
+      };
+    }
+
+    function getRemoveEventListener(state) {
+      state = state || 0;
+      return function(l) {
+        var listeners = listenersList[state];
+        var index = listeners.indexOf(l);
+        index !== -1 && listeners.splice(index, 1);
+      };
+    }
+
+    function getRemoveEventListeners(state) {
+      state = state || 0;
+      return function(l) {
+        listenersList[state] = [];
+      };
+    }
+
+    var toast = {};
+    var whistleBridge = {
+      config: config,
+      toast: toast,
+      addSessionActiveListener: getAddEventHandler(),
+      removeSessionActiveListener: getRemoveEventListener(),
+      removeSessionActiveListeners: getRemoveEventListeners(),
+      addSessionRequestListener: getAddEventHandler(1),
+      removeSessionRequestListener: getRemoveEventListener(1),
+      removeSessionRequestListeners: getRemoveEventListeners(1),
+      addSessionResponseListener: getAddEventHandler(2),
+      removeSessionResponseListener: getRemoveEventListener(2),
+      removeSessionResponseListeners: getRemoveEventListeners(2),
+      addSessionCompleteListener: getAddEventHandler(3),
+      removeSessionCompleteListener: getRemoveEventListener(3),
+      removeSessionCompleteListeners: getRemoveEventListeners(3)
+    };
+
+    try {
+      window.parent.onWhistleInspectorCustomTabReady(function(options) {
+        Object.keys(options.msgBox).forEach(function(name) {
+          toast[name] = options.msgBox[name];
+        });
+        getActiveSession = options.getActiveSession;
+        getSelectedSessionList = options.getSelectedSessionList;
+        whistleBridge.decodeBase64 = options.decodeBase64;
+        whistleBridge.importSessions = options.importSessions;
+        whistleBridge.request = options.request;
+        whistleBridge.createRequest = options.createRequest;
+        whistleBridge.showModal = options.showModal;
+        whistleBridge.getSelectedSessionList = getSelectedSessionList;
+        whistleBridge.getActiveSession = whistleBridge.getSession = whistleBridge.getSelectedSession = getActiveSession;
+        whistleBridge.importRules = options.importRules;
+        whistleBridge.importValues = options.importValues;
+        whistleBridge.getServerInfo = options.getServerInfo;
+        whistleBridge.alert = options.alert;
+        whistleBridge.confirm = options.confirm;
+      });
+    } catch (e) {}
+    window.whistleBridge = whistleBridge;
+  })();
+</script>
@@ -53,10 +53,8 @@
       window.addEventListener('load', delayOnLoad);
     } catch (e) {}
     var toast = {};
-    var modal = {};
-    window.whistleBridge = {
+    var whistleBridge = {
       config: config,
-      modal: modal,
       toast: toast,
       addNetworkListener: function(l) {
         if (typeof l === 'function' && networkListeners.indexOf(l) === -1) {
@@ -107,15 +105,20 @@
         Object.keys(options.msgBox).forEach(function(name) {
           toast[name] = options.msgBox[name];
         });
-        window.whistleBridge.importSessions = options.importSessions;
-        window.whistleBridge.request = options.request;
-        window.whistleBridge.createRequest = options.createRequest;
-        window.whistleBridge.showModal = options.showModal;
-        window.whistleBridge.createModal = options.createModal;
-        window.whistleBridge.importRules = options.importRules;
-        window.whistleBridge.importValues = options.importValues;
+        whistleBridge.decodeBase64 = options.decodeBase64;
+        whistleBridge.importSessions = options.importSessions;
+        whistleBridge.request = options.request;
+        whistleBridge.createRequest = options.createRequest;
+        whistleBridge.showModal = options.showModal;
+        whistleBridge.createModal = options.createModal;
+        whistleBridge.importRules = options.importRules;
+        whistleBridge.importValues = options.importValues;
+        whistleBridge.getServerInfo = options.getServerInfo;
+        whistleBridge.alert = options.alert;
+        whistleBridge.confirm = options.confirm;
       };
       window.parent.onPluginContextMenuReady(window);
     } catch (e) {}
+    window.whistleBridge = whistleBridge;
   })();
 </script>
@@ -95,6 +95,13 @@ function install(cmd, name, argv) {
           removeDir(installPath);
         } catch (e) {}
       }
+      try {
+        var pkgPath = path.join(realPath, 'node_modules', name, 'package.json');
+        if (fs.statSync(pkgPath).mtime.getFullYear() < 2010) {
+          var now = new Date();
+          fs.utimesSync(pkgPath, now, now);
+        }
+      } catch (e) {}
     }
   });
 }
 
@@ -76,7 +76,7 @@ function showUsage(isRunning, options, restart) {
   var list = options.host ? [options.host] : getIpList();
   info('[i] 1. use your device to visit the following URL list, gets the ' + colors.bold('IP') + ' of the URL you can access:');
   info(list.map(function(ip) {
-    return '       http://' + colors.bold(ip) + (port ? ':' + port : '') + '/';
+    return '       http://' + colors.bold(ip) + (port && port != 80 ? ':' + port : '') + '/';
   }).join('\n'));
 
   warn('       Note: If all the above URLs are unable to access, check the firewall settings');
 
@@ -0,0 +1,8 @@
+var ca = require('../../../../lib/https/ca');
+
+module.exports = function(req, res) {
+  res.json({
+    certs: ca.getCustomCertsFiles(),
+    dir: ca.CUSTOM_CERTS_DIR
+  });
+};
@@ -0,0 +1,8 @@
+var ca = require('../../../../lib/https/ca');
+
+
+module.exports = function(req, res) {
+  ca.removeCert(req.body.filename);
+  var isparsed = req.query.dataType === 'parsed';
+  res.json(isparsed ? ca.getCustomCertsInfo() : ca.getCustomCertsFiles());
+};
@@ -0,0 +1,8 @@
+var ca = require('../../../../lib/https/ca');
+
+
+module.exports = function(req, res) {
+  ca.uploadCerts(req.body);
+  var isparsed = req.query.dataType === 'parsed';
+  res.json(isparsed ? ca.getCustomCertsInfo() : ca.getCustomCertsFiles());
+};
@@ -217,7 +217,7 @@ module.exports = function(req, res) {
   var clientId = req.headers[config.CLIENT_ID_HEADER];
   var headers = parseHeaders(req.body.headers, rawHeaderNames, clientId);
   delete headers[config.WEBUI_HEAD];
-  headers[config.WHISTLE_REQ_FROM_HEADER] = 'W2COMPOSER';
+  headers[config.REQ_FROM_HEADER] = 'W2COMPOSER';
   headers.host = options.host;
   options.clientId = clientId;
   var clientIp = util.getClientIp(req);
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,13 @@ function install(cmd, name, argv) {`
`95`	`95`	`removeDir(installPath);`
`96`	`96`	`} catch (e) {}`
`97`	`97`	`}`
	`98`	`+ try {`
	`99`	`+ var pkgPath = path.join(realPath, 'node_modules', name, 'package.json');`
	`100`	`+ if (fs.statSync(pkgPath).mtime.getFullYear() < 2010) {`
	`101`	`+ var now = new Date();`
	`102`	`+ fs.utimesSync(pkgPath, now, now);`
	`103`	`+ }`
	`104`	`+ } catch (e) {}`
`98`	`105`	`}`
`99`	`106`	`});`
`100`	`107`	`}`