Skip to content

Commit 4efcdb3

Browse files
MHSanaeiMHSanaei
committed
Transport: Remove HTTP
Migrated to XHTTP "stream-one" mode.
1 parent ddc2cfa commit 4efcdb3

File tree

7 files changed

+2
-186
lines changed

7 files changed

+2
-186
lines changed

‎sub/subService.go

-17
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,6 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
208208
headers, _ := ws["headers"].(map[string]interface{})
209209
obj["host"] = searchHost(headers)
210210
}
211-
case "http":
212-
obj["net"] = "h2"
213-
http, _ := stream["httpSettings"].(map[string]interface{})
214-
obj["path"], _ = http["path"].(string)
215-
obj["host"] = searchHost(http)
216211
case "grpc":
217212
grpc, _ := stream["grpcSettings"].(map[string]interface{})
218213
obj["path"] = grpc["serviceName"].(string)
@@ -361,10 +356,6 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
361356
headers, _ := ws["headers"].(map[string]interface{})
362357
params["host"] = searchHost(headers)
363358
}
364-
case "http":
365-
http, _ := stream["httpSettings"].(map[string]interface{})
366-
params["path"] = http["path"].(string)
367-
params["host"] = searchHost(http)
368359
case "grpc":
369360
grpc, _ := stream["grpcSettings"].(map[string]interface{})
370361
params["serviceName"] = grpc["serviceName"].(string)
@@ -559,10 +550,6 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
559550
headers, _ := ws["headers"].(map[string]interface{})
560551
params["host"] = searchHost(headers)
561552
}
562-
case "http":
563-
http, _ := stream["httpSettings"].(map[string]interface{})
564-
params["path"] = http["path"].(string)
565-
params["host"] = searchHost(http)
566553
case "grpc":
567554
grpc, _ := stream["grpcSettings"].(map[string]interface{})
568555
params["serviceName"] = grpc["serviceName"].(string)
@@ -757,10 +744,6 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
757744
headers, _ := ws["headers"].(map[string]interface{})
758745
params["host"] = searchHost(headers)
759746
}
760-
case "http":
761-
http, _ := stream["httpSettings"].(map[string]interface{})
762-
params["path"] = http["path"].(string)
763-
params["host"] = searchHost(http)
764747
case "grpc":
765748
grpc, _ := stream["grpcSettings"].(map[string]interface{})
766749
params["serviceName"] = grpc["serviceName"].(string)

‎web/assets/js/model/inbound.js

-67
Original file line numberDiff line numberDiff line change
@@ -419,42 +419,6 @@ class WsStreamSettings extends XrayCommonClass {
419419
}
420420
}
421421

422-
class HttpStreamSettings extends XrayCommonClass {
423-
constructor(
424-
path = '/',
425-
host = [''],
426-
) {
427-
super();
428-
this.path = path;
429-
this.host = host.length === 0 ? [''] : host;
430-
}
431-
432-
addHost(host) {
433-
this.host.push(host);
434-
}
435-
436-
removeHost(index) {
437-
this.host.splice(index, 1);
438-
}
439-
440-
static fromJson(json = {}) {
441-
return new HttpStreamSettings(json.path, json.host);
442-
}
443-
444-
toJson() {
445-
let host = [];
446-
for (let i = 0; i < this.host.length; ++i) {
447-
if (!ObjectUtil.isEmpty(this.host[i])) {
448-
host.push(this.host[i]);
449-
}
450-
}
451-
return {
452-
path: this.path,
453-
host: host,
454-
}
455-
}
456-
}
457-
458422
class GrpcStreamSettings extends XrayCommonClass {
459423
constructor(
460424
serviceName = "",
@@ -958,7 +922,6 @@ class StreamSettings extends XrayCommonClass {
958922
tcpSettings = new TcpStreamSettings(),
959923
kcpSettings = new KcpStreamSettings(),
960924
wsSettings = new WsStreamSettings(),
961-
httpSettings = new HttpStreamSettings(),
962925
grpcSettings = new GrpcStreamSettings(),
963926
httpupgradeSettings = new HTTPUpgradeStreamSettings(),
964927
xhttpSettings = new xHTTPStreamSettings(),
@@ -973,7 +936,6 @@ class StreamSettings extends XrayCommonClass {
973936
this.tcp = tcpSettings;
974937
this.kcp = kcpSettings;
975938
this.ws = wsSettings;
976-
this.http = httpSettings;
977939
this.grpc = grpcSettings;
978940
this.httpupgrade = httpupgradeSettings;
979941
this.xhttp = xhttpSettings;
@@ -1023,7 +985,6 @@ class StreamSettings extends XrayCommonClass {
1023985
TcpStreamSettings.fromJson(json.tcpSettings),
1024986
KcpStreamSettings.fromJson(json.kcpSettings),
1025987
WsStreamSettings.fromJson(json.wsSettings),
1026-
HttpStreamSettings.fromJson(json.httpSettings),
1027988
GrpcStreamSettings.fromJson(json.grpcSettings),
1028989
HTTPUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
1029990
xHTTPStreamSettings.fromJson(json.xhttpSettings),
@@ -1042,7 +1003,6 @@ class StreamSettings extends XrayCommonClass {
10421003
tcpSettings: network === 'tcp' ? this.tcp.toJson() : undefined,
10431004
kcpSettings: network === 'kcp' ? this.kcp.toJson() : undefined,
10441005
wsSettings: network === 'ws' ? this.ws.toJson() : undefined,
1045-
httpSettings: network === 'http' ? this.http.toJson() : undefined,
10461006
grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
10471007
httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
10481008
xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
@@ -1174,10 +1134,6 @@ class Inbound extends XrayCommonClass {
11741134
return this.network === "grpc";
11751135
}
11761136

1177-
get isH2() {
1178-
return this.network === "http";
1179-
}
1180-
11811137
get isHttpupgrade() {
11821138
return this.network === "httpupgrade";
11831139
}
@@ -1222,8 +1178,6 @@ class Inbound extends XrayCommonClass {
12221178
return this.getHeader(this.stream.tcp.request, 'host');
12231179
} else if (this.isWs) {
12241180
return this.stream.ws.host?.length > 0 ? this.stream.ws.host : this.getHeader(this.stream.ws, 'host');
1225-
} else if (this.isH2) {
1226-
return this.stream.http.host[0];
12271181
} else if (this.isHttpupgrade) {
12281182
return this.stream.httpupgrade.host?.length > 0 ? this.stream.httpupgrade.host : this.getHeader(this.stream.httpupgrade, 'host');
12291183
} else if (this.isXHTTP) {
@@ -1237,8 +1191,6 @@ class Inbound extends XrayCommonClass {
12371191
return this.stream.tcp.request.path[0];
12381192
} else if (this.isWs) {
12391193
return this.stream.ws.path;
1240-
} else if (this.isH2) {
1241-
return this.stream.http.path;
12421194
} else if (this.isHttpupgrade) {
12431195
return this.stream.httpupgrade.path;
12441196
} else if (this.isXHTTP) {
@@ -1331,10 +1283,6 @@ class Inbound extends XrayCommonClass {
13311283
const ws = this.stream.ws;
13321284
obj.path = ws.path;
13331285
obj.host = ws.host?.length > 0 ? ws.host : this.getHeader(ws, 'host');
1334-
} else if (network === 'http') {
1335-
obj.net = 'h2';
1336-
obj.path = this.stream.http.path;
1337-
obj.host = this.stream.http.host.join(',');
13381286
} else if (network === 'grpc') {
13391287
obj.path = this.stream.grpc.serviceName;
13401288
obj.authority = this.stream.grpc.authority;
@@ -1400,11 +1348,6 @@ class Inbound extends XrayCommonClass {
14001348
params.set("path", ws.path);
14011349
params.set("host", ws.host?.length > 0 ? ws.host : this.getHeader(ws, 'host'));
14021350
break;
1403-
case "http":
1404-
const http = this.stream.http;
1405-
params.set("path", http.path);
1406-
params.set("host", http.host);
1407-
break;
14081351
case "grpc":
14091352
const grpc = this.stream.grpc;
14101353
params.set("serviceName", grpc.serviceName);
@@ -1504,11 +1447,6 @@ class Inbound extends XrayCommonClass {
15041447
params.set("path", ws.path);
15051448
params.set("host", ws.host?.length > 0 ? ws.host : this.getHeader(ws, 'host'));
15061449
break;
1507-
case "http":
1508-
const http = this.stream.http;
1509-
params.set("path", http.path);
1510-
params.set("host", http.host);
1511-
break;
15121450
case "grpc":
15131451
const grpc = this.stream.grpc;
15141452
params.set("serviceName", grpc.serviceName);
@@ -1587,11 +1525,6 @@ class Inbound extends XrayCommonClass {
15871525
params.set("path", ws.path);
15881526
params.set("host", ws.host?.length > 0 ? ws.host : this.getHeader(ws, 'host'));
15891527
break;
1590-
case "http":
1591-
const http = this.stream.http;
1592-
params.set("path", http.path);
1593-
params.set("host", http.host);
1594-
break;
15951528
case "grpc":
15961529
const grpc = this.stream.grpc;
15971530
params.set("serviceName", grpc.serviceName);

‎web/assets/js/model/outbound.js

+1-67
Original file line numberDiff line numberDiff line change
@@ -235,59 +235,6 @@ class WsStreamSettings extends CommonClass {
235235
}
236236
}
237237

238-
class HttpStreamSettings extends CommonClass {
239-
constructor(path = '/', host = '') {
240-
super();
241-
this.path = path;
242-
this.host = host;
243-
}
244-
245-
static fromJson(json = {}) {
246-
return new HttpStreamSettings(
247-
json.path,
248-
json.host ? json.host.join(',') : '',
249-
);
250-
}
251-
252-
toJson() {
253-
return {
254-
path: this.path,
255-
host: ObjectUtil.isEmpty(this.host) ? [''] : this.host.split(','),
256-
}
257-
}
258-
}
259-
260-
class QuicStreamSettings extends CommonClass {
261-
constructor(
262-
security = 'none',
263-
key = '',
264-
type = 'none'
265-
) {
266-
super();
267-
this.security = security;
268-
this.key = key;
269-
this.type = type;
270-
}
271-
272-
static fromJson(json = {}) {
273-
return new QuicStreamSettings(
274-
json.security,
275-
json.key,
276-
json.header ? json.header.type : 'none',
277-
);
278-
}
279-
280-
toJson() {
281-
return {
282-
security: this.security,
283-
key: this.key,
284-
header: {
285-
type: this.type,
286-
}
287-
}
288-
}
289-
}
290-
291238
class GrpcStreamSettings extends CommonClass {
292239
constructor(
293240
serviceName = "",
@@ -478,8 +425,6 @@ class StreamSettings extends CommonClass {
478425
tcpSettings = new TcpStreamSettings(),
479426
kcpSettings = new KcpStreamSettings(),
480427
wsSettings = new WsStreamSettings(),
481-
httpSettings = new HttpStreamSettings(),
482-
quicSettings = new QuicStreamSettings(),
483428
grpcSettings = new GrpcStreamSettings(),
484429
httpupgradeSettings = new HttpUpgradeStreamSettings(),
485430
xhttpSettings = new xHTTPStreamSettings(),
@@ -493,7 +438,6 @@ class StreamSettings extends CommonClass {
493438
this.tcp = tcpSettings;
494439
this.kcp = kcpSettings;
495440
this.ws = wsSettings;
496-
this.http = httpSettings;
497441
this.grpc = grpcSettings;
498442
this.httpupgrade = httpupgradeSettings;
499443
this.xhttp = xhttpSettings;
@@ -525,8 +469,6 @@ class StreamSettings extends CommonClass {
525469
TcpStreamSettings.fromJson(json.tcpSettings),
526470
KcpStreamSettings.fromJson(json.kcpSettings),
527471
WsStreamSettings.fromJson(json.wsSettings),
528-
HttpStreamSettings.fromJson(json.httpSettings),
529-
QuicStreamSettings.fromJson(json.quicSettings),
530472
GrpcStreamSettings.fromJson(json.grpcSettings),
531473
HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
532474
xHTTPStreamSettings.fromJson(json.xhttpSettings),
@@ -544,7 +486,6 @@ class StreamSettings extends CommonClass {
544486
tcpSettings: network === 'tcp' ? this.tcp.toJson() : undefined,
545487
kcpSettings: network === 'kcp' ? this.kcp.toJson() : undefined,
546488
wsSettings: network === 'ws' ? this.ws.toJson() : undefined,
547-
httpSettings: network === 'http' ? this.http.toJson() : undefined,
548489
grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
549490
httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
550491
xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
@@ -585,7 +526,7 @@ class Mux extends CommonClass {
585526
class Outbound extends CommonClass {
586527
constructor(
587528
tag = '',
588-
protocol = Protocols.VMess,
529+
protocol = Protocols.VLESS,
589530
settings = null,
590531
streamSettings = new StreamSettings(),
591532
sendThrough,
@@ -723,11 +664,6 @@ class Outbound extends CommonClass {
723664
stream.seed = json.path;
724665
} else if (network === 'ws') {
725666
stream.ws = new WsStreamSettings(json.path, json.host);
726-
} else if (network === 'http' || network == 'h2') {
727-
stream.network = 'http'
728-
stream.http = new HttpStreamSettings(
729-
json.path,
730-
json.host);
731667
} else if (network === 'grpc') {
732668
stream.grpc = new GrpcStreamSettings(json.path, json.authority, json.type == 'multi');
733669
} else if (network === 'httpupgrade') {
@@ -767,8 +703,6 @@ class Outbound extends CommonClass {
767703
stream.kcp.seed = path;
768704
} else if (type === 'ws') {
769705
stream.ws = new WsStreamSettings(path, host);
770-
} else if (type === 'http' || type == 'h2') {
771-
stream.http = new HttpStreamSettings(path, host);
772706
} else if (type === 'grpc') {
773707
stream.grpc = new GrpcStreamSettings(
774708
url.searchParams.get('serviceName') ?? '',

‎web/html/xui/form/outbound.html

-11
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<a-select-option value="tcp">TCP (RAW)</a-select-option>
271271
<a-select-option value="kcp">mKCP</a-select-option>
272272
<a-select-option value="ws">WebSocket</a-select-option>
273-
<a-select-option value="http">HTTP</a-select-option>
274273
<a-select-option value="grpc">gRPC</a-select-option>
275274
<a-select-option value="httpupgrade">HTTPUpgrade</a-select-option>
276275
<a-select-option value="xhttp">XHTTP</a-select-option>
@@ -341,16 +340,6 @@
341340
<a-input-number v-model.number="outbound.stream.ws.heartbeatPeriod" :min="0"></a-input-number>
342341
</a-form-item>
343342
</template>
344-
345-
<!-- http -->
346-
<template v-if="outbound.stream.network === 'http'">
347-
<a-form-item label='{{ i18n "host" }}'>
348-
<a-input v-model.trim="outbound.stream.http.host"></a-input>
349-
</a-form-item>
350-
<a-form-item label='{{ i18n "path" }}'>
351-
<a-input v-model.trim="outbound.stream.http.path"></a-input>
352-
</a-form-item>
353-
</template>
354343

355344
<!-- grpc -->
356345
<template v-if="outbound.stream.network === 'grpc'">

‎web/html/xui/form/stream/stream_http.html

-17
This file was deleted.

‎web/html/xui/form/stream/stream_settings.html

-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<a-select-option value="tcp">TCP (RAW)</a-select-option>
88
<a-select-option value="kcp">mKCP</a-select-option>
99
<a-select-option value="ws">WebSocket</a-select-option>
10-
<a-select-option value="http">HTTP</a-select-option>
1110
<a-select-option value="grpc">gRPC</a-select-option>
1211
<a-select-option value="httpupgrade">HTTPUpgrade</a-select-option>
1312
<a-select-option value="xhttp">XHTTP</a-select-option>
@@ -30,11 +29,6 @@
3029
{{template "form/streamWS"}}
3130
</template>
3231

33-
<!-- http -->
34-
<template v-if="inbound.stream.network === 'http'">
35-
{{template "form/streamHTTP"}}
36-
</template>
37-
3832
<!-- grpc -->
3933
<template v-if="inbound.stream.network === 'grpc'">
4034
{{template "form/streamGRPC"}}

‎web/html/xui/inbound_info_modal.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<a-tag color="green">[[ inbound.network ]]</a-tag>
3535
</td>
3636
</tr>
37-
<template v-if="inbound.isTcp || inbound.isWs || inbound.isH2 || inbound.isHttpupgrade || inbound.isXHTTP">
37+
<template v-if="inbound.isTcp || inbound.isWs || inbound.isHttpupgrade || inbound.isXHTTP">
3838
<tr>
3939
<td>{{ i18n "host" }}</td>
4040
<td v-if="inbound.host">

0 commit comments

Comments
 (0)