Manually construct frames

FAForever · Oct 13, 2023 · 5106364 · 5106364
1 parent 580eda1
commit 5106364
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt b/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt
@@ -150,9 +150,11 @@ class FafLobbyClient(
     return webSocketClient
       .uri(config.url)
       .handle { inbound, outbound ->
-        val inboundMono = inbound.receiveFrames()
-          .windowUntil { it.isFinalFragment }
-          .flatMap { ByteBufFlux.fromInbound(it.map { frame -> frame.content() }).asString(Charsets.UTF_8).collect(Collectors.joining()) }
+        val inboundMono = inbound.receive()
+          .asString()
+          .flatMapIterable { it.toCharArray().asIterable() }
+          .windowUntil { '\n' == it }
+          .flatMap { it.collectList().map { chars -> chars.toCharArray() }.map { charArray -> String(charArray) } }
           .doOnError { LOG.error("Inbound channel closed with error", it) }
           .doOnComplete { LOG.info("Inbound channel closed") }
           .doOnCancel { LOG.info("Inbound channel cancelled") }