refactor: server should start the receive loop (#19)

Move the receive loop into the server package and make it restart on error

The receive loop is now managed by the server package, which will restart it automatically if it encounters an error. The loop previously lived in main.go but has been relocated to server.go for better error handling and recovery.

ref #8

Co-authored-by: Mathias Fredriksson <[email protected]>

main.go

@@ -60,8 +60,6 @@ func realMain() int {
 		return 1
 	}
 
-	go sarc.ReceiveLoop()
-
 	srv := server.New(sarc)
 
 	server := &http.Server{

receiver/client.go

@@ -110,15 +110,15 @@ func New(uri *url.URL) (*Client, error) {
 // ReceiveLoop is a blocking call and it loop over receiving messages over the
 // websocket and record them internally to be consumed by either Pop() or
 // Flush().
-func (c *Client) ReceiveLoop() {
+func (c *Client) ReceiveLoop() error {
 	log.Print("Starting the receive loop from Signal API")
 
 	for {
 		_, msg, err := c.ReadMessage()
 		if err != nil {
 			log.Printf("error returned by the websocket: %s", err)
 
-			return
+			return err
 		}
 
 		c.recordMessage(msg)

server/server.go

@@ -3,6 +3,7 @@ package server
 import (
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 
 	"github.com/kalbasit/signal-api-receiver/receiver"
@@ -19,13 +20,25 @@ type Server struct {
 }
 
 type client interface {
+	ReceiveLoop() error
 	Pop() *receiver.Message
 	Flush() []receiver.Message
 }
 
 // New returns a new Server.
 func New(sarc client) *Server {
-	return &Server{sarc: sarc}
+	s := &Server{sarc: sarc}
+	go s.start()
+
+	return s
+}
+
+func (s *Server) start() {
+	for {
+		if err := s.sarc.ReceiveLoop(); err != nil {
+			log.Printf("Error in the receive loop: %v", err)
+		}
+	}
 }
 
 // ServeHTTP implements the http.Handler interface

server/server_test.go

@@ -19,6 +19,10 @@ type mockClient struct {
 	msgs []receiver.Message
 }
 
+func (mc *mockClient) ReceiveLoop() error {
+	return nil
+}
+
 func (mc *mockClient) Pop() *receiver.Message {
 	if len(mc.msgs) == 0 {
 		return nil