[pull] master from vernesong:master

README.md

@@ -8,11 +8,11 @@
 	<a target="_blank" href="https://github.com/Dreamacro/clash/releases/tag/v1.3.0">
     <img src="https://img.shields.io/badge/Clash-v1.3.0-blue.svg">
   </a>
-  <a target="_blank" href="https://github.com/vernesong/OpenClash/tree/v0.41.08-beta">
-    <img src="https://img.shields.io/badge/source code-v0.41.08--beta-green.svg">
+  <a target="_blank" href="https://github.com/vernesong/OpenClash/tree/v0.41.10-beta">
+    <img src="https://img.shields.io/badge/source code-v0.41.10--beta-green.svg">
   </a>
-  <a target="_blank" href="https://github.com/vernesong/OpenClash/releases/tag/v0.41.08-beta">
-    <img src="https://img.shields.io/badge/New Release-v0.41.08--beta-orange.svg">
+  <a target="_blank" href="https://github.com/vernesong/OpenClash/releases/tag/v0.41.10-beta">
+    <img src="https://img.shields.io/badge/New Release-v0.41.10--beta-orange.svg">
   </a>
   </p>
 

luci-app-openclash/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-openclash
-PKG_VERSION:=0.41.08
+PKG_VERSION:=0.41.10
 PKG_RELEASE:=beta
 PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>
 

luci-app-openclash/luasrc/controller/openclash.lua

@@ -39,7 +39,8 @@ function index()
 	entry({"admin", "services", "openclash", "switch_mode"}, call("action_switch_mode"))
 	entry({"admin", "services", "openclash", "op_mode"}, call("action_op_mode"))
 	entry({"admin", "services", "openclash", "settings"},cbi("openclash/settings"),_("Global Settings"), 30).leaf = true
-	entry({"admin", "services", "openclash", "servers"},cbi("openclash/servers"),_("Severs and Groups"), 40).leaf = true
+	entry({"admin", "services", "openclash", "servers"},cbi("openclash/servers"),_("Servers and Groups"), 40).leaf = true
+	entry({"admin", "services", "openclash", "other-rules-edit"},cbi("openclash/other-rules-edit"), nil).leaf = true
 	entry({"admin", "services", "openclash", "rule-providers-settings"},cbi("openclash/rule-providers-settings"),_("Rule Providers and Groups"), 50).leaf = true
 	entry({"admin", "services", "openclash", "game-rules-manage"},form("openclash/game-rules-manage"), nil).leaf = true
 	entry({"admin", "services", "openclash", "rule-providers-manage"},form("openclash/rule-providers-manage"), nil).leaf = true

luci-app-openclash/luasrc/model/cbi/openclash/config-subscribe-edit.lua

@@ -47,10 +47,8 @@ o.datatype = "or(host, string)"
 o.rmempty = false
 
 ---- subconverter
-o = s:option(ListValue, "sub_convert", translate("Subscribe Convert Online"))
+o = s:option(Flag, "sub_convert", translate("Subscribe Convert Online"))
 o.description = translate("Convert Subscribe Online With Template, Mix Proxies and Keep Settings options Will Not Effect")
-o:value("0", translate("Disable"))
-o:value("1", translate("Enable"))
 o.default=0
 
 ---- Template

luci-app-openclash/luasrc/model/cbi/openclash/config-subscribe.lua

@@ -21,10 +21,8 @@ s = m:section(TypedSection, "openclash")
 s.anonymous = true
 
 ---- update Settings
-o = s:option(ListValue, "auto_update", translate("Auto Update"))
+o = s:option(Flag, "auto_update", translate("Auto Update"))
 o.description = translate("Auto Update Server subscription")
-o:value("0", translate("Disable"))
-o:value("1", translate("Enable"))
 o.default=0
 
 o = s:option(ListValue, "config_auto_update_mode", translate("Update Mode"))
@@ -131,7 +129,7 @@ o.write = function()
 		function(s)
 		  if s.name ~= "" and s.name ~= nil and s.enabled == "1" then
 			   local back_cfg_path_yaml="/etc/openclash/backup/" .. s.name .. ".yaml"
-			   local back_cfg_path_yml="/etc/openclash/backup/" .. s.name .. ".yaml"
+			   local back_cfg_path_yml="/etc/openclash/backup/" .. s.name .. ".yml"
 			   fs.unlink(back_cfg_path_yaml)
 			   fs.unlink(back_cfg_path_yml)
 			end

luci-app-openclash/luasrc/model/cbi/openclash/other-rules-edit.lua

@@ -0,0 +1,275 @@
+
+local m, s, o
+local openclash = "openclash"
+local uci = luci.model.uci.cursor()
+local fs = require "luci.openclash"
+local sys = require "luci.sys"
+local sid = arg[1]
+
+font_red = [[<font color="red">]]
+font_green = [[<font color="green">]]
+font_off = [[</font>]]
+bold_on  = [[<strong>]]
+bold_off = [[</strong>]]
+
+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(openclash, translate("Other Rules Edit"))
+m.pageaction = false
+m.redirect = luci.dispatcher.build_url("admin/services/openclash/settings")
+if m.uci:get(openclash, sid) ~= "other_rules" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+-- [[ Other Rules Setting ]]--
+s = m:section(NamedSection, sid, "other_rules")
+s.anonymous = true
+s.addremove   = false
+
+o = s:option(ListValue, "config", translate("Config File"))
+local e,a={}
+local groupnames,filename
+for t,f in ipairs(fs.glob("/etc/openclash/config/*"))do
+	a=fs.stat(f)
+	if a then
+    e[t]={}
+    e[t].name=fs.basename(f)
+    if IsYamlFile(e[t].name) or IsYmlFile(e[t].name) then
+       o:value(e[t].name)
+    end
+    if e[t].name == m.uci:get(openclash, sid, "config") then
+    	filename = e[t].name
+      groupnames = sys.exec(string.format('ruby -ryaml -E UTF-8 -e "YAML.load_file(\'%s\')[\'proxy-groups\'].each do |i| puts i[\'name\']+\'##\' end" 2>/dev/null',f))
+    end
+  end
+end
+
+o = s:option(Button, translate("Get Group Names")) 
+o.title = translate("Get Group Names")
+o.inputtitle = translate("Get Group Names")
+o.description = translate("Get Group Names After Select Config File")
+o.inputstyle = "reload"
+o.write = function()
+  m.uci:commit("openclash")
+  luci.http.redirect(luci.dispatcher.build_url("admin/services/openclash/other-rules-edit/%s") % sid)
+end
+
+if groupnames ~= nil and filename ~= nil then
+s = m:section(NamedSection, sid, "other_rules")
+s.title = translate("Set Proxy Groups")
+s.anonymous = true
+s.addremove   = false
+
+o = s:option(ListValue, "rule_name", translate("Other Rules Name"))
+o.rmempty = true
+o:value("lhie1", translate("lhie1 Rules"))
+o:value("ConnersHua", translate("ConnersHua(Provider-type) Rules"))
+o:value("ConnersHua_return", translate("ConnersHua Return Rules"))
+
+o = s:option(ListValue, "GlobalTV", translate("GlobalTV"))
+o:depends("rule_name", "lhie1")
+o:depends("rule_name", "ConnersHua")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "AsianTV", translate("AsianTV"))
+o:depends("rule_name", "lhie1")
+o:depends("rule_name", "ConnersHua")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Proxy", translate("Proxy"))
+o:depends("rule_name", "lhie1")
+o:depends("rule_name", "ConnersHua")
+o:depends("rule_name", "ConnersHua_return")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Youtube", translate("Youtube"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Apple", translate("Apple"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Microsoft", translate("Microsoft"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Netflix", translate("Netflix"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Spotify", translate("Spotify"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Steam", translate("Steam"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Speedtest", translate("Speedtest"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Telegram", translate("Telegram"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "PayPal", translate("PayPal"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "AdBlock", translate("AdBlock"))
+o:depends("rule_name", "lhie1")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Domestic", translate("Domestic"))
+o:depends("rule_name", "lhie1")
+o:depends("rule_name", "ConnersHua")
+o.rmempty = true
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+o = s:option(ListValue, "Others", translate("Others"))
+o:depends("rule_name", "lhie1")
+o:depends("rule_name", "ConnersHua")
+o:depends("rule_name", "ConnersHua_return")
+o.rmempty = true
+o.description = translate("Choose Proxy Groups, Base On Your Config File").." ( "..font_green..bold_on..filename..bold_off..font_off.." )"
+for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
+  if groupname ~= nil and groupname ~= "" then
+    o:value(groupname)
+  end
+end
+o:value("DIRECT")
+o:value("REJECT")
+
+end
+
+local t = {
+    {Commit, Back}
+}
+a = m:section(Table, t)
+
+o = a:option(Button,"Commit")
+o.inputtitle = translate("Commit Configurations")
+o.inputstyle = "apply"
+o.write = function()
+   m.uci:commit(openclash)
+   --luci.http.redirect(m.redirect)
+end
+
+o = a:option(Button,"Back")
+o.inputtitle = translate("Back Configurations")
+o.inputstyle = "reset"
+o.write = function()
+   m.uci:revert(openclash)
+   luci.http.redirect(m.redirect)
+end
+
+return m

luci-app-openclash/luasrc/model/cbi/openclash/servers-config.lua

@@ -219,6 +219,7 @@ o.default = "none"
 o:value("none")
 o:value("websocket", translate("websocket (ws)"))
 o:value("http", translate("http"))
+o:value("h2", translate("h2"))
 o:depends("type", "vmess")
 
 o = s:option(Value, "host", translate("obfs-hosts"))
@@ -236,6 +237,16 @@ o.rmempty = true
 o:depends("obfs", "websocket")
 o:depends("obfs_vmess", "websocket")
 
+o = s:option(DynamicList, "h2_host", translate("host"))
+o.rmempty = true
+o.datatype = "host"
+o:depends("obfs_vmess", "h2")
+
+o = s:option(Value, "h2_path", translate("path"))
+o.rmempty = true
+o.default = "/"
+o:depends("obfs_vmess", "h2")
+
 o = s:option(DynamicList, "http_path", translate("path"))
 o.rmempty = true
 o:value("/")