diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index 905d060409..ac6121181e 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.36.11 +PKG_VERSION:=0.36.12 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml b/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml index 8b942aac11..9643787e2f 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml @@ -432,6 +432,7 @@ Rule: - DOMAIN-SUFFIX,pbs.org,GlobalMedia # > Pornhub - DOMAIN-SUFFIX,phncdn.com,GlobalMedia +- DOMAIN-SUFFIX,phprcdn.com,GlobalMedia - DOMAIN-SUFFIX,pornhub.com,GlobalMedia - DOMAIN-SUFFIX,pornhubpremium.com,GlobalMedia # > 台湾好 @@ -814,6 +815,7 @@ Rule: - DOMAIN-SUFFIX,wattpad.com,PROXY - DOMAIN-SUFFIX,whoer.net,PROXY - DOMAIN-SUFFIX,wikimapia.org,PROXY +- DOMAIN-SUFFIX,wikimedia.org,PROXY - DOMAIN-SUFFIX,wikipedia.org,PROXY - DOMAIN-SUFFIX,wikiquote.org,PROXY - DOMAIN-SUFFIX,wikiwand.com,PROXY diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/Country.mmdb b/package/ctcgfw/luci-app-openclash/files/etc/openclash/Country.mmdb index 866190bb84..478595180b 100644 Binary files a/package/ctcgfw/luci-app-openclash/files/etc/openclash/Country.mmdb and b/package/ctcgfw/luci-app-openclash/files/etc/openclash/Country.mmdb differ 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 2483983e88..5f9cec65d1 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml @@ -8461,13 +8461,10 @@ Rule: -# > ABC -- DOMAIN-SUFFIX,edgedatg.com,GlobalTV -- DOMAIN-SUFFIX,go.com,GlobalTV - -# > Abema TV +# > AbemaTV # - USER-AGENT,AbemaTV*,GlobalTV - DOMAIN-SUFFIX,abema.io,GlobalTV +- DOMAIN-SUFFIX,abema.tv,GlobalTV - DOMAIN-SUFFIX,akamaized.net,GlobalTV - DOMAIN-SUFFIX,ameba.jp,GlobalTV - DOMAIN-SUFFIX,hayabusa.io,GlobalTV @@ -8481,6 +8478,18 @@ Rule: - DOMAIN-SUFFIX,amazonvideo.com,GlobalTV - DOMAIN-SUFFIX,llnwd.net,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 +# - USER-AGENT,News*,GlobalTV +# - DOMAIN,apple.comscoreresearch.com,GlobalTV +# - DOMAIN,gateway.icloud.com,GlobalTV +# - DOMAIN,news-client.apple.com,GlobalTV +# - DOMAIN,news-edge.apple.com,GlobalTV +# - DOMAIN,news-events.apple.com,GlobalTV +# - DOMAIN-SUFFIX,apple.news,GlobalTV + # > Apple TV - DOMAIN,np-edge.itunes.apple.com,GlobalTV - DOMAIN,play-edge.itunes.apple.com,GlobalTV @@ -8492,20 +8501,12 @@ Rule: - DOMAIN-SUFFIX,gamer.com.tw,GlobalTV - DOMAIN-SUFFIX,hinet.net,GlobalTV -# > BBC +# > BBC iPlayer # - USER-AGENT,BBCiPlayer*,GlobalTV -- DOMAIN-KEYWORD,bbcfmt,GlobalTV -- DOMAIN-KEYWORD,co.uk,GlobalTV -- DOMAIN-KEYWORD,uk-live,GlobalTV -- DOMAIN-SUFFIX,bbc.co,GlobalTV - DOMAIN-SUFFIX,bbc.co.uk,GlobalTV -- DOMAIN-SUFFIX,bbc.com,GlobalTV -- DOMAIN-SUFFIX,bbci.co,GlobalTV - DOMAIN-SUFFIX,bbci.co.uk,GlobalTV - -# > CHOCO TV -# - USER-AGENT,TwDramas*,GlobalTV -- DOMAIN-SUFFIX,chocotv.com.tw,GlobalTV +- DOMAIN-KEYWORD,bbcfmt,GlobalTV +- DOMAIN-KEYWORD,uk-live,GlobalTV # > DAZN - DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net,GlobalTV @@ -8517,97 +8518,121 @@ Rule: # > Disney Plus # - USER-AGENT,Disney*,GlobalTV -- DOMAIN,cdn.registerdisney.go.com,GlobalTV - DOMAIN-SUFFIX,disneyplus.com,GlobalTV - DOMAIN-SUFFIX,disney-plus.net,GlobalTV - DOMAIN-SUFFIX,dssott.com,GlobalTV - DOMAIN-SUFFIX,bamgrid.com,GlobalTV - DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com,GlobalTV +- DOMAIN,cdn.registerdisney.go.com,GlobalTV -# > Now E -# - USER-AGENT,PCCW*,GlobalTV -- DOMAIN-KEYWORD,nowe,GlobalTV -- DOMAIN,bcbolthboa-a.akamaihd.net,GlobalTV -- DOMAIN-SUFFIX,nowe.com,GlobalTV -- DOMAIN-SUFFIX,youboranqs01.com,GlobalTV +# > encoreTVB +# - USER-AGENT,encoreTVB*,GlobalTV +- DOMAIN-SUFFIX,encoretvb.com,GlobalTV +- DOMAIN,content.jwplatform.com,GlobalTV +- DOMAIN,videos-f.jwpsrv.com,GlobalTV -# > Epicgames -- DOMAIN-KEYWORD,epicgames,GlobalTV -- DOMAIN-SUFFIX,helpshift.com,GlobalTV - -# > Fox+ +# > Fox Now # - USER-AGENT,FOX%20NOW*,GlobalTV -# - USER-AGENT,FOXPlus*,GlobalTV -- DOMAIN-KEYWORD,foxplus,GlobalTV -- DOMAIN-SUFFIX,config.fox.com,GlobalTV -- DOMAIN-SUFFIX,emome.net,GlobalTV - DOMAIN-SUFFIX,fox.com,GlobalTV - DOMAIN-SUFFIX,foxdcg.com,GlobalTV -- DOMAIN-SUFFIX,foxnow.com,GlobalTV -- DOMAIN-SUFFIX,foxplus.com,GlobalTV -- DOMAIN-SUFFIX,foxplay.com,GlobalTV -- DOMAIN-SUFFIX,ipinfo.io,GlobalTV -- DOMAIN-SUFFIX,mstage.io,GlobalTV -- DOMAIN-SUFFIX,now.com,GlobalTV -- DOMAIN-SUFFIX,theplatform.com,GlobalTV -- DOMAIN-SUFFIX,urlload.net,GlobalTV +- DOMAIN-SUFFIX,uplynk.com,GlobalTV -# > HBO && HBO Go +# > Fox+ (HK|TW|SG) +# - USER-AGENT,FOXPlus*,GlobalTV +- DOMAIN-SUFFIX,akamaized.net,GlobalTV +- DOMAIN-SUFFIX,foxplus.com,GlobalTV +- DOMAIN-SUFFIX,theplatform.com,GlobalTV + +# > HBO NOW & HBO GO # - USER-AGENT,HBO%20NOW*,GlobalTV - DOMAIN-SUFFIX,execute-api.ap-southeast-1.amazonaws.com,GlobalTV - DOMAIN-SUFFIX,hbo.com,GlobalTV +- DOMAIN-SUFFIX,hbogo.com,GlobalTV - DOMAIN-SUFFIX,hboasia.com,GlobalTV - DOMAIN-SUFFIX,hbogo.com,GlobalTV - DOMAIN-SUFFIX,hbogoasia.com,GlobalTV - DOMAIN-SUFFIX,hbogoasia.hk,GlobalTV -# > Hulu -# - USER-AGENT,Hulu*,GlobalTV +# > Hulu(フールー) - DOMAIN-SUFFIX,happyon.jp,GlobalTV +- DOMAIN-SUFFIX,hulu.jp,GlobalTV + +# > Hulu - DOMAIN-SUFFIX,hulu.com,GlobalTV - DOMAIN-SUFFIX,huluim.com,GlobalTV - DOMAIN-SUFFIX,hulustream.com,GlobalTV -# > Imkan -- DOMAIN-SUFFIX,imkan.tv,GlobalTV +# > Japonx +- DOMAIN-KEYWORD,japonx,GlobalTV +- DOMAIN-KEYWORD,japronx,GlobalTV +- DOMAIN-SUFFIX,japonx.com,GlobalTV +- DOMAIN-SUFFIX,japonx.tv,GlobalTV +- DOMAIN-SUFFIX,japonx.net,GlobalTV +- DOMAIN-SUFFIX,japonx.vip,GlobalTV +- DOMAIN-SUFFIX,japronx.com,GlobalTV +- DOMAIN-SUFFIX,japronx.tv,GlobalTV +- DOMAIN-SUFFIX,japronx.net,GlobalTV +- DOMAIN-SUFFIX,japronx.vip,GlobalTV # > JOOX # - USER-AGENT,WeMusic*,GlobalTV # - USER-AGENT,JOOX*,GlobalTV - DOMAIN-SUFFIX,joox.com,GlobalTV -# > MytvSUPER +# > KKBOX +- DOMAIN-SUFFIX,kkbox.com,GlobalTV +- DOMAIN-SUFFIX,kkbox.com.tw,GlobalTV +- DOMAIN-SUFFIX,kfs.io,GlobalTV + +# > Line TV +# - USER-AGENT,LINE*,GlobalTV +- DOMAIN-SUFFIX,d3c7rimkq79yfu.cloudfront.net,GlobalTV +- DOMAIN-SUFFIX,linetv.tw,GlobalTV + +# > myTV_SUPER # - USER-AGENT,mytv*,GlobalTV -- DOMAIN-KEYWORD,nowtv100,GlobalTV -- DOMAIN-KEYWORD,rthklive,GlobalTV - DOMAIN-SUFFIX,mytvsuper.com,GlobalTV - DOMAIN-SUFFIX,tvb.com,GlobalTV # > Pandora - DOMAIN-SUFFIX,pandora.com,GlobalTV -# > Sky GO -# - USER-AGENT,skygo*,GlobalTV -- DOMAIN-SUFFIX,sky.com,GlobalTV -- DOMAIN-SUFFIX,skygo.co.nz,GlobalTV +# > PBS +# - USER-AGENT,PBS*,GlobalTV +- DOMAIN-SUFFIX,pbs.org,GlobalTV + +# > Pornhub +- DOMAIN-SUFFIX,phncdn.com,GlobalTV +- DOMAIN-SUFFIX,phprcdn.com,GlobalTV +- DOMAIN-SUFFIX,pornhub.com,GlobalTV +- DOMAIN-SUFFIX,pornhubpremium.com,GlobalTV # > SoundCloud # - USER-AGENT,SoundCloud*,GlobalTV - DOMAIN-SUFFIX,sndcdn.com,GlobalTV - DOMAIN-SUFFIX,soundcloud.com,GlobalTV -# > viuTV +# > ViuTV +# - USER-AGENT,ViuTV*,GlobalTV - DOMAIN-SUFFIX,cloudfront.net,GlobalTV - DOMAIN-SUFFIX,viu.com,GlobalTV - 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-SUFFIX,googlevideo.com,GlobalTV - DOMAIN-SUFFIX,gvt2.com,GlobalTV - DOMAIN-SUFFIX,youtu.be,GlobalTV + + # > Netflix - DOMAIN-SUFFIX,netflix.com,Netflix - DOMAIN-SUFFIX,netflix.net,Netflix @@ -8785,6 +8810,7 @@ Rule: - DOMAIN-SUFFIX,airtable.com,Proxy - DOMAIN-SUFFIX,alfredapp.com,Proxy - DOMAIN-SUFFIX,allconnected.co,Proxy +- DOMAIN-SUFFIX,amazon.co,Proxy - DOMAIN-SUFFIX,amazon.com,Proxy - DOMAIN-SUFFIX,amazonaws.com,Proxy - DOMAIN-SUFFIX,ampproject.com,Proxy @@ -8975,6 +9001,7 @@ Rule: - DOMAIN-SUFFIX,homedepot.com,Proxy - DOMAIN-SUFFIX,hootsuite.com,Proxy - DOMAIN-SUFFIX,howtoforge.com,Proxy +- DOMAIN-SUFFIX,i-cable.com,Proxy - DOMAIN-SUFFIX,iam.soy,Proxy - DOMAIN-SUFFIX,icoco.com,Proxy - DOMAIN-SUFFIX,icons8.com,Proxy @@ -9100,6 +9127,7 @@ Rule: - DOMAIN-SUFFIX,popo.tw,Proxy - DOMAIN-SUFFIX,potato.im,Proxy - DOMAIN-SUFFIX,redd.it,Proxy +- DOMAIN-SUFFIX,rthk.hk,Proxy - DOMAIN-SUFFIX,prfct.co,Proxy - DOMAIN-SUFFIX,proxfree.com,Proxy - DOMAIN-SUFFIX,psiphon3.com,Proxy @@ -9575,6 +9603,7 @@ Rule: - DOMAIN-SUFFIX,digicert.com,Domestic - DOMAIN-SUFFIX,douban.com,Domestic - DOMAIN-SUFFIX,doubanio.com,Domestic +- DOMAIN-SUFFIX,douyin.com,Domestic - DOMAIN-SUFFIX,douyu.com,Domestic - DOMAIN-SUFFIX,douyu.tv,Domestic - DOMAIN-SUFFIX,douyutv.com,Domestic @@ -9762,14 +9791,38 @@ Rule: - IP-CIDR,1.255.62.0/24,Domestic +# > CN +- DOMAIN-SUFFIX,cn,Domestic + # > Apple +# - USER-AGENT,%E5%9C%B0%E5%9B%BE*,DIRECT +# - USER-AGENT,%E8%AE%BE%E7%BD%AE*,DIRECT +# - USER-AGENT,*com.apple.mobileme.fmip1,DIRECT +# - USER-AGENT,*WeatherFoundation*,DIRECT +# - USER-AGENT,DIRECTNews*,DIRECT +# - USER-AGENT,AppStore*,DIRECT +# - USER-AGENT,com.apple.appstored*,DIRECT +# - USER-AGENT,com.apple.geod*,DIRECT +# - USER-AGENT,com.apple.Maps,DIRECT +# - USER-AGENT,com.apple.news*,DIRECT +# - USER-AGENT,FindMyFriends*,DIRECT +# - USER-AGENT,FindMyiPhone*,DIRECT +# - USER-AGENT,FMDClient*,DIRECT +# - USER-AGENT,FMFD*,DIRECT +# - USER-AGENT,fmflocatord*,DIRECT +# - USER-AGENT,geod*,DIRECT +# - USER-AGENT,locationd*,DIRECT +# - USER-AGENT,Maps*,DIRECT +# - USER-AGENT,TestFlight*,DIRECT - DOMAIN,Apple.comscoreresearch.com,Apple - DOMAIN-SUFFIX,Apple.cn,Apple - DOMAIN-SUFFIX,Apple.com,Apple - DOMAIN-SUFFIX,Apple.news,Apple +- DOMAIN-SUFFIX,cdn-apple.com,Apple - DOMAIN-SUFFIX,icloud.com,Apple +- DOMAIN-SUFFIX,icloud.com.cn,Apple - DOMAIN-SUFFIX,icloud-content.com,Apple - DOMAIN-SUFFIX,itunes.com,Apple - DOMAIN-SUFFIX,me.com,Apple 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 cf7ef237f3..bbb255ca12 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.36.11-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAAAqCAMAAACEAtzLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEQTAxOUY0NjYyRTExRUE4NDQwRkE3NUQyMjZBRDhDIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEQTAxOUY1NjYyRTExRUE4NDQwRkE3NUQyMjZBRDhDIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRBMDE5RjI2NjJFMTFFQTg0NDBGQTc1RDIyNkFEOEMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkRBMDE5RjM2NjJFMTFFQTg0NDBGQTc1RDIyNkFEOEMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7XrLZPAAADAFBMVEWhoaEqjcVlrNSy0eKGv9+6urqiwdIFbamUxeFUi6vh7/dISEilpaWKioqxytjR0dE0dJoccqM9PT3R5vMJeLhFgKIihLwJca0FVYIGZp2enp6CgoIGcKxjlLEbhcEwk8ve3t45lckHVoS1tbUVapo/Pz9ubm5FmsoJdbPa2trn5+ez1ukkeqrOzs7R4emStcqRkZFFRUVLS0sEXI4IXIxycnIkapI2kcZ3d3eixdmFhYUEU4CEtNCcnJxiYmIKaqC/v7+srKx4eHhWlroXYoyCrsZkpcvg4OBFkr5DQ0MEWYlBQUGizOUEXpGUlJR0tNjCwsIFYJRqamoJYJLIyMhXpdIJZJhkm7vFxcVAQEDAwMA0fKYFaaIFZZu2trYXgL3Kysp0sdUgdabB2efB1OAIZ54Hc7FKn89lZWXw9PdgYGBHnMzR3+gYbZ0micGkzuZ0p8SNjY0IX5EJWIVzoLoFcrAGbKU1hrRJns5ynrhGirCDq8IJbaUEYpivr690dHQFa6WJweKiv9Emb5mDqsFEf6GEsswJb6portcYe7QBcrNZWVlTU1NRUVFUVFRVVVULfL1SUlIKe7wHeLkFdrdWVlYEdbYEdrYOgMAOf8ADdbUDdLQDdLUSg8MSg8QShMQThMUAcrJXV1cGd7gOf78Nfr8Nfr4Mfb4Mfb0IeboJeroJe7sJers6OjqqqqrV1dXU1NSrq6upqak7OzuAgIB+fn7C3u7w9/v19fWBgYGEvN3q6uqEvd3z8/P09PRMTEyDvNx/f3+Fvt6Css6CqcBGm8vv9Pfg6vDB3e3A1N8IV4TB3e7o6OgUXong6u9Hm8zB3u6Xl5fW1taFvd6Fvd2ErMLC3+9Vos+Dr8iCutrD3+9EmcrC3u9Inc1Inc6Eq8IFdLPB2+oHdrXv9vqCsMrB1eAFZ5/C3OsId7cab6CSvdYnhr3Q5PAIWIcLerkCc7QRgsMPgMEQgcJaWlpfX19NTU1eXl5cXFxbW1tPT09QUFBYWFhdXV1OTk7///////8CSmxRAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADElJREFUeNrsVwtYVGUaPiCGMNwaUmgGEEEuiqQzoCLjgpKGI4pkalsBmq6lZlqYRaXdL7aOKDPO3q90McRhGApmdABJSTQvaanZ3S7j1pbttpuWGh/7/f9/LnNmBuXZep6aeXyfh/N/7/d/l3++98w5A9fb63ho7DeBgFF/80MMfdTe28v1FgeGBCjCX/0SQ2N7OcfYswGCUX/xTwy1cw+dDRgR/uyneJQb+32gYNS//RRDue8vi/CTI5BE+I+/gvs2YHBZhJ8BFn7tr+C+CxhcFuHnIMLv/BXcfwMGC3/vr/Apgnry5Ml3p//4Y1qiVi8RSbpa3Z+cInVRf0V4ri98HbQuJOR2b//tISGPzk2SO3zGDZMVuz3JKyIEQp77/8Gt90RBpQMoio8UrP+BUE9Wy7gDjoh2GSzoT4k34I1+Nlv4fF8YRD9P+DC5dyX7mPYQwRFiJ/wdr/Rque8dqPYKQRH67F4dUv38xeElQpETYIRNpcrG86h/qAiTYbI7NU+CYlFrgDE/sggv9IFdsPSuB64dAPYkmRuge/Sx0d0AuyhNigVYfuzYY1ke2UHr7HBcZM9XZwFU+2ix64W+2/e9x8BdkKOgGNrTlQRaVbv6wg8EiiDj6QDpvHkE2mv7U0Kj1PSz2cItvhEEELMK4YKVMr9rMPGuioJwSo/Dchp2gzybfluOC2wXpdVePXDQW/rCxfYYOK+xtRco9QqtVqNUmmf3d9h5apleanW6bxEUI0FoaIXKHl+5glxCDUmEArW6wP12kVMU4UWfeGEWRJ1eExc3bzDYZRurVuUuLizMHQxA2DpYOmVVVWHhvHny9F1vn3DBcYFV75p4DEXwaoKDfvHFoOphkiepujrIbU/Ir3aPEeApggNUaRuoZdYSwwrbKdsOVv56pBjAdsEGtgIbPrnIro28RBw2GgdQQKm1gBIGsfoGFTil74RZnisVv6AuJmmOm7GIDVjhPCtxWfP4yPSbCa10P/qVm3gkAQQxayUM2rQpCz7MJOQG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 \ No newline at end of file +v0.36.12-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAAAqCAMAAACEAtzLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkQzMkI0OEVFNkE0MzExRUE4ODI1Q0I0MTVGNjYzQThEIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkQzMkI0OEVGNkE0MzExRUE4ODI1Q0I0MTVGNjYzQThEIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RDMyQjQ4RUM2QTQzMTFFQTg4MjVDQjQxNUY2NjNBOEQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RDMyQjQ4RUQ2QTQzMTFFQTg4MjVDQjQxNUY2NjNBOEQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4a7y+kAAADAFBMVEUKaqE1dZp+fn6tra0GXpFJns6hoaGGv99lrNQqjcW6uroFbakGcKwIca05lcnR5vOUxeFUi6vh7/dISEilpaWKioqxytjR0dEHVoQccaI9PT0bhcFFgKIihLwFVYIGZp0JeLienp6CgoJjlLEwk8t1tdne3t61tbUVapo/Pz8IXIyStclubm7a2tqizeUXYYzn5+ckeqrOzs7R4emRkZFFRUVLS0sEXI5ycnIkapI2kcZ3d3eixtqFhYUEU4BFmsoJZJhFkb2cnJxiYmJjnLxYptK/v794eHhWlrqy1uqCrseEtNDg4OBDQ0MEWYlBQUEKYZPw9PeUlJTCwsIFYJRqamqiwNHIyMgKdrUXgb7FxcVAQEDAwMA0fKYFZZsFaaLQ3+i2trbKysqy0OEgdabB1ODB2ecIZ54HdbIJWIVlZWVgYGAYbZ5Hi7IKdbGTvteDudikzuYmicF0p8SNjY1zoLoFcrAIbKU1hrRynrhHnMyDq8KCqsBkp82hv9AEYph0dHQFa6WJweIUXol0sdUmb5lEf6GEsswJb6portcYe7QIcq8BcrNZWVlTU1NRUVFUVFRVVVULfL1SUlIKe7wHeLkFdrdWVlYOf8AOgMADdLUEdrYDdbUEdbYDdLQSg8MSg8QShMQThMUAcrJXV1cOf78Gd7gNfr8Nfr4Mfb4Mfb0IeboJeroJe7sJers6OjqqqqrV1dXU1NSrq6upqak7Ozvw9/vC3u6AgID19fWBgYGEvN2DvNzq6uqCqcCEvd309PTz8/NMTEzv9PeFvt7B3e3g6vBGm8vB3e7A1N/o6OiCss6Xl5eErMLB3u7g6u/C3++Fvd6Fvd3W1tZHm8zC3u9Vos8IV4TD3++Du9xEmcqDr8jB1eAHdrWy0+bv9vqEq8IFdLPB2+qixNeDrcUnbZUFZ5/R5O8nhr0Lerl/uNgmcZzP5PEHWIdGibACc7QRgsMPgMEQgcJaWlpfX19NTU1eXl5cXFxbW1tPT09QUFBYWFhdXV1OTk7///////8wtP/fAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADH5JREFUeNrsVwtYVGUaPsAMF0FQBhAHJWdQkIuo6AwqMeCSEsIISl7YCi+54qW1tNIyy9K2MtcRYWB2t932RlfE4dbQqNy8kJqpXa2cLma51a7ttpuWGh99//+fy5wZUJ6t56mZx/d55vzf/fvP9545/wzX02P3m/S1N2D83zwQIzfZenq4ngLvoABJ+KtHYmRYD2efdMFLMP4vnomRNs7vgteQ8GcPxSZu0nfegvH/8VCM5L67RsJPDm8i4b+eCu4br8E1En4GWPKVp4L71mtwjYSfAwm/91Rw//MaLPmdp6JXErR+fn53p/z4Y1qh1a4QlRSttj85udrc/pLwdF/4KmhLQIDS3a4MCNg0LUZu6CXuK2WoKMZMC9g0KtQtJAACnv7/wW1zRc4iO1AUHM3Z9gOh9dPKdDscFeViWNyfEm/AG/1stuTZvjCI3k94qNy6mt2mLUAwBNiI/o5bulK0Bb3DcsJcSj2LJPTZXRmgfPbKcCMhtxVgTJNGk4a9tD+UBD/wc1Yt06FA5Bpg4o9MwnN94ADMuuvXN94GthiZGaAr+dXkLoADVI0JA5jw6qtzP3DJDtpigxO8rARwYMgs11LY4sBzfbfv28fAXZYjpwA6U9QEek2n9vIPBJIg01MAUnjxKHRW9qeETq3rZ7Mlz/eOIACf5QgHrJbZHcOIdXkUhFP1BEygYUXybPrkn+AV5dxPSYjPhzBKHoWDfr4vXMnHwLmNrTNHbVTp9Tq12jKnv8PO0Mr40mpTeidBNQ78ebEBFnX3livQJdSQSMjRanOcHxe5iiS80DtGQdTydasezx4GNpl9+fKkMo5LGgZAtC0wa+zyIo7LzpZnH7jzlANO8Mqq5SSk7FyyaBGi4MALLwQpQyVLjFIZ5OTjoVQ6xwhwJcEOmsTtVLLoidAAu6m2Gxr469ECgKbLTdCU04RvLuJtIoeIvYnGAeRQtSGHKgxi9e0aaJW+ExZ5rlT8sraApNlvwSJNwApnNBBTQwYfmXILURc5b33o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 \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua index 008f902a0e..48c9298f09 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua @@ -70,7 +70,11 @@ local function ConnersHua_return() end local function daip() - return luci.sys.exec("ifstatus lan 2>/dev/null |jsonfilter -e '@[\"ipv4-address\"][0].address' 2>/dev/null") + local daip = luci.sys.exec("ifstatus lan 2>/dev/null |jsonfilter -e '@[\"ipv4-address\"][0].address' 2>/dev/null") + if not daip or daip == "" then + local daip = luci.sys.exec("uci get network.lan.ipaddr 2>/dev/null |awk -F '/' '{print $1}' 2>/dev/null |tr -d '\n'") + end + return daip end local function dase() diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/status.htm b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/status.htm index d8155ebf49..2275dc2df6 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/status.htm +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/status.htm @@ -163,7 +163,7 @@ XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "currentversion")%>', status.currentversion, function(x, status) { if ( x && x.status == 200 ) { - clashversion.innerHTML = 'currentversion'; + clashversion.innerHTML = 'currentversion'; } }); @@ -173,7 +173,7 @@ if ( x && x.status == 200 ) { if ( status.lastversion != "\n" && status.lastversion != "" ) { - clashversion.innerHTML = 'lastversion'; + clashversion.innerHTML = 'lastversion'; } } }); @@ -183,7 +183,7 @@ { XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "currentversion")%>', status.currentversion, function(x, status) { if ( x && x.status == 200 ) { - clashversion.innerHTML = 'currentversion'; + clashversion.innerHTML = 'currentversion'; } }); } diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/clash_version.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/clash_version.sh index da1c5ee362..03c7adf6b4 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/clash_version.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/clash_version.sh @@ -18,6 +18,7 @@ if [ "$CKTIME" != "$(grep "CheckTime" $LAST_OPVER 2>/dev/null |awk -F ':' '{prin else curl -sL --connect-timeout 10 --retry 2 "$VERSION_URL" -o $LAST_OPVER >/dev/null 2>&1 fi + LAST_VER=$(sed -n 1p "$LAST_OPVER" 2>/dev/null |awk -F '-' '{print $1$2}' 2>/dev/null |awk -F '.' '{print $2$3}' 2>/dev/null) if [ "$?" -eq "0" ] && [ -s "$LAST_OPVER" ]; then echo "CheckTime:$CKTIME" >>$LAST_OPVER else diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_version.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_version.sh index 703431459b..52e74cebd9 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_version.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_version.sh @@ -18,6 +18,7 @@ if [ "$CKTIME" != "$(grep "CheckTime" $LAST_OPVER 2>/dev/null |awk -F ':' '{prin curl -sL --connect-timeout 10 --retry 2 "$VERSION_URL" -o $LAST_OPVER >/dev/null 2>&1 fi if [ "$?" -eq "0" ] && [ -s "$LAST_OPVER" ]; then + OP_LV=$(sed -n 1p $LAST_OPVER 2>/dev/null |awk -F '-' '{print $1}' |awk -F '.' '{print $2$3}') if [ "$OP_CV" -ge "$OP_LV" ]; then sed -i "/^https:/i\CheckTime:${CKTIME}" "$LAST_OPVER" 2>/dev/null sed -i '/^https:/,$d' $LAST_OPVER diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_watchdog.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_watchdog.sh index 7b912ab728..7516c7673f 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_watchdog.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_watchdog.sh @@ -35,6 +35,7 @@ if [ "$enable" -eq 1 ]; then /usr/share/openclash/openclash_history_set.sh else echo "${LOGTIME} Watchdog: Already Restart 3 Times With Clash Core Problem, Auto-Exit." >> $LOG_FILE + /etc/init.d/openclash stop exit 0 fi else diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh index 8df2bd51a7..072e984b2f 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh @@ -85,7 +85,7 @@ cfg_get() cfg_get_alpn() { - echo "$(grep "$1" "$2" 2>/dev/null |grep -v "^ \{0,\}- name:" |awk -v tag=$1 'BEGIN{FS=tag} {print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/\}.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null)" + echo "$(grep "^ \{0,\}$1" "$2" 2>/dev/null |grep -v "^ \{0,\}- name:" |awk -v tag=$1 'BEGIN{FS=tag} {print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/\}.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null)" } echo "开始更新【$CONFIG_NAME】的代理集配置..." >$START_LOG 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 82bbf64da7..ffb6d668a2 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 @@ -103,7 +103,7 @@ set_alpn() return fi cat >> "$SERVER_FILE" <<-EOF - - "$1" + - $1 EOF } @@ -183,7 +183,11 @@ yml_servers_set() fi fi - if [ ! -z "$udp" ] && [ "$obfs" = "none" ]; then + if [ ! -z "$udp" ] && [ "$obfs" = "none" ] && [ "$type" = "ss" ]; then + udp=", udp: $udp" + fi + + if [ ! -z "$udp" ] && [ "$type" != "trojan" ] && [ "$type" != "ss" ]; then udp=", udp: $udp" fi @@ -219,7 +223,7 @@ yml_servers_set() fi fi - if [ ! -z "$skip_cert_verify" ] && [ "$type" != "ss" ]; then + if [ ! -z "$skip_cert_verify" ] && [ "$type" != "ss" ] && [ "$type" != "trojan" ]; then skip_cert_verify=", skip-cert-verify: $skip_cert_verify" elif [ ! -z "$skip_cert_verify" ]; then skip_cert_verify="skip-cert-verify: $skip_cert_verify" @@ -278,10 +282,14 @@ EOF fi if [ "$type" = "vmess" ]; then - echo "- { name: \"$name\", type: $type, server: $server, port: $port, uuid: $uuid, alterId: $alterId, cipher: $securitys$skip_cert_verify$obfs_vmess$path$custom$tls }" >>$SERVER_FILE + echo "- { name: \"$name\", type: $type, server: $server, port: $port, uuid: $uuid, alterId: $alterId, cipher: $securitys$udp$skip_cert_verify$obfs_vmess$path$custom$tls }" >>$SERVER_FILE fi - if [ "$type" = "socks5" ] || [ "$type" = "http" ]; then + if [ "$type" = "socks5" ]; then + echo "- { name: \"$name\", type: $type, server: $server, port: $port, username: $auth_name, password: $auth_pass$udp$skip_cert_verify$tls }" >>$SERVER_FILE + fi + + if [ "$type" = "http" ]; then echo "- { name: \"$name\", type: $type, server: $server, port: $port, username: $auth_name, password: $auth_pass$skip_cert_verify$tls }" >>$SERVER_FILE fi @@ -311,7 +319,7 @@ EOF fi if [ ! -z "$skip_cert_verify" ]; then cat >> "$SERVER_FILE" <<-EOF - $skip_cert_verify + $skip_cert_verify EOF fi fi 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 e2ebfc632b..49533b43c3 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 @@ -147,7 +147,7 @@ fi sed -i '/^##Custom Rules 2 End##/d' "$4" 2>/dev/null sed -i '/- DOMAIN-KEYWORD,tracker,DIRECT/d' "$4" 2>/dev/null sed -i '/- DOMAIN-KEYWORD,announce,DIRECT/d' "$4" 2>/dev/null - sed -i '/- DOMAIN-KEYWORD,tracker,tracker/d' "$4" 2>/dev/null + sed -i '/- DOMAIN-KEYWORD,torrent,DIRECT/d' "$4" 2>/dev/null if [ "$3" = 1 ]; then sed -i '/^Rule:/a\##Custom Rules End##' "$4" 2>/dev/null