OpenWrt/kenzok8-small
1
0
Fork 0
mirror of https://github.com/kenzok8/small.git synced 2025-01-09 04:29:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 2023-09-22 08:39:10

Browse Source
This commit is contained in:
github-actions[bot] 2023-09-22 08:39:10 +08:00
parent f8808cde3f
commit ead5c3dce3
22 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall/Makefile
View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=4.70-9
PKG_VERSION:=4.70-10
PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \

1
luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua
View File

@ -4,6 +4,7 @@ local sys = api.sys
local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist")
m = Map(appname)
api.set_apply_on_parse(m)
s = m:section(TypedSection, "global", translate("ACLs"), "<font color='red'>" .. translate("ACLs is a tools which used to designate specific IP proxy mode.") .. "</font>")
s.anonymous = true

1
luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua
View File

@ -6,6 +6,7 @@ local has_xray = api.finded_com("xray")
local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist")
m = Map(appname)
api.set_apply_on_parse(m)
local nodes_table = {}
for k, e in ipairs(api.get_valid_nodes()) do

1
luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua
View File

@ -2,6 +2,7 @@ local api = require "luci.passwall.api"
local appname = api.appname
m = Map(appname)
api.set_apply_on_parse(m)
-- [[ App Settings ]]--
s = m:section(TypedSection, "global_app", translate("App Update"),

1
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -7,6 +7,7 @@ local has_xray = api.finded_com("xray")
local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist")
m = Map(appname)
api.set_apply_on_parse(m)
local nodes_table = {}
for k, e in ipairs(api.get_valid_nodes()) do

1
luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua
View File

@ -16,6 +16,7 @@ for k, e in ipairs(api.get_valid_nodes()) do
end
m = Map(appname)
api.set_apply_on_parse(m)
-- [[ Haproxy Settings ]]--
s = m:section(TypedSection, "global_haproxy")

1
luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua
View File

@ -10,6 +10,7 @@ end
m = Map(appname, translate("Node Config"))
m.redirect = api.url()
api.set_apply_on_parse(m)
s = m:section(NamedSection, arg[1], "nodes", "")
s.addremove = false

1
luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua
View File

@ -4,6 +4,7 @@ local sys = api.sys
local datatypes = api.datatypes
m = Map(appname)
api.set_apply_on_parse(m)
-- [[ Other Settings ]]--
s = m:section(TypedSection, "global_other")

1
luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
View File

@ -30,6 +30,7 @@ if has_trojan_go then
end
m = Map(appname)
api.set_apply_on_parse(m)
-- [[ Subscribe Settings ]]--
s = m:section(TypedSection, "global_subscribe", "")

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

@ -32,6 +32,7 @@ end
m = Map(appname)
m.redirect = api.url("node_subscribe")
api.set_apply_on_parse(m)
s = m:section(NamedSection, arg[1])
s.addremove = false

1
luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
View File

@ -7,6 +7,7 @@ local has_fw3 = api.is_finded("fw3")
local has_fw4 = api.is_finded("fw4")
m = Map(appname)
api.set_apply_on_parse(m)
-- [[ Delay Settings ]]--
s = m:section(TypedSection, "global_delay", translate("Delay Settings"))

2
luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua
View File

@ -3,6 +3,8 @@ local appname = api.appname
local has_xray = api.finded_com("xray")
m = Map(appname)
api.set_apply_on_parse(m)
-- [[ Rule Settings ]]--
s = m:section(TypedSection, "global_rules", translate("Rule status"))
s.anonymous = true

1
luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua
View File

@ -7,6 +7,7 @@ local path = string.format("/usr/share/%s/rules/", appname)
local route_hosts_path = "/etc/"
m = Map(appname)
api.set_apply_on_parse(m)
-- [[ Rule List Settings ]]--
s = m:section(TypedSection, "global_rules")

1
luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua
View File

@ -4,6 +4,7 @@ local datatypes = api.datatypes
m = Map(appname, "Xray " .. translate("Shunt Rule"))
m.redirect = api.url()
api.set_apply_on_parse(m)
s = m:section(NamedSection, arg[1], "shunt_rules", "")
s.addremove = false

1
luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua
View File

@ -4,6 +4,7 @@ local uci = api.uci
local has_xray = api.finded_com("xray")
m = Map(appname)
api.set_apply_on_parse(m)
local nodes_table = {}
for k, e in ipairs(api.get_valid_nodes()) do

4
luci-app-passwall/luasrc/model/cbi/passwall/client/type/hysteria2.lua
View File

@ -68,4 +68,8 @@ o = s:option(Flag, option_name("disable_mtu_discovery"), translate("Disable MTU
o.default = "0"
o.rewrite_option = o.option
o = s:option(Flag, option_name("lazy_start"), translate("Lazy Start"))
o.default = "0"
o.rewrite_option = o.option
api.luci_types(arg[1], m, s, type_name, option_prefix)

1
luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua
View File

@ -1,6 +1,7 @@
local api = require "luci.passwall.api"
m = Map("passwall_server", translate("Server-Side"))
api.set_apply_on_parse(m)
t = m:section(NamedSection, "global", "global")
t.anonymous = true

1
luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua
View File

@ -4,6 +4,7 @@ local types_dir = "/usr/lib/lua/luci/model/cbi/passwall/server/type/"
m = Map("passwall_server", translate("Server Config"))
m.redirect = api.url("server")
api.set_apply_on_parse(m)
s = m:section(NamedSection, arg[1], "user", "")
s.addremove = false

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

@ -973,6 +973,22 @@ function to_check_self()
}
end
function is_js_luci()
return sys.call('[ -f "/www/luci-static/resources/uci.js" ]') == 0
end
function set_apply_on_parse(map)
if is_js_luci() == true then
map.apply_on_parse = false
map.on_after_apply = function(self)
if self.redirect then
os.execute("sleep 1")
luci.http.redirect(self.redirect)
end
end
end
end
function luci_types(id, m, s, type_name, option_prefix)
local rewrite_option_table = {}
for key, value in pairs(s.fields) do

2
luci-app-passwall/luasrc/passwall/util_hysteria2.lua
View File

@ -90,7 +90,7 @@ function gen_config(var)
down = node.hysteria2_down_mbps and node.hysteria2_down_mbps .. " mbps" or "100 mbps"
},
fast_open = (node.fast_open == "1") and true or false,
lazy = true,
lazy = (node.hysteria2_lazy_start == "1") and true or false,
socks5 = (local_socks_address and local_socks_port) and {
listen = local_socks_address .. ":" .. local_socks_port,
username = (local_socks_username and local_socks_password) and local_socks_username or nil,

4
luci-app-passwall/luasrc/passwall/util_sing-box.lua
View File

@ -1068,7 +1068,7 @@ function gen_config(var)
rule.geosite = #domain_table.geosite > 0 and domain_table.geosite or nil
if outboundTag and outboundTag ~= "nil" then
table.insert(dns_domain_rules, domain_table)
table.insert(dns_domain_rules, api.clone(domain_table))
end
end
@ -1236,7 +1236,7 @@ function gen_config(var)
table.insert(domain, w)
end)
if #domain > 0 then
table.insert(dns_domain_rules, {
table.insert(dns_domain_rules, 1, {
outboundTag = "direct",
domain = domain
})

2
luci-app-passwall2/luasrc/passwall2/util_hysteria2.lua
View File

@ -87,7 +87,7 @@ function gen_config(var)
down = node.hysteria2_down_mbps and node.hysteria2_down_mbps .. " mbps" or "100 mbps"
},
fast_open = (node.fast_open == "1") and true or false,
lazy_start = (node.hysteria2_lazy_start == "1") and true or false,
lazy = (node.hysteria2_lazy_start == "1") and true or false,
socks5 = (local_socks_address and local_socks_port) and {
listen = local_socks_address .. ":" .. local_socks_port,
username = (local_socks_username and local_socks_password) and local_socks_username or nil,