From 7ead62d108401e4f093260e074e9c9ba6f058b41 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Tue, 23 Apr 2024 02:34:56 +0800
Subject: [PATCH] Feat: adapt Surge latest DOMAIN-WILDCARD

---
 Source/non_ip/cdn.conf      |  7 ++++---
 Source/non_ip/download.conf |  4 ++--
 Source/non_ip/reject.conf   | 13 ++++++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Source/non_ip/cdn.conf b/Source/non_ip/cdn.conf
index f3756d31..ad30ab14 100644
--- a/Source/non_ip/cdn.conf
+++ b/Source/non_ip/cdn.conf
@@ -17,8 +17,9 @@ URL-REGEX,^http://(.+)\.gvt1\.com/edgedl
 URL-REGEX,^http://www\.microsoft\.com/pki/
 URL-REGEX,^http://www\.microsoft\.com/pkiops/
 # >> AppCenter Download
-AND,((DOMAIN-SUFFIX,azureedge.net),(DOMAIN-KEYWORD,appcenter-filemanagement))
+DOMAIN-WILDCARD,appcenter-filemanagement-*.cloudapp.net
 # >> Daily Motion
-AND,((DOMAIN-SUFFIX,dailymotion.com),(DOMAIN-KEYWORD,proxy-))
+DOMAIN-WILDCARD,proxy-*.dailymotion.com
 # >> tgstat.ru
-AND,((DOMAIN-SUFFIX,tgstat.ru),(DOMAIN-KEYWORD,static))
+DOMAIN-WILDCARD,static?.tgstat.ru
+DOMAIN-WILDCARD,static??.tgstat.ru
diff --git a/Source/non_ip/download.conf b/Source/non_ip/download.conf
index bb221e7b..67f5df56 100644
--- a/Source/non_ip/download.conf
+++ b/Source/non_ip/download.conf
@@ -1,5 +1,5 @@
 # $ meta_title Sukka's Ruleset - Large Files Hosting IPs
 # $ meta_description This file contains ruleset for software updating & large file hosting.
 
-AND,((DOMAIN-SUFFIX,mediafire.com), (DOMAIN-KEYWORD,download))
-AND,((DOMAIN-SUFFIX,debian.org), (DOMAIN-KEYWORD,ftp))
+DOMAIN-WILDCARD,download*.mediafire.com
+DOMAIN-WILDCARD,ftp.*.debian.org
diff --git a/Source/non_ip/reject.conf b/Source/non_ip/reject.conf
index c1a25abd..aaf82d38 100644
--- a/Source/non_ip/reject.conf
+++ b/Source/non_ip/reject.conf
@@ -61,8 +61,8 @@ DOMAIN-KEYWORD,telemetry.officeapps.live.com
 DOMAIN-KEYWORD,-launches.appsflyersdk.com
 DOMAIN-KEYWORD,-s2s.sensic.net
 
-AND,((DOMAIN-KEYWORD,f-log), (DOMAIN-SUFFIX,grammarly.io))
-AND,((DOMAIN-SUFFIX,prod.hosts.ooklaserver.net), (DOMAIN-KEYWORD,.ad.))
+DOMAIN-WILDCARD,f-log*.grammarly.io
+DOMAIN-WILDCARD,*.ad.*.prod.hosts.ooklaserver.net
 AND,((DOMAIN-KEYWORD,genuine), (DOMAIN-KEYWORD,autodesk))
 
 # Important: Force add the following domains without whitelisting
@@ -82,13 +82,16 @@ DOMAIN-SUFFIX,notify6.com
 
 # Tencent AD KEYWORD
 DOMAIN-KEYWORD,wxsnsdy
-
-AND,((DOMAIN-SUFFIX,msa.cdn.mediaset.net), (DOMAIN-KEYWORD,adv0))
+DOMAIN-WILDCARD,adv0*.msa.cdn.mediaset.net
 
 # >> Google
 DOMAIN-KEYWORD,adsense
 DOMAIN-KEYWORD,adwords
-AND,((OR,((DOMAIN-SUFFIX,gvt3.com), (DOMAIN-SUFFIX,gvt2.com), (DOMAIN-SUFFIX,gvt1.com), (DOMAIN-SUFFIX,gvt0.com))), (DOMAIN-KEYWORD,beacon))
+
+DOMAIN-WILDCARD,beacons*.gvt3.com
+DOMAIN-WILDCARD,beacons*.gvt2.com
+DOMAIN-WILDCARD,beacons*.gvt1.com
+DOMAIN-WILDCARD,beacons*.gvt0.com
 
 URL-REGEX,^https?://.+.youtube.com/api/stats/.+adformat
 URL-REGEX,^https?://.+.youtube.com/api/stats/ads