Update Apple / Global / Reject Hosts

Build/lib/parse-filter.ts

@@ -80,9 +80,9 @@ export function processHosts(span: Span, hostsUrl: string, mirrors: string[] | n
         // Avoid event loop starvation, so we wait for a macrotask before we start fetching.
         await Promise.resolve();
 
-        const filterRules = await childSpan.traceChild('download hosts').traceAsyncFn(() => {
-          return fetchAssets(hostsUrl, mirrors).then(text => text.split('\n'));
-        });
+        const filterRules = await childSpan
+          .traceChild('download hosts')
+          .traceAsyncFn(() => fetchAssets(hostsUrl, mirrors).then(text => text.split('\n')));
 
         childSpan.traceChild('parse hosts').traceSyncFn(() => {
           for (let i = 0, len = filterRules.length; i < len; i++) {

Source/non_ip/apple_services.conf

@@ -29,10 +29,6 @@ PROCESS-NAME,mapspushd
 PROCESS-NAME,com.apple.Maps
 
 # >> Apple System Services
-PROCESS-NAME,fmfd
-PROCESS-NAME,findmydevice-user-agent
-PROCESS-NAME,CoreLocationAgent
-PROCESS-NAME,WeatherWidget
 # DOMAIN api.smoot.apple.com
 # DOMAIN captive.apple.com
 # DOMAIN xp.apple.com
@@ -51,3 +47,8 @@ DOMAIN,api.smoot.apple.cn
 # DOMAIN-SUFFIX lcdn-locator.apple.com
 # DOMAIN-SUFFIX lcdn-registration.apple.com
 # DOMAIN-SUFFIX ls.apple.com
+PROCESS-NAME,apsd
+PROCESS-NAME,fmfd
+PROCESS-NAME,findmydevice-user-agent
+PROCESS-NAME,CoreLocationAgent
+PROCESS-NAME,WeatherWidget

Source/non_ip/global.conf

@@ -1,19 +1,6 @@
 # $ meta_title Sukka's Ruleset - General Global Services
 # $ meta_description This file contains rules for services that are not available inside the Mainland China.
 
-# >> Apple
-DOMAIN-SUFFIX,appsto.re
-DOMAIN,api-glb-sea.smoot.apple.com
-DOMAIN,audiocontentdownload.apple.com
-DOMAIN,beta.itunes.apple.com
-DOMAIN,books.itunes.apple.com
-DOMAIN,embed.music.apple.com
-DOMAIN,hls.itunes.apple.com
-DOMAIN,itunes.apple.com
-DOMAIN,lookup-api.apple.com
-DOMAIN,news-client.apple.com
-DOMAIN,news-edge.apple.com
-
 # >> Google
 DOMAIN-SUFFIX,abc.xyz
 DOMAIN-SUFFIX,androidify.com
@@ -123,6 +110,7 @@ DOMAIN-SUFFIX,prowritingaid.com
 DOMAIN-SUFFIX,wordtune.com
 DOMAIN-SUFFIX,quillbot.com
 
+DOMAIN-SUFFIX,cloudflare-dns.com
 
 DOMAIN-SUFFIX,codepen.io
 

Source/non_ip/reject-no-drop.conf

@@ -4,5 +4,5 @@
 # Block YouTube QUIC
 AND,((PROTOCOL,UDP), (DOMAIN-SUFFIX,googlevideo.com))
 # Block Bilibili/Douyu P2P CDN
-AND,((PROTOCOL,UDP), (OR,((DOMAIN-KEYWORD,bilibili), (DOMAIN-KEYWORD,biliapi), (DOMAIN-KEYWORD,mcdn), (DOMAIN-KEYWORD,douyu)))),REJECT-NO-DROP
+AND,((PROTOCOL,UDP), (OR,((DOMAIN-KEYWORD,bilibili), (DOMAIN-KEYWORD,biliapi), (DOMAIN-KEYWORD,mcdn), (DOMAIN-KEYWORD,douyu))))
 AND,((PROTOCOL,TCP), (OR,((DOMAIN-KEYWORD,stun), (DOMAIN-KEYWORD,douyu))))

Source/non_ip/reject.conf

@@ -1,6 +1,37 @@
 # $ meta_title Sukka's Ruleset - Reject Domains
 # $ meta_description The ruleset supports AD blocking, tracking protection, privacy protection, anti-phishing, anti-mining
 
+# --- Migrate from Reject Domainset due to Public Suffix List ---
+
+DOMAIN-SUFFIX,001www.com
+DOMAIN-SUFFIX,16-b.it
+DOMAIN-SUFFIX,32-b.it
+DOMAIN-SUFFIX,64-b.it
+DOMAIN-SUFFIX,crafting.xyz
+DOMAIN-SUFFIX,ddnslive.com
+DOMAIN-SUFFIX,dnsking.ch
+DOMAIN-SUFFIX,dnsup.net
+DOMAIN-SUFFIX,dynserv.org
+DOMAIN-SUFFIX,forumz.info
+DOMAIN-SUFFIX,freeddns.us
+DOMAIN-SUFFIX,hicam.net
+DOMAIN-SUFFIX,myiphost.com
+DOMAIN-SUFFIX,mypi.co
+DOMAIN-SUFFIX,now-dns.net
+DOMAIN-SUFFIX,now-dns.org
+DOMAIN-SUFFIX,now-dns.top
+DOMAIN-SUFFIX,ntdll.top
+DOMAIN-SUFFIX,ownip.net
+DOMAIN-SUFFIX,soundcast.me
+DOMAIN-SUFFIX,tcp4.me
+DOMAIN-SUFFIX,vpndns.net
+DOMAIN-SUFFIX,servebbs.net
+
+DOMAIN-SUFFIX,3utilities.com
+DOMAIN-SUFFIX,webhop.net
+
+# --- End of Migrate from Reject Domainset due to Public Suffix List ---
+
 # --- Blacklist ---
 
 # >> Crypto Coin Hive
@@ -148,12 +179,12 @@ DOMAIN-SUFFIX,measure.office.com
 # Tencent AD KEYWORD
 DOMAIN-KEYWORD,wxsnsdy
 
-AND, ((DOMAIN-SUFFIX,msa.cdn.mediaset.net), (DOMAIN-KEYWORD,adv0))
+AND,((DOMAIN-SUFFIX,msa.cdn.mediaset.net), (DOMAIN-KEYWORD,adv0))
 
 # >> Google
 DOMAIN-KEYWORD,adsense
 DOMAIN-KEYWORD,adwords
-AND, ((OR,((DOMAIN-SUFFIX,gvt0.com),(DOMAIN-SUFFIX,gvt2.com),(DOMAIN-SUFFIX,gvt3.com))),(DOMAIN-KEYWORD,beacon))
+AND,((OR,((DOMAIN-SUFFIX,gvt3.com), (DOMAIN-SUFFIX,gvt2.com), (DOMAIN-SUFFIX,gvt1.com), (DOMAIN-SUFFIX,gvt0.com))), (DOMAIN-KEYWORD,beacon))
 
 URL-REGEX,^https?://.+.youtube.com/api/stats/.+adformat
 URL-REGEX,^https?://.+.youtube.com/api/stats/ads
@@ -219,7 +250,7 @@ DOMAIN-KEYWORD,-tracker.biliapi.net
 #   ))
 # )
 
-AND,((USER-AGENT,bili*),(NOT,((OR,((DOMAIN-SUFFIX,bilibili.com),(DOMAIN-SUFFIX,hdslb.com),(DOMAIN-SUFFIX,wo.cn),(DOMAIN-SUFFIX,biligame.com),(DOMAIN-SUFFIX,bilivideo.com),(DOMAIN-SUFFIX,biliapi.com),(DOMAIN-SUFFIX,biliapi.net),(DOMAIN-SUFFIX,biliintl.com),(DOMAIN-SUFFIX,bstarstatic.com),(DOMAIN-SUFFIX,akamaized.net))))))
+AND,((NOT,((OR,((DOMAIN-SUFFIX,bilibili.com),(DOMAIN-SUFFIX,hdslb.com),(DOMAIN-SUFFIX,wo.cn),(DOMAIN-SUFFIX,biligame.com),(DOMAIN-SUFFIX,bilivideo.com),(DOMAIN-SUFFIX,biliapi.com),(DOMAIN-SUFFIX,biliapi.net),(DOMAIN-SUFFIX,biliintl.com),(DOMAIN-SUFFIX,bstarstatic.com),(DOMAIN-SUFFIX,akamaized.net))))),(USER-AGENT,bili*))
 
 # >> CNTV
 URL-REGEX,^https?://asp.cntv.myalicdn.com/.+\?maxbr=850
@@ -609,34 +640,3 @@ URL-REGEX,^https?://mi.gdt.qq.com/gdt_mview\.fcg
 # >> Misc
 
 # --- End of Anti-AD Section ---
-
-# --- Migrate from Reject Domainset due to Public Suffix List ---
-
-DOMAIN-SUFFIX,001www.com
-DOMAIN-SUFFIX,16-b.it
-DOMAIN-SUFFIX,32-b.it
-DOMAIN-SUFFIX,64-b.it
-DOMAIN-SUFFIX,crafting.xyz
-DOMAIN-SUFFIX,ddnslive.com
-DOMAIN-SUFFIX,dnsking.ch
-DOMAIN-SUFFIX,dnsup.net
-DOMAIN-SUFFIX,dynserv.org
-DOMAIN-SUFFIX,forumz.info
-DOMAIN-SUFFIX,freeddns.us
-DOMAIN-SUFFIX,hicam.net
-DOMAIN-SUFFIX,myiphost.com
-DOMAIN-SUFFIX,mypi.co
-DOMAIN-SUFFIX,now-dns.net
-DOMAIN-SUFFIX,now-dns.org
-DOMAIN-SUFFIX,now-dns.top
-DOMAIN-SUFFIX,ntdll.top
-DOMAIN-SUFFIX,ownip.net
-DOMAIN-SUFFIX,soundcast.me
-DOMAIN-SUFFIX,tcp4.me
-DOMAIN-SUFFIX,vpndns.net
-DOMAIN-SUFFIX,servebbs.net
-
-DOMAIN-SUFFIX,3utilities.com
-DOMAIN-SUFFIX,webhop.net
-
-# --- End of Migrate from Reject Domainset due to Public Suffix List ---

package.json

@@ -14,31 +14,31 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@cliqz/adblocker": "^1.26.12",
-    "@gorhill/publicsuffixlist": "^3.0.1",
+    "@cliqz/adblocker": "^1.26.15",
+    "@gorhill/publicsuffixlist": "3.0.1",
     "@sukka/listdir": "^0.3.1",
     "async-retry": "^1.3.3",
     "async-sema": "^3.1.1",
     "ci-info": "^4.0.0",
     "csv-parse": "^5.5.3",
     "fast-cidr-tools": "^0.2.4",
-    "mnemonist": "^0.39.6",
+    "mnemonist": "^0.39.7",
     "path-scurry": "^1.10.1",
     "picocolors": "^1.0.0",
     "punycode": "^2.3.1",
     "table": "^6.8.1",
     "tar-stream": "^3.1.6",
-    "tldts": "^6.1.1"
+    "tldts": "^6.1.3"
   },
   "devDependencies": {
-    "@eslint-sukka/node": "4.1.10-beta.2",
-    "@eslint-sukka/ts": "4.1.10-beta.2",
+    "@eslint-sukka/node": "5.0.0",
+    "@eslint-sukka/ts": "5.0.0",
     "@types/async-retry": "^1.4.8",
     "@types/bun": "^1.0.0",
     "@types/tar-stream": "^3.1.3",
     "bun-types": "^1.0.21",
     "eslint": "^8.56.0",
-    "eslint-config-sukka": "4.1.10-beta.2",
+    "eslint-config-sukka": "5.0.0",
     "eslint-formatter-sukka": "4.1.9",
     "mitata": "^0.1.6",
     "typescript": "^5.3.3"