chore: upgrade pinger

Author: itsnebulalol

Justfile

@@ -0,0 +1,2 @@
+build:
+    GOOS=linux GOARCH=arm GOARM=7 go build -ldflags "-s -w" -o nocturned

go.mod

@@ -7,16 +7,9 @@ toolchain go1.23.9
 require (
 	github.com/godbus/dbus/v5 v5.1.0
 	github.com/gorilla/websocket v1.5.3
-	github.com/prometheus-community/pro-bing v0.7.0
 	github.com/vishvananda/netlink v1.3.0
 )
 
-require (
-	github.com/google/uuid v1.6.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sync v0.13.0 // indirect
-)
-
 require (
 	github.com/vishvananda/netns v0.0.5 // indirect
 	golang.org/x/sys v0.31.0 // indirect

go.sum

@@ -1,20 +1,12 @@
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/prometheus-community/pro-bing v0.7.0 h1:KFYFbxC2f2Fp6c+TyxbCOEarf7rbnzr9Gw8eIb0RfZA=
-github.com/prometheus-community/pro-bing v0.7.0/go.mod h1:Moob9dvlY50Bfq6i88xIwfyw7xLFHH69LUgx9n5zqCE=
 github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
 github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
 github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=

main.go

@@ -8,6 +8,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -16,7 +17,6 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/vishvananda/netlink"
 
-	ping "github.com/prometheus-community/pro-bing"
 	"github.com/usenocturne/nocturned/bluetooth"
 	"github.com/usenocturne/nocturned/utils"
 )
@@ -59,64 +59,46 @@ func networkChecker(hub *utils.WebSocketHub) {
 	const (
 		host          = "1.1.1.1"
 		interval      = 1 // seconds
-		failThreshold = 3
+		failThreshold = 5
 	)
 
 	failCount := 0
-
 	isOnline := false
-	pinger, err := ping.NewPinger(host)
-	if err == nil {
-		pinger.Count = 1
-		pinger.Timeout = 1 * time.Second
-		pinger.Interval = 1 * time.Second
-		pinger.SetPrivileged(true)
-		err = pinger.Run()
-		if err == nil && pinger.Statistics().PacketsRecv > 0 {
-			currentNetworkStatus = "online"
-			hub.Broadcast(utils.WebSocketEvent{
-				Type:    "network_status",
-				Payload: map[string]string{"status": "online"},
-			})
-			isOnline = true
-		} else {
-			currentNetworkStatus = "offline"
-			hub.Broadcast(utils.WebSocketEvent{
-				Type:    "network_status",
-				Payload: map[string]string{"status": "offline"},
-			})
-		}
+
+	pingHost := func() bool {
+		cmd := exec.Command("ping", "-c", "1", "-W", "1", host)
+		err := cmd.Run()
+		return err == nil
+	}
+
+	if pingHost() {
+		currentNetworkStatus = "online"
+		hub.Broadcast(utils.WebSocketEvent{
+			Type:    "network_status",
+			Payload: map[string]string{"status": "online"},
+		})
+		isOnline = true
 	} else {
+		currentNetworkStatus = "offline"
 		hub.Broadcast(utils.WebSocketEvent{
 			Type:    "network_status",
 			Payload: map[string]string{"status": "offline"},
 		})
 	}
 
 	for {
-		pinger, err := ping.NewPinger(host)
-		if err != nil {
-			log.Printf("Failed to create pinger: %v", err)
-			failCount++
-		} else {
-			pinger.Count = 1
-			pinger.Timeout = 1 * time.Second
-			pinger.Interval = 1 * time.Second
-			pinger.SetPrivileged(true)
-			err = pinger.Run()
-			if err != nil || pinger.Statistics().PacketsRecv == 0 {
-				failCount++
-			} else {
-				failCount = 0
-				if !isOnline {
-					currentNetworkStatus = "online"
-					hub.Broadcast(utils.WebSocketEvent{
-						Type:    "network_status",
-						Payload: map[string]string{"status": "online"},
-					})
-					isOnline = true
-				}
+		if pingHost() {
+			failCount = 0
+			if !isOnline {
+				currentNetworkStatus = "online"
+				hub.Broadcast(utils.WebSocketEvent{
+					Type:    "network_status",
+					Payload: map[string]string{"status": "online"},
+				})
+				isOnline = true
 			}
+		} else {
+			failCount++
 		}
 
 		if failCount >= failThreshold && isOnline {
@@ -630,7 +612,7 @@ func main() {
 		go func() {
 			utils.SetUpdateStatus(true, "download", "")
 
-			tempDir, err := os.MkdirTemp("/data/tmp", "update-*")
+			tempDir, err := os.MkdirTemp("/var/tmp", "update-*")
 			if err != nil {
 				utils.SetUpdateStatus(false, "", fmt.Sprintf("Failed to create temp directory: %v", err))
 				return