diff --git a/package/ntlf9t/luci-app-clash/Makefile b/package/ntlf9t/luci-app-clash/Makefile
index f9dca789f0..dc1bf206ff 100644
--- a/package/ntlf9t/luci-app-clash/Makefile
+++ b/package/ntlf9t/luci-app-clash/Makefile
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-clash
-PKG_VERSION:=1.7.1
+PKG_VERSION:=1.7.3.2
PKG_MAINTAINER:=frainzy1477
@@ -12,7 +12,7 @@ define Package/luci-app-clash
CATEGORY:=LuCI
SUBMENU:=3. Applications
TITLE:=LuCI app for clash
- DEPENDS:=+luci-base +wget +iptables +coreutils-base64 +coreutils +coreutils-nohup +bash +ipset +libustream-openssl +curl +jsonfilter +ca-certificates +iptables-mod-tproxy
+ DEPENDS:=+luci-base +wget +iptables +coreutils-base64 +coreutils +coreutils-nohup +bash +ipset +libustream-openssl +curl +jsonfilter +ca-certificates +iptables-mod-tproxy +kmod-tun
PKGARCH:=all
MAINTAINER:=frainzy1477
endef
@@ -93,6 +93,7 @@ endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/clash
+ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/clash/provider
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/clash
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
$(INSTALL_DIR) $(1)/etc/init.d
@@ -111,7 +112,10 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/etc/clash/dtun
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/share/clashbackup
+ $(INSTALL_DIR) $(1)/usr/share/clash/provider
$(INSTALL_DIR) $(1)/etc/clash/provider
+ $(INSTALL_DIR) $(1)/etc/clash/proxyprovider
+ $(INSTALL_DIR) $(1)/etc/clash/ruleprovider
$(INSTALL_DIR) $(1)/usr/share/clash/config
$(INSTALL_DIR) $(1)/usr/share/clash/config/sub
$(INSTALL_DIR) $(1)/usr/share/clash/config/upload
@@ -120,8 +124,9 @@ define Package/$(PKG_NAME)/install
$(INSTALL_BIN) ./root/etc/init.d/clash $(1)/etc/init.d/clash
$(INSTALL_CONF) ./root/etc/config/clash $(1)/etc/config/clash
- $(INSTALL_CONF) ./root/etc/clash/* $(1)/etc/clash/
-
+ $(INSTALL_CONF) ./root/etc/clash/Country.mmdb $(1)/etc/clash/
+ $(INSTALL_CONF) ./root/etc/clash/ruleprovider/* $(1)/etc/clash/ruleprovider/
+ $(INSTALL_BIN) ./root/usr/share/clash/provider/* $(1)/usr/share/clash/provider/
$(INSTALL_BIN) ./root/usr/share/clash/*.sh $(1)/usr/share/clash/
$(INSTALL_BIN) ./root/usr/share/clash/dns.yaml $(1)/usr/share/clash/
$(INSTALL_BIN) ./root/usr/share/clash/rules/g_rules/Steam.rules $(1)/usr/share/clash/rules/g_rules
@@ -137,15 +142,16 @@ define Package/$(PKG_NAME)/install
$(INSTALL_BIN) ./root/usr/share/clash/clash.txt $(1)/usr/share/clash/
$(INSTALL_BIN) ./root/usr/share/clash/dashboard/index.html $(1)/usr/share/clash/dashboard/
- $(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.1560b07adc97ac0ac265.css $(1)/usr/share/clash/dashboard/
+ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.772fa8c97df0c4f1549a.css $(1)/usr/share/clash/dashboard/
$(INSTALL_BIN) ./root/usr/share/clash/dashboard/img/ffac0fa1d89f15922b4594863b8b32e9.png $(1)/usr/share/clash/dashboard/img/
- $(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/1.bundle.1560b07adc97ac0ac265.min.js $(1)/usr/share/clash/dashboard/js/
- $(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/bundle.1560b07adc97ac0ac265.min.js $(1)/usr/share/clash/dashboard/js/
+ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/1.bundle.772fa8c97df0c4f1549a.min.js $(1)/usr/share/clash/dashboard/js/
+ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/bundle.772fa8c97df0c4f1549a.min.js $(1)/usr/share/clash/dashboard/js/
$(INSTALL_BIN) ./root/usr/share/clash/yacd/* $(1)/usr/share/clash/yacd/
$(INSTALL_DATA) ./luasrc/clash.lua $(1)/usr/lib/lua/luci/
$(INSTALL_DATA) ./luasrc/controller/*.lua $(1)/usr/lib/lua/luci/controller/
$(INSTALL_DATA) ./luasrc/model/cbi/clash/*.lua $(1)/usr/lib/lua/luci/model/cbi/clash/
+ $(INSTALL_DATA) ./luasrc/model/cbi/clash/provider/*.lua $(1)/usr/lib/lua/luci/model/cbi/clash/provider/
$(INSTALL_DATA) ./luasrc/view/clash/* $(1)/usr/lib/lua/luci/view/clash/
$(INSTALL_DATA) ./po/zh-cn/clash.zh-cn.lmo $(1)/usr/lib/lua/luci/i18n/
endef
diff --git a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua
index 2d3726bf0d..90fb18dd2e 100644
--- a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua
+++ b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua
@@ -18,15 +18,23 @@ function index()
entry({"admin", "services", "clash", "overview"},cbi("clash/overview"),_("Overview"), 10).leaf = true
entry({"admin", "services", "clash", "client"},cbi("clash/client"),_("Client"), 20).leaf = true
- entry({"admin", "services", "clash", "import"},cbi("clash/import"),_("Import Config"), 25).leaf = true
+ entry({"admin", "services", "clash", "config"}, firstchild(),_("Config"), 25)
+ entry({"admin", "services", "clash", "config", "import"},cbi("clash/import"),_("Import Config"), 25).leaf = true
+ entry({"admin", "services", "clash", "config", "config"},cbi("clash/config"),_("Select Config"), 30).leaf = true
+
- entry({"admin", "services", "clash", "config"},cbi("clash/config"),_("Config"), 30).leaf = true
-
- entry({"admin", "services", "clash", "create"},cbi("clash/create"),_("Create Config"), 40).leaf = true
+
+ entry({"admin", "services", "clash", "config", "create"},cbi("clash/create"),_("Standard Config"), 35).leaf = true
entry({"admin", "services", "clash", "servers"},cbi("clash/servers-config"), nil).leaf = true
entry({"admin", "services", "clash", "provider"},cbi("clash/provider-config"), nil).leaf = true
entry({"admin", "services", "clash", "groups"},cbi("clash/groups"), nil).leaf = true
+ entry({"admin", "services", "clash", "config", "providers"},cbi("clash/provider/providers"),_("Provider Config"), 40).leaf = true
+ entry({"admin", "services", "clash", "proxyprovider"},cbi("clash/provider/proxy_provider"), nil).leaf = true
+ entry({"admin", "services", "clash", "ruleprovider"},cbi("clash/provider/rule_provider"), nil).leaf = true
+ entry({"admin", "services", "clash", "rules"},cbi("clash/provider/rules"), nil).leaf = true
+ entry({"admin", "services", "clash", "pgroups"},cbi("clash/provider/groups"), nil).leaf = true
+
entry({"admin", "services", "clash", "settings"}, firstchild(),_("Settings"), 50)
entry({"admin", "services", "clash", "settings", "port"},cbi("clash/port"),_("Proxy Ports"), 60).leaf = true
entry({"admin", "services", "clash", "settings", "dns"},cbi("clash/dns"),_("DNS Settings"), 70).leaf = true
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/config.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/config.lua
index 12f297da74..3715285b10 100644
--- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/config.lua
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/config.lua
@@ -89,7 +89,7 @@ if luci.sys.call("pidof clash >/dev/null") == 0 then
SYS.call("/etc/init.d/clash restart >/dev/null 2>&1 &")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash"))
else
- HTTP.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config"))
+ HTTP.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config","config"))
end
end
@@ -206,7 +206,7 @@ if luci.sys.call("pidof clash >/dev/null") == 0 then
SYS.call("/etc/init.d/clash restart >/dev/null 2>&1 &")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash"))
else
- HTTP.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config"))
+ HTTP.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config" ,"config"))
end
end
@@ -306,7 +306,7 @@ if luci.sys.call("pidof clash >/dev/null") == 0 then
SYS.call("/etc/init.d/clash restart >/dev/null 2>&1 &")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash"))
else
- HTTP.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config"))
+ HTTP.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "config"))
end
end
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/create.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/create.lua
index 8a38acaddc..da5ca820cd 100644
--- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/create.lua
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/create.lua
@@ -29,7 +29,6 @@ o.inputstyle = "reload"
o.write = function()
uci:commit("clash")
luci.sys.call("bash /usr/share/clash/rule.sh >>/usr/share/clash/clash.txt >/dev/null 2>&1 &")
- HTTP.redirect(DISP.build_url("admin", "services", "clash", "create"))
end
local rule = "/usr/share/clash/custom_rule.yaml"
@@ -117,7 +116,7 @@ o.inputtitle = translate("Save & Apply")
o.inputstyle = "apply"
o.write = function()
krk.uci:commit("clash")
- luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "create"))
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "create"))
end
o = b:option(Button,"Delete_Severs")
@@ -126,7 +125,7 @@ o.inputstyle = "reset"
o.write = function()
krk.uci:delete_all("clash", "servers", function(s) return true end)
krk.uci:commit("clash")
- luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "create"))
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "create"))
end
o = b:option(Button,"Delete_Provider")
@@ -135,7 +134,7 @@ o.inputstyle = "reset"
o.write = function()
krk.uci:delete_all("clash", "provider", function(s) return true end)
krk.uci:commit("clash")
- luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "create"))
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "create"))
end
@@ -145,7 +144,7 @@ o.inputstyle = "reset"
o.write = function()
krk.uci:delete_all("clash", "groups", function(s) return true end)
krk.uci:commit("clash")
- luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "create"))
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "create"))
end
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns.lua
index d784f94dbf..64b935654e 100644
--- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns.lua
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns.lua
@@ -38,6 +38,34 @@ cdns = s:option(Flag, "culan", translate("Enable Lan DNS"))
cdns.default = 1
cdns.description = translate("Enabling will set custom DNS Servers for Lan")
+y = s:option(ListValue, "access_control", translate("Access Control"))
+y:value("0", translate("disabled"))
+y:value("1", translate("Whitelist IPs"))
+y:value("2", translate("Blacklist Ips"))
+y.description = translate("Whitelist or Blacklist IPs to use Clash ( Only support enhanced-mode: redir-host )")
+
+
+o = s:option(DynamicList, "proxy_lan_ips", translate("Proxy Lan List"))
+o.datatype = "ipaddr"
+o.description = translate("Only selected IPs will be proxied")
+luci.ip.neighbors({ family = 4 }, function(entry)
+ if entry.reachable then
+ o:value(entry.dest:string())
+ end
+end)
+o:depends("access_control", 1)
+
+
+o = s:option(DynamicList, "reject_lan_ips", translate("Bypass Lan List"))
+o.datatype = "ipaddr"
+o.description = translate("Selected IPs will not be proxied")
+luci.ip.neighbors({ family = 4 }, function(entry)
+ if entry.reachable then
+ o:value(entry.dest:string())
+ end
+end)
+o:depends("access_control", 2)
+
dns = s:option(DynamicList, "landns", translate("Lan DNS servers"))
dns.description = translate("Set custom DNS Servers for Lan")
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/port.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/port.lua
index abd9060553..16f574b941 100644
--- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/port.lua
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/port.lua
@@ -75,6 +75,7 @@ o = s:option(ListValue, "p_mode", translate("Proxy Mode"))
o.description = translate("Choose proxy mode")
o:value("Rule", translate("RULE"))
o:value("Global", translate("GLOBAL"))
+o:value("Script", translate("SCRIPT"))
o:value("Direct", translate("DIRECT"))
o.default = "Rule"
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/groups.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/groups.lua
new file mode 100644
index 0000000000..3e2a862ff8
--- /dev/null
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/groups.lua
@@ -0,0 +1,88 @@
+
+local m, s, o
+local clash = "clash"
+local uci = luci.model.uci.cursor()
+local fs = require "nixio.fs"
+local sys = require "luci.sys"
+local sid = arg[1]
+
+
+m = Map(clash, translate("Edit Group"))
+m.pageaction = false
+m.redirect = luci.dispatcher.build_url("admin/services/clash/config/providers")
+if m.uci:get(clash, sid) ~= "pgroups" then
+ luci.http.redirect(m.redirect)
+ return
+end
+
+-- [[ Groups Setting ]]--
+s = m:section(NamedSection, sid, "pgroups")
+s.anonymous = true
+s.addremove = false
+
+o = s:option(ListValue, "type", translate("Group Type"))
+o.rmempty = true
+o.description = translate("Choose The Operation Mode")
+o:value("select", translate("Select"))
+o:value("url-test", translate("URL-Test"))
+o:value("fallback", translate("Fallback"))
+o:value("load-balance", translate("Load-Balance"))
+o:value("relay", translate("Relay"))
+
+o = s:option(Value, "name", translate("Group Name"))
+o.rmempty = false
+
+o = s:option(Value, "test_url", translate("Test URL"))
+o.default = "http://www.gstatic.com/generate_204"
+o.rmempty = true
+o:depends("type", "url-test")
+o:depends("type", "fallback")
+o:depends("type", "load-balance")
+
+o = s:option(Value, "test_interval", translate("Test Interval(s)"))
+o.default = "300"
+o.rmempty = true
+o:depends("type", "url-test")
+o:depends("type", "fallback")
+o:depends("type", "load-balance")
+
+o = s:option(DynamicList, "other_group", translate("Other Group"))
+o.rmempty = true
+o.description = translate("Proxy Groups Must Exist In Rule")
+o:value("", translate("None"))
+uci:foreach("clash", "pgroups",
+ function(s)
+ if s.name ~= "" and s.name ~= nil and s.name ~= m.uci:get(clash, sid, "name") then
+ o:value(s.name)
+ end
+ end)
+o:value("DIRECT")
+o:value("REJECT")
+
+
+local t = {
+ {Apply, Return}
+}
+
+b = m:section(Table, t)
+
+o = b:option(Button,"Apply")
+o.inputtitle = translate("Save & Apply")
+o.inputstyle = "apply"
+o.write = function()
+ m.uci:commit("clash")
+ sys.call("/usr/share/clash/provider/pgroups.sh start >/dev/null 2>&1 &")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+o = b:option(Button,"Return")
+o.inputtitle = translate("Back to Overview")
+o.inputstyle = "reset"
+o.write = function()
+ m.uci:revert(clash)
+ luci.http.redirect(m.redirect)
+ --luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+
+return m
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/providers.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/providers.lua
new file mode 100644
index 0000000000..7ce2483659
--- /dev/null
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/providers.lua
@@ -0,0 +1,251 @@
+local NXFS = require "nixio.fs"
+local SYS = require "luci.sys"
+local HTTP = require "luci.http"
+local DISP = require "luci.dispatcher"
+local UTIL = require "luci.util"
+local fs = require "luci.clash"
+local uci = require "luci.model.uci".cursor()
+local s, o, krk, z, r
+local clash = "clash"
+local http = luci.http
+
+
+krk = Map(clash)
+s = krk:section(TypedSection, "clash", translate("Provider Config"))
+s.anonymous = true
+krk.pageaction = false
+
+o = s:option(Flag, "provider_config", translate("Enable Create"))
+o.default = 1
+o.description = translate("Enable to create configuration")
+
+o = s:option(Flag, "ppro", translate("Use Proxy Provider"))
+o.description = translate("Use Proxy Provider")
+
+o = s:option(Flag, "rulprp", translate("Use Rule Provider"))
+o.description = translate("Use Rule Provider")
+
+o = s:option(Flag, "rul", translate("Use Rules"))
+o.description = translate("Use Rules")
+
+o = s:option(Flag, "script", translate("Use Script"))
+o.description = translate("Use Script")
+
+
+o = s:option(Value, "name_tag")
+o.title = translate("Config Name")
+o.rmempty = true
+o.description = translate("Give a name for your config")
+
+
+
+local t = {
+ {Creat_Config, Apply, Delete_Groups, Delete_ProxyPro, Delete_RulePro,Delete_Rules}
+}
+
+b = krk:section(Table, t)
+
+
+o = b:option(Button,"Creat_Config")
+o.inputtitle = translate("Create Config")
+o.inputstyle = "apply"
+o.write = function()
+ krk.uci:commit("clash")
+ luci.sys.call("bash /usr/share/clash/provider/provider.sh >/dev/null 2>&1 &")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash"))
+end
+
+o = b:option(Button,"Apply")
+o.inputtitle = translate("Save & Apply")
+o.inputstyle = "apply"
+o.write = function()
+ krk.uci:commit("clash")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+o = b:option(Button,"Delete_ProxyPro")
+o.inputtitle = translate("Delete Proxy Provider")
+o.inputstyle = "reset"
+o.write = function()
+ krk.uci:delete_all("clash", "proxyprovider", function(s) return true end)
+ krk.uci:commit("clash")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+o = b:option(Button,"Delete_RulePro")
+o.inputtitle = translate("Delete Rule Provider")
+o.inputstyle = "reset"
+o.write = function()
+ krk.uci:delete_all("clash", "ruleprovider", function(s) return true end)
+ krk.uci:commit("clash")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+
+o = b:option(Button,"Delete_Rules")
+o.inputtitle = translate("Delete Rules")
+o.inputstyle = "reset"
+o.write = function()
+ krk.uci:delete_all("clash", "rules", function(s) return true end)
+ krk.uci:commit("clash")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+o = b:option(Button,"Delete_Groups")
+o.inputtitle = translate("Delete Groups")
+o.inputstyle = "reset"
+o.write = function()
+ krk.uci:delete_all("clash", "pgroups", function(s) return true end)
+ krk.uci:commit("clash")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+-- [[ Groups Manage ]]--
+x = krk:section(TypedSection, "pgroups", translate("Policy Groups"))
+x.anonymous = true
+x.addremove = true
+x.sortable = true
+x.template = "cbi/tblsection"
+x.extedit = luci.dispatcher.build_url("admin/services/clash/pgroups/%s")
+function x.create(...)
+ local sid = TypedSection.create(...)
+ if sid then
+ luci.http.redirect(x.extedit % sid)
+ return
+ end
+end
+
+o = x:option(DummyValue, "type", translate("Group Type"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+
+o = x:option(DummyValue, "name", translate("Group Name"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+
+-- [[ Proxy-Provider Manage ]]--
+z = krk:section(TypedSection, "proxyprovider", translate("Proxy Provider"))
+z.anonymous = true
+z.addremove = true
+z.sortable = true
+z.template = "cbi/tblsection"
+z.extedit = luci.dispatcher.build_url("admin/services/clash/proxyprovider/%s")
+function z.create(...)
+ local sid = TypedSection.create(...)
+ if sid then
+ luci.http.redirect(z.extedit % sid)
+ return
+ end
+end
+
+
+o = z:option(DummyValue, "name", translate("Provider Name"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+o = z:option(DummyValue, "type", translate("Provider Type"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+
+
+
+
+-- [[ Rule-Provider Manage ]]--
+r = krk:section(TypedSection, "ruleprovider", translate("Rule Provider"))
+r.anonymous = true
+r.addremove = true
+r.sortable = true
+r.template = "cbi/tblsection"
+r.extedit = luci.dispatcher.build_url("admin/services/clash/ruleprovider/%s")
+function r.create(...)
+ local sid = TypedSection.create(...)
+ if sid then
+ luci.http.redirect(r.extedit % sid)
+ return
+ end
+end
+
+
+o = r:option(DummyValue, "name", translate("Provider Name"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+o = r:option(DummyValue, "type", translate("Provider Type"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+o = r:option(DummyValue, "behavior", translate("Provider Behavior"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+
+-- [[ Rule Manage ]]--
+q = krk:section(TypedSection, "rules", translate("Rules"))
+q.anonymous = true
+q.addremove = true
+q.sortable = true
+q.template = "cbi/tblsection"
+q.extedit = luci.dispatcher.build_url("admin/services/clash/rules/%s")
+function q.create(...)
+ local sid = TypedSection.create(...)
+ if sid then
+ luci.http.redirect(q.extedit % sid)
+ return
+ end
+end
+
+o = q:option(DummyValue, "type", translate("Rule Type"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+o = q:option(DummyValue, "rulename", translate("Description"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("-")
+end
+
+
+o = q:option(DummyValue, "rulegroups", translate("Groups"))
+function o.cfgvalue(...)
+ return Value.cfgvalue(...) or translate("None")
+end
+
+
+m = Map("clash")
+y = m:section(TypedSection, "clash" , translate("Script"))
+y.anonymous = true
+y.addremove=false
+m.pageaction = false
+
+local script="/usr/share/clash/provider/script.yaml"
+sev = y:option(TextValue, "scriptt")
+sev.description = translate("NB: Set Clash Mode to Script if want to use")
+sev.rows = 10
+sev.wrap = "off"
+sev.cfgvalue = function(self, section)
+ return NXFS.readfile(script) or ""
+end
+sev.write = function(self, section, value)
+ NXFS.writefile(script, value:gsub("\r\n", "\n"))
+end
+
+o = y:option(Button,"Apply")
+o.inputtitle = translate("Save & Apply")
+o.inputstyle = "apply"
+o.write = function()
+ m.uci:commit("clash")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+return krk,m
+
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/proxy_provider.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/proxy_provider.lua
new file mode 100644
index 0000000000..1458e4c97d
--- /dev/null
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/proxy_provider.lua
@@ -0,0 +1,160 @@
+
+local m, s, o
+local clash = "clash"
+local uci = luci.model.uci.cursor()
+local fs = require "nixio.fs"
+local sys = require "luci.sys"
+local sid = arg[1]
+local http = luci.http
+local fss = require "luci.clash"
+
+function IsYamlFile(e)
+ e=e or""
+ local e=string.lower(string.sub(e,-5,-1))
+ return e == ".yaml"
+end
+function IsYmlFile(e)
+ e=e or""
+ local e=string.lower(string.sub(e,-4,-1))
+ return e == ".yml"
+end
+
+
+m = Map(clash, translate("Edit Proxy Provider"))
+m.pageaction = false
+m.redirect = luci.dispatcher.build_url("admin/services/clash/config/providers")
+if m.uci:get(clash, sid) ~= "proxyprovider" then
+ luci.http.redirect(m.redirect)
+ return
+end
+
+s = m:section(NamedSection, sid, "proxyprovider")
+s.anonymous = true
+s.addremove = false
+
+o = s:option(ListValue, "type", translate("Provider Type"))
+o.rmempty = false
+o.description = translate("Provider Type")
+o:value("http")
+o:value("file")
+
+o = s:option(FileUpload, "",translate("Upload Provider File"))
+o.title = translate("Provider File")
+o.template = "clash/clash_upload"
+o:depends("type", "file")
+um = s:option(DummyValue, "", nil)
+um.template = "clash/clash_dvalue"
+
+local dir, fd
+dir = "/etc/clash/proxyprovider/"
+http.setfilehandler(
+ function(meta, chunk, eof)
+ if not fd then
+ if not meta then return end
+
+ if meta and chunk then fd = nixio.open(dir .. meta.file, "w") end
+
+ if not fd then
+ um.value = translate("upload file error.")
+ return
+ end
+ end
+ if chunk and fd then
+ fd:write(chunk)
+ end
+ if eof and fd then
+ fd:close()
+ fd = nil
+ um.value = translate("File saved to") .. ' "/etc/clash/proxyprovider/"'
+ end
+ end
+)
+
+if luci.http.formvalue("upload") then
+ local f = luci.http.formvalue("ulfile")
+ if #f <= 0 then
+ um.value = translate("No specify upload file.")
+ end
+end
+
+
+
+o = s:option(Value, "name", translate("Provider Name"))
+o.rmempty = false
+
+
+o = s:option(ListValue, "path", translate("Provider Path"))
+o.description = translate("Upload Provider File If Empty")
+local p,h={}
+for t,f in ipairs(fss.glob("/etc/clash/proxyprovider/*"))do
+ h=fss.stat(f)
+ if h then
+ p[t]={}
+ p[t].name=fss.basename(f)
+ if IsYamlFile(p[t].name) or IsYmlFile(p[t].name) then
+ o:value("./proxyprovider/"..p[t].name)
+ end
+ end
+end
+o.rmempty = true
+o:depends("type", "file")
+
+
+o = s:option(Value, "provider_url", translate("Provider URL"))
+o.description = translate("【HTTP】./hk.yaml")
+o.rmempty = true
+o:depends("type", "http")
+
+o = s:option(Value, "provider_interval", translate("Provider Interval"))
+o.default = "3600"
+o.rmempty = true
+o:depends("type", "http")
+
+o = s:option(ListValue, "health_check", translate("Provider Health Check"))
+o:value("false", translate("Disable"))
+o:value("true", translate("Enable"))
+o.default=true
+
+o = s:option(Value, "health_check_url", translate("Health Check URL"))
+o.default = "http://www.gstatic.com/generate_204"
+o.rmempty = true
+
+o = s:option(Value, "health_check_interval", translate("Health Check Interval"))
+o.default = "300"
+o.rmempty = true
+
+o = s:option(DynamicList, "pgroups", translate("Policy Group"))
+o.rmempty = true
+m.uci:foreach("clash", "pgroups",
+ function(s)
+ if s.name ~= "" and s.name ~= nil and s.type ~= "relay" then
+ o:value(s.name)
+ end
+ end)
+
+
+local t = {
+ {Apply, Return}
+}
+
+b = m:section(Table, t)
+
+o = b:option(Button,"Apply")
+o.inputtitle = translate("Save & Apply")
+o.inputstyle = "apply"
+o.write = function()
+ m.uci:commit("clash")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+o = b:option(Button,"Return")
+o.inputtitle = translate("Back to Overview")
+o.inputstyle = "reset"
+o.write = function()
+ m.uci:revert(clash)
+ luci.http.redirect(m.redirect)
+ --luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+
+return m
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/rule_provider.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/rule_provider.lua
new file mode 100644
index 0000000000..505c12b919
--- /dev/null
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/rule_provider.lua
@@ -0,0 +1,150 @@
+
+local m, s, o
+local clash = "clash"
+local uci = luci.model.uci.cursor()
+local fs = require "nixio.fs"
+local sys = require "luci.sys"
+local sid = arg[1]
+local http = luci.http
+local fss = require "luci.clash"
+
+function IsYamlFile(e)
+ e=e or""
+ local e=string.lower(string.sub(e,-5,-1))
+ return e == ".yaml"
+end
+function IsYmlFile(e)
+ e=e or""
+ local e=string.lower(string.sub(e,-4,-1))
+ return e == ".yml"
+end
+function IsFile(e)
+ e=e or""
+ local e=string.lower(string.sub(e,-5,-1))
+ return e == ".list"
+end
+
+
+m = Map(clash, translate("Edit Rule Provider"))
+m.pageaction = false
+m.redirect = luci.dispatcher.build_url("admin/services/clash/config/providers")
+if m.uci:get(clash, sid) ~= "ruleprovider" then
+ luci.http.redirect(m.redirect)
+ return
+end
+
+s = m:section(NamedSection, sid, "ruleprovider")
+s.anonymous = true
+s.addremove = false
+
+o = s:option(Value, "name", translate("Rule Provider Name"))
+o.rmempty = false
+
+o = s:option(ListValue, "type", translate("Provider Type"))
+o.rmempty = false
+o.description = translate("Provider Type")
+o:value("http")
+o:value("file")
+
+
+o = s:option(ListValue, "behavior", translate("Provider Behavior"))
+o.rmempty = false
+o.description = translate("ipcidr # or domain")
+o:value("ipcidr")
+o:value("domain")
+
+
+o = s:option(FileUpload, "",translate("Upload Provider File"))
+o.title = translate("Provider File")
+o.template = "clash/clash_upload"
+o:depends("type", "file")
+um = s:option(DummyValue, "", nil)
+um.template = "clash/clash_dvalue"
+
+local dir, fd
+dir = "/etc/clash/ruleprovider/"
+http.setfilehandler(
+ function(meta, chunk, eof)
+ if not fd then
+ if not meta then return end
+
+ if meta and chunk then fd = nixio.open(dir .. meta.file, "w") end
+
+ if not fd then
+ um.value = translate("upload file error.")
+ return
+ end
+ end
+ if chunk and fd then
+ fd:write(chunk)
+ end
+ if eof and fd then
+ fd:close()
+ fd = nil
+ um.value = translate("File saved to") .. ' "/etc/clash/ruleprovider/"'
+ end
+ end
+)
+
+if luci.http.formvalue("upload") then
+ local f = luci.http.formvalue("ulfile")
+ if #f <= 0 then
+ um.value = translate("No specify upload file.")
+ end
+end
+
+
+
+
+
+o = s:option(ListValue, "path", translate("Provider Path"))
+o.description = translate("Upload Provider File If Empty")
+local p,h={}
+for t,f in ipairs(fss.glob("/etc/clash/ruleprovider/*"))do
+ h=fss.stat(f)
+ if h then
+ p[t]={}
+ p[t].name=fss.basename(f)
+ if IsYamlFile(p[t].name) or IsYmlFile(p[t].name) or IsFile(p[t].name) then
+ o:value("./ruleprovider/"..p[t].name)
+ end
+ end
+end
+o:depends("type", "file")
+
+
+o = s:option(Value, "url", translate("Provider URL"))
+o.description = translate("【HTTP】./hk.yaml")
+o:depends("type", "http")
+
+o = s:option(Value, "interval", translate("Provider Interval"))
+o.default = "3600"
+o:depends("type", "http")
+
+
+
+local t = {
+ {Apply, Return}
+}
+
+b = m:section(Table, t)
+
+o = b:option(Button,"Apply")
+o.inputtitle = translate("Save & Apply")
+o.inputstyle = "apply"
+o.write = function()
+ m.uci:commit("clash")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+o = b:option(Button,"Return")
+o.inputtitle = translate("Back to Overview")
+o.inputstyle = "reset"
+o.write = function()
+ m.uci:revert(clash)
+ luci.http.redirect(m.redirect)
+ --luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+
+return m
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/rules.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/rules.lua
new file mode 100644
index 0000000000..7819d05140
--- /dev/null
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/provider/rules.lua
@@ -0,0 +1,110 @@
+local m, s, o
+local clash = "clash"
+local uci = luci.model.uci.cursor()
+local fs = require "nixio.fs"
+local sys = require "luci.sys"
+local sid = arg[1]
+
+
+m = Map(clash, translate("Edit Rules"))
+--m.pageaction = false
+m.redirect = luci.dispatcher.build_url("admin/services/clash/config/providers")
+if m.uci:get(clash, sid) ~= "rules" then
+ luci.http.redirect(m.redirect)
+ return
+end
+
+
+s = m:section(NamedSection, sid, "rules")
+s.anonymous = true
+s.addremove = false
+m.pageaction = false
+
+o = s:option(ListValue, "type", translate("Rule Type"))
+o.rmempty = false
+o.description = translate("Choose Type")
+o:value("RULE-SET", translate("RULE-SET"))
+o:value("DST-PORT", translate("DST-PORT"))
+o:value("SRC-PORT", translate("SRC-PORT"))
+o:value("SRC-IP-CIDR", translate("SRC-IP-CIDR"))
+o:value("IP-CIDR", translate("IP-CIDR"))
+o:value("DOMAIN", translate("DOMAIN"))
+o:value("DOMAIN-KEYWORD", translate("DOMAIN-KEYWORD"))
+o:value("DOMAIN-SUFFIX", translate("DOMAIN-SUFFIX"))
+o:value("GEOIP", translate("GEOIP"))
+o:value("MATCH", translate("MATCH"))
+
+
+o = s:option(ListValue, "rulename", translate("Description"))
+uci:foreach("clash", "ruleprovider",
+ function(s)
+ if s.name ~= "" and s.name ~= nil then
+ o:value(s.name)
+ end
+ end)
+o.description = translate("Select rule provider name")
+o:depends("type", "RULE-SET")
+
+
+o = s:option(ListValue, "rulegroups", translate("Select Proxy Group"))
+uci:foreach("clash", "pgroups",
+ function(s)
+ if s.name ~= "" and s.name ~= nil then
+ o:value(s.name)
+ end
+ end)
+o:value("DIRECT")
+o:value("REJECT")
+o.description = translate("Select a policy group to add rule")
+
+
+
+o = s:option(Value, "rulenamee", translate("Description"))
+o:depends("type", "DST-PORT")
+o:depends("type", "SRC-PORT")
+o:depends("type", "SRC-IP-CIDR")
+o:depends("type", "IP-CIDR")
+o:depends("type", "DOMAIN")
+o:depends("type", "DOMAIN-KEYWORD")
+o:depends("type", "DOMAIN-SUFFIX")
+o:depends("type", "GEOIP")
+
+o = s:option(Flag, "res", translate("No Resolve"))
+o.default = 0
+--o:value("RULE-SET", translate("RULE-SET"))
+o:depends("type", "DST-PORT")
+o:depends("type", "SRC-PORT")
+o:depends("type", "SRC-IP-CIDR")
+o:depends("type", "IP-CIDR")
+o:depends("type", "DOMAIN")
+o:depends("type", "DOMAIN-KEYWORD")
+o:depends("type", "DOMAIN-SUFFIX")
+o:depends("type", "GEOIP")
+
+
+local t = {
+ {Apply, Return}
+}
+
+b = m:section(Table, t)
+
+o = b:option(Button,"Apply")
+o.inputtitle = translate("Save & Apply")
+o.inputstyle = "apply"
+o.write = function()
+ m.uci:commit("clash")
+ sys.call("/usr/share/clash/provider/rules.sh start >/dev/null 2>&1 &")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+o = b:option(Button,"Return")
+o.inputtitle = translate("Back to Overview")
+o.inputstyle = "reset"
+o.write = function()
+ m.uci:revert(clash)
+ luci.http.redirect(m.redirect)
+ --luci.http.redirect(luci.dispatcher.build_url("admin", "services", "clash", "config", "providers"))
+end
+
+
+return m
diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update.lua
index b39626e02e..f3f755983c 100644
--- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update.lua
+++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update.lua
@@ -24,7 +24,7 @@ sul.addremove=false
o = sul:option(FileUpload, "")
o.description =''..font_red..bold_on..translate("Manually download, unzip and rename clash core from links below and upload")..bold_off..font_off..' '
.."
"
-..translate("Dreamacro clash tun core (dtun) - (https://github.com/Dreamacro/clash/releases/tag/TUN)")
+..translate("Dreamacro clash tun core (dtun) - (https://github.com/Dreamacro/clash/releases/tag/premium)")
.."
"
..translate("comzyh clash tun core (ctun) - (https://github.com/comzyh/clash/releases)")
.."
"
@@ -33,8 +33,7 @@ o.description =''..font_red..bold_on..translate("Manually download, unzip and re
..translate("Frainzy1477 clashr core - (https://github.com/frainzy1477/clashrdev/releases)")
.."
"
..translate("Frainzy1477 clash core - (https://github.com/frainzy1477/clash_dev/releases)")
-.."
"
-..translate("Frainzy1477 clash(ctun) core - (https://github.com/frainzy1477/clashtun/releases)")
+
o.title = translate(" ")
o.template = "clash/upload_core"
@@ -118,7 +117,7 @@ o = s:option(ListValue, "dcore", translate("Core Type"))
o.default = "clashcore"
o:value("1", translate("Clash"))
o:value("2", translate("Clashr"))
-o:value("3", translate("Clash(ctun)"))
+--o:value("3", translate("Clash(ctun)"))
o.description = translate("Select core, clashr support ssr while clash does not.")
diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm
index ade51ce68c..4e49b14d11 100644
--- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm
+++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm
@@ -1,3 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+