Merge branch 'master' into patch-3

5 years ago · 20ac111bdd
parent 33b80f7712 8473549500
commit 20ac111bdd
11 changed files with 343 additions and 241 deletions
--- a/Clash/Rule.yaml
+++ b/Clash/Rule.yaml
@ -8459,13 +8459,10 @@



-# > 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
@ -8479,6 +8476,18 @@
 - 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
@ -8490,20 +8499,12 @@
 - 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
@ -8515,97 +8516,121 @@

 # > 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
-
-# > Epicgames
- DOMAIN-KEYWORD,epicgames,GlobalTV
- DOMAIN-SUFFIX,helpshift.com,GlobalTV
+# > encoreTVB
+# - USER-AGENT,encoreTVB*,GlobalTV
+- DOMAIN-SUFFIX,encoretvb.com,GlobalTV
+- DOMAIN,content.jwplatform.com,GlobalTV
+- DOMAIN,videos-f.jwpsrv.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,uplynk.com,GlobalTV
+
+# > Fox+ (HK|TW|SG)
+# - USER-AGENT,FOXPlus*,GlobalTV
+- DOMAIN-SUFFIX,akamaized.net,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

-# > HBO && HBO Go
+# > 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
--- a/Shadowrocket/Complete.conf
+++ b/Shadowrocket/Complete.conf
@ -8501,13 +8501,10 @@ IP-CIDR,106.11.0.0/16,DIRECT,no-resolve



-# > ABC
-DOMAIN-SUFFIX,edgedatg.com,PROXY
-DOMAIN-SUFFIX,go.com,PROXY
-
-# > Abema TV
+# > AbemaTV
 USER-AGENT,AbemaTV*,PROXY
 DOMAIN-SUFFIX,abema.io,PROXY
+DOMAIN-SUFFIX,abema.tv,PROXY
 DOMAIN-SUFFIX,akamaized.net,PROXY
 DOMAIN-SUFFIX,ameba.jp,PROXY
 DOMAIN-SUFFIX,hayabusa.io,PROXY
@ -8516,11 +8513,23 @@ DOMAIN-SUFFIX,hayabusa.io,PROXY
 USER-AGENT,InstantVideo.US*,PROXY
 USER-AGENT,Prime%20Video*,PROXY
 DOMAIN-SUFFIX,aiv-cdn.net,PROXY
-DOMAIN-SUFFIX,amazonaws.com,PROXY
 DOMAIN-SUFFIX,amazonaws.co.uk,PROXY
+DOMAIN-SUFFIX,amazonaws.com,PROXY
 DOMAIN-SUFFIX,amazonvideo.com,PROXY
 DOMAIN-SUFFIX,llnwd.net,PROXY

+# > Apple News and Apple Map TOMTOM Version
+USER-AGENT,AppleNews*,PROXY
+USER-AGENT,com.apple.news*,PROXY
+DOMAIN,gspe1-ssl.ls.apple.com,PROXY
+# USER-AGENT,News*,PROXY
+# DOMAIN,apple.comscoreresearch.com,PROXY
+# DOMAIN,gateway.icloud.com,PROXY
+# DOMAIN,news-client.apple.com,PROXY
+# DOMAIN,news-edge.apple.com,PROXY
+# DOMAIN,news-events.apple.com,PROXY
+# DOMAIN-SUFFIX,apple.news,PROXY
+
 # > Apple TV
 DOMAIN,np-edge.itunes.apple.com,PROXY
 DOMAIN,play-edge.itunes.apple.com,PROXY
@ -8532,20 +8541,12 @@ DOMAIN-SUFFIX,bahamut.com.tw,PROXY
 DOMAIN-SUFFIX,gamer.com.tw,PROXY
 DOMAIN-SUFFIX,hinet.net,PROXY

-# > BBC
+# > BBC iPlayer
 USER-AGENT,BBCiPlayer*,PROXY
-DOMAIN-KEYWORD,bbcfmt,PROXY
-DOMAIN-KEYWORD,co.uk,PROXY
-DOMAIN-KEYWORD,uk-live,PROXY
-DOMAIN-SUFFIX,bbc.co,PROXY
 DOMAIN-SUFFIX,bbc.co.uk,PROXY
-DOMAIN-SUFFIX,bbc.com,PROXY
-DOMAIN-SUFFIX,bbci.co,PROXY
 DOMAIN-SUFFIX,bbci.co.uk,PROXY
-
-# > CHOCO TV
-USER-AGENT,TwDramas*,PROXY
-DOMAIN-SUFFIX,chocotv.com.tw,PROXY
+DOMAIN-KEYWORD,bbcfmt,PROXY
+DOMAIN-KEYWORD,uk-live,PROXY

 # > DAZN
 DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net,PROXY
@ -8557,92 +8558,111 @@ DOMAIN-SUFFIX,intercom.io,PROXY

 # > Disney Plus
 USER-AGENT,Disney*,PROXY
-DOMAIN,cdn.registerdisney.go.com,PROXY
 DOMAIN-SUFFIX,disneyplus.com,PROXY
 DOMAIN-SUFFIX,disney-plus.net,PROXY
 DOMAIN-SUFFIX,dssott.com,PROXY
 DOMAIN-SUFFIX,bamgrid.com,PROXY
 DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com,PROXY
+DOMAIN,cdn.registerdisney.go.com,PROXY

-# > Now E
-USER-AGENT,PCCW*,PROXY
-DOMAIN-KEYWORD,nowe,PROXY
-DOMAIN,bcbolthboa-a.akamaihd.net,PROXY
-DOMAIN-SUFFIX,nowe.com,PROXY
-DOMAIN-SUFFIX,youboranqs01.com,PROXY
-
-# > Epicgames
-DOMAIN-KEYWORD,epicgames,PROXY
-DOMAIN-SUFFIX,helpshift.com,PROXY
+# > encoreTVB
+USER-AGENT,encoreTVB*,PROXY
+DOMAIN-SUFFIX,encoretvb.com,PROXY
+DOMAIN,content.jwplatform.com,PROXY
+DOMAIN,videos-f.jwpsrv.com,PROXY

-# > Fox+
+# > Fox Now
 USER-AGENT,FOX%20NOW*,PROXY
-USER-AGENT,FOXPlus*,PROXY
-DOMAIN-KEYWORD,foxplus,PROXY
-DOMAIN-SUFFIX,config.fox.com,PROXY
-DOMAIN-SUFFIX,emome.net,PROXY
 DOMAIN-SUFFIX,fox.com,PROXY
 DOMAIN-SUFFIX,foxdcg.com,PROXY
-DOMAIN-SUFFIX,foxnow.com,PROXY
+DOMAIN-SUFFIX,uplynk.com,PROXY
+
+# > Fox+ (HK|TW|SG)
+USER-AGENT,FOXPlus*,PROXY
+DOMAIN-SUFFIX,akamaized.net,PROXY
 DOMAIN-SUFFIX,foxplus.com,PROXY
-DOMAIN-SUFFIX,foxplay.com,PROXY
-DOMAIN-SUFFIX,ipinfo.io,PROXY
-DOMAIN-SUFFIX,mstage.io,PROXY
-DOMAIN-SUFFIX,now.com,PROXY
 DOMAIN-SUFFIX,theplatform.com,PROXY
-DOMAIN-SUFFIX,urlload.net,PROXY

-# > HBO && HBO Go
+# > HBO NOW & HBO GO
 USER-AGENT,HBO%20NOW*,PROXY
 DOMAIN-SUFFIX,execute-api.ap-southeast-1.amazonaws.com,PROXY
 DOMAIN-SUFFIX,hbo.com,PROXY
+DOMAIN-SUFFIX,hbogo.com,PROXY
 DOMAIN-SUFFIX,hboasia.com,PROXY
 DOMAIN-SUFFIX,hbogo.com,PROXY
 DOMAIN-SUFFIX,hbogoasia.com,PROXY
 DOMAIN-SUFFIX,hbogoasia.hk,PROXY

-# > Hulu
-USER-AGENT,Hulu*,PROXY
+# > Hulu(フールー)
 DOMAIN-SUFFIX,happyon.jp,PROXY
+DOMAIN-SUFFIX,hulu.jp,PROXY
+
+# > Hulu
 DOMAIN-SUFFIX,hulu.com,PROXY
 DOMAIN-SUFFIX,huluim.com,PROXY
 DOMAIN-SUFFIX,hulustream.com,PROXY

-# > Imkan
-DOMAIN-SUFFIX,imkan.tv,PROXY
+# > Japonx
+DOMAIN-KEYWORD,japonx,PROXY
+DOMAIN-KEYWORD,japronx,PROXY
+DOMAIN-SUFFIX,japonx.com,PROXY
+DOMAIN-SUFFIX,japonx.tv,PROXY
+DOMAIN-SUFFIX,japonx.net,PROXY
+DOMAIN-SUFFIX,japonx.vip,PROXY
+DOMAIN-SUFFIX,japronx.com,PROXY
+DOMAIN-SUFFIX,japronx.tv,PROXY
+DOMAIN-SUFFIX,japronx.net,PROXY
+DOMAIN-SUFFIX,japronx.vip,PROXY

 # > JOOX
 USER-AGENT,WeMusic*,PROXY
 USER-AGENT,JOOX*,PROXY
 DOMAIN-SUFFIX,joox.com,PROXY

-# > MytvSUPER
+# > KKBOX
+DOMAIN-SUFFIX,kkbox.com,PROXY
+DOMAIN-SUFFIX,kkbox.com.tw,PROXY
+DOMAIN-SUFFIX,kfs.io,PROXY
+
+# > Line TV
+USER-AGENT,LINE*,PROXY
+DOMAIN-SUFFIX,d3c7rimkq79yfu.cloudfront.net,PROXY
+DOMAIN-SUFFIX,linetv.tw,PROXY
+
+# > myTV_SUPER
 USER-AGENT,mytv*,PROXY
-DOMAIN-KEYWORD,nowtv100,PROXY
-DOMAIN-KEYWORD,rthklive,PROXY
 DOMAIN-SUFFIX,mytvsuper.com,PROXY
 DOMAIN-SUFFIX,tvb.com,PROXY

 # > Pandora
 DOMAIN-SUFFIX,pandora.com,PROXY

-# > Sky GO
-USER-AGENT,skygo*,PROXY
-DOMAIN-SUFFIX,sky.com,PROXY
-DOMAIN-SUFFIX,skygo.co.nz,PROXY
+# > PBS
+USER-AGENT,PBS*,PROXY
+DOMAIN-SUFFIX,pbs.org,PROXY
+
+# > Pornhub
+DOMAIN-SUFFIX,phncdn.com,PROXY
+DOMAIN-SUFFIX,phprcdn.com,PROXY
+DOMAIN-SUFFIX,pornhub.com,PROXY
+DOMAIN-SUFFIX,pornhubpremium.com,PROXY

 # > SoundCloud
 USER-AGENT,SoundCloud*,PROXY
 DOMAIN-SUFFIX,sndcdn.com,PROXY
 DOMAIN-SUFFIX,soundcloud.com,PROXY

-# > viuTV
+# > ViuTV
 USER-AGENT,ViuTV*,PROXY
 DOMAIN-SUFFIX,cloudfront.net,PROXY
 DOMAIN-SUFFIX,viu.com,PROXY
 DOMAIN-SUFFIX,viu.tv,PROXY
 DOMAIN-SUFFIX,viu.now.com,PROXY

+# > Youtube_Music
+USER-AGENT,*YouTubeMusic*,PROXY
+USER-AGENT,*com.google.ios.youtubemusic*,PROXY
+
 # > Youtube
 USER-AGENT,*youtube*,PROXY
 USER-AGENT,YouTube*,PROXY
@ -8651,6 +8671,8 @@ DOMAIN-SUFFIX,googlevideo.com,PROXY
 DOMAIN-SUFFIX,gvt2.com,PROXY
 DOMAIN-SUFFIX,youtu.be,PROXY

+
+
 # > Netflix
 DOMAIN-SUFFIX,netflix.com,PROXY
 DOMAIN-SUFFIX,netflix.net,PROXY
--- a/Surfboard/Rule.conf
+++ b/Surfboard/Rule.conf
@ -8467,11 +8467,11 @@ DOMAIN-SUFFIX,biligame.net,DIRECT
 DOMAIN-SUFFIX,bilivideo.com,DIRECT
 DOMAIN-SUFFIX,hdslb.com,DIRECT
 DOMAIN-SUFFIX,im9.com,DIRECT
-// USER-AGENT,*bili*,DIRECT
+// // USER-AGENT,*bili*,DIRECT

 # > IQIYI
-// USER-AGENT,QIYI*,DIRECT
-// USER-AGENT,iQiYi*,DIRECT
+// // USER-AGENT,QIYI*,DIRECT
+// // USER-AGENT,iQiYi*,DIRECT
 DOMAIN-KEYWORD,qiyi,DIRECT
 DOMAIN-SUFFIX,qy.net,DIRECT
 IP-CIDR,101.227.0.0/16,DIRECT,no-resolve
@ -8482,8 +8482,8 @@ IP-CIDR,119.176.0.0/12,DIRECT,no-resolve
 DOMAIN-SUFFIX,api.mob.app.letv.com,DIRECT

 # > MOO
-// USER-AGENT,MOO*,DIRECT
-// USER-AGENT,TencentMidasConnect*,DIRECT
+// // USER-AGENT,MOO*,DIRECT
+// // USER-AGENT,TencentMidasConnect*,DIRECT

 # > Tencent Video
 DOMAIN-SUFFIX,vv.video.qq.com,DIRECT
@ -8493,13 +8493,10 @@ IP-CIDR,106.11.0.0/16,DIRECT,no-resolve



-# > ABC
-DOMAIN-SUFFIX,edgedatg.com,Proxy
-DOMAIN-SUFFIX,go.com,Proxy
-
-# > Abema TV
+# > AbemaTV
 // USER-AGENT,AbemaTV*,Proxy
 DOMAIN-SUFFIX,abema.io,Proxy
+DOMAIN-SUFFIX,abema.tv,Proxy
 DOMAIN-SUFFIX,akamaized.net,Proxy
 DOMAIN-SUFFIX,ameba.jp,Proxy
 DOMAIN-SUFFIX,hayabusa.io,Proxy
@ -8513,6 +8510,18 @@ DOMAIN-SUFFIX,amazonaws.com,Proxy
 DOMAIN-SUFFIX,amazonvideo.com,Proxy
 DOMAIN-SUFFIX,llnwd.net,Proxy

+# > Apple News and Apple Map TOMTOM Version
+// USER-AGENT,AppleNews*,Proxy
+// USER-AGENT,com.apple.news*,Proxy
+DOMAIN,gspe1-ssl.ls.apple.com,Proxy
+# // USER-AGENT,News*,Proxy
+# DOMAIN,apple.comscoreresearch.com,Proxy
+# DOMAIN,gateway.icloud.com,Proxy
+# DOMAIN,news-client.apple.com,Proxy
+# DOMAIN,news-edge.apple.com,Proxy
+# DOMAIN,news-events.apple.com,Proxy
+# DOMAIN-SUFFIX,apple.news,Proxy
+
 # > Apple TV
 DOMAIN,np-edge.itunes.apple.com,Proxy
 DOMAIN,play-edge.itunes.apple.com,Proxy
@ -8524,20 +8533,12 @@ DOMAIN-SUFFIX,bahamut.com.tw,Proxy
 DOMAIN-SUFFIX,gamer.com.tw,Proxy
 DOMAIN-SUFFIX,hinet.net,Proxy

-# > BBC
+# > BBC iPlayer
 // USER-AGENT,BBCiPlayer*,Proxy
-DOMAIN-KEYWORD,bbcfmt,Proxy
-DOMAIN-KEYWORD,co.uk,Proxy
-DOMAIN-KEYWORD,uk-live,Proxy
-DOMAIN-SUFFIX,bbc.co,Proxy
 DOMAIN-SUFFIX,bbc.co.uk,Proxy
-DOMAIN-SUFFIX,bbc.com,Proxy
-DOMAIN-SUFFIX,bbci.co,Proxy
 DOMAIN-SUFFIX,bbci.co.uk,Proxy
-
-# > CHOCO TV
-// USER-AGENT,TwDramas*,Proxy
-DOMAIN-SUFFIX,chocotv.com.tw,Proxy
+DOMAIN-KEYWORD,bbcfmt,Proxy
+DOMAIN-KEYWORD,uk-live,Proxy

 # > DAZN
 DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net,Proxy
@ -8549,92 +8550,111 @@ DOMAIN-SUFFIX,intercom.io,Proxy

 # > Disney Plus
 // USER-AGENT,Disney*,Proxy
-DOMAIN,cdn.registerdisney.go.com,Proxy
 DOMAIN-SUFFIX,disneyplus.com,Proxy
 DOMAIN-SUFFIX,disney-plus.net,Proxy
 DOMAIN-SUFFIX,dssott.com,Proxy
 DOMAIN-SUFFIX,bamgrid.com,Proxy
 DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com,Proxy
+DOMAIN,cdn.registerdisney.go.com,Proxy

-# > Now E
-// USER-AGENT,PCCW*,Proxy
-DOMAIN-KEYWORD,nowe,Proxy
-DOMAIN,bcbolthboa-a.akamaihd.net,Proxy
-DOMAIN-SUFFIX,nowe.com,Proxy
-DOMAIN-SUFFIX,youboranqs01.com,Proxy
-
-# > Epicgames
-DOMAIN-KEYWORD,epicgames,Proxy
-DOMAIN-SUFFIX,helpshift.com,Proxy
+# > encoreTVB
+// USER-AGENT,encoreTVB*,Proxy
+DOMAIN-SUFFIX,encoretvb.com,Proxy
+DOMAIN,content.jwplatform.com,Proxy
+DOMAIN,videos-f.jwpsrv.com,Proxy

-# > Fox+
+# > Fox Now
 // USER-AGENT,FOX%20NOW*,Proxy
-// USER-AGENT,FOXPlus*,Proxy
-DOMAIN-KEYWORD,foxplus,Proxy
-DOMAIN-SUFFIX,config.fox.com,Proxy
-DOMAIN-SUFFIX,emome.net,Proxy
 DOMAIN-SUFFIX,fox.com,Proxy
 DOMAIN-SUFFIX,foxdcg.com,Proxy
-DOMAIN-SUFFIX,foxnow.com,Proxy
+DOMAIN-SUFFIX,uplynk.com,Proxy
+
+# > Fox+ (HK|TW|SG)
+// USER-AGENT,FOXPlus*,Proxy
+DOMAIN-SUFFIX,akamaized.net,Proxy
 DOMAIN-SUFFIX,foxplus.com,Proxy
-DOMAIN-SUFFIX,foxplay.com,Proxy
-DOMAIN-SUFFIX,ipinfo.io,Proxy
-DOMAIN-SUFFIX,mstage.io,Proxy
-DOMAIN-SUFFIX,now.com,Proxy
 DOMAIN-SUFFIX,theplatform.com,Proxy
-DOMAIN-SUFFIX,urlload.net,Proxy

-# > HBO && HBO Go
+# > HBO NOW & HBO GO
 // USER-AGENT,HBO%20NOW*,Proxy
 DOMAIN-SUFFIX,execute-api.ap-southeast-1.amazonaws.com,Proxy
 DOMAIN-SUFFIX,hbo.com,Proxy
+DOMAIN-SUFFIX,hbogo.com,Proxy
 DOMAIN-SUFFIX,hboasia.com,Proxy
 DOMAIN-SUFFIX,hbogo.com,Proxy
 DOMAIN-SUFFIX,hbogoasia.com,Proxy
 DOMAIN-SUFFIX,hbogoasia.hk,Proxy

-# > Hulu
-// USER-AGENT,Hulu*,Proxy
+# > Hulu(フールー)
 DOMAIN-SUFFIX,happyon.jp,Proxy
+DOMAIN-SUFFIX,hulu.jp,Proxy
+
+# > Hulu
 DOMAIN-SUFFIX,hulu.com,Proxy
 DOMAIN-SUFFIX,huluim.com,Proxy
 DOMAIN-SUFFIX,hulustream.com,Proxy

-# > Imkan
-DOMAIN-SUFFIX,imkan.tv,Proxy
+# > Japonx
+DOMAIN-KEYWORD,japonx,Proxy
+DOMAIN-KEYWORD,japronx,Proxy
+DOMAIN-SUFFIX,japonx.com,Proxy
+DOMAIN-SUFFIX,japonx.tv,Proxy
+DOMAIN-SUFFIX,japonx.net,Proxy
+DOMAIN-SUFFIX,japonx.vip,Proxy
+DOMAIN-SUFFIX,japronx.com,Proxy
+DOMAIN-SUFFIX,japronx.tv,Proxy
+DOMAIN-SUFFIX,japronx.net,Proxy
+DOMAIN-SUFFIX,japronx.vip,Proxy

 # > JOOX
 // USER-AGENT,WeMusic*,Proxy
 // USER-AGENT,JOOX*,Proxy
 DOMAIN-SUFFIX,joox.com,Proxy

-# > MytvSUPER
+# > KKBOX
+DOMAIN-SUFFIX,kkbox.com,Proxy
+DOMAIN-SUFFIX,kkbox.com.tw,Proxy
+DOMAIN-SUFFIX,kfs.io,Proxy
+
+# > Line TV
+// USER-AGENT,LINE*,Proxy
+DOMAIN-SUFFIX,d3c7rimkq79yfu.cloudfront.net,Proxy
+DOMAIN-SUFFIX,linetv.tw,Proxy
+
+# > myTV_SUPER
 // USER-AGENT,mytv*,Proxy
-DOMAIN-KEYWORD,nowtv100,Proxy
-DOMAIN-KEYWORD,rthklive,Proxy
 DOMAIN-SUFFIX,mytvsuper.com,Proxy
 DOMAIN-SUFFIX,tvb.com,Proxy

 # > Pandora
 DOMAIN-SUFFIX,pandora.com,Proxy

-# > Sky GO
-// USER-AGENT,skygo*,Proxy
-DOMAIN-SUFFIX,sky.com,Proxy
-DOMAIN-SUFFIX,skygo.co.nz,Proxy
+# > PBS
+// USER-AGENT,PBS*,Proxy
+DOMAIN-SUFFIX,pbs.org,Proxy
+
+# > Pornhub
+DOMAIN-SUFFIX,phncdn.com,Proxy
+DOMAIN-SUFFIX,phprcdn.com,Proxy
+DOMAIN-SUFFIX,pornhub.com,Proxy
+DOMAIN-SUFFIX,pornhubpremium.com,Proxy

 # > SoundCloud
 // USER-AGENT,SoundCloud*,Proxy
 DOMAIN-SUFFIX,sndcdn.com,Proxy
 DOMAIN-SUFFIX,soundcloud.com,Proxy

-# > viuTV
+# > ViuTV
 // USER-AGENT,ViuTV*,Proxy
 DOMAIN-SUFFIX,cloudfront.net,Proxy
 DOMAIN-SUFFIX,viu.com,Proxy
 DOMAIN-SUFFIX,viu.tv,Proxy
 DOMAIN-SUFFIX,viu.now.com,Proxy

+# > Youtube_Music
+// USER-AGENT,*YouTubeMusic*,Proxy
+// USER-AGENT,*com.google.ios.youtubemusic*,Proxy
+
 # > Youtube
 // USER-AGENT,*youtube*,Proxy
 // USER-AGENT,YouTube*,Proxy
@ -8643,6 +8663,8 @@ DOMAIN-SUFFIX,googlevideo.com,Proxy
 DOMAIN-SUFFIX,gvt2.com,Proxy
 DOMAIN-SUFFIX,youtu.be,Proxy

+
+
 # > Netflix
 DOMAIN-SUFFIX,netflix.com,Proxy
 DOMAIN-SUFFIX,netflix.net,Proxy
@ -8668,7 +8690,7 @@ IP-CIDR,207.45.72.0/22,Proxy,no-resolve
 IP-CIDR,208.75.76.0/22,Proxy,no-resolve

 # > Spotify
-// USER-AGENT,*Proxy*,Proxy
+// // USER-AGENT,*Proxy*,Proxy
 DOMAIN-KEYWORD,spotify,Proxy
 DOMAIN-SUFFIX,scdn.co,Proxy
 DOMAIN-SUFFIX,spoti.fi,Proxy
@ -8706,7 +8728,7 @@ DOMAIN-SUFFIX,ooklaserver.net,Proxy


 # > PayPal
-// USER-AGENT,PayPal*,DIRECT
+// // USER-AGENT,PayPal*,DIRECT
 DOMAIN-KEYWORD,paypal,DIRECT
 DOMAIN-SUFFIX,paypal.com,DIRECT
 DOMAIN-SUFFIX,paypalobjects.com,DIRECT
@ -8714,8 +8736,8 @@ DOMAIN-SUFFIX,paypalobjects.com,DIRECT


 # > Netease Music
-// USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90,DIRECT
-// USER-AGENT,NeteaseMusic*,DIRECT
+// // USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90,DIRECT
+// // USER-AGENT,NeteaseMusic*,DIRECT
 DOMAIN-SUFFIX,music.126.net,DIRECT
 DOMAIN-SUFFIX,music.163.com,DIRECT

@ -8726,7 +8748,7 @@ DOMAIN-KEYWORD,mtalk.google.com,DIRECT
 DOMAIN,safebrowsing.googleapis.com,DIRECT

 # > Steam
-// USER-AGENT,Steam*,DIRECT
+// // USER-AGENT,Steam*,DIRECT
 DOMAIN-SUFFIX,steamcontent.com,DIRECT

 # > Private Tracker
@ -8776,7 +8798,7 @@ DOMAIN-SUFFIX,line-scdn.net,Proxy
 DOMAIN-SUFFIX,nhncorp.jp,Proxy

 # > Microsoft
-// USER-AGENT,OneDrive*,Proxy
+// // USER-AGENT,OneDrive*,Proxy
 DOMAIN-KEYWORD,microsoft,Proxy
 DOMAIN-KEYWORD,onedrive,Proxy
 DOMAIN-SUFFIX,azure.com,Proxy
@ -8787,7 +8809,7 @@ DOMAIN-SUFFIX,office.net,Proxy
 DOMAIN-SUFFIX,skype.com,Proxy

 # > Sony
-// USER-AGENT,RemotePlay*,DIRECT
+// // USER-AGENT,RemotePlay*,DIRECT
 DOMAIN-SUFFIX,playstation.com,Proxy
 DOMAIN-SUFFIX,playstation.net,Proxy
 DOMAIN-SUFFIX,playstationnetwork.com,Proxy
@ -8808,7 +8830,7 @@ DOMAIN-SUFFIX,steampowered.com,Proxy
 DOMAIN-SUFFIX,steamstatic.com,Proxy

 # > Zooba
-// USER-AGENT,battleroyale*,Proxy
+// // USER-AGENT,battleroyale*,Proxy

 # > Top blocked sites
 DOMAIN-SUFFIX,2o7.net,Proxy
@ -9803,25 +9825,25 @@ IP-CIDR,1.255.62.0/24,DIRECT,no-resolve


 # > 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
+// // 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,DIRECT
 DOMAIN-SUFFIX,apple.cn,DIRECT
 DOMAIN-SUFFIX,apple.com,DIRECT
--- a/2/Rule.conf
+++ b/2/Rule.conf
@ -8492,13 +8492,10 @@ IP-CIDR,106.11.0.0/16,AsianTV,no-resolve



-# > 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
@ -8512,6 +8509,18 @@ DOMAIN-SUFFIX,amazonaws.com,GlobalTV
 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
@ -8523,20 +8532,12 @@ DOMAIN-SUFFIX,bahamut.com.tw,GlobalTV
 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
@ -8548,92 +8549,111 @@ DOMAIN-SUFFIX,intercom.io,GlobalTV

 # > 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
-
-# > Epicgames
-DOMAIN-KEYWORD,epicgames,GlobalTV
-DOMAIN-SUFFIX,helpshift.com,GlobalTV
+# > encoreTVB
+USER-AGENT,encoreTVB*,GlobalTV
+DOMAIN-SUFFIX,encoretvb.com,GlobalTV
+DOMAIN,content.jwplatform.com,GlobalTV
+DOMAIN,videos-f.jwpsrv.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,uplynk.com,GlobalTV
+
+# > Fox+ (HK|TW|SG)
+USER-AGENT,FOXPlus*,GlobalTV
+DOMAIN-SUFFIX,akamaized.net,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

-# > HBO && HBO Go
+# > 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
@ -8642,6 +8662,8 @@ 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
--- a/3/MitM.conf
+++ b/3/MitM.conf
@ -2,7 +2,7 @@
 skip-server-cert-verify = true
 tcp-connection = false

-hostname= *.360buyimg.com, *.chelaile.net.cn, *.cnbetacdn.com, *.didistatic.com, *.doubanio.com, *.google-analytics.com, *.iydsj.com, *.k.sohu.com, *.kfc.com, *.kingsoft-office-service.com, *.meituan.net, *.ofo.com, *.pixiv.net, *.pstatp.com, *.uve.weibo.com, *.wikipedia.org, *.wikiwand.com, *.ydstatic.com, *.youdao.com, *.youtube.com, *.zhuishushenqi.com, *.zymk.cn, 101.201.62.22, 113.105.222.132, 113.96.109.*, 118.178.214.118, 119.18.193.135, 121.14.89.216, 121.9.212.178, 123.59.31.1, 14.21.76.30, 153.3.236.81, 180.101.212.22, 183.232.237.194, 183.232.246.225, 183.60.159.227, 218.11.3.70, 59.151.53.6, 59.37.96.220, 789.kakamobi.cn, a.apicloud.com, a.applovin.com, a.qiumibao.com, a.sfansclub.com, a.wkanx.com, aarkissltrial.secure2.footprint.net, acs.m.taobao.com, act.vip.iqiyi.com, activity2.api.ofo.com, adm.10jqka.com.cn, adproxy.autohome.com.cn, adse.ximalaya.com, afd.baidu.com, api*.musical.ly, api*.tiktokv.com, api.abema.io, api.app.vhall.com, api.bilibili.com, api.chelaile.net.cn, api.daydaycook.com.cn, api.douban.com, api.feng.com, api.fengshows.com, api.gotokeep.com, api.huomao.com, api.intsig.net, api.jr.mi.com, api.jxedt.com, api.k.sohu.com, api.kkmh.com, api.laifeng.com, api.live.bilibili.com, api.m.jd.com, api.m.mi.com, api.mddcloud.com.cn, api.mgzf.com, api.psy-1.com, api.rr.tv, api.smzdm.com, api.tv.sohu.com, api.wallstreetcn.com, api.weibo.cn, api.xiachufang.com, api.zhihu.com, api.zhuishushenqi.com, api5.futunn.com, api-mifit.huami.com, api-mifit-cn.huami.com, api-release.wuta-cam.com, app.10086.cn, app.58.com, app.api.ke.com, app.bilibili.com, app.m.zj.chinamobile.com, app.mixcapp.com, app.variflight.com, app.wy.guahao.com, app2.autoimg.cn, appsdk.soku.com, atrace.chelaile.net.cn, b.zhuishushenqi.com, c.m.163.com, cap.caocaokeji.cn, capi.douyucdn.cn, capi.mwee.cn, cdn.kuaidi100.com, cdn.moji.com, channel.beitaichufang.com, classbox2.kechenggezi.com, client.mail.163.com, cms.daydaycook.com.cn, connect.facebook.net, consumer.fcbox.com, creatives.ftimg.net, creditcard.ecitic.com, d.1qianbao.com, daoyu.sdo.com, dapis.mting.info, dl.app.gtja.com, dongfeng.alicdn.com, dsp-impr2.youdao.com, dspsdk.abreader.com, e.dangdang.com, erebor.douban.com, fdfs.xmcdn.com, fm.fenqile.com, frodo.douban.com, fuss10.elemecdn.com, g1.163.com, gateway.shouqiev.com, gorgon.youdao.com, gw.alicdn.com, gw-passenger.01zhuanche.com, hm.xiaomi.com, hui.sohu.com, huichuan.sm.cn, i.weread.qq.com, i.ys7.com, i1.hoopchina.com.cn, iapi.bishijie.com, iface.iqiyi.com, iface2.iqiyi.com, img*.doubanio.com, img.jiemian.com, img.zuoyebang.cc, img01.10101111cdn.com, img1.126.net, img1.doubanio.com, img3.doubanio.com, impservice.dictapp.youdao.com, impservice.youdao.com, interface.music.163.com, ios.prod.ftl.netflix.com, ios.wps.cn, kano.guahao.cn, lives.l.qq.com, m*.amap.com, m.aty.sohu.com, m.client.10010.com, m.creditcard.ecitic.com, m.ibuscloud.com, m.yap.yahoo.com, m5.amap.com, ma.ofo.com, mage.if.qidian.com, mapi.appvipshop.com, mapi.mafengwo.cn, mapi.weibo.com, mbl.56.com, media.qyer.com, mi.gdt.qq.com, mimg.127.net, mmg.aty.sohu.com, mmgr.gtimg.com, mob.mddcloud.com.cn, mobile-api2011.elong.com, mp.weixin.qq.com, mrobot.pcauto.com.cn, mrobot.pconline.com.cn, ms.jr.jd.com, msspjh.emarbox.com, newsso.map.qq.com, nex.163.com, nnapp.cloudbae.cn, open.qyer.com, p.kuaidi100.com, p1.music.126.net, pic.k.sohu.com, pic1.chelaile.net.cn, pic1cdn.cmbchina.com, pic2.zhimg.com, portal-xunyou.qingcdn.com, pss.txffp.com, r.inews.qq.com, render.alipay.com, resource.cmbchina.com, res-release.wuta-cam.com, ress.dxpmedia.com, richmanapi.jxedt.com, rm.aarki.net, rtbapi.douyucdn.cn, service.4gtv.tv, slapi.oray.net, smkmp.96225.com, snailsleep.net, sp.kaola.com, ssl.kohsocialapp.qq.com, sso.ifanr.com, static.api.m.panda.tv, static.vuevideo.net, static1.keepcdn.com, staticlive.douyucdn.cn, storage.wax.weibo.com, support.you.163.com, supportda.ofo.com, thor.weidian.com, ups.youku.com, wapwenku.baidu.com, wenku.baidu.com, www.dandanzan.com, www.facebook.com, www.flyertea.com, www.ft.com, www.oschina.net, www.zhihu.com, youtubei.googleapis.com, zhidao.baidu.com
+hostname= *.360buyimg.com, *.amemv.com, *.chelaile.net.cn, *.cnbetacdn.com, *.didistatic.com, *.doubanio.com, *.google-analytics.com, *.iydsj.com, *.k.sohu.com, *.kfc.com, *.kingsoft-office-service.com, *.meituan.net, *.ofo.com, *.pixiv.net, *.pstatp.com, *.uve.weibo.com, *.wikipedia.org, *.wikiwand.com, *.ydstatic.com, *.youdao.com, *.youtube.com, *.zhuishushenqi.com, *.zymk.cn, 101.201.62.22, 113.105.222.132, 113.96.109.*, 118.178.214.118, 119.18.193.135, 121.14.89.216, 121.9.212.178, 123.59.31.1, 14.21.76.30, 153.3.236.81, 180.101.212.22, 183.232.237.194, 183.232.246.225, 183.60.159.227, 218.11.3.70, 59.151.53.6, 59.37.96.220, 789.kakamobi.cn, a.apicloud.com, a.applovin.com, a.qiumibao.com, a.sfansclub.com, a.wkanx.com, aarkissltrial.secure2.footprint.net, acs.m.taobao.com, act.vip.iqiyi.com, activity2.api.ofo.com, adm.10jqka.com.cn, adproxy.autohome.com.cn, adse.ximalaya.com, afd.baidu.com, api*.musical.ly, api*.tiktokv.com, api.abema.io, api.app.vhall.com, api.bilibili.com, api.chelaile.net.cn, api.daydaycook.com.cn, api.douban.com, api.feng.com, api.fengshows.com, api.gotokeep.com, api.huomao.com, api.intsig.net, api.jr.mi.com, api.jxedt.com, api.k.sohu.com, api.kkmh.com, api.laifeng.com, api.live.bilibili.com, api.m.jd.com, api.m.mi.com, api.mddcloud.com.cn, api.mgzf.com, api.psy-1.com, api.rr.tv, api.smzdm.com, api.tv.sohu.com, api.wallstreetcn.com, api.weibo.cn, api.xiachufang.com, api.zhihu.com, api.zhuishushenqi.com, api5.futunn.com, api-mifit.huami.com, api-mifit-cn.huami.com, api-release.wuta-cam.com, app.10086.cn, app.58.com, app.api.ke.com, app.bilibili.com, app.m.zj.chinamobile.com, app.mixcapp.com, app.variflight.com, app.wy.guahao.com, app2.autoimg.cn, appsdk.soku.com, atrace.chelaile.net.cn, b.zhuishushenqi.com, c.m.163.com, cap.caocaokeji.cn, capi.douyucdn.cn, capi.mwee.cn, cdn.kuaidi100.com, cdn.moji.com, channel.beitaichufang.com, classbox2.kechenggezi.com, client.mail.163.com, cms.daydaycook.com.cn, connect.facebook.net, consumer.fcbox.com, creatives.ftimg.net, creditcard.ecitic.com, d.1qianbao.com, daoyu.sdo.com, dapis.mting.info, dl.app.gtja.com, dongfeng.alicdn.com, dsp-impr2.youdao.com, dspsdk.abreader.com, e.dangdang.com, erebor.douban.com, fdfs.xmcdn.com, fm.fenqile.com, frodo.douban.com, fuss10.elemecdn.com, g1.163.com, gateway.shouqiev.com, gorgon.youdao.com, gw.alicdn.com, gw-passenger.01zhuanche.com, hm.xiaomi.com, hui.sohu.com, huichuan.sm.cn, i.weread.qq.com, i.ys7.com, i1.hoopchina.com.cn, iapi.bishijie.com, iface.iqiyi.com, iface2.iqiyi.com, img*.doubanio.com, img.jiemian.com, img.zuoyebang.cc, img01.10101111cdn.com, img1.126.net, img1.doubanio.com, img3.doubanio.com, impservice.dictapp.youdao.com, impservice.youdao.com, interface.music.163.com, ios.prod.ftl.netflix.com, ios.wps.cn, kano.guahao.cn, lives.l.qq.com, m*.amap.com, m.aty.sohu.com, m.client.10010.com, m.creditcard.ecitic.com, m.ibuscloud.com, m.yap.yahoo.com, m5.amap.com, ma.ofo.com, mage.if.qidian.com, mapi.appvipshop.com, mapi.mafengwo.cn, mapi.weibo.com, mbl.56.com, media.qyer.com, mi.gdt.qq.com, mimg.127.net, mmg.aty.sohu.com, mmgr.gtimg.com, mob.mddcloud.com.cn, mobile-api2011.elong.com, mp.weixin.qq.com, mrobot.pcauto.com.cn, mrobot.pconline.com.cn, ms.jr.jd.com, msspjh.emarbox.com, newsso.map.qq.com, nex.163.com, nnapp.cloudbae.cn, open.qyer.com, p.kuaidi100.com, p1.music.126.net, pic.k.sohu.com, pic1.chelaile.net.cn, pic1cdn.cmbchina.com, pic2.zhimg.com, portal-xunyou.qingcdn.com, pss.txffp.com, r.inews.qq.com, render.alipay.com, resource.cmbchina.com, res-release.wuta-cam.com, ress.dxpmedia.com, richmanapi.jxedt.com, rm.aarki.net, rtbapi.douyucdn.cn, service.4gtv.tv, slapi.oray.net, smkmp.96225.com, snailsleep.net, sp.kaola.com, ssl.kohsocialapp.qq.com, sso.ifanr.com, static.api.m.panda.tv, static.vuevideo.net, static1.keepcdn.com, staticlive.douyucdn.cn, storage.wax.weibo.com, support.you.163.com, supportda.ofo.com, thor.weidian.com, ups.youku.com, wapwenku.baidu.com, wenku.baidu.com, www.dandanzan.com, www.facebook.com, www.flyertea.com, www.ft.com, www.oschina.net, www.zhihu.com, youtubei.googleapis.com, zhidao.baidu.com

 enable = true
 ca-passphrase = DlerCloud
--- a/3/Provider/Apple.list
+++ b/3/Provider/Apple.list
@ -26,4 +26,5 @@ DOMAIN-SUFFIX,icloud-content.com
 DOMAIN-SUFFIX,itunes.com
 DOMAIN-SUFFIX,me.com
 DOMAIN-SUFFIX,mzstatic.com
+DOMAIN-SUFFIX,icloud.com.cn
 DOMAIN-SUFFIX,cdn-apple.com
--- a/3/Provider/Domestic.list
+++ b/3/Provider/Domestic.list
@ -102,6 +102,7 @@ DOMAIN-SUFFIX,douyutv.com
 DOMAIN-SUFFIX,duokan.com
 DOMAIN-SUFFIX,duoshuo.com
 DOMAIN-SUFFIX,dytt8.net
+DOMAIN-SUFFIX,douyin.com
 DOMAIN-SUFFIX,easou.com
 DOMAIN-SUFFIX,ecitic.com
 DOMAIN-SUFFIX,ecitic.net
--- a/3/Provider/Media/Pornhub.list
+++ b/3/Provider/Media/Pornhub.list
@ -0,0 +1,6 @@
+
+# > Pornhub
+DOMAIN-SUFFIX,phncdn.com
+DOMAIN-SUFFIX,phprcdn.com
+DOMAIN-SUFFIX,pornhub.com
+DOMAIN-SUFFIX,pornhubpremium.com
--- a/3/Provider/Proxy.list
+++ b/3/Provider/Proxy.list
@ -617,7 +617,6 @@ DOMAIN-KEYWORD,dropbox
 DOMAIN-KEYWORD,facebook
 DOMAIN-KEYWORD,github
 DOMAIN-KEYWORD,instagram
-DOMAIN-KEYWORD,porn
 DOMAIN-KEYWORD,twitter
 DOMAIN-KEYWORD,whatsapp
 DOMAIN-KEYWORD,google
--- a/3/Rule.conf
+++ b/3/Rule.conf
@ -25,7 +25,6 @@ RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Pr
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/HBO.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Hulu%20Japan.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Hulu.list,GlobalTV
-RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/iQiyi.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Japonx.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/JOOX.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/KKBOX.list,GlobalTV
@ -33,6 +32,7 @@ RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Pr
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/myTV%20SUPER.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Pandora.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/PBS.list,GlobalTV
+RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Pornhub.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Soundcloud.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/ViuTV.list,GlobalTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/YouTube%20Music.list,GlobalTV
--- a/3/Script.conf
+++ b/3/Script.conf
@ -3,6 +3,10 @@
 cron "3 0 * * *" script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js
 http-request https:\/\/api\.m\.jd\.com\/client\.action.*functionId=signBean max-size=0,script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js

+# > Aweme
+http-request ^https:\/\/.*\.amemv\.com\/aweme\/v.*\/(feed|post) script-path=https://Choler.github.io/Surge/Script/Aweme.js
+http-response ^https:\/\/.*\.amemv\.com\/aweme\/v.*\/(feed|post) requires-body=true,script-path=https://Choler.github.io/Surge/Script/Aweme.js
+
 # > Weibo
 http-response ^https?://m?api\.weibo\.c(n|om)/2/(statuses/(unread|extend|positives/get|(friends|video)(/|_)timeline)|stories/(video_stream|home_list)|(groups|fangle)/timeline|profile/statuses|comments/build_comments|photo/recommend_list|service/picfeed|searchall|cardlist|page|\!/photos/pic_recommend_status) requires-body=1,script-path=https://raw.githubusercontent.com/yichahucha/surge/master/wb_ad.js
 http-response ^https?://(sdk|wb)app\.uve\.weibo\.com(/interface/sdk/sdkad.php|/wbapplua/wbpullad.lua) requires-body=1,script-path=https://raw.githubusercontent.com/yichahucha/surge/master/wb_launch.js