diff --git a/sub/subJsonService.go b/sub/subJsonService.go index 7b072b9532..742c403cd6 100644 --- a/sub/subJsonService.go +++ b/sub/subJsonService.go @@ -223,8 +223,6 @@ func (s *SubJsonService) streamData(stream string) map[string]interface{} { streamSettings["wsSettings"] = s.removeAcceptProxy(streamSettings["wsSettings"]) case "httpupgrade": streamSettings["httpupgradeSettings"] = s.removeAcceptProxy(streamSettings["httpupgradeSettings"]) - case "splithttp": - streamSettings["splithttpSettings"] = s.removeAcceptProxy(streamSettings["splithttpSettings"]) } return streamSettings } diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js index ee954fc1fa..9b9a814699 100644 --- a/web/assets/js/model/outbound.js +++ b/web/assets/js/model/outbound.js @@ -1084,6 +1084,7 @@ Outbound.WireguardSettings = class extends CommonClass { super(); this.mtu = mtu; this.secretKey = secretKey; + this.pubKey = secretKey.length>0 ? Wireguard.generateKeypair(secretKey).publicKey : ''; this.address = address instanceof Array ? address.join(',') : address; this.workers = workers; this.domainStrategy = domainStrategy; diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index acbe4034b5..7a8b25b98f 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1391,7 +1391,7 @@ class Inbound extends XrayCommonClass { type: 'none', tls: security, }; - let network = this.stream.network; + const network = this.stream.network; if (network === 'tcp') { const tcp = this.stream.tcp; obj.type = tcp.type; @@ -1402,11 +1402,11 @@ class Inbound extends XrayCommonClass { if (host) obj.host = host; } } else if (network === 'kcp') { - let kcp = this.stream.kcp; + const kcp = this.stream.kcp; obj.type = kcp.type; obj.path = kcp.seed; } else if (network === 'ws') { - let ws = this.stream.ws; + const ws = this.stream.ws; obj.path = ws.path; obj.host = ws.host?.length>0 ? ws.host : this.getHeader(ws, 'host'); } else if (network === 'http') { @@ -1424,11 +1424,11 @@ class Inbound extends XrayCommonClass { obj.type = 'multi' } } else if (network === 'httpupgrade') { - let httpupgrade = this.stream.httpupgrade; + const httpupgrade = this.stream.httpupgrade; obj.path = httpupgrade.path; obj.host = httpupgrade.host?.length>0 ? httpupgrade.host : this.getHeader(httpupgrade, 'host'); } else if (network === 'splithttp') { - let splithttp = this.stream.splithttp; + const splithttp = this.stream.splithttp; obj.path = splithttp.path; obj.host = splithttp.host?.length>0 ? splithttp.host : this.getHeader(splithttp, 'host'); } diff --git a/web/html/xui/form/outbound.html b/web/html/xui/form/outbound.html index a61f5c4474..90b9e60ba5 100644 --- a/web/html/xui/form/outbound.html +++ b/web/html/xui/form/outbound.html @@ -72,9 +72,23 @@ - + + - + + + + [[ wds ]] diff --git a/web/html/xui/form/stream/stream_splithttp.html b/web/html/xui/form/stream/stream_splithttp.html index e7a38d5ed2..0dcab96545 100644 --- a/web/html/xui/form/stream/stream_splithttp.html +++ b/web/html/xui/form/stream/stream_splithttp.html @@ -19,10 +19,10 @@ - + - +