diff --git a/sub/subService.go b/sub/subService.go
index 84846241ac..f52d4b67ff 100644
--- a/sub/subService.go
+++ b/sub/subService.go
@@ -208,11 +208,6 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
headers, _ := ws["headers"].(map[string]interface{})
obj["host"] = searchHost(headers)
}
- case "http":
- obj["net"] = "h2"
- http, _ := stream["httpSettings"].(map[string]interface{})
- obj["path"], _ = http["path"].(string)
- obj["host"] = searchHost(http)
case "grpc":
grpc, _ := stream["grpcSettings"].(map[string]interface{})
obj["path"] = grpc["serviceName"].(string)
@@ -361,10 +356,6 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
headers, _ := ws["headers"].(map[string]interface{})
params["host"] = searchHost(headers)
}
- case "http":
- http, _ := stream["httpSettings"].(map[string]interface{})
- params["path"] = http["path"].(string)
- params["host"] = searchHost(http)
case "grpc":
grpc, _ := stream["grpcSettings"].(map[string]interface{})
params["serviceName"] = grpc["serviceName"].(string)
@@ -559,10 +550,6 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
headers, _ := ws["headers"].(map[string]interface{})
params["host"] = searchHost(headers)
}
- case "http":
- http, _ := stream["httpSettings"].(map[string]interface{})
- params["path"] = http["path"].(string)
- params["host"] = searchHost(http)
case "grpc":
grpc, _ := stream["grpcSettings"].(map[string]interface{})
params["serviceName"] = grpc["serviceName"].(string)
@@ -757,10 +744,6 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
headers, _ := ws["headers"].(map[string]interface{})
params["host"] = searchHost(headers)
}
- case "http":
- http, _ := stream["httpSettings"].(map[string]interface{})
- params["path"] = http["path"].(string)
- params["host"] = searchHost(http)
case "grpc":
grpc, _ := stream["grpcSettings"].(map[string]interface{})
params["serviceName"] = grpc["serviceName"].(string)
diff --git a/web/assets/js/model/inbound.js b/web/assets/js/model/inbound.js
index e8c3ab5d18..f398f2f157 100644
--- a/web/assets/js/model/inbound.js
+++ b/web/assets/js/model/inbound.js
@@ -419,42 +419,6 @@ class WsStreamSettings extends XrayCommonClass {
}
}
-class HttpStreamSettings extends XrayCommonClass {
- constructor(
- path = '/',
- host = [''],
- ) {
- super();
- this.path = path;
- this.host = host.length === 0 ? [''] : host;
- }
-
- addHost(host) {
- this.host.push(host);
- }
-
- removeHost(index) {
- this.host.splice(index, 1);
- }
-
- static fromJson(json = {}) {
- return new HttpStreamSettings(json.path, json.host);
- }
-
- toJson() {
- let host = [];
- for (let i = 0; i < this.host.length; ++i) {
- if (!ObjectUtil.isEmpty(this.host[i])) {
- host.push(this.host[i]);
- }
- }
- return {
- path: this.path,
- host: host,
- }
- }
-}
-
class GrpcStreamSettings extends XrayCommonClass {
constructor(
serviceName = "",
@@ -958,7 +922,6 @@ class StreamSettings extends XrayCommonClass {
tcpSettings = new TcpStreamSettings(),
kcpSettings = new KcpStreamSettings(),
wsSettings = new WsStreamSettings(),
- httpSettings = new HttpStreamSettings(),
grpcSettings = new GrpcStreamSettings(),
httpupgradeSettings = new HTTPUpgradeStreamSettings(),
xhttpSettings = new xHTTPStreamSettings(),
@@ -973,7 +936,6 @@ class StreamSettings extends XrayCommonClass {
this.tcp = tcpSettings;
this.kcp = kcpSettings;
this.ws = wsSettings;
- this.http = httpSettings;
this.grpc = grpcSettings;
this.httpupgrade = httpupgradeSettings;
this.xhttp = xhttpSettings;
@@ -1023,7 +985,6 @@ class StreamSettings extends XrayCommonClass {
TcpStreamSettings.fromJson(json.tcpSettings),
KcpStreamSettings.fromJson(json.kcpSettings),
WsStreamSettings.fromJson(json.wsSettings),
- HttpStreamSettings.fromJson(json.httpSettings),
GrpcStreamSettings.fromJson(json.grpcSettings),
HTTPUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
xHTTPStreamSettings.fromJson(json.xhttpSettings),
@@ -1042,7 +1003,6 @@ class StreamSettings extends XrayCommonClass {
tcpSettings: network === 'tcp' ? this.tcp.toJson() : undefined,
kcpSettings: network === 'kcp' ? this.kcp.toJson() : undefined,
wsSettings: network === 'ws' ? this.ws.toJson() : undefined,
- httpSettings: network === 'http' ? this.http.toJson() : undefined,
grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
@@ -1174,10 +1134,6 @@ class Inbound extends XrayCommonClass {
return this.network === "grpc";
}
- get isH2() {
- return this.network === "http";
- }
-
get isHttpupgrade() {
return this.network === "httpupgrade";
}
@@ -1222,8 +1178,6 @@ class Inbound extends XrayCommonClass {
return this.getHeader(this.stream.tcp.request, 'host');
} else if (this.isWs) {
return this.stream.ws.host?.length > 0 ? this.stream.ws.host : this.getHeader(this.stream.ws, 'host');
- } else if (this.isH2) {
- return this.stream.http.host[0];
} else if (this.isHttpupgrade) {
return this.stream.httpupgrade.host?.length > 0 ? this.stream.httpupgrade.host : this.getHeader(this.stream.httpupgrade, 'host');
} else if (this.isXHTTP) {
@@ -1237,8 +1191,6 @@ class Inbound extends XrayCommonClass {
return this.stream.tcp.request.path[0];
} else if (this.isWs) {
return this.stream.ws.path;
- } else if (this.isH2) {
- return this.stream.http.path;
} else if (this.isHttpupgrade) {
return this.stream.httpupgrade.path;
} else if (this.isXHTTP) {
@@ -1331,10 +1283,6 @@ class Inbound extends XrayCommonClass {
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') {
- obj.net = 'h2';
- obj.path = this.stream.http.path;
- obj.host = this.stream.http.host.join(',');
} else if (network === 'grpc') {
obj.path = this.stream.grpc.serviceName;
obj.authority = this.stream.grpc.authority;
@@ -1400,11 +1348,6 @@ class Inbound extends XrayCommonClass {
params.set("path", ws.path);
params.set("host", ws.host?.length > 0 ? ws.host : this.getHeader(ws, 'host'));
break;
- case "http":
- const http = this.stream.http;
- params.set("path", http.path);
- params.set("host", http.host);
- break;
case "grpc":
const grpc = this.stream.grpc;
params.set("serviceName", grpc.serviceName);
@@ -1504,11 +1447,6 @@ class Inbound extends XrayCommonClass {
params.set("path", ws.path);
params.set("host", ws.host?.length > 0 ? ws.host : this.getHeader(ws, 'host'));
break;
- case "http":
- const http = this.stream.http;
- params.set("path", http.path);
- params.set("host", http.host);
- break;
case "grpc":
const grpc = this.stream.grpc;
params.set("serviceName", grpc.serviceName);
@@ -1587,11 +1525,6 @@ class Inbound extends XrayCommonClass {
params.set("path", ws.path);
params.set("host", ws.host?.length > 0 ? ws.host : this.getHeader(ws, 'host'));
break;
- case "http":
- const http = this.stream.http;
- params.set("path", http.path);
- params.set("host", http.host);
- break;
case "grpc":
const grpc = this.stream.grpc;
params.set("serviceName", grpc.serviceName);
diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js
index 5a7722e330..7a53383c6c 100644
--- a/web/assets/js/model/outbound.js
+++ b/web/assets/js/model/outbound.js
@@ -235,59 +235,6 @@ class WsStreamSettings extends CommonClass {
}
}
-class HttpStreamSettings extends CommonClass {
- constructor(path = '/', host = '') {
- super();
- this.path = path;
- this.host = host;
- }
-
- static fromJson(json = {}) {
- return new HttpStreamSettings(
- json.path,
- json.host ? json.host.join(',') : '',
- );
- }
-
- toJson() {
- return {
- path: this.path,
- host: ObjectUtil.isEmpty(this.host) ? [''] : this.host.split(','),
- }
- }
-}
-
-class QuicStreamSettings extends CommonClass {
- constructor(
- security = '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 CommonClass {
constructor(
serviceName = "",
@@ -478,8 +425,6 @@ class StreamSettings extends CommonClass {
tcpSettings = new TcpStreamSettings(),
kcpSettings = new KcpStreamSettings(),
wsSettings = new WsStreamSettings(),
- httpSettings = new HttpStreamSettings(),
- quicSettings = new QuicStreamSettings(),
grpcSettings = new GrpcStreamSettings(),
httpupgradeSettings = new HttpUpgradeStreamSettings(),
xhttpSettings = new xHTTPStreamSettings(),
@@ -493,7 +438,6 @@ class StreamSettings extends CommonClass {
this.tcp = tcpSettings;
this.kcp = kcpSettings;
this.ws = wsSettings;
- this.http = httpSettings;
this.grpc = grpcSettings;
this.httpupgrade = httpupgradeSettings;
this.xhttp = xhttpSettings;
@@ -525,8 +469,6 @@ class StreamSettings extends CommonClass {
TcpStreamSettings.fromJson(json.tcpSettings),
KcpStreamSettings.fromJson(json.kcpSettings),
WsStreamSettings.fromJson(json.wsSettings),
- HttpStreamSettings.fromJson(json.httpSettings),
- QuicStreamSettings.fromJson(json.quicSettings),
GrpcStreamSettings.fromJson(json.grpcSettings),
HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
xHTTPStreamSettings.fromJson(json.xhttpSettings),
@@ -544,7 +486,6 @@ class StreamSettings extends CommonClass {
tcpSettings: network === 'tcp' ? this.tcp.toJson() : undefined,
kcpSettings: network === 'kcp' ? this.kcp.toJson() : undefined,
wsSettings: network === 'ws' ? this.ws.toJson() : undefined,
- httpSettings: network === 'http' ? this.http.toJson() : undefined,
grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
@@ -585,7 +526,7 @@ class Mux extends CommonClass {
class Outbound extends CommonClass {
constructor(
tag = '',
- protocol = Protocols.VMess,
+ protocol = Protocols.VLESS,
settings = null,
streamSettings = new StreamSettings(),
sendThrough,
@@ -723,11 +664,6 @@ class Outbound extends CommonClass {
stream.seed = json.path;
} else if (network === 'ws') {
stream.ws = new WsStreamSettings(json.path, json.host);
- } else if (network === 'http' || network == 'h2') {
- stream.network = 'http'
- stream.http = new HttpStreamSettings(
- json.path,
- json.host);
} else if (network === 'grpc') {
stream.grpc = new GrpcStreamSettings(json.path, json.authority, json.type == 'multi');
} else if (network === 'httpupgrade') {
@@ -767,8 +703,6 @@ class Outbound extends CommonClass {
stream.kcp.seed = path;
} else if (type === 'ws') {
stream.ws = new WsStreamSettings(path, host);
- } else if (type === 'http' || type == 'h2') {
- stream.http = new HttpStreamSettings(path, host);
} else if (type === 'grpc') {
stream.grpc = new GrpcStreamSettings(
url.searchParams.get('serviceName') ?? '',
diff --git a/web/html/xui/form/outbound.html b/web/html/xui/form/outbound.html
index e6d12ee44b..fb9e6f41a2 100644
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -270,7 +270,6 @@
TCP (RAW)
mKCP
WebSocket
- HTTP
gRPC
HTTPUpgrade
XHTTP
@@ -341,16 +340,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/web/html/xui/form/stream/stream_http.html b/web/html/xui/form/stream/stream_http.html
deleted file mode 100644
index b562c11292..0000000000
--- a/web/html/xui/form/stream/stream_http.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{define "form/streamHTTP"}}
-
-
-
-
-
- {{ i18n "host" }}
-
-
-
-
-
-
-
-
-
-{{end}}
\ No newline at end of file
diff --git a/web/html/xui/form/stream/stream_settings.html b/web/html/xui/form/stream/stream_settings.html
index cab4e7279b..a3119d9c04 100644
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -7,7 +7,6 @@
TCP (RAW)
mKCP
WebSocket
- HTTP
gRPC
HTTPUpgrade
XHTTP
@@ -30,11 +29,6 @@
{{template "form/streamWS"}}
-
-
- {{template "form/streamHTTP"}}
-
-
{{template "form/streamGRPC"}}
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html
index c7e05f8847..7796cf1e01 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -34,7 +34,7 @@
[[ inbound.network ]]
-
+
{{ i18n "host" }} |
|