Load the ICE servers from the new faf-icebreaker API (#3043)

Brutus5000 · web-flow · commit 08f3d96634a9 · 2023-11-04T14:27:56.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -310,7 +310,9 @@ dependencies {
   implementation("com.neovisionaries:nv-i18n:1.29")
   implementation("com.nativelibs4java:bridj:0.7.0")
   implementation("org.luaj:luaj-jse:3.0.1")
-  implementation("commons-validator:commons-validator:1.7")
+  implementation("commons-validator:commons-validator:1.7") {
+    exclude module: 'commons-logging'
+  }
   implementation("com.github.micheljung:JJsonRpc:01a7fba5f4")
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
   implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
@@ -336,8 +338,10 @@ dependencies {
   implementation("org.openjfx:javafx-media:${javafxVersion}:${javafxPlatform}")
   implementation("com.github.1-alex98:discord-rpc:1.6.2-jna")
   implementation("org.controlsfx:controlsfx:11.1.2")
+  implementation("de.codecentric.centerdevice:javafxsvg:1.3.0") {
+    exclude module: 'commons-logging'
+  }
   implementation("org.fxmisc.flowless:flowless:0.7.2")
-  implementation("de.codecentric.centerdevice:javafxsvg:1.3.0")
 
   implementation("org.javassist:javassist:3.29.2-GA")
 
diff --git a/src/main/java/com/faforever/client/api/FafApiAccessor.java b/src/main/java/com/faforever/client/api/FafApiAccessor.java
@@ -52,6 +52,7 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClient.RequestHeadersSpec;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 import reactor.core.publisher.Flux;
@@ -153,8 +154,18 @@ public int getMaxPageSize() {
   }
 
   public Mono<MeResult> getMe() {
-    return retrieveMonoWithErrorHandling(MeResult.class, apiWebClient.get().uri("/me"))
-        .doOnNext(object -> log.trace("Retrieved {} from /me with type MeResult", object));
+    return retrieveMonoWithErrorHandling(MeResult.class, apiWebClient.get()
+        .uri("/me")).doOnNext(object -> log.trace("Retrieved {} from /me with type MeResult", object));
+  }
+
+  public <T> Mono<T> getApiObject(String path, Class<T> clazz) {
+    RequestHeadersSpec<?> requestSpec = apiWebClient.get().uri(path);
+    return retrieveMonoWithErrorHandling(clazz, requestSpec).doOnNext(object -> log.trace("Retrieved {} from {} with type {}", object, path, clazz));
+  }
+
+  public <T> Flux<T> getApiObjects(String path, Class<T> clazz) {
+    RequestHeadersSpec<?> requestSpec = apiWebClient.get().uri(path);
+    return retrieveFluxWithErrorHandling(clazz, requestSpec).doOnNext(object -> log.trace("Retrieved {} from {} with type {}", object, path, clazz));
   }
 
   public Mono<Void> uploadFile(String endpoint, Path file, ByteCountListener listener,
diff --git a/src/main/java/com/faforever/client/api/IceServer.java b/src/main/java/com/faforever/client/api/IceServer.java
@@ -0,0 +1,4 @@
+package com.faforever.client.api;
+
+public record IceServer(String id, String region) {
+}
diff --git a/src/main/java/com/faforever/client/api/IceServerResponse.java b/src/main/java/com/faforever/client/api/IceServerResponse.java
@@ -0,0 +1,6 @@
+package com.faforever.client.api;
+
+import java.util.List;
+
+public record IceServerResponse(List<IceServer> servers) {
+}
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,9 @@
+package com.faforever.client.api;
+
+import com.faforever.commons.api.dto.CoturnServer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+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,11 +1,11 @@
 package com.faforever.client.fa.relay.ice;
 
 import com.faforever.client.api.FafApiAccessor;
-import com.faforever.client.mapstruct.IceServerMapper;
+import com.faforever.client.api.IceServer;
+import com.faforever.client.api.IceServerResponse;
+import com.faforever.client.api.IceSession;
 import com.faforever.client.preferences.ForgedAlliancePrefs;
 import com.faforever.commons.api.dto.CoturnServer;
-import com.faforever.commons.api.elide.ElideNavigator;
-import com.faforever.commons.api.elide.ElideNavigatorOnCollection;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -21,19 +21,19 @@
 public class CoturnService {
 
   private final FafApiAccessor fafApiAccessor;
-  private final IceServerMapper iceServerMapper;
   private final ForgedAlliancePrefs forgedAlliancePrefs;
 
-  public CompletableFuture<List<CoturnServer>> getActiveCoturns() {
-    ElideNavigatorOnCollection<CoturnServer> navigator = ElideNavigator.of(CoturnServer.class).collection();
-    return fafApiAccessor.getMany(navigator)
+  public CompletableFuture<List<IceServer>> getActiveCoturns() {
+    return fafApiAccessor.getApiObject("/ice/server", IceServerResponse.class)
+        .flatMapIterable(IceServerResponse::servers)
+        .switchIfEmpty(Flux.error(new IllegalStateException("No Coturn Servers Available")))
         .collectList()
         .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.getApiObject("/ice/session/game/" + gameId, IceSession.class)
+        .flatMapIterable(IceSession::servers);
 
     Set<String> preferredCoturnIds = forgedAlliancePrefs.getPreferredCoturnIds();
 
diff --git a/src/main/java/com/faforever/client/fa/relay/ice/IceAdapterImpl.java b/src/main/java/com/faforever/client/fa/relay/ice/IceAdapterImpl.java
@@ -223,11 +223,6 @@ List<String> buildCommand(Path workDirectory, int adapterPort, int gpgPort, int
 
     cmd.addAll(standardIceOptions);
 
-    if (forgedAlliancePrefs.isForceRelay()) {
-      cmd.add("--force-relay");
-      log.info("Forcing ice adapter relay connection");
-    }
-
     if (forgedAlliancePrefs.isShowIceAdapterDebugWindow()) {
       cmd.add("--debug-window");
       cmd.add("--info-window");
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/main/java/com/faforever/client/preferences/ForgedAlliancePrefs.java b/src/main/java/com/faforever/client/preferences/ForgedAlliancePrefs.java
@@ -24,7 +24,6 @@ public class ForgedAlliancePrefs {
   ObjectProperty<Path> preferencesFile = new SimpleObjectProperty<>();
   ObjectProperty<Path> vaultBaseDirectory = new SimpleObjectProperty<>();
   BooleanProperty warnNonAsciiVaultPath = new SimpleBooleanProperty(true);
-  BooleanProperty forceRelay = new SimpleBooleanProperty(false);
   BooleanProperty autoDownloadMaps = new SimpleBooleanProperty(true);
   BooleanProperty allowIpv6 = new SimpleBooleanProperty(false);
 
@@ -60,18 +59,6 @@ public ObjectProperty<Path> preferencesFileProperty() {
     return preferencesFile;
   }
 
-  public boolean isForceRelay() {
-    return forceRelay.get();
-  }
-
-  public void setForceRelay(boolean forceRelay) {
-    this.forceRelay.set(forceRelay);
-  }
-
-  public BooleanProperty forceRelayProperty() {
-    return forceRelay;
-  }
-
   public boolean isAutoDownloadMaps() {
     return autoDownloadMaps.get();
   }
diff --git a/src/main/java/com/faforever/client/preferences/ui/SettingsController.java b/src/main/java/com/faforever/client/preferences/ui/SettingsController.java
@@ -1,6 +1,7 @@
 package com.faforever.client.preferences.ui;
 
 import ch.qos.logback.classic.Level;
+import com.faforever.client.api.IceServer;
 import com.faforever.client.chat.ChatColorMode;
 import com.faforever.client.chat.ChatFormat;
 import com.faforever.client.config.ClientProperties;
@@ -16,7 +17,6 @@
 import com.faforever.client.game.VaultPathHandler;
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.main.event.NavigationItem;
-import com.faforever.client.mapstruct.IceServerMapper;
 import com.faforever.client.notification.Action;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.notification.PersistentNotification;
@@ -44,7 +44,6 @@
 import com.faforever.client.ui.preferences.event.GameDirectoryChooseEvent;
 import com.faforever.client.update.ClientUpdateService;
 import com.faforever.client.user.LoginService;
-import com.faforever.commons.api.dto.CoturnServer;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.eventbus.EventBus;
 import javafx.application.Platform;
@@ -107,7 +106,6 @@ public class SettingsController implements Controller<Node> {
   private final ClientUpdateService clientUpdateService;
   private final TaskService taskService;
   private final CoturnService coturnService;
-  private final IceServerMapper iceServerMapper;
   private final VaultPathHandler vaultPathHandler;
   private final Preferences preferences;
   private final ObjectFactory<MoveDirectoryTask> moveDirectoryTaskFactory;
@@ -121,7 +119,6 @@ public class SettingsController implements Controller<Node> {
   public Toggle randomColorsToggle;
   public Toggle defaultColorsToggle;
   public CheckBox hideFoeToggle;
-  public CheckBox forceRelayToggle;
   public CheckBox changeProcessPriorityToggle;
   public TextField dataLocationTextField;
   public TextField gameLocationTextField;
@@ -177,11 +174,12 @@ public class SettingsController implements Controller<Node> {
   public Spinner<Integer> gameDataCacheTimeSpinner;
   public ComboBox<Level> logLevelComboBox;
   public CheckBox mapAndModAutoUpdateCheckBox;
-  public ListView<CoturnServer> preferredCoturnListView;
+  public ListView<IceServer> preferredCoturnListView;
 
   private final SimpleChangeListener<Theme> selectedThemeChangeListener = this::onThemeChanged;
   private final SimpleChangeListener<Theme> currentThemeChangeListener = newValue -> themeComboBox.getSelectionModel().select(newValue);;
-  private SimpleInvalidationListener availableLanguagesListener = this::setAvailableLanguages;;
+  private final SimpleInvalidationListener availableLanguagesListener = this::setAvailableLanguages;
+  ;
 
   public void initialize() {
     JavaFxUtil.bindManagedToVisible(vaultLocationWarningLabel);
@@ -309,7 +307,6 @@ private void bindGeneralPreferences() {
 
   private void bindGamePreferences() {
     ForgedAlliancePrefs forgedAlliancePrefs = preferences.getForgedAlliance();
-    forceRelayToggle.selectedProperty().bindBidirectional(forgedAlliancePrefs.forceRelayProperty());
     changeProcessPriorityToggle.selectedProperty()
         .bindBidirectional(forgedAlliancePrefs.changeProcessPriorityProperty());
     gameLocationTextField.textProperty()
@@ -339,23 +336,23 @@ private void initPreferredCoturnListView() {
     coturnService.getActiveCoturns().thenAcceptAsync(coturnServers -> {
       preferredCoturnListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
       preferredCoturnListView.setItems(FXCollections.observableList(coturnServers));
-      preferredCoturnListView.setCellFactory(param -> new StringListCell<>(CoturnServer::getRegion, fxApplicationThreadExecutor));
+      preferredCoturnListView.setCellFactory(param -> new StringListCell<>(IceServer::region, fxApplicationThreadExecutor));
       ObservableSet<String> preferredCoturnServers = preferences
           .getForgedAlliance()
           .getPreferredCoturnIds();
-      Map<String, CoturnServer> hostPortCoturnServerMap = coturnServers.stream()
-          .collect(Collectors.toMap(CoturnServer::getId, Function.identity()));
+      Map<String, IceServer> hostPortCoturnServerMap = coturnServers.stream()
+          .collect(Collectors.toMap(IceServer::id, Function.identity()));
 
       preferredCoturnServers.stream()
           .filter(hostPortCoturnServerMap::containsKey)
           .map(hostPortCoturnServerMap::get)
           .forEach(coturnServer -> preferredCoturnListView.getSelectionModel().select(coturnServer));
 
       JavaFxUtil.addAndTriggerListener(preferredCoturnListView.getSelectionModel()
-          .getSelectedItems(), (InvalidationListener) observable -> {
-        List<CoturnServer> selectedCoturns = preferredCoturnListView.getSelectionModel().getSelectedItems();
+          .getSelectedItems(), observable -> {
+        List<IceServer> selectedCoturns = preferredCoturnListView.getSelectionModel().getSelectedItems();
         preferredCoturnServers.clear();
-        selectedCoturns.stream().map(CoturnServer::getId).forEach(preferredCoturnServers::add);
+        selectedCoturns.stream().map(IceServer::id).forEach(preferredCoturnServers::add);
       });
     }, fxApplicationThreadExecutor);
   }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -81,6 +81,7 @@ spring:
   jackson:
     deserialization:
       read-unknown-enum-values-using-default-value: true
+      fail-on-unknown-properties: false
 
 logging:
   level:
diff --git a/src/main/resources/theme/settings/settings.fxml b/src/main/resources/theme/settings/settings.fxml
@@ -642,27 +642,6 @@
                             <content>
                                 <VBox styleClass="view-content">
                                     <children>
-                                        <GridPane styleClass="setting-container">
-                                            <columnConstraints>
-                                                <ColumnConstraints hgrow="ALWAYS" minWidth="10.0"/>
-                                                <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES"
-                                                                   minWidth="10.0"/>
-                                            </columnConstraints>
-                                            <rowConstraints>
-                                                <RowConstraints minHeight="10.0" valignment="TOP" vgrow="SOMETIMES"/>
-                                                <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-                                            </rowConstraints>
-                                            <children>
-                                                <Label contentDisplay="RIGHT" maxWidth="1.7976931348623157E308"
-                                                       styleClass="setting-title" text="%settings.fa.forceRelay"/>
-                                                <Label styleClass="setting-description"
-                                                       text="%settings.fa.forceRelay.description"
-                                                       GridPane.columnSpan="2147483647" GridPane.hgrow="ALWAYS"
-                                                       GridPane.rowIndex="1"/>
-                                                <CheckBox fx:id="forceRelayToggle" contentDisplay="GRAPHIC_ONLY"
-                                                          mnemonicParsing="false" GridPane.columnIndex="1"/>
-                                            </children>
-                                        </GridPane>
                                         <GridPane hgap="10.0" styleClass="setting-container">
                                             <columnConstraints>
                                                 <ColumnConstraints hgrow="ALWAYS" minWidth="10.0"/>
diff --git a/src/test/java/com/faforever/client/chat/ChatUserItemControllerTest.java b/src/test/java/com/faforever/client/chat/ChatUserItemControllerTest.java
@@ -180,9 +180,9 @@ public void testCheckChatUserGameListener() {
     when(uiService.getThemeImage(UiService.CHAT_LIST_STATUS_HOSTING)).thenReturn(new Image(InputStream.nullInputStream()));
     when(mapService.loadPreview(game.getMapFolderName(), PreviewSize.SMALL)).thenReturn(new Image(InputStream.nullInputStream()));
     when(mapService.getMapLocallyFromName(mapFolderName)).thenReturn(Optional.of(mapVersion));
-    when(mapService.convertMapFolderNameToHumanNameIfPossible(mapFolderName)).thenReturn("map name");
+    when(mapService.convertMapFolderNameToHumanNameIfPossible(mapFolderName)).thenReturn("map id");
     when(i18n.get(eq("game.onMapFormat"), anyString())).thenReturn(mapVersion.getMap()
-        .getDisplayName(), "map name", "Neroxis Generated Map");
+        .getDisplayName(), "map id", "Neroxis Generated Map");
 
     runOnFxThreadAndWait(() -> instance.setChatUser(defaultUser));
     assertNotNull(instance.gameStatusImageView.getImage());
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
diff --git a/src/test/java/com/faforever/client/fa/relay/ice/IceAdapterImplTest.java b/src/test/java/com/faforever/client/fa/relay/ice/IceAdapterImplTest.java
diff --git a/src/test/java/com/faforever/client/game/GameServiceTest.java b/src/test/java/com/faforever/client/game/GameServiceTest.java
diff --git a/src/test/java/com/faforever/client/preferences/ui/SettingsControllerTest.java b/src/test/java/com/faforever/client/preferences/ui/SettingsControllerTest.java

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.faforever.client.api;
++
 +public record IceServer(String id, String region) {
 +}
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ public Map<String, Object> map(CoturnServer coturnServer) {`
`14`	`14`	`return Map.of(`
`15`	`15`	`"urls", coturnServer.getUrls().stream().map(URI::toString).toList(),`
`16`	`16`	`"credential", coturnServer.getCredential(),`
`17`		`- "credentialType", coturnServer.getCredentialType(),`
`18`	`17`	`"username", coturnServer.getUsername()`
`19`	`18`	`);`
`20`	`19`	`}`