💐 Sync 2026-09-10 14:49:21

luci-app-passwall/luasrc/passwall/util_xray.lua

@@ -44,6 +44,7 @@ function gen_outbound(flag, node, tag, proxy_table)
 		local remarks = node.remarks
 
 		local proxy_tag = nil
+		local dialer_proxy_tag = nil
 		local fragment = nil
 		local noise = nil
 		local run_socks_instance = true
@@ -86,12 +87,7 @@ function gen_outbound(flag, node, tag, proxy_table)
 			node.stream_security = "none"
 			proxy_tag = "socks <- " .. node_id
 		else
-			if proxy_tag then
-				node.proxySettings = {
-					tag = proxy_tag,
-					transportLayer = true
-				}
-			end
+			dialer_proxy_tag = proxy_tag
 		end
 
 		if node.type == "Xray" then
@@ -135,7 +131,6 @@ function gen_outbound(flag, node, tag, proxy_table)
 			_flag = flag,
 			_flag_proxy_tag = proxy_tag,
 			tag = tag,
-			proxySettings = node.proxySettings or nil,
 			protocol = node.protocol,
 			mux = {
 				enabled = (node.mux == "1") and true or false,
@@ -143,7 +138,7 @@ function gen_outbound(flag, node, tag, proxy_table)
 				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" or node.protocol == "hysteria") and {
+			streamSettings = (node.streamSettings or dialer_proxy_tag or node.protocol == "vmess" or node.protocol == "vless" or node.protocol == "socks" or node.protocol == "shadowsocks" or node.protocol == "trojan" or node.protocol == "hysteria") and {
 				sockopt = {
 					mark = 255,
 					domainStrategy = node.domain_strategy or "UseIP",
@@ -154,7 +149,8 @@ function gen_outbound(flag, node, tag, proxy_table)
 						PrioritizeIPv6 = false,
 						Interleave = 1,
 						MaxConcurrentTry = 4
-					} or nil
+					} or nil,
+					dialerProxy = dialer_proxy_tag,
 				},
 				[(api.compare_versions(xray_version, "<", "26.7.11")) and "network" or "method"] = node.transport, -- Todo: Remove version check and "network"
 				security = node.stream_security,
@@ -1209,10 +1205,9 @@ function gen_config(var)
 						end
 						if preproxy_outbound then
 							outbound.tag = preproxy_outbound.tag .. " -> " .. outbound.tag
-							outbound.proxySettings = {
-								tag = preproxy_outbound.tag,
-								transportLayer = true
-							}
+							outbound.streamSettings = outbound.streamSettings or {}
+							outbound.streamSettings.sockopt = outbound.streamSettings.sockopt or {}
+							outbound.streamSettings.sockopt.dialerProxy = preproxy_outbound.tag
 							if not exist then
 								last_insert_outbound = preproxy_outbound
 							end
@@ -1260,10 +1255,9 @@ function gen_config(var)
 					if to_outbound then
 						to_outbound.tag = outbound.tag .. " -> " .. to_outbound.tag
 						if to_node.type == "Xray" then
-							to_outbound.proxySettings = {
-								tag = outbound.tag,
-								transportLayer = true
-							}
+							to_outbound.streamSettings = to_outbound.streamSettings or {}
+							to_outbound.streamSettings.sockopt = to_outbound.streamSettings.sockopt or {}
+							to_outbound.streamSettings.sockopt.dialerProxy = outbound.tag
 						end
 						table.insert(outbounds_table, to_outbound)
 						default_outTag = to_outbound.tag