Optimize testtool

Author: whyoleg

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

@@ -5,12 +5,10 @@
 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 io.ktor.utils.io.core.*
 import kotlinx.coroutines.flow.*
 import kotlinx.io.*
 
@@ -45,21 +43,16 @@ private val client = HttpClient {
 
 internal suspend fun postData(path: String, bytes: ByteArray): String = client.post(path) {
     setBody(ByteArrayContent(bytes))
-}.bodyAsText()
+}.body<Source>().use { it.readString() }
 
 internal fun getData(path: String): Flow<Pair<String, ByteArray>> = flow {
-    val channel = client.get(path).bodyAsChannel()
-    while (true) {
-        val idLength = channel.readIntOrNull() ?: break
-        val id = channel.readPacket(idLength).readString()
-        val contentLength = channel.readInt()
-        val content = channel.readPacket(contentLength).readByteArray()
-        emit(id to content)
+    client.get(path).body<Source>().use { source ->
+        while (!source.exhausted()) {
+            val idLength = source.readInt()
+            val id = source.readString(idLength.toLong())
+            val contentLength = source.readInt()
+            val content = source.readByteArray(contentLength)
+            emit(id to content)
+        }
     }
 }
-
-private suspend fun ByteReadChannel.readIntOrNull(): Int? {
-    val packet = readRemaining(4)
-    if (packet.remaining == 0L) return null
-    return packet.readInt()
-}

testtool/server/src/main/kotlin/compatibility.kt

@@ -4,6 +4,7 @@
 
 package dev.whyoleg.cryptography.testtool.server
 
+import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
@@ -57,13 +58,19 @@ internal fun Route.routes(
 }
 
 private suspend fun ApplicationCall.saveFile(path: Path, name: String) {
-    val bytes = request.receiveChannel().readRemaining().readByteArray()
+    val buffer = request.receiveChannel().readBuffer()
 
-    path.createDirectories().resolve(name).writeBytes(bytes, StandardOpenOption.CREATE_NEW)
+    path.createDirectories().resolve(name)
+        .outputStream(StandardOpenOption.CREATE_NEW)
+        .use(buffer::readTo)
 }
 
-private suspend fun ApplicationCall.getFiles(path: Path, get: Path.() -> Pair<String, Path>) = respondBytesWriter {
-    if (!path.exists()) return@respondBytesWriter
+private suspend fun ApplicationCall.getFiles(path: Path, get: Path.() -> Pair<String, Path>) {
+    if (!path.exists()) {
+        respond(HttpStatusCode.OK)
+    }
+
+    val output = Buffer()
 
     path.forEachDirectoryEntry { entry ->
         val (id, contentPath) = get(entry)
@@ -72,10 +79,11 @@ private suspend fun ApplicationCall.getFiles(path: Path, get: Path.() -> Pair<St
             return@forEachDirectoryEntry
         }
         val idBytes = id.encodeToByteArray()
-        val contentBytes = contentPath.readBytes()
-        writeInt(idBytes.size)
-        writeFully(idBytes)
-        writeInt(contentBytes.size)
-        writeFully(contentBytes)
+        output.writeInt(idBytes.size)
+        output.write(idBytes)
+        output.writeInt(contentPath.fileSize().toInt())
+        contentPath.inputStream().use(output::transferFrom)
     }
+
+    respondSource(output)
 }