diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 16dfee6..ef5c499 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -417,10 +417,11 @@ class GrpcStreamSettings extends XrayCommonClass { class TlsStreamSettings extends XrayCommonClass { constructor(serverName='', - certificates=[new TlsStreamSettings.Cert()]) { + certificates=[new TlsStreamSettings.Cert()], alpn=[]) { super(); this.server = serverName; this.certs = certificates; + this.alpn = alpn; } addCert(cert) { @@ -436,9 +437,11 @@ class TlsStreamSettings extends XrayCommonClass { if (!ObjectUtil.isEmpty(json.certificates)) { certs = json.certificates.map(cert => TlsStreamSettings.Cert.fromJson(cert)); } + return new TlsStreamSettings( json.serverName, certs, + json.alpn ); } @@ -446,6 +449,7 @@ class TlsStreamSettings extends XrayCommonClass { return { serverName: this.server, certificates: TlsStreamSettings.toJsonArray(this.certs), + alpn: this.alpn }; } } diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html index 6244ce3..f6794b6 100644 --- a/web/html/xui/form/tls_settings.html +++ b/web/html/xui/form/tls_settings.html @@ -16,6 +16,9 @@ + + +