Fix issue with closed websocket sessions not being registered (#21)

* Fix issue with closed websocket sessions not being registered * Update version
team5499 · Feb 6, 2019 · 8939f28 · 8939f28
1 parent bc4bba2
commit 8939f28
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 }
 
 group = 'org.team5499'
-version = '0.1.3' /* Change this when deploying a new version */
+version = '0.1.4' /* Change this when deploying a new version */
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava

diff --git a/src/main/kotlin/org/team5499/dashboard/SocketHandler.kt b/src/main/kotlin/org/team5499/dashboard/SocketHandler.kt
@@ -5,6 +5,8 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError
+import org.eclipse.jetty.websocket.api.WebSocketException
 import java.util.Queue
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.lang.Thread
@@ -46,7 +48,12 @@ class SocketHandler {
         public fun broadcastJSONMinusSession(json: JSONObject, session: Session) {
             for (s in sessions) {
                 if (!s.equals(session)) {
-                    sendJSON(s, json, "updates")
+                    try {
+                        sendJSON(s, json, "updates")
+                    } catch (e: WebSocketException) {
+                        session.close()
+                        continue
+                    }
                 }
             }
         }
@@ -59,8 +66,10 @@ class SocketHandler {
     }
 
     @OnWebSocketClose
-    fun onClose(session: Session, statusCode: Int, reason: String) {
-        sessions.remove(session)
+    fun onClose(session: Session?, statusCode: Int, reason: String?) {
+        if (session != null) {
+            sessions.remove(session)
+        }
     }
 
     @OnWebSocketMessage
@@ -70,6 +79,10 @@ class SocketHandler {
         Dashboard.mergeVariableUpdates(updates)
     }
 
+    @OnWebSocketError
+    fun onError(t: Throwable) {
+    }
+
     @Suppress("EmptyDefaultConstructor")
     class Broadcaster() : Runnable {
         override fun run() {