Merge pull request #178 from nxtrace/main

chore: 同步V1版本

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
 	github.com/tsosunchia/powclient v0.1.4
-	golang.org/x/net v0.16.0
+	golang.org/x/net v0.17.0
 	golang.org/x/sync v0.4.0
 )
 

go.sum

@@ -296,8 +296,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
-golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

util/latency.go

@@ -21,6 +21,7 @@ type ResponseInfo struct {
 
 var (
 	results = make(chan ResponseInfo)
+	timeout = 5 * time.Second
 )
 var FastIpCache = ""
 
@@ -38,6 +39,11 @@ func GetFastIP(domain string, port string, enableOutput bool) string {
 		log.Fatal("DNS resolution failed, please check your system DNS Settings")
 	}
 
+	if len(ips) == 0 {
+		// 添加默认IP 45.88.195.154
+		ips = append(ips, net.ParseIP("45.88.195.154"))
+	}
+
 	for _, ip := range ips {
 		go checkLatency(domain, ip.String(), port)
 	}
@@ -46,21 +52,22 @@ func GetFastIP(domain string, port string, enableOutput bool) string {
 
 	select {
 	case result = <-results:
-	case <-time.After(1 * time.Second):
-		log.Fatal("IP connection has been timeout, please check your network")
+	//等待5s没有结果 视为连不上API了
+	case <-time.After(timeout):
+		log.Println("IP connection has been timeout, please check your network")
 
 	}
 
-	if len(ips) > 0 {
-		if enableOutput {
-			_, _ = fmt.Fprintf(color.Output, "%s prefered API IP - %s - %s - %s",
-				color.New(color.FgWhite, color.Bold).Sprintf("[NextTrace API]"),
-				color.New(color.FgGreen, color.Bold).Sprintf("%s", result.IP),
-				color.New(color.FgCyan, color.Bold).Sprintf("%sms", result.Latency),
-				color.New(color.FgGreen, color.Bold).Sprintf("%s", result.Content),
-			)
-		}
+	//if len(ips) > 0 {
+	if enableOutput {
+		_, _ = fmt.Fprintf(color.Output, "%s prefered API IP - %s - %s - %s",
+			color.New(color.FgWhite, color.Bold).Sprintf("[NextTrace API]"),
+			color.New(color.FgGreen, color.Bold).Sprintf("%s", result.IP),
+			color.New(color.FgCyan, color.Bold).Sprintf("%sms", result.Latency),
+			color.New(color.FgGreen, color.Bold).Sprintf("%s", result.Content),
+		)
 	}
+	//}
 	FastIpCache = result.IP
 	return result.IP
 }
@@ -79,31 +86,32 @@ func checkLatency(domain string, ip string, port string) {
 		TLSClientConfig: &tls.Config{
 			ServerName: domain,
 		},
-		TLSHandshakeTimeout: 1 * time.Second,
+		TLSHandshakeTimeout: timeout,
 	}
 
 	client := &http.Client{
 		Transport: transport,
-		Timeout:   2 * time.Second,
+		Timeout:   timeout,
 	}
 
 	//此处虽然是 https://domain/ 但是实际上会使用指定的IP连接
 	req, err := http.NewRequest("GET", "https://"+ip+":"+port+"/", nil)
 	if err != nil {
-		results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
+		// !!! 此处不要给results返回任何值
+		//results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
 		return
 	}
 	req.Host = domain
 	resp, err := client.Do(req)
 	if err != nil {
-		results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
+		//results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
 		return
 	}
 	defer resp.Body.Close()
 
 	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
-		results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
+		//results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
 		return
 	}
 	bodyString := string(bodyBytes)