feat: switch away from websocket to stdout messaging for agent

agent/internal/hpagent/handler.go

@@ -1,9 +1,12 @@
 package hpagent
 
 import (
+	"bufio"
 	"encoding/json"
+	"os"
 	"sync"
 
+	"github.com/tale/headplane/agent/internal/tsnet"
 	"github.com/tale/headplane/agent/internal/util"
 	"tailscale.com/tailcfg"
 )
@@ -13,30 +16,32 @@ type RecvMessage struct {
 	NodeIDs []string
 }
 
-// Starts listening for messages from the Headplane master
-func (s *Socket) FollowMaster() {
-	log := util.GetLogger()
+type SendMessage struct {
+	Type string
+	Data any
+}
 
-	for {
-		_, message, err := s.ReadMessage()
-		if err != nil {
-			log.Error("Error reading message: %s", err)
-			return
-		}
+// Starts listening for messages from stdin
+func FollowMaster(agent *tsnet.TSAgent) {
+	log := util.GetLogger()
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for scanner.Scan() {
+		line := scanner.Bytes()
 
 		var msg RecvMessage
-		err = json.Unmarshal(message, &msg)
+		err := json.Unmarshal(line, &msg)
 		if err != nil {
 			log.Error("Unable to unmarshal message: %s", err)
 			log.Debug("Full Error: %v", err)
 			continue
 		}
 
-		log.Debug("Recieved message from master: %v", message)
+		log.Debug("Recieved message from master: %v", line)
 
 		if len(msg.NodeIDs) == 0 {
 			log.Debug("Message recieved had no node IDs")
-			log.Debug("Full message: %s", message)
+			log.Debug("Full message: %s", line)
 			continue
 		}
 
@@ -49,7 +54,7 @@ func (s *Socket) FollowMaster() {
 			wg.Add(1)
 			go func(nodeID string) {
 				defer wg.Done()
-				result, err := s.Agent.GetStatusForPeer(nodeID)
+				result, err := agent.GetStatusForPeer(nodeID)
 				if err != nil {
 					log.Error("Unable to get status for node %s: %s", nodeID, err)
 					return
@@ -70,15 +75,13 @@ func (s *Socket) FollowMaster() {
 
 		// Send the results back to the Headplane master
 		log.Debug("Sending status back to master: %v", results)
-		err = s.SendStatus(results)
-		if err != nil {
-			log.Error("Error sending status: %s", err)
-			return
-		}
+		log.Msg(&SendMessage{
+			Type: "status",
+			Data: results,
+		})
+	}
+
+	if err := scanner.Err(); err != nil {
+		log.Fatal("Error reading from stdin: %s", err)
 	}
 }
-
-// Stops listening for messages from the Headplane master
-func (s *Socket) StopListening() {
-	s.Close()
-}

agent/internal/hpagent/sender.go

@@ -1,11 +0,0 @@
-package hpagent
-
-import (
-	"tailscale.com/tailcfg"
-)
-
-// Sends the status to the Headplane master
-func (s *Socket) SendStatus(status map[string]*tailcfg.HostinfoView) error {
-	err := s.WriteJSON(status)
-	return err
-}

agent/internal/hpagent/websocket.go

@@ -1,67 +0,0 @@
-package hpagent
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-
-	"github.com/gorilla/websocket"
-	"github.com/tale/headplane/agent/internal/config"
-	"github.com/tale/headplane/agent/internal/tsnet"
-	"github.com/tale/headplane/agent/internal/util"
-)
-
-type Socket struct {
-	*websocket.Conn
-	Agent *tsnet.TSAgent
-}
-
-// Creates a new websocket connection to the Headplane server.
-func NewSocket(agent *tsnet.TSAgent, cfg *config.Config) (*Socket, error) {
-	log := util.GetLogger()
-
-	wsURL, err := httpToWs(cfg.HPControlURL)
-	if err != nil {
-		return nil, err
-	}
-
-	headers := http.Header{}
-	headers.Add("X-Headplane-Tailnet-ID", agent.ID)
-	auth := fmt.Sprintf("Bearer %s", cfg.HPAuthKey)
-	headers.Add("Authorization", auth)
-
-	log.Info("Dialing WebSocket with master: %s", wsURL)
-	ws, _, err := websocket.DefaultDialer.Dial(wsURL, headers)
-	if err != nil {
-		log.Debug("Failed to dial WebSocket: %s", err)
-		return nil, err
-	}
-
-	return &Socket{ws, agent}, nil
-}
-
-// We need to convert the control URL to a websocket URL
-func httpToWs(controlURL string) (string, error) {
-	log := util.GetLogger()
-	u, err := url.Parse(controlURL)
-	if err != nil {
-		log.Debug("Failed to parse control URL: %s", err)
-		return "", err
-	}
-
-	if u.Scheme == "http" {
-		u.Scheme = "ws"
-	} else if u.Scheme == "https" {
-		u.Scheme = "wss"
-	} else {
-		return "", fmt.Errorf("unsupported scheme: %s", u.Scheme)
-	}
-
-	// We also need to append /_dial to the path
-	if u.Path[len(u.Path)-1] != '/' {
-		u.Path += "/"
-	}
-
-	u.Path += "_dial"
-	return u.String(), nil
-}