From a8791f64eeef366196010fda2caf200a1d1d2891 Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Sat, 20 Sep 2025 04:22:54 +0800
Subject: [PATCH] update 2025-09-20 04:22:54

---
 luci-app-passwall2/Makefile                   |  11 +-
 .../{ => view/passwall2}/qrcode.min.js        |   0
 .../model/cbi/passwall2/client/type/ray.lua   | 158 ++++++++---------
 .../cbi/passwall2/client/type/sing-box.lua    |  22 ++-
 .../model/cbi/passwall2/server/type/ray.lua   |  30 +---
 luci-app-passwall2/luasrc/passwall2/api.lua   |   2 +-
 .../luasrc/passwall2/util_xray.lua            |  46 ++---
 .../luasrc/view/passwall2/global/backup.htm   |  84 ++++-----
 .../passwall2/node_list/link_add_node.htm     |  41 ++---
 .../passwall2/node_list/link_share_man.htm    |  40 ++---
 luci-app-passwall2/po/zh-cn/passwall2.po      |   3 -
 .../root/usr/share/passwall2/app.sh           |   5 +-
 .../root/usr/share/passwall2/subscribe.lua    |  19 +-
 .../luasrc/view/shadowsocksr/ssrurl.htm       | 166 +++++++++++++++++-
 luci-app-ssr-plus/po/templates/ssr-plus.pot   |  29 ++-
 luci-app-ssr-plus/po/zh_Hans/ssr-plus.po      |  29 ++-
 .../root/usr/share/shadowsocksr/subscribe.lua | 144 +++++++++++++++
 natflow/Makefile                              |   4 +-
 18 files changed, 556 insertions(+), 277 deletions(-)
 rename luci-app-passwall2/htdocs/luci-static/resources/{ => view/passwall2}/qrcode.min.js (100%)

diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
index bdf1f3689..ef30315bf 100644
--- a/luci-app-passwall2/Makefile
+++ b/luci-app-passwall2/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=25.9.4
+PKG_VERSION:=25.9.20
 PKG_RELEASE:=1
 
 PKG_CONFIG_DEPENDS:= \
@@ -83,7 +83,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
 	bool "Include NaiveProxy"
-	depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc)
+	depends on !(arc||armeb||loongarch64||mips||mips64||powerpc||TARGET_gemini)
 	select PACKAGE_naiveproxy
 	default n
 
@@ -100,13 +100,13 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client
 	bool "Include Shadowsocks Rust Client"
-	depends on aarch64||arm||i386||mips||mipsel||x86_64
+	depends on !i386
 	select PACKAGE_shadowsocks-rust-sslocal
-	default y if aarch64
+	default y if aarch64||x86_64
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
 	bool "Include Shadowsocks Rust Server"
-	depends on aarch64||arm||i386||mips||mipsel||x86_64
+	depends on !i386
 	select PACKAGE_shadowsocks-rust-ssserver
 	default n
 
@@ -150,7 +150,6 @@ define Package/$(PKG_NAME)/conffiles
 /etc/config/passwall2
 /etc/config/passwall2_server
 /usr/share/passwall2/domains_excluded
-/www/luci-static/resources/qrcode.min.js
 endef
 
 include $(TOPDIR)/feeds/luci/luci.mk
diff --git a/luci-app-passwall2/htdocs/luci-static/resources/qrcode.min.js b/luci-app-passwall2/htdocs/luci-static/resources/view/passwall2/qrcode.min.js
similarity index 100%
rename from luci-app-passwall2/htdocs/luci-static/resources/qrcode.min.js
rename to luci-app-passwall2/htdocs/luci-static/resources/view/passwall2/qrcode.min.js
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
index 9881ef15a..b4c811fd6 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
@@ -43,7 +43,9 @@ o:value("socks", translate("Socks"))
 o:value("shadowsocks", translate("Shadowsocks"))
 o:value("trojan", translate("Trojan"))
 o:value("wireguard", translate("WireGuard"))
-o:value("_balancing", translate("Balancing"))
+if api.compare_versions(xray_version, ">=", "1.8.12") then
+	o:value("_balancing", translate("Balancing"))
+end
 o:value("_shunt", translate("Shunt"))
 o:value("_iface", translate("Custom Interface"))
 
@@ -99,80 +101,86 @@ m.uci:foreach(appname, "socks", function(s)
 end)
 
 -- 负载均衡列表
-local o = s:option(DynamicList, _n("balancing_node"), translate("Load balancing node list"), translate("Load balancing node list, <a target='_blank' href='https://xtls.github.io/config/routing.html#balancerobject'>document</a>"))
+o = s:option(DynamicList, _n("balancing_node"), translate("Load balancing node list"), translate("Load balancing node list, <a target='_blank' href='https://xtls.github.io/config/routing.html#balancerobject'>document</a>"))
 o:depends({ [_n("protocol")] = "_balancing" })
-for k, v in pairs(nodes_table) do o:value(v.id, v.remark) end
+local valid_ids = {}
+for k, v in pairs(nodes_table) do
+	o:value(v.id, v.remark)
+	valid_ids[v.id] = true
+end
+-- 去重并禁止自定义非法输入
+function o.custom_write(self, section, value)
+	local result = {}
+	if type(value) == "table" then
+		local seen = {}
+		for _, v in ipairs(value) do
+			if v and not seen[v] and valid_ids[v] then
+				table.insert(result, v)
+				seen[v] = true
+			end
+		end
+	else
+		result = { value }
+	end
+	api.uci:set_list(appname, section, "balancing_node", result)
+end
 
-local o = s:option(ListValue, _n("balancingStrategy"), translate("Balancing Strategy"))
+o = s:option(ListValue, _n("balancingStrategy"), translate("Balancing Strategy"))
 o:depends({ [_n("protocol")] = "_balancing" })
 o:value("random")
 o:value("roundRobin")
 o:value("leastPing")
 o:value("leastLoad")
-o.default = "leastLoad"
+o.default = "random"
 
 -- Fallback Node
-if api.compare_versions(xray_version, ">=", "1.8.10") then
-	local o = s:option(ListValue, _n("fallback_node"), translate("Fallback Node"))
-	if api.compare_versions(xray_version, ">=", "1.8.12") then
-		o:depends({ [_n("protocol")] = "_balancing" })
-	else
-		o:depends({ [_n("balancingStrategy")] = "leastPing" })
-	end
-	local function check_fallback_chain(fb)
-		for k, v in pairs(fallback_table) do
-			if v.fallback == fb then
-				fallback_table[k] = nil
-				check_fallback_chain(v.id)
-			end
+o = s:option(ListValue, _n("fallback_node"), translate("Fallback Node"))
+o:value("", translate("Close(Not use)"))
+o:depends({ [_n("protocol")] = "_balancing" })
+local function check_fallback_chain(fb)
+	for k, v in pairs(fallback_table) do
+		if v.fallback == fb then
+			fallback_table[k] = nil
+			check_fallback_chain(v.id)
 		end
 	end
-	-- 检查fallback链，去掉会形成闭环的balancer节点
-	if is_balancer then
-		check_fallback_chain(arg[1])
-	end
-	for k, v in pairs(fallback_table) do o:value(v.id, v.remark) end
-	for k, v in pairs(nodes_table) do o:value(v.id, v.remark) end
 end
+-- 检查fallback链，去掉会形成闭环的balancer节点
+if is_balancer then
+	check_fallback_chain(arg[1])
+end
+for k, v in pairs(fallback_table) do o:value(v.id, v.remark) end
+for k, v in pairs(nodes_table) do o:value(v.id, v.remark) end
 
 -- 探测地址
-local ucpu = s:option(Flag, _n("useCustomProbeUrl"), translate("Use Custom Probe URL"), translate("By default the built-in probe URL will be used, enable this option to use a custom probe URL."))
-ucpu:depends({ [_n("balancingStrategy")] = "leastPing" })
-ucpu:depends({ [_n("balancingStrategy")] = "leastLoad" })
+o = s:option(Flag, _n("useCustomProbeUrl"), translate("Use Custom Probe URL"), translate("By default the built-in probe URL will be used, enable this option to use a custom probe URL."))
+o:depends({ [_n("protocol")] = "_balancing" })
 
-local pu = s:option(Value, _n("probeUrl"), translate("Probe URL"))
-pu:depends({ [_n("useCustomProbeUrl")] = true })
-pu:value("https://cp.cloudflare.com/", "Cloudflare")
-pu:value("https://www.gstatic.com/generate_204", "Gstatic")
-pu:value("https://www.google.com/generate_204", "Google")
-pu:value("https://www.youtube.com/generate_204", "YouTube")
-pu:value("https://connect.rom.miui.com/generate_204", "MIUI (CN)")
-pu:value("https://connectivitycheck.platform.hicloud.com/generate_204", "HiCloud (CN)")
-pu.default = "https://www.google.com/generate_204"
-pu.description = translate("The URL used to detect the connection status.")
+o = s:option(Value, _n("probeUrl"), translate("Probe URL"))
+o:depends({ [_n("useCustomProbeUrl")] = true })
+o:value("https://cp.cloudflare.com/", "Cloudflare")
+o:value("https://www.gstatic.com/generate_204", "Gstatic")
+o:value("https://www.google.com/generate_204", "Google")
+o:value("https://www.youtube.com/generate_204", "YouTube")
+o:value("https://connect.rom.miui.com/generate_204", "MIUI (CN)")
+o:value("https://connectivitycheck.platform.hicloud.com/generate_204", "HiCloud (CN)")
+o.default = "https://www.google.com/generate_204"
+o.description = translate("The URL used to detect the connection status.")
 
 -- 探测间隔
-local pi = s:option(Value, _n("probeInterval"), translate("Probe Interval"))
-pi:depends({ [_n("balancingStrategy")] = "leastPing" })
-pi:depends({ [_n("balancingStrategy")] = "leastLoad" })
-pi.default = "1m"
-pi.placeholder = "1m"
-pi.description = translate("The interval between initiating probes.") .. "<br>" ..
+o = s:option(Value, _n("probeInterval"), translate("Probe Interval"))
+o:depends({ [_n("protocol")] = "_balancing" })
+o.default = "1m"
+o.placeholder = "1m"
+o.description = translate("The interval between initiating probes.") .. "<br>" ..
 		translate("The time format is numbers + units, such as '10s', '2h45m', and the supported time units are <code>s</code>, <code>m</code>, <code>h</code>, which correspond to seconds, minutes, and hours, respectively.") .. "<br>" ..
 		translate("When the unit is not filled in, it defaults to seconds.")
 
-if api.compare_versions(xray_version, ">=", "1.8.12") then
-	ucpu:depends({ [_n("protocol")] = "_balancing" })
-	pi:depends({ [_n("protocol")] = "_balancing" })
-else
-	ucpu:depends({ [_n("balancingStrategy")] = "leastPing" })
-	pi:depends({ [_n("balancingStrategy")] = "leastPing" })
-end
-
 o = s:option(Value, _n("expected"), translate("Preferred Node Count"))
 o:depends({ [_n("balancingStrategy")] = "leastLoad" })
 o.datatype = "uinteger"
 o.default = "2"
+o.placeholder = "2"
 o.description = translate("The load balancer selects the optimal number of nodes, and traffic is randomly distributed among them.")
 
 
@@ -311,7 +319,7 @@ o:depends({ [_n("protocol")] = "vmess" })
 
 o = s:option(Value, _n("encryption"), translate("Encrypt Method") .. " (encryption)")
 o.default = "none"
-o:value("none")
+o.placeholder = "none"
 o:depends({ [_n("protocol")] = "vless" })
 
 o = s:option(ListValue, _n("ss_method"), translate("Encrypt Method"))
@@ -353,7 +361,6 @@ o = s:option(Flag, _n("reality"), translate("REALITY"))
 o.default = 0
 o:depends({ [_n("tls")] = true, [_n("transport")] = "raw" })
 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" })
@@ -367,7 +374,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 })
+o:depends({ [_n("tls")] = true, [_n("reality")] = false })
 
 -- o = s:option(Value, _n("minversion"), translate("minversion"))
 -- o.default = "1.3"
@@ -448,11 +455,9 @@ o = s:option(ListValue, _n("transport"), translate("Transport"))
 o:value("raw", "RAW (TCP)")
 o:value("mkcp", "mKCP")
 o:value("ws", "WebSocket")
-o:value("ds", "DomainSocket")
-o:value("quic", "QUIC")
 o:value("grpc", "gRPC")
 o:value("httpupgrade", "HttpUpgrade")
-o:value("xhttp", "XHTTP (SplitHTTP)")
+o:value("xhttp", "XHTTP")
 o:depends({ [_n("protocol")] = "vmess" })
 o:depends({ [_n("protocol")] = "vless" })
 o:depends({ [_n("protocol")] = "socks" })
@@ -552,24 +557,6 @@ o = s:option(Value, _n("ws_heartbeatPeriod"), translate("HeartbeatPeriod(second)
 o.datatype = "integer"
 o:depends({ [_n("transport")] = "ws" })
 
--- [[ DomainSocket部分 ]]--
-o = s:option(Value, _n("ds_path"), "Path", translate("A legal file path. This file must not exist before running."))
-o:depends({ [_n("transport")] = "ds" })
-
--- [[ QUIC部分 ]]--
-o = s:option(ListValue, _n("quic_security"), translate("Encrypt Method"))
-o:value("none")
-o:value("aes-128-gcm")
-o:value("chacha20-poly1305")
-o:depends({ [_n("transport")] = "quic" })
-
-o = s:option(Value, _n("quic_key"), translate("Encrypt Method") .. translate("Key"))
-o:depends({ [_n("transport")] = "quic" })
-
-o = s:option(ListValue, _n("quic_guise"), translate("Camouflage Type"))
-for a, t in ipairs(header_type_list) do o:value(t) end
-o:depends({ [_n("transport")] = "quic" })
-
 -- [[ gRPC部分 ]]--
 o = s:option(Value, _n("grpc_serviceName"), "ServiceName")
 o:depends({ [_n("transport")] = "grpc" })
@@ -637,6 +624,7 @@ o.custom_write = function(self, section, value)
 		local address = (data.extra and data.extra.downloadSettings and data.extra.downloadSettings.address)
 			or (data.downloadSettings and data.downloadSettings.address)
 		if address and address ~= "" then
+			address = address:gsub("^%[", ""):gsub("%]$", "")
 			m:set(section, "download_address", address)
 		else
 			m:del(section, "download_address")
@@ -660,34 +648,27 @@ end
 -- [[ Mux.Cool ]]--
 o = s:option(Flag, _n("mux"), "Mux", translate("Enable Mux.Cool"))
 o:depends({ [_n("protocol")] = "vmess" })
-o:depends({ [_n("protocol")] = "vless", [_n("flow")] = "" })
+o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "raw" })
+o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "ws" })
+o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "grpc" })
+o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "httpupgrade" })
 o:depends({ [_n("protocol")] = "http" })
 o:depends({ [_n("protocol")] = "socks" })
 o:depends({ [_n("protocol")] = "shadowsocks" })
 o:depends({ [_n("protocol")] = "trojan" })
 
 o = s:option(Value, _n("mux_concurrency"), translate("Mux concurrency"))
-o.default = 8
+o.default = -1
 o:depends({ [_n("mux")] = true })
 
--- [[ XUDP Mux ]]--
-o = s:option(Flag, _n("xmux"), "XUDP Mux")
-o.default = 1
-o:depends({ [_n("protocol")] = "vless", [_n("flow")] = "xtls-rprx-vision" })
-o:depends({ [_n("protocol")] = "vless", [_n("flow")] = "xtls-rprx-vision-udp443" })
-o:depends({ [_n("protocol")] = "shadowsocks" })
-
 o = s:option(Value, _n("xudp_concurrency"), translate("XUDP Mux concurrency"))
 o.default = 8
-o:depends({ [_n("xmux")] = true })
+o:depends({ [_n("mux")] = true })
 
 --[[tcpMptcp]]
 o = s:option(Flag, _n("tcpMptcp"), "tcpMptcp", translate("Enable Multipath TCP, need to be enabled in both server and client configuration."))
 o.default = 0
 
-o = s:option(Flag, _n("tcpNoDelay"), "tcpNoDelay")
-o.default = 0
-
 o = s:option(ListValue, _n("chain_proxy"), translate("Chain Proxy"))
 o:value("", translate("Close(Not use)"))
 o:value("1", translate("Preproxy Node"))
@@ -714,7 +695,6 @@ end
 for i, v in ipairs(s.fields[_n("protocol")].keylist) do
 	if not v:find("_") then
 		s.fields[_n("tcpMptcp")]:depends({ [_n("protocol")] = v })
-		s.fields[_n("tcpNoDelay")]:depends({ [_n("protocol")] = v })
 		s.fields[_n("chain_proxy")]:depends({ [_n("protocol")] = v })
 	end
 end
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua
index baa73a0ef..c8dc18c7b 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua
@@ -113,7 +113,27 @@ end)
 --[[ URLTest ]]
 o = s:option(DynamicList, _n("urltest_node"), translate("URLTest node list"), translate("List of nodes to test, <a target='_blank' href='https://sing-box.sagernet.org/configuration/outbound/urltest'>document</a>"))
 o:depends({ [_n("protocol")] = "_urltest" })
-for k, v in pairs(nodes_table) do o:value(v.id, v.remark) end
+local valid_ids = {}
+for k, v in pairs(nodes_table) do
+	o:value(v.id, v.remark)
+	valid_ids[v.id] = true
+end
+-- 去重并禁止自定义非法输入
+function o.custom_write(self, section, value)
+	local result = {}
+	if type(value) == "table" then
+		local seen = {}
+		for _, v in ipairs(value) do
+			if v and not seen[v] and valid_ids[v] then
+				table.insert(result, v)
+				seen[v] = true
+			end
+		end
+	else
+		result = { value }
+	end
+	api.uci:set_list(appname, section, "urltest_node", result)
+end
 
 o = s:option(Value, _n("urltest_url"), translate("Probe URL"))
 o:depends({ [_n("protocol")] = "_urltest" })
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
index 4c4ace565..028bf3920 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
@@ -181,13 +181,13 @@ end
 
 o = s:option(ListValue, _n("alpn"), translate("alpn"))
 o.default = "h2,http/1.1"
-o:value("h3,h2,http/1.1")
-o:value("h3,h2")
-o:value("h2,http/1.1")
 o:value("h3")
 o:value("h2")
+o:value("h3,h2")
 o:value("http/1.1")
-o:depends({ [_n("tls")] = true })
+o:value("h2,http/1.1")
+o:value("h3,h2,http/1.1")
+o:depends({ [_n("tls")] = true, [_n("reality")] = false })
 
 o = s:option(Flag, _n("use_mldsa65Seed"), translate("ML-DSA-65"))
 o.default = "0"
@@ -255,8 +255,6 @@ o = s:option(ListValue, _n("transport"), translate("Transport"))
 o:value("raw", "RAW")
 o:value("mkcp", "mKCP")
 o:value("ws", "WebSocket")
-o:value("ds", "DomainSocket")
-o:value("quic", "QUIC")
 o:value("grpc", "gRPC")
 o:value("httpupgrade", "HttpUpgrade")
 o:value("xhttp", "XHTTP")
@@ -281,7 +279,7 @@ o = s:option(Value, _n("httpupgrade_path"), translate("HttpUpgrade Path"))
 o.placeholder = "/"
 o:depends({ [_n("transport")] = "httpupgrade" })
 
--- [[ SplitHTTP部分 ]]--
+-- [[ XHTTP部分 ]]--
 o = s:option(Value, _n("xhttp_host"), translate("XHTTP Host"))
 o:depends({ [_n("transport")] = "xhttp" })
 
@@ -360,24 +358,6 @@ o:depends({ [_n("transport")] = "mkcp" })
 o = s:option(Value, _n("mkcp_seed"), translate("KCP Seed"))
 o:depends({ [_n("transport")] = "mkcp" })
 
--- [[ DomainSocket部分 ]]--
-o = s:option(Value, _n("ds_path"), "Path", translate("A legal file path. This file must not exist before running."))
-o:depends({ [_n("transport")] = "ds" })
-
--- [[ QUIC部分 ]]--
-o = s:option(ListValue, _n("quic_security"), translate("Encrypt Method"))
-o:value("none")
-o:value("aes-128-gcm")
-o:value("chacha20-poly1305")
-o:depends({ [_n("transport")] = "quic" })
-
-o = s:option(Value, _n("quic_key"), translate("Encrypt Key"))
-o:depends({ [_n("transport")] = "quic" })
-
-o = s:option(ListValue, _n("quic_guise"), translate("Camouflage Type"))
-for a, t in ipairs(header_type_list) do o:value(t) end
-o:depends({ [_n("transport")] = "quic" })
-
 -- [[ gRPC部分 ]]--
 o = s:option(Value, _n("grpc_serviceName"), "ServiceName")
 o:depends({ [_n("transport")] = "grpc" })
diff --git a/luci-app-passwall2/luasrc/passwall2/api.lua b/luci-app-passwall2/luasrc/passwall2/api.lua
index e73d030e7..033dfe92d 100644
--- a/luci-app-passwall2/luasrc/passwall2/api.lua
+++ b/luci-app-passwall2/luasrc/passwall2/api.lua
@@ -1005,7 +1005,7 @@ function to_download(app_name, url, size)
 	end
 
 	local _curl_args = clone(curl_args)
-	table.insert(_curl_args, "-m 60")
+	table.insert(_curl_args, "--speed-limit 51200 --speed-time 15 --max-time 300")
 
 	local return_code, result = curl_logic(url, tmp_file, _curl_args)
 	result = return_code == 0
diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
index 420e40d63..6bc1ae18d 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
@@ -95,14 +95,11 @@ function gen_outbound(flag, node, tag, proxy_table)
 			node.port = new_port
 			node.stream_security = "none"
 		else
-			if node.flow == "xtls-rprx-vision" then
-			else
-				if proxy_tag then
-					node.proxySettings = {
-						tag = proxy_tag,
-						transportLayer = true
-					}
-				end
+			if proxy_tag then
+				node.proxySettings = {
+					tag = proxy_tag,
+					transportLayer = true
+				}
 			end
 		end
 		
@@ -138,16 +135,15 @@ function gen_outbound(flag, node, tag, proxy_table)
 			proxySettings = node.proxySettings or nil,
 			protocol = node.protocol,
 			mux = {
-				enabled = (node.mux == "1" or node.xmux == "1") and true or false,
-				concurrency = (node.mux == "1" and ((node.mux_concurrency) and tonumber(node.mux_concurrency) or 8)) or ((node.xmux == "1") and -1) or nil,
-				xudpConcurrency = (node.xmux == "1" and ((node.xudp_concurrency) and tonumber(node.xudp_concurrency) or 8)) or nil
+				enabled = (node.mux == "1") and true or false,
+				concurrency = (node.mux == "1" and ((node.mux_concurrency) and tonumber(node.mux_concurrency) or -1)) or nil,
+				xudpConcurrency = (node.mux == "1" and ((node.xudp_concurrency) and tonumber(node.xudp_concurrency) or 8)) or nil
 			} or nil,
 			-- 底层传输配置
 			streamSettings = (node.streamSettings or node.protocol == "vmess" or node.protocol == "vless" or node.protocol == "socks" or node.protocol == "shadowsocks" or node.protocol == "trojan") and {
 				sockopt = {
 					mark = 255,
 					tcpMptcp = (node.tcpMptcp == "1") and true or nil,
-					tcpNoDelay = (node.tcpNoDelay == "1") and true or nil,
 					dialerProxy = (fragment or noise) and "dialerproxy" or nil
 				},
 				network = node.transport,
@@ -199,13 +195,6 @@ function gen_outbound(flag, node, tag, proxy_table)
 					earlyDataHeaderName = (node.ws_earlyDataHeaderName) and node.ws_earlyDataHeaderName or nil,
 					heartbeatPeriod = tonumber(node.ws_heartbeatPeriod) or nil
 				} or nil,
-				dsSettings = (node.transport == "ds") and
-					{path = node.ds_path} or nil,
-				quicSettings = (node.transport == "quic") and {
-					security = node.quic_security,
-					key = node.quic_key,
-					header = {type = node.quic_guise}
-				} or nil,
 				grpcSettings = (node.transport == "grpc") and {
 					serviceName = node.grpc_serviceName,
 					multiMode = (node.grpc_mode == "multi") and true or nil,
@@ -218,10 +207,10 @@ function gen_outbound(flag, node, tag, proxy_table)
 					path = node.httpupgrade_path or "/",
 					host = node.httpupgrade_host
 				} or nil,
-				xhttpSettings = (node.transport == "xhttp" or node.transport == "splithttp") and {
+				xhttpSettings = (node.transport == "xhttp") and {
 					mode = node.xhttp_mode or "auto",
-					path = node.xhttp_path or node.splithttp_path or "/",
-					host = node.xhttp_host or node.splithttp_host,
+					path = node.xhttp_path or "/",
+					host = node.xhttp_host,
 					-- 如果包含 "extra" 节，取 "extra" 内的内容，否则直接赋值给 extra
 					extra = node.xhttp_extra and (function()
 						local success, parsed = pcall(jsonc.parse, node.xhttp_extra)
@@ -496,14 +485,6 @@ function gen_config_server(node)
 						host = node.ws_host or nil,
 						path = node.ws_path
 					} or nil,
-					dsSettings = (node.transport == "ds") and {
-						path = node.ds_path
-					} or nil,
-					quicSettings = (node.transport == "quic") and {
-						security = node.quic_security,
-						key = node.quic_key,
-						header = {type = node.quic_guise}
-					} or nil,
 					grpcSettings = (node.transport == "grpc") and {
 						serviceName = node.grpc_serviceName
 					} or nil,
@@ -928,7 +909,7 @@ function gen_config(var)
 							table.insert(outbounds, copied_outbound)
 							return copied_outbound.tag, nil
 						else
-							if use_proxy and (_node.type ~= "Xray" or _node.flow == "xtls-rprx-vision") then
+							if use_proxy and _node.type ~= "Xray" then
 								new_port = get_new_port()
 								table.insert(inbounds, {
 									tag = "proxy_" .. rule_name,
@@ -1574,8 +1555,7 @@ function gen_config(var)
 				},
 				streamSettings = {
 					sockopt = {
-						mark = 255,
-						tcpNoDelay = true
+						mark = 255
 					}
 				}
 			})
diff --git a/luci-app-passwall2/luasrc/view/passwall2/global/backup.htm b/luci-app-passwall2/luasrc/view/passwall2/global/backup.htm
index c96acda2c..c10c6ce81 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/global/backup.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/global/backup.htm
@@ -37,55 +37,57 @@ local api = require "luci.passwall2.api"
 <div id="upload-modal" class="up-modal" style="display:none;">
 	<div class="up-modal-content">
 		<h3><%:Restore Backup File%></h3>
-		<div class="cbi-value" id="_upload_div">
-			<div class="up-cbi-value-field">
-				<input class="cbi-input-file" type="file" id="ulfile" accept=".tar.gz" />
-				<br />
-				<div class="up-button-container">
-					<input class="btn cbi-button cbi-button-apply" type="button" id="upload-btn" onclick="do_upload()" value="<%:UL Restore%>" />
-					<input class="btn cbi-button cbi-button-remove" type="button" onclick="close_upload_win()" value="<%:CLOSE WIN%>" />
-				</div>
-			</div>
+		<div class="up-cbi-value-field">
+			<input class="cbi-input-file" type="file" id="ulfile" accept=".tar.gz" />
+		</div>
+		<div class="up-button-container">
+			<input class="btn cbi-button cbi-button-apply" type="button" id="upload-btn" onclick="do_upload()" value="<%:UL Restore%>" />
+			<input class="btn cbi-button cbi-button-remove" type="button" onclick="close_upload_win()" value="<%:CLOSE WIN%>" />
 		</div>
 	</div>
 </div>
 
 <style>
-.up-modal {
-	position: fixed;
-	left: 50%;
-	top: 50%;
-	transform: translate(-50%, -50%);
-	background: white;
-	padding: 20px;
-	border: 2px solid #ccc;
-	box-shadow: 0 0 10px rgba(0,0,0,0.5);
-	z-index: 1000;
-}
+	.up-modal {
+		position: fixed;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		background: white;
+		padding: 20px;
+		border: 2px solid #ccc;
+		border-radius: 5px;
+		box-shadow: 0 0 10px rgba(0,0,0,0.5);
+		z-index: 1000;
+		width: 90%;
+		max-width: 400px;
+	}
 
-.up-modal-content {
-	width: 100%;
-	max-width: 400px;
-	text-align: center;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
+	.up-modal-content {
+		width: 100%;
+		max-width: 400px;
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
 
-.up-button-container {
-	display: flex;
-	justify-content: space-between;
-	width: 100%;
-	max-width: 250px;
-}
+	.up-button-container {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		max-width: 250px;
+	}
 
-.up-cbi-value-field {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	width: 100%;
-}
+	.up-cbi-value-field {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 100%;
+		margin-top: 15px;
+		margin-bottom: 30px;
+	}
 </style>
 
 <script>
diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
index 3cb824fc7..5eb5a2e04 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
@@ -4,37 +4,34 @@ local api = require "luci.passwall2.api"
 
 <script type="text/javascript">
 	//<![CDATA[
-	function getXHR() {
-		if (typeof XHR === 'object' && typeof XHR.create === 'function') {
-			return XHR.create();
-		} else if (typeof XHR === 'function') {
-			return new XHR();
-		} else {
-			throw new Error("XHR is not supported in this environment.");
-		}
-	}
-
 	function ajax_add_node(link) {
-		var chunkSize = 1000;  // 分片发送以突破uhttpd的限制，每块1000字符
-		var totalChunks = Math.ceil(link.length / chunkSize);
-		var currentChunk = 0;
+		const chunkSize = 1000;  // 分片发送以突破uhttpd的限制，每块1000字符
+		const totalChunks = Math.ceil(link.length / chunkSize);
+		let currentChunk = 0;
 
 		function sendNextChunk() {
 			if (currentChunk < totalChunks) {
-				var chunk = link.substring(currentChunk * chunkSize, (currentChunk + 1) * chunkSize);
-				var xhr = getXHR();
-				xhr.post('<%=api.url("link_add_node")%>', {
-					'chunk': chunk,
-					'chunk_index': currentChunk,
-					'total_chunks': totalChunks
-				}, function(x, data) {
-					if (x && x.status === 200) {
+				const chunk = link.substring(currentChunk * chunkSize, (currentChunk + 1) * chunkSize);
+				const xhr = new XMLHttpRequest();
+				xhr.open('POST', '<%=api.url("link_add_node")%>', true);
+				xhr.onload = function () {
+					if (xhr.status === 200) {
 						currentChunk++;
 						sendNextChunk();
 					} else {
 						alert("<%:Error%>");
+						return;
 					}
-				});
+				};
+				xhr.onerror = function () {
+					alert("<%:Network Error%>");
+					return;
+				};
+				const formData = new FormData();
+				formData.append("chunk", chunk);
+				formData.append("chunk_index", currentChunk);
+				formData.append("total_chunks", totalChunks);
+				xhr.send(formData);
 			} else {
 				window.location.href = '<%=api.url("node_list")%>';
 			}
diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
index b126f387c..db2dde9e7 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
@@ -1,6 +1,7 @@
 <%+cbi/valueheader%>
 <%
 local api = require "luci.passwall2.api"
+local appname = api.appname
 local map = self.map
 
 local has_ss = api.is_finded("ss-redir")
@@ -25,7 +26,7 @@ local vmess_type = get_core("vmess_type", {{has_xray,"xray"},{has_singbox,"sing-
 local vless_type = get_core("vless_type", {{has_xray,"xray"},{has_singbox,"sing-box"}})
 local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{has_singbox,"sing-box"}})
 -%>
-<script src="<%=resource%>/qrcode.min.js"></script>
+<script src="<%=resource%>/view/<%=appname%>/qrcode.min.js"></script>
 <script type="text/javascript">//<![CDATA[
 	let has_singbox = "<%=has_singbox%>"
 	let has_xray = "<%=has_xray%>"
@@ -286,8 +287,6 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				}
 				params += "&type=" + v_transport;
 
-				params += opt.query("encryption", dom_prefix + "encryption");
-
 				if (opt.get(dom_prefix + "tls").checked) {
 					var v_security = "tls";
 					if (opt.get(dom_prefix + "fingerprint") && opt.get(dom_prefix + "fingerprint").value != "") {
@@ -530,8 +529,6 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 			}
 			params += "&type=" + v_transport;
 
-			params += opt.query("encryption", dom_prefix + "encryption");
-
 			if (opt.get(dom_prefix + "tls").checked) {
 				var v_security = "tls";
 				if (opt.get(dom_prefix + "fingerprint") && opt.get(dom_prefix + "fingerprint").value != "") {
@@ -545,10 +542,6 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 					params += opt.query("spx", dom_prefix + "reality_spiderX");
 					params += opt.query("pqv", dom_prefix + "reality_mldsa65Verify");
 				}
-				if (opt.get(dom_prefix + "flow") && opt.get(dom_prefix + "flow").value) {
-					let v_flow = opt.get(dom_prefix + "flow").value;
-					params += "&flow=" + v_flow;
-				}
 				params += "&security=" + v_security;
 				params += opt.query("alpn", dom_prefix + "alpn");
 				params += opt.query("sni", dom_prefix + "tls_serverName");
@@ -658,7 +651,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 		}
 		return false;
 	}
-	
+
 	function exportUrl(btn, urlname, sid) {
 		var url = buildUrl(btn, urlname, sid);
 		if (url) {
@@ -683,6 +676,11 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 		}
 	}
 
+	function unbracketIP(server) {
+		if (!server) return '';
+		return server.replace(/^\[/, '').replace(/\]$/, '');
+	}
+
 	function fromUrl(btn, urlname, sid) {
 		var opt = {
 			base: 'cbid.passwall2',
@@ -805,7 +803,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 		if (ssu[0] === "ssr") {
 			dom_prefix = "ssr_"
 			//var b64c = ssu[1].match(/([A-Za-z0-9_-]+)/);
-			var sstr = b64decsafe(ssu[1]);
+			var sstr = b64decsafe((ssu[1] || "").replace(/#.*/, "").trim());
 			var ploc = sstr.indexOf("/?");
 			var url0 = "", param = "";
 			if (ploc > 0) {
@@ -828,7 +826,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				}
 			}
 			opt.set('type', "SSR");
-			opt.set(dom_prefix + 'address', ssm[1]);
+			opt.set(dom_prefix + 'address', unbracketIP(ssm[1]));
 			opt.set(dom_prefix + 'port', ssm[2]);
 			opt.set(dom_prefix + 'protocol', ssm[3]);
 			opt.set(dom_prefix + 'method', ssm[4]);
@@ -934,7 +932,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				method = method.toLowerCase() === "chacha20-poly1305" ? "chacha20-ietf-poly1305" : method;
 				method = method.toLowerCase() === "xchacha20-poly1305" ? "xchacha20-ietf-poly1305" : method;
 			}
-			opt.set(dom_prefix + 'address', server);
+			opt.set(dom_prefix + 'address', unbracketIP(server));
 			opt.set(dom_prefix + 'port', port);
 			opt.set(dom_prefix + 'password', password || "");
 			opt.set(dom_prefix + 'method', method || "");
@@ -968,7 +966,6 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 			}
 
 			if (Object.keys(queryParam).length > 0 && !queryParam.plugin) {
-				opt.set(dom_prefix + 'encryption', queryParam.encryption);
 				if (queryParam.security) {
 					if (queryParam.security == "tls") {
 						opt.set(dom_prefix + 'tls', true);
@@ -1138,7 +1135,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				}
 			}
 			opt.set(dom_prefix + 'mux', queryParam.mux === '1');
-			opt.set(dom_prefix + 'address', m.hostname);
+			opt.set(dom_prefix + 'address', unbracketIP(m.hostname));
 			opt.set(dom_prefix + 'port', m.port || "443");
 			opt.set(dom_prefix + 'password', decodeURIComponent(password));
 
@@ -1216,7 +1213,6 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				}
 				tls_serverName = tls_serverName || "";
 				opt.set(dom_prefix + 'tls_serverName', tls_serverName);
-				opt.set(dom_prefix + 'flow', (queryParam.flow || '').replace('-udp443', ''));
 				opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
 			}
 			opt.set(dom_prefix + 'tls_allowInsecure', true);
@@ -1238,7 +1234,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				opt.set('type', "Xray");
 			}
 			opt.set(dom_prefix + 'protocol', "vmess");
-			var sstr = b64DecodeUnicode(ssu[1]);
+			var sstr = b64DecodeUnicode((ssu[1] || "").replace(/#.*/, "").trim());
 			var ploc = sstr.indexOf("/?");
 			var url0, param = "";
 			if (ploc > 0) {
@@ -1247,7 +1243,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 			}
 			var ssm = JSON.parse(sstr);
 			opt.set('remarks', ssm.ps);
-			opt.set(dom_prefix + 'address', ssm.add);
+			opt.set(dom_prefix + 'address', unbracketIP(ssm.add));
 			opt.set(dom_prefix + 'port', ssm.port);
 			opt.set(dom_prefix + 'uuid', ssm.id);
 			opt.set(dom_prefix + 'tls', ssm.tls === "tls");
@@ -1336,7 +1332,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				return false;
 			}
 			opt.set(dom_prefix + 'uuid', password);
-			opt.set(dom_prefix + 'address', m.hostname);
+			opt.set(dom_prefix + 'address', unbracketIP(m.hostname));
 			opt.set(dom_prefix + 'port', m.port || "443");
 			var queryParam = {};
 			if (m.search.length > 1) {
@@ -1508,7 +1504,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				opt.set(dom_prefix + 'hop', queryParam.mport || "");
 			}
 			
-			opt.set(dom_prefix + 'address', m.hostname);
+			opt.set(dom_prefix + 'address', unbracketIP(m.hostname));
 			opt.set(dom_prefix + 'port', m.port || "443");
 			
 			opt.set(dom_prefix + 'tls_serverName', queryParam.sni || "");
@@ -1534,7 +1530,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 			var hash = _parsedUrl.hash;
 			opt.set(dom_prefix + 'uuid', decodeURIComponent(username));
 			opt.set(dom_prefix + 'password', decodeURIComponent(password));
-			opt.set(dom_prefix + 'address', hostname);
+			opt.set(dom_prefix + 'address', unbracketIP(hostname));
 			opt.set(dom_prefix + 'port', port || "443");
 			var queryParam = {};
 			if (search.length > 1) {
@@ -1572,7 +1568,7 @@ local hysteria2_type = get_core("hysteria2_type", {{has_hysteria2,"hysteria2"},{
 				return false;
 			}
 			opt.set(dom_prefix + 'password', password);
-			opt.set(dom_prefix + 'address', m.hostname);
+			opt.set(dom_prefix + 'address', unbracketIP(m.hostname));
 			opt.set(dom_prefix + 'port', m.port || "443");
 			var queryParam = {};
 			if (m.search.length > 1) {
diff --git a/luci-app-passwall2/po/zh-cn/passwall2.po b/luci-app-passwall2/po/zh-cn/passwall2.po
index 3e40e5b38..13d4d3613 100644
--- a/luci-app-passwall2/po/zh-cn/passwall2.po
+++ b/luci-app-passwall2/po/zh-cn/passwall2.po
@@ -1285,9 +1285,6 @@ msgstr "<br />none：默认值，不进行伪装，发送的数据是没有特
 msgid "Use it together with the DNS disguised type. You can fill in any domain."
 msgstr "配合伪装类型 DNS 使用，可随便填一个域名。"
 
-msgid "A legal file path. This file must not exist before running."
-msgstr "一个合法的文件路径。在运行之前，这个文件必须不存在。"
-
 msgid "Auth"
 msgstr "身份认证"
 
diff --git a/luci-app-passwall2/root/usr/share/passwall2/app.sh b/luci-app-passwall2/root/usr/share/passwall2/app.sh
index 814fa0800..474560f7f 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/app.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/app.sh
@@ -1126,6 +1126,7 @@ run_ipset_dnsmasq() {
 		port=${listen_port}
 		no-poll
 		no-resolv
+		strict-order
 		cache-size=${cache_size:-0}
 		dns-forward-max=${dns_forward_max:-1000}
 	EOF
@@ -1415,8 +1416,8 @@ get_config() {
 	RESOLVFILE=/tmp/resolv.conf.d/resolv.conf.auto
 	[ -f "${RESOLVFILE}" ] && [ -s "${RESOLVFILE}" ] || RESOLVFILE=/tmp/resolv.conf.auto
 
-	ISP_DNS=$(cat $RESOLVFILE 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1)
-	ISP_DNS6=$(cat $RESOLVFILE 2>/dev/null | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | awk -F % '{print $1}' | awk -F " " '{print $2}'| sort -u | grep -v -Fx ::1 | grep -v -Fx ::)
+	ISP_DNS=$(cat $RESOLVFILE 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v -E '^(0\.0\.0\.0|127\.0\.0\.1)$' | awk '!seen[$0]++')
+	ISP_DNS6=$(cat $RESOLVFILE 2>/dev/null | grep -E "([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}" | awk -F % '{print $1}' | awk -F " " '{print $2}' | grep -v -Fx ::1 | grep -v -Fx :: | awk '!seen[$0]++')
 
 	DEFAULT_DNSMASQ_CFGID=$(uci show dhcp.@dnsmasq[0] |  awk -F '.' '{print $2}' | awk -F '=' '{print $1}'| head -1)
 	DEFAULT_DNS=$(uci show dhcp.@dnsmasq[0] | grep "\.server=" | awk -F '=' '{print $2}' | sed "s/'//g" | tr ' ' '\n' | grep -v "\/" | head -2 | sed ':label;N;s/\n/,/;b label')
diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
index 38e6c3c49..af71e71cf 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
@@ -601,7 +601,7 @@ local function processData(szType, content, add_mode, add_from)
 			result.tls = "0"
 		end
 
-		if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp" or result.transport == "splithttp") then
+		if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp") then
 			log("跳过节点:" .. result.remarks .."，因Sing-Box不支持" .. szType .. "协议的" .. result.transport .. "传输方式，需更换Xray。")
 			return nil
 		end
@@ -1044,7 +1044,7 @@ local function processData(szType, content, add_mode, add_from)
 				if params.serviceName then result.grpc_serviceName = params.serviceName end
 				result.grpc_mode = params.mode or "gun"
 			end
-			if params.type == 'xhttp' or params.type == 'splithttp' then
+			if params.type == 'xhttp' then
 				result.xhttp_host = params.host
 				result.xhttp_path = params.path
 			end
@@ -1053,11 +1053,9 @@ local function processData(szType, content, add_mode, add_from)
 				result.httpupgrade_path = params.path
 			end
 
-			result.encryption = params.encryption or "none"
-			result.flow = params.flow and params.flow:gsub("-udp443", "") or nil
 			result.alpn = params.alpn
 
-			if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp" or result.transport == "splithttp") then
+			if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp") then
 				log("跳过节点:" .. result.remarks .."，因Sing-Box不支持" .. szType .. "协议的" .. result.transport .. "传输方式，需更换Xray。")
 				return nil
 			end
@@ -1194,7 +1192,7 @@ local function processData(szType, content, add_mode, add_from)
 				if success and Data then
 					local address = (Data.extra and Data.extra.downloadSettings and Data.extra.downloadSettings.address)
 							or (Data.downloadSettings and Data.downloadSettings.address)
-					result.download_address = address and address ~= "" and address or nil
+					result.download_address = (address and address ~= "") and address:gsub("^%[", ""):gsub("%]$", "") or nil
 				else
 					result.download_address = nil
 				end
@@ -1240,7 +1238,7 @@ local function processData(szType, content, add_mode, add_from)
 				result.tls_allowInsecure = allowInsecure_default and "1" or "0"
 			end
 
-			if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp" or result.transport == "splithttp") then
+			if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp") then
 				log("跳过节点:" .. result.remarks .."，因Sing-Box不支持" .. szType .. "协议的" .. result.transport .. "传输方式，需更换Xray。")
 				return nil
 			end
@@ -1828,10 +1826,11 @@ local function parse_link(raw, add_mode, add_from, cfgid)
 						local node = api.trim(v)
 						local dat = split(node, "://")
 						if dat and dat[1] and dat[2] then
-							if dat[1] == 'ss' or dat[1] == 'trojan' then
-								result = processData(dat[1], dat[2], add_mode, add_from)
+							if dat[1] == 'vmess' or dat[1] == 'ssr' then
+								local link = api.trim(dat[2]:gsub("#.*$", ""))
+								result = processData(dat[1], base64Decode(link), add_mode, add_from)
 							else
-								result = processData(dat[1], base64Decode(dat[2]), add_mode, add_from)
+								result = processData(dat[1], dat[2], add_mode, add_from)
 							end
 						end
 					else
diff --git a/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
index 53f6428d8..805d1acec 100644
--- a/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
+++ b/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
@@ -96,6 +96,19 @@ function import_ssr_url(btn, urlname, sid) {
 		//var ssu = ssrurl.match(/ssr:\/\/([A-Za-z0-9_-]+)/i);
 		var ssu = ssrurl.split('://');
 		//console.log(ssu.length);
+		if (ssu[0] === "ss") {
+		    var queryStr = "";
+			if (ssu[1].indexOf("?") > -1) {
+			    queryStr = ssu[1].split("?")[1]; // 提取 ? 后面的参数
+				queryStr = queryStr.replace(/&([a-zA-Z]+);/g, '&'); // 转义 &amp; 为 &
+			}
+			var params = new URLSearchParams(queryStr);
+			if (params.get("type")) {
+			    // 替换协议头
+				ssrurl = ssrurl.replace(/^ss:\/\//i, "shadowsocks://");
+				var ssu = ssrurl.split('://');
+			}
+		}
 		var event = document.createEvent("HTMLEvents");
 		event.initEvent("change", true, true);
 		switch (ssu[0]) {
@@ -164,7 +177,7 @@ function import_ssr_url(btn, urlname, sid) {
 			s.innerHTML = "<font style=\'color:green\'><%:Import configuration information successfully.%></font>";
 			return false;
 		case "ss":
-			var url0 = ssu[1] || "";
+			var url0 = ((ssu[1] || "").replace(/&([a-zA-Z]+);/g, '&').replace(/\s*#\s*/, '#').trim());
 			var param = "";
 
 			// 先分离 #（alias）
@@ -194,7 +207,7 @@ function import_ssr_url(btn, urlname, sid) {
 				var userInfoSplitIndex = userInfo.indexOf(":");
 				if(userInfoSplitIndex < 0) {
 					// 格式错误
-					s.innerHTML = "<font style='color:red'>Userinfo format error</font>";
+					s.innerHTML = "<font style='color:red'><%:Userinfo format error.%></font>";
 					break;
 				}
 				var method = userInfo.substring(0, userInfoSplitIndex);
@@ -217,7 +230,7 @@ function import_ssr_url(btn, urlname, sid) {
 				var decodedUrl0 = decodeURIComponent(url0);
 				var sstr = b64decsafe(decodedUrl0);
 				if (!sstr) {
-					s.innerHTML = "<font style='color:red'>Base64 sstr failed</font>";
+					s.innerHTML = "<font style='color:red'><%:Base64 sstr failed.%></font>";
 					break;
 				}
 
@@ -239,7 +252,7 @@ function import_ssr_url(btn, urlname, sid) {
 					var server = mNormal[3];
 					var port = mNormal[4];
 				} else {
-					s.innerHTML = "<font style='color:red'>SS URL base64 sstr format not recognized</font>";
+					s.innerHTML = "<font style='color:red'><%:SS URL base64 sstr format not recognized.%></font>";
 					break;
 				}
 
@@ -651,6 +664,151 @@ function import_ssr_url(btn, urlname, sid) {
 			}
 			s.innerHTML = "<font style=\'color:green\'><%:Import configuration information successfully.%></font>";
 			return false;
+		case "shadowsocks":
+			try {
+				// 处理完整 ss:// 链接
+				var urlinfo = ssu[1].replace(/&([a-zA-Z]+);/g, '&').replace(/\s*#\s*/, '#').trim();
+				// 拆分 @，判断是否是 base64 userinfo 的格式
+				var parts = urlinfo.split("@");
+				if (parts.length > 1) {
+					// @ 前是 base64(method:password)，后面是 server:port?params
+					var userinfo = b64decsafe(parts[0]);
+					var sepIndex = userinfo.indexOf(":");
+					if (sepIndex > -1) {
+						method = userinfo.slice(0, sepIndex);
+						password = userinfo.slice(sepIndex + 1); 
+					}
+				}
+				var url = new URL("http://" + urlinfo);
+
+				var params = url.searchParams;
+
+			} catch(e) {
+				alert(e);
+				return false;
+			}
+			// Check if the elements exist before trying to modify them
+			function setElementValue(name, value) {
+				const element = document.getElementsByName(name)[0];
+				if (element) {
+					if (typeof value === 'boolean') {
+						element.checked = value;
+					} else {
+						element.value = value;
+					}
+				}
+			}
+			function dispatchEventIfExists(name, event) {
+				const element = document.getElementsByName(name)[0];
+				if (element) {
+					element.dispatchEvent(event);
+				}
+			}
+			setElementValue('cbid.shadowsocksr.' + sid + '.alias', url.hash ? decodeURIComponent(url.hash.slice(1)) : "");
+			setElementValue('cbid.shadowsocksr.' + sid + '.type', "v2ray");
+			dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.type', event);
+			setElementValue('cbid.shadowsocksr.' + sid + '.v2ray_protocol', "shadowsocks");
+			dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.v2ray_protocol', event);
+			setElementValue('cbid.shadowsocksr.' + sid + '.server', url.hostname);
+			setElementValue('cbid.shadowsocksr.' + sid + '.server_port', url.port || "80");
+			setElementValue('cbid.shadowsocksr.' + sid + '.password', password || url.username);
+			setElementValue('cbid.shadowsocksr.' + sid + '.transport', 
+				params.get("type") === "http" ? "h2" : 
+				(["xhttp", "splithttp"].includes(params.get("type")) ? "xhttp" :
+				(["tcp", "raw"].includes(params.get("type")) ? "raw" : 
+				(params.get("type") || "raw")))
+			);
+			dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.transport', event);
+			setElementValue('cbid.shadowsocksr.' + sid + '.encrypt_method_ss', method || params.get("encryption") || "none");
+			if ([ "tls", "xtls", "reality" ].includes(params.get("security"))) {
+				setElementValue('cbid.shadowsocksr.' + sid + '.' + params.get("security"), true);
+				dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.' + params.get("security"), event);
+
+				if (params.get("security") === "tls") {
+					if (params.get("ech") && params.get("ech").trim() !== "") {
+						setElementValue('cbid.shadowsocksr.' + sid + '.enable_ech', true); // 设置 enable_ech 为 true
+						dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.enable_ech', event); // 触发事件
+						setElementValue('cbid.shadowsocksr.' + sid + '.ech_config', params.get("ech") || "");
+					}
+					if (params.get("allowInsecure") === "1") {
+						setElementValue('cbid.shadowsocksr.' + sid + '.insecure', true); // 设置 insecure 为 true
+						dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.insecure', event); // 触发事件
+					}
+				}
+				if (params.get("security") === "reality") {
+					setElementValue('cbid.shadowsocksr.' + sid + '.reality_publickey', params.get("pbk") ? decodeURIComponent(params.get("pbk")) : "");
+					setElementValue('cbid.shadowsocksr.' + sid + '.reality_shortid', params.get("sid") || "");
+					setElementValue('cbid.shadowsocksr.' + sid + '.reality_spiderx', params.get("spx") ? decodeURIComponent(params.get("spx")) : "");
+					if (params.get("pqv") && params.get("pqv").trim() !== "") {
+						setElementValue('cbid.shadowsocksr.' + sid + '.enable_mldsa65verify', true); // 设置 enable_mldsa65verify 为 true
+						dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.enable_mldsa65verify', event); // 触发事件
+						setElementValue('cbid.shadowsocksr.' + sid + '.reality_mldsa65verify', params.get("pqv") || "");
+					}
+				}
+				setElementValue('cbid.shadowsocksr.' + sid + '.tls_flow', params.get("flow") || "none");
+				dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.tls_flow', event);
+
+				setElementValue('cbid.shadowsocksr.' + sid + '.tls_alpn', params.get("alpn") || "");
+				setElementValue('cbid.shadowsocksr.' + sid + '.fingerprint', params.get("fp") || "");
+				setElementValue('cbid.shadowsocksr.' + sid + '.tls_host', params.get("sni") || "");
+			}
+			switch (params.get("type")) {
+			case "ws":
+				if (params.get("security") !== "tls") {
+					setElementValue('cbid.shadowsocksr.' + sid + '.ws_host', params.get("host") ? decodeURIComponent(params.get("host")) : "");
+				}
+				setElementValue('cbid.shadowsocksr.' + sid + '.ws_path', params.get("path") ? decodeURIComponent(params.get("path")) : "/");
+				break;
+			case "httpupgrade":
+				if (params.get("security") !== "tls") {
+					setElementValue('cbid.shadowsocksr.' + sid + '.httpupgrade_host', params.get("host") ? decodeURIComponent(params.get("host")) : "");
+				}
+				setElementValue('cbid.shadowsocksr.' + sid + '.httpupgrade_path', params.get("path") ? decodeURIComponent(params.get("path")) : "/");
+				break;
+			case "xhttp":
+			case "splithttp":
+				if (params.get("security") !== "tls") {
+					setElementValue('cbid.shadowsocksr.' + sid + '.xhttp_host', params.get("host") ? decodeURIComponent(params.get("host")) : "");
+				}
+				setElementValue('cbid.shadowsocksr.' + sid + '.xhttp_mode', params.get("mode") || "auto");
+				setElementValue('cbid.shadowsocksr.' + sid + '.xhttp_path', params.get("path") ? decodeURIComponent(params.get("path")) : "/");
+				if (params.get("extra") && params.get("extra").trim() !== "") {
+					setElementValue('cbid.shadowsocksr.' + sid + '.enable_xhttp_extra', true); // 设置 enable_xhttp_extra 为 true
+					dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.enable_xhttp_extra', event); // 触发事件
+					setElementValue('cbid.shadowsocksr.' + sid + '.xhttp_extra', params.get("extra") || "");
+				}
+				break;
+			case "kcp":
+				setElementValue('cbid.shadowsocksr.' + sid + '.kcp_guise', params.get("headerType") || "none");
+				setElementValue('cbid.shadowsocksr.' + sid + '.seed', params.get("seed") || "");
+				break;
+			case "http":
+			/* this is non-standard, bullshit */
+			case "h2":
+				setElementValue('cbid.shadowsocksr.' + sid + '.h2_host', params.get("host") ? decodeURIComponent(params.get("host")) : "");
+				setElementValue('cbid.shadowsocksr.' + sid + '.h2_path', params.get("path") ? decodeURIComponent(params.get("path")) : "");
+				break;
+			case "quic":
+				setElementValue('cbid.shadowsocksr.' + sid + '.quic_guise', params.get("headerType") || "none");
+				setElementValue('cbid.shadowsocksr.' + sid + '.quic_security', params.get("quicSecurity") || "none");
+				setElementValue('cbid.shadowsocksr.' + sid + '.quic_key', params.get("key") || "");
+				break;
+			case "grpc":
+				setElementValue('cbid.shadowsocksr.' + sid + '.serviceName', params.get("serviceName") || "");
+				setElementValue('cbid.shadowsocksr.' + sid + '.grpc_mode', params.get("mode") || "gun");
+				break;
+			case "tcp":
+			case "raw":
+				setElementValue('cbid.shadowsocksr.' + sid + '.tcp_guise', params.get("headerType") || "none");
+				dispatchEventIfExists('cbid.shadowsocksr.' + sid + '.tcp_guise', event);
+				if (params.get("headerType") === "http") {
+					setElementValue('cbid.shadowsocksr.' + sid + '.http_host', params.get("host") ? decodeURIComponent(params.get("host")) : "");
+					setElementValue('cbid.shadowsocksr.' + sid + '.http_path', params.get("path") ? decodeURIComponent(params.get("path")) : "");
+				}
+				break;
+			}
+			s.innerHTML = "<font style=\'color:green\'><%:Import configuration information successfully.%></font>";
+			return false;
 		default:
 			s.innerHTML = "<font style=\'color:red\'><%:Invalid format.%></font>";
 			return false;
diff --git a/luci-app-ssr-plus/po/templates/ssr-plus.pot b/luci-app-ssr-plus/po/templates/ssr-plus.pot
index 717a9be1b..cfdd5c9e6 100644
--- a/luci-app-ssr-plus/po/templates/ssr-plus.pot
+++ b/luci-app-ssr-plus/po/templates/ssr-plus.pot
@@ -219,6 +219,10 @@ msgstr ""
 msgid "Baidu Public DNS (180.76.76.76)"
 msgstr ""
 
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:233
+msgid "Base64 sstr failed."
+msgstr ""
+
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1034
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1044
 msgid "BitTorrent (uTP)"
@@ -969,16 +973,17 @@ msgstr ""
 msgid "If you have a self-signed certificate,please check the box"
 msgstr ""
 
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:661
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:819
 msgid "Import"
 msgstr ""
 
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:164
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:307
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:339
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:435
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:522
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:652
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:177
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:320
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:352
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:448
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:535
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:665
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:810
 msgid "Import configuration information successfully."
 msgstr ""
 
@@ -998,7 +1003,7 @@ msgstr ""
 msgid "Invalid JSON format"
 msgstr ""
 
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:655
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:813
 msgid "Invalid format."
 msgstr ""
 
@@ -1585,6 +1590,10 @@ msgstr ""
 msgid "Running Mode"
 msgstr ""
 
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:255
+msgid "SS URL base64 sstr format not recognized."
+msgstr ""
+
 #: applications/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua:13
 msgid "SSR Client"
 msgstr ""
@@ -2054,6 +2063,10 @@ msgstr ""
 msgid "User-Agent"
 msgstr ""
 
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:210
+msgid "Userinfo format error."
+msgstr ""
+
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:402
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server-config.lua:110
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server.lua:117
diff --git a/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po b/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
index 900ba1267..227ae0e4b 100644
--- a/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
+++ b/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
@@ -221,6 +221,10 @@ msgstr "【百度】连通性检查"
 msgid "Baidu Public DNS (180.76.76.76)"
 msgstr ""
 
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:233
+msgid "Base64 sstr failed."
+msgstr "Base64 解码失败。"
+
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1034
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1044
 msgid "BitTorrent (uTP)"
@@ -980,16 +984,17 @@ msgstr ""
 msgid "If you have a self-signed certificate,please check the box"
 msgstr "如果你使用自签证书，请选择"
 
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:661
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:819
 msgid "Import"
 msgstr "导入配置信息"
 
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:164
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:307
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:339
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:435
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:522
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:652
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:177
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:320
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:352
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:448
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:535
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:665
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:810
 msgid "Import configuration information successfully."
 msgstr "导入配置信息成功。"
 
@@ -1009,7 +1014,7 @@ msgstr "接口控制"
 msgid "Invalid JSON format"
 msgstr "无效的 JSON 格式"
 
-#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:655
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:813
 msgid "Invalid format."
 msgstr "无效的格式。"
 
@@ -1598,6 +1603,10 @@ msgstr "运行中"
 msgid "Running Mode"
 msgstr "运行模式"
 
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:255
+msgid "SS URL base64 sstr format not recognized."
+msgstr "无法识别 SS URL 的 Base64 格式。"
+
 #: applications/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua:13
 msgid "SSR Client"
 msgstr "客户端"
@@ -2070,6 +2079,10 @@ msgstr "用户已取消。"
 msgid "User-Agent"
 msgstr "用户代理(User-Agent)"
 
+#: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm:210
+msgid "Userinfo format error."
+msgstr "用户信息格式错误。"
+
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:402
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server-config.lua:110
 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server.lua:117
diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
index d05ad3566..25d59015b 100755
--- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
+++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
@@ -173,6 +173,34 @@ local function isCompleteJSON(str)
 	local success, _ = pcall(jsonParse, str)
 	return success
 end
+local function detectNodeType(rawContent)
+    -- 去掉 # 前后空格，处理 HTML 转义 &amp;
+    local content = trim(rawContent:gsub("&[a-zA-Z]+;", "&"):gsub("%s*#%s*", "#"))
+
+    -- 找到 # 分隔位置
+    local idx_sp = content:find("#") or 0
+    local info = content:sub(1, idx_sp > 0 and idx_sp - 1 or #content):gsub("/%?", "?")
+
+    -- 拆 base64 主体和 ? 参数部分
+    local uri_main, query_str = info:match("^([^?]+)%??(.*)$")
+
+    local params = {}
+    if query_str and query_str ~= "" then
+        for _, v in ipairs(split(query_str, '&')) do
+            local t = split(v, '=')
+            if #t >= 2 then
+                params[t[1]] = UrlDecode(t[2])
+            end
+        end
+    end
+
+    -- 判断是否是 Xray-SS 节点
+    if params["type"] then
+        return "shadowsocks"
+    else
+        return "ss"
+    end
+end
 -- 处理数据
 local function processData(szType, content)
 	local result = {type = szType, local_port = 1234, kcp_param = '--nocomp'}
@@ -183,6 +211,14 @@ local function processData(szType, content)
 		end
 	end
 
+	-- 协议头识别
+	if szType == "ss" then
+		local nodeType = detectNodeType(content)
+		if nodeType == "shadowsocks" then
+			szType = "shadowsocks"  -- 替换类型
+		end
+	end
+
 	if szType == "hysteria2" or szType == "hy2" then
 		local url = URL.parse("http://" .. content)
 		local params = url.query
@@ -399,6 +435,7 @@ local function processData(szType, content)
 			result.security = info.security
 		end
 	elseif szType == "ss" then
+		local content = trim(content:gsub("&[a-zA-Z]+;", "&"):gsub("%s*#%s*", "#"))
 		local idx_sp = content:find("#") or 0
 		local alias = ""
 		if idx_sp > 0 then
@@ -761,6 +798,113 @@ local function processData(szType, content)
 		result.server_port = url.port
 		result.vmess_id = url.user
 		result.vless_encryption = params.encryption or "none"
+		result.transport = params.type or "raw"
+		if result.transport == "tcp" then
+			result.transport = "raw"
+		end
+		if result.transport == "splithttp" then
+			result.transport = "xhttp"
+		end
+		result.tls = (params.security == "tls" or params.security == "xtls") and "1" or "0"
+		if params.alpn and params.alpn ~= "" then
+			local alpn = {}
+			for v in params.alpn:gmatch("[^,]+") do
+				table.insert(alpn, v)
+			end
+			result.tls_alpn = alpn
+		end
+		result.tls_host = params.sni
+		result.tls_flow = (params.security == "tls" or params.security == "reality") and params.flow or nil
+		result.fingerprint = params.fp
+		result.reality = (params.security == "reality") and "1" or "0"
+		result.reality_publickey = params.pbk and UrlDecode(params.pbk) or nil
+		result.reality_shortid = params.sid
+		result.reality_spiderx = params.spx and UrlDecode(params.spx) or nil
+		-- 检查 ech 参数是否存在且非空
+		result.enable_ech = (params.ech and params.ech ~= "") and "1" or nil
+		result.ech_config = (params.ech and params.ech ~= "") and params.ech or nil
+		-- 检查 pqv 参数是否存在且非空
+		result.enable_mldsa65verify = (params.pqv and params.pqv ~= "") and "1" or nil
+		result.reality_mldsa65verify = (params.pqv and params.pqv ~= "") and params.pqv or nil
+		if result.transport == "ws" then
+			result.ws_host = (result.tls ~= "1") and (params.host and UrlDecode(params.host)) or nil
+			result.ws_path = params.path and UrlDecode(params.path) or "/"
+		elseif result.transport == "httpupgrade" then
+			result.httpupgrade_host = (result.tls ~= "1") and (params.host and UrlDecode(params.host)) or nil
+			result.httpupgrade_path = params.path and UrlDecode(params.path) or "/"
+		elseif result.transport == "xhttp" or result.transport == "splithttp" then
+			result.xhttp_host = (result.tls ~= "1") and (params.host and UrlDecode(params.host)) or nil
+			result.xhttp_mode = params.mode or "auto"
+			result.xhttp_path = params.path and UrlDecode(params.path) or "/"
+			-- 检查 extra 参数是否存在且非空
+			result.enable_xhttp_extra = (params.extra and params.extra ~= "") and "1" or nil
+			result.xhttp_extra = (params.extra and params.extra ~= "") and params.extra or nil
+			-- 尝试解析 JSON 数据
+			local success, Data = pcall(jsonParse, params.extra or "")
+			if success and type(Data) == "table" then
+				local address = (Data.extra and Data.extra.downloadSettings and Data.extra.downloadSettings.address)
+					or (Data.downloadSettings and Data.downloadSettings.address)
+				result.download_address = address and address ~= "" and address or nil
+			else
+				-- 如果解析失败，清空下载地址
+				result.download_address = nil
+			end
+		-- make it compatible with bullshit, "h2" transport is non-existent at all
+		elseif result.transport == "http" or result.transport == "h2" then
+			result.transport = "h2"
+			result.h2_host = params.host and UrlDecode(params.host) or nil
+			result.h2_path = params.path and UrlDecode(params.path) or nil
+		elseif result.transport == "kcp" then
+			result.kcp_guise = params.headerType or "none"
+			result.seed = params.seed
+			result.mtu = 1350
+			result.tti = 50
+			result.uplink_capacity = 5
+			result.downlink_capacity = 20
+			result.read_buffer_size = 2
+			result.write_buffer_size = 2
+		elseif result.transport == "quic" then
+			result.quic_guise = params.headerType or "none"
+			result.quic_security = params.quicSecurity or "none"
+			result.quic_key = params.key
+		elseif result.transport == "grpc" then
+			result.serviceName = params.serviceName
+			result.grpc_mode = params.mode or "gun"
+		elseif result.transport == "tcp" or result.transport == "raw" then
+			result.tcp_guise = params.headerType or "none"
+			if result.tcp_guise == "http" then
+				result.tcp_host = params.host and UrlDecode(params.host) or nil
+				result.tcp_path = params.path and UrlDecode(params.path) or nil
+			end
+		end
+	elseif szType == "shadowsocks" then
+		local content = trim(content:gsub("&[a-zA-Z]+;", "&"):gsub("%s*#%s*", "#"))
+		local idx_sp = content:find("#") or 0
+		local alias = ""
+		if idx_sp > 0 then
+        	alias = UrlDecode(content:sub(idx_sp + 1))
+		end
+		local info = content:sub(1, idx_sp > 0 and idx_sp - 1 or #content)
+		local url = URL.parse("http://" .. info)
+		local params = url.query
+
+		result.alias = alias
+		result.type = "v2ray"
+		result.v2ray_protocol = "shadowsocks"
+		result.server = url.host
+		result.server_port = url.port
+
+		-- 判断 @ 前部分是否为 Base64
+		local is_base64_decoded = base64Decode(UrlDecode(url.user))
+		if is_base64_decoded:find(":") then
+        	-- 新格式：method:password
+        	result.encrypt_method_ss, result.password = is_base64_decoded:match("^(.-):(.*)$")
+		else
+        	-- 旧格式：UUID 直接作为密码
+        	result.password = url.user
+        	result.encrypt_method_ss = params.encryption or "none"
+		end
+
 		result.transport = params.type or "raw"
 		if result.transport == "tcp" then
 			result.transport = "raw"
diff --git a/natflow/Makefile b/natflow/Makefile
index 9b3732829..dbfc456c3 100644
--- a/natflow/Makefile
+++ b/natflow/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=natflow
-PKG_VERSION:=20250918
+PKG_VERSION:=20250920
 
 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=072c5cc8a2aa41f0dfcd99ee0b2044e08c5c9483fc2330753e3ba51868542b42
+PKG_HASH:=6b6b015e883cb9935a2565c998d5af01cc48d90226125ae1b35d233682dd4272
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>