From 3216039a8ed4270894a646d320b36e5696976a63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Aug 2022 23:41:10 +0800 Subject: [PATCH] update 2022-08-20 23:41:10 --- luci-app-openclash/Makefile | 2 +- .../luasrc/model/cbi/openclash/settings.lua | 38 ++++++ .../luasrc/view/openclash/myip.htm | 5 - .../luasrc/view/openclash/update.htm | 28 ++-- .../po/zh-cn/openclash.zh-cn.po | 17 ++- luci-app-openclash/root/etc/init.d/openclash | 72 ++++++++-- .../custom/openclash_custom_fake_filter.list | 1 + .../root/usr/share/openclash/openclash.sh | 2 +- .../usr/share/openclash/openclash_core.sh | 27 ++-- .../openclash/openclash_download_dashboard.sh | 32 +++-- .../openclash/openclash_download_rule_list.sh | 2 +- .../usr/share/openclash/openclash_geoip.sh | 1 + .../usr/share/openclash/openclash_geosite.sh | 1 + .../openclash/openclash_streaming_unlock.lua | 127 ++++++++++++++---- .../usr/share/openclash/openclash_watchdog.sh | 4 +- .../ui/dashboard/assets/index.7cc327e0.js | 1 + .../ui/dashboard/assets/index.ccf895d1.js | 1 - .../ui/dashboard/assets/index.e71ce3d7.css | 1 - .../ui/dashboard/assets/index.ebec649d.css | 1 + .../ui/dashboard/assets/vendor.46bd3f27.js | 102 -------------- .../ui/dashboard/assets/vendor.8d36e21e.js | 89 ++++++++++++ .../share/openclash/ui/dashboard/index.html | 6 +- .../usr/share/openclash/ui/dashboard/sw.js | 2 +- ...orkbox-4ee7f24a.js => workbox-74eda642.js} | 2 +- .../root/usr/share/openclash/yml_change.sh | 12 +- .../resources/openclash/img/version.svg | 2 +- .../resources/openclash/theme/idea.css | 2 +- 27 files changed, 387 insertions(+), 193 deletions(-) create mode 100644 luci-app-openclash/root/usr/share/openclash/ui/dashboard/assets/index.7cc327e0.js delete mode 100644 luci-app-openclash/root/usr/share/openclash/ui/dashboard/assets/index.ccf895d1.js delete mode 100644 luci-app-openclash/root/usr/share/openclash/ui/dashboard/assets/index.e71ce3d7.css create mode 100644 luci-app-openclash/root/usr/share/openclash/ui/dashboard/assets/index.ebec649d.css delete mode 100644 luci-app-openclash/root/usr/share/openclash/ui/dashboard/assets/vendor.46bd3f27.js create mode 100644 luci-app-openclash/root/usr/share/openclash/ui/dashboard/assets/vendor.8d36e21e.js rename luci-app-openclash/root/usr/share/openclash/ui/dashboard/{workbox-4ee7f24a.js => workbox-74eda642.js} (66%) diff --git a/luci-app-openclash/Makefile b/luci-app-openclash/Makefile index a580a3b4c..8a189676c 100644 --- a/luci-app-openclash/Makefile +++ b/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.45.47 +PKG_VERSION:=0.45.51 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/luci-app-openclash/luasrc/model/cbi/openclash/settings.lua b/luci-app-openclash/luasrc/model/cbi/openclash/settings.lua index 93af67961..5dda39bff 100644 --- a/luci-app-openclash/luasrc/model/cbi/openclash/settings.lua +++ b/luci-app-openclash/luasrc/model/cbi/openclash/settings.lua @@ -730,6 +730,38 @@ function custom_rules_2.write(self, section, value) end --Stream Enhance +se_dns_ip = s:taboption("stream_enhance", DynamicList, "lan_block_google_dns_ips", font_red..bold_on..translate("LAN Block Google DNS IP List")..bold_off..font_off) +se_dns_ip:depends("proxy_mode", "global") +se_dns_ip:depends("proxy_mode", "direct") +se_dns_ip:depends("proxy_mode", "script") +se_dns_ip:depends({router_self_proxy = "1", proxy_mode = "rule"}) +se_dns_ip.datatype = "ipaddr" +se_dns_ip.rmempty = true + +se_dns_mac = s:taboption("stream_enhance", DynamicList, "lan_block_google_dns_macs", font_red..bold_on..translate("LAN Block Google DNS Mac List")..bold_off..font_off) +se_dns_mac.datatype = "list(macaddr)" +se_dns_mac.rmempty = true +se_dns_mac:depends("proxy_mode", "global") +se_dns_mac:depends("proxy_mode", "direct") +se_dns_mac:depends("proxy_mode", "script") +se_dns_mac:depends({router_self_proxy = "1", proxy_mode = "rule"}) + +luci.ip.neighbors({ family = 4 }, function(n) + if n.mac and n.dest then + se_dns_ip:value(n.dest:string()) + se_dns_mac:value(n.mac, "%s (%s)" %{ n.mac, n.dest:string() }) + end +end) + +if string.len(SYS.exec("/usr/share/openclash/openclash_get_network.lua 'gateway6'")) ~= 0 then +luci.ip.neighbors({ family = 6 }, function(n) + if n.mac and n.dest then + se_dns_ip:value(n.dest:string()) + se_dns_mac:value(n.mac, "%s (%s)" %{ n.mac, n.dest:string() }) + end +end) +end + o = s:taboption("stream_enhance", Flag, "stream_domains_prefetch", font_red..bold_on..translate("Prefetch Netflix, Disney Plus Domains")..bold_off..font_off) o.description = translate("Prevent Some Devices From Directly Using IP Access To Cause Unlocking Failure, Recommend Use meta Sniffer Function") o.default = 0 @@ -761,6 +793,12 @@ o.default = "30" o.datatype = "uinteger" o:depends("stream_auto_select", "1") +o = s:taboption("stream_enhance", ListValue, "stream_auto_select_logic", font_red..bold_on..translate("Auto Select Logic")..bold_off..font_off) +o.default = "urltest" +o:value("urltest", translate("Urltest")) +o:value("random", translate("Random")) +o:depends("stream_auto_select", "1") + o = s:taboption("stream_enhance", Flag, "stream_auto_select_expand_group", font_red..bold_on..translate("Expand Group")..bold_off..font_off) o.description = translate("Automatically Expand The Group When Selected") o.default = 0 diff --git a/luci-app-openclash/luasrc/view/openclash/myip.htm b/luci-app-openclash/luasrc/view/openclash/myip.htm index e266f0a1f..cef227d37 100644 --- a/luci-app-openclash/luasrc/view/openclash/myip.htm +++ b/luci-app-openclash/luasrc/view/openclash/myip.htm @@ -26,7 +26,6 @@