Merge pull request #7 from mpuckett159/bugs/update-on-disconnect

Fix issue where clients disconnecting doesn't visibly update stack for users

Author: mpuckett159

frontend/db/db.go

@@ -144,7 +144,7 @@ func GetOnStack(tableId string, speakerId string, name string) (err error) {
 		log.WithFields(log.Fields{
 			"sqlQuery": addUserToStackTableSQL,
 			"error": err.Error(),
-		}).Error("Error preparing statement to delete meeting table")
+		}).Error("Error preparing statement to get on stack.")
 		return err
 	}
 	defer statement.Close()
@@ -155,7 +155,7 @@ func GetOnStack(tableId string, speakerId string, name string) (err error) {
 		log.WithFields(log.Fields{
 			"sqlQuery": addUserToStackTableSQL,
 			"error": err.Error(),
-		}).Error("Error executing statement to delete meeting table")
+		}).Error("Error executing statement to get on stack.")
 		return err
 	}
 
@@ -186,7 +186,7 @@ func GetOffStack(tableId string, speakerId string) (err error) {
 		log.WithFields(log.Fields{
 			"sqlQuery": removeUserFromStackTableSQL,
 			"error": err.Error(),
-		}).Error("Error preparing statement to delete meeting table")
+		}).Error("Error preparing statement to get off stack")
 		return err
 	}
 	defer statement.Close()
@@ -197,7 +197,7 @@ func GetOffStack(tableId string, speakerId string) (err error) {
 		log.WithFields(log.Fields{
 			"sqlQuery": removeUserFromStackTableSQL,
 			"error": err.Error(),
-		}).Error("Error executing statement to delete meeting table")
+		}).Error("Error executing statement to get off stack")
 	}
 
 	// Return nothing because there are no failures

frontend/wshandler/client.go

@@ -6,10 +6,11 @@ package wshandler
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"net/http"
+	"os"
 	"time"
-	"encoding/json"
 
 	"stack-web-app/frontend/db"
 
@@ -155,8 +156,28 @@ func (c *Client) writePump() {
 			c.conn.SetWriteDeadline(time.Now().Add(writeWait))
 			if !ok {
 				// The hub closed the channel.
-				ContextLogger.Debug("Hub has closed this channel.")
+				ContextLogger.Debug("Hub has closed this channel, sending update to users.")
 				c.conn.WriteMessage(websocket.CloseMessage, []byte{})
+
+				// Sending update to all still connected clients// Get current stack back and push to the broadcast message queue
+				db.GetOffStack(c.hub.hubId, c.clientId)
+				stackUsers, err := db.ShowCurrentStack(c.hub.hubId)
+				if err != nil {
+					ContextLogger.WithFields(log.Fields{
+						"dbError": err.Error(),
+					}).Error("Error getting current meeting stack contents.")
+				}
+				messageUsers, err := json.Marshal(stackUsers)
+				if err != nil {
+					ContextLogger.WithFields(log.Fields{
+						"dbError": err.Error(),
+					}).Error("Error marshalling JSON for response to client.")
+				}
+				message := bytes.TrimSpace(bytes.Replace(messageUsers, newline, space, -1))
+				ContextLogger.WithFields(log.Fields{
+					"message": fmt.Sprintf("%+v", string(message)),
+				}).Debug("Sending message from client to hub broadcast.")
+				c.hub.broadcast <- message
 				return
 			}
 
@@ -180,7 +201,8 @@ func (c *Client) writePump() {
 		case <-ticker.C:
 			c.conn.SetWriteDeadline(time.Now().Add(writeWait))
 			if err := c.conn.WriteMessage(websocket.PingMessage, nil); err != nil {
-				ContextLogger.Warning("Error pinging the websocket I think.")
+				ContextLogger.Warning("Error pinging the websocket, assuming client is dead and unregistering.")
+				c.hub.unregister <- c
 				return
 			}
 		}
@@ -211,7 +233,7 @@ func GetWS(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// This is to enable local testing for myself. Probably stupid
-	_, disableCORS := os.LookupEnv("DISABLECORS")
+	_, disableCORS := os.LookupEnv("DISABLEWEBSOCKETORIGINCHECK")
 	if disableCORS {
 		upgrader.CheckOrigin = func(r *http.Request) bool { return true }
 	}

frontend/wshandler/hub.go

@@ -92,9 +92,10 @@ func (h *Hub) run() {
 			}).Debug("Client successfully registered to hub.")
 		case client := <-h.unregister:
 			if _, ok := h.clients[client]; ok {
-				db.GetOffStack(h.hubId, client.clientId)
-				delete(h.clients, client)
+				// Closing the client connection
 				close(client.send)
+				_ = client.conn.Close()
+				delete(h.clients, client)
 				ContextLogger.WithFields(log.Fields{
 					"client": fmt.Sprintf("%+v", client),
 					"hub": fmt.Sprintf("%+v", h),

public/app.js

@@ -11,11 +11,15 @@ new Vue({
     },
 
     created: function() {
-        var self = this;
         let urlParams = new URLSearchParams(window.location.search);
         if (urlParams.has('meeting_id')) {
             this.tableId = urlParams.get('meeting_id');
         };
+        if (window.location.protocol == "http:"){
+            this.wsProtocol = "ws:"
+        } else {
+            this.wsProtocol = "wss:"
+        };
     },
 
     methods: {
@@ -63,7 +67,7 @@ new Vue({
 
             // Join an on-going meeting by ID and update session values
             this.meetingUrl = window.location.host + '/?meeting_id=' + this.tableId;
-            this.ws = new WebSocket('wss://' + window.location.host + '/ws?meeting_id=' + this.tableId);
+            this.ws = new WebSocket(this.wsProtocol + '//' + window.location.host + '/ws?meeting_id=' + this.tableId);
             this.joined = true;
 
             // Set up event listeners to handle incoming/outgoing messages and open/close actions
@@ -85,13 +89,13 @@ new Vue({
                 method: "POST",
                 headers: { "Accept": "application/json" }
             };
-            await fetch("https://" + window.location.host + "/ws", requestOptions)
+            await fetch(window.location.protocol + "//" + window.location.host + "/ws", requestOptions)
               .then(response => response.json())
               .then(data => self.tableId = data.meetingId);
 
             // Set up new WebSocket to be used with the required meeting ID and update session values
             this.meetingUrl = window.location.host + '/?meeting_id=' + this.tableId;
-            this.ws = new WebSocket('wss://' + window.location.host + '/ws?meeting_id=' + this.tableId);
+            this.ws = new WebSocket(this.wsProtocol + '//' + window.location.host + '/ws?meeting_id=' + this.tableId);
             this.joined = true;
 
             // Set up event listeners to handle incoming/outgoing messages and open/close actions