fix: 修复PING值测试的过滤条件

README.md

@@ -225,6 +225,8 @@ Usage: goecs [options]
         Enable/Disable security test (default true)
   -speed
         Enable/Disable speed test (default true)
+  -ping
+        Enable/Disable ping test (default false)
   -spnum int
         Set the number of servers per operator for speed test (default 2)
   -upload

README_EN.md

@@ -224,6 +224,8 @@ Usage: goecs [options]
         Enable/Disable security test (default true)
   -speed
         Enable/Disable speed test (default true)
+  -ping
+        Enable/Disable ping test (default false)
   -spnum int
         Set the number of servers per operator for speed test (default 2)
   -upload

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/imroc/req/v3 v3.54.0
 	github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841
 	github.com/oneclickvirt/UnlockTests v0.0.30-20251030112700
-	github.com/oneclickvirt/backtrace v0.0.7-20250811023541
+	github.com/oneclickvirt/backtrace v0.0.8-20251102140847
 	github.com/oneclickvirt/basics v0.0.16-20251030093657
 	github.com/oneclickvirt/cputest v0.0.12-20250720122317
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
@@ -14,10 +14,10 @@ require (
 	github.com/oneclickvirt/gostun v0.0.5-20250727155022
 	github.com/oneclickvirt/memorytest v0.0.10-20250924154648
 	github.com/oneclickvirt/nt3 v0.0.9-20251031045617
-	github.com/oneclickvirt/pingtest v0.0.8-20250728015259
+	github.com/oneclickvirt/pingtest v0.0.9-20251102150730
 	github.com/oneclickvirt/portchecker v0.0.3-20250728015900
 	github.com/oneclickvirt/security v0.0.7-20251030094114
-	github.com/oneclickvirt/speedtest v0.0.10-20250728015734
+	github.com/oneclickvirt/speedtest v0.0.11-20251102151740
 )
 
 require (

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.30-20251030112700 h1:dtHHyWZdshox8StzrjgImj3Rvqwup5OZJ8FAZZQjPIA=
 github.com/oneclickvirt/UnlockTests v0.0.30-20251030112700/go.mod h1:oOa6wj/qECtRMxwBO6D7o0L0F0Q/5sQ747OCnFQqoGE=
-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/backtrace v0.0.8-20251102140847 h1:OiwD06+Mql3pYP8jJFFdP3OUlCrx/qJT7y2YCd/OMiI=
+github.com/oneclickvirt/backtrace v0.0.8-20251102140847/go.mod h1:mj9TSow7FNszBb3bQj2Hhm41LwBo7HQP6sgaPtovKdM=
 github.com/oneclickvirt/basics v0.0.16-20251030093657 h1:6SWWILNjJfMTXbspqYRpktUEOe/QIVhGonKO8ODC7n4=
 github.com/oneclickvirt/basics v0.0.16-20251030093657/go.mod h1:2PV+1ge01zb0Sqzj2V2I7P0wAdFSLF1XgAiumchJJbg=
 github.com/oneclickvirt/cputest v0.0.12-20250720122317 h1:toiwAK1hZE5b8klu2mOQ7J4sv5yV9lpPKwgPahfRYBQ=
@@ -120,14 +120,14 @@ github.com/oneclickvirt/memorytest v0.0.10-20250924154648 h1:trk6oZ7xs1eVtr+6oIv
 github.com/oneclickvirt/memorytest v0.0.10-20250924154648/go.mod h1:4kiHsEWkW9r3/1ZcV5xIweU0smiKP0IRfQj74AUIiVI=
 github.com/oneclickvirt/nt3 v0.0.9-20251031045617 h1:g42R4kwOL4s6sDsG+axEXJsI82pldv42HLMYCDFypNg=
 github.com/oneclickvirt/nt3 v0.0.9-20251031045617/go.mod h1:yo1ufkduFt9QjqG7nqSUf1D3YlQOmFpdlTYniJfclQI=
-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/pingtest v0.0.9-20251102150730 h1:pipqyJUaUI0K5waFvDNNfqbIikMp+9Kg8Dw/kLEUYF8=
+github.com/oneclickvirt/pingtest v0.0.9-20251102150730/go.mod h1:gxwsxxwitNQiGq2OI0ZogYoOLwc8DtuOdSRe6/EvRqs=
 github.com/oneclickvirt/portchecker v0.0.3-20250728015900 h1:AomzdppSOFB70AJESQhlp0IPbsHTTJGimAWDk2TzCWM=
 github.com/oneclickvirt/portchecker v0.0.3-20250728015900/go.mod h1:9sjMDPCd4Z40wkYB0S9gQPGH8YPtnNE1ZJthVIuHUzA=
 github.com/oneclickvirt/security v0.0.7-20251030094114 h1:Ax8J1TYqprXyiWNAIJJ3xhoyGhvBlKw4m9j6va5Q2nM=
 github.com/oneclickvirt/security v0.0.7-20251030094114/go.mod h1:YfDilPFW22szjdUNgv4VOuSwHnZzsFsdPOfRYiMoc3I=
-github.com/oneclickvirt/speedtest v0.0.10-20250728015734 h1:HKO7/JQ74ueXA8Wo8NIvcK9DphbEG/YTfAAVz/akSiY=
-github.com/oneclickvirt/speedtest v0.0.10-20250728015734/go.mod h1:0W8vnMbA3iucXLXFdGfe9Ia6RPS0izRO7jvu/SnH1P8=
+github.com/oneclickvirt/speedtest v0.0.11-20251102151740 h1:1NUrNt5ay6/xVNC5x62UrQjPqK8jgbKtyjBml/3boZg=
+github.com/oneclickvirt/speedtest v0.0.11-20251102151740/go.mod h1:fy0II2Wo7kDWVBKTwcHdodZwyfmJo0g8N9V02EwQDZE=
 github.com/oneclickvirt/stream v0.0.2-20250924154001 h1:GuJWdiPkoK84+y/+oHKr2Ghl3c/MzS9Z5m1nM+lMmy4=
 github.com/oneclickvirt/stream v0.0.2-20250924154001/go.mod h1:oWaizaHTC2VQciBC9RfaLbAOf8qeR6n20/gY7QxriDE=
 github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=

goecs.go

@@ -39,7 +39,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.1.93"
+	ecsVersion                                                        = "v0.1.95"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
@@ -56,6 +56,7 @@ var (
 	basicStatus, cpuTestStatus, memoryTestStatus, diskTestStatus      bool
 	commTestStatus, utTestStatus, securityTestStatus, emailTestStatus bool
 	backtraceStatus, nt3Status, speedTestStatus, pingTestStatus       bool
+	tgdcTestStatus, webTestStatus                                     bool
 	autoChangeDiskTestMethod                                          = true
 	filePath                                                          = "goecs.txt"
 	enabelUpload                                                      = true
@@ -137,6 +138,9 @@ func parseFlags() {
 	goecsFlag.BoolVar(&backtraceStatus, "backtrace", true, "Enable/Disable backtrace test (in 'en' language or on windows it always false)")
 	goecsFlag.BoolVar(&nt3Status, "nt3", true, "Enable/Disable NT3 test (in 'en' language or on windows it always false)")
 	goecsFlag.BoolVar(&speedTestStatus, "speed", true, "Enable/Disable speed test")
+	goecsFlag.BoolVar(&pingTestStatus, "ping", false, "Enable/Disable ping test")
+	goecsFlag.BoolVar(&tgdcTestStatus, "tgdc", false, "Enable/Disable Telegram DC test")
+	goecsFlag.BoolVar(&webTestStatus, "web", false, "Enable/Disable popular websites test")
 	goecsFlag.StringVar(&cpuTestMethod, "cpum", "sysbench", "Set CPU test method (supported: sysbench, geekbench, winsat)")
 	goecsFlag.StringVar(&cpuTestThreadMode, "cput", "multi", "Set CPU test thread mode (supported: single, multi)")
 	goecsFlag.StringVar(&memoryTestMethod, "memorym", "stream", "Set memory test method (supported: stream, sysbench, dd, winsat, auto)")
@@ -184,6 +188,7 @@ func handleMenuMode(preCheck utils.NetCheckResult) {
 	basicStatus, cpuTestStatus, memoryTestStatus, diskTestStatus = false, false, false, false
 	commTestStatus, utTestStatus, securityTestStatus, emailTestStatus = false, false, false, false
 	backtraceStatus, nt3Status, speedTestStatus = false, false, false
+	tgdcTestStatus, webTestStatus = false, false
 	autoChangeDiskTestMethod = true
 	printMenuOptions(preCheck)
 Loop:
@@ -307,11 +312,11 @@ func printMenuOptions(preCheck utils.NetCheckResult) {
 		fmt.Println("3. 精简版(系统信息+CPU+内存+磁盘+常用流媒体+路由+测速节点5个)")
 		fmt.Println("4. 精简网络版(系统信息+CPU+内存+磁盘+回程+路由+测速节点5个)")
 		fmt.Println("5. 精简解锁版(系统信息+CPU+内存+磁盘IO+御三家+常用流媒体+测速节点5个)")
-		fmt.Println("6. 网络单项(IP质量检测+上游及三网回程+广州三网回程详细路由+全国延迟+测速节点11个)")
+		fmt.Println("6. 网络单项(IP质量检测+上游及三网回程+广州三网回程详细路由+全国延迟+TGDC+网站延迟+测速节点11个)")
 		fmt.Println("7. 解锁单项(御三家解锁+常用流媒体解锁)")
 		fmt.Println("8. 硬件单项(系统信息+CPU+dd磁盘测试+fio磁盘测试)")
 		fmt.Println("9. IP质量检测(15个数据库的IP质量检测+邮件端口检测)")
-		fmt.Println("10. 三网回程线路检测+三网回程详细路由(北京上海广州成都)+三网延迟测试(全国)")
+		fmt.Println("10. 三网回程线路检测+三网回程详细路由(北京上海广州成都)+全国延迟+TGDC+网站延迟")
 		fmt.Println("0. 退出程序")
 	case "en":
 		fmt.Printf("VPS Fusion Monster Test Version: %s\n", ecsVersion)
@@ -327,7 +332,7 @@ func printMenuOptions(preCheck utils.NetCheckResult) {
 		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)")
 		fmt.Println("5. Unlock-Focused Test Suite (System Info + CPU + Memory + Disk IO + Basic Unlock Tests + Common Streaming Services + 5 Speed Test Nodes)")
-		fmt.Println("6. Network-Only Test (IP Quality Test + 5 Speed Test Nodes)")
+		fmt.Println("6. Network-Only Test (IP Quality Test + TGDC + Websites + 11 Speed Test Nodes)")
 		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)")
@@ -348,6 +353,8 @@ func setFullTestStatus(preCheck utils.NetCheckResult) {
 		backtraceStatus = true
 		nt3Status = true
 		speedTestStatus = true
+		tgdcTestStatus = true
+		webTestStatus = true
 	}
 }
 
@@ -404,6 +411,8 @@ func setNetworkOnlyTestStatus() {
 	backtraceStatus = true
 	nt3Status = true
 	pingTestStatus = true
+	tgdcTestStatus = true
+	webTestStatus = true
 }
 
 func setUnlockOnlyTestStatus() {
@@ -433,6 +442,8 @@ func setRouteTestStatus() {
 	backtraceStatus = true
 	nt3Status = true
 	pingTestStatus = true
+	tgdcTestStatus = true
+	webTestStatus = true
 }
 
 func printInvalidChoice() {
@@ -572,7 +583,7 @@ func runChineseTests(preCheck utils.NetCheckResult, wg1, wg2, wg3 *sync.WaitGrou
 	*output = appendTimeInfo(*output, tempOutput, startTime, outputMutex)
 }
 
-func runEnglishTests(preCheck utils.NetCheckResult, wg1, wg2 *sync.WaitGroup, basicInfo, securityInfo, emailInfo, mediaInfo *string, output *string, tempOutput string, startTime time.Time, outputMutex *sync.Mutex) {
+func runEnglishTests(preCheck utils.NetCheckResult, wg1, wg2, wg3 *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)
@@ -595,9 +606,17 @@ func runEnglishTests(preCheck utils.NetCheckResult, wg1, wg2 *sync.WaitGroup, ba
 				*emailInfo = email.EmailCheck()
 			}()
 		}
+		if pingTestStatus {
+			wg3.Add(1)
+			go func() {
+				defer wg3.Done()
+				*ptInfo = pt.PingTest()
+			}()
+		}
 		*output = runStreamingTests(wg1, mediaInfo, *output, tempOutput, outputMutex)
 		*output = runSecurityTests(*securityInfo, *output, tempOutput, outputMutex)
 		*output = runEmailTests(wg2, emailInfo, *output, tempOutput, outputMutex)
+		*output = runEnglishNetworkTests(wg3, ptInfo, *output, tempOutput, outputMutex)
 		*output = runEnglishSpeedTests(*output, tempOutput, outputMutex)
 	}
 	*output = appendTimeInfo(*output, tempOutput, startTime, outputMutex)
@@ -788,11 +807,34 @@ func runNetworkTests(wg3 *sync.WaitGroup, ptInfo *string, output, tempOutput str
 			utils.PrintCenteredTitle("三网回程路由检测", width)
 			nexttrace.NextTrace3Check(language, nt3Location, nt3CheckType) // 不能在重定向的同时外部并发，此处仅可以顺序执行
 		}
-		if (onlyChinaTest || pingTestStatus) && *ptInfo != "" {
+		// 中国模式：显示三网 PING 测试
+		if onlyChinaTest && *ptInfo != "" {
 			wg3.Wait()
-			utils.PrintCenteredTitle("三网ICMP的PING值检测", width)
+			utils.PrintCenteredTitle("PING值检测", width)
 			fmt.Println(*ptInfo)
 		}
+		// 选项 6/10：显示三网 PING + TGDC + 网站
+		if pingTestStatus && *ptInfo != "" {
+			wg3.Wait()
+			utils.PrintCenteredTitle("PING值检测", width)
+			fmt.Println(*ptInfo)
+			if tgdcTestStatus {
+				fmt.Println(pt.TelegramDCTest())
+			}
+			if webTestStatus {
+				fmt.Println(pt.WebsiteTest())
+			}
+		}
+		// 非中国模式且非 pingTestStatus：只显示 TGDC + 网站（选项 1 的情况）
+		if !onlyChinaTest && !pingTestStatus && (tgdcTestStatus || webTestStatus) {
+			utils.PrintCenteredTitle("PING值检测", width)
+			if tgdcTestStatus {
+				fmt.Println(pt.TelegramDCTest())
+			}
+			if webTestStatus {
+				fmt.Println(pt.WebsiteTest())
+			}
+		}
 	}, tempOutput, output)
 }
 
@@ -818,6 +860,30 @@ func runSpeedTests(output, tempOutput string, outputMutex *sync.Mutex) string {
 	}, tempOutput, output)
 }
 
+func runEnglishNetworkTests(wg3 *sync.WaitGroup, ptInfo *string, output, tempOutput string, outputMutex *sync.Mutex) string {
+	outputMutex.Lock()
+	defer outputMutex.Unlock()
+	return utils.PrintAndCapture(func() {
+		if pingTestStatus && *ptInfo != "" {
+			wg3.Wait()
+			utils.PrintCenteredTitle("PING-Test", width)
+			fmt.Println(*ptInfo)
+		}
+		if tgdcTestStatus {
+			if !pingTestStatus || *ptInfo == "" {
+				utils.PrintCenteredTitle("PING-Test", width)
+			}
+			fmt.Println(pt.TelegramDCTest())
+		}
+		if webTestStatus {
+			if !pingTestStatus && !tgdcTestStatus {
+				utils.PrintCenteredTitle("PING-Test", width)
+			}
+			fmt.Println(pt.WebsiteTest())
+		}
+	}, tempOutput, output)
+}
+
 func runEnglishSpeedTests(output, tempOutput string, outputMutex *sync.Mutex) string {
 	outputMutex.Lock()
 	defer outputMutex.Unlock()
@@ -901,7 +967,7 @@ func main() {
 	case "zh":
 		runChineseTests(preCheck, &wg1, &wg2, &wg3, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &ptInfo, &output, tempOutput, startTime, &outputMutex)
 	case "en":
-		runEnglishTests(preCheck, &wg1, &wg2, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &output, tempOutput, startTime, &outputMutex)
+		runEnglishTests(preCheck, &wg1, &wg2, &wg3, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &ptInfo, &output, tempOutput, startTime, &outputMutex)
 	default:
 		fmt.Println("Unsupported language")
 	}

goecs.sh

@@ -152,7 +152,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.91"
+    ECS_VERSION="0.1.93"
     for api in \
         "https://api.github.com/repos/oneclickvirt/ecs/releases/latest" \
         "https://githubapi.spiritlhl.workers.dev/repos/oneclickvirt/ecs/releases/latest" \
@@ -164,8 +164,8 @@ goecs_check() {
         sleep 1
     done
     if [ -z "$ECS_VERSION" ]; then
-        _yellow "Unable to get version info, using default version 0.1.91"
-        ECS_VERSION="0.1.91"
+        _yellow "Unable to get version info, using default version 0.1.93"
+        ECS_VERSION="0.1.93"
     fi
     version_output=""
     for cmd_path in "goecs" "./goecs" "/usr/bin/goecs" "/usr/local/bin/goecs"; do