check websocket readyState without var.now()

tulz-app · Jan 10, 2022 · dec2343 · dec2343
1 parent 8109af3
commit dec2343
Showing 1 changed file with 8 additions and 8 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,20 +121,20 @@ class WebSocket[Receive, Send](
   }
 
   private def trySend(): Unit = {
-    if (connectedVar.now()) {
-      maybeWS.foreach { ws =>
-        sendBuffer.foreach { message =>
-          sender(ws, message)
-        }
-        sendBuffer.clear()
-      }
-    } else {
+    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)
       }
     }
+    connectedWS.foreach { ws =>
+      sendBuffer.foreach { message =>
+        sender(ws, message)
+      }
+      sendBuffer.clear()
+    }
   }
 
   def connect[El <: ReactiveElement.Base]: Binder[El] =