WIP

Author: whyoleg

testtool/client/src/commonMain/kotlin/TesttoolClient.kt

@@ -5,11 +5,11 @@
 package dev.whyoleg.cryptography.testtool.client
 
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.plugins.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.content.*
-import io.ktor.utils.io.*
 import kotlinx.coroutines.flow.*
 import kotlinx.io.*
 
@@ -47,16 +47,16 @@ internal suspend fun postData(path: String, bytes: ByteArray): String = client.p
 }.bodyAsText()
 
 internal fun getData(path: String): Flow<Pair<String, ByteArray>> = flow {
-    val channel = client.get(path).bodyAsChannel()
+    val source = client.get(path).body<Source>()
     try {
         while (true) {
-            val idLength = runCatching { channel.readInt() }.getOrNull() ?: break // not enough data to read
-            val id = channel.readPacket(idLength).readString()
-            val contentLength = channel.readInt()
-            val content = channel.readPacket(contentLength).readByteArray()
+            val idLength = source.readInt()
+            val id = source.readString(idLength.toLong())
+            val contentLength = source.readInt()
+            val content = source.readByteArray(contentLength)
             emit(id to content)
         }
-    } finally {
-        channel.cancel()
+    } catch (cause: EOFException) {
+        // ignore
     }
 }