update

Author: guFalcon

pom.xml

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

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

@@ -0,0 +1,26 @@
+package info.unterrainer.websocketclient;
+
+import info.unterrainer.commons.serialization.jsonmapper.JsonMapper;
+import jakarta.websocket.Session;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Accessors;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@RequiredArgsConstructor
+@SuperBuilder(toBuilder = true)
+@Accessors(fluent = true)
+public class EventContext {
+
+	private final Session session;
+	private final JsonMapper jsonMapper;
+
+	private String message;
+	private Byte[] binaryMessage;
+	private Throwable error;
+
+	public <T> T message(Class<T> type) {
+		return jsonMapper.fromStringTo(type, message);
+	}
+}

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

@@ -39,10 +39,11 @@ public class WebsocketConnection implements AutoCloseable {
 
 	@Getter
 	private final String host;
-	private final Consumer<Session> onOpenHandler;
-	private final Consumer<String> onMessageHandler;
-	private final Consumer<Session> onCloseHandler;
-	private final Consumer<Throwable> onErrorHandler;
+	private final Consumer<EventContext> onOpenHandler;
+	private final Consumer<EventContext> onMessageHandler;
+	private final Consumer<EventContext> onBinaryMessageHandler;
+	private final Consumer<EventContext> onCloseHandler;
+	private final Consumer<EventContext> onErrorHandler;
 	private final String keycloakHost;
 	private final String keycloakClient;
 	private final String keycloakClientSecret;

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

@@ -21,11 +21,10 @@ public WebsocketEndpoints(WebsocketConnection client) {
 	public void onOpen(Session session, EndpointConfig config) {
 		client.sessionReady().complete(session);
 		log.info("Connected to server");
-
-		// onOpen-Handler
 		if (client.onOpenHandler() != null) {
 			try {
-				client.onOpenHandler().accept(session);
+				client.onOpenHandler()
+						.accept(EventContext.builder().session(session).jsonMapper(client.jsonMapper()).build());
 			} catch (Exception e) {
 				log.error("Error executing onOpen handler: ", e);
 			}
@@ -37,7 +36,29 @@ public void onOpen(Session session, EndpointConfig config) {
 			client.awaitOpen(Duration.ofMillis(5000L));
 			if (client.onMessageHandler() != null) {
 				try {
-					client.onMessageHandler().accept(message);
+					client.onMessageHandler()
+							.accept(EventContext.builder()
+									.session(session)
+									.jsonMapper(client.jsonMapper())
+									.message(message)
+									.build());
+				} catch (Exception e) {
+					log.error("Error executing onMessage handler: ", e);
+				}
+			}
+		});
+
+		session.addMessageHandler(Byte[].class, message -> {
+			log.debug("Received binary-message: " + message);
+			client.awaitOpen(Duration.ofMillis(5000L));
+			if (client.onBinaryMessageHandler() != null) {
+				try {
+					client.onBinaryMessageHandler()
+							.accept(EventContext.builder()
+									.session(session)
+									.jsonMapper(client.jsonMapper())
+									.binaryMessage(message)
+									.build());
 				} catch (Exception e) {
 					log.error("Error executing onMessage handler: ", e);
 				}
@@ -51,7 +72,8 @@ public void onClose(Session session, CloseReason closeReason) {
 		log.info("Disconnected from server: {}", closeReason);
 		if (client.onCloseHandler() != null) {
 			try {
-				client.onCloseHandler().accept(s);
+				client.onCloseHandler()
+						.accept(EventContext.builder().session(session).jsonMapper(client.jsonMapper()).build());
 			} catch (Exception e) {
 				log.error("Error executing onClose handler: ", e);
 			}
@@ -70,7 +92,12 @@ public void onError(Session session, Throwable throwable) {
 		log.error("Error occurred: ", throwable);
 		if (client.onErrorHandler() != null) {
 			try {
-				client.onErrorHandler().accept(throwable);
+				client.onErrorHandler()
+						.accept(EventContext.builder()
+								.session(session)
+								.jsonMapper(client.jsonMapper())
+								.error(throwable)
+								.build());
 			} catch (Exception e) {
 				log.error("Error executing onError handler: ", e);
 			}