luci: optimize import/subscribe logic and support udp/tfo params

Author: lwb1978

luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm

@@ -243,6 +243,9 @@
 			}
 
 			var params = "";
+
+			opt.get(dom_prefix + "tcp_fast_open")?.checked && (params += "&tfo=1");
+
 			var v_plugin_dom = opt.get(dom_prefix + "plugin");
 			if (v_plugin_dom) {
 				var v_plugin = v_plugin_dom.value;
@@ -322,6 +325,8 @@
 					params += opt.query("ech", dom_prefix + "ech_config");
 				}
 
+				opt.get(dom_prefix + "uot")?.checked && (params += "&udp=1");
+
 				if (opt.get(dom_prefix + "shadowtls")?.checked) {
 					let st_plugin_str = "";
 					let st_version = opt.get(dom_prefix + "shadowtls_version")?.value;
@@ -418,6 +423,9 @@
 				info.tls = "tls";
 				info.sni = opt.get(dom_prefix + "tls_serverName").value;
 			}
+
+			opt.get(dom_prefix + "tcp_fast_open")?.checked && (info.tfo = "1");
+
 			url = b64EncodeUnicode(JSON.stringify(info));
 		} else if ((v_type === "sing-box" || v_type === "Xray") && opt.get(dom_prefix + "protocol").value === "vless") {
 			protocol = "vless";
@@ -502,6 +510,8 @@
 				params += opt.query("ech", dom_prefix + "ech_config");
 			}
 
+			opt.get(dom_prefix + "tcp_fast_open")?.checked && (params += "&tfo=1");
+
 			params += "#" + encodeURI(v_alias.value);
 			if (params[0] == "&") {
 				params = params.substring(1);
@@ -567,6 +577,9 @@
 				params += opt.query("vcn", dom_prefix + "tls_CertByName");
 				params += opt.query("ech", dom_prefix + "ech_config");
 			}
+
+			opt.get(dom_prefix + "tcp_fast_open")?.checked && (params += "&tfo=1");
+
 			params += "#" + encodeURI(v_alias.value);
 			if (params[0] == "&") {
 				params = params.substring(1);
@@ -944,11 +957,14 @@
 				pluginOpts = pluginParams.join(";");
 			}
 
-			if (has_xray && ((ss_type !== "xray" && ss_type !== "sing-box" && queryParam.type) || ss_type == "xray" || queryParam.type == "xhttp")) {
+			const needUpgrade = ss_type !== "Xray" && ss_type !== "sing-box" &&
+					queryParam.type && queryParam.type !== "tcp" &&
+					queryParam.headerType && queryParam.headerType !== "none";
+			if (has_xray && (ss_type == "xray" || needUpgrade || queryParam.type === "xhttp")) {
 				dom_prefix = "xray_"
 				opt.set('type', "Xray");
 				opt.set(dom_prefix + 'protocol', "shadowsocks");
-			} else if (has_singbox && ((ss_type !== "xray" && ss_type !== "sing-box" && queryParam.type) || ss_type == "sing-box")) {
+			} else if (has_singbox && (ss_type == "sing-box" || needUpgrade)) {
 				dom_prefix = "singbox_"
 				opt.set('type', "sing-box");
 				opt.set(dom_prefix + 'protocol', "shadowsocks");
@@ -977,6 +993,7 @@
 			opt.set(dom_prefix + 'password', password || "");
 			opt.set(dom_prefix + 'method', method || "");
 			opt.set(dom_prefix + 'ss_method', method || "");
+			opt.set(dom_prefix + 'tcp_fast_open', queryParam.tfo);
 			if (plugin && plugin != "none") {
 				plugin = (plugin === "simple-obfs") ? "obfs-local" : plugin;
 				opt.set(dom_prefix + 'plugin_enabled', true);
@@ -1114,6 +1131,8 @@
 					opt.set(dom_prefix + 'use_xhttp_extra', !!queryParam.extra);
 					opt.set(dom_prefix + 'xhttp_extra', queryParam.extra || "");
 				}
+
+				opt.set(dom_prefix + 'uot', queryParam.udp);
 
 				if (queryParam["shadow-tls"]) {
 					//解析SS Shadow-TLS 插件参数
@@ -1273,6 +1292,8 @@
 				opt.set(dom_prefix + 'tls_allowInsecure', false);
 			}
 
+			opt.set(dom_prefix + 'tcp_fast_open', queryParam.tfo);
+
 			if (m.hash) {
 				opt.set('remarks', decodeURIComponent(m.hash.substr(1)));
 			}
@@ -1367,6 +1388,8 @@
 			} else if (ssm.net === "grpc") {
 				opt.set(dom_prefix + 'grpc_serviceName', ssm.path);
 			}
+
+			opt.set(dom_prefix + 'tcp_fast_open', ssm.tfo);
 		}
 		if (ssu[0] === "vless") {
 			if (vless_type == "sing-box" && has_singbox) {
@@ -1518,6 +1541,8 @@
 				opt.set(dom_prefix + 'httpupgrade_path', queryParam.path || "");
 			}
 
+			opt.set(dom_prefix + 'tcp_fast_open', queryParam.tfo);
+
 			if (m.hash) {
 				opt.set('remarks', decodeURIComponent(m.hash.substr(1)));
 			}
@@ -1697,12 +1722,14 @@
 	}
 
 	document.addEventListener("DOMContentLoaded", function () {
-		const fromUrlCache = JSON.parse(sessionStorage.getItem("fromUrl"));
-		if (fromUrlCache && fromUrlCache.savetime && (Date.now() - fromUrlCache.timestamp) < fromUrlCache.savetime) {
-			fromUrl(null, fromUrlCache.urlname, fromUrlCache.sid, fromUrlCache)
-		} else {
-			sessionStorage.removeItem("fromUrl");
-		}
+		setTimeout(function () {
+			const fromUrlCache = JSON.parse(sessionStorage.getItem("fromUrl"));
+			if (fromUrlCache && fromUrlCache.savetime && (Date.now() - fromUrlCache.timestamp) < fromUrlCache.savetime) {
+				fromUrl(null, fromUrlCache.urlname, fromUrlCache.sid, fromUrlCache)
+			} else {
+				sessionStorage.removeItem("fromUrl");
+			}
+		}, 500);
 	})
 
 //]]></script>

luci-app-passwall/root/usr/share/passwall/subscribe.lua

@@ -620,6 +620,8 @@ local function processData(szType, content, add_mode, group)
 			result.tls = "0"
 		end
 
+		result.tcp_fast_open = info.tfo
+
 		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
@@ -723,13 +725,17 @@ local function processData(szType, content, add_mode, group)
 
 			result.method = method
 			result.password = password
+			result.tcp_fast_open = params.tfo
 
-			if has_xray and (result.type ~= 'Xray' and  result.type ~= 'sing-box' and params.type) then
-				result.type = 'Xray'
-				result.protocol = 'shadowsocks'
-			elseif has_singbox and (result.type ~= 'Xray' and  result.type ~= 'sing-box' and params.type) then
-				result.type = 'sing-box'
-				result.protocol = 'shadowsocks'
+			local need_upgrade = (result.type ~= "Xray" and result.type ~= "sing-box")
+				and (params.type and params.type ~= "tcp")
+				and (params.headerType and params.headerType ~= "none")
+			if has_xray and (need_upgrade or params.type == "xhttp") then
+				result.type = "Xray"
+				result.protocol = "shadowsocks"
+			elseif has_singbox and need_upgrade then
+				result.type = "sing-box"
+				result.protocol = "shadowsocks"
 			end
 
 			if result.plugin then
@@ -892,7 +898,8 @@ local function processData(szType, content, add_mode, group)
 					else
 						result.tls_allowInsecure = allowInsecure_default and "1" or "0"
 					end
-				else
+					result.uot = params.udp
+				elseif (params.type ~= "tcp" and params.type ~= "raw") and (params.headerType and params.headerType ~= "none") then
 					result.error_msg = "请更换Xray或Sing-Box来支持SS更多的传输方式."
 				end
 			end
@@ -1091,6 +1098,7 @@ local function processData(szType, content, add_mode, group)
 			end
 
 			result.alpn = params.alpn
+			result.tcp_fast_open = params.tfo
 
 			if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp") then
 				log("跳过节点:" .. result.remarks .."，因Sing-Box不支持" .. szType .. "协议的" .. result.transport .. "传输方式，需更换Xray。")
@@ -1281,6 +1289,8 @@ local function processData(szType, content, add_mode, group)
 				result.tls_allowInsecure = allowInsecure_default and "1" or "0"
 			end
 
+			result.tcp_fast_open = params.tfo
+
 			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