Migrate testtool to ktor 3.0.0

Author: whyoleg

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ kotlinx-kover = "0.8.3"
 kotlinx-io = "0.5.4"
 kotlinx-serialization = "1.7.3"
 kotlinx-coroutines = "1.9.0"
-ktor = "2.3.12"
+ktor = "3.0.0"
 
 # android
 android = "8.5.0"
@@ -21,7 +21,7 @@ maven-publish = "0.29.0"
 
 # other
 bouncycastle = "1.78.1"
-logback = "1.2.11"
+logback = "1.5.9"
 
 [libraries]
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }

testtool/client/build.gradle.kts

@@ -4,8 +4,6 @@
 
 import org.jetbrains.kotlin.gradle.*
 import org.jetbrains.kotlin.gradle.plugin.*
-import org.jetbrains.kotlin.gradle.plugin.mpp.*
-import org.jetbrains.kotlin.konan.target.*
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -21,7 +19,6 @@ kotlin {
         browser()
     }
     wasmJs {
-        // No support from KTOR
         nodejs()
         browser()
     }
@@ -33,6 +30,7 @@ kotlin {
     watchosX64()
     watchosArm32()
     watchosArm64()
+    watchosDeviceArm64()
     watchosSimulatorArm64()
 
     tvosX64()
@@ -46,74 +44,36 @@ kotlin {
     linuxArm64()
     mingwX64()
 
-    // No support from KTOR
-    watchosDeviceArm64()
     androidNativeX64()
     androidNativeX86()
     androidNativeArm64()
     androidNativeArm32()
 
-    val supportsKtor: (KotlinCompilation<*>).() -> Boolean = {
-        val konanTarget = (target as? KotlinNativeTarget)?.konanTarget
-        when {
-            konanTarget == KonanTarget.WATCHOS_DEVICE_ARM64 -> false
-            konanTarget?.family == Family.ANDROID           -> false
-            platformType == KotlinPlatformType.wasm         -> false
-            else                                            -> true
-        }
-    }
-
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
     applyDefaultHierarchyTemplate {
         common {
             group("nonJvm") {
                 withCompilations { it.platformType != KotlinPlatformType.jvm }
             }
-            group("ktor") {
-                withCompilations(supportsKtor)
-            }
-            group("nonKtor") {
-                withCompilations { !supportsKtor(it) }
-            }
-            group("cio") {
-                withCompilations {
-                    val target = (it.target as? KotlinNativeTarget)?.konanTarget
-                    when {
-                        target == KonanTarget.WATCHOS_DEVICE_ARM64 -> false
-                        target?.family?.isAppleFamily == true      -> true
-                        target?.family == Family.LINUX             -> true
-                        else                                       -> false
-                    }
-                }
-            }
         }
     }
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(libs.kotlinx.coroutines.core)
-            }
+        commonMain.dependencies {
+            api(libs.kotlinx.coroutines.core)
+            implementation(libs.ktor.client.core)
         }
-        val ktorMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.core)
-            }
+        jvmMain.dependencies {
+            implementation(libs.ktor.client.okhttp)
         }
-        val jvmMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.okhttp)
-            }
+        linuxMain.dependencies {
+            implementation(libs.ktor.client.cio)
         }
-        val cioMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.cio)
-            }
+        appleMain.dependencies {
+            implementation(libs.ktor.client.cio)
         }
-        val mingwMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.winhttp)
-            }
+        mingwMain.dependencies {
+            implementation(libs.ktor.client.winhttp)
         }
     }
 }

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

@@ -4,7 +4,15 @@
 
 package dev.whyoleg.cryptography.testtool.client
 
+import io.ktor.client.*
+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.*
 
 object TesttoolClient {
 
@@ -26,6 +34,32 @@ object TesttoolClient {
 
 internal expect fun hostOverride(): String?
 
-internal expect suspend fun postData(path: String, bytes: ByteArray): String
+private val client = HttpClient {
+    expectSuccess = true
+    install(DefaultRequest) {
+        host = hostOverride() ?: ""
+        port = 9000
+    }
+    install(HttpRequestRetry)
+}
+
+internal suspend fun postData(path: String, bytes: ByteArray): String = client.post(path) {
+    setBody(ByteArrayContent(bytes))
+}.bodyAsText()
+
+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)
+    }
+}
 
-internal expect fun getData(path: String): Flow<Pair<String, ByteArray>>
+private suspend fun ByteReadChannel.readIntOrNull(): Int? {
+    val packet = readRemaining(4)
+    if (packet.remaining == 0L) return null
+    return packet.readInt()
+}

testtool/client/src/ktorMain/kotlin/TesttoolClient.ktor.kt

@@ -7,7 +7,7 @@ package dev.whyoleg.cryptography.testtool.server
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.cors.routing.*
 import io.ktor.server.routing.*
 import java.io.*

testtool/client/src/nonKtorMain/kotlin/TesttoolClient.nonKtor.kt

@@ -8,7 +8,7 @@ import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.utils.io.*
-import io.ktor.utils.io.core.*
+import kotlinx.io.*
 import java.nio.file.*
 import java.util.concurrent.atomic.*
 import kotlin.io.path.*
@@ -57,7 +57,7 @@ internal fun Route.routes(
 }
 
 private suspend fun ApplicationCall.saveFile(path: Path, name: String) {
-    val bytes = request.receiveChannel().readRemaining().readBytes()
+    val bytes = request.receiveChannel().readRemaining().readByteArray()
 
     path.createDirectories().resolve(name).writeBytes(bytes, StandardOpenOption.CREATE_NEW)
 }