Merge pull request #217 from frainzy1477/test

merge

Author: frainzy1477

Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk 
 
 PKG_NAME:=luci-app-clash
-PKG_VERSION:=1.6.3
+PKG_VERSION:=1.6.4
 PKG_MAINTAINER:=frainzy1477
 
 
@@ -12,7 +12,7 @@ define Package/luci-app-clash
 	CATEGORY:=LuCI
 	SUBMENU:=2. Clash
 	TITLE:=LuCI app for clash
-	DEPENDS:=+luci +luci-base +wget +iptables +coreutils-base64 +coreutils +coreutils-nohup +bash +ipset +libustream-openssl +libopenssl +openssl-util +curl +jsonfilter +ca-certificates +iptables-mod-tproxy
+	DEPENDS:=+luci +luci-base +wget +iptables +coreutils-base64 +coreutils +coreutils-nohup +bash +ipset +libustream-openssl +openssl-util +curl +jsonfilter +ca-certificates +iptables-mod-tproxy
 	PKGARCH:=all
 	MAINTAINER:=frainzy1477
 endef
@@ -141,10 +141,10 @@ 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.9ba3dbeae71a3cb9926b.css $(1)/usr/share/clash/dashboard/
+	$(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.ad0717ae3407e246a9ab.css $(1)/usr/share/clash/dashboard/
 	$(INSTALL_BIN) ./root/usr/share/clash/dashboard/img/33343e6117c37aaef8886179007ba6b5.png $(1)/usr/share/clash/dashboard/img/
-	$(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/1.bundle.9ba3dbeae71a3cb9926b.min.js $(1)/usr/share/clash/dashboard/js/
-	$(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/bundle.9ba3dbeae71a3cb9926b.min.js $(1)/usr/share/clash/dashboard/js/
+	$(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/1.bundle.ad0717ae3407e246a9ab.min.js $(1)/usr/share/clash/dashboard/js/
+	$(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/bundle.ad0717ae3407e246a9ab.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/

README.md

@@ -8,8 +8,8 @@
 	A rule based custom proxy for Openwrt based on <a href="https://github.com/Dreamacro/clash" target="_blank">Clash</a>.
   </p>
   <p align="center">
-  <a target="_blank" href="https://github.com/frainzy1477/luci-app-clash/releases/tag/v1.6.3">
-    <img src="https://img.shields.io/badge/luci%20for%20clash-v1.6.3-blue.svg"> 	  
+  <a target="_blank" href="https://github.com/frainzy1477/luci-app-clash/releases/tag/v1.6.4">
+    <img src="https://img.shields.io/badge/luci%20for%20clash-v1.6.4-blue.svg"> 	  
   </a>
   <!-- <a href="https://github.com/frainzy1477/luci-app-clash/releases" target="_blank">
         <img src="https://img.shields.io/github/downloads/frainzy1477/luci-app-clash/total.svg?style=flat-square"/>
@@ -22,8 +22,8 @@
 
 - cd /tmp
 - opkg update
-- opkg install luci-app-clash_1.6.3_all.ipk  
-- opkg install luci-app-clash_1.6.3_all.ipk --force-depends
+- opkg install luci-app-clash_1.6.4_all.ipk  
+- opkg install luci-app-clash_1.6.4_all.ipk --force-depends
 
 ## Features
 
@@ -32,6 +32,8 @@
 - Iptables udp redirect
 - IP Query / Website Access Check
 - DNS Forwarding
+- Support Trojan
+- Support SSR
 - Ping Custom proxy servers
 - Create v2ray & ssr clash config from subscription url
 - Create Custom Clash Config

luasrc/controller/clash.lua

@@ -334,7 +334,7 @@ end
 function act_ping()
 	local e={}
 	e.index=luci.http.formvalue("index")
-	e.ping=luci.sys.exec("ping -c 1 -W 1 -w 10 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'"%luci.http.formvalue("domain"))
+	e.ping=luci.sys.exec("ping -c 1 -W 1 -w 5 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'"%luci.http.formvalue("domain"))
 	luci.http.prepare_content("application/json")
 	luci.http.write_json(e)
 end

luasrc/model/cbi/clash/client.lua

@@ -29,12 +29,6 @@ o:value("4", translate("Clash(dTun)"))
 end
 o.description = translate("Select core, clashr support ssr while clash does not.")
 
-
-o = s:option(ListValue, "new_conf", translate("New Config(Rename fields)"))
-o:value("0", translate("Disable"))
-o:value("1", translate("Enable"))
-o.description = translate("https://github.com/Dreamacro/clash/commit/88d8f937938d7aba774b1af638df6910b1a1a14d")
-
 o = s:option(ListValue, "g_rules", translate("Game Rules"))
 o.default = "0"
 o:value("0", translate("Disable"))

luasrc/model/cbi/clash/create.lua

@@ -71,11 +71,6 @@ o.title = translate("Config Name")
 o.rmempty = true
 o.description = translate("Give a name for your config")
 
-o = s:option(ListValue, "new_conff", translate("New Config(Rename fields)"))
-o:value("0", translate("Disable"))
-o:value("1", translate("Enable"))
-o.description = translate("https://github.com/Dreamacro/clash/commit/88d8f937938d7aba774b1af638df6910b1a1a14d")
-
 cc = s:option(Flag, "same_tag", translate("Force Same Name"))
 cc.default = 1
 cc.description = translate("Enable to overwrite config file")

luasrc/model/cbi/clash/dns.lua

@@ -37,7 +37,7 @@ deldns.description = translate("Remove Lan custom DNS Servers when client is dis
 cdns = s:option(Flag, "culan", translate("Enable Lan DNS"))
 cdns.default = 1
 cdns.description = translate("Enabling will set custom DNS Servers for Lan")
-cdns:depends("dnsforwader", 0)
+
 
 dns = s:option(DynamicList, "landns", translate("Lan DNS servers"))
 dns.description = translate("Set custom DNS Servers for Lan")

luasrc/model/cbi/clash/groups.lua

@@ -27,6 +27,7 @@ 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

luasrc/model/cbi/clash/import.lua

@@ -87,7 +87,7 @@ sul =ko:section(TypedSection, "clash", translate("Upload Config"))
 sul.anonymous = true
 sul.addremove=false
 o = sul:option(FileUpload, "")
-o.description = translate("NB: Only upload file with name .yaml.It recommended to rename each upload file name to avoid overwrite")
+--o.description = translate("NB: Only upload file with name .yaml.It recommended to rename each upload file name to avoid overwrite")
 o.title = translate("  ")
 o.template = "clash/clash_upload"
 um = sul:option(DummyValue, "", nil)
@@ -96,6 +96,7 @@ um.template = "clash/clash_dvalue"
 local dir, fd
 dir = "/usr/share/clash/config/upload/"
 http.setfilehandler(
+
 	function(meta, chunk, eof)
 		if not fd then
 			if not meta then return end
@@ -113,9 +114,15 @@ http.setfilehandler(
 		if eof and fd then
 			fd:close()
 			fd = nil
+			local e=string.lower(string.sub(meta.file,-4,-1))
+			local yml2=string.lower(string.sub(meta.file,0,-5))
+			if e == '.yml'  then
 			local yml=string.lower(string.sub(meta.file,0,-5))
 			local c=fs.rename(dir .. meta.file,"/usr/share/clash/config/upload/".. yml .. ".yaml")
 			um.value = translate("File saved to") .. ' "/usr/share/clash/config/upload/'..yml..'.yaml"'
+			else
+			um.value = translate("File saved to") .. ' "/usr/share/clash/config/upload/'..yml2..'yaml"'
+			end
 
 		end
 	end

luasrc/model/cbi/clash/other.lua

@@ -62,23 +62,10 @@ end
 
 
 w = Map("clash")
-s = w:section(TypedSection, "clash" , translate("New Config(Rename fields)"))
+s = w:section(TypedSection, "clash" , translate("Load Groups)"))
 s.anonymous = true
 
 
-o = s:option(ListValue, "new_conff", translate("New Config(Rename fields)"))
-o:value("0", translate("Disable"))
-o:value("1", translate("Enable"))
-o.description = translate("https://github.com/Dreamacro/clash/commit/88d8f937938d7aba774b1af638df6910b1a1a14d")
-
-o=s:option(Button,"nwewcf")
-o.inputtitle = translate("Save & Apply")
-o.title = translate("Save & Apply")
-o.inputstyle = "reload"
-o.write = function()
-  w.uci:commit("clash")
-end
-
 o = s:option(Button, "Load") 
 o.inputtitle = translate("Load Groups")
 o.title = translate("Load Groups")

luasrc/model/cbi/clash/provider-config.lua

@@ -132,7 +132,9 @@ o = s:option(DynamicList, "groups", translate("Policy Group"))
 o.rmempty = true
 m.uci:foreach("clash", "groups",
 		function(s)
-			o:value(s.name)
+			if s.name ~= "" and s.name ~= nil and s.type ~= "relay" then
+			   o:value(s.name)
+			end
 		end)