fix: 删除无效的并发

go.mod

@@ -6,14 +6,14 @@ require (
 	github.com/imroc/req/v3 v3.54.0
 	github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841
 	github.com/oneclickvirt/UnlockTests v0.0.28-20250727155204
-	github.com/oneclickvirt/backtrace v0.0.6-20250805091811
+	github.com/oneclickvirt/backtrace v0.0.7-20250811023541
 	github.com/oneclickvirt/basics v0.0.15-20250805084236
 	github.com/oneclickvirt/cputest v0.0.12-20250720122317
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
 	github.com/oneclickvirt/disktest v0.0.10-20250808140407
 	github.com/oneclickvirt/gostun v0.0.5-20250727155022
 	github.com/oneclickvirt/memorytest v0.0.9-20250808065154
-	github.com/oneclickvirt/nt3 v0.0.7-20250805133514
+	github.com/oneclickvirt/nt3 v0.0.8-20250811123903
 	github.com/oneclickvirt/pingtest v0.0.8-20250728015259
 	github.com/oneclickvirt/portchecker v0.0.3-20250728015900
 	github.com/oneclickvirt/security v0.0.6-20250805090112

go.sum

@@ -98,8 +98,8 @@ github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841 h1:Zef93z9UiZQwRA
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
 github.com/oneclickvirt/UnlockTests v0.0.28-20250727155204 h1:apFaEbHGKflYMZzK17nXzEai4GG873mTd+d9hCO/KdY=
 github.com/oneclickvirt/UnlockTests v0.0.28-20250727155204/go.mod h1:oOa6wj/qECtRMxwBO6D7o0L0F0Q/5sQ747OCnFQqoGE=
-github.com/oneclickvirt/backtrace v0.0.6-20250805091811 h1:mKXh/SB+8Aud1TdgmekIXiRR1ZTduIwoCpvrwa5gyyo=
-github.com/oneclickvirt/backtrace v0.0.6-20250805091811/go.mod h1:/+KUtOWz48TyiTTbhVTsp3D6b5WY+4pCgvFBYtUGtns=
+github.com/oneclickvirt/backtrace v0.0.7-20250811023541 h1:GzkzvUC6U9b6Dkz/Bl4JRPeQ7XBGoW7Qw1aWqzhF+MQ=
+github.com/oneclickvirt/backtrace v0.0.7-20250811023541/go.mod h1:/+KUtOWz48TyiTTbhVTsp3D6b5WY+4pCgvFBYtUGtns=
 github.com/oneclickvirt/basics v0.0.15-20250805084236 h1:guYO6wGooSIOAIutuy/zfJ4sXj525nBITw8cjEPRaK8=
 github.com/oneclickvirt/basics v0.0.15-20250805084236/go.mod h1:2PV+1ge01zb0Sqzj2V2I7P0wAdFSLF1XgAiumchJJbg=
 github.com/oneclickvirt/cputest v0.0.12-20250720122317 h1:toiwAK1hZE5b8klu2mOQ7J4sv5yV9lpPKwgPahfRYBQ=
@@ -118,8 +118,8 @@ github.com/oneclickvirt/mbw v0.0.1-20250808061222 h1:WGXOe6QvHiDRhPVMI0VcctjzW08
 github.com/oneclickvirt/mbw v0.0.1-20250808061222/go.mod h1:0Vq6NRpyLmGUdfHfL3uDcFsuZhi7KlG+OCs5ky2757Y=
 github.com/oneclickvirt/memorytest v0.0.9-20250808065154 h1:mjYOvpFz2mpDU9MNjj66oIDcc2r6+zoW8veP616/+4Q=
 github.com/oneclickvirt/memorytest v0.0.9-20250808065154/go.mod h1:DBxiVZX7mWCe0Fy+qu57ENheLo00sLfjKzvxiICrUtU=
-github.com/oneclickvirt/nt3 v0.0.7-20250805133514 h1:PeDFYMaqO3nH8dVNHek1HtjxBYVli1R5Rtd/5uFOSN0=
-github.com/oneclickvirt/nt3 v0.0.7-20250805133514/go.mod h1:O7YkaOMFihB8hwQiD74WTbDlyoTieDwTDBR6jbkZaP0=
+github.com/oneclickvirt/nt3 v0.0.8-20250811123903 h1:ubSPLh/DSrXj+tOgmRABgi2vrVmbmjjSne+NrVFNmNc=
+github.com/oneclickvirt/nt3 v0.0.8-20250811123903/go.mod h1:F1v+6xInBKnbUa8gV1M40R1HOzxg+obtduNhx3CTnmA=
 github.com/oneclickvirt/pingtest v0.0.8-20250728015259 h1:egoxZRZBOWN3JqBwqEsULDyRo2/dpGMeWcmV3U87zig=
 github.com/oneclickvirt/pingtest v0.0.8-20250728015259/go.mod h1:gxwsxxwitNQiGq2OI0ZogYoOLwc8DtuOdSRe6/EvRqs=
 github.com/oneclickvirt/portchecker v0.0.3-20250728015900 h1:AomzdppSOFB70AJESQhlp0IPbsHTTJGimAWDk2TzCWM=

goecs.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"os/exec"
 	"os/signal"
 	"regexp"
 	"runtime"
@@ -24,6 +25,7 @@ import (
 	"github.com/oneclickvirt/ecs/cputest"
 	"github.com/oneclickvirt/ecs/disktest"
 	"github.com/oneclickvirt/ecs/memorytest"
+	"github.com/oneclickvirt/ecs/nexttrace"
 	"github.com/oneclickvirt/ecs/speedtest"
 	"github.com/oneclickvirt/ecs/unlocktest"
 	"github.com/oneclickvirt/ecs/upstreams"
@@ -31,7 +33,6 @@ import (
 	gostunmodel "github.com/oneclickvirt/gostun/model"
 	memorytestmodel "github.com/oneclickvirt/memorytest/memory"
 	nt3model "github.com/oneclickvirt/nt3/model"
-	"github.com/oneclickvirt/nt3/nt"
 	ptmodel "github.com/oneclickvirt/pingtest/model"
 	"github.com/oneclickvirt/pingtest/pt"
 	"github.com/oneclickvirt/portchecker/email"
@@ -39,7 +40,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.1.76"
+	ecsVersion                                                        = "v0.1.80"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
@@ -99,7 +100,7 @@ func getMenuChoice(language string) string {
 			if re.MatchString(input) {
 				inChoice := input
 				switch inChoice {
-				case "1", "2", "3", "4", "5", "6", "7", "8", "9", "10":
+				case "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10":
 					return inChoice
 				default:
 					if language == "zh" {
@@ -190,6 +191,8 @@ Loop:
 	for {
 		choice = getMenuChoice(language)
 		switch choice {
+		case "0":
+			os.Exit(0)
 		case "1":
 			setFullTestStatus(preCheck)
 			onlyChinaTest = utils.CheckChina(enableLogger)
@@ -244,7 +247,23 @@ Loop:
 	}
 }
 
+// clearScreen 清屏
+func clearScreen() {
+	var cmd *exec.Cmd
+	switch runtime.GOOS {
+	case "windows":
+		cmd = exec.Command("cmd", "/c", "cls")
+	case "darwin":
+		cmd = exec.Command("clear")
+	default:
+		cmd = exec.Command("clear")
+	}
+	cmd.Stdout = os.Stdout
+	_ = cmd.Run()
+}
+
 func printMenuOptions(preCheck utils.NetCheckResult) {
+	clearScreen() // 清屏
 	var stats *utils.StatsResponse
 	var statsErr error
 	var githubInfo *utils.GitHubRelease
@@ -308,8 +327,9 @@ func printMenuOptions(preCheck utils.NetCheckResult) {
 		fmt.Println("6. 网络单项(IP质量检测+上游及三网回程+广州三网回程详细路由+全国延迟+测速节点11个)")
 		fmt.Println("7. 解锁单项(御三家解锁+常用流媒体解锁)")
 		fmt.Println("8. 硬件单项(系统信息+CPU+dd磁盘测试+fio磁盘测试)")
-		fmt.Println("9. IP质量检测(15个数据库的IP检测+邮件端口检测)")
+		fmt.Println("9. IP质量检测(15个数据库的IP质量检测+邮件端口检测)")
 		fmt.Println("10. 三网回程线路检测+三网回程详细路由(北京上海广州成都)+三网延迟测试(全国)")
+		fmt.Println("0. 退出程序")
 	case "en":
 		fmt.Printf("VPS Fusion Monster Test Version: %s\n", ecsVersion)
 		if preCheck.Connected {
@@ -319,7 +339,7 @@ func printMenuOptions(preCheck utils.NetCheckResult) {
 			}
 			fmt.Printf("%s\n", statsInfo)
 		}
-		fmt.Println("1. VPS Fusion Monster Test Comprehensive Test Suite")
+		fmt.Println("1. VPS Fusion Monster Test (Full Test)")
 		fmt.Println("2. Minimal Test Suite (System Info + CPU + Memory + Disk + 5 Speed Test Nodes)")
 		fmt.Println("3. Standard Test Suite (System Info + CPU + Memory + Disk + Basic Unlock Tests + 5 Speed Test Nodes)")
 		fmt.Println("4. Network-Focused Test Suite (System Info + CPU + Memory + Disk + 5 Speed Test Nodes)")
@@ -328,6 +348,7 @@ func printMenuOptions(preCheck utils.NetCheckResult) {
 		fmt.Println("7. Unlock-Only Test (Basic Unlock Tests + Common Streaming Services Unlock)")
 		fmt.Println("8. Hardware-Only Test (System Info + CPU + Memory + dd Disk Test + fio Disk Test)")
 		fmt.Println("9. IP Quality Test (IP Test with 15 Databases + Email Port Test)")
+		fmt.Println("0. Exit Program")
 	}
 }
 
@@ -525,7 +546,7 @@ func handleSignalInterrupt(sig chan os.Signal, startTime *time.Time, output *str
 	}
 }
 
-func runChineseTests(preCheck utils.NetCheckResult, wg1, wg2, wg3 *sync.WaitGroup, basicInfo, securityInfo, emailInfo, mediaInfo, ptInfo *string, output *string, tempOutput string, startTime time.Time, outputMutex *sync.Mutex) {
+func runChineseTests(preCheck utils.NetCheckResult, wg1, wg2, wg3, wg4 *sync.WaitGroup, basicInfo, securityInfo, emailInfo, mediaInfo, ptInfo *string, output *string, tempOutput string, startTime time.Time, outputMutex *sync.Mutex) {
 	*output = runBasicTests(preCheck, basicInfo, securityInfo, *output, tempOutput, outputMutex)
 	*output = runCPUTest(*output, tempOutput, outputMutex)
 	*output = runMemoryTest(*output, tempOutput, outputMutex)
@@ -533,11 +554,12 @@ func runChineseTests(preCheck utils.NetCheckResult, wg1, wg2, wg3 *sync.WaitGrou
 	if onlyIpInfoCheckStatus && !basicStatus && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
 		*output = runIpInfoCheck(*output, tempOutput, outputMutex)
 	}
-	if (onlyChinaTest || pingTestStatus) && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
-		wg3.Add(1)
+	var backtraceInfo string
+	if utTestStatus && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" && !onlyChinaTest {
+		wg1.Add(1)
 		go func() {
-			defer wg3.Done()
-			*ptInfo = pt.PingTest()
+			defer wg1.Done()
+			*mediaInfo = unlocktest.MediaTest(language)
 		}()
 	}
 	if emailTestStatus && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
@@ -547,20 +569,31 @@ func runChineseTests(preCheck utils.NetCheckResult, wg1, wg2, wg3 *sync.WaitGrou
 			*emailInfo = email.EmailCheck()
 		}()
 	}
-	if utTestStatus && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" && !onlyChinaTest {
-		wg1.Add(1)
+	if (onlyChinaTest || pingTestStatus) && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
+		wg3.Add(1)
 		go func() {
-			defer wg1.Done()
-			*mediaInfo = unlocktest.MediaTest(language)
+			defer wg3.Done()
+			*ptInfo = pt.PingTest()
 		}()
 	}
+	if runtime.GOOS != "windows" && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
+		if backtraceStatus && !onlyChinaTest {
+			wg4.Add(1)
+			go func() {
+				defer wg4.Done()
+				backtraceInfo = utils.PrintAndCapture(func() {
+					upstreams.UpstreamsCheck()
+				}, "", "")
+			}()
+		}
+	}
 	if preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
 		*output = runStreamingTests(wg1, mediaInfo, *output, tempOutput, outputMutex)
 		*output = runSecurityTests(*securityInfo, *output, tempOutput, outputMutex)
 		*output = runEmailTests(wg2, emailInfo, *output, tempOutput, outputMutex)
 	}
 	if runtime.GOOS != "windows" && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
-		*output = runNetworkTests(wg3, ptInfo, *output, tempOutput, outputMutex)
+		*output = runNetworkTests(wg3, wg4, ptInfo, &backtraceInfo, *output, tempOutput, outputMutex)
 	}
 	if preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
 		*output = runSpeedTests(*output, tempOutput, outputMutex)
@@ -599,6 +632,7 @@ func runEnglishTests(preCheck utils.NetCheckResult, wg1, wg2 *sync.WaitGroup, ba
 	*output = appendTimeInfo(*output, tempOutput, startTime, outputMutex)
 }
 
+// runIpInfoCheck 系统和网络基础信息检测不进行测试的时候，该函数检测取得本机IP信息并显示(单项测试中输出)
 func runIpInfoCheck(output, tempOutput string, outputMutex *sync.Mutex) string {
 	outputMutex.Lock()
 	defer outputMutex.Unlock()
@@ -771,23 +805,29 @@ func runEmailTests(wg2 *sync.WaitGroup, emailInfo *string, output, tempOutput st
 	}, tempOutput, output)
 }
 
-func runNetworkTests(wg3 *sync.WaitGroup, ptInfo *string, output, tempOutput string, outputMutex *sync.Mutex) string {
+func runNetworkTests(wg3, wg4 *sync.WaitGroup, ptInfo, backtraceInfo *string, output, tempOutput string, outputMutex *sync.Mutex) string {
 	outputMutex.Lock()
 	defer outputMutex.Unlock()
-	output = utils.PrintAndCapture(func() {
-		if backtraceStatus && !onlyChinaTest {
-			utils.PrintCenteredTitle("上游及回程线路检测", width)
-			upstreams.UpstreamsCheck()
-		}
-	}, tempOutput, output)
-	output = utils.PrintAndCapture(func() {
-		if nt3Status && !onlyChinaTest {
-			utils.PrintCenteredTitle("三网回程路由检测", width)
-			nt.TraceRoute(language, nt3Location, nt3CheckType)
-		}
-	}, tempOutput, output)
 	return utils.PrintAndCapture(func() {
-		if onlyChinaTest || pingTestStatus {
+		if backtraceStatus && !onlyChinaTest && *backtraceInfo != "" {
+			if wg4 != nil {
+				wg4.Wait()
+			}
+			utils.PrintCenteredTitle("上游及回程线路检测", width)
+			fmt.Print(*backtraceInfo)
+		}
+		if nt3Status && !onlyChinaTest {
+			var nt3Info string
+			if nt3Status && !onlyChinaTest {
+				utils.PrintCenteredTitle("三网回程路由检测", width)
+				nexttrace.NextTrace3Check(language, nt3Location, nt3CheckType) // 不可
+				nt3Info = utils.PrintAndCapture(func() {
+					fmt.Print(nt3Info)
+				}, "", "")
+				fmt.Print(nt3Info)
+			}
+		}
+		if (onlyChinaTest || pingTestStatus) && *ptInfo != "" {
 			wg3.Wait()
 			utils.PrintCenteredTitle("三网ICMP的PING值检测", width)
 			fmt.Println(*ptInfo)
@@ -884,7 +924,7 @@ func main() {
 		enabelUpload = false
 	}
 	var (
-		wg1, wg2, wg3                                         sync.WaitGroup
+		wg1, wg2, wg3, wg4                                    sync.WaitGroup
 		basicInfo, securityInfo, emailInfo, mediaInfo, ptInfo string
 		output, tempOutput                                    string
 		outputMutex                                           sync.Mutex
@@ -896,7 +936,7 @@ func main() {
 	go handleSignalInterrupt(sig, &startTime, &output, tempOutput, uploadDone, &outputMutex)
 	switch language {
 	case "zh":
-		runChineseTests(preCheck, &wg1, &wg2, &wg3, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &ptInfo, &output, tempOutput, startTime, &outputMutex)
+		runChineseTests(preCheck, &wg1, &wg2, &wg3, &wg4, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &ptInfo, &output, tempOutput, startTime, &outputMutex)
 	case "en":
 		runEnglishTests(preCheck, &wg1, &wg2, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &output, tempOutput, startTime, &outputMutex)
 	default:

goecs.sh

@@ -143,7 +143,7 @@ goecs_check() {
     os=$(uname -s 2>/dev/null || echo "Unknown")
     arch=$(uname -m 2>/dev/null || echo "Unknown")
     check_china
-    ECS_VERSION="0.1.75"
+    ECS_VERSION="0.1.79"
     for api in \
         "https://api.github.com/repos/oneclickvirt/ecs/releases/latest" \
         "https://githubapi.spiritlhl.workers.dev/repos/oneclickvirt/ecs/releases/latest" \
@@ -155,8 +155,8 @@ goecs_check() {
         sleep 1
     done
     if [ -z "$ECS_VERSION" ]; then
-        _yellow "Unable to get version info, using default version 0.1.75"
-        ECS_VERSION="0.1.75"
+        _yellow "Unable to get version info, using default version 0.1.79"
+        ECS_VERSION="0.1.79"
     fi
     version_output=""
     for cmd_path in "goecs" "./goecs" "/usr/bin/goecs" "/usr/local/bin/goecs"; do

nexttrace/nexttrace.go

@@ -0,0 +1,44 @@
+package nexttrace
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/oneclickvirt/nt3/nt"
+)
+
+func NextTrace3Check(language, nt3Location, nt3CheckType string) {
+	resultChan := make(chan nt.TraceResult, 100)
+	go nt.TraceRoute(language, nt3Location, nt3CheckType, resultChan)
+	for result := range resultChan {
+		if result.Index == -1 {
+			for index, res := range result.Output {
+				res = strings.TrimSpace(res)
+				if res != "" && index == 0 {
+					fmt.Println(res)
+				}
+			}
+			continue
+		}
+		if result.ISPName == "Error" {
+			for _, res := range result.Output {
+				res = strings.TrimSpace(res)
+				if res != "" {
+					fmt.Println(res)
+				}
+			}
+			return
+		}
+		for _, res := range result.Output {
+			res = strings.TrimSpace(res)
+			if res == "" {
+				continue
+			}
+			if strings.Contains(res, "ICMP") {
+				fmt.Print(res)
+			} else {
+				fmt.Println(res)
+			}
+		}
+	}
+}

nexttrace/nexttrace_test.go

@@ -0,0 +1,13 @@
+package nexttrace
+
+import (
+	"testing"
+	"time"
+)
+
+func TestNextTrace3Check(t *testing.T) {
+	start := time.Now()
+	NextTrace3Check("zh", "ALL", "ipv4")
+	duration := time.Since(start)
+	t.Logf("执行耗时: %s", duration)
+}

upstreams/upstreams.go

@@ -2,19 +2,65 @@ package upstreams
 
 import (
 	"fmt"
+	"sync"
+	"time"
 
 	"github.com/oneclickvirt/UnlockTests/uts"
 	bgptools "github.com/oneclickvirt/backtrace/bgptools"
 	backtrace "github.com/oneclickvirt/backtrace/bk"
+	. "github.com/oneclickvirt/defaultset"
 )
 
+type IpInfo struct {
+	Ip      string `json:"ip"`
+	City    string `json:"city"`
+	Region  string `json:"region"`
+	Country string `json:"country"`
+	Org     string `json:"org"`
+}
+
+type ConcurrentResults struct {
+	bgpResult       string
+	backtraceResult string
+	bgpError        error
+	// backtraceError  error
+}
+
 var IPV4, IPV6 string
 
 func UpstreamsCheck() {
+	results := ConcurrentResults{}
+	var wg sync.WaitGroup
 	if IPV4 != "" {
-		if result, err := bgptools.GetPoPInfo(IPV4); err == nil {
-			fmt.Print(result.Result)
-		}
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for i := 0; i < 2; i++ {
+				result, err := bgptools.GetPoPInfo(IPV4)
+				results.bgpError = err
+				if err == nil && result.Result != "" {
+					results.bgpResult = result.Result
+					return
+				}
+				if i == 0 {
+					time.Sleep(3 * time.Second)
+				}
+			}
+		}()
 	}
-	backtrace.BackTrace(uts.IPV6)
-}
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		result := backtrace.BackTrace(uts.IPV6)
+		results.backtraceResult = result
+	}()
+	wg.Wait()
+	if results.bgpResult != "" {
+		fmt.Print(results.bgpResult)
+	}
+	if results.backtraceResult != "" {
+		fmt.Printf("%s\n", results.backtraceResult)
+	}
+	fmt.Println(Yellow("准确线路自行查看详细路由，本测试结果仅作参考"))
+	fmt.Println(Yellow("同一目标地址多个线路时，检测可能已越过汇聚层，除第一个线路外，后续信息可能无效"))
+}