refactor(socket): update socket handling to use a local socket and improve connection management

This commit is contained in:
2026-05-10 14:39:17 +08:00
parent 65f31f28f6
commit 751e6afa83
4 changed files with 124 additions and 121 deletions
-15
View File
@@ -1,6 +1,5 @@
package main package main
import ( import (
"Watchdog_Linux-systemd/postLog" "Watchdog_Linux-systemd/postLog"
"encoding/json" "encoding/json"
@@ -10,10 +9,6 @@ import (
var Config struct { var Config struct {
DebugMode bool `json:"debugMode"` DebugMode bool `json:"debugMode"`
Debug struct {
ListenAddr string `json:"listenAddr"`
ListenPort int `json:"listenPort"`
} `json:"debug"`
} }
func loadConfig() { func loadConfig() {
@@ -31,14 +26,4 @@ func loadConfig() {
isDebug = true isDebug = true
} }
if Config.Debug.ListenAddr != "" {
DebugListenAddr = Config.Debug.ListenAddr
} else {
DebugListenAddr = "0.0.0.0"
}
if Config.Debug.ListenPort != 0 {
DebugListenPort = Config.Debug.ListenPort
} else {
DebugListenPort = 10080
}
} }
+1 -5
View File
@@ -1,7 +1,3 @@
{ {
"debugMode": true, "debugMode": true
"debug": {
"listenAddr": "0.0.0.0",
"listenPort": 10080
}
} }
+1 -12
View File
@@ -7,12 +7,6 @@ import (
"fmt" "fmt"
) )
var (
listenAddr = "127.0.0.1"
listenPort = 10080
Type = "tcp"
)
type SoftwareInfo struct { type SoftwareInfo struct {
Name string Name string
Version string Version string
@@ -33,15 +27,10 @@ var softwareInfo SoftwareInfo = SoftwareInfo{
var isDebug bool var isDebug bool
var DebugListenAddr string
var DebugListenPort int
func main() { func main() {
loadConfig() loadConfig()
if isDebug == true { if isDebug == true {
postLog.SetDebugMode(true) postLog.SetDebugMode(true)
listenAddr = DebugListenAddr
listenPort = DebugListenPort
} }
postLog.Info(fmt.Sprintf("%s %s (Build %d.%s) by %s", softwareInfo.Name, softwareInfo.Version, softwareInfo.BuildVer, softwareInfo.BuildType, softwareInfo.Developer)) postLog.Info(fmt.Sprintf("%s %s (Build %d.%s) by %s", softwareInfo.Name, softwareInfo.Version, softwareInfo.BuildVer, softwareInfo.BuildType, softwareInfo.Developer))
@@ -50,7 +39,7 @@ func main() {
// End of command handler // End of command handler
go func() { go func() {
err := socket.BootSocket(Type, listenAddr, listenPort) err := socket.BootSocket()
if err != nil { if err != nil {
postLog.Fatal(fmt.Sprintf("Failed to initialize socket server: %v", err)) postLog.Fatal(fmt.Sprintf("Failed to initialize socket server: %v", err))
} }
+49 -16
View File
@@ -5,37 +5,64 @@ import (
"bufio" "bufio"
"fmt" "fmt"
"net" "net"
"os"
"strings" "strings"
"sync"
) )
const SocketPath = "/tmp/super-frpc-watchdog.sock"
var ( var (
Conn net.Conn Conn net.Conn
connMutex sync.Mutex
CommandHandler func(string) error CommandHandler func(string) error
) )
func BootSocket(networkType, listenAddr string, listenPort int) error { func BootSocket() error {
listen, err := net.Listen(networkType, fmt.Sprintf("%s:%d", listenAddr, listenPort)) if err := os.RemoveAll(SocketPath); err != nil {
if err != nil { return fmt.Errorf("failed to remove stale socket %s: %w", SocketPath, err)
postLog.Fatal(fmt.Sprintf("[Socket] Failed to listen: %v, err: %v, %v", listenAddr, listenPort, err))
return fmt.Errorf("failed to listen: %v, err: %v, %v", listenAddr, listenPort, err)
} }
defer listen.Close()
postLog.Info(fmt.Sprintf("Server is running on %s:%d", listenAddr, listenPort)) listen, err := net.Listen("unix", SocketPath)
if err != nil {
postLog.Fatal(fmt.Sprintf("[Socket] Failed to listen on %s: %v", SocketPath, err))
return fmt.Errorf("failed to listen on %s: %w", SocketPath, err)
}
defer func() {
listen.Close()
os.Remove(SocketPath)
}()
postLog.Info(fmt.Sprintf("Server is running on local socket %s", SocketPath))
for { for {
Conn, err = listen.Accept() conn, err := listen.Accept()
if err != nil { if err != nil {
postLog.Error(fmt.Sprintf("Failed to accept: %v, err: %v", Conn, err)) postLog.Error(fmt.Sprintf("Failed to accept local socket connection: %v", err))
continue
} }
go handleRequest() connMutex.Lock()
if Conn != nil {
Conn.Close()
}
Conn = conn
connMutex.Unlock()
go handleRequest(conn)
} }
} }
func handleRequest() { func handleRequest(conn net.Conn) {
defer Conn.Close() defer func() {
conn.Close()
connMutex.Lock()
if Conn == conn {
Conn = nil
}
connMutex.Unlock()
}()
reader := bufio.NewReader(Conn) reader := bufio.NewReader(conn)
for { for {
data, err := reader.ReadBytes('\n') data, err := reader.ReadBytes('\n')
@@ -64,17 +91,23 @@ func handleRequest() {
} }
} }
Conn.Write([]byte(responseMsg + "\n")) if _, err := conn.Write([]byte(responseMsg + "\n")); err != nil {
return
}
} }
} }
func SendMsg(msg string) error { func SendMsg(msg string) error {
if Conn == nil { connMutex.Lock()
conn := Conn
connMutex.Unlock()
if conn == nil {
return fmt.Errorf("connection is nil") return fmt.Errorf("connection is nil")
} }
data := []byte(msg + "\n") data := []byte(msg + "\n")
n, err := Conn.Write(data) n, err := conn.Write(data)
if err != nil { if err != nil {
return fmt.Errorf("failed to write message: %v", err) return fmt.Errorf("failed to write message: %v", err)
} }