|
@@ -421,7 +421,6 @@ class HttpStreamSettings extends XrayCommonClass {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
class QuicStreamSettings extends XrayCommonClass {
|
|
|
constructor(security=VmessMethods.NONE,
|
|
|
key=RandomUtil.randomSeq(10), type='none') {
|
|
@@ -483,7 +482,7 @@ class TlsStreamSettings extends XrayCommonClass {
|
|
|
cipherSuites = '',
|
|
|
rejectUnknownSni = false,
|
|
|
certificates=[new TlsStreamSettings.Cert()],
|
|
|
- alpn=[ALPN_OPTION.H2,ALPN_OPTION.HTTP1],
|
|
|
+ alpn=[ALPN_OPTION.HTTP1,ALPN_OPTION.H2],
|
|
|
settings=new TlsStreamSettings.Settings()) {
|
|
|
super();
|
|
|
this.server = serverName;
|
|
@@ -816,6 +815,7 @@ class SockoptStreamSettings extends XrayCommonClass {
|
|
|
this.tproxy = tproxy;
|
|
|
}
|
|
|
static fromJson(json = {}) {
|
|
|
+ if (Object.keys(json).length === 0) return undefined;
|
|
|
return new SockoptStreamSettings(
|
|
|
json.acceptProxyProtocol,
|
|
|
json.tcpFastOpen,
|
|
@@ -823,6 +823,7 @@ class SockoptStreamSettings extends XrayCommonClass {
|
|
|
json.tproxy,
|
|
|
);
|
|
|
}
|
|
|
+
|
|
|
toJson() {
|
|
|
return {
|
|
|
acceptProxyProtocol: this.acceptProxyProtocol,
|