From c16931e1755e7e3338cda9027801ac4132a7df62 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Sat, 14 Dec 2024 00:40:40 +0800
Subject: [PATCH] Refactor: enable more DNS to validate alive domains

---
 Build/validate-domain-alive.ts | 37 +++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/Build/validate-domain-alive.ts b/Build/validate-domain-alive.ts
index cc0375786..3593fde47 100644
--- a/Build/validate-domain-alive.ts
+++ b/Build/validate-domain-alive.ts
@@ -35,7 +35,7 @@ const dohServers: Array<[string, DNS2.DnsResolver]> = ([
   // 'zero.dns0.eu',
   'dns.nextdns.io',
   'anycast.dns.nextdns.io',
-  // 'wikimedia-dns.org',
+  'wikimedia-dns.org',
   // 'ordns.he.net',
   // 'dns.mullvad.net',
   'basic.rethinkdns.com'
@@ -181,22 +181,39 @@ export async function isDomainAlive(domain: string, isSuffix: boolean): Promise<
     return [domain, false] as const;
   }
 
+  const $domain = domain[0] === '.' ? domain.slice(1) : domain;
+
   if (!isSuffix) {
-    const $domain = domain[0] === '.' ? domain.slice(1) : domain;
+    const aDns: string[] = [];
+    const aaaaDns: string[] = [];
+
+    // test 2 times before make sure record is empty
+    for (let i = 0; i < 2; i++) {
+      // eslint-disable-next-line no-await-in-loop -- sequential
+      const aRecords = (await resolve($domain, 'A'));
+      if (aRecords.answers.length !== 0) {
+        domainAliveMap.set(domain, true);
+        return [domain, true] as const;
+      }
 
-    const aRecords = (await resolve($domain, 'A'));
-    if (aRecords.answers.length === 0) {
+      aDns.push(aRecords.dns);
+    }
+    for (let i = 0; i < 2; i++) {
+      // eslint-disable-next-line no-await-in-loop -- sequential
       const aaaaRecords = (await resolve($domain, 'AAAA'));
-      if (aaaaRecords.answers.length === 0) {
-        console.log(picocolors.red('[domain dead]'), 'no A/AAAA records', { domain, a: aRecords.dns, aaaa: aaaaRecords.dns });
-        domainAliveMap.set($domain, false);
-        return [domain, false] as const;
+      if (aaaaRecords.answers.length !== 0) {
+        domainAliveMap.set(domain, true);
+        return [domain, true] as const;
       }
+
+      aaaaDns.push(aaaaRecords.dns);
     }
+
+    console.log(picocolors.red('[domain dead]'), 'no A/AAAA records', { domain, a: aDns, aaaa: aaaaDns });
   }
 
-  domainAliveMap.set(domain, true);
-  return [domain, true] as const;
+  domainAliveMap.set($domain, false);
+  return [domain, false] as const;
 }
 
 export async function runAgainstRuleset(filepath: string) {