diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index 30fe8d7591..b1eccdf8f1 100644 --- a/package/ctcgfw/luci-app-openclash/Makefile +++ b/package/ctcgfw/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.39.5 +PKG_VERSION:=0.39.6 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml b/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml index 973def0e1e..549607d6b8 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml @@ -5211,7 +5211,6 @@ rules: - DOMAIN-SUFFIX,m.xxkio.com,AdBlock - DOMAIN-SUFFIX,m.yalayi.com,AdBlock - DOMAIN-SUFFIX,m.yangjingbang.net,AdBlock -- DOMAIN-SUFFIX,m.yap.yahoo.com,AdBlock - DOMAIN-SUFFIX,m.yicang8.com,AdBlock - DOMAIN-SUFFIX,m.yingchengtou.com,AdBlock - DOMAIN-SUFFIX,m.ynnke.com,AdBlock @@ -8489,6 +8488,7 @@ rules: - DOMAIN-SUFFIX,bilivideo.com,AsianTV - DOMAIN-SUFFIX,hdslb.com,AsianTV - DOMAIN-SUFFIX,im9.com,AsianTV +- DOMAIN-SUFFIX,smtcdns.net,AsianTV # > IQIYI - DOMAIN-KEYWORD,qiyi,AsianTV @@ -8533,11 +8533,12 @@ rules: - DOMAIN-SUFFIX,amazonaws.com,GlobalTV - DOMAIN-SUFFIX,amazonvideo.com,GlobalTV - DOMAIN-SUFFIX,llnwd.net,GlobalTV +- DOMAIN-SUFFIX,primevideo.com,GlobalTV # > Apple News and Apple Map TOMTOM Version # - USER-AGENT,AppleNews*,GlobalTV # - USER-AGENT,com.apple.news*,GlobalTV -- DOMAIN,gspe1-ssl.ls.apple.com,GlobalTV +# - DOMAIN,gspe1-ssl.ls.apple.com,GlobalTV # - USER-AGENT,News*,GlobalTV # - DOMAIN,apple.comscoreresearch.com,GlobalTV # - DOMAIN,gateway.icloud.com,GlobalTV @@ -8701,20 +8702,6 @@ rules: - DOMAIN-SUFFIX,viu.tv,GlobalTV - DOMAIN-SUFFIX,viu.now.com,GlobalTV -# > Youtube Music -# - USER-AGENT,*YouTubeMusic*,GlobalTV -# - USER-AGENT,*com.google.ios.youtubemusic*,GlobalTV - -# > Youtube -# - USER-AGENT,*youtube*,GlobalTV -# - USER-AGENT,YouTube*,GlobalTV -- DOMAIN-KEYWORD,youtube,GlobalTV -- DOMAIN,yt3.ggpht.com,GlobalTV -- DOMAIN-SUFFIX,googlevideo.com,GlobalTV -- DOMAIN-SUFFIX,gvt2.com,GlobalTV -- DOMAIN-SUFFIX,youtu.be,GlobalTV -- DOMAIN-SUFFIX,ytimg.com,GlobalTV - # > Netflix @@ -8789,22 +8776,13 @@ rules: - IP-CIDR,170.249.179.114/32,Netflix - IP-CIDR,170.52.52.130/32,Netflix - IP-CIDR,172.56.128.126/32,Netflix -- IP-CIDR,172.56.128.126/32,Netflix -- IP-CIDR,172.56.132.126/32,Netflix - IP-CIDR,172.56.132.126/32,Netflix - IP-CIDR,172.56.133.126/32,Netflix -- IP-CIDR,172.56.133.126/32,Netflix -- IP-CIDR,172.56.138.126/32,Netflix - IP-CIDR,172.56.138.126/32,Netflix - IP-CIDR,172.56.139.126/32,Netflix -- IP-CIDR,172.56.139.126/32,Netflix -- IP-CIDR,172.56.140.126/32,Netflix - IP-CIDR,172.56.140.126/32,Netflix - IP-CIDR,172.56.141.126/32,Netflix -- IP-CIDR,172.56.141.126/32,Netflix - IP-CIDR,172.56.143.126/32,Netflix -- IP-CIDR,172.56.143.126/32,Netflix -- IP-CIDR,172.56.145.66/32,Netflix - IP-CIDR,172.56.145.66/32,Netflix - IP-CIDR,173.219.132.226/32,Netflix - IP-CIDR,173.219.132.229/32,Netflix @@ -8971,12 +8949,10 @@ rules: - IP-CIDR,184.150.15.99/32,Netflix - IP-CIDR,184.175.190.38/32,Netflix - IP-CIDR,185.43.181.232/32,Netflix -- IP-CIDR,185.43.181.232/32,Netflix - IP-CIDR,185.43.181.234/32,Netflix - IP-CIDR,185.43.181.236/32,Netflix - IP-CIDR,185.43.181.238/32,Netflix - IP-CIDR,185.43.181.240/32,Netflix -- IP-CIDR,185.43.181.240/32,Netflix - IP-CIDR,185.43.181.246/32,Netflix - IP-CIDR,185.97.110.36/32,Netflix - IP-CIDR,186.15.229.194/32,Netflix @@ -8996,7 +8972,6 @@ rules: - IP-CIDR,188.47.196.252/32,Netflix - IP-CIDR,188.47.196.253/32,Netflix - IP-CIDR,188.47.208.242/32,Netflix -- IP-CIDR,188.47.208.242/32,Netflix - IP-CIDR,189.194.232.193/32,Netflix - IP-CIDR,189.194.232.194/32,Netflix - IP-CIDR,189.194.232.195/32,Netflix @@ -9013,10 +8988,7 @@ rules: - IP-CIDR,190.98.134.144/32,Netflix - IP-CIDR,190.98.134.146/32,Netflix - IP-CIDR,190.98.156.141/32,Netflix -- IP-CIDR,190.98.156.141/32,Netflix - IP-CIDR,190.98.156.149/32,Netflix -- IP-CIDR,190.98.156.149/32,Netflix -- IP-CIDR,190.98.156.183/32,Netflix - IP-CIDR,190.98.156.183/32,Netflix - IP-CIDR,192.148.237.10/32,Netflix - IP-CIDR,192.148.237.130/32,Netflix @@ -9037,14 +9009,10 @@ rules: - IP-CIDR,193.212.179.82/32,Netflix - IP-CIDR,193.212.179.98/32,Netflix - IP-CIDR,193.247.193.100/32,Netflix -- IP-CIDR,193.247.193.100/32,Netflix - IP-CIDR,193.247.193.38/32,Netflix - IP-CIDR,193.247.193.72/32,Netflix - IP-CIDR,193.247.193.74/32,Netflix -- IP-CIDR,193.247.193.74/32,Netflix - IP-CIDR,193.247.193.99/32,Netflix -- IP-CIDR,193.247.193.99/32,Netflix -- IP-CIDR,194.228.248.66/32,Netflix - IP-CIDR,194.228.248.66/32,Netflix - IP-CIDR,195.121.126.132/32,Netflix - IP-CIDR,195.121.126.139/32,Netflix @@ -9110,26 +9078,19 @@ rules: - IP-CIDR,203.116.200.130/32,Netflix - IP-CIDR,203.116.200.131/32,Netflix - IP-CIDR,203.116.200.134/32,Netflix -- IP-CIDR,203.116.200.134/32,Netflix - IP-CIDR,203.116.200.135/32,Netflix - IP-CIDR,203.116.200.136/32,Netflix -- IP-CIDR,203.116.200.136/32,Netflix - IP-CIDR,203.116.200.137/32,Netflix - IP-CIDR,203.116.210.132/32,Netflix - IP-CIDR,203.116.210.133/32,Netflix -- IP-CIDR,203.116.210.133/32,Netflix - IP-CIDR,203.116.210.134/32,Netflix - IP-CIDR,203.116.210.135/32,Netflix - IP-CIDR,203.116.210.136/32,Netflix - IP-CIDR,203.116.210.137/32,Netflix - IP-CIDR,203.116.210.196/32,Netflix -- IP-CIDR,203.116.210.196/32,Netflix - IP-CIDR,203.116.210.197/32,Netflix - IP-CIDR,203.116.210.198/32,Netflix -- IP-CIDR,203.116.210.198/32,Netflix - IP-CIDR,203.116.210.199/32,Netflix -- IP-CIDR,203.116.210.199/32,Netflix -- IP-CIDR,203.116.210.200/32,Netflix - IP-CIDR,203.116.210.200/32,Netflix - IP-CIDR,203.116.210.201/32,Netflix - IP-CIDR,203.177.54.2/32,Netflix @@ -9178,17 +9139,11 @@ rules: - IP-CIDR,208.180.59.229/32,Netflix - IP-CIDR,208.54.16.65/32,Netflix - IP-CIDR,208.54.2.3/32,Netflix -- IP-CIDR,208.54.2.3/32,Netflix -- IP-CIDR,208.54.37.30/32,Netflix - IP-CIDR,208.54.37.30/32,Netflix - IP-CIDR,208.54.66.30/32,Netflix - IP-CIDR,208.54.67.30/32,Netflix -- IP-CIDR,208.54.67.30/32,Netflix -- IP-CIDR,208.54.70.30/32,Netflix - IP-CIDR,208.54.70.30/32,Netflix - IP-CIDR,208.54.80.30/32,Netflix -- IP-CIDR,208.54.80.30/32,Netflix -- IP-CIDR,208.54.85.30/32,Netflix - IP-CIDR,208.54.85.30/32,Netflix - IP-CIDR,208.76.186.5/32,Netflix - IP-CIDR,208.76.186.50/32,Netflix @@ -9274,13 +9229,10 @@ rules: - IP-CIDR,40.133.138.47/32,Netflix - IP-CIDR,40.133.138.57/32,Netflix - IP-CIDR,43.245.105.1/32,Netflix -- IP-CIDR,43.245.105.1/32,Netflix -- IP-CIDR,43.245.105.11/32,Netflix - IP-CIDR,43.245.105.11/32,Netflix - IP-CIDR,43.245.105.129/32,Netflix - IP-CIDR,43.245.105.13/32,Netflix - IP-CIDR,43.245.105.9/32,Netflix -- IP-CIDR,43.245.105.9/32,Netflix - IP-CIDR,45.121.219.34/32,Netflix - IP-CIDR,45.57.56.130/32,Netflix - IP-CIDR,49.231.114.6/32,Netflix @@ -9295,7 +9247,6 @@ rules: - IP-CIDR,51.148.80.22/32,Netflix - IP-CIDR,51.148.80.6/32,Netflix - IP-CIDR,58.27.11.201/32,Netflix -- IP-CIDR,58.27.11.201/32,Netflix - IP-CIDR,58.27.38.199/32,Netflix - IP-CIDR,62.127.102.10/32,Netflix - IP-CIDR,62.127.102.14/32,Netflix @@ -9637,9 +9588,26 @@ rules: # > Spotify # - USER-AGENT,*Spotify*,Spotify -- DOMAIN-KEYWORD,spotify,Spotify +- DOMAIN-SUFFIX,pscdn.co,Spotify - DOMAIN-SUFFIX,scdn.co,Spotify - DOMAIN-SUFFIX,spoti.fi,Spotify +- DOMAIN-SUFFIX,spotify.com,Spotify +- DOMAIN-SUFFIX,spotifycdn.net,Spotify + +# > Youtube Music +# - USER-AGENT,*YouTubeMusic*,Youtube +# - USER-AGENT,*com.google.ios.youtubemusic*,Youtube + +# > Youtube +# - USER-AGENT,*youtube*,Youtube +# - USER-AGENT,YouTube*,Youtube +- DOMAIN-KEYWORD,youtube,Youtube +- DOMAIN,yt3.ggpht.com,Youtube +- DOMAIN-SUFFIX,googlevideo.com,Youtube +- DOMAIN-SUFFIX,gvt2.com,Youtube +- DOMAIN-SUFFIX,youtu.be,Youtube +- DOMAIN-SUFFIX,ytimg.com,Youtube + # > Telegram @@ -9970,7 +9938,7 @@ rules: - DOMAIN-SUFFIX,gvt0.com,Proxy - DOMAIN-SUFFIX,gvt1.com,Proxy - DOMAIN-SUFFIX,helpshift.com,Proxy -- DOMAIN-SUFFIX,hinet.net,Proxy +- DOMAIN-SUFFIX,hitun.io,Proxy - DOMAIN-SUFFIX,hockeyapp.net,Proxy - DOMAIN-SUFFIX,homedepot.com,Proxy - DOMAIN-SUFFIX,hootsuite.com,Proxy @@ -10031,6 +9999,7 @@ rules: - DOMAIN-SUFFIX,macid.co,Proxy - DOMAIN-SUFFIX,macromedia.com,Proxy - DOMAIN-SUFFIX,macrumors.com,Proxy +- DOMAIN-SUFFIX,mangaup.jp,Proxy - DOMAIN-SUFFIX,manhuaren.com,Proxy - DOMAIN-SUFFIX,marketwatch.com,Proxy - DOMAIN-SUFFIX,mashable.com,Proxy @@ -10056,7 +10025,9 @@ rules: - DOMAIN-SUFFIX,netdna-cdn.com,Proxy - DOMAIN-SUFFIX,newipnow.com,Proxy - DOMAIN-SUFFIX,nextmedia.com,Proxy +- DOMAIN-SUFFIX,nicovideo.jp,Proxy - DOMAIN-SUFFIX,nih.gov,Proxy +- DOMAIN-SUFFIX,nimg.jp,Proxy - DOMAIN-SUFFIX,nintendo.com,Proxy - DOMAIN-SUFFIX,nintendo.net,Proxy - DOMAIN-SUFFIX,notion.so,Proxy @@ -10383,7 +10354,6 @@ rules: - DOMAIN-SUFFIX,gcr.io,Proxy - DOMAIN-SUFFIX,gmail.com,Proxy - DOMAIN-SUFFIX,gosetsuden.jp,Proxy -- DOMAIN-SUFFIX,gvt1.com,Proxy - DOMAIN-SUFFIX,gwtproject.org,Proxy - DOMAIN-SUFFIX,heroku.com,Proxy - DOMAIN-SUFFIX,html5rocks.com,Proxy @@ -10548,7 +10518,6 @@ rules: - DOMAIN-SUFFIX,bababian.com,Domestic - DOMAIN-SUFFIX,baidu.com,Domestic - DOMAIN-SUFFIX,baidupcs.com,Domestic -- DOMAIN-SUFFIX,battle.net,Domestic - DOMAIN-SUFFIX,bdimg.com,Domestic - DOMAIN-SUFFIX,bdstatic.com,Domestic - DOMAIN-SUFFIX,beatsbydre.com,Domestic @@ -10639,6 +10608,8 @@ rules: - DOMAIN-SUFFIX,lxdns.com,Domestic - DOMAIN-SUFFIX,mai.tn,Domestic - DOMAIN-SUFFIX,meizu.com,Domestic +- DOMAIN-SUFFIX,metatrader4.com,Domestic +- DOMAIN-SUFFIX,metatrader5.com,Domestic - DOMAIN-SUFFIX,mi.com,Domestic - DOMAIN-SUFFIX,miaopai.com,Domestic - DOMAIN-SUFFIX,miui.com,Domestic diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version index 142d6c6ebd..c521b7278c 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.39.5-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjY4OUM3MjlDQ0RGRjExRUFBNThGODVBNTBEMzU3REU2IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjY4OUM3MjlEQ0RGRjExRUFBNThGODVBNTBEMzU3REU2Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Njg5QzcyOUFDREZGMTFFQUE1OEY4NUE1MEQzNTdERTYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Njg5QzcyOUJDREZGMTFFQUE1OEY4NUE1MEQzNTdERTYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5vEDfyAAADAFBMVEUla5NISEjB1eCCqcBTiqkHXpHR0dEGcKwahMFJns5tbW09PT2EvN2EhIS6urokhLuTu9OUxeEJeLgJdbSCgoJlnr6enp4Ka6Ha2tqlpaV4eHgGbanf39/n5+c/Pz/GxsahoaE0dZrOzs46lcpYpdJpaWnR5vJ2ttpilLEEXI6RkZGizOVxcXG/v79FRUWsrKy1tbVmrdbR4uwJca0HXI2StchFmsrKysondqQEU4DB2eZiYmIEYJWy1upkq9MXgb5LS0tDQ0Pg4OCLi4sJZJkGdLKDs86iwNFGirEGVYLw9fd2dnbAwMCcnJwEWorCwsJBQUFFkbyx0OJCQkJFgKImcJuDrcW2trYYYo2jx9yXl5dHnMwmicJlZWWNjY0FaaJyn7grjsdzobuxzdwFcrAHZ502ksYIbKSvr69gYGCEtNCiyd8JWIUZdaqUlJQGZJpzsdSkzuYEYph0dHSyytgJcKuJweIwk8sIYZRGhKc1hbJDfqEHV4YRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYFdrcHeLkKe7wEdbYDdLQDdLUEdrYDdbUOf8AOgMASg8NXV1cSg8QShMQThMUAcrIGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkJeroJe7sJers6OjqqqqrU1NTV1dWrq6upqak7OzvC3u6AgIB+fn4HVoTw9/uBgYHq6upMTEz19fXz8/Ph7/eHv9/09PSErMLA1N9/f3+DvNyFvt7v9Pfg6u90s9iGvt/B3e3B3e7C3+8FZ5+JiYlGm8vo6OgEVYMUXomhv9ALerkFa6YFZZuGv98HVoPW1tbg6vDD3+/B3u7g7vaEvd0FZ6CDu9wLdK8IaJ9Hm8zg7/cEWIgVaJcIWYgLb6iDr8gLeLfR3+hor9cGdbRVos/v9voEVYREmcp1qMWAudmjxdgpiL6ErcUXe7MHdrVkmbfB2+s1jsJTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////+IfDSJAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADDlJREFUeNrsVwlUFOcdn+WQY10Vjw0ssgoiAuqCQTErHsulYmxFo9F6PDWRaIwx8Yomsa0IG+iVlB4mTVCXSwIrl0AMGq94EmOiiSbmbI42sW3aTa0NiOFH/983s7szCxhek+d7u8/fe8z3P3//md83zMwKHR01q4Zf8wT8wQ2w+TFrR4fQkbLhmmfg926BzVEdQs2oVg/B79wDm63CKk+RvPW3boLHhFHfegp+6ibYLHx7W/NbDQ/S/N/uAuEbj8FtzW89vnYXCP/1GNzW/NbjGXeB8B+PwdPugi4118TFxcUG/vCqLNFoljicQI2mJz06ja6H7M92h2eGjdg3Yphr9Gv/yH379gU4/OV/lnsSKCZhuSL+Gl579v+GcNUVSfNrwJGyMOnq94QmTqPwa7DQYc/E+J5QvI7XezjsuW7g/wa/nDf8n5ZHl4tR1EWKfpDoBSh7pSKCMkGadzfuuYDXAp67KTpprqsCgku12giao/m+mschTu6aRyPFsbVA7A+r+Z+6wRHcOWj6oDtxRBENAD5uaJg2g9Rk7jrM+Ov06AmSJ+v1ahBxRRF/Ba90N+6mOQ7hhhJJKagNVDOYtLUDb3xPkOYKfxQQKJkLUZvTEwqD2tDDYc93jTE4t2DNmjULZmCMPBwwTVjDwuewjhfNoKKtW6ehTtF8BA1rRFxUxEnX57vDzXIcQieVapPUySqTyaBWm4f3VFvdQMX2DBwY2LXmqjAMlcwSzG+XinVdMya5aB6oHJJkr7Djha4xCff5fnDxA98GTJKHL65Z43vHHWnvN+AIeUcw7v2VFzdtoZ2JlFcdweo7RHykIH0ZL7/wwvKAYbJQgN3jOUdQUSPCVfMaaPXbuGU2MaMEe7m3FyXScWEKUHqjFKVJpfQYYtlS9gKoKeV1QBJ3S5K4I8LBvk2LKklAuuMLSLiZLF+VekNBfmNoFQ8zylKIxKk8NDNJqgzkjfPlp54rIRJ1klWHyNxcKx4/Tfbpx2HNleFi2kdsOd0PD9ECsSg3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 \ No newline at end of file +v0.39.6-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjBBNTEyRjU3RDE1QjExRUE4MzgyQUY3ODk5QTY2NTgyIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjBBNTEyRjU4RDE1QjExRUE4MzgyQUY3ODk5QTY2NTgyIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEE1MTJGNTVEMTVCMTFFQTgzODJBRjc4OTlBNjY1ODIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MEE1MTJGNTZEMTVCMTFFQTgzODJBRjc4OTlBNjY1ODIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6HWc3zAAADAFBMVEUGcKzR0dFtbW0GVYI9PT3B1eCStckHZp2EvN2EhIS6urokhLtFmsqUxeFTiqmGv98KaqGizOUHXpE6lcqCgoIJeLhlnr6enp52ttra2tqlpaXR4ux4eHgHXI3f398JdbTn5+djlbE/Pz9XpdLGxsahoaHOzs4la5MEXI6Ds85paWnR5vIFbamRkZFxcXG/v79GRkasrKw0dJq1tbVmrNUEU4AJZJkEYJWy1urKysoJca5iYmJkq9OiwNFLS0tDQ0Pg4ODC2eaLi4tFkbwGWopHirF2dnYGdLLAwMCcnJzw9ffCwsJBQUGx0OIXgL0neKZFgKJCQkIFZZomcJuDrcW2trYYYo2jx9xHnMyXl5cnicFlZWWNjY0FaaJJns42kcYrjsdzor2xzdwFcrA0fKUIbKUJWIWjzuavr69gYGCiyd8Zdapyn7iUlJSTvdaTu9FKns8EYpgIYZR0dHSyythDfqAdh8MJcKuJweIwk8t0sdUahMFortdFiK01hbIRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYFdrcHeLkKe7wOgMADdLQOf8AEdrYEdbYDdLUDdbUSg8MSg8RXV1cShMQAcrIThMUGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkJeroJe7sJers6OjqqqqrU1NTV1dWrq6tISEipqak7OzuAgIB+fn7w9/sHVoTC3u5JSUmBgYHq6urh7/f19fVMTEzz8/P09PR/f3+DvNyFvt7A1N/B3e3v9PeCqcDg6u+hv9CErMLB3e6JiYnB3u7o6Oh0s9gIaJ/g6vALerkUXonW1taDq8LD3++EtNDC3+8LdK/g7/cFa6aDqsEEWIgFZ5+Evd3R3+hGm8tVos/g7vZInc2CutsZg8BGg6YGdbSDr8jv9voLb6gKeLeRuM8VaJdInc4IWYcEVYNXk7Y1jsKErcWjxdgvksvP5PFkmbdTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7////////xDrwLAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADGJJREFUeNrsVwlUFOcdH2EBV8UDjCtkVVgUUEAHcVFBFyQarKIxGK3H08QY0SRqvKJJNGkrAkJ6l7YmTQxyGxaQM4p44G2M95HL3Im2TZttrQ2I4Uf/3zezuzMLGF6T53u7z997zPc/f/+Z3zc7MwitrVXLht10BfzZCfD8c+bWVqE1fu1N18AfnQLPh7UKVcObXAR/cA48bxaWuYrkTb93EjwnDP/OVfAzJ8E/hO/uaX634UKa/9tZIHzrMrin+d3Hv5wFwn9dBvc0v/t42Vkg/Mdl8CtnQbuaayMjIyPcfnxV5mu1822Om1bbmR69Vt9J9lc6wsu+/Xv1920TXh/Uq1evVTb3sU1KTwGW6L9eHeuFXq/83xBuOCJ2VhU44ufG3viB0EZqVX4V5trsyRjbGYq38XYnh73aAda/wy/nnfWq6GNSFJVBku8teascu32lOoc4ad7RuFdX9Vr16h3RRnN9BeBXqNMF0yDtD9U8EpFKN2ME4m1bC0T8uJr/pQOcwf39JvW7H2dU0YXAlYMHx08BFjJ3KcyLJv11guzZsQmYMv7gwSsO4T3Y09G4O+Y4hNtqxMajxk3DYNLV9L39A0Gaq/zhgJtszkVNWmcoRI3YyWGvtY9NOD47JSVl9hRsUoYXjg9JYeHjWMqLpsy+di0lZTwqVc20MwdZWcpZNSnp+lpHuFOOQ2ijUk2sJq7cZBI1moxhndVW31e1PX37urWveVEAhshmAWa1yMX69hljHTR3Uw+JtVZY8Xr7GINFPp+d/cznIMYow2dTUnx6946+dhBnyDsDz2tLzm5YQzsTpKyqJMmvRffu7XNWTUq6vv76Ywt9FaGFVo/nbEFVjQRHzaugM2zmVoaJGQXYxb1dKJCPc+OBwtuFKIwtpMcQyxayF0BVIa8DYrlbEMsdCTb2zTpUyALSHZ9Nwk1m+YqE2yry20MqeJhRFkIiTuChybFypRtvnKU89XQZQaiUrUoEpaeb8eLnZJ/4COZ0Bc5Gs2j6iWfwFC3A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 \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index 167cef1f8f..3f7bb17c0f 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -308,6 +308,12 @@ o:depends("rule_source", "ConnersHua_return") o:value(l) end file:seek("set") +o = s:taboption("rules", ListValue, "Youtube", translate("Youtube")) +o:depends("rule_source", "lhie1") + for l in file:lines() do + o:value(l) + end + file:seek("set") o = s:taboption("rules", ListValue, "Apple", translate("Apple")) o:depends("rule_source", "lhie1") for l in file:lines() do diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_set.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_set.sh index b7ae5bae30..fa1e27d22e 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_set.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_set.sh @@ -704,6 +704,20 @@ EOF fi cat /tmp/Proxy_Provider >> $SERVER_FILE 2>/dev/null cat >> "$SERVER_FILE" <<-EOF +- name: Youtube + type: select + proxies: + - GlobalTV + - DIRECT +EOF +cat /tmp/Proxy_Server >> $SERVER_FILE 2>/dev/null +if [ -f "/tmp/Proxy_Provider" ]; then +cat >> "$SERVER_FILE" <<-EOF + use: +EOF +fi +cat /tmp/Proxy_Provider >> $SERVER_FILE 2>/dev/null +cat >> "$SERVER_FILE" <<-EOF - name: Spotify type: select proxies: @@ -825,6 +839,7 @@ ${UCI_SET}rule_source="lhie1" ${UCI_SET}GlobalTV="GlobalTV" ${UCI_SET}AsianTV="AsianTV" ${UCI_SET}Proxy="Proxy" +${UCI_SET}Youtube="Youtube" ${UCI_SET}Apple="Apple" ${UCI_SET}Microsoft="Microsoft" ${UCI_SET}Netflix="Netflix" @@ -841,6 +856,7 @@ ${UCI_SET}Others="Others" ${UCI_SET}servers_update="1" ${UCI_DEL_LIST}="Auto - UrlTest" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Auto - UrlTest" >/dev/null 2>&1 ${UCI_DEL_LIST}="Proxy" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Proxy" >/dev/null 2>&1 + ${UCI_DEL_LIST}="Youtube" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Youtube" >/dev/null 2>&1 ${UCI_DEL_LIST}="AsianTV" >/dev/null 2>&1 && ${UCI_ADD_LIST}="AsianTV" >/dev/null 2>&1 ${UCI_DEL_LIST}="GlobalTV" >/dev/null 2>&1 && ${UCI_ADD_LIST}="GlobalTV" >/dev/null 2>&1 ${UCI_DEL_LIST}="Netflix" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Netflix" >/dev/null 2>&1 diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh index 8658ddad92..2645434e7b 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh @@ -84,6 +84,7 @@ if [ "$2" != 0 ]; then GlobalTV=$(uci get openclash.config.GlobalTV 2>/dev/null) AsianTV=$(uci get openclash.config.AsianTV 2>/dev/null) Proxy=$(uci get openclash.config.Proxy 2>/dev/null) + Youtube=$(uci get openclash.config.Youtube 2>/dev/null) Apple=$(uci get openclash.config.Apple 2>/dev/null) Netflix=$(uci get openclash.config.Netflix 2>/dev/null) Spotify=$(uci get openclash.config.Spotify 2>/dev/null) @@ -117,6 +118,7 @@ if [ "$2" != 0 ]; then if [ -z "$(grep "$GlobalTV" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$AsianTV" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$Proxy" /tmp/Proxy_Group)" ]\ + || [ -z "$(grep "$Youtube" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$Apple" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$Netflix" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$Spotify" /tmp/Proxy_Group)" ]\ @@ -156,6 +158,7 @@ if [ "$2" != 0 ]; then GlobalTV_YAML=$(grep '##GlobalTV:' "$4" |awk -F ':' '{print $2}') AsianTV_YAML=$(grep '##AsianTV:' "$4" |awk -F ':' '{print $2}') Proxy_YAML=$(grep '##Proxy:' "$4" |awk -F ':' '{print $2}') + Youtube_YAML=$(grep '##Youtube:' "$4" |awk -F ':' '{print $2}') Apple_YAML=$(grep '##Apple:' "$4" |awk -F ':' '{print $2}') Netflix_YAML=$(grep '##Netflix:' "$4" |awk -F ':' '{print $2}') Spotify_YAML=$(grep '##Spotify:' "$4" |awk -F ':' '{print $2}') @@ -186,6 +189,7 @@ if [ "$2" != 0 ]; then if [ "$GlobalTV" != "$GlobalTV_YAML" ]\ || [ "$AsianTV" != "$AsianTV_YAML" ]\ || [ "$Proxy" != "$Proxy_YAML" ]\ + || [ "$Youtube" != "$Youtube_YAML" ]\ || [ "$Apple" != "$Apple_YAML" ]\ || [ "$Netflix" != "$Netflix_YAML" ]\ || [ "$Spotify" != "$Spotify_YAML" ]\ @@ -217,6 +221,9 @@ if [ "$2" != 0 ]; then sed -i "s/,Proxy$/,${Proxy}#d/g" "/tmp/other_rule.yaml" 2>/dev/null sed -i "s/,Proxy,no-resolve$/,${Proxy},no-resolve#d/g" "/tmp/other_rule.yaml" 2>/dev/null sed -i "/rules:/a\##Proxy:${Proxy}" "/tmp/other_rule.yaml" 2>/dev/null + sed -i "s/,Youtube$/,${Youtube}#d/g" "/tmp/other_rule.yaml" 2>/dev/null + sed -i "s/,Youtube,no-resolve$/,${Youtube},no-resolve#d/g" "/tmp/other_rule.yaml" 2>/dev/null + sed -i "/rules:/a\##Youtube:${Youtube}" "/tmp/other_rule.yaml" 2>/dev/null sed -i "s/,Apple$/,${Apple}#d/g" "/tmp/other_rule.yaml" 2>/dev/null sed -i "s/,Apple,no-resolve$/,${Apple},no-resolve#d/g" "/tmp/other_rule.yaml" 2>/dev/null sed -i "/rules:/a\##Apple:${Apple}" "/tmp/other_rule.yaml" 2>/dev/null diff --git a/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po b/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po index 2c3ae67306..471aacd3f3 100644 --- a/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po +++ b/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po @@ -454,6 +454,9 @@ msgstr "亚洲流媒体流量" msgid "Proxy" msgstr "必须代理的流量" +msgid "Youtube" +msgstr "Youtube流量" + msgid "Apple" msgstr "苹果服务流量"