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

luci: Optimize subscribe UA

Browse Source
This commit is contained in:
xiaorouji 2024-03-19 19:13:53 +08:00 committed by sbwml
parent 99e5e171d6
commit 9dc1a2f719
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua
View File

@ -145,6 +145,10 @@ o.default = 0
o:depends("auto_update", true) o:depends("auto_update", true)
o = s:option(Value, "user_agent", translate("User-Agent")) o = s:option(Value, "user_agent", translate("User-Agent"))
o.default = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36" o.default = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0"
o:value("curl")
o:value("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0")
o:value("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0")
o:value("Passwall/OpenWrt")
return m return m

7
luci-app-passwall/luasrc/passwall/api.lua
View File

@ -10,7 +10,7 @@ jsonc = require "luci.jsonc"
i18n = require "luci.i18n" i18n = require "luci.i18n"
appname = "passwall" appname = "passwall"
curl_args = { "-skfL", "--connect-timeout 3", "--retry 3", "-m 60" } curl_args = { "-skfL", "--connect-timeout 3", "--retry 3" }
command_timeout = 300 command_timeout = 300
OPENWRT_ARCH = nil OPENWRT_ARCH = nil
DISTRIB_ARCH = nil DISTRIB_ARCH = nil
@ -820,7 +820,10 @@ function to_download(app_name, url, size)
end end
end end
local return_code, result = curl_logic(url, tmp_file, curl_args) local _curl_args = clone(curl_args)
table.insert(_curl_args, "-m 60")
local return_code, result = curl_logic(url, tmp_file, _curl_args)
result = return_code == 0 result = return_code == 0
if not result then if not result then

10
luci-app-passwall/root/usr/share/passwall/subscribe.lua
View File

@ -898,13 +898,11 @@ local function processData(szType, content, add_mode, add_from)
end end
local function curl(url, file, ua) local function curl(url, file, ua)
if not ua or ua == "" then local curl_args = api.clone(api.curl_args)
ua = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36" if ua and ua ~= "" and ua ~= "curl" then
table.insert(curl_args, '--user-agent "' .. ua .. '"')
end end
local args = { local return_code, result = api.curl_logic(url, file, curl_args)
"-skL", "--retry 3", "--connect-timeout 3", '--user-agent "' .. ua .. '"'
}
local return_code, result = api.curl_logic(url, file, args)
return return_code return return_code
end end