From dfe1600a902fb1d33524beceb83ed13ead4c22fc Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Mon, 30 Sep 2024 04:17:12 +0800
Subject: [PATCH] Chore: minor changes to build infra

---
 Build/build-sgmodule-redirect.ts   |  2 +-
 Build/build-speedtest-domainset.ts |  2 +-
 Build/validate-domestic.ts         | 14 +++-----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Build/build-sgmodule-redirect.ts b/Build/build-sgmodule-redirect.ts
index 2c4222de..a623d727 100644
--- a/Build/build-sgmodule-redirect.ts
+++ b/Build/build-sgmodule-redirect.ts
@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { task } from './trace';
 import { compareAndWriteFile } from './lib/create-file';
-import { getHostname } from 'tldts';
+import { getHostname } from 'tldts-experimental';
 import { isTruthy } from './lib/misc';
 import { OUTPUT_MODULES_DIR } from './constants/dir';
 
diff --git a/Build/build-speedtest-domainset.ts b/Build/build-speedtest-domainset.ts
index 9729fe6a..80fd0608 100644
--- a/Build/build-speedtest-domainset.ts
+++ b/Build/build-speedtest-domainset.ts
@@ -1,7 +1,7 @@
 import path from 'node:path';
 
 import { Sema } from 'async-sema';
-import { getHostname } from 'tldts';
+import { getHostname } from 'tldts-experimental';
 import { task } from './trace';
 import { fetchWithRetry } from './lib/fetch-retry';
 import { SHARED_DESCRIPTION } from './lib/constants';
diff --git a/Build/validate-domestic.ts b/Build/validate-domestic.ts
index 707358f8..158ea3c1 100644
--- a/Build/validate-domestic.ts
+++ b/Build/validate-domestic.ts
@@ -1,21 +1,13 @@
-import { fetchRemoteTextByLine, readFileByLine } from './lib/fetch-text-by-line';
+import { readFileByLine } from './lib/fetch-text-by-line';
 import { parse } from 'csv-parse/sync';
 import { createTrie } from './lib/trie';
 import path from 'node:path';
 import { processLine } from './lib/process-line';
-import { extractDomainsFromFelixDnsmasq } from './lib/parse-dnsmasq';
+import { parseFelixDnsmasq } from './lib/parse-dnsmasq';
 import { SOURCE_DIR } from './constants/dir';
 
 export const parseDomesticList = async () => {
-  const set = new Set<string>();
-  for await (const line of await fetchRemoteTextByLine('https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf')) {
-    const domain = extractDomainsFromFelixDnsmasq(line);
-    if (domain) {
-      set.add(domain);
-    }
-  }
-
-  const trie = createTrie(set, true);
+  const trie = createTrie(await parseFelixDnsmasq('https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf'), true);
 
   const top5000 = new Set<string>();