✨ Include RustRconRequest inside RustRconResponse

For traceability
MrGraversen · Oct 22, 2023 · 0e12501 · 0e12501
1 parent ae5343f
commit 0e12501
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 15 deletions.
diff --git a/src/main/java/io/graversen/rust/rcon/DefaultRustRconClient.java b/src/main/java/io/graversen/rust/rcon/DefaultRustRconClient.java
@@ -36,7 +36,8 @@ public class DefaultRustRconClient implements RustRconClient {
     private final @NonNull RustWebSocketClient webSocketClient;
     private final @NonNull EventBus eventBus;
 
-    private Cache<Integer, CompletableFuture<RustRconResponse>> asyncRequests;
+    private Cache<Integer, CompletableFuture<RustRconResponse>> asyncResponses;
+    private Cache<Integer, RustRconRequest> asyncRequests;
     private JsonMapper jsonMapper;
 
     @Override
@@ -46,7 +47,8 @@ public CompletableFuture<RustRconResponse> send(@NonNull RustRconRequest request
             final var json = jsonMapper().toJson(mappedRequest);
 
             final var responseFuture = new CompletableFuture<RustRconResponse>();
-            getAsyncRequests().put(request.getIdentifier(), responseFuture);
+            getAsyncRequests().put(request.getIdentifier(), request);
+            getAsyncResponses().put(request.getIdentifier(), responseFuture);
             webSocketClient.send(json);
 
             return responseFuture;
@@ -67,12 +69,13 @@ public Function<RustRconRequest, RustRconRequestDTO> mapRequest() {
     }
 
     @Override
-    public Function<RustRconResponseDTO, RustRconResponse> mapResponse() {
+    public Function<RustRconResponseDTO, RustRconResponse> mapResponse(@NonNull RustRconRequest request) {
         return rustRconResponseDTO -> new RustRconResponse(
                 Objects.requireNonNullElse(rustRconResponseDTO.getIdentifier(), -1),
                 rustRconResponseDTO.getMessage(),
                 rustRconResponseDTO.getType(),
-                rustServer.get()
+                rustServer.get(),
+                request
         );
     }
 
@@ -130,23 +133,38 @@ public void onWsOpenedEvent(@NonNull WsOpenedEvent wsOpenedEvent) {
     @Subscribe
     public void onWsMessage(@NonNull WsMessageEvent messageEvent) {
         final var rconMessage = jsonMapper().fromJson(messageEvent.getMessage(), RustRconResponseDTO.class);
-        final var mappedRconMessage = mapResponse().apply(rconMessage);
+        final var rconRequest = getAsyncRequests().getIfPresent(rconMessage.getIdentifier());
 
-        if (rconMessage.getIdentifier() >= initialMessageIdentifier()) {
-            final var responseFutureOrNull = asyncRequests.getIfPresent(rconMessage.getIdentifier());
+        if (rconRequest != null) {
+            final var mappedRconMessage = mapResponse(rconRequest).apply(rconMessage);
 
-            if (responseFutureOrNull != null) {
-                responseFutureOrNull.complete(mappedRconMessage);
-            } else {
-                log.warn("Could not resolve response future for ID: {} (Discarding it)", rconMessage.getIdentifier());
+            if (rconMessage.getIdentifier() >= initialMessageIdentifier()) {
+                final var responseFutureOrNull = getAsyncResponses().getIfPresent(rconMessage.getIdentifier());
+
+                if (responseFutureOrNull != null) {
+                    responseFutureOrNull.complete(mappedRconMessage);
+                } else {
+                    log.warn("Could not resolve response future for ID: {} (Discarding it)", rconMessage.getIdentifier());
+                }
             }
+
+            eventBus.post(new RconReceivedEvent(name(), mappedRconMessage));
+        } else {
+            log.warn("Could not resolve request for ID: {} (Discarding it)", rconMessage.getIdentifier());
+        }
+    }
+
+    @Synchronized
+    private Cache<Integer, CompletableFuture<RustRconResponse>> getAsyncResponses() {
+        if (asyncResponses == null) {
+            asyncResponses = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build();
         }
 
-        eventBus.post(new RconReceivedEvent(name(), mappedRconMessage));
+        return asyncResponses;
     }
 
     @Synchronized
-    private Cache<Integer, CompletableFuture<RustRconResponse>> getAsyncRequests() {
+    private Cache<Integer, RustRconRequest> getAsyncRequests() {
         if (asyncRequests == null) {
             asyncRequests = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build();
         }

diff --git a/src/main/java/io/graversen/rust/rcon/RustRconClient.java b/src/main/java/io/graversen/rust/rcon/RustRconClient.java
@@ -13,7 +13,7 @@ public interface RustRconClient extends EventEmitter, Closeable {
 
     Function<RustRconRequest, RustRconRequestDTO> mapRequest();
 
-    Function<RustRconResponseDTO, RustRconResponse> mapResponse();
+    Function<RustRconResponseDTO, RustRconResponse> mapResponse(@NonNull RustRconRequest request);
 
     JsonMapper jsonMapper();
 

diff --git a/src/main/java/io/graversen/rust/rcon/RustRconResponse.java b/src/main/java/io/graversen/rust/rcon/RustRconResponse.java
@@ -13,4 +13,5 @@ public class RustRconResponse {
     private final @NonNull String message;
     private final @NonNull String type;
     private final @NonNull RustServer server;
+    private final @NonNull RustRconRequest request;
 }
diff --git a/src/test/java/io/graversen/rust/rcon/TestRustRconResponse.java b/src/test/java/io/graversen/rust/rcon/TestRustRconResponse.java
@@ -4,7 +4,7 @@
 
 public class TestRustRconResponse extends RustRconResponse {
     public TestRustRconResponse(@NonNull String message) {
-        super(0, message, "type", testServer());
+        super(0, message, "type", testServer(), new RustRconRequest(0, message));
     }
 
     private static RustServer testServer() {

diff --git a/src/test/java/io/graversen/rust/rcon/protocol/player/DefaultPlayerManagementTest.java b/src/test/java/io/graversen/rust/rcon/protocol/player/DefaultPlayerManagementTest.java
@@ -3,6 +3,7 @@
 import io.graversen.rust.rcon.RustPlayer;
 import io.graversen.rust.rcon.TestRustRconResponse;
 import io.graversen.rust.rcon.protocol.AdminCodec;
+import io.graversen.rust.rcon.protocol.dto.RustDtoMappers;
 import io.graversen.rust.rcon.protocol.util.PlayerName;
 import io.graversen.rust.rcon.protocol.util.SteamId64;
 import org.junit.jupiter.api.Test;
@@ -18,6 +19,9 @@ class DefaultPlayerManagementTest {
     @Mock
     private AdminCodec adminCodec;
 
+    @Mock
+    private RustDtoMappers rustDtoMappers;
+
     @InjectMocks
     private DefaultPlayerManagement defaultPlayerManagement;