From 5bbf04ae904a2c59915bff015f7d90fa707c22b2 Mon Sep 17 00:00:00 2001 From: whysman Date: Fri, 21 Feb 2025 21:03:04 -0500 Subject: [PATCH 1/4] Cleaning up websocket comms for efficiency. --- main.go | 63 +++++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/main.go b/main.go index 5903720..d72eb10 100644 --- a/main.go +++ b/main.go @@ -44,6 +44,7 @@ type Config struct { type Client struct { conn *websocket.Conn + mu sync.Mutex } type Server struct { @@ -110,7 +111,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,77 +155,69 @@ func (s *Server) handleConnections(w http.ResponseWriter, r *http.Request) { } } +func sendMessageToClient(client *Client, message Message) { + var msgJSON, err = json.Marshal(message) + if err != nil { + log.Println("Error marshalling json:", err) + return + } + sendToClient(client, msgJSON) +} + +func sendToClient(client *Client, msgJSON []byte) { + client.mu.Lock() + defer client.mu.Unlock() + if err := client.conn.WriteMessage(websocket.TextMessage, msgJSON); err != nil { + log.Println("Failed to send message to client:", err) + } +} + func broadcastAllRecords(s *Server) { allRecords, err := fetchAllRecords() if err != nil { 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)) - + fmt.Printf("Broadcasting %s to %d clients\n", msgContent, 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) - } + sendToClient(client, []byte(msgContent)) } } } } func broadcastRemovedRecords(s *Server, 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)) - for client := range s.clients { - if err := client.conn.WriteMessage(websocket.TextMessage, msgJSON); err != nil { - log.Println("Failed to broadcast update:", err) - return - } + sendMessageToClient(client, message) } } func broadcastExpiredRecords(s *Server, removed string) { 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)) + fmt.Printf("Broadcasting expiration: %s to %d clients\n", message, 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 - } + sendMessageToClient(client, message) } } -func broadcastAllRecordsToClient(c *Client) { +func sendAllRecordsToClient(client *Client) { allRecords, err := fetchAllRecords() if err != nil { log.Println("Error fetching all records:", err) } fmt.Printf("Broadcasting %d records to client\n", len(allRecords)) var message Message + client.mu.Lock() + defer client.mu.Unlock() 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\n", message.Id, message.Status, message.Name, message.Timestamp) - if err := c.conn.WriteMessage(websocket.TextMessage, []byte(msgContent)); err != nil { - log.Println("Failed to broadcast update:", err) - } + sendToClient(client, []byte(msgContent)) } } From f7ddf11f94c60eee64979519aabca301f2c13535 Mon Sep 17 00:00:00 2001 From: whysman Date: Sat, 22 Feb 2025 19:10:09 -0500 Subject: [PATCH 2/4] Removed extra locks, goroutine for sendToClient --- main.go | 84 +++++++++++++++++++-------------------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) diff --git a/main.go b/main.go index d72eb10..082dc6e 100644 --- a/main.go +++ b/main.go @@ -155,13 +155,19 @@ func (s *Server) handleConnections(w http.ResponseWriter, r *http.Request) { } } +func broadcastSingleRecord(s *Server, message Message) { + for client := range s.clients { + sendMessageToClient(client, message) + } +} + func sendMessageToClient(client *Client, message Message) { var msgJSON, err = json.Marshal(message) if err != nil { log.Println("Error marshalling json:", err) return } - sendToClient(client, msgJSON) + go sendToClient(client, msgJSON) } func sendToClient(client *Client, msgJSON []byte) { @@ -172,36 +178,6 @@ func sendToClient(client *Client, msgJSON []byte) { } } -func broadcastAllRecords(s *Server) { - allRecords, err := fetchAllRecords() - if err != nil { - log.Println("Error fetching all records:", err) - } - if len(allRecords) > 0 { - for _, msgContent := range allRecords { - fmt.Printf("Broadcasting %s to %d clients\n", msgContent, len(s.clients)) - for client := range s.clients { - sendToClient(client, []byte(msgContent)) - } - } - } -} - -func broadcastRemovedRecords(s *Server, message Message) { - fmt.Printf("Broadcasting removal: %s,%s,%s,%s to %d clients\n", message.Id, message.Status, message.Name, message.Timestamp, len(s.clients)) - for client := range s.clients { - sendMessageToClient(client, message) - } -} - -func broadcastExpiredRecords(s *Server, removed string) { - var message = Message{Id: removed, Name: "", Image: "", Status: "removed", Timestamp: ""} - fmt.Printf("Broadcasting expiration: %s to %d clients\n", message, len(s.clients)) - for client := range s.clients { - sendMessageToClient(client, message) - } -} - func sendAllRecordsToClient(client *Client) { allRecords, err := fetchAllRecords() if err != nil { @@ -209,15 +185,13 @@ func sendAllRecordsToClient(client *Client) { } fmt.Printf("Broadcasting %d records to client\n", len(allRecords)) var message Message - client.mu.Lock() - defer client.mu.Unlock() 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\n", message.Id, message.Status, message.Name, message.Timestamp) - sendToClient(client, []byte(msgContent)) + go sendToClient(client, []byte(msgContent)) } } @@ -226,7 +200,7 @@ func (s *Server) listenForExpirationEvents() { defer func(ps *redis.PubSub) { err := ps.Close() if err != nil { - + log.Println("Error closing redis pubsub:", err) } }(ps) @@ -235,8 +209,9 @@ func (s *Server) listenForExpirationEvents() { expiredID := msg.Payload fmt.Println(expiredID) // Broadcast expiration event - broadcastExpiredRecords(s, expiredID) - fmt.Printf("Done Broadcasting Expiration\n") + var message = Message{Id: expiredID, Name: "", Image: "", Status: "removed", Timestamp: ""} + fmt.Printf("Broadcasting expiration: %s to %d clients\n", message, len(s.clients)) + broadcastSingleRecord(s, message) } } @@ -256,7 +231,6 @@ func fetchAllRecords() (map[string]string, error) { } records[key] = value } - return records, nil } @@ -333,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) - w.WriteHeader(http.StatusOK) - return + fmt.Printf("Broadcasting removal: %s,%s,%s,%s to %d clients\n", message.Id, message.Status, message.Name, message.Timestamp, len(s.clients)) + } else { + 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 to %d clients\n", message.Id, message.Status, message.Name, message.Timestamp, len(s.clients)) } - 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 - } - - broadcastAllRecords(s) + broadcastSingleRecord(s, message) w.WriteHeader(http.StatusOK) } From 0eee8e006ddb0c2d3f50b15c2d080dedeb7e7da1 Mon Sep 17 00:00:00 2001 From: whysman Date: Mon, 24 Feb 2025 19:21:49 -0500 Subject: [PATCH 3/4] Enable the getState function --- main.go | 107 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 53 insertions(+), 54 deletions(-) diff --git a/main.go b/main.go index 082dc6e..8bffbd6 100644 --- a/main.go +++ b/main.go @@ -234,60 +234,59 @@ func fetchAllRecords() (map[string]string, error) { return records, nil } -/* - func getState(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - http.Error(w, "Only POST method is allowed", http.StatusMethodNotAllowed) - 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) - } +func getState(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + http.Error(w, "Only POST method is allowed", http.StatusMethodNotAllowed) + 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 + } + 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) @@ -385,7 +384,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") From 6a262387129ec578dc7c7d5cf1f1e9ae3ba129bc Mon Sep 17 00:00:00 2001 From: whysman Date: Wed, 26 Feb 2025 11:56:42 -0500 Subject: [PATCH 4/4] Added theme to message structure. --- main.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 8bffbd6..62dcbc1 100644 --- a/main.go +++ b/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"` } @@ -190,7 +191,7 @@ func sendAllRecordsToClient(client *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) go sendToClient(client, []byte(msgContent)) } } @@ -209,7 +210,7 @@ func (s *Server) listenForExpirationEvents() { expiredID := msg.Payload fmt.Println(expiredID) // Broadcast expiration event - var message = Message{Id: expiredID, Name: "", Image: "", Status: "removed", Timestamp: ""} + var message = Message{Id: expiredID, Name: "", Image: "", Status: "removed", Theme: "", Timestamp: ""} fmt.Printf("Broadcasting expiration: %s to %d clients\n", message, len(s.clients)) broadcastSingleRecord(s, message) } @@ -320,7 +321,7 @@ func setState(w http.ResponseWriter, r *http.Request, s *Server) { http.Error(w, "Failed to store data", http.StatusInternalServerError) return } - fmt.Printf("Broadcasting message: %s,%s,%s,%s to %d clients\n", message.Id, message.Status, message.Name, message.Timestamp, len(s.clients)) + 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)) } broadcastSingleRecord(s, message)