update 2026-07-08 18:11:50

luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua

@@ -652,12 +652,12 @@ o = s:option(Flag, _n("http_h2_health_check"), translate("Health check"))
 o:depends({ [_n("tls")] = true, [_n("transport")] = "http" })
 
 o = s:option(Value, _n("http_h2_read_idle_timeout"), translate("Idle timeout"))
-o.default = "10"
-o:depends({ [_n("tls")] = true, [_n("transport")] = "http", [_n("http_h2_health_check")] = true })
+o.default = "15"
+o:depends({ [_n("http_h2_health_check")] = true })
 
 o = s:option(Value, _n("http_h2_health_check_timeout"), translate("Health check timeout"))
 o.default = "15"
-o:depends({ [_n("tls")] = true, [_n("transport")] = "http", [_n("http_h2_health_check")] = true })
+o:depends({ [_n("http_h2_health_check")] = true })
 
 -- [[ WebSocket部分 ]]--
 o = s:option(Value, _n("ws_host"), translate("WebSocket Host"))
@@ -693,11 +693,11 @@ o = s:option(Flag, _n("grpc_health_check"), translate("Health check"))
 o:depends({ [_n("transport")] = "grpc" })
 
 o = s:option(Value, _n("grpc_idle_timeout"), translate("Idle timeout"))
-o.default = "10"
+o.default = "15"
 o:depends({ [_n("grpc_health_check")] = true })
 
 o = s:option(Value, _n("grpc_health_check_timeout"), translate("Health check timeout"))
-o.default = "20"
+o.default = "15"
 o:depends({ [_n("grpc_health_check")] = true })
 
 o = s:option(Flag, _n("grpc_permit_without_stream"), translate("Permit without stream"))

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

@@ -1447,7 +1447,7 @@ function get_std_domain(domain)
 	return domain
 end
 
-function format_go_time(input)
+function format_go_time(input, default)
 	input = input and trim(input)
 	local N = 0
 	if input and input:match("^%d+$") then
@@ -1465,7 +1465,7 @@ function format_go_time(input)
 		end
 	end
 	if N <= 0 then
-		return "0s"
+		return default or "0s"
 	end
 	local result = ""
 	local h = math.floor(N / 3600)

luci-app-passwall/luasrc/passwall/util_sing-box.lua

@@ -304,8 +304,6 @@ function gen_outbound(flag, node, tag, proxy_table)
 				headers = node.user_agent and {
 					["User-Agent"] = node.user_agent
 				} or nil,
-				idle_timeout = (node.http_h2_health_check == "1") and node.http_h2_read_idle_timeout or nil,
-				ping_timeout = (node.http_h2_health_check == "1") and node.http_h2_health_check_timeout or nil,
 			}
 			--不强制执行 TLS。如果未配置 TLS，将使用纯 HTTP 1.1。
 		end
@@ -318,8 +316,8 @@ function gen_outbound(flag, node, tag, proxy_table)
 				headers = node.user_agent and {
 					["User-Agent"] = node.user_agent
 				} or nil,
-				idle_timeout = (node.http_h2_health_check == "1") and node.http_h2_read_idle_timeout or nil,
-				ping_timeout = (node.http_h2_health_check == "1") and node.http_h2_health_check_timeout or nil,
+				idle_timeout = (node.http_h2_health_check == "1") and api.format_go_time(node.http_h2_read_idle_timeout, "15s") or nil,
+				ping_timeout = (node.http_h2_health_check == "1") and api.format_go_time(node.http_h2_health_check_timeout, "15s") or nil,
 			}
 			--不强制执行 TLS。如果未配置 TLS，将使用纯 HTTP 1.1。
 		end
@@ -359,8 +357,8 @@ function gen_outbound(flag, node, tag, proxy_table)
 			v2ray_transport = {
 				type = "grpc",
 				service_name = node.grpc_serviceName,
-				idle_timeout = tonumber(node.grpc_idle_timeout) or nil,
-				ping_timeout = tonumber(node.grpc_health_check_timeout) or nil,
+				idle_timeout = (node.grpc_health_check == "1") and api.format_go_time(node.grpc_idle_timeout, "15s") or nil,
+				ping_timeout = (node.grpc_health_check == "1") and api.format_go_time(node.grpc_health_check_timeout, "15s") or nil,
 				permit_without_stream = (node.grpc_permit_without_stream == "1") and true or nil,
 			}
 		end
@@ -583,12 +581,12 @@ function gen_outbound(flag, node, tag, proxy_table)
 				idle_timeout = (function(t)
 					if not version_ge_1_14_0 then return nil end
 					t = tonumber(tostring(t or "30"):match("^%d+"))
-					return (t and t >= 4 and t <= 120) and t or 30
+					return (t and t >= 4 and t <= 120) and t .. "s" or "30s"
 				end)(node.hysteria2_idle_timeout),
 				keep_alive_period = (function(t)
 					if not version_ge_1_14_0 then return nil end
 					t = tonumber(tostring(t or "0"):match("^%d+"))
-					return (t and t >= 2 and t <= 60) and t or nil
+					return (t and t >= 2 and t <= 60) and t .. "s" or nil
 				end)(node.hysteria2_keep_alive_period),
 				disable_path_mtu_discovery = version_ge_1_14_0 and (tonumber(node.hysteria2_disable_mtu_discovery) == 1) or nil,
 				tls = tls,