fix: 修复站点监控使用自定义dns解析域名报错的bug

2026-07-09 06:07:37 +08:00 · 2025-07-31 10:44:50 +08:00
parent 3fc863561a
commit eb8cd53de2
4 changed files with 127 additions and 46 deletions
@@ -1,60 +1,134 @@
-import { LocalCache } from '@certd/basic';
-import dnsSdk from 'dns'
+import {LocalCache, logger} from '@certd/basic';
+import dnsSdk, {AnyRecord} from 'dns'
+import { LRUCache } from 'lru-cache';
+import {LookupAddress} from "node:dns";
 const dns = dnsSdk.promises

 export class DnsCustom{
-  resolver: any;
+  private resolver: dnsSdk.promises.Resolver;
+  private cache = new LRUCache<string, any>({
+    max: 1000,
+    ttl: 1000 * 60 * 5,
+  });

  constructor(dnsServers:string[]) {
    const resolver = new dns.Resolver();
    resolver.setServers(dnsServers);
    this.resolver = resolver;
  }
-  async resolve(hostname:string,options:any):Promise<string[]>{
-    // { family: undefined, hints: 0, all: true }

-    const cnames = await this.resolver.resolveCname(hostname)
-    let cnameIps = []
-    // deep
-    if (cnames && cnames.length > 0) {
-      for (let cname of cnames) {
-        const cnameIp = await this.resolve(cname,options)
-        if (cnameIp && cnameIp.length > 0) {
-          cnameIps.push(...cnameIp)
+  async lookup(hostname:string,options?:{ family: any, hints: number, all: boolean }):Promise<LookupAddress[]>{
+    const cacheKey = hostname + JSON.stringify(options)
+    let res = this.cache.get(cacheKey)
+    if (res){
+      return res
+    }
+    res = await this.doLookup(hostname,options)
+    this.cache.set(cacheKey,res)
+    return res
+  }
+  async doLookup(hostname:string,options?:{ family: any, hints: number, all: boolean }):Promise<LookupAddress[]>{
+    // { family: undefined, hints: 0, all: true }
+    let cnameIps:LookupAddress[] = []
+    let v4:LookupAddress[] = []
+    let v6:LookupAddress[] = []
+    let errors = []
+    const resolveCname = async ()=>{
+      let cnames = []
+      try{
+        cnames = await this.resolver.resolveCname(hostname)
+      }catch (e) {
+        errors.push(e)
+        logger.warn("query cname error",e)
+      }
+      // deep
+      if (cnames && cnames.length > 0) {
+        for (let cname of cnames) {
+          try{
+            const cnameIp = await this.lookup(cname,options)
+            if (cnameIp && cnameIp.length > 0) {
+              cnameIps.push(...cnameIp)
+            }
+          }catch (e) {
+            errors.push(e)
+            logger.warn("lookup cname error",e)
+          }
        }
      }
    }
-    let v4 = []
-    let v6 = []
+    const queryV6 = async ()=>{
+      try{
+        const list = await this.resolver.resolve6(hostname)
+        if (list && list.length > 0) {
+          v6 = list.map(item=>{
+            return {
+              address: item,
+              family: 6
+            }
+          })
+        }
+      }catch (e) {
+        logger.warn("query v6 error",e)
+        errors.push(e)
+      }
+    }
+    const queryV4 = async ()=>{
+      try{
+        const list =await this.resolver.resolve4(hostname)
+        if (list && list.length > 0) {
+          v4 = list.map(item=>{
+            return {
+              address: item,
+              family: 4
+            }
+          })
+        }
+      }catch (e) {
+        logger.warn("query v4 error",e)
+        errors.push(e)
+      }
+    }
+
+    const queries:Promise<any>[] = [resolveCname()]
+

    const {family, all} = options
-    if(family === 6 && !all){
-      v6= await this.resolver.resolve6(hostname)
+    if (all){
+      queries.push(queryV6())
+      queries.push(queryV4())
+    }else{
+      if(family === 6 ){
+        queries.push(queryV6())
+      }
+      if(family === 4 ){
+        queries.push(queryV4())
+      }
    }
-    if(family === 4 && !all){
-      v4 = await this.resolver.resolve4(hostname)
+    await Promise.all(queries)
+    const res = [...v4,...v6,...cnameIps]
+    if(res.length === 0){
+      if (errors.length > 0){
+        const e =  new Error(errors[0])
+        // @ts-ignore
+        e.errors =  errors
+        throw e
+      }
    }
-
-    if(all){
-       v4 = await this.resolver.resolve4(hostname)
-       v6 = await this.resolver.resolve6(hostname)
-    }
-
-    return [...v4,...v6,...cnameIps]
+    return res
  }

-  async resolve4(hostname:string,options:any):Promise<string[]>{
-    return await this.resolver.resolve4(hostname,options)
+  async resolve4(hostname:string):Promise<string[]>{
+    return await this.resolver.resolve4(hostname)
  }
-  async resolve6(hostname:string,options:any):Promise<string[]>{
-    return await this.resolver.resolve6(hostname,options)
+  async resolve6(hostname:string):Promise<string[]>{
+    return await this.resolver.resolve6(hostname)
  }
-  async resolveAny(hostname:string,options:any):Promise<string[]>{
-    return await this.resolver.resolveAny(hostname,options)
+  async resolveAny(hostname:string):Promise<AnyRecord[]>{
+    return await this.resolver.resolveAny(hostname)
  }

-  async resolveCname(hostname:string,options:any):Promise<string[]>{
-    return await this.resolver.resolveCname(hostname,options)
+  async resolveCname(hostname:string):Promise<string[]>{
+    return await this.resolver.resolveCname(hostname)
  }