From e5d08bb3585ebe67ca410c6ce8aad27fa06e9166 Mon Sep 17 00:00:00 2001
From: kerry <kerryji@git>
Date: Thu, 28 Apr 2022 14:27:28 +0800
Subject: [PATCH] add alpn into tlsSetting, fix fallback bug

---
 web/assets/js/model/xray.js         | 6 +++++-
 web/html/xui/form/tls_settings.html | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

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 @@
     <a-form-item label="域名">
         <a-input v-model.trim="inbound.stream.tls.server"></a-input>
     </a-form-item>
+    <a-form-item label="alpn" placeholder="http/1.1,h2">
+        <a-input v-model.trim="inbound.stream.tls.alpn"></a-input>
+    </a-form-item>
     <a-form-item label="证书">
         <a-radio-group v-model="inbound.stream.tls.certs[0].useFile"
                        button-style="solid">