fix blocking issue

Author: guFalcon

pom.xml

@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>websocket-client</artifactId>
-	<version>1.0.6</version>
+	<version>1.0.7</version>
 	<name>WebsocketClient</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/websocketclient/WebsocketConnection.java

@@ -2,9 +2,11 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 import org.glassfish.tyrus.client.ClientManager;
@@ -46,16 +48,20 @@ public class WebsocketConnection implements AutoCloseable {
 
 	final CompletableFuture<Session> sessionReady = new CompletableFuture<>();
 
-	public Session awaitOpen() {
+	public Session awaitOpen(Duration timeoutInMillis) {
 		try {
-			return sessionReady.get();
+			if (timeoutInMillis == null) {
+				// Blocks indefinitely until the session is ready.
+				return sessionReady.get();
+			}
+			return sessionReady.get(timeoutInMillis.toMillis(), TimeUnit.MILLISECONDS);
 		} catch (Exception e) {
 			throw new IllegalStateException("WebSocket did not open in time.", e);
 		}
 	}
 
 	public void send(String message) {
-		Session s = awaitOpen();
+		Session s = awaitOpen(Duration.ofMillis(5000L));
 		try {
 			s.getBasicRemote().sendText(message);
 		} catch (Exception e) {
@@ -67,7 +73,7 @@ public void send(String message) {
 
 	@Override
 	public void close() {
-		Session s = awaitOpen();
+		Session s = awaitOpen(Duration.ofMillis(5000L));
 		try {
 			s.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, "Normal closure"));
 		} catch (IOException e) {

src/main/java/info/unterrainer/websocketclient/WebsocketEndpoints.java

@@ -1,5 +1,7 @@
 package info.unterrainer.websocketclient;
 
+import java.time.Duration;
+
 import jakarta.websocket.CloseReason;
 import jakarta.websocket.Endpoint;
 import jakarta.websocket.EndpointConfig;
@@ -32,7 +34,7 @@ public void onOpen(Session session, EndpointConfig config) {
 		// onMessage-Handler
 		session.addMessageHandler(String.class, message -> {
 			log.debug("Received message: " + message);
-			client.awaitOpen();
+			client.awaitOpen(Duration.ofMillis(5000L));
 			if (client.onMessageHandler != null) {
 				try {
 					client.onMessageHandler.accept(message);
@@ -45,7 +47,7 @@ public void onOpen(Session session, EndpointConfig config) {
 
 	@Override
 	public void onClose(Session session, CloseReason closeReason) {
-		Session s = client.awaitOpen();
+		Session s = client.awaitOpen(Duration.ofMillis(5000L));
 		log.info("Disconnected from server: {}", closeReason);
 		if (client.onCloseHandler != null) {
 			try {
@@ -64,7 +66,7 @@ public void onClose(Session session, CloseReason closeReason) {
 
 	@Override
 	public void onError(Session session, Throwable throwable) {
-		client.awaitOpen();
+		client.awaitOpen(Duration.ofMillis(5000L));
 		log.error("Error occurred: ", throwable);
 		if (client.onErrorHandler != null) {
 			try {