From f6dba1e5baaa6322210fff6439f9145887634ff6 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Fri, 9 Sep 2022 15:26:06 +0800
Subject: [PATCH] Chore: update CDN Hosts auto build script

---
 Build/build-cdn-conf.js    | 14 +++++++++++---
 List/non_ip/my_reject.conf | 15 +++++++++++++++
 List/non_ip/reject.conf    |  3 ---
 3 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 List/non_ip/my_reject.conf

diff --git a/Build/build-cdn-conf.js b/Build/build-cdn-conf.js
index 617c346a..ddb208a9 100644
--- a/Build/build-cdn-conf.js
+++ b/Build/build-cdn-conf.js
@@ -5,9 +5,17 @@ const path = require('path');
 (async () => {
   const domains = (await (await fetch('https://publicsuffix.org/list/public_suffix_list.dat')).text()).split('\n');
 
-  const awsS3 = domains.filter(line => {
+  const S3OSSDomains = domains.filter(line => {
     if (line) {
-      return line.startsWith('s3') && line.endsWith('.amazonaws.com') && !line.includes('cn-')
+      return (
+        line.startsWith('s3-')
+        || line.startsWith('s3.')
+      )
+      && (
+        line.endsWith('.amazonaws.com')
+        || line.endsWith('.scw.cloud')
+      )
+      && !line.includes('cn-')
     }
 
     return false;
@@ -17,7 +25,7 @@ const path = require('path');
   const content = (await fs.promises.readFile(filePath, 'utf-8'))
     .replace(
       '# --- [AWS S3 Replace Me] ---',
-      awsS3.map(domain => `DOMAIN-SUFFIX,${domain}`).join('\n')
+      S3OSSDomains.map(domain => `DOMAIN-SUFFIX,${domain}`).join('\n')
     );
 
   await fs.promises.writeFile(filePath, content, 'utf-8');
diff --git a/List/non_ip/my_reject.conf b/List/non_ip/my_reject.conf
new file mode 100644
index 00000000..3cd2580d
--- /dev/null
+++ b/List/non_ip/my_reject.conf
@@ -0,0 +1,15 @@
+DOMAIN,download.parallels.com
+DOMAIN,update.parallels.com
+DOMAIN,desktop.parallels.com
+DOMAIN,download.parallels.com.cdn.cloudflare.net
+DOMAIN,update.parallels.com.cdn.cloudflare.net
+DOMAIN,desktop.parallels.com.cdn.cloudflare.net
+DOMAIN-SUFFIX,parallels.cn
+DOMAIN,www.parallels.com
+DOMAIN,reportus.parallels.com
+DOMAIN,parallels.com
+DOMAIN-SUFFIX,myparallels.com
+DOMAIN-SUFFIX,my.parallels.com
+
+DOMAIN-KEYWORD,bahoom
+DOMAIN,daisydiskapp.com
diff --git a/List/non_ip/reject.conf b/List/non_ip/reject.conf
index b16c965b..39091720 100644
--- a/List/non_ip/reject.conf
+++ b/List/non_ip/reject.conf
@@ -73,9 +73,6 @@ DOMAIN-KEYWORD,advertising.com
 # Tencent AD KEYWORD
 DOMAIN-KEYWORD,wxsnsdy
 
-DOMAIN-KEYWORD,bahoom
-DOMAIN,daisydiskapp.com
-
 AND, ((DOMAIN-SUFFIX,msa.cdn.mediaset.net), (DOMAIN-KEYWORD,adv0))
 
 # >> Tencent Lemon