add universal tcp message reader and writer

1 files changed, 7 insertions, 10 deletions

diff --git a/internal/server/tcpserver.go b/internal/server/tcpserver.go
index b6d2ede..21324c3 100644
--- a/internal/server/tcpserver.go
+++ b/internal/server/tcpserver.go
@@ -1,13 +1,13 @@
 package server
 
 import (
-	"bufio"
 	"context"
 	"fmt"
 	"log"
 	"net"
 
 	"codeberg.org/snonux/gorum/internal/config"
+	"codeberg.org/snonux/gorum/internal/tcp"
 )
 
 type handlerCb func(message string) string
@@ -41,11 +41,7 @@ func tcpServerRun(ctx context.Context, conf config.Config, cb handlerCb) error {
 
 func handleConnection(ctx context.Context, conn net.Conn, cb handlerCb) {
 	defer conn.Close()
-
-	var (
-		remoteAddr = conn.RemoteAddr().String()
-		reader     = bufio.NewReader(conn)
-	)
+	remoteAddr := conn.RemoteAddr().String()
 
 	for {
 		select {
@@ -53,15 +49,16 @@ func handleConnection(ctx context.Context, conn net.Conn, cb handlerCb) {
 			log.Println("server: context done, disconnecting client:", remoteAddr)
 			return
 		default:
-			message, err := reader.ReadString('\n')
+			message, err := tcp.ReadStr(conn)
 			if err != nil {
-				log.Println("server: client disconnected:", remoteAddr, err)
+				log.Println("server: unable to read message", remoteAddr, err)
 				return
 			}
 
-			log.Println("server: received message", remoteAddr, message)
+			log.Println("server: received message", message, "from", remoteAddr)
 			response := cb(message)
-			if _, err := conn.Write([]byte(response)); err != nil {
+
+			if err := tcp.WriteStr(conn, response); err != nil {
 				log.Println("error:", err)
 			}
 		}