Merge pull request #108 from lavrov/websocket-send-connected

WebSocket: only send when connected
tulz-app · Jan 10, 2022 · 7f3baa7 · 7f3baa7
2 parents 46c4bb5 + dec2343
commit 7f3baa7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/modules/websocket/src/main/scala/io/laminext/websocket/WebSocket.scala b/modules/websocket/src/main/scala/io/laminext/websocket/WebSocket.scala
@@ -121,14 +121,15 @@ class WebSocket[Receive, Send](
   }
 
   private def trySend(): Unit = {
-    if (js.isUndefined(maybeWS)) {
+    val connectedWS = maybeWS.filter(_.readyState == 1 /* OPEN */ )
+    if (js.isUndefined(connectedWS)) {
       if (!bufferWhenDisconnected) {
         sendBuffer.clear()
       } else if (sendBuffer.size > bufferSize) {
         sendBuffer.drop(sendBuffer.size - bufferSize)
       }
     }
-    maybeWS.foreach { ws =>
+    connectedWS.foreach { ws =>
       sendBuffer.foreach { message =>
         sender(ws, message)
       }