From 5217f3197ee3183797e01f5b21c8a826a728efb2 Mon Sep 17 00:00:00 2001 From: qist <87984115@qq.com> Date: Mon, 9 Sep 2024 10:57:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20quic=20=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E4=B8=80=E4=BA=9B=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/version | 2 +- web/assets/js/model/xray.js | 72 ------------------- web/html/xui/component/inbound_info.html | 5 -- web/html/xui/form/stream/stream_quic.html | 24 ------- web/html/xui/form/stream/stream_settings.html | 6 -- 5 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 web/html/xui/form/stream/stream_quic.html diff --git a/config/version b/config/version index 1b21703d..d3429c4d 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -1.8.27 \ No newline at end of file +24.9.9 \ No newline at end of file diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 30e900fe..500698bb 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -440,35 +440,6 @@ class HttpStreamSettings extends XrayCommonClass { } } - -class QuicStreamSettings extends XrayCommonClass { - constructor(security = VmessMethods.NONE, - key = '', type = 'none',) { - super(); - this.security = security; - this.key = key; - this.type = type; - } - - static fromJson(json = {}) { - return new QuicStreamSettings( - json.security, - json.key, - json.header ? json.header.type : 'none', - ); - } - - toJson() { - return { - security: this.security, - key: this.key, - header: { - type: this.type, - } - } - } -} - class GrpcStreamSettings extends XrayCommonClass { constructor( serviceName = "", @@ -889,7 +860,6 @@ class StreamSettings extends XrayCommonClass { kcpSettings = new KcpStreamSettings(), wsSettings = new WsStreamSettings(), httpSettings = new HttpStreamSettings(), - quicSettings = new QuicStreamSettings(), grpcSettings = new GrpcStreamSettings(), httpupgradeSettings = new HttpUpgradeStreamSettings(), splithttpSettings = new SplitHTTPStreamSettings(), @@ -904,7 +874,6 @@ class StreamSettings extends XrayCommonClass { this.kcp = kcpSettings; this.ws = wsSettings; this.http = httpSettings; - this.quic = quicSettings; this.grpc = grpcSettings; this.httpupgrade = httpupgradeSettings; this.splithttp = splithttpSettings; @@ -953,7 +922,6 @@ class StreamSettings extends XrayCommonClass { KcpStreamSettings.fromJson(json.kcpSettings), WsStreamSettings.fromJson(json.wsSettings), HttpStreamSettings.fromJson(json.httpSettings), - QuicStreamSettings.fromJson(json.quicSettings), GrpcStreamSettings.fromJson(json.grpcSettings), HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings), SplitHTTPStreamSettings.fromJson(json.splithttpSettings), @@ -972,7 +940,6 @@ class StreamSettings extends XrayCommonClass { kcpSettings: network === 'kcp' ? this.kcp.toJson() : undefined, wsSettings: network === 'ws' ? this.ws.toJson() : undefined, httpSettings: network === 'http' ? this.http.toJson() : undefined, - quicSettings: network === 'quic' ? this.quic.toJson() : undefined, grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined, httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined, splithttpSettings: network === 'splithttp' ? this.splithttp.toJson() : undefined, @@ -1081,10 +1048,6 @@ class Inbound extends XrayCommonClass { return this.network === "kcp"; } - get isQuic() { - return this.network === "quic" - } - get isGrpc() { return this.network === "grpc"; } @@ -1195,18 +1158,6 @@ class Inbound extends XrayCommonClass { return null; } - get quicSecurity() { - return this.stream.quic.security; - } - - get quicKey() { - return this.stream.quic.key; - } - - get quicType() { - return this.stream.quic.type; - } - get kcpType() { return this.stream.kcp.type; } @@ -1234,7 +1185,6 @@ class Inbound extends XrayCommonClass { case "tcp": case "ws": case "http": - case "quic": case "grpc": case "httpupgrade": case "splithttp": @@ -1344,10 +1294,6 @@ class Inbound extends XrayCommonClass { network = 'h2'; path = this.stream.http.path; host = this.stream.http.host.join(','); - } else if (network === 'quic') { - type = this.stream.quic.type; - host = this.stream.quic.security; - path = this.stream.quic.key; } else if (network === 'grpc') { path = this.stream.grpc.serviceName; authority = this.stream.grpc.authority; @@ -1443,12 +1389,6 @@ class Inbound extends XrayCommonClass { params.set("path", http.path); params.set("host", http.host); break; - case "quic": - const quic = this.stream.quic; - params.set("quicSecurity", quic.security); - params.set("key", quic.key); - params.set("headerType", quic.type); - break; case "grpc": const grpc = this.stream.grpc; params.set("serviceName", grpc.serviceName); @@ -1568,12 +1508,6 @@ class Inbound extends XrayCommonClass { params.set("path", http.path); params.set("host", http.host); break; - case "quic": - const quic = this.stream.quic; - params.set("quicSecurity", quic.security); - params.set("key", quic.key); - params.set("headerType", quic.type); - break; case "grpc": const grpc = this.stream.grpc; params.set("serviceName", grpc.serviceName); @@ -1684,12 +1618,6 @@ class Inbound extends XrayCommonClass { params.set("path", http.path); params.set("host", http.host); break; - case "quic": - const quic = this.stream.quic; - params.set("quicSecurity", quic.security); - params.set("key", quic.key); - params.set("headerType", quic.type); - break; case "grpc": const grpc = this.stream.grpc; params.set("serviceName", grpc.serviceName); diff --git a/web/html/xui/component/inbound_info.html b/web/html/xui/component/inbound_info.html index f8ff718f..1a0aa9b1 100644 --- a/web/html/xui/component/inbound_info.html +++ b/web/html/xui/component/inbound_info.html @@ -9,11 +9,6 @@

path: 无

- - - -