Merge branch 'DivineEngine:master' into master

2 years ago · 97463f434a
parent 5cae1a4cbc f4d75f7d48
commit 97463f434a
12 changed files with 60 additions and 8 deletions
--- a/Clash/RuleSet/StreamingMedia/Streaming.yaml
+++ b/Clash/RuleSet/StreamingMedia/Streaming.yaml
@ -59,8 +59,11 @@ payload:
  - PROCESS-NAME,tv.abema
  - DOMAIN-SUFFIX,abema.io
  - DOMAIN-SUFFIX,abema.tv
+  - DOMAIN-SUFFIX,abema-tv.com
  - DOMAIN-SUFFIX,ameba.jp
  - DOMAIN-SUFFIX,hayabusa.io
+  - DOMAIN-SUFFIX,hayabusa.media
+  - DOMAIN,api-abematv.bucketeer.jp
  - DOMAIN-KEYWORD,abematv.akamaized.net
  # > All 4
  - PROCESS-NAME,com.channel4.ondemand
@ -148,6 +151,12 @@ payload:
  - DOMAIN-SUFFIX,encoretvb.com
  - DOMAIN,edge.api.brightcove.com
  - DOMAIN,bcbolt446c5271-a.akamaihd.net
+  # > Hami Video
+  - PROCESS-NAME,com.cht.ottPlayer
+  - DOMAIN-SUFFIX,ott.hinet.net
+  - DOMAIN-SUFFIX,hamivideo.hinet.net
+  - DOMAIN,hls-hichannel.cdn.hinet.net
+  - DOMAIN-KEYWORD,hamivideo.cdn.hinet.net
  # > HBO NOW & Max
  - PROCESS-NAME,com.hbo.hbonow
  - DOMAIN-SUFFIX,hbo.com
--- a/Clash/RuleSet/StreamingMedia/Video/AbemaTV.yaml
+++ b/Clash/RuleSet/StreamingMedia/Video/AbemaTV.yaml
@ -3,6 +3,9 @@ payload:
  - PROCESS-NAME,tv.abema
  - DOMAIN-SUFFIX,abema.io
  - DOMAIN-SUFFIX,abema.tv
+  - DOMAIN-SUFFIX,abema-tv.com
  - DOMAIN-SUFFIX,ameba.jp
  - DOMAIN-SUFFIX,hayabusa.io
+  - DOMAIN-SUFFIX,hayabusa.media
+  - DOMAIN,api-abematv.bucketeer.jp
  - DOMAIN-KEYWORD,abematv.akamaized.net
--- a/Clash/RuleSet/StreamingMedia/Video/Hami-Video.yaml
+++ b/Clash/RuleSet/StreamingMedia/Video/Hami-Video.yaml
@ -0,0 +1,7 @@
+payload:
+  # > Hami Video
+  - PROCESS-NAME,com.cht.ottPlayer
+  - DOMAIN-SUFFIX,ott.hinet.net
+  - DOMAIN-SUFFIX,hamivideo.hinet.net
+  - DOMAIN,hls-hichannel.cdn.hinet.net
+  - DOMAIN-KEYWORD,hamivideo.cdn.hinet.net
--- a/Quantumult/Filter/StreamingMedia/Streaming.list
+++ b/Quantumult/Filter/StreamingMedia/Streaming.list
@ -59,8 +59,11 @@ DOMAIN-SUFFIX,overcast.fm,Streaming
 USER-AGENT,AbemaTV*,Streaming
 DOMAIN-SUFFIX,abema.io,Streaming
 DOMAIN-SUFFIX,abema.tv,Streaming
+DOMAIN-SUFFIX,abema-tv.com,Streaming
 DOMAIN-SUFFIX,ameba.jp,Streaming
 DOMAIN-SUFFIX,hayabusa.io,Streaming
+DOMAIN-SUFFIX,hayabusa.media,Streaming
+DOMAIN,api-abematv.bucketeer.jp,Streaming
 DOMAIN-KEYWORD,abematv.akamaized.net,Streaming
 # > All 4
 USER-AGENT,All4*,Streaming
@ -148,6 +151,11 @@ USER-AGENT,encoreTVB*,Streaming
 DOMAIN-SUFFIX,encoretvb.com,Streaming
 DOMAIN,edge.api.brightcove.com,Streaming
 DOMAIN,bcbolt446c5271-a.akamaihd.net,Streaming
+# > Hami Video
+DOMAIN-SUFFIX,ott.hinet.net,Streaming
+DOMAIN-SUFFIX,hamivideo.hinet.net,Streaming
+DOMAIN,hls-hichannel.cdn.hinet.net,Streaming
+DOMAIN-KEYWORD,hamivideo.cdn.hinet.net,Streaming
 # > HBO NOW & Max
 USER-AGENT,HBO%20NOW*,Streaming
 DOMAIN-SUFFIX,hbo.com,Streaming
--- a/Quantumult/Filter/StreamingMedia/Video/AbemaTV.list
+++ b/Quantumult/Filter/StreamingMedia/Video/AbemaTV.list
@ -2,6 +2,9 @@
 USER-AGENT,AbemaTV*,AbemaTV
 DOMAIN-SUFFIX,abema.io,AbemaTV
 DOMAIN-SUFFIX,abema.tv,AbemaTV
+DOMAIN-SUFFIX,abema-tv.com,AbemaTV
 DOMAIN-SUFFIX,ameba.jp,AbemaTV
 DOMAIN-SUFFIX,hayabusa.io,AbemaTV
+DOMAIN-SUFFIX,hayabusa.media,AbemaTV
+DOMAIN,api-abematv.bucketeer.jp,AbemaTV
 DOMAIN-KEYWORD,abematv.akamaized.net,AbemaTV
--- a/Quantumult/Filter/StreamingMedia/Video/Hami-Video.list
+++ b/Quantumult/Filter/StreamingMedia/Video/Hami-Video.list
@ -0,0 +1,5 @@
+# > Hami Video
+DOMAIN-SUFFIX,ott.hinet.net,Hami Video
+DOMAIN-SUFFIX,hamivideo.hinet.net,Hami Video
+DOMAIN,hls-hichannel.cdn.hinet.net,Hami Video
+DOMAIN-KEYWORD,hamivideo.cdn.hinet.net,Hami Video
--- a/Quantumult/Filter/Unbreak.list
+++ b/Quantumult/Filter/Unbreak.list
@ -15,7 +15,7 @@ DOMAIN,dl.google.com,DIRECT
 DOMAIN,dl.l.google.com,DIRECT
 DOMAIN,update.googleapis.com,DIRECT
 # >> Firebase Cloud Messaging
-DOMAIN,mtalk.google.com
+DOMAIN,mtalk.google.com,DIRECT
 DOMAIN,alt1-mtalk.google.com,DIRECT
 DOMAIN,alt2-mtalk.google.com,DIRECT
 DOMAIN,alt3-mtalk.google.com,DIRECT
@ -35,4 +35,4 @@ DOMAIN,vi.l.qq.com,DIRECT
 DOMAIN,analytics.strava.com,DIRECT
 # > Umeng
 DOMAIN,msg.umeng.com,DIRECT
-DOMAIN,msg.umengcloud.com,DIRECT
+DOMAIN,msg.umengcloud.com,DIRECT
--- a/Quantumult/Rewrite/General.conf
+++ b/Quantumult/Rewrite/General.conf
@ -1,4 +1,4 @@
-hostname = www.google.cn,www.firefox.com.cn,api.abema.io,app.biliintl.com,passport.biliintl.com
+hostname = www.google.cn,www.firefox.com.cn,api.*.abema-tv.com,app.biliintl.com,passport.biliintl.com

 # Redirect Google Search Service
 ^https?:\/\/(www.)?(g|google)\.cn url 302 https://www.google.com
@ -72,8 +72,8 @@ hostname = www.google.cn,www.firefox.com.cn,api.abema.io,app.biliintl.com,passpo
 ^https?:\/\/(www.)?zbrushcn.com/ url 302 https://pixologic.com/
 ^https?:\/\/(www.)?anydeskchina.cn/ url 302 https://anydesk.com/zhs

-# AbeamTV
-^https?:\/\/api\.abema\.io\/v\d\/ip\/check url reject-200
+# AbeamTV - api.*.abema-tv.com
+^https?:\/\/api\.[\w-]+\.abema-tv\.com\/v\d\/ip\/check url reject-200

 # bstar intl
 (^https?:\/\/app\.biliintl\.com\/(x\/)?(intl|dm|reply|history|v\d\/(fav|msgfeed)).+?)(&s_locale=zh-Hans_[A-Z]{2})(.+?)(&sim_code=\d+)(.+) url 302 $1&s_locale=zh-Hans_PH$6&sim_code=51503$8
--- a/Surge/Module/General.sgmodule
+++ b/Surge/Module/General.sgmodule
@ -85,8 +85,8 @@ tun-excluded-routes = %APPEND% 239.255.255.250/32
 ^https?:\/\/(www.)?yuanchengxiezuo\.com\/ https://www.teamviewer.com/ 302
 ^https?:\/\/(www.)?zbrushcn\.com\/ https://pixologic.com/ 302

-# AbeamTV - api.abema.io
-^https?:\/\/api\.abema\.io\/v\d\/ip\/check - reject
+# AbeamTV - api.*.abema-tv.com
+^https?:\/\/api\.[\w-]+\.abema-tv\.com\/v\d\/ip\/check - reject

 # bstar intl
 (^https?:\/\/app\.biliintl\.com\/(x\/)?(intl|dm|reply|history|v\d\/(fav|msgfeed)).+?)(&s_locale=zh-Hans_[A-Z]{2})(.+?)(&sim_code=\d+)(.+) $1&s_locale=zh-Hans_PH$6&sim_code=51503$8 header
@ -100,4 +100,4 @@ bstar_login = type=http-request,pattern=^https?:\/\/passport\.biliintl\.com\/x\/
 bstar_play = type=http-request,pattern=^https?:\/\/app\.biliintl\.com\/(intl\/gateway\/v\d\/app\/data\/report\/heartbeat\/mobile|x\/(history|reply)/v\d/add),requires-body=1,max-size=0,script-path=https://raw.githubusercontent.com/DivineEngine/Profiles/master/Surge/Rewrite/bstar.js,script-update-interval=0

 [MITM]
-hostname = %APPEND% www.google.cn,www.firefox.com.cn,api.abema.io,app.biliintl.com,passport.biliintl.com
+hostname = %APPEND% www.google.cn,www.firefox.com.cn,api.*.abema-tv.com,app.biliintl.com,passport.biliintl.com
--- a/Surge/Ruleset/StreamingMedia/Streaming.list
+++ b/Surge/Ruleset/StreamingMedia/Streaming.list
@ -59,8 +59,11 @@ DOMAIN-SUFFIX,overcast.fm
 USER-AGENT,AbemaTV*
 DOMAIN-SUFFIX,abema.io
 DOMAIN-SUFFIX,abema.tv
+DOMAIN-SUFFIX,abema-tv.com
 DOMAIN-SUFFIX,ameba.jp
 DOMAIN-SUFFIX,hayabusa.io
+DOMAIN-SUFFIX,hayabusa.media
+DOMAIN,api-abematv.bucketeer.jp
 DOMAIN-KEYWORD,abematv.akamaized.net
 # > All 4
 USER-AGENT,All4*
@ -148,6 +151,11 @@ USER-AGENT,encoreTVB*
 DOMAIN-SUFFIX,encoretvb.com
 DOMAIN,edge.api.brightcove.com
 DOMAIN,bcbolt446c5271-a.akamaihd.net
+# > Hami Video
+DOMAIN-SUFFIX,ott.hinet.net
+DOMAIN-SUFFIX,hamivideo.hinet.net
+DOMAIN,hls-hichannel.cdn.hinet.net
+DOMAIN-KEYWORD,hamivideo.cdn.hinet.net
 # > HBO NOW & Max
 USER-AGENT,HBO%20NOW*
 DOMAIN-SUFFIX,hbo.com
@ -219,6 +227,7 @@ USER-AGENT,com.kktv.ios.kktv*
 DOMAIN-SUFFIX,kktv.com.tw
 DOMAIN-SUFFIX,kktv.me
 DOMAIN,kktv-theater.kk.stream
+DOMAIN,theater-kktv.cdn.hinet.net
 # > LINE TV
 USER-AGENT,LINE%20TV*
 DOMAIN-SUFFIX,linetv.tw
--- a/Surge/Ruleset/StreamingMedia/Video/AbemaTV.list
+++ b/Surge/Ruleset/StreamingMedia/Video/AbemaTV.list
@ -2,6 +2,9 @@
 USER-AGENT,AbemaTV*
 DOMAIN-SUFFIX,abema.io
 DOMAIN-SUFFIX,abema.tv
+DOMAIN-SUFFIX,abema-tv.com
 DOMAIN-SUFFIX,ameba.jp
 DOMAIN-SUFFIX,hayabusa.io
+DOMAIN-SUFFIX,hayabusa.media
+DOMAIN,api-abematv.bucketeer.jp
 DOMAIN-KEYWORD,abematv.akamaized.net
--- a/Surge/Ruleset/StreamingMedia/Video/Hami-Video.list
+++ b/Surge/Ruleset/StreamingMedia/Video/Hami-Video.list
@ -0,0 +1,5 @@
+# > Hami Video
+DOMAIN-SUFFIX,ott.hinet.net
+DOMAIN-SUFFIX,hamivideo.hinet.net
+DOMAIN,hls-hichannel.cdn.hinet.net
+DOMAIN-KEYWORD,hamivideo.cdn.hinet.net