rebuild tcping

tcping.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"net"
 	"net/http"
-	"strconv"
 	"sync"
 	"time"
 
@@ -13,30 +13,24 @@ import (
 )
 
 //bool connectionSucceed float32 time
-func tcping(ip net.IPAddr, tcpPort int) (bool, float32) {
+func tcping(ip net.IPAddr, tcpPort int) (bool, time.Duration) {
 	startTime := time.Now()
-	var fullAddress string
+	fullAddress := fmt.Sprintf("%s:%d", ip.String(), tcpPort)
 	//fmt.Println(ip.String())
 	if ipv6Mode { // IPv6 需要加上 []
-		fullAddress = "[" + ip.String() + "]:" + strconv.Itoa(tcpPort)
-	} else {
-		fullAddress = ip.String() + ":" + strconv.Itoa(tcpPort)
+		fullAddress = fmt.Sprintf("[%s]:%d", ip.String(), tcpPort)
 	}
 	conn, err := net.DialTimeout("tcp", fullAddress, tcpConnectTimeout)
 	if err != nil {
 		return false, 0
-	} else {
-		var endTime = time.Since(startTime)
-		var duration = float32(endTime.Microseconds()) / 1000.0
-		_ = conn.Close()
-		return true, duration
 	}
+	defer conn.Close()
+	duration := time.Since(startTime)
+	return true, duration
 }
 
 //pingReceived pingTotalTime
-func checkConnection(ip net.IPAddr, tcpPort int) (int, float32) {
-	pingRecv := 0
-	var pingTime float32 = 0.0
+func checkConnection(ip net.IPAddr, tcpPort int) (pingRecv int, pingTime time.Duration) {
 	for i := 1; i <= failTime; i++ {
 		pingSucceed, pingTimeCurrent := tcping(ip, tcpPort)
 		if pingSucceed {
@@ -44,14 +38,14 @@ func checkConnection(ip net.IPAddr, tcpPort int) (int, float32) {
 			pingTime += pingTimeCurrent
 		}
 	}
-	return pingRecv, pingTime
+	return
 }
 
 //return Success packetRecv averagePingTime specificIPAddr
-func tcpingHandler(ip net.IPAddr, tcpPort int, pingCount int, progressHandler func(e progressEvent)) (bool, int, float32, net.IPAddr) {
+func tcpingHandler(ip net.IPAddr, tcpPort, pingCount int, progressHandler func(e progressEvent)) (bool, int, time.Duration, net.IPAddr) {
 	ipCanConnect := false
 	pingRecv := 0
-	var pingTime float32 = 0.0
+	var pingTime time.Duration
 	for !ipCanConnect {
 		pingRecvCurrent, pingTimeCurrent := checkConnection(ip, tcpPort)
 		if pingRecvCurrent != 0 {
@@ -66,21 +60,20 @@ func tcpingHandler(ip net.IPAddr, tcpPort int, pingCount int, progressHandler fu
 			break
 		}
 	}
-	if ipCanConnect {
-		progressHandler(AvailableIPFound)
-		for i := failTime; i < pingCount; i++ {
-			pingSuccess, pingTimeCurrent := tcping(ip, tcpPort)
-			progressHandler(NormalPing)
-			if pingSuccess {
-				pingRecv++
-				pingTime += pingTimeCurrent
-			}
-		}
-		return true, pingRecv, pingTime / float32(pingRecv), ip
-	} else {
+	if !ipCanConnect {
 		progressHandler(NoAvailableIPFound)
 		return false, 0, 0, net.IPAddr{}
 	}
+	progressHandler(AvailableIPFound)
+	for i := failTime; i < pingCount; i++ {
+		pingSuccess, pingTimeCurrent := tcping(ip, tcpPort)
+		progressHandler(NormalPing)
+		if pingSuccess {
+			pingRecv++
+			pingTime += pingTimeCurrent
+		}
+	}
+	return true, pingRecv, pingTime / time.Duration(pingRecv), ip
 }
 
 func tcpingGoroutine(wg *sync.WaitGroup, mutex *sync.Mutex, ip net.IPAddr, tcpPort int, pingCount int, csv *[]CloudflareIPData, control chan bool, progressHandler func(e progressEvent)) {
@@ -126,47 +119,47 @@ func DownloadSpeedHandler(ip net.IPAddr) (bool, float32) {
 	response, err := client.Get(url)
 	if err != nil {
 		return false, 0
-	} else {
-		defer func() { _ = response.Body.Close() }()
-		if response.StatusCode == 200 {
-			timeStart := time.Now()
-			timeEnd := timeStart.Add(downloadTestTime)
+	}
+	defer response.Body.Close()
+	if response.StatusCode != 200 {
+		return false, 0
+	}
+	timeStart := time.Now()
+	timeEnd := timeStart.Add(downloadTestTime)
 
-			contentLength := response.ContentLength
-			buffer := make([]byte, downloadBufferSize)
+	contentLength := response.ContentLength
+	buffer := make([]byte, downloadBufferSize)
 
-			var contentRead int64 = 0
-			var timeSlice = downloadTestTime / 100
-			var timeCounter = 1
-			var lastContentRead int64 = 0
+	var (
+		contentRead     int64 = 0
+		timeSlice             = downloadTestTime / 100
+		timeCounter           = 1
+		lastContentRead int64 = 0
+	)
 
-			var nextTime = timeStart.Add(timeSlice * time.Duration(timeCounter))
-			e := ewma.NewMovingAverage()
+	var nextTime = timeStart.Add(timeSlice * time.Duration(timeCounter))
+	e := ewma.NewMovingAverage()
 
-			for contentLength != contentRead {
-				var currentTime = time.Now()
-				if currentTime.After(nextTime) {
-					timeCounter += 1
-					nextTime = timeStart.Add(timeSlice * time.Duration(timeCounter))
-					e.Add(float64(contentRead - lastContentRead))
-					lastContentRead = contentRead
-				}
-				if currentTime.After(timeEnd) {
-					break
-				}
-				bufferRead, err := response.Body.Read(buffer)
-				contentRead += int64(bufferRead)
-				if err != nil {
-					if err != io.EOF {
-						break
-					} else {
-						e.Add(float64(contentRead-lastContentRead) / (float64(nextTime.Sub(currentTime)) / float64(timeSlice)))
-					}
-				}
+	for contentLength != contentRead {
+		var currentTime = time.Now()
+		if currentTime.After(nextTime) {
+			timeCounter++
+			nextTime = timeStart.Add(timeSlice * time.Duration(timeCounter))
+			e.Add(float64(contentRead - lastContentRead))
+			lastContentRead = contentRead
+		}
+		if currentTime.After(timeEnd) {
+			break
+		}
+		bufferRead, err := response.Body.Read(buffer)
+		contentRead += int64(bufferRead)
+		if err != nil {
+			if err != io.EOF {
+				break
 			}
-			return true, float32(e.Value()) / (float32(downloadTestTime.Seconds()) / 120)
-		} else {
-			return false, 0
+			e.Add(float64(contentRead-lastContentRead) / (float64(nextTime.Sub(currentTime)) / float64(timeSlice)))
 		}
 	}
+	return true, float32(e.Value()) / (float32(downloadTestTime.Seconds()) / 120)
+
 }