✨ 优化忽略规则配置和 Agent 获取 IP

cmd/agent/monitor/myip.go

@@ -1,18 +1,13 @@
 package monitor
 
 import (
-	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
-	"net"
 	"net/http"
-	"strings"
-	"sync"
 	"time"
 
-	"github.com/miekg/dns"
+	"github.com/naiba/nezha/pkg/utils"
 )
 
 type geoIP struct {
@@ -24,14 +19,16 @@ var (
 	ipv4Servers = []string{
 		"https://api-ipv4.ip.sb/geoip",
 		"https://ip4.seeip.org/geoip",
+		"https://ipapi.co/json",
 	}
 	ipv6Servers = []string{
 		"https://ip6.seeip.org/geoip",
 		"https://api-ipv6.ip.sb/geoip",
+		"https://ipapi.co/json",
 	}
 	cachedIP, cachedCountry string
-	httpClientV4            = newHTTPClient(time.Second*20, time.Second*5, time.Second*10, false)
-	httpClientV6            = newHTTPClient(time.Second*20, time.Second*5, time.Second*10, true)
+	httpClientV4            = utils.NewSingleStackHTTPClient(time.Second*20, time.Second*5, time.Second*10, false)
+	httpClientV6            = utils.NewSingleStackHTTPClient(time.Second*20, time.Second*5, time.Second*10, true)
 )
 
 func UpdateIP() {
@@ -73,93 +70,3 @@ func fetchGeoIP(servers []string, isV6 bool) geoIP {
 	}
 	return ip
 }
-
-func newHTTPClient(httpTimeout, dialTimeout, keepAliveTimeout time.Duration, ipv6 bool) *http.Client {
-	dialer := &net.Dialer{
-		Timeout:   dialTimeout,
-		KeepAlive: keepAliveTimeout,
-	}
-
-	transport := &http.Transport{
-		Proxy:             http.ProxyFromEnvironment,
-		ForceAttemptHTTP2: false,
-		DialContext: func(ctx context.Context, network string, addr string) (net.Conn, error) {
-			ip, err := resolveIP(addr, ipv6)
-			if err != nil {
-				return nil, err
-			}
-			return dialer.DialContext(ctx, network, ip)
-		},
-	}
-
-	return &http.Client{
-		Transport: transport,
-		Timeout:   httpTimeout,
-	}
-}
-
-func resolveIP(addr string, ipv6 bool) (string, error) {
-	url := strings.Split(addr, ":")
-
-	m := new(dns.Msg)
-	if ipv6 {
-		m.SetQuestion(dns.Fqdn(url[0]), dns.TypeAAAA)
-	} else {
-		m.SetQuestion(dns.Fqdn(url[0]), dns.TypeA)
-	}
-	m.RecursionDesired = true
-
-	dnsServers := []string{"2606:4700:4700::1001", "2001:4860:4860::8844"}
-	if !ipv6 {
-		dnsServers = []string{"1.0.0.1", "8.8.4.4"}
-	}
-
-	var wg sync.WaitGroup
-	var resolveLock sync.RWMutex
-	var ipv4Resolved, ipv6Resolved bool
-
-	wg.Add(len(dnsServers))
-	for i := 0; i < len(dnsServers); i++ {
-		go func(i int) {
-			defer wg.Done()
-			c := new(dns.Client)
-			c.Timeout = time.Second * 3
-			r, _, err := c.Exchange(m, net.JoinHostPort(dnsServers[i], "53"))
-			if err != nil {
-				return
-			}
-			resolveLock.Lock()
-			defer resolveLock.Unlock()
-			if ipv6 && ipv6Resolved {
-				return
-			}
-			if !ipv6 && ipv4Resolved {
-				return
-			}
-			for _, ans := range r.Answer {
-				if ipv6 {
-					if aaaa, ok := ans.(*dns.AAAA); ok {
-						url[0] = "[" + aaaa.AAAA.String() + "]"
-						ipv6Resolved = true
-					}
-				} else {
-					if a, ok := ans.(*dns.A); ok {
-						url[0] = a.A.String()
-						ipv4Resolved = true
-					}
-				}
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	if ipv6 && !ipv6Resolved {
-		return "", errors.New("the AAAA record not resolved")
-	}
-
-	if !ipv6 && !ipv4Resolved {
-		return "", errors.New("the A record not resolved")
-	}
-
-	return strings.Join(url, ":"), nil
-}