feat: update Apple rules

3 years ago · f3b9e09714
parent 83cb8a8113
commit f3b9e09714
14 changed files with 44 additions and 50 deletions
--- a/Clash/RuleSet/Extra/Apple/Apple.yaml
+++ b/Clash/RuleSet/Extra/Apple/Apple.yaml
@ -6,6 +6,8 @@ payload:
  - DOMAIN-SUFFIX,apple.com.cn
  - DOMAIN-SUFFIX,apple-cloudkit.com
  - DOMAIN-SUFFIX,apple-livephotoskit.com
+  - DOMAIN-SUFFIX,apple-mapkit.com
+  - DOMAIN-SUFFIX,applemusic.com
  - DOMAIN-SUFFIX,appstore.com
  - DOMAIN-SUFFIX,apzones.com
  - DOMAIN-SUFFIX,cdn-apple.com
@ -15,12 +17,6 @@ payload:
  - DOMAIN-SUFFIX,me.com
  - DOMAIN-SUFFIX,mzstatic.com
  - DOMAIN-KEYWORD,apple.com.akadns.net
-  - DOMAIN-KEYWORD,icloud.com.akadns.net
-  - IP-CIDR,17.0.0.0/8,no-resolve
-  - IP-CIDR,63.92.224.0/19,no-resolve
-  - IP-CIDR,65.199.22.0/23,no-resolve
-  - IP-CIDR,139.178.128.0/18,no-resolve
-  - IP-CIDR,144.178.0.0/19,no-resolve
-  - IP-CIDR,192.35.50.0/24,no-resolve
-  - IP-CIDR,198.183.17.0/24,no-resolve
-  - IP-CIDR,205.180.175.0/24,no-resolve
+  - DOMAIN-KEYWORD,apple.com.edgekey.net
+  - DOMAIN-KEYWORD,apple-support.akadns.net
+  - DOMAIN-KEYWORD,icloud.com.akadns.net
--- a/Clash/RuleSet/Extra/Apple/Music.yaml
+++ b/Clash/RuleSet/Extra/Apple/Music.yaml
@ -1,9 +1,11 @@
 payload:
  # > Apple Music
+  - DOMAIN-SUFFIX,applemusic.com
  - DOMAIN-SUFFIX,music.apple.com
  - DOMAIN,aod.itunes.apple.com
  - DOMAIN,aod-ssl.itunes.apple.com
  - DOMAIN,audio.itunes.apple.com
+  - DOMAIN,audio-ssl.itunes.apple.com
  - DOMAIN,mvod.itunes.apple.com
  - DOMAIN,streamingaudio.itunes.apple.com
-  - DOMAIN-SUFFIX,blobstore.apple.com
+  - DOMAIN-SUFFIX,blobstore.apple.com // iCloud Music Library
--- a/Quantumult/Filter/Extra/Apple/AppStoreConnect.list
+++ b/Quantumult/Filter/Extra/Apple/AppStoreConnect.list
@ -1,4 +1,4 @@
 # > App Store Connect
-DOMAIN,appstoreconnect.apple.com,App Store Connect
-DOMAIN,iosapps-ssl.itunes.apple.com,App Store Connect
-DOMAIN,itcmobile.itunes.apple.com,App Store Connect
+DOMAIN,appstoreconnect.apple.com,PROXY
+DOMAIN,iosapps-ssl.itunes.apple.com,PROXY
+DOMAIN,itcmobile.itunes.apple.com,PROXY
--- a/Quantumult/Filter/Extra/Apple/Apple.list
+++ b/Quantumult/Filter/Extra/Apple/Apple.list
@ -4,7 +4,11 @@ DOMAIN-SUFFIX,apple.co,Apple
 DOMAIN-SUFFIX,apple.com,Apple
 DOMAIN-SUFFIX,apple.com.cn,Apple
 DOMAIN-SUFFIX,apple-cloudkit.com,Apple
+DOMAIN-SUFFIX,apple-livephotoskit.com,Apple
+DOMAIN-SUFFIX,apple-mapkit.com,Apple
+DOMAIN-SUFFIX,applemusic.com,Apple
 DOMAIN-SUFFIX,appstore.com,Apple
+DOMAIN-SUFFIX,apzones.com,Apple
 DOMAIN-SUFFIX,cdn-apple.com,Apple
 DOMAIN-SUFFIX,icloud.com,Apple
 DOMAIN-SUFFIX,icloud.com.cn,Apple
@ -12,12 +16,6 @@ DOMAIN-SUFFIX,icloud-content.com,Apple
 DOMAIN-SUFFIX,me.com,Apple
 DOMAIN-SUFFIX,mzstatic.com,Apple
 DOMAIN-KEYWORD,apple.com.akadns.net,Apple
-DOMAIN-KEYWORD,icloud.com.akadns.net,Apple
-IP-CIDR,17.0.0.0/8,Apple
-IP-CIDR,63.92.224.0/19,Apple
-IP-CIDR,65.199.22.0/23,Apple
-IP-CIDR,139.178.128.0/18,Apple
-IP-CIDR,144.178.0.0/19,Apple
-IP-CIDR,192.35.50.0/24,Apple
-IP-CIDR,198.183.17.0/24,Apple
-IP-CIDR,205.180.175.0/24,Apple
+DOMAIN-KEYWORD,apple.com.edgekey.net,Apple
+DOMAIN-KEYWORD,apple-support.akadns.net,Apple
+DOMAIN-KEYWORD,icloud.com.akadns.net,Apple
--- a/Quantumult/Filter/Extra/Apple/Books.list
+++ b/Quantumult/Filter/Extra/Apple/Books.list
@ -0,0 +1,6 @@
+# Apple Books
+DOMAIN,buy.itunes.apple.com,PROXY
+DOMAIN-SUFFIX,books.apple.com,PROXY
+DOMAIN,books.itunes.apple.com,PROXY
+DOMAIN,bookkeeper.itunes.apple.com,PROXY
+DOMAIN,books-analytics-events.apple.com,PROXY
--- a/Quantumult/Filter/Extra/Apple/Music.list
+++ b/Quantumult/Filter/Extra/Apple/Music.list
@ -1,5 +1,6 @@
 # > Apple Music
 USER-AGENT,Music*,PROXY
+DOMAIN-SUFFIX,applemusic.com,PROXY
 DOMAIN-SUFFIX,music.apple.com,PROXY
 DOMAIN,aod.itunes.apple.com,PROXY
 DOMAIN,aod-ssl.itunes.apple.com,PROXY
--- a/Quantumult/Filter/Extra/Apple/MusicRadio.list
+++ b/Quantumult/Filter/Extra/Apple/MusicRadio.list
@ -0,0 +1,3 @@
+# > for Music.app and TV.app
+DOMAIN,radio.itunes.apple.com,Apple Music Radio
+DOMAIN,tv.applemusic.com,Apple Music Radio
--- a/Quantumult/Filter/Extra/Apple/News.list
+++ b/Quantumult/Filter/Extra/Apple/News.list
@ -1,9 +0,0 @@
-# > Apple News
-DOMAIN,gateway.icloud.com,PROXY
-DOMAIN,gspe1-ssl.ls.apple.com,PROXY
-DOMAIN-SUFFIX,apple.news,PROXY
-DOMAIN,news-assets.apple.com,PROXY
-DOMAIN,news-client.apple.com,PROXY
-DOMAIN,news-edge.apple.com,PROXY
-DOMAIN,news-events.apple.com,PROXY
-DOMAIN,apple.comscoreresearch.com,PROXY
--- a/Quantumult/Filter/Extra/Apple/SoftwareUpdate.list
+++ b/Quantumult/Filter/Extra/Apple/SoftwareUpdate.list
@ -14,10 +14,10 @@ DOMAIN,swscan.apple.com,PROXY
 # > macOS Recovery
 DOMAIN,oscdn.apple.com,PROXY
 DOMAIN,osrecovery.apple.com,PROXY
-# > iOS and iPadOS updates
+# > iOS, iPadOS, and watchOS updates
 DOMAIN,appldnld.apple.com,PROXY
 DOMAIN,ns.itunes.apple.com,PROXY
-# > iOS, iPadOS, tvOS, and macOS updates
+# > iOS, iPadOS, tvOS, watchOS, and macOS updates
 DOMAIN,gg.apple.com,PROXY
 DOMAIN,gdmf.apple.com,PROXY
 DOMAIN,mesu.apple.com,PROXY
--- a/Quantumult/Filter/Extra/Apple/iCloud.list
+++ b/Quantumult/Filter/Extra/Apple/iCloud.list
@ -1,6 +1,12 @@
 # iCloud
-DOMAIN-SUFFIX,apple-cloudkit.com,PROXY
-DOMAIN-SUFFIX,icloud.com,PROXY
-DOMAIN-SUFFIX,icloud.com.cn,PROXY
-DOMAIN-SUFFIX,icloud-content.com,PROXY
-DOMAIN,www-cdn.icloud.com.akadns.net,PROXY
+DOMAIN-SUFFIX,apple-cloudkit.com,iCloud
+DOMAIN-SUFFIX,apple-livephotoskit.com,iCloud
+DOMAIN-SUFFIX,apzones.com,iCloud
+DOMAIN-SUFFIX,cdn-apple.com,iCloud
+DOMAIN-SUFFIX,gc.apple.com,iCloud
+DOMAIN-SUFFIX,icloud.apple.com,iCloud
+DOMAIN-SUFFIX,icloud.com,iCloud
+DOMAIN-SUFFIX,icloud.com.cn,iCloud
+DOMAIN-SUFFIX,icloud-content.com,iCloud
+DOMAIN-SUFFIX,iwork.apple.com,iCloud
+DOMAIN-KEYWORD,icloud.com.akadns.net,iCloud
--- a/Surge/Ruleset/Extra/Apple/Apple.list
+++ b/Surge/Ruleset/Extra/Apple/Apple.list
@ -6,6 +6,7 @@ DOMAIN-SUFFIX,apple.com.cn
 DOMAIN-SUFFIX,apple-cloudkit.com
 DOMAIN-SUFFIX,apple-livephotoskit.com
 DOMAIN-SUFFIX,apple-mapkit.com
+DOMAIN-SUFFIX,applemusic.com
 DOMAIN-SUFFIX,appstore.com
 DOMAIN-SUFFIX,apzones.com
 DOMAIN-SUFFIX,cdn-apple.com
--- a/Surge/Ruleset/Extra/Apple/Music.list
+++ b/Surge/Ruleset/Extra/Apple/Music.list
@ -1,6 +1,7 @@
 # > Apple Music
 PROCESS-NAME,Music
 USER-AGENT,Music*
+DOMAIN-SUFFIX,applemusic.com
 DOMAIN-SUFFIX,music.apple.com
 DOMAIN,aod.itunes.apple.com
 DOMAIN,aod-ssl.itunes.apple.com
--- a/Surge/Ruleset/Extra/Apple/MusicRadio.list
+++ b/Surge/Ruleset/Extra/Apple/MusicRadio.list
@ -1,2 +1,3 @@
+# > for Music.app and TV.app
 DOMAIN,radio.itunes.apple.com
 DOMAIN,tv.applemusic.com
--- a/Surge/Ruleset/Extra/Apple/News.list
+++ b/Surge/Ruleset/Extra/Apple/News.list
@ -1,12 +0,0 @@
-# > Apple News
-DOMAIN,gspe1-ssl.ls.apple.com // 必要，但会导致「地图」使用「TOMTOM」版本数据
-PROCESS-NAME,News
-USER-AGENT,AppleNews*
-# USER-AGENT,News* // 「今日头条」亦使用此，故不启用
-USER-AGENT,com.apple.news*
-DOMAIN-SUFFIX,apple.news
-DOMAIN,news-assets.apple.com
-DOMAIN,news-client.apple.com
-DOMAIN,news-edge.apple.com
-DOMAIN,news-events.apple.com
-DOMAIN,apple.comscoreresearch.com