fix: 更新gostun版本以及增加提取错误的容错机制

Author: spiritysdx

.github/workflows/ci.yaml

@@ -7,15 +7,15 @@ jobs:
   test:
     strategy:
       matrix:
-        go: ['1.22.x']
+        go: ['stable']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
 
@@ -27,7 +27,7 @@ jobs:
         run: |
           git config --global user.name 'github-actions'
           git config --global user.email 'github-actions@github.com'
-          TAG="v0.0.16-$(date +'%Y%m%d%H%M%S')"
+          TAG="v0.0.17-$(date +'%Y%m%d%H%M%S')"
           git tag $TAG
           git push origin $TAG
           echo "TAG=$TAG" >> $GITHUB_ENV

.github/workflows/main.yaml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: 'stable'
 
@@ -43,19 +43,23 @@ jobs:
     needs: build
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: 'stable'
 
     - name: Build and Release
       run: |
         mkdir -p bin
         cd cmd
-        CGO_ENABLED=0 GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build \
-          -o ../bin/basics-${{ matrix.goos }}-${{ matrix.goarch }} \
+        GOARM_SUFFIX=""
+        if [ -n "${{ matrix.goarm }}" ]; then GOARM_SUFFIX="-${{ matrix.goarm }}"; fi
+        EXT=""
+        if [ "${{ matrix.goos }}" = "windows" ]; then EXT=".exe"; fi
+        CGO_ENABLED=0 GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} GOARM=${{ matrix.goarm }} go build \
+          -o ../bin/basics-${{ matrix.goos }}-${{ matrix.goarch }}${GOARM_SUFFIX}${EXT} \
           -v \
           -ldflags="-extldflags=-static -s -w" \
           -trimpath \
@@ -74,6 +78,7 @@ jobs:
         done
 
     strategy:
+      fail-fast: false
       matrix:
         goos: [windows, freebsd, linux, darwin]
         goarch: [amd64, 386]

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/json-iterator/go v1.1.12
 	github.com/libp2p/go-nat v0.2.0
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
-	github.com/oneclickvirt/gostun v0.0.5-20250727155022
+	github.com/oneclickvirt/gostun v0.0.6-20260509043509
 	github.com/shirou/gopsutil/v4 v4.25.6
 	github.com/yusufpapurcu/wmi v1.2.4
 	golang.org/x/sys v0.33.0

go.sum

@@ -60,8 +60,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/oneclickvirt/defaultset v0.0.2-20240624082446 h1:5Pg3mK/u/vQvSz7anu0nxzrNdELi/AcDAU1mMsmPzyc=
 github.com/oneclickvirt/defaultset v0.0.2-20240624082446/go.mod h1:e9Jt4tf2sbemCtc84/XgKcHy9EZ2jkc5x2sW1NiJS+E=
-github.com/oneclickvirt/gostun v0.0.5-20250727155022 h1:/e3gSUrOp1tg/1NTRx+P8B51OGcP26Q6//5EoSIjOvk=
-github.com/oneclickvirt/gostun v0.0.5-20250727155022/go.mod h1:pfp7MFZJK9n/KTLAVqqFcCAns4xqMykmjI+1UeF/vdE=
+github.com/oneclickvirt/gostun v0.0.6-20260509043509 h1:VoxIzEVQHsesHdNffA1Bv1H62nV9LM9kzbH32cE6K4U=
+github.com/oneclickvirt/gostun v0.0.6-20260509043509/go.mod h1:pfp7MFZJK9n/KTLAVqqFcCAns4xqMykmjI+1UeF/vdE=
 github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8=
 github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=

model/model.go

@@ -1,6 +1,6 @@
 package model
 
-const BasicsVersion = "v0.0.16"
+const BasicsVersion = "v0.0.17"
 
 var EnableLoger bool
 

system/cpu.go

@@ -224,12 +224,16 @@ func updateSystemLoad(ret *model.SystemInfo) {
 	out, err := exec.Command("w").Output()
 	if err == nil {
 		loadFields := strings.Fields(string(out))
-		load = strings.Join(loadFields[len(loadFields)-3:], " ")
+		if len(loadFields) >= 3 {
+			load = strings.Join(loadFields[len(loadFields)-3:], " ")
+		}
 	} else {
 		out, err = exec.Command("uptime").Output()
 		if err == nil {
 			fields := strings.Fields(string(out))
-			load = strings.Join(fields[len(fields)-3:], " ")
+			if len(fields) >= 3 {
+				load = strings.Join(fields[len(fields)-3:], " ")
+			}
 		}
 	}
 	if load != "" {
@@ -619,13 +623,22 @@ func getDarwinCpuInfo(ret *model.SystemInfo) (*model.SystemInfo, error) {
 	if len(model.MacOSInfo) > 0 {
 		for _, line := range model.MacOSInfo {
 			if strings.Contains(line, "Chip") && ret.CpuModel == "" {
-				ret.CpuModel = strings.TrimSpace(strings.Split(line, ":")[1])
+				parts := strings.SplitN(line, ":", 2)
+				if len(parts) == 2 {
+					ret.CpuModel = strings.TrimSpace(parts[1])
+				}
 			}
 			if strings.Contains(line, "Total Number of Cores") && ret.CpuCores == "" {
-				ret.CpuCores = strings.TrimSpace(strings.Split(line, ":")[1])
+				parts := strings.SplitN(line, ":", 2)
+				if len(parts) == 2 {
+					ret.CpuCores = strings.TrimSpace(parts[1])
+				}
 			}
 			if strings.Contains(line, "Memory") && ret.MemoryTotal == "" {
-				ret.MemoryTotal = strings.TrimSpace(strings.Split(line, ":")[1])
+				parts := strings.SplitN(line, ":", 2)
+				if len(parts) == 2 {
+					ret.MemoryTotal = strings.TrimSpace(parts[1])
+				}
 			}
 		}
 	}
@@ -664,7 +677,10 @@ func updateSysctlCpuInfo(ret *model.SystemInfo, sysctlPath string) {
 	if ret.CpuCache == "" {
 		ccache, err := getSysctlValue(sysctlPath, "hw.cacheconfig")
 		if err == nil && !strings.Contains(ccache, "cannot") {
-			ret.CpuCache = strings.TrimSpace(strings.Split(ccache, ":")[1])
+			parts := strings.Split(ccache, ":")
+			if len(parts) > 1 {
+				ret.CpuCache = strings.TrimSpace(parts[1])
+			}
 		}
 	}
 }

system/disk.go

@@ -119,7 +119,7 @@ func deduplicatePhysicalDisks(diskInfos []DiskSingelInfo, currentDiskInfo *DiskS
 				}
 			}
 		}
-		if largest.BootPath != currentDiskInfo.BootPath || largest.MountPath != currentDiskInfo.MountPath {
+		if currentDiskInfo == nil || largest.BootPath != currentDiskInfo.BootPath || largest.MountPath != currentDiskInfo.MountPath {
 			result = append(result, largest)
 		} else if !hasCurrent {
 			result = append(result, largest)

system/load.go

@@ -20,6 +20,9 @@ func getLoadFromProc() (float64, float64, float64, error) {
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
 		fields := strings.Fields(scanner.Text())
+		if len(fields) < 3 {
+			break
+		}
 		// 解析负载信息并转换为 float64 类型
 		load1, _ := strconv.ParseFloat(fields[0], 64)
 		load5, _ := strconv.ParseFloat(fields[1], 64)

system/utils/utils_darwin.go

@@ -26,14 +26,14 @@ func GetLoad1() float64 {
 
 // GetTCPAccelerateStatus 查询TCP控制算法
 func GetTCPAccelerateStatus() string {
-	cmd := exec.Command("sysctl", "-n", "net.ipv4.tcp_congestion_control")
+	cmd := exec.Command("sysctl", "-n", "net.inet.tcp.cc_algorithm")
 	var out bytes.Buffer
 	cmd.Stdout = &out
 	err := cmd.Run()
 	if err != nil {
 		return ""
 	} else {
-		return out.String()
+		return strings.TrimSpace(out.String())
 	}
 }
 
@@ -56,7 +56,7 @@ func parseTimeZone(output string) string {
 // GetTimeZone 获取当前时区
 func GetTimeZone() string {
 	var CurrentTimeZone string
-	output, err := exec.Command("timedatectl", "|", "grep", "Time zone").Output()
+	output, err := exec.Command("timedatectl").Output()
 	if err == nil && strings.Contains(string(output), "Time zone") {
 		timeZone := parseTimeZone(string(output))
 		CurrentTimeZone = timeZone

system/utils/utils_freebsd.go

@@ -26,14 +26,14 @@ func GetLoad1() float64 {
 
 // GetTCPAccelerateStatus 查询TCP控制算法
 func GetTCPAccelerateStatus() string {
-	cmd := exec.Command("sysctl", "-n", "net.ipv4.tcp_congestion_control")
+	cmd := exec.Command("sysctl", "-n", "net.inet.tcp.cc_algorithm")
 	var out bytes.Buffer
 	cmd.Stdout = &out
 	err := cmd.Run()
 	if err != nil {
 		return ""
 	} else {
-		return out.String()
+		return strings.TrimSpace(out.String())
 	}
 }
 
@@ -56,7 +56,7 @@ func parseTimeZone(output string) string {
 // GetTimeZone 获取当前时区
 func GetTimeZone() string {
 	var CurrentTimeZone string
-	output, err := exec.Command("timedatectl", "|", "grep", "Time zone").Output()
+	output, err := exec.Command("timedatectl").Output()
 	if err == nil && strings.Contains(string(output), "Time zone") {
 		timeZone := parseTimeZone(string(output))
 		CurrentTimeZone = timeZone