fix：部分测速成功也输出，但补充节点测速

Added step to install UPX for binary compression.

.github/workflows/build_binary.yaml

@@ -19,11 +19,31 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+          
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: false
+          docker-images: false
+          swap-storage: false
+
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.25.3
+          go-version: 1.25.4
 
+      # - name: Install UPX
+      #   run: |
+      #     apk add --no-cache upx
+      
       - name: Configure Git for Private Modules
         run: |
           git config --global url."https://${{ secrets.GHT }}@github.com/".insteadOf "https://github.com/"
@@ -31,13 +51,18 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GHT }}
 
+      - name: Clean Go cache before build
+        run: |
+          go clean -cache -modcache -testcache
+          df -h
+
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           # version: latest
           version: '~> v2'
-          args: release
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GHT }}
           GOPRIVATE: github.com/oneclickvirt/security,github.com/oneclickvirt/privatespeedtest

.goreleaser.yaml

@@ -1,6 +1,10 @@
 before:
   hooks:
     - go mod tidy -v
+    - go clean -cache
+
+project_name: goecs
+
 builds:
   - id: universal
     env:
@@ -31,6 +35,7 @@ builds:
         goarch: arm
     main: ./
     binary: goecs
+
   - id: darwin-amd64
     env:
       - CGO_ENABLED=1
@@ -44,6 +49,7 @@ builds:
       - amd64
     main: ./
     binary: goecs
+
   - id: darwin-arm64
     env:
       - CGO_ENABLED=1
@@ -57,18 +63,23 @@ builds:
       - arm64
     main: ./
     binary: goecs
+
 universal_binaries:
   - name_template: "goecs"
     replace: false
+
 checksum:
   name_template: "checksums.txt"
+
 snapshot:
   name_template: "goecs"
+
 archives:
   - name_template: "goecs_{{ .Os }}_{{ .Arch }}"
     format: zip
     files:
       - none*
+
 changelog:
   sort: asc
   filters:
@@ -79,4 +90,18 @@ changelog:
       - Merge pull request
       - Merge branch
       - go mod tidy
-      - New translations
+      - New translations
+
+upx:
+  - enabled: true
+    brute: true
+    goos:
+      - linux
+      - windows
+    goarch:
+      - amd64
+      - 386
+      - arm64
+      - ppc64le
+      - s390x
+      - riscv64

goecs.go

@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	ecsVersion   = "v0.1.109"                   // 融合怪版本号
+	ecsVersion   = "v0.1.112"                   // 融合怪版本号
 	configs      = params.NewConfig(ecsVersion) // 全局配置实例
 	userSetFlags = make(map[string]bool)        // 用于跟踪哪些参数是用户显式设置的
 )

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.108"
+    ECS_VERSION="0.1.111"
     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.108"
-        ECS_VERSION="0.1.108"
+        _yellow "Unable to get version info, using default version 0.1.111"
+        ECS_VERSION="0.1.111"
     fi
     version_output=""
     for cmd_path in "goecs" "./goecs" "/usr/bin/goecs" "/usr/local/bin/goecs"; do

internal/runner/runner.go

@@ -330,6 +330,8 @@ func RunNetworkTests(config *params.Config, wg3 *sync.WaitGroup, ptInfo *string,
 				fmt.Println(pt.WebsiteTest())
 			}
 		}
+		// 等待第三方库的输出完全刷新到标准输出
+		time.Sleep(300 * time.Millisecond)
 	}, tempOutput, output)
 }
 
@@ -362,6 +364,8 @@ func RunSpeedTests(config *params.Config, output, tempOutput string, outputMutex
 			} else if config.Choice == "6" {
 				tests.CustomSP("net", "global", 11, config.Language)
 			}
+			// 等待第三方库的输出完全刷新到标准输出
+			time.Sleep(500 * time.Millisecond)
 		}
 	}, tempOutput, output)
 }
@@ -380,6 +384,8 @@ func RunEnglishNetworkTests(config *params.Config, wg3 *sync.WaitGroup, ptInfo *
 				fmt.Println(pt.WebsiteTest())
 			}
 		}
+		// 等待第三方库的输出完全刷新到标准输出
+		time.Sleep(300 * time.Millisecond)
 	}, tempOutput, output)
 }
 
@@ -393,6 +399,8 @@ func RunEnglishSpeedTests(config *params.Config, output, tempOutput string, outp
 			tests.ShowHead(config.Language)
 			tests.NearbySP()
 			tests.CustomSP("net", "global", -1, config.Language)
+			// 等待第三方库的输出完全刷新到标准输出
+			time.Sleep(500 * time.Millisecond)
 		}
 	}, tempOutput, output)
 }

internal/tests/speed.go

@@ -56,8 +56,8 @@ func printTableRow(result pst.SpeedTestResult) {
 		}
 		location = fmt.Sprintf("%s%s", carrier, result.City)
 	}
-	if len(location) > 14 {
-		location = location[:14] + "..."
+	if len(location) > 15 {
+		location = location[:15]
 	}
 	upload := "N/A"
 	if result.UploadMbps > 0 {
@@ -135,6 +135,8 @@ func privateSpeedTest(num int, operator string) (int, error) {
 	// 去重：确保同一运营商内城市不重复
 	seenCities := make(map[string]bool)
 	var bestServers []pst.ServerWithLatencyInfo
+	// 保留更多备用节点，以应对测速失败的情况（保留 serversPerISP * 2 个备用节点）
+	maxBackupServers := serversPerISP * 2
 	for _, serverInfo := range candidateServers {
 		city := serverInfo.Server.City
 		if city == "" {
@@ -143,8 +145,8 @@ func privateSpeedTest(num int, operator string) (int, error) {
 		if !seenCities[city] {
 			seenCities[city] = true
 			bestServers = append(bestServers, serverInfo)
-			// 去重后取前 serversPerISP 个
-			if len(bestServers) >= serversPerISP {
+			// 去重后保留足够的备用节点
+			if len(bestServers) >= maxBackupServers {
 				break
 			}
 		}
@@ -153,7 +155,13 @@ func privateSpeedTest(num int, operator string) (int, error) {
 		return 0, fmt.Errorf("去重后没有可用的服务器")
 	}
 	// 执行测速并逐个打印结果（不打印表头）
+	// 统计成功输出的节点数
+	successCount := 0
 	for i, serverInfo := range bestServers {
+		// 如果已经成功输出了足够的节点，则停止测试
+		if successCount >= serversPerISP {
+			break
+		}
 		result := pst.RunSpeedTest(
 			serverInfo.Server,
 			false,          // 不禁用下载测试
@@ -163,16 +171,21 @@ func privateSpeedTest(num int, operator string) (int, error) {
 			&serverInfo,
 			false, // 不显示进度条
 		)
-		if result.Success {
+		// 只要测试成功且有任意一个速度值有效，就输出结果（部分成功也显示）
+		if result.Success && (result.UploadMbps > 0 || result.DownloadMbps > 0) {
 			printTableRow(result)
+			// 只有上传和下载都成功时才计入成功数
+			if result.UploadMbps > 0 && result.DownloadMbps > 0 {
+				successCount++
+			}
 		}
-		// 在测试之间暂停（除了最后一个）
-		if i < len(bestServers)-1 {
+		// 在测试之间暂停（如果还需要继续测试的话）
+		if successCount < serversPerISP && i < len(bestServers)-1 {
 			time.Sleep(1 * time.Second)
 		}
 	}
-	// 返回实际测试的节点数量
-	return len(bestServers), nil
+	// 返回实际成功输出的节点数量
+	return successCount, nil
 }
 
 // privateSpeedTestWithFallback 使用私有测速，如果失败则回退到 global 节点

utils/utils.go

@@ -219,6 +219,11 @@ func CaptureOutput(f func()) string {
 	}()
 	// 执行函数
 	f()
+	// 确保所有输出都已经刷新
+	os.Stdout.Sync()
+	os.Stderr.Sync()
+	// 等待一小段时间，确保后台goroutine的输出完成
+	time.Sleep(100 * time.Millisecond)
 	// 关闭管道写入端，让管道读取端可以读取所有数据
 	stdoutPipeW.Close()
 	stderrPipeW.Close()