fix：更新主程序版本

.github/workflows/build_binary.yaml

@@ -40,7 +40,7 @@ jobs:
           args: release
         env:
           GITHUB_TOKEN: ${{ secrets.GHT }}
-          GOPRIVATE: github.com/oneclickvirt/security
+          GOPRIVATE: github.com/oneclickvirt/security,github.com/oneclickvirt/privatespeedtest
 
       - name: Update goecs.sh with new version
         run: |

.github/workflows/build_public.yml

@@ -65,8 +65,12 @@ jobs:
         sed -i '/SecurityUploadToken/d' utils/utils.go
         sed -i 's|"github.com/oneclickvirt/security/network"|"github.com/oneclickvirt/basics/network"|g' utils/utils.go
         sed -i '/^import/,/^)/{/^)/a\'$'\n''const token = "OvwKx5qgJtf7PZgCKbtyojSU.MTcwMTUxNzY1MTgwMw"'$'\n''}' utils/utils.go
-        sed -i '/github.com\/oneclickvirt\/security/d' go.mod
+        sed -i '/github.com\/oneclickvirt\/security/d' go.mod        
+        sed -i '/github.com\/oneclickvirt\/privatespeedtest/d' go.mod        
         sed -i 's|var securityFlag = flag.Bool("security", true,|var securityFlag = flag.Bool("security", false,|g' goecs.go
+        sed -i 's|"github.com/oneclickvirt/privatespeedtest/pst"|// "github.com/oneclickvirt/privatespeedtest/pst"|g' internal/tests/speed.go
+        sed -i '/^\/\/ privateSpeedTest.*使用 privatespeedtest/,/^func [A-Z]/{/^func [A-Z]/!s/^/\/\/ /}' internal/tests/speed.go
+        sed -i '/err := privateSpeedTest(num, opLower)/,/return/{/return/!s/^/\/\/ /; s/return$/\/\/ return/}' internal/tests/speed.go
         sed -i 's|VPS融合怪测试|VPS融合怪测试(非官方编译)|g' utils/utils.go
         sed -i 's|VPS Fusion Monster Test|VPS Fusion Monster Test (Unofficial)|g' utils/utils.go
         go mod tidy

README.md

@@ -60,7 +60,7 @@ Shell 版本：[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS
 - 邮件端口测试：[portchecker](https://github.com/oneclickvirt/portchecker)
 - 上游及回程路由线路检测：借鉴 [zhanghanyun/backtrace](https://github.com/zhanghanyun/backtrace)，二次开发至 [oneclickvirt/backtrace](https://github.com/oneclickvirt/backtrace)
 - 三网路由测试：基于 [NTrace-core](https://github.com/nxtrace/NTrace-core)，二次开发至 [nt3](https://github.com/oneclickvirt/nt3)
-- 网速测试：基于 [speedtest.net](https://github.com/spiritLHLS/speedtest.net-CN-ID) 和 [speedtest.cn](https://github.com/spiritLHLS/speedtest.cn-CN-ID) 数据，开发至 [oneclickvirt/speedtest](https://github.com/oneclickvirt/speedtest)
+- 网速测试：基于 [speedtest.net](https://github.com/spiritLHLS/speedtest.net-CN-ID) 和 [speedtest.cn](https://github.com/spiritLHLS/speedtest.cn-CN-ID) 数据，开发至 [oneclickvirt/speedtest](https://github.com/oneclickvirt/speedtest)，同时融合私有国内测速平台
 - 三网 Ping 值测试：借鉴 [ecsspeed](https://github.com/spiritLHLS/ecsspeed)，二次开发至 [pingtest](https://github.com/oneclickvirt/pingtest)
 - 支持root或admin环境下测试，支持非root或非admin环境下测试，支持离线环境下进行测试，**暂未**支持无DNS的在线环境下进行测试
 

go.mod

@@ -60,6 +60,7 @@ require (
 	github.com/oneclickvirt/dd v0.0.2-20250808062818 // indirect
 	github.com/oneclickvirt/fio v0.0.2-20250808045755 // indirect
 	github.com/oneclickvirt/mbw v0.0.1-20250808061222 // indirect
+	github.com/oneclickvirt/privatespeedtest v0.0.1-20260112130218 // indirect
 	github.com/oneclickvirt/stream v0.0.2-20250924154001 // indirect
 	github.com/oschwald/maxminddb-golang v1.13.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
@@ -77,7 +78,7 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rodaine/table v1.3.0 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
-	github.com/schollz/progressbar/v3 v3.14.4 // indirect
+	github.com/schollz/progressbar/v3 v3.17.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/shirou/gopsutil/v4 v4.25.6 // indirect
 	github.com/showwin/speedtest-go v1.7.10 // indirect

go.sum

@@ -122,6 +122,10 @@ github.com/oneclickvirt/pingtest v0.0.9-20251104112920 h1:j3Fjhy0YHT/VF7iuAVVELa
 github.com/oneclickvirt/pingtest v0.0.9-20251104112920/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/privatespeedtest v0.0.1-20260112095218 h1:VcglFz85LVPo8wE8AkBhgXHHUUVI2Ae9ng6+hY6ewx4=
+github.com/oneclickvirt/privatespeedtest v0.0.1-20260112095218/go.mod h1:IXOlKKX4DUNqxOaW/K9bcdrBiWxo0jGSLXeBeo7NrTo=
+github.com/oneclickvirt/privatespeedtest v0.0.1-20260112130218 h1:h2k2fHtrsIIP/x/apEWkQGlTKuIumz8GrUR/df41YhE=
+github.com/oneclickvirt/privatespeedtest v0.0.1-20260112130218/go.mod h1:IXOlKKX4DUNqxOaW/K9bcdrBiWxo0jGSLXeBeo7NrTo=
 github.com/oneclickvirt/security v0.0.8-20251112080734 h1:WpwdGbwpiBP2YA1lNsymati5uvBbWFlN9CXHYgd3/fE=
 github.com/oneclickvirt/security v0.0.8-20251112080734/go.mod h1:aPMIwqsz7wiUH1cqvtRr9+QcQRkKzlUWecDM6SGVddc=
 github.com/oneclickvirt/speedtest v0.0.11-20251102151740 h1:1NUrNt5ay6/xVNC5x62UrQjPqK8jgbKtyjBml/3boZg=
@@ -168,6 +172,8 @@ github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDc
 github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
 github.com/schollz/progressbar/v3 v3.14.4 h1:W9ZrDSJk7eqmQhd3uxFNNcTr0QL+xuGNI9dEMrw0r74=
 github.com/schollz/progressbar/v3 v3.14.4/go.mod h1:aT3UQ7yGm+2ZjeXPqsjTenwL3ddUiuZ0kfQ/2tHlyNI=
+github.com/schollz/progressbar/v3 v3.17.1 h1:bI1MTaoQO+v5kzklBjYNRQLoVpe0zbyRZNK6DFkVC5U=
+github.com/schollz/progressbar/v3 v3.17.1/go.mod h1:RzqpnsPQNjUyIgdglUjRLgD7sVnxN1wpmBMV+UiEbL4=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil/v4 v4.25.6 h1:kLysI2JsKorfaFPcYmcJqbzROzsBWEOAtw6A7dIfqXs=

goecs.go

@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	ecsVersion   = "v0.1.106"                    // 融合怪版本号
+	ecsVersion   = "v0.1.107"                    // 融合怪版本号
 	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.105"
+    ECS_VERSION="0.1.106"
     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.105"
-        ECS_VERSION="0.1.105"
+        _yellow "Unable to get version info, using default version 0.1.106"
+        ECS_VERSION="0.1.106"
     fi
     version_output=""
     for cmd_path in "goecs" "./goecs" "/usr/bin/goecs" "/usr/local/bin/goecs"; do

internal/tests/speed.go

@@ -5,7 +5,9 @@ import (
 	"os"
 	"runtime"
 	"strings"
+	"time"
 
+	"github.com/oneclickvirt/privatespeedtest/pst"
 	"github.com/oneclickvirt/speedtest/model"
 	"github.com/oneclickvirt/speedtest/sp"
 )
@@ -32,12 +34,157 @@ func NearbySP() {
 	}
 }
 
+// formatString 格式化字符串到指定宽度
+func formatString(s string, width int) string {
+	return fmt.Sprintf("%-*s", width, s)
+}
+
+// printTableRow 打印表格行
+func printTableRow(result pst.SpeedTestResult) {
+	location := result.City
+	if result.CarrierType != "" {
+		carrier := result.CarrierType
+		switch carrier {
+		case "Telecom":
+			carrier = "电信"
+		case "Unicom":
+			carrier = "联通"
+		case "Mobile":
+			carrier = "移动"
+		case "Other":
+			carrier = "其他"
+		}
+		location = fmt.Sprintf("%s%s", carrier, result.City)
+	}
+	if len(location) > 14 {
+		location = location[:14] + "..."
+	}
+	upload := "N/A"
+	if result.UploadMbps > 0 {
+		upload = fmt.Sprintf("%.2f Mbps", result.UploadMbps)
+	}
+	download := "N/A"
+	if result.DownloadMbps > 0 {
+		download = fmt.Sprintf("%.2f Mbps", result.DownloadMbps)
+	}
+	latency := fmt.Sprintf("%.2f ms", result.PingLatency.Seconds()*1000)
+	packetLoss := "N/A"
+	fmt.Print(formatString(location, 16))
+	fmt.Print(formatString(upload, 16))
+	fmt.Print(formatString(download, 16))
+	fmt.Print(formatString(latency, 16))
+	fmt.Print(formatString(packetLoss, 16))
+	fmt.Println()
+}
+
+// privateSpeedTest 使用 privatespeedtest 进行单个运营商测速
+// operator 参数：只支持 "cmcc"、"cu"、"ct"
+func privateSpeedTest(num int, operator string) error {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Fprintf(os.Stderr, "[WARN] privateSpeedTest panic: %v\n", r)
+		}
+	}()
+	// 加载服务器列表
+	serverList, err := pst.LoadServerList()
+	if err != nil {
+		return fmt.Errorf("加载自定义服务器列表失败")
+	}
+	// 使用三网测速模式（每个运营商选择指定数量的最低延迟节点）
+	serversPerISP := num
+	if serversPerISP <= 0 || serversPerISP > 5{
+		serversPerISP = 2
+	}
+	// 单个运营商测速：先过滤服务器列表
+	var carrierType string
+	switch strings.ToLower(operator) {
+	case "cmcc":
+		carrierType = "Mobile"
+	case "cu":
+		carrierType = "Unicom"
+	case "ct":
+		carrierType = "Telecom"
+	default:
+		return fmt.Errorf("不支持的运营商类型: %s", operator)
+	}
+	// 过滤出指定运营商的服务器
+	filteredServers := pst.FilterServersByISP(serverList.Servers, carrierType)
+	// 先找足够多的候选服务器用于去重（找 serversPerISP * 3 个，确保去重后还能剩下足够的服务器）
+	candidateCount := serversPerISP * 3
+	if candidateCount > len(filteredServers) {
+		candidateCount = len(filteredServers)
+	}
+	// 使用 FindBestServers 选择最佳服务器
+	candidateServers, err := pst.FindBestServers(
+		filteredServers,
+		candidateCount,   // 选择更多候选节点用于去重
+		5*time.Second,    // ping 超时
+		true,             // 显示进度条
+		true,             // 静默
+	)
+	if err != nil {
+		return fmt.Errorf("分组查找失败")
+	}
+	// 去重：确保同一运营商内城市不重复
+	seenCities := make(map[string]bool)
+	var bestServers []pst.ServerWithLatencyInfo
+	for _, serverInfo := range candidateServers {
+		city := serverInfo.Server.City
+		if city == "" {
+			city = "Unknown"
+		}
+		if !seenCities[city] {
+			seenCities[city] = true
+			bestServers = append(bestServers, serverInfo)
+			// 去重后取前 serversPerISP 个
+			if len(bestServers) >= serversPerISP {
+				break
+			}
+		}
+	}
+	if len(bestServers) == 0 {
+		return fmt.Errorf("去重后没有可用的服务器")
+	}
+	// 执行测速并逐个打印结果（不打印表头）
+	for i, serverInfo := range bestServers {
+		result := pst.RunSpeedTest(
+			serverInfo.Server,
+			false,            // 不禁用下载测试
+			false,            // 不禁用上传测试
+			6,                // 并发线程数
+			12*time.Second,   // 超时时间
+			&serverInfo,
+			false,             // 不显示进度条
+		)
+		if result.Success {
+			printTableRow(result)
+		}
+		// 在测试之间暂停（除了最后一个）
+		if i < len(bestServers)-1 {
+			time.Sleep(1 * time.Second)
+		}
+	}
+	return nil
+}
+
 func CustomSP(platform, operator string, num int, language string) {
 	defer func() {
 		if r := recover(); r != nil {
 			fmt.Fprintf(os.Stderr, "[WARN] CustomSP panic: %v\n", r)
 		}
 	}()
+	// 对于三网测速（cmcc、cu、ct），优先使用 privatespeedtest 进行私有测速
+	opLower := strings.ToLower(operator)
+	if opLower == "cmcc" || opLower == "cu" || opLower == "ct" {
+		err := privateSpeedTest(num, opLower)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "[WARN] privatespeedtest failed\n")
+			// 继续使用原有的兜底方案
+		} else {
+			// 测速成功，直接返回
+			return
+		}
+	}
 	var url, parseType string
 	if strings.ToLower(platform) == "cn" {
 		if strings.ToLower(operator) == "cmcc" {