From f3b9e0971420df4bdbb5086ec32700f65ea7f1e8 Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Sat, 12 Feb 2022 19:26:34 +0800 Subject: [PATCH] feat: update Apple rules --- Clash/RuleSet/Extra/Apple/Apple.yaml | 14 +++++--------- Clash/RuleSet/Extra/Apple/Music.yaml | 4 +++- .../Filter/Extra/Apple/AppStoreConnect.list | 6 +++--- Quantumult/Filter/Extra/Apple/Apple.list | 16 +++++++--------- Quantumult/Filter/Extra/Apple/Books.list | 6 ++++++ Quantumult/Filter/Extra/Apple/Music.list | 1 + Quantumult/Filter/Extra/Apple/MusicRadio.list | 3 +++ Quantumult/Filter/Extra/Apple/News.list | 9 --------- .../Filter/Extra/Apple/SoftwareUpdate.list | 4 ++-- Quantumult/Filter/Extra/Apple/iCloud.list | 16 +++++++++++----- Surge/Ruleset/Extra/Apple/Apple.list | 1 + Surge/Ruleset/Extra/Apple/Music.list | 1 + Surge/Ruleset/Extra/Apple/MusicRadio.list | 1 + Surge/Ruleset/Extra/Apple/News.list | 12 ------------ 14 files changed, 44 insertions(+), 50 deletions(-) create mode 100644 Quantumult/Filter/Extra/Apple/Books.list create mode 100644 Quantumult/Filter/Extra/Apple/MusicRadio.list delete mode 100644 Quantumult/Filter/Extra/Apple/News.list delete mode 100644 Surge/Ruleset/Extra/Apple/News.list diff --git a/Clash/RuleSet/Extra/Apple/Apple.yaml b/Clash/RuleSet/Extra/Apple/Apple.yaml index 311c02c..5652590 100644 --- 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 \ No newline at end of file + - DOMAIN-KEYWORD,apple.com.edgekey.net + - DOMAIN-KEYWORD,apple-support.akadns.net + - DOMAIN-KEYWORD,icloud.com.akadns.net \ No newline at end of file diff --git a/Clash/RuleSet/Extra/Apple/Music.yaml b/Clash/RuleSet/Extra/Apple/Music.yaml index 1fd3435..8d572c1 100644 --- 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 \ No newline at end of file + - DOMAIN-SUFFIX,blobstore.apple.com // iCloud Music Library \ No newline at end of file diff --git a/Quantumult/Filter/Extra/Apple/AppStoreConnect.list b/Quantumult/Filter/Extra/Apple/AppStoreConnect.list index dfd5244..1646373 100644 --- 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 \ No newline at end of file +DOMAIN,appstoreconnect.apple.com,PROXY +DOMAIN,iosapps-ssl.itunes.apple.com,PROXY +DOMAIN,itcmobile.itunes.apple.com,PROXY \ No newline at end of file diff --git a/Quantumult/Filter/Extra/Apple/Apple.list b/Quantumult/Filter/Extra/Apple/Apple.list index 6b8f630..89c55b8 100644 --- 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 \ No newline at end of file +DOMAIN-KEYWORD,apple.com.edgekey.net,Apple +DOMAIN-KEYWORD,apple-support.akadns.net,Apple +DOMAIN-KEYWORD,icloud.com.akadns.net,Apple \ No newline at end of file diff --git a/Quantumult/Filter/Extra/Apple/Books.list b/Quantumult/Filter/Extra/Apple/Books.list new file mode 100644 index 0000000..5c5f641 --- /dev/null +++ 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 \ No newline at end of file diff --git a/Quantumult/Filter/Extra/Apple/Music.list b/Quantumult/Filter/Extra/Apple/Music.list index d1a73f3..9da77f5 100644 --- 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 diff --git a/Quantumult/Filter/Extra/Apple/MusicRadio.list b/Quantumult/Filter/Extra/Apple/MusicRadio.list new file mode 100644 index 0000000..8677489 --- /dev/null +++ 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 \ No newline at end of file diff --git a/Quantumult/Filter/Extra/Apple/News.list b/Quantumult/Filter/Extra/Apple/News.list deleted file mode 100644 index ec9d8d4..0000000 --- a/Quantumult/Filter/Extra/Apple/News.list +++ /dev/null @@ -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 \ No newline at end of file diff --git a/Quantumult/Filter/Extra/Apple/SoftwareUpdate.list b/Quantumult/Filter/Extra/Apple/SoftwareUpdate.list index 776caa0..053ecdf 100644 --- 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 diff --git a/Quantumult/Filter/Extra/Apple/iCloud.list b/Quantumult/Filter/Extra/Apple/iCloud.list index b29c450..60e74a3 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/Surge/Ruleset/Extra/Apple/Apple.list b/Surge/Ruleset/Extra/Apple/Apple.list index 09e200f..5c2bea1 100644 --- 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 diff --git a/Surge/Ruleset/Extra/Apple/Music.list b/Surge/Ruleset/Extra/Apple/Music.list index 3764487..ac4ae3c 100644 --- 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 diff --git a/Surge/Ruleset/Extra/Apple/MusicRadio.list b/Surge/Ruleset/Extra/Apple/MusicRadio.list index c4051f2..f370244 100644 --- 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 \ No newline at end of file diff --git a/Surge/Ruleset/Extra/Apple/News.list b/Surge/Ruleset/Extra/Apple/News.list deleted file mode 100644 index 8bbaf2e..0000000 --- a/Surge/Ruleset/Extra/Apple/News.list +++ /dev/null @@ -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 \ No newline at end of file