Merge pull request 'ws-refactor' (#3) from ws-refactor into master

Reviewed-on: #3

main.go

@@ -32,6 +32,7 @@ type Message struct {
 	Name      string `json:"Name"`
 	Image     string `json:"Image"`
 	Status    string `json:"Status"`
+	Theme     string `json:"Theme"`
 	Timestamp string `json:"Timestamp"`
 }
 
@@ -44,6 +45,7 @@ type Config struct {
 
 type Client struct {
 	conn *websocket.Conn
+	mu   sync.Mutex
 }
 
 type Server struct {
@@ -110,7 +112,7 @@ func (s *Server) addClient(client *Client) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	s.clients[client] = true
-	broadcastAllRecordsToClient(client)
+	sendAllRecordsToClient(client)
 }
 
 func (s *Server) removeClient(client *Client) {
@@ -154,62 +156,30 @@ func (s *Server) handleConnections(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func broadcastAllRecords(s *Server) {
+func broadcastSingleRecord(s *Server, message Message) {
-	allRecords, err := fetchAllRecords()
+	for client := range s.clients {
-	if err != nil {
+		sendMessageToClient(client, message)
-		log.Println("Error fetching all records:", err)
-	}
-	if len(allRecords) > 0 {
-		var message Message
-		for _, msgContent := range allRecords {
-			err = json.Unmarshal([]byte(msgContent), &message)
-			if err != nil {
-				log.Println("Unable to marshal JSON due to: ", err)
-			}
-			fmt.Printf("Broadcasting %s,%s,%s,%s to %d clients\n", message.Id, message.Status, message.Name, message.Timestamp, len(s.clients))
-
-			for client := range s.clients {
-				if err := client.conn.WriteMessage(websocket.TextMessage, []byte(msgContent)); err != nil {
-					log.Println("Failed to broadcast update:", err)
-				}
-			}
-		}
 	}
 }
 
-func broadcastRemovedRecords(s *Server, message Message) {
+func sendMessageToClient(client *Client, message Message) {
 	var msgJSON, err = json.Marshal(message)
 	if err != nil {
 		log.Println("Error marshalling json:", err)
 		return
 	}
-	fmt.Printf("Broadcasting removal: %s,%s,%s,%s to %d clients\n", message.Id, message.Status, message.Name, message.Timestamp, len(s.clients))
+	go sendToClient(client, msgJSON)
+}
 
-	for client := range s.clients {
+func sendToClient(client *Client, msgJSON []byte) {
-		if err := client.conn.WriteMessage(websocket.TextMessage, msgJSON); err != nil {
+	client.mu.Lock()
-			log.Println("Failed to broadcast update:", err)
+	defer client.mu.Unlock()
-			return
+	if err := client.conn.WriteMessage(websocket.TextMessage, msgJSON); err != nil {
-		}
+		log.Println("Failed to send message to client:", err)
 	}
 }
 
-func broadcastExpiredRecords(s *Server, removed string) {
+func sendAllRecordsToClient(client *Client) {
-	var message = Message{Id: removed, Name: "", Image: "", Status: "removed", Timestamp: ""}
-	var msgJSON, err = json.Marshal(message)
-	if err != nil {
-		log.Println("Error marshalling json:", err)
-		return
-	}
-	fmt.Printf("Broadcasting expiration: %s to %d clients\n", string(msgJSON), len(s.clients))
-	for client := range s.clients {
-		if err := client.conn.WriteMessage(websocket.TextMessage, msgJSON); err != nil {
-			log.Println("Failed to broadcast update:", err)
-			return
-		}
-	}
-}
-
-func broadcastAllRecordsToClient(c *Client) {
 	allRecords, err := fetchAllRecords()
 	if err != nil {
 		log.Println("Error fetching all records:", err)
@@ -221,10 +191,8 @@ func broadcastAllRecordsToClient(c *Client) {
 		if err != nil {
 			log.Println("Unable to marshal JSON due to: ", err)
 		}
-		fmt.Printf("Broadcasting %s,%s,%s,%s\n", message.Id, message.Status, message.Name, message.Timestamp)
+		fmt.Printf("Broadcasting %s,%s,%s,%s,%s\n", message.Id, message.Status, message.Name, message.Theme, message.Timestamp)
-		if err := c.conn.WriteMessage(websocket.TextMessage, []byte(msgContent)); err != nil {
+		go sendToClient(client, []byte(msgContent))
-			log.Println("Failed to broadcast update:", err)
-		}
 	}
 }
 
@@ -233,7 +201,7 @@ func (s *Server) listenForExpirationEvents() {
 	defer func(ps *redis.PubSub) {
 		err := ps.Close()
 		if err != nil {
-
+			log.Println("Error closing redis pubsub:", err)
 		}
 	}(ps)
 
@@ -242,8 +210,9 @@ func (s *Server) listenForExpirationEvents() {
 		expiredID := msg.Payload
 		fmt.Println(expiredID)
 		// Broadcast expiration event
-		broadcastExpiredRecords(s, expiredID)
+		var message = Message{Id: expiredID, Name: "", Image: "", Status: "removed", Theme: "", Timestamp: ""}
-		fmt.Printf("Done Broadcasting Expiration\n")
+		fmt.Printf("Broadcasting expiration: %s to %d clients\n", message, len(s.clients))
+		broadcastSingleRecord(s, message)
 	}
 }
 
@@ -263,64 +232,62 @@ func fetchAllRecords() (map[string]string, error) {
 		}
 		records[key] = value
 	}
-
 	return records, nil
 }
 
-/*
+func getState(w http.ResponseWriter, r *http.Request) {
-	func getState(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPost {
-		if r.Method != http.MethodPost {
+		http.Error(w, "Only POST method is allowed", http.StatusMethodNotAllowed)
-			http.Error(w, "Only POST method is allowed", http.StatusMethodNotAllowed)
+		return
-			return
-		}
-		fmt.Println("Checking Status")
-		var request struct {
-			Id string `json:"Id"`
-		}
-		err := json.NewDecoder(r.Body).Decode(&request)
-		if err != nil {
-			fmt.Println("Invalid JSON format")
-			fmt.Println(r.Body)
-			http.Error(w, "Invalid JSON format", http.StatusBadRequest)
-			return
-		}
-
-		if request.Id == "" {
-			fmt.Println("Missing or empty Id field")
-			http.Error(w, "Missing or empty Id field", http.StatusBadRequest)
-			return
-		}
-		fmt.Println(request.Id)
-		value, err := redisClient.Get(ctx, request.Id).Result()
-		if errors.Is(err, redis.Nil) {
-			message := Message{Id: request.Id, Status: "none", Timestamp: time.Now().Format(time.RFC3339)}
-			w.Header().Set("Content-Type", "application/json")
-			err := json.NewEncoder(w).Encode(message)
-			if err != nil {
-				return
-			}
-			return
-		} else if err != nil {
-			log.Printf("Redis error: %v", err)
-			http.Error(w, "Error connecting to Redis", http.StatusInternalServerError)
-			return
-		}
-
-		var message Message
-		err = json.Unmarshal([]byte(value), &message)
-		if err != nil {
-			log.Printf("Failed to decode Redis data for Id: %s - %v", request.Id, err)
-			http.Error(w, "Failed to parse data", http.StatusInternalServerError)
-			return
-		}
-
-		w.Header().Set("Content-Type", "application/json")
-		err = json.NewEncoder(w).Encode(message)
-		if err != nil {
-			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-		}
 	}
-*/
+	fmt.Println("Checking Status")
+	var request struct {
+		Id string `json:"Id"`
+	}
+	err := json.NewDecoder(r.Body).Decode(&request)
+	if err != nil {
+		fmt.Println("Invalid JSON format")
+		fmt.Println(r.Body)
+		http.Error(w, "Invalid JSON format", http.StatusBadRequest)
+		return
+	}
+	fmt.Println(request)
+	if request.Id == "" {
+		fmt.Println("Missing or empty Id field")
+		http.Error(w, "Missing or empty Id field", http.StatusBadRequest)
+		return
+	}
+	fmt.Println(request.Id)
+	value, err := redisClient.Get(ctx, request.Id).Result()
+	if errors.Is(err, redis.Nil) {
+		message := Message{Id: request.Id, Status: "none", Timestamp: time.Now().Format(time.RFC3339)}
+		w.Header().Set("Content-Type", "application/json")
+		err := json.NewEncoder(w).Encode(message)
+		if err != nil {
+			return
+		}
+		return
+	} else if err != nil {
+		log.Printf("Redis error: %v", err)
+		http.Error(w, "Error connecting to Redis", http.StatusInternalServerError)
+		return
+	}
+
+	var message Message
+	err = json.Unmarshal([]byte(value), &message)
+	if err != nil {
+		log.Printf("Failed to decode Redis data for Id: %s - %v", request.Id, err)
+		http.Error(w, "Failed to parse data", http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	err = json.NewEncoder(w).Encode(message)
+	if err != nil {
+		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+	}
+}
+
 func setState(w http.ResponseWriter, r *http.Request, s *Server) {
 	if r.Method != http.MethodPost {
 		http.Error(w, "Only POST method is allowed", http.StatusMethodNotAllowed)
@@ -340,26 +307,24 @@ func setState(w http.ResponseWriter, r *http.Request, s *Server) {
 			http.Error(w, "Failed to delete key from Redis", http.StatusInternalServerError)
 			return
 		}
-		broadcastRemovedRecords(s, message)
+		fmt.Printf("Broadcasting removal: %s,%s,%s,%s to %d clients\n", message.Id, message.Status, message.Name, message.Timestamp, len(s.clients))
-		w.WriteHeader(http.StatusOK)
+	} else {
-		return
+		msgJSON, err := json.Marshal(message)
+		if err != nil {
+			http.Error(w, "Failed to encode message", http.StatusInternalServerError)
+			return
+		}
+		timeout := 20 * time.Second
+		err = redisClient.Set(ctx, message.Id, msgJSON, timeout).Err()
+		if err != nil {
+			log.Printf("Failed to set key in Redis: %v", err)
+			http.Error(w, "Failed to store data", http.StatusInternalServerError)
+			return
+		}
+		fmt.Printf("Broadcasting message: %s,%s,%s,%s,%s to %d clients\n", message.Id, message.Status, message.Name, message.Theme, message.Timestamp, len(s.clients))
 	}
 
-	msgJSON, err := json.Marshal(message)
+	broadcastSingleRecord(s, message)
-	if err != nil {
-		http.Error(w, "Failed to encode message", http.StatusInternalServerError)
-		return
-	}
-
-	timeout := 20 * time.Second
-	err = redisClient.Set(ctx, message.Id, msgJSON, timeout).Err()
-	if err != nil {
-		log.Printf("Failed to set key in Redis: %v", err)
-		http.Error(w, "Failed to store data", http.StatusInternalServerError)
-		return
-	}
-
-	broadcastAllRecords(s)
 	w.WriteHeader(http.StatusOK)
 }
 
@@ -420,7 +385,7 @@ func main() {
 
 	// Register routes on the mux router
 	router.HandleFunc("/ws", server.handleConnections).Methods("GET")
-	//router.HandleFunc("/get", getState).Methods("POST")
+	router.HandleFunc("/get", getState).Methods("POST")
 	router.HandleFunc("/set", func(w http.ResponseWriter, r *http.Request) {
 		setState(w, r, server)
 	}).Methods("POST")