Load the ICE servers from the new faf-icebreaker API

FAForever · Oct 28, 2023 · 4001a49 · 4001a49
1 parent 3cea443
commit 4001a49
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/src/main/java/com/faforever/client/api/FafApiAccessor.java b/src/main/java/com/faforever/client/api/FafApiAccessor.java
@@ -157,6 +157,11 @@ public Mono<MeResult> getMe() {
         .doOnNext(object -> log.trace("Retrieved {} from /me with type MeResult", object));
   }
 
+  public Mono<IceSession> getIceSession(int gameId) {
+    return retrieveMonoWithErrorHandling(IceSession.class, apiWebClient.get().uri("/ice/session/game/" + gameId))
+        .doOnNext(object -> log.trace("Retrieved {} from /ice/session/game/{} with type MeResult", object, gameId));
+  }
+
   public Mono<Void> uploadFile(String endpoint, Path file, ByteCountListener listener,
                                java.util.Map<String, java.util.Map<String, ?>> params) {
     MultiValueMap<String, Object> multipartContent = createFileMultipart(file, listener);

diff --git a/src/main/java/com/faforever/client/api/IceSession.java b/src/main/java/com/faforever/client/api/IceSession.java
@@ -0,0 +1,11 @@
+package com.faforever.client.api;
+
+import com.faforever.commons.api.dto.CoturnServer;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record IceSession(@NotNull String id, @NotNull List<CoturnServer> servers) {
+}
diff --git a/src/main/java/com/faforever/client/fa/relay/ice/CoturnService.java b/src/main/java/com/faforever/client/fa/relay/ice/CoturnService.java
@@ -1,6 +1,7 @@
 package com.faforever.client.fa.relay.ice;
 
 import com.faforever.client.api.FafApiAccessor;
+import com.faforever.client.api.IceSession;
 import com.faforever.client.mapstruct.IceServerMapper;
 import com.faforever.client.preferences.ForgedAlliancePrefs;
 import com.faforever.commons.api.dto.CoturnServer;
@@ -31,9 +32,9 @@ public CompletableFuture<List<CoturnServer>> getActiveCoturns() {
         .toFuture();
   }
 
-  public CompletableFuture<List<CoturnServer>> getSelectedCoturns() {
-    ElideNavigatorOnCollection<CoturnServer> navigator = ElideNavigator.of(CoturnServer.class).collection();
-    Flux<CoturnServer> coturnServerFlux = fafApiAccessor.getMany(navigator);
+  public CompletableFuture<List<CoturnServer>> getSelectedCoturns(int gameId) {
+    Flux<CoturnServer> coturnServerFlux = fafApiAccessor.getIceSession(gameId)
+        .flatMapIterable(IceSession::servers);
 
     Set<String> preferredCoturnIds = forgedAlliancePrefs.getPreferredCoturnIds();
 

diff --git a/src/main/java/com/faforever/client/game/GameService.java b/src/main/java/com/faforever/client/game/GameService.java
@@ -665,7 +665,7 @@ private CompletableFuture<Void> startGame(GameParameters gameParameters) {
           localReplayPort = port;
           return iceAdapter.start(gameParameters.getUid());
         })
-        .thenCompose(adapterPort -> coturnService.getSelectedCoturns()
+        .thenCompose(adapterPort -> coturnService.getSelectedCoturns(uid)
             .thenAccept(iceAdapter::setIceServers)
             .thenApply(aVoid -> adapterPort))
         .thenApply(adapterPort -> {

diff --git a/src/main/java/com/faforever/client/mapstruct/IceServerMapper.java b/src/main/java/com/faforever/client/mapstruct/IceServerMapper.java
@@ -14,7 +14,6 @@ public Map<String, Object> map(CoturnServer coturnServer) {
     return Map.of(
         "urls", coturnServer.getUrls().stream().map(URI::toString).toList(),
         "credential", coturnServer.getCredential(),
-        "credentialType", coturnServer.getCredentialType(),
         "username", coturnServer.getUsername()
     );
   }

diff --git a/src/test/java/com/faforever/client/fa/relay/ice/CoturnServiceTest.java b/src/test/java/com/faforever/client/fa/relay/ice/CoturnServiceTest.java
@@ -55,7 +55,7 @@ public void TestGetSelectedCoturnsNoActiveSelected() {
     otherServer.setId("0");
     when(fafApiAccessor.getMany(any())).thenReturn(Flux.just(otherServer));
 
-    List<CoturnServer> servers = instance.getSelectedCoturns().join();
+    List<CoturnServer> servers = instance.getSelectedCoturns(123).join();
 
     assertEquals(1, servers.size());
     assertEquals("0", servers.get(0).getId());
@@ -68,7 +68,7 @@ public void testGetSelectedCoturnsNoneSelected() {
     otherServer.setId("0");
     when(fafApiAccessor.getMany(any())).thenReturn(Flux.just(otherServer));
 
-    List<CoturnServer> servers = instance.getSelectedCoturns().join();
+    List<CoturnServer> servers = instance.getSelectedCoturns(123).join();
 
     assertEquals(1, servers.size());
     assertEquals("0", servers.get(0).getId());
@@ -85,7 +85,7 @@ public void testGetSelectedCoturnsActiveSelected() {
     otherServer.setId("1");
     when(fafApiAccessor.getMany(any())).thenReturn(Flux.just(otherServer, selectedServer));
 
-    List<CoturnServer> servers = instance.getSelectedCoturns().join();
+    List<CoturnServer> servers = instance.getSelectedCoturns(123).join();
 
     assertEquals(1, servers.size());
     assertEquals("1", servers.get(0).getId());