GithubStar/whistle
1
0
Fork 0
mirror of https://github.com/avwo/whistle.git synced 2026-10-29 07:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: code

Browse Source
This commit is contained in:
avwo
2019-06-15 15:55:56 +08:00
parent 86551da151
commit 14bc438479
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/https/index.js
+9 -8
View File
@@ -185,12 +185,7 @@ function resolveWebsocket(socket, wss) {
data.abort = destroy;
proxy.emit('request', reqEmitter, data);
}
if (socket.enable.abort || filter.abort) {
return destroy();
}
if (response()) {
return;
}
pluginMgr.loadPlugin(plugin, function(err, ports) {
if (err) {
return execCallback(err);
@@ -209,8 +204,14 @@ function resolveWebsocket(socket, wss) {
return;
}
plugin = null;
rules.getProxy(fullUrl, plugin ? null : socket, function(err, hostIp, hostPort) {
proxyUrl = !plugin && _rules.proxy ? util.rule.getMatcher(_rules.proxy) : null;
if (socket.enable.abort || filter.abort) {
return destroy();
}
if (response()) {
return;
}
rules.getProxy(fullUrl, socket, function(err, hostIp, hostPort) {
proxyUrl = _rules.proxy ? util.rule.getMatcher(_rules.proxy) : null;
if (proxyUrl) {
var isXProxy = X_RE.test(proxyUrl);
var isSocks = SOCKS_PROXY_RE.test(proxyUrl);