From 1548ed1002c941bdea38836b0530d321ee848fdc Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Wed, 26 Mar 2025 01:02:47 +0800
Subject: [PATCH] Validate dead domains with domestic DoH twice

---
 Build/lib/is-domain-alive.ts       | 24 +++++++++------
 Source/domainset/cdn.conf          |  2 --
 Source/domainset/reject.conf       | 48 ++++++++----------------------
 Source/domainset/reject_extra.conf | 12 --------
 4 files changed, 28 insertions(+), 58 deletions(-)

diff --git a/Build/lib/is-domain-alive.ts b/Build/lib/is-domain-alive.ts
index eb329616..4634e3aa 100644
--- a/Build/lib/is-domain-alive.ts
+++ b/Build/lib/is-domain-alive.ts
@@ -163,18 +163,24 @@ export async function isDomainAlive(domain: string, isSuffix: boolean): Promise<
     aaaaDns.push(aaaaRecords.dns);
   }
 
-  // only then, let's test once with domesticDohServers
-  const aRecords = (await $resolve($domain, 'A', pickOne(domesticDohServers)));
-  if (aRecords.answers.length > 0) {
-    return onDomainAlive(domain);
+  // only then, let's test twice with domesticDohServers
+  for (let i = 0; i < 2; i++) {
+    // eslint-disable-next-line no-await-in-loop -- sequential
+    const aRecords = (await $resolve($domain, 'A', pickOne(domesticDohServers)));
+    if (aRecords.answers.length > 0) {
+      return onDomainAlive(domain);
+    }
+    aDns.push(aRecords.dns);
   }
-  aDns.push(aRecords.dns);
 
-  const aaaaRecords = (await $resolve($domain, 'AAAA', pickOne(domesticDohServers)));
-  if (aaaaRecords.answers.length > 0) {
-    return onDomainAlive(domain);
+  for (let i = 0; i < 2; i++) {
+    // eslint-disable-next-line no-await-in-loop -- sequential
+    const aaaaRecords = (await $resolve($domain, 'AAAA', pickOne(domesticDohServers)));
+    if (aaaaRecords.answers.length > 0) {
+      return onDomainAlive(domain);
+    }
+    aaaaDns.push(aaaaRecords.dns);
   }
-  aaaaDns.push(aaaaRecords.dns);
 
   console.log(picocolors.red('[domain dead]'), 'no A/AAAA records', { domain, a: aDns, aaaa: aaaaDns });
   return onDomainDead($domain);
diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf
index d720e5a1..702f3b73 100644
--- a/Source/domainset/cdn.conf
+++ b/Source/domainset/cdn.conf
@@ -4034,7 +4034,6 @@ netlify.apollo.io
 cdn.bullwhip.cloud
 cdn.coral.coralproject.net
 js.puter.com
-static.javatpoint.com
 # telemetry and some widget, use secondary widget
 hawk.tomsguide.com
 cdn0.iconfinder.com
@@ -4255,7 +4254,6 @@ jac.yahoosandbox.com
 dassets.shimano.com
 dz2cdn1.dzone.com
 newfold.scene7.com
-stbff.scene7.com
 mta.newfold.com
 stbff.newfold.com
 .li-cdn.com
diff --git a/Source/domainset/reject.conf b/Source/domainset/reject.conf
index 43923699..5ee5b884 100644
--- a/Source/domainset/reject.conf
+++ b/Source/domainset/reject.conf
@@ -2571,7 +2571,6 @@ switch.cup.com.cn
 # tom.com
 .pub.tom.com
 .discovery.tom.com
-adserve2.tom.com
 
 # brightdata (luminati) SDK
 .l-err.biz
@@ -2745,20 +2744,17 @@ smart-789.kakamobi.cn
 ad.thsi.cn
 league1.maoyuncloud.cn
 .ad.xelements.cn
-s.trafficjam.cn
+.trafficjam.cn
 s.snmi.cn
 api.snmi.cn
 adlaunch.qtfm.cn
 ad.api.youshiad.cn
 .appsad.cn
 iflyad.bj.openstorage.cn
-sdk.api.oaid.wocloud.cn
-api1.888zy.cn
 adpai.thepaper.cn
 qchannel04.cn
 dig.zjurl.cn
-uvu.nojmlxq.cn
-meipian7.cn
+.meipian7.cn
 80vn.cn
 ee.89kvh.cn
 m.89kvh.cn
@@ -2768,7 +2764,6 @@ m.zdjgj.cn
 m.shilian168.cn
 cmshow.gtimg.cn
 dsa-mfp.fengshows.cn
-adlog.molitv.cn
 .sigmob.cn
 
 ggx.cmvideo.cn
@@ -2778,8 +2773,7 @@ video-ad.sm.cn
 d.cntv.cn
 a.cntv.cn
 domob.com.cn
-ads-go.adroi.com.cn
-ads.adroi.com.cn
+.adroi.com.cn
 adx.appsdk.com.cn
 
 04.lzzncm.com
@@ -2791,7 +2785,7 @@ a.dounanhuahui.com
 ads.yam.com
 admd.yam.com
 ad2.yam.com
-r.pixgold.com
+.pixgold.com
 ads.ign.com
 ad.hiiir.com
 ad.funp.com
@@ -2802,29 +2796,27 @@ bu2.duba.com
 bu1.duba.com
 c.bing.com
 p.medialytics.com
-cdn.creative.medialytics.com
-px.cdn.creative.medialytics.com
+.cdn.creative.medialytics.com
 c.medialytics.com
 a.medialytics.com
 .adadapted.com
-plugin.2easydroid.com
 
 .nearbyad.com
 ads2.mediaarmor.com
 static.cdn.gtsmobi.com
 gts-ads.twistbox.com
-cdn.trafficforce.com
+.trafficforce.com
 .eltrafiko.com
 ads.mobilityware.com
 apps.mobilityware.com
-asotrack1.fluentmobile.com
+.fluentmobile.com
 .adultmoda.com
 c753738.r38.cf2.rackcdn.com
 adserver.ubiyoo.com
 .ads.taptapnetworks.com
 .crispadvertising.com
 ad.where.com
-oasc04012.247realmedia.com
+.247realmedia.com
 .bigmobileads.com
 ftpcontent.worldnow.com
 ads.saymedia.com
@@ -2832,7 +2824,7 @@ adcontent.saymedia.com
 static.estebull.com
 go.vrvm.com
 c.vrvm.com
-s3.phluant.com
+.phluant.com
 creative1cdn.mobfox.com
 .ads.huntmad.com
 .analytics.omgpop.com
@@ -2850,12 +2842,9 @@ pasta.esfile.duapps.com
 adx.hzbxm.com
 log1.cmpassport.com
 ads.reader.yueyouxs.com
-qqwx.zhangguangzong.com
-jpg.mengbingyuan.com
 spl.ztvx8.com
 zls.xz6d.com
 hw.zuimeitianqi.com
-ad.lflucky.com
 ads.yimg.com
 edgecast-vod.yimg.com
 engine.lvehaisen.com
@@ -2863,9 +2852,7 @@ api.ad.yipinread.com
 api-ad.kajicam.com
 log.kajicam.com
 api.touchxd.com
-cloudservice22.kingsoft-office-service.com
 splashimgbssdl.yun.kugou.com
-ad.ikonke.com
 sdk.zsdfm.com
 zhihu-web-analytics.zhihu.com
 raddus.bayescom.com
@@ -2890,9 +2877,8 @@ adx-bid.tianzhuobj.com
 
 ddd.1sapp.com
 in.vipliangmei.com
-ssp.1nmob.com
+.1nmob.com
 adls.suning.com
-adx.rrt365.com
 api-ads.tiantianqutao.com
 statics.woozooo.com
 .keybut.com
@@ -2901,7 +2887,6 @@ fbapi.guguread.com
 api.adxpand.com
 norma-external-collect.meizu.com
 ad.51wnl-cq.com
-mobds.pthejzb.com
 doubleclick.ctfile.com
 mydisplay.ctfile.com
 
@@ -2921,7 +2906,7 @@ glores2.taisantech.com
 cl2.webterren.com
 
 sdk.cferw.com
-ssp.tadseeker.com
+.tadseeker.com
 analytics3.dopool.com
 ad-cache.dopool.com
 cdn.adm.myhayo.com
@@ -2931,15 +2916,11 @@ static.jebe.renren.com
 bolt.jebe.renren.com
 ebp.renren.com
 .iscrv.com
-pole.6rooms.com
-bill.agent.v-56.com
-acs.agent.v-56.com
+.agent.v-56.com
 v16.56.com
 .union.56.com
-stat2.corp.56.com
 stat.56.com
-bill.agent.56.com
-acs.agent.56.com
+.agent.56.com
 acs.56.com
 ggx10.miguvideo.com
 ggx02.miguvideo.com
@@ -2948,14 +2929,11 @@ adstore-index-1252524079.file.myqcloud.com
 adstore-1252524079.file.myqcloud.com
 adguanggao.eee114.com
 app.starschina.com
-analytics3.starschina.com
-ssp.cibn.starschina.com
 ad.video.51togic.com
 test.ark.letv.com
 da.mmarket.com
 aiseet.aa.atianqi.com
 bdcdncmn-gd.inter.71edge.com
-rd596n.jomodns.com
 noxagile.duapp.com
 androidgo.duapp.com
 static.g.ppstream.com
diff --git a/Source/domainset/reject_extra.conf b/Source/domainset/reject_extra.conf
index 91bbf959..c63aec7a 100644
--- a/Source/domainset/reject_extra.conf
+++ b/Source/domainset/reject_extra.conf
@@ -50,7 +50,6 @@ nimiq.terorie.com
 .tdsshark.club
 .techandgadgets.net
 .techynews.org
-.theasea.xyz
 .thelastpicture.show
 .trafficbounce.net
 .unigogo.co
@@ -372,9 +371,7 @@ nimiq.terorie.com
 .coinloot.com
 .pdss2access.com
 .91pool.com
-.xmrlab.com
 .raskul.com
-.99miners.com
 .100-btc.com
 .100btc.com
 .ikpool.com
@@ -552,7 +549,6 @@ nimiq.terorie.com
 .bitaps.com
 .evrpool.com
 .karlsencoin.com
-.moriaxmr.com
 .poloniex.com
 .moneropool.com
 .teepool.com
@@ -652,7 +648,6 @@ nimiq.terorie.com
 .aropool.com
 .arriels.com
 .arrowbtc.com
-.snowmining.com
 .arsbitcoin.com
 .leywapool.com
 .clevermining.com
@@ -764,7 +759,6 @@ nimiq.terorie.com
 .befirstcdn.com
 .bellsyscdn.com
 .bestcoinsignals.com
-.bestmobiworld.com
 .chianetspace.com
 .coinblind.com
 .findchia.com
@@ -775,7 +769,6 @@ nimiq.terorie.com
 .biberukalap.com
 .bibipool.com
 .coin-have.com
-.gpuhot.com
 .binancebtc.com
 .binancecash.com
 .binanceus.com
@@ -856,7 +849,6 @@ nimiq.terorie.com
 .cc-poolz.com
 .statdynamic.com
 .ceilingcatcoin.com
-.poolmin.com
 .poolflare.com
 .maxeter.com
 .chain-pool.com
@@ -911,7 +903,6 @@ nimiq.terorie.com
 .conhive.com
 .dinartether.com
 .fennecblockchain.com
-.connecticoin.com
 .hashunited.com
 .mvcpool.com
 .multiminerapp.com
@@ -1037,7 +1028,6 @@ nimiq.terorie.com
 .futeboltv.com
 .g1thub.com
 .gayfishpool.com
-.gaypornwave.com
 .gazanew.com
 .getcryptotab.com
 .slimepool.com
@@ -1170,7 +1160,6 @@ nimiq.terorie.com
 .serie-vostfr.com
 .serv1swork.com
 .server.com
-.shoptoptop.com
 .silimbompom.com
 .sm3na.com
 .snahome.com
@@ -1249,7 +1238,6 @@ nimiq.terorie.com
 .stitthappens.com
 .tgservers.com
 .hemnes.win
-.mutuza.win
 .apdrive.win
 .azpool.win
 .bitcoiner.win