zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall: sync upstream

Browse Source 
last commit: 27f323d547
This commit is contained in:
actions 2024-05-31 22:30:05 +08:00
parent bf46b250bd
commit bc15af58bc
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
View File

@ -109,11 +109,11 @@ o.default = "leastPing"
-- Fallback Node -- Fallback Node
if api.compare_versions(xray_version, ">=", "1.8.10") then if api.compare_versions(xray_version, ">=", "1.8.10") then
local o = s:option(ListValue, option_name("fallback_node"), translate("Fallback Node")) local o = s:option(ListValue, option_name("fallback_node"), translate("Fallback Node"))
if api.compare_versions(xray_version, "<", "1.8.12") then if api.compare_versions(xray_version, ">=", "1.8.12") then
o:depends({ [option_name("protocol")] = "_balancing" })
else
o:depends({ [option_name("balancingStrategy")] = "leastPing" }) o:depends({ [option_name("balancingStrategy")] = "leastPing" })
end end
o:value("",translate("Null"))
o.default = ""
local function check_fallback_chain(fb) local function check_fallback_chain(fb)
for k, v in pairs(fallback_table) do for k, v in pairs(fallback_table) do
if v.fallback == fb then if v.fallback == fb then
@ -131,21 +131,34 @@ if api.compare_versions(xray_version, ">=", "1.8.10") then
end end
-- 探测地址 -- 探测地址
local o = s:option(Flag, option_name("useCustomProbeUrl"), translate("Use Custome Probe URL"), translate("By default the built-in probe URL will be used, enable this option to use a custom probe URL.")) local ucpu = s:option(Flag, option_name("useCustomProbeUrl"), translate("Use Custome Probe URL"), translate("By default the built-in probe URL will be used, enable this option to use a custom probe URL."))
o:depends({ [option_name("balancingStrategy")] = "leastPing" }) ucpu:depends({ [option_name("balancingStrategy")] = "leastPing" })
o:depends({ [option_name("fallback_node")] = "", ["!reverse"] = true })
local o = s:option(Value, option_name("probeUrl"), translate("Probe URL")) local pu = s:option(Value, option_name("probeUrl"), translate("Probe URL"))
o:depends({ [option_name("useCustomProbeUrl")] = true }) pu:depends({ [option_name("useCustomProbeUrl")] = true })
o.default = "https://www.google.com/generate_204" pu:value("https://cp.cloudflare.com/", "Cloudflare")
o.description = translate("The URL used to detect the connection status.") 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.")
-- 探测间隔 -- 探测间隔
local o = s:option(Value, option_name("probeInterval"), translate("Probe Interval")) local pi = s:option(Value, option_name("probeInterval"), translate("Probe Interval"))
o:depends({ [option_name("balancingStrategy")] = "leastPing" }) pi:depends({ [option_name("balancingStrategy")] = "leastPing" })
o:depends({ [option_name("fallback_node")] = "", ["!reverse"] = true }) pi.default = "1m"
o.default = "1m" pi.description = translate("The interval between initiating probes. Every time this time elapses, a server status check is performed on a server. The time format is numbers + units, such as '10s', '2h45m', and the supported time units are <code>ns</code>, <code>us</code>, <code>ms</code>, <code>s</code>, <code>m</code>, <code>h</code>, which correspond to nanoseconds, microseconds, milliseconds, seconds, minutes, and hours, respectively.")
o.description = translate("The interval between initiating probes. Every time this time elapses, a server status check is performed on a server. The time format is numbers + units, such as '10s', '2h45m', and the supported time units are <code>ns</code>, <code>us</code>, <code>ms</code>, <code>s</code>, <code>m</code>, <code>h</code>, which correspond to nanoseconds, microseconds, milliseconds, seconds, minutes, and hours, respectively.")
if api.compare_versions(xray_version, ">=", "1.8.12") then
ucpu:depends({ [option_name("protocol")] = "_balancing" })
pi:depends({ [option_name("protocol")] = "_balancing" })
else
ucpu:depends({ [option_name("balancingStrategy")] = "leastPing" })
pi:depends({ [option_name("balancingStrategy")] = "leastPing" })
end
-- [[ 分流模块 ]] -- [[ 分流模块 ]]
if #nodes_table > 0 then if #nodes_table > 0 then