[refactoring] Cleanup server code

Author: g3force

internal/app/controller/server.go

@@ -7,14 +7,15 @@ import (
 	"net/http"
 )
 
+// handle incoming web socket connections
 func WsHandler(w http.ResponseWriter, r *http.Request) {
-	upgrader := websocket.Upgrader{
+	u := websocket.Upgrader{
 		ReadBufferSize:  1024,
 		WriteBufferSize: 1024,
 		CheckOrigin:     func(*http.Request) bool { return true },
 	}
 
-	conn, err := upgrader.Upgrade(w, r, nil)
+	conn, err := u.Upgrade(w, r, nil)
 	if err != nil {
 		log.Println(err)
 		return
@@ -24,8 +25,12 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 
 	log.Println("Client connected")
 
-	go checkForNewEvent(conn)
+	go listenForNewEvents(conn)
 
+	publishState(conn)
+}
+
+func publishState(conn *websocket.Conn) {
 	for {
 		b, err := json.Marshal(refBox.State)
 		if err != nil {
@@ -38,31 +43,37 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		// wait for a new event
+		// wait to be notified
 		<-refBox.notifyUpdateState
 	}
 }
 
-func checkForNewEvent(conn *websocket.Conn) {
+func listenForNewEvents(conn *websocket.Conn) {
 	for {
 		messageType, b, err := conn.ReadMessage()
 		if err != nil || messageType != websocket.TextMessage {
-			log.Println("Could not read message:", err)
+			log.Println("Could not read message: ", err)
 			return
 		}
 
-		event := RefBoxEvent{}
-		err = json.Unmarshal(b, &event)
-		if err != nil {
-			log.Println("Could not read event:", string(b), err)
-		} else {
-			err = processEvent(&event)
-			if err != nil {
-				log.Println("Could not process event:", string(b), err)
-			} else {
-				refBox.SaveState()
-				refBox.Update(event.Command)
-			}
-		}
+		handleNewEventMessage(b)
+	}
+}
+
+func handleNewEventMessage(b []byte) {
+	event := RefBoxEvent{}
+	err := json.Unmarshal(b, &event)
+	if err != nil {
+		log.Println("Could not read event:", string(b), err)
+		return
 	}
+
+	err = processEvent(&event)
+	if err != nil {
+		log.Println("Could not process event:", string(b), err)
+		return
+	}
+
+	refBox.SaveState()
+	refBox.Update(event.Command)
 }