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

luci: optimize subscription

Browse Source
This commit is contained in:
xiaorouji 2023-03-03 23:46:43 +08:00 committed by sbwml
parent d13e04f352
commit 8d62a289be
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,7 +604,7 @@ local function processData(szType, content, add_mode, add_from)
else else
result.tls_allowInsecure = string.lower(params.allowinsecure) == "true" and "1" or "0" result.tls_allowInsecure = string.lower(params.allowinsecure) == "true" and "1" or "0"
end end
log(result.remarks .. ' 使用节点AllowInsecure设定: '.. result.tls_allowInsecure) --log(result.remarks .. ' 使用节点AllowInsecure设定: '.. result.tls_allowInsecure)
else else
result.tls_allowInsecure = allowInsecure_default and "1" or "0" result.tls_allowInsecure = allowInsecure_default and "1" or "0"
end end
@ -809,7 +809,7 @@ local function processData(szType, content, add_mode, add_from)
result.tls_serverName = params.peer result.tls_serverName = params.peer
if params.insecure and (params.insecure == "1" or params.insecure == "0") then if params.insecure and (params.insecure == "1" or params.insecure == "0") then
result.tls_allowInsecure = params.insecure result.tls_allowInsecure = params.insecure
log(result.remarks ..' 使用节点AllowInsecure设定: '.. result.tls_allowInsecure) --log(result.remarks ..' 使用节点AllowInsecure设定: '.. result.tls_allowInsecure)
else else
result.tls_allowInsecure = allowInsecure_default and "1" or "0" result.tls_allowInsecure = allowInsecure_default and "1" or "0"
end end
@ -903,12 +903,12 @@ local function select_node(nodes, config)
end end
end end
end end
-- 第一优先级 类型 + IP + 端口 -- 第一优先级 类型 + 备注 + IP + 端口
if not server then if not server then
for index, node in pairs(nodes) do for index, node in pairs(nodes) do
if config.currentNode.type and config.currentNode.address and config.currentNode.port then if config.currentNode.type and config.currentNode.remarks and config.currentNode.address and config.currentNode.port then
if node.type and node.address and node.port then if node.type and node.remarks and node.address and node.port then
if node.type == config.currentNode.type and (node.address .. ':' .. node.port == config.currentNode.address .. ':' .. config.currentNode.port) then if node.type == config.currentNode.type and node.remarks == config.currentNode.remarks and (node.address .. ':' .. node.port == config.currentNode.address .. ':' .. config.currentNode.port) then
if config.log == nil or config.log == true then if config.log == nil or config.log == true then
log('更新【' .. config.remarks .. '】第一匹配节点：' .. node.remarks) log('更新【' .. config.remarks .. '】第一匹配节点：' .. node.remarks)
end end
@ -919,12 +919,12 @@ local function select_node(nodes, config)
end end
end end
end end
-- 第二优先级 IP + 端口 -- 第二优先级 类型 + IP + 端口
if not server then if not server then
for index, node in pairs(nodes) do for index, node in pairs(nodes) do
if config.currentNode.address and config.currentNode.port then if config.currentNode.type and config.currentNode.address and config.currentNode.port then
if node.address and node.port then if node.type and node.address and node.port then
if node.address .. ':' .. node.port == config.currentNode.address .. ':' .. config.currentNode.port then if node.type == config.currentNode.type and (node.address .. ':' .. node.port == config.currentNode.address .. ':' .. config.currentNode.port) then
if config.log == nil or config.log == true then if config.log == nil or config.log == true then
log('更新【' .. config.remarks .. '】第二匹配节点：' .. node.remarks) log('更新【' .. config.remarks .. '】第二匹配节点：' .. node.remarks)
end end
@ -935,12 +935,12 @@ local function select_node(nodes, config)
end end
end end
end end
-- 第三优先级 IP -- 第三优先级 IP + 端口
if not server then if not server then
for index, node in pairs(nodes) do for index, node in pairs(nodes) do
if config.currentNode.address then if config.currentNode.address and config.currentNode.port then
if node.address then if node.address and node.port then
if node.address == config.currentNode.address then if node.address .. ':' .. node.port == config.currentNode.address .. ':' .. config.currentNode.port then
if config.log == nil or config.log == true then if config.log == nil or config.log == true then
log('更新【' .. config.remarks .. '】第三匹配节点：' .. node.remarks) log('更新【' .. config.remarks .. '】第三匹配节点：' .. node.remarks)
end end
@ -951,14 +951,30 @@ local function select_node(nodes, config)
end end
end end
end end
-- 第四优先级备注 -- 第四优先级 IP
if not server then
for index, node in pairs(nodes) do
if config.currentNode.address then
if node.address then
if node.address == config.currentNode.address then
if config.log == nil or config.log == true then
log('更新【' .. config.remarks .. '】第四匹配节点：' .. node.remarks)
end
server = node[".name"]
break
end
end
end
end
end
-- 第五优先级备注
if not server then if not server then
for index, node in pairs(nodes) do for index, node in pairs(nodes) do
if config.currentNode.remarks then if config.currentNode.remarks then
if node.remarks then if node.remarks then
if node.remarks == config.currentNode.remarks then if node.remarks == config.currentNode.remarks then
if config.log == nil or config.log == true then if config.log == nil or config.log == true then
log('更新【' .. config.remarks .. '】第四匹配节点：' .. node.remarks) log('更新【' .. config.remarks .. '】第五匹配节点：' .. node.remarks)
end end
server = node[".name"] server = node[".name"]
break break