From f4ba56b2bfdafc074e3e6b1913ab7cab580a2cf4 Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Sun, 29 Dec 2024 22:00:24 +0800
Subject: [PATCH] luci-app-passwall: sync upstream

last commit: https://github.com/xiaorouji/openwrt-passwall/commit/dadc686233d6b1b4f37cd019143d3f1056dc4d13
---
 .../model/cbi/passwall/client/type/ray.lua    |  6 +++--
 .../passwall/node_list/link_share_man.htm     | 24 ++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
index 9fb19305b..ddc998a3c 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
@@ -333,8 +333,10 @@ o:depends({ [_n("protocol")] = "shadowsocks" })
 o = s:option(Flag, _n("reality"), translate("REALITY"), translate("Only recommend to use with VLESS-TCP-XTLS-Vision."))
 o.default = 0
 o:depends({ [_n("tls")] = true, [_n("transport")] = "raw" })
-o:depends({ [_n("tls")] = true, [_n("transport")] = "h2" })
+o:depends({ [_n("tls")] = true, [_n("transport")] = "ws" })
+o:depends({ [_n("tls")] = true, [_n("transport")] = "quic" })
 o:depends({ [_n("tls")] = true, [_n("transport")] = "grpc" })
+o:depends({ [_n("tls")] = true, [_n("transport")] = "httpupgrade" })
 o:depends({ [_n("tls")] = true, [_n("transport")] = "xhttp" })
 
 o = s:option(ListValue, _n("alpn"), translate("alpn"))
@@ -346,7 +348,7 @@ o:value("h3,h2")
 o:value("http/1.1")
 o:value("h2,http/1.1")
 o:value("h3,h2,http/1.1")
-o:depends({ [_n("tls")] = true, [_n("reality")] = false })
+o:depends({ [_n("tls")] = true })
 
 -- o = s:option(Value, _n("minversion"), translate("minversion"))
 -- o.default = "1.3"
diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
index 7c454aff2..d34003a99 100644
--- a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
+++ b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
@@ -3,11 +3,11 @@
 local api = require "luci.passwall.api"
 local appname = 'passwall'
 local uci = api.libuci
-local ss_type = uci:get(appname, "@global_subscribe[0]", "ss_type") or "shadowsocks-libev"
-local trojan_type = uci:get(appname, "@global_subscribe[0]", "trojan_type") or "trojan-plus"
+local ss_type = uci:get(appname, "@global_subscribe[0]", "ss_type") or "xray"
+local trojan_type = uci:get(appname, "@global_subscribe[0]", "trojan_type") or "xray"
 local vmess_type = uci:get(appname, "@global_subscribe[0]", "vmess_type") or "xray"
 local vless_type = uci:get(appname, "@global_subscribe[0]", "vless_type") or "xray"
-local hysteria2_type = uci:get(appname, "@global_subscribe[0]", "hysteria2_type") or "hysteria2"
+local hysteria2_type = uci:get(appname, "@global_subscribe[0]", "hysteria2_type") or "sing-box"
 -%>
 <script src="<%=resource%>/qrcode.min.js"></script>
 <script type="text/javascript">//<![CDATA[
@@ -795,25 +795,28 @@ local hysteria2_type = uci:get(appname, "@global_subscribe[0]", "hysteria2_type"
 					if (queryParam.security) {
 						if (queryParam.security == "tls") {
 							opt.set(dom_prefix + 'tls', true);
-							opt.set(dom_prefix + 'reality', false)
+							opt.set(dom_prefix + 'reality', false);
 							opt.set(dom_prefix + 'flow', queryParam.flow || '');
-							opt.set(dom_prefix + 'alpn', queryParam.alpn || '');
+							opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
 							opt.set(dom_prefix + 'tls_serverName', queryParam.sni || '');
 							opt.set(dom_prefix + 'tls_allowInsecure', true);
 							if (queryParam.allowinsecure === '0') {
 								opt.set(dom_prefix + 'tls_allowInsecure', false);
 							}
 							if (queryParam.fp && queryParam.fp.trim() != "") {
+								opt.set(dom_prefix + 'utls', true);
 								opt.set(dom_prefix + 'fingerprint', queryParam.fp);
 							}
 						}
 
 						if (queryParam.security == "reality") {
 							opt.set(dom_prefix + 'tls', true);
-							opt.set(dom_prefix + 'reality', true)
+							opt.set(dom_prefix + 'reality', true);
 							opt.set(dom_prefix + 'flow', queryParam.flow || '');
+							opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
 							opt.set(dom_prefix + 'tls_serverName', queryParam.sni || '');
 							if (queryParam.fp && queryParam.fp.trim() != "") {
+								opt.set(dom_prefix + 'utls', true);
 								opt.set(dom_prefix + 'fingerprint', queryParam.fp);
 							}
 							opt.set(dom_prefix + 'reality_publicKey', queryParam.pbk || '');
@@ -1156,25 +1159,28 @@ local hysteria2_type = uci:get(appname, "@global_subscribe[0]", "hysteria2_type"
 			if (queryParam.security) {
 				if (queryParam.security == "tls") {
 					opt.set(dom_prefix + 'tls', true);
-					opt.set(dom_prefix + 'reality', false)
+					opt.set(dom_prefix + 'reality', false);
 					opt.set(dom_prefix + 'flow', queryParam.flow || '');
-					opt.set(dom_prefix + 'alpn', queryParam.alpn || '');
+					opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
 					opt.set(dom_prefix + 'tls_serverName', queryParam.sni || '');
 					opt.set(dom_prefix + 'tls_allowInsecure', true);
 					if (queryParam.allowinsecure === '0') {
 						opt.set(dom_prefix + 'tls_allowInsecure', false);
 					}
 					if (queryParam.fp && queryParam.fp.trim() != "") {
+						opt.set(dom_prefix + 'utls', true);
 						opt.set(dom_prefix + 'fingerprint', queryParam.fp);
 					}
 				}
 
 				if (queryParam.security == "reality") {
 					opt.set(dom_prefix + 'tls', true);
-					opt.set(dom_prefix + 'reality', true)
+					opt.set(dom_prefix + 'reality', true);
 					opt.set(dom_prefix + 'flow', queryParam.flow || '');
+					opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
 					opt.set(dom_prefix + 'tls_serverName', queryParam.sni || '');
 					if (queryParam.fp && queryParam.fp.trim() != "") {
+						opt.set(dom_prefix + 'utls', true);
 						opt.set(dom_prefix + 'fingerprint', queryParam.fp);
 					}
 					opt.set(dom_prefix + 'reality_publicKey', queryParam.pbk || '');