fankes/komari-agent
2
0
Fork 0
mirror of https://github.com/fankes/komari-agent.git synced 2025-10-19 11:09:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20 from mogumc/main

Browse Source 
fix: 复用Client 优化网络性能
This commit is contained in:
Akizon
2025-08-14 15:28:31 +08:00
committed by GitHub
parent 3aa730d7b1 0b58849c9c
commit af730aafb2
1 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
monitoring/unit/ip.go
View File

@@ -10,10 +10,9 @@ import (
"time" "time"
) )
var userAgent = "curl/8.0.1" var (
ipv4HTTPClient = &http.Client{
func ipv4Transport() *http.Transport { Transport: &http.Transport{
return &http.Transport{
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
d := net.Dialer{ d := net.Dialer{
Timeout: 15 * time.Second, Timeout: 15 * time.Second,
@@ -25,11 +24,11 @@ func ipv4Transport() *http.Transport {
IdleConnTimeout: 30 * time.Second, IdleConnTimeout: 30 * time.Second,
TLSHandshakeTimeout: 10 * time.Second, TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second, ExpectContinueTimeout: 1 * time.Second,
},
Timeout: 15 * time.Second,
} }
} ipv6HTTPClient = &http.Client{
Transport: &http.Transport{
func ipv6Transport() *http.Transport {
return &http.Transport{
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
d := net.Dialer{ d := net.Dialer{
Timeout: 15 * time.Second, Timeout: 15 * time.Second,
@@ -41,14 +40,13 @@ func ipv6Transport() *http.Transport {
IdleConnTimeout: 30 * time.Second, IdleConnTimeout: 30 * time.Second,
TLSHandshakeTimeout: 10 * time.Second, TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second, ExpectContinueTimeout: 1 * time.Second,
} },
}
func GetIPv4Address() (string, error) {
client := &http.Client{
Transport: ipv4Transport(),
Timeout: 15 * time.Second, Timeout: 15 * time.Second,
} }
userAgent = "curl/8.0.1"
)
func GetIPv4Address() (string, error) {
webAPIs := []string{ webAPIs := []string{
"https://www.visa.cn/cdn-cgi/trace", "https://www.visa.cn/cdn-cgi/trace",
@@ -67,7 +65,7 @@ func GetIPv4Address() (string, error) {
continue continue
} }
req.Header.Set("User-Agent", userAgent) req.Header.Set("User-Agent", userAgent)
resp, err := client.Do(req) resp, err := ipv4HTTPClient.Do(req)
if err != nil { if err != nil {
continue continue
} }
@@ -87,10 +85,6 @@ func GetIPv4Address() (string, error) {
} }
func GetIPv6Address() (string, error) { func GetIPv6Address() (string, error) {
client := &http.Client{
Transport: ipv6Transport(), // 对于v6请求只使用v6
Timeout: 15 * time.Second,
}
webAPIs := []string{ webAPIs := []string{
"https://v6.ip.zxinc.org/info.php?type=json", "https://v6.ip.zxinc.org/info.php?type=json",
@@ -106,7 +100,7 @@ func GetIPv6Address() (string, error) {
continue continue
} }
req.Header.Set("User-Agent", userAgent) req.Header.Set("User-Agent", userAgent)
resp, err := client.Do(req) resp, err := ipv6HTTPClient.Do(req)
if err != nil { if err != nil {
continue continue
} }