From a00f05a989e94cefb72a9227728a216b8be8f57e Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Sun, 12 Mar 2023 14:57:40 +0800
Subject: [PATCH] Chore: new sorting for reject hosts

---
 Build/build-reject-domainset.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Build/build-reject-domainset.js b/Build/build-reject-domainset.js
index 6af180f0..d533b7f3 100644
--- a/Build/build-reject-domainset.js
+++ b/Build/build-reject-domainset.js
@@ -6,6 +6,7 @@ const { processHosts, processFilterRules, preprocessFullDomainSetBeforeUsedAsWor
 const cpuCount = require('os').cpus().length;
 const { isCI } = require('ci-info');
 const threads = isCI ? cpuCount : cpuCount / 2;
+const { getDomain } = require('tldts');
 
 const { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, PREDEFINED_ENFORCED_BACKLIST } = require('./lib/reject-data-source');
 const { withBannerArray } = require('./lib/with-banner');
@@ -249,6 +250,24 @@ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST);
 
   console.time('* Write reject.conf');
 
+  const getDomainOpt = { allowPrivateDomains: true };
+  const sortedDomainSets = [...domainSets]
+    .map((v) => {
+      return { v, domain: getDomain(v, getDomainOpt)?.toLowerCase() || v };
+    })
+    .sort((a, b) => {
+      if (a.domain > b.domain) {
+        return 1;
+      }
+      if (a.domain < b.domain) {
+        return -1;
+      }
+      return 0;
+    })
+    .map(({ v }) => {
+      return v;
+    });
+
   await compareAndWriteFile(
     withBannerArray(
       'Sukka\'s Surge Rules - Reject Base',
@@ -264,7 +283,7 @@ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST);
         ...ADGUARD_FILTERS.map(filter => ` - ${Array.isArray(filter) ? filter[0] : filter}`),
       ],
       new Date(),
-      [...domainSets].sort()
+      sortedDomainSets
     ),
     pathResolve(__dirname, '../List/domainset/reject.conf')
   );