From b2d20762a815c43a7eac5caf1042cd8addb01f0f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2026 20:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=88=20Sync=202026-04-27=2020:35:30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 daed/Makefile                                 |  4 ++--
 easytier/Makefile                             |  4 ++--
 gn/Makefile                                   |  6 +++---
 gn/src/out/last_commit_position.h             |  4 ++--
 hysteria/Makefile                             |  4 ++--
 luci-app-easytier/Makefile                    |  4 ++--
 .../luasrc/controller/easytier.lua            |  4 ++--
 .../luasrc/view/easytier/easytier_status.htm  |  2 +-
 .../luasrc/view/easytier/easytier_upload.htm  | 10 ++++-----
 luci-app-easytier/po/zh_Hans/easytier.po      |  2 +-
 luci-app-easytier/root/etc/init.d/easytier    |  2 +-
 .../root/usr/share/easytier/download.sh       |  2 +-
 luci-app-passwall/Makefile                    |  2 +-
 .../cbi/passwall/client/type/hysteria2.lua    |  1 -
 .../model/cbi/passwall/client/type/ray.lua    |  2 +-
 .../luasrc/passwall/util_hysteria2.lua        |  2 +-
 .../luasrc/passwall/util_xray.lua             |  6 +++---
 .../view/passwall/node_config/header.htm      |  2 +-
 .../passwall/node_config/link_share_man.htm   | 21 ++++++++-----------
 .../view/passwall/node_list/node_list.htm     |  6 +++---
 .../root/usr/share/passwall/subscribe.lua     | 11 +++++-----
 .../resources/view/network/wireless.js        |  2 +-
 22 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/daed/Makefile b/daed/Makefile
index 32de1542..a6c1cd24 100644
--- a/daed/Makefile
+++ b/daed/Makefile
@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=daed
-PKG_VERSION:=1.24.0
-PKG_RELEASE:=5
+PKG_VERSION:=1.27.0
+PKG_RELEASE:=6
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/daeuniverse/daed.git
diff --git a/easytier/Makefile b/easytier/Makefile
index 4ad99601..1e1172da 100644
--- a/easytier/Makefile
+++ b/easytier/Makefile
@@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
 -include $(dir $(lastword $(MAKEFILE_LIST)))../version.mk
 
 PKG_NAME:=easytier
-PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.1)
-PKG_RELEASE:=3
+PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.2)
+PKG_RELEASE:=4
 
 ifeq ($(ARCH),mipsel)
 	APP_ARCH:=mipsel
diff --git a/gn/Makefile b/gn/Makefile
index d2ecf846..ee8157ae 100644
--- a/gn/Makefile
+++ b/gn/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gn
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git
-PKG_SOURCE_DATE:=2025-11-07
-PKG_SOURCE_VERSION:=e7f3202128bdb2429872fdb138626a010b2bff7f
+PKG_SOURCE_DATE:=2026-03-31
+PKG_SOURCE_VERSION:=6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=BSD 3-Clause
diff --git a/gn/src/out/last_commit_position.h b/gn/src/out/last_commit_position.h
index 92713e0f..92edaab2 100644
--- a/gn/src/out/last_commit_position.h
+++ b/gn/src/out/last_commit_position.h
@@ -3,7 +3,7 @@
 #ifndef OUT_LAST_COMMIT_POSITION_H_
 #define OUT_LAST_COMMIT_POSITION_H_
 
-#define LAST_COMMIT_POSITION_NUM 2292
-#define LAST_COMMIT_POSITION "2292 (e7f3202128bd)"
+#define LAST_COMMIT_POSITION_NUM 2355
+#define LAST_COMMIT_POSITION "2355 (6e8dcdebbadf)"
 
 #endif  // OUT_LAST_COMMIT_POSITION_H_
diff --git a/hysteria/Makefile b/hysteria/Makefile
index ac383495..0e331c39 100644
--- a/hysteria/Makefile
+++ b/hysteria/Makefile
@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hysteria
-PKG_VERSION:=2.8.1
-PKG_RELEASE:=3
+PKG_VERSION:=2.8.2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)?
diff --git a/luci-app-easytier/Makefile b/luci-app-easytier/Makefile
index 61c8eb14..d51540bb 100644
--- a/luci-app-easytier/Makefile
+++ b/luci-app-easytier/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 -include $(dir $(lastword $(MAKEFILE_LIST)))../version.mk
 
-PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.0)
-PKG_RELEASE:=7
+PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.2)
+PKG_RELEASE:=8
 
 LUCI_TITLE:=LuCI support for EasyTier
 LUCI_DEPENDS:=+kmod-tun +easytier +luci-compat
diff --git a/luci-app-easytier/luasrc/controller/easytier.lua b/luci-app-easytier/luasrc/controller/easytier.lua
index 44531cb8..96a6c164 100644
--- a/luci-app-easytier/luasrc/controller/easytier.lua
+++ b/luci-app-easytier/luasrc/controller/easytier.lua
@@ -163,7 +163,7 @@ function get_upload_config()
 		easytierbin = uci:get_first("easytier", "easytier", "easytierbin") or "/usr/bin/easytier-core",
 		webbin = uci:get_first("easytier", "easytier", "webbin") or "/usr/bin/easytier-web",
 		github_proxys = {},
-		fallback_version = uci:get_first("easytier", "easytier", "fallback_version") or "v2.6.1"
+		fallback_version = uci:get_first("easytier", "easytier", "fallback_version") or "v2.6.2"
 	}
 	
 	-- 读取代理列表（list 类型）
@@ -200,7 +200,7 @@ function save_upload_config()
 	-- 保存配置
 	uci:set("easytier", "@easytier[0]", "easytierbin", data.easytierbin or "/usr/bin/easytier-core")
 	uci:set("easytier", "@easytier[0]", "webbin", data.webbin or "/usr/bin/easytier-web")
-	uci:set("easytier", "@easytier[0]", "fallback_version", data.fallback_version or "v2.6.1")
+	uci:set("easytier", "@easytier[0]", "fallback_version", data.fallback_version or "v2.6.2")
 	
 	-- 删除旧的代理列表
 	uci:delete("easytier", "@easytier[0]", "github_proxys")
diff --git a/luci-app-easytier/luasrc/view/easytier/easytier_status.htm b/luci-app-easytier/luasrc/view/easytier/easytier_status.htm
index 50a3349c..c49c4924 100644
--- a/luci-app-easytier/luasrc/view/easytier/easytier_status.htm
+++ b/luci-app-easytier/luasrc/view/easytier/easytier_status.htm
@@ -649,7 +649,7 @@ function renderService(name, data, isRunning) {
 		var displayVersion = data.version === 'unknown' ? '<%=translate("Unknown")%>' : data.version;
 		html += '<span>' + (displayVersion || '-') + '</span>';
 		if (!versionInfo.match && versionInfo.latest && data.version !== 'unknown') {
-			html += '<span class="et-version-badge"><%=translate("New")%>: ' + versionInfo.latest + '</span>';
+			html += '<span class="et-version-badge"><%=translate("New Version")%>: ' + versionInfo.latest + '</span>';
 		}
 		html += '</div>';
 		html += '</div></div>';
diff --git a/luci-app-easytier/luasrc/view/easytier/easytier_upload.htm b/luci-app-easytier/luasrc/view/easytier/easytier_upload.htm
index 5f25fbb6..209dd5ed 100644
--- a/luci-app-easytier/luasrc/view/easytier/easytier_upload.htm
+++ b/luci-app-easytier/luasrc/view/easytier/easytier_upload.htm
@@ -383,7 +383,7 @@ local translate = i18n.translate
 					<select id="fallback_version_select" class="config-input" style="display:none;width:100%;">
 						<option value=""><%=translate("Loading versions...")%></option>
 					</select>
-					<input type="text" id="fallback_version" class="config-input" placeholder="v2.6.1" style="display:none;width:100%;">
+					<input type="text" id="fallback_version" class="config-input" placeholder="v2.6.2" style="display:none;width:100%;">
 				</div>
 				<button type="button" class="upload-btn" onclick="showDownloadModal()" style="padding:8px 16px;min-width:auto;flex-shrink:0;">
 					<%=translate("Online Download")%>
@@ -758,14 +758,14 @@ function loadConfig() {
 				proxyList = Array.isArray(proxys) ? proxys : [];
 				
 				renderProxyList();
-				versionManager.setVersion(config.fallback_version || 'v2.6.1');
+				versionManager.setVersion(config.fallback_version || 'v2.6.2');
 				
 				// 保存原始配置
 				originalConfig = {
 					easytierbin: config.easytierbin || '/usr/bin/easytier-core',
 					webbin: config.webbin || '/usr/bin/easytier-web',
 					github_proxys: JSON.stringify(proxyList),
-					fallback_version: config.fallback_version || 'v2.6.1'
+					fallback_version: config.fallback_version || 'v2.6.2'
 				};
 				
 				checkDiskSpace('easytierbin');
@@ -843,7 +843,7 @@ function getCurrentConfig() {
 		easytierbin: document.getElementById('easytierbin').value || '/usr/bin/easytier-core',
 		webbin: document.getElementById('webbin').value || '/usr/bin/easytier-web',
 		github_proxys: JSON.stringify(proxyList),
-		fallback_version: versionManager.getCurrentVersion() || 'v2.6.1'
+		fallback_version: versionManager.getCurrentVersion() || 'v2.6.2'
 	};
 }
 
@@ -868,7 +868,7 @@ function saveConfig() {
 		easytierbin: document.getElementById('easytierbin').value || '/usr/bin/easytier-core',
 		webbin: document.getElementById('webbin').value || '/usr/bin/easytier-web',
 		github_proxys: proxyList,
-		fallback_version: versionManager.getCurrentVersion() || 'v2.6.1'
+		fallback_version: versionManager.getCurrentVersion() || 'v2.6.2'
 	};
 	
 	var xhr = new XMLHttpRequest();
diff --git a/luci-app-easytier/po/zh_Hans/easytier.po b/luci-app-easytier/po/zh_Hans/easytier.po
index 2490f542..709adfbb 100644
--- a/luci-app-easytier/po/zh_Hans/easytier.po
+++ b/luci-app-easytier/po/zh_Hans/easytier.po
@@ -1072,7 +1072,7 @@ msgstr "Web 控制台主页"
 msgid "Service not running"
 msgstr "服务未运行"
 
-msgid "New"
+msgid "New Version"
 msgstr "发现新版本"
 
 msgid "Unknown"
diff --git a/luci-app-easytier/root/etc/init.d/easytier b/luci-app-easytier/root/etc/init.d/easytier
index e5f5e115..ced3cef0 100755
--- a/luci-app-easytier/root/etc/init.d/easytier
+++ b/luci-app-easytier/root/etc/init.d/easytier
@@ -103,7 +103,7 @@ check_bin() {
 	# 如果获取失败，从 UCI 配置或使用默认版本
 	if [ -z "$tag" ]; then
 		tag=$(uci -q get easytier.@easytier[0].fallback_version)
-		[ -z "$tag" ] && tag="v2.6.1"
+		[ -z "$tag" ] && tag="v2.6.2"
 	fi
 	echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 开始在线下载${tag}版本，${proxy}https://github.com/EasyTier/EasyTier/releases/download/${tag}/easytier-linux-${cpucore}-${tag}.zip下载较慢耐心等候" >>/tmp/easytier.log
 	echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 开始在线下载${tag}版本，${proxy}https://github.com/EasyTier/EasyTier/releases/download/${tag}/easytier-linux-${cpucore}-${tag}.zip下载较慢耐心等候" >>/tmp/easytierweb.log
diff --git a/luci-app-easytier/root/usr/share/easytier/download.sh b/luci-app-easytier/root/usr/share/easytier/download.sh
index 7c97e28e..0eb781be 100755
--- a/luci-app-easytier/root/usr/share/easytier/download.sh
+++ b/luci-app-easytier/root/usr/share/easytier/download.sh
@@ -42,7 +42,7 @@ get_latest_version() {
 	# 如果获取失败，从 UCI 配置或使用默认版本
 	if [ -z "$tag" ]; then
 		tag=$(uci -q get easytier.@easytier[0].fallback_version)
-		[ -z "$tag" ] && tag="v2.6.0"
+		[ -z "$tag" ] && tag="v2.6.2"
 	fi
 	
 	echo "$tag"
diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index 6f5224fc..0a30ebd1 100644
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=26.4.15
-PKG_RELEASE:=98
+PKG_RELEASE:=99
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/hysteria2.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/hysteria2.lua
index 0aa837c1..e7babfe8 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/hysteria2.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/hysteria2.lua
@@ -54,7 +54,6 @@ o = s:option(Flag, _n("tls_allowInsecure"), translate("allowInsecure"), translat
 o.default = "0"
 
 o = s:option(Value, _n("tls_pinSHA256"), translate("PinSHA256"),translate("Certificate fingerprint"))
-o.rewrite_option = o.option
 
 o = s:option(Value, _n("up_mbps"), translate("Max upload Mbps"))
 o.rewrite_option = o.option
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 44c6fa77..a160fffe 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
@@ -376,7 +376,7 @@ if api.compare_versions(os.date("%Y.%m.%d"), "<", "2026.6.1") then
 end
 
 if api.compare_versions(xray_version, ">=", "26.1.31") then
-	o = s:option(Value, _n("tls_CertSha"), translate("TLS Chain Fingerprint (SHA256)"))
+	o = s:option(Value, _n("tls_pinSHA256"), translate("TLS Chain Fingerprint (SHA256)"))
 	o:depends({ [_n("tls")] = true, [_n("reality")] = false })
 	o:depends({ [_n("protocol")] = "hysteria2" })
 	o.description = translate("Once set, connects only when the server’s chain fingerprint matches.") ..
diff --git a/luci-app-passwall/luasrc/passwall/util_hysteria2.lua b/luci-app-passwall/luasrc/passwall/util_hysteria2.lua
index 817ae978..18d80edd 100644
--- a/luci-app-passwall/luasrc/passwall/util_hysteria2.lua
+++ b/luci-app-passwall/luasrc/passwall/util_hysteria2.lua
@@ -96,7 +96,7 @@ function gen_config(var)
 		tls = {
 			sni = node.tls_serverName,
 			insecure = (node.tls_allowInsecure == "1") and true or false,
-			pinSHA256 = (node.hysteria2_tls_pinSHA256) and node.hysteria2_tls_pinSHA256 or nil,
+			pinSHA256 = (node.tls_pinSHA256) and node.tls_pinSHA256 or nil,
 		},
 		quic = {
 			initStreamReceiveWindow = (node.hysteria2_recv_window) and tonumber(node.hysteria2_recv_window) or nil,
diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua
index 8c4ae7f2..89568aa9 100644
--- a/luci-app-passwall/luasrc/passwall/util_xray.lua
+++ b/luci-app-passwall/luasrc/passwall/util_xray.lua
@@ -149,14 +149,14 @@ function gen_outbound(flag, node, tag, proxy_table)
 				tlsSettings = (node.stream_security == "tls") and {
 					serverName = node.tls_serverName,
 					allowInsecure = (function()
-								if node.tls_CertSha and node.tls_CertSha ~= "" then return nil end
+								if node.tls_pinSHA256 and node.tls_pinSHA256 ~= "" then return nil end
 								if api.compare_versions(os.date("%Y.%m.%d"), "<", "2026.6.1") and node.tls_allowInsecure == "1" then return true end
 							end)(),
 					fingerprint = (node.type == "Xray" and node.utls == "1" and node.fingerprint and node.fingerprint ~= "") and node.fingerprint or nil,
 					pinnedPeerCertSha256 = (function()
 								if api.compare_versions(xray_version, "<", "26.1.31") then return nil end
-								if not node.tls_CertSha then return "" end
-								return node.tls_CertSha
+								if not node.tls_pinSHA256 then return "" end
+								return node.tls_pinSHA256
 							end)(),
 					verifyPeerCertByName = (function()
 								if api.compare_versions(xray_version, "<", "26.1.31") then return nil end
diff --git a/luci-app-passwall/luasrc/view/passwall/node_config/header.htm b/luci-app-passwall/luasrc/view/passwall/node_config/header.htm
index 31df86a1..2af70b3c 100644
--- a/luci-app-passwall/luasrc/view/passwall/node_config/header.htm
+++ b/luci-app-passwall/luasrc/view/passwall/node_config/header.htm
@@ -70,7 +70,7 @@ local api = self.api
 				alert(res && res.msg ? res.msg : "<%:Fetch Failed%> !");
 				return;
 			}
-			const inputs = document.querySelectorAll('input[id$=".xray_tls_CertSha"]');
+			const inputs = document.querySelectorAll('input[id$=".xray_tls_pinSHA256"]');
 			inputs.forEach(function(input) {
 				input.value = res.data;
 			});
diff --git a/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm
index 4398f36e..f548f5f2 100644
--- a/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm
+++ b/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm
@@ -310,7 +310,7 @@ local current_node = map:get(section)
 					params += opt.query("alpn", dom_prefix + "alpn");
 					params += opt.query("sni", dom_prefix + "tls_serverName");
 					params += opt.query("allowinsecure", dom_prefix + "tls_allowInsecure");
-					params += opt.query("pcs", dom_prefix + "tls_CertSha");
+					params += opt.query("pcs", dom_prefix + "tls_pinSHA256");
 					params += opt.query("vcn", dom_prefix + "tls_CertByName");
 					params += opt.query("ech", dom_prefix + "ech_config");
 				}
@@ -503,7 +503,7 @@ local current_node = map:get(section)
 				params += opt.query("alpn", dom_prefix + "alpn");
 				params += opt.query("sni", dom_prefix + "tls_serverName");
 				params += opt.query("allowinsecure", dom_prefix + "tls_allowInsecure");
-				params += opt.query("pcs", dom_prefix + "tls_CertSha");
+				params += opt.query("pcs", dom_prefix + "tls_pinSHA256");
 				params += opt.query("vcn", dom_prefix + "tls_CertByName");
 				params += opt.query("ech", dom_prefix + "ech_config");
 			}
@@ -574,7 +574,7 @@ local current_node = map:get(section)
 				params += opt.query("alpn", dom_prefix + "alpn");
 				params += opt.query("sni", dom_prefix + "tls_serverName");
 				params += opt.query("allowinsecure", dom_prefix + "tls_allowInsecure");
-				params += opt.query("pcs", dom_prefix + "tls_CertSha");
+				params += opt.query("pcs", dom_prefix + "tls_pinSHA256");
 				params += opt.query("vcn", dom_prefix + "tls_CertByName");
 				params += opt.query("ech", dom_prefix + "ech_config");
 			}
@@ -595,14 +595,14 @@ local current_node = map:get(section)
 			var params = "";
 			params += opt.query("sni", dom_prefix + "tls_serverName");
 			params += opt.query("insecure", dom_prefix + "tls_allowInsecure");
-			params += opt.query("pcs", dom_prefix + "tls_CertSha");
+			params += opt.query("pinSHA256", dom_prefix + "tls_pinSHA256");
+			params += opt.query("pcs", dom_prefix + "tls_pinSHA256");
 			params += opt.query("vcn", dom_prefix + "tls_CertByName");
 			
 			var v_password = null;
 			
 			if (v_type === "Hysteria2") {
 				v_password = opt.get("hysteria2_auth_password");
-				params += opt.query("pinSHA256", "hysteria2_tls_pinSHA256");
 				var dom_obfs = opt.get("hysteria2_obfs");
 				if (dom_obfs && dom_obfs.value != "") {
 					params += "&obfs=" + "salamander";
@@ -1073,7 +1073,7 @@ local current_node = map:get(section)
 						}
 						opt.set(dom_prefix + 'ech', !!queryParam.ech);
 						opt.set(dom_prefix + 'ech_config', queryParam.ech || '');
-						opt.set(dom_prefix + 'tls_CertSha', queryParam.pcs || '');
+						opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pcs || '');
 						opt.set(dom_prefix + 'tls_CertByName', queryParam.vcn || '');
 					}
 
@@ -1314,7 +1314,7 @@ local current_node = map:get(section)
 			if (queryParam.security === "tls") {
 				opt.set(dom_prefix + 'tls_serverName', queryParam.peer || queryParam.sni || "");
 				opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
-				opt.set(dom_prefix + 'tls_CertSha', queryParam.pcs || '');
+				opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pcs || '');
 				opt.set(dom_prefix + 'tls_CertByName', queryParam.vcn || '');
 			}
 			opt.set(
@@ -1478,7 +1478,7 @@ local current_node = map:get(section)
 					}
 					opt.set(dom_prefix + 'ech', !!queryParam.ech);
 					opt.set(dom_prefix + 'ech_config', queryParam.ech || '');
-					opt.set(dom_prefix + 'tls_CertSha', queryParam.pcs || '');
+					opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pcs || '');
 					opt.set(dom_prefix + 'tls_CertByName', queryParam.vcn || '');
 				}
 
@@ -1619,9 +1619,6 @@ local current_node = map:get(section)
 				if (queryParam["obfs-password"] || queryParam["obfs_password"]) {
 					opt.set(dom_prefix + 'obfs', queryParam["obfs-password"] || queryParam["obfs_password"]);
 				}
-				if (queryParam.pinSHA256) {
-					opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pinSHA256);
-				}
 				opt.set(dom_prefix + 'hop', queryParam.mport || "");
 			}
 			
@@ -1633,7 +1630,7 @@ local current_node = map:get(section)
 				dom_prefix + 'tls_allowInsecure',
 				!((queryParam.allowinsecure ?? '0') === '0' && (queryParam.allowInsecure ?? '0') === '0' && (queryParam.insecure ?? '0') === '0')
 			);
-			opt.set(dom_prefix + 'tls_CertSha', queryParam.pcs || '');
+			opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pcs || queryParam.pinSHA256 || '');
 			opt.set(dom_prefix + 'tls_CertByName', queryParam.vcn || '');
 			if (m.hash) {
 				opt.set('remarks', decodeURIComponent(m.hash.substr(1)));
diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm b/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
index 8d849abc..d385df68 100644
--- a/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
+++ b/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
@@ -962,10 +962,10 @@ table td, .table .td {
 						} else {
 							innerHTML = innerHTML.split("{{tcping}}").join('<span class="tcping_value" cbiid="{{id}}"><a href="javascript:void(0)" style="color:inherit">---</a></span>');
 						}
-						if (o["protocol"] && o["protocol"] !== '_shunt') {
-							innerHTML = innerHTML.split("{{url_test}}").join('<span class="ping"><a href="javascript:void(0)" onclick="javascript:urltest_node(\'{{id}}\', this)" title="<%:TLS handshake test, latency for reference only%>"><%:Test%></a></span>');
-						} else {
+						if (o["protocol"] && o["protocol"] === '_shunt') {
 							innerHTML = innerHTML.split("{{url_test}}").join('<span class="ping" cbiid="{{id}}">---</span>');
+						} else {
+							innerHTML = innerHTML.split("{{url_test}}").join('<span class="ping"><a href="javascript:void(0)" onclick="javascript:urltest_node(\'{{id}}\', this)" title="<%:TLS handshake test, latency for reference only%>"><%:Test%></a></span>');
 						}
 						innerHTML = innerHTML.split("{{id}}").join(o[".name"]);
 						innerHTML = innerHTML.split("{{group}}").join(o["group"] || "");
diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
index 46a0b745..e664fd33 100755
--- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua
+++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
@@ -667,7 +667,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 		if info.tls == "tls" or info.tls == "1" then
 			result.tls = "1"
 			result.tls_serverName = (info.sni and info.sni ~= "") and info.sni or info.host
-			result.tls_CertSha = info.pcs
+			result.tls_pinSHA256 = info.pcs
 			result.tls_CertByName = info.vcn
 			local insecure = info.allowinsecure or info.allowInsecure or info.insecure
 			result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0")
@@ -938,7 +938,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 							result.ech = "1"
 							result.ech_config = params.ech
 						end
-						result.tls_CertSha = params.pcs
+						result.tls_pinSHA256 = params.pcs
 						result.tls_CertByName = params.vcn
 						if params.security == "reality" then
 							result.reality = "1"
@@ -1052,7 +1052,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 
 			result.tls = '1'
 			result.tls_serverName = params.peer or params.sni or ""
-			result.tls_CertSha = params.pcs
+			result.tls_pinSHA256 = params.pcs
 			result.tls_CertByName = params.vcn
 			local insecure = params.allowinsecure or params.allowInsecure or params.insecure
 			result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0")
@@ -1296,7 +1296,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 					result.ech = "1"
 					result.ech_config = params.ech
 				end
-				result.tls_CertSha = params.pcs
+				result.tls_pinSHA256 = params.pcs
 				result.tls_CertByName = params.vcn
 				if params.security == "reality" then
 					result.reality = "1"
@@ -1407,11 +1407,10 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 			result.address = host_port
 		end
 		result.tls_serverName = params.sni
-		result.tls_CertSha = params.pcs
+		result.tls_pinSHA256 = params.pcs or params.pinsha256
 		result.tls_CertByName = params.vcn
 		local insecure = params.allowinsecure or params.insecure
 		result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0")
-		result.hysteria2_tls_pinSHA256 = params.pinSHA256
 		result.hysteria2_hop = params.mport
 
 		if (sub_hysteria2_type == "sing-box" and has_singbox) or (sub_hysteria2_type == "xray" and has_xray) then
diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index 76ca8607..a91cbc2c 100644
--- a/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -687,7 +687,7 @@ function getConfiguredWirelessMode(hwtype, hwmode, htmode) {
 function isPpeVpTarget(boardinfo) {
 	const target = String(boardinfo?.release?.target || '');
 
-	return /(^|\/)ipq(?:53|95)xx\//.test(target);
+	return (/(^|\/)ipq(?:53|95)xx\//).test(target);
 }
 
 function getFrequencyListBand(entry, hwmode) {