refactor(watchdog): remove tcp socket connection and add local unix sock connection

config/config.go

@@ -65,7 +65,6 @@ func LoadConfig(configPath string, getInitSystem func() string) error {
 	global.CurrentConfig.InstancePath = fileConfig.InstancePath
 	global.CurrentConfig.Debug = fileConfig.Debug
 	global.CurrentConfig.Watchdog.Enabled = fileConfig.Watchdog.Enabled
-	global.CurrentConfig.Watchdog.Port = fileConfig.Watchdog.Port
 	global.CurrentConfig.Notification.Enabled = fileConfig.Notification.Enabled
 	global.CurrentConfig.Notification.Method = fileConfig.Notification.Method
 	global.CurrentConfig.Webhook.Method = fileConfig.Webhook.Method
@@ -93,10 +92,6 @@ func LoadConfig(configPath string, getInitSystem func() string) error {
 		global.CurrentConfig.InstancePath = "./configs"
 	}
 
-	if fileConfig.Watchdog.Port == 0 {
-		global.CurrentConfig.Watchdog.Port = 12380
-	}
-
 	if err := os.MkdirAll(global.CurrentConfig.InstancePath, 0755); err != nil {
 		return fmt.Errorf("failed to create config directory: %w", err)
 	}

docs/api.md

@@ -1655,7 +1655,6 @@ key=ListenAddr
     "InstancePath": "./configs",
     "Debug": true,
     "Watchdog.Enabled": true,
-    "Watchdog.Port": 12380,
     "Notification.Enabled": true,
     "Notification.Method": "webhook",
     "Webhook.Method": "POST",

global/global.go

@@ -51,15 +51,14 @@ type Config struct {
 	Debug        bool   `json:"debug"`
 	Watchdog     struct {
 		Enabled bool `json:"enabled"`
-		Port    int  `json:"port"`
 	} `json:"watchdog"`
 	Notification struct {
 		Enabled bool   `json:"enabled"`
 		Method  string `json:"method"`
 	} `json:"notification"`
 	Webhook struct {
-		Method  string            `json:"method"`
+		Method  string `json:"method"`
-		URL     string            `json:"url"`
+		URL     string `json:"url"`
 		Headers string `json:"headers"`
 		Body    string `json:"body"`
 	} `json:"webhook"`
@@ -73,10 +72,8 @@ var CurrentConfig = Config{
 	Debug:        false,
 	Watchdog: struct {
 		Enabled bool `json:"enabled"`
-		Port    int  `json:"port"`
 	}{
 		Enabled: false,
-		Port:    0,
 	},
 	Notification: struct {
 		Enabled bool   `json:"enabled"`
@@ -86,14 +83,14 @@ var CurrentConfig = Config{
 		Method:  "webhook",
 	},
 	Webhook: struct {
-		Method  string            `json:"method"`
+		Method  string `json:"method"`
-		URL     string            `json:"url"`
+		URL     string `json:"url"`
 		Headers string `json:"headers"`
-		Body   string `json:"body"`
+		Body    string `json:"body"`
 	}{
-		Method: "",
+		Method:  "",
-		URL:    "",
+		URL:     "",
 		Headers: "Content-Type: application/json",
-		Body: "",
+		Body:    "",
 	},
 }

handlers/settings.go

@@ -37,8 +37,6 @@ func GetSettingsHandler(w http.ResponseWriter, r *http.Request) {
 			value = global.CurrentConfig.Debug
 		case "Watchdog.Enabled":
 			value = global.CurrentConfig.Watchdog.Enabled
-		case "Watchdog.Port":
-			value = global.CurrentConfig.Watchdog.Port
 		case "Notification.Enabled":
 			value = global.CurrentConfig.Notification.Enabled
 		case "Notification.Method":
@@ -68,7 +66,6 @@ func GetSettingsHandler(w http.ResponseWriter, r *http.Request) {
 			"InstancePath":         global.CurrentConfig.InstancePath,
 			"Debug":                global.CurrentConfig.Debug,
 			"Watchdog.Enabled":     global.CurrentConfig.Watchdog.Enabled,
-			"Watchdog.Port":        global.CurrentConfig.Watchdog.Port,
 			"Notification.Enabled": global.CurrentConfig.Notification.Enabled,
 			"Notification.Method":  global.CurrentConfig.Notification.Method,
 			"Webhook.Method":       global.CurrentConfig.Webhook.Method,
@@ -131,10 +128,6 @@ func SetSettingsHandler(w http.ResponseWriter, r *http.Request) {
 			if v, ok := value.(bool); ok {
 				global.CurrentConfig.Watchdog.Enabled = v
 			}
-		case "Watchdog.Port":
-			if v, ok := value.(float64); ok {
-				global.CurrentConfig.Watchdog.Port = int(v)
-			}
 		case "Notification.Enabled":
 			if v, ok := value.(bool); ok {
 				global.CurrentConfig.Notification.Enabled = v

main.go

@@ -76,11 +76,10 @@ func main() {
 	if err != nil {
 		postLog.Error(fmt.Sprintf("Unable to initialize Watchdog: %s", err))
 	} else {
-		if !watchdog.Connect("127.0.0.1", global.CurrentConfig.Watchdog.Port) {
+		if !watchdog.Connect() {
-			postLog.Error(fmt.Sprintf("Failed to connect to Watchdog at %s:%d", "127.0.0.1", global.CurrentConfig.Watchdog.Port))
+			postLog.Error("Failed to connect to Watchdog")
 		} else {
-			postLog.Info(fmt.Sprintf("Connected to Watchdog at %s:%d", "127.0.0.1", global.CurrentConfig.Watchdog.Port))
+			postLog.Info("Connected to Watchdog successfully")
-			global.Is.WatchdogConnected = true
 
 			go func() {
 				if err := watchdog.StartKeepAlive(); err != nil {

watchdog/client.go

@@ -16,26 +16,28 @@ import (
 	"time"
 )
 
+const socketPath = "/tmp/super-frpc-watchdog.sock"
+
 var (
-	tcpConn      net.Conn
+	localConn      net.Conn
-	tcpConnMutex sync.Mutex
+	localConnMutex sync.Mutex
-	isConnected  bool
+	isConnected    bool
-	recvChan     chan string
+	recvChan       chan string
-	stopRecvChan chan struct{}
+	stopRecvChan   chan struct{}
-	recvWg       sync.WaitGroup
+	recvWg         sync.WaitGroup
 )
 
 func Init() error {
-	tcpConnMutex.Lock()
+	localConnMutex.Lock()
 	if recvChan != nil || stopRecvChan != nil {
-		tcpConnMutex.Unlock()
+		localConnMutex.Unlock()
 		return nil
 	}
-	if tcpConn != nil {
+	if localConn != nil {
-		tcpConnMutex.Unlock()
+		localConnMutex.Unlock()
-		return fmt.Errorf("TCP client already initialized")
+		return fmt.Errorf("local socket client already initialized")
 	}
-	tcpConnMutex.Unlock()
+	localConnMutex.Unlock()
 
 	if global.CurrentConfig.Watchdog.Enabled {
 		if err := ensureWatchdogProcess(); err != nil {
@@ -44,8 +46,8 @@ func Init() error {
 		}
 	}
 
-	tcpConnMutex.Lock()
+	localConnMutex.Lock()
-	defer tcpConnMutex.Unlock()
+	defer localConnMutex.Unlock()
 
 	recvChan = make(chan string, 100)
 	stopRecvChan = make(chan struct{})
@@ -135,21 +137,20 @@ func isWatchdogProcessRunning(watchdogName string) bool {
 	}
 }
 
-func tcpConnect(ipaddr string, port int) error {
+func localSocketConnect() error {
-	tcpConnMutex.Lock()
+	localConnMutex.Lock()
-	defer tcpConnMutex.Unlock()
+	defer localConnMutex.Unlock()
 
-	if tcpConn != nil {
+	if localConn != nil {
 		return fmt.Errorf("already connected")
 	}
 
-	address := net.JoinHostPort(ipaddr, fmt.Sprintf("%d", port))
+	conn, err := net.DialTimeout("unix", socketPath, 3*time.Second)
-	conn, err := net.DialTimeout("tcp", address, 3*time.Second)
 	if err != nil {
-		return fmt.Errorf("failed to connect to %s: %v", address, err)
+		return fmt.Errorf("failed to connect to %s: %v", socketPath, err)
 	}
 
-	tcpConn = conn
+	localConn = conn
 	isConnected = true
 
 	recvWg.Add(1)
@@ -159,20 +160,20 @@ func tcpConnect(ipaddr string, port int) error {
 }
 
 func sendMsg(message string, timeout int) (string, error) {
-	tcpConnMutex.Lock()
+	localConnMutex.Lock()
 
-	if tcpConn == nil {
+	if localConn == nil {
-		tcpConnMutex.Unlock()
+		localConnMutex.Unlock()
 		return "", fmt.Errorf("not connected")
 	}
 
-	_, err := tcpConn.Write([]byte(message + "\n"))
+	_, err := localConn.Write([]byte(message + "\n"))
 	if err != nil {
-		tcpConnMutex.Unlock()
+		localConnMutex.Unlock()
 		return "", fmt.Errorf("failed to send message: %v", err)
 	}
 
-	tcpConnMutex.Unlock()
+	localConnMutex.Unlock()
 
 	select {
 	case response := <-recvChan:
@@ -188,13 +189,13 @@ func sendMsg(message string, timeout int) (string, error) {
 func recvMsg() {
 	defer recvWg.Done()
 
-	tcpConnMutex.Lock()
+	localConnMutex.Lock()
-	if tcpConn == nil {
+	if localConn == nil {
-		tcpConnMutex.Unlock()
+		localConnMutex.Unlock()
 		return
 	}
-	conn := tcpConn
+	conn := localConn
-	tcpConnMutex.Unlock()
+	localConnMutex.Unlock()
 
 	reader := bufio.NewReader(conn)
 
@@ -215,9 +216,7 @@ func recvMsg() {
 					default:
 						// drop the message
 					}
-					// Here add logic to handle the message
 					if !isResponseMessage(line) {
-						// postLog.Debug(fmt.Sprintf("[Watchdog] TCP Socket received message: %s", line))
 						parseCommand(line)
 					}
 				}
@@ -228,13 +227,13 @@ func recvMsg() {
 					continue
 				}
 
-				tcpConnMutex.Lock()
+				localConnMutex.Lock()
-				if tcpConn != nil {
+				if localConn != nil {
-					tcpConn.Close()
+					localConn.Close()
-					tcpConn = nil
+					localConn = nil
 					isConnected = false
 				}
-				tcpConnMutex.Unlock()
+				localConnMutex.Unlock()
 				return
 			}
 		}
@@ -246,23 +245,23 @@ func isResponseMessage(msg string) bool {
 }
 
 func Destroy() error {
-	tcpConnMutex.Lock()
+	localConnMutex.Lock()
 
 	if stopRecvChan != nil {
 		close(stopRecvChan)
 		stopRecvChan = nil
 	}
 
-	tcpConnMutex.Unlock()
+	localConnMutex.Unlock()
 
 	recvWg.Wait()
 
-	tcpConnMutex.Lock()
+	localConnMutex.Lock()
-	defer tcpConnMutex.Unlock()
+	defer localConnMutex.Unlock()
 
-	if tcpConn != nil {
+	if localConn != nil {
-		err := tcpConn.Close()
+		err := localConn.Close()
-		tcpConn = nil
+		localConn = nil
 		isConnected = false
 		if err != nil {
 			return fmt.Errorf("failed to close connection: %v", err)
@@ -278,7 +277,7 @@ func Destroy() error {
 }
 
 func IsConnected() bool {
-	tcpConnMutex.Lock()
+	localConnMutex.Lock()
-	defer tcpConnMutex.Unlock()
+	defer localConnMutex.Unlock()
-	return isConnected && tcpConn != nil
+	return isConnected && localConn != nil
 }

watchdog/connect.go

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-func Connect(ipaddr string, port int) bool {
+func Connect() bool {
 	if IsConnected() {
 		return true
 	}
@@ -18,7 +18,7 @@ func Connect(ipaddr string, port int) bool {
 	deadline := time.Now().Add(5 * time.Second)
 	var lastErr error
 	for {
-		if err := tcpConnect(ipaddr, port); err == nil {
+		if err := localSocketConnect(); err == nil {
 			break
 		} else {
 			lastErr = err
@@ -58,6 +58,8 @@ func Disconnect() bool {
 		return false
 	}
 
+	KillWatchdogProcess()
+
 	time.Sleep(100 * time.Millisecond)
 
 	return true

watchdog/keepalive.go

@@ -29,7 +29,7 @@ func StartKeepAlive() error {
 					continue
 				}
 
-				if Connect("127.0.0.1", global.CurrentConfig.Watchdog.Port) {
+				if err = Init(); err == nil && Connect() {
 					global.Is.WatchdogConnected = true
 					postLog.Info("[watchdog] successfully reconnected to watchdog")
 					lastErr = nil
@@ -37,7 +37,7 @@ func StartKeepAlive() error {
 				}
 
 				lastErr = fmt.Errorf("failed to connect to watchdog")
-				time.Sleep(500 * time.Millisecond)
+				time.Sleep(1000 * time.Millisecond)
 			}
 
 			if lastErr != nil {

watchdog/watchdog_build_linux.go

@@ -6,3 +6,13 @@ import "os/exec"
 
 func configureWatchdogCommand(cmd *exec.Cmd) {
 }
+
+func KillWatchdogProcess() error {
+	watchdogName, err := getWatchdogBinaryName()
+	if err != nil {
+		return err
+	}
+	
+	cmd := exec.Command("pkill", "-f", watchdogName)
+	return cmd.Run()
+}

watchdog/watchdog_build_windows.go

@@ -10,3 +10,13 @@ import (
 func configureWatchdogCommand(cmd *exec.Cmd) {
 	cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
 }
+
+func KillWatchdogProcess() error {
+	watchdogName, err := getWatchdogBinaryName()
+	if err != nil {
+		return err
+	}
+
+	cmd := exec.Command("taskkill", "/IM", watchdogName, "/F")
+	return cmd.Run()
+}