Update Ktor to 3.1.0 and add support for all native and wasm targets (#281)

* Use "127.0.0.1" instead of "0.0.0.0" in ktor tcp server tests because of mingw/windows behaviour
* leave only buffered local tests (as those will be default in future)

Author: whyoleg

.github/workflows/run-tests.yml

@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        target: [ 'jvm', 'jvm11', 'jvm17', 'jvm21', 'js', 'native' ]
+        target: [ 'jvm', 'jvm11', 'jvm17', 'jvm21', 'web', 'native' ]
         include:
           - os: 'macos-latest'
             target: 'macos'
@@ -50,7 +50,6 @@ jobs:
       - uses: ./.github/actions/setup-gradle
 
       - run: ./gradlew ${{ matrix.target }}Test --continue
-        timeout-minutes: 30
 
       - if: always() && !cancelled()
         uses: actions/upload-artifact@v4

build-logic/src/main/kotlin/rsocketbuild.multiplatform-base.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.gradle.*
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.targets.js.ir.*
+import org.jetbrains.kotlin.gradle.targets.js.testing.*
 import org.jetbrains.kotlin.gradle.targets.jvm.*
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.*
 import org.jetbrains.kotlin.gradle.targets.native.tasks.*
@@ -32,15 +33,30 @@ plugins {
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     compilerOptions {
-        // because of INVISIBLE_REFERENCE suppression - will be removed after migration to kotlinx.io
-        if (project.name != "rsocket-test") {
-            allWarningsAsErrors.set(true)
-        }
+        allWarningsAsErrors.set(true)
         progressiveMode.set(true)
         freeCompilerArgs.add("-Xrender-internal-diagnostic-names")
         optIn.addAll(OptIns.ExperimentalSubclassOptIn)
     }
 
+    applyDefaultHierarchyTemplate {
+        common {
+            group("nonJvm") {
+                group("nonConcurrent")
+                group("native")
+            }
+            group("concurrent") {
+                withJvm()
+                group("native")
+            }
+            group("nonConcurrent") {
+                withJs()
+                withWasmJs()
+                withWasmWasi()
+            }
+        }
+    }
+
     sourceSets.configureEach {
         languageSettings {
             if (name.contains("test", ignoreCase = true)) {
@@ -103,6 +119,12 @@ registerTestAggregationTask(
     targetFilter = { it.platformType == KotlinPlatformType.jvm }
 )
 
+registerTestAggregationTask(
+    name = "webTest",
+    taskDependencies = { tasks.withType<KotlinJsTest>() },
+    targetFilter = { it.platformType == KotlinPlatformType.js || it.platformType == KotlinPlatformType.wasm }
+)
+
 registerTestAggregationTask(
     name = "nativeTest",
     taskDependencies = { tasks.withType<KotlinNativeTest>().matching { it.enabled } },

build-logic/src/main/kotlin/rsocketbuild/targets.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,21 @@ package rsocketbuild
 
 import org.gradle.jvm.toolchain.*
 import org.gradle.kotlin.dsl.*
+import org.jetbrains.kotlin.gradle.*
 import org.jetbrains.kotlin.gradle.dsl.*
 
-fun KotlinMultiplatformExtension.appleTargets() {
+fun KotlinMultiplatformExtension.allTargets(
+    supportsWasi: Boolean = true,
+    supportsBrowser: Boolean = true,
+) {
+    jvmTarget()
+    jsTarget(supportsBrowser = supportsBrowser)
+    wasmJsTarget(supportsBrowser = supportsBrowser)
+    if (supportsWasi) wasmWasiTarget()
+    nativeTargets()
+}
+
+fun KotlinMultiplatformExtension.nativeTargets() {
     macosX64()
     macosArm64()
 
@@ -32,29 +44,20 @@ fun KotlinMultiplatformExtension.appleTargets() {
     watchosArm32()
     watchosArm64()
     watchosSimulatorArm64()
-    // https://youtrack.jetbrains.com/issue/KTOR-6368, supported by kotlinx-io
-    // watchosDeviceArm64()
+    watchosDeviceArm64()
 
     tvosX64()
     tvosArm64()
     tvosSimulatorArm64()
-}
 
-fun KotlinMultiplatformExtension.nixTargets() {
-    appleTargets()
     linuxX64()
     linuxArm64()
-}
-
-fun KotlinMultiplatformExtension.nativeTargets() {
-    nixTargets()
     mingwX64()
 
-    // not supported by ktor, supported by kotlinx-io
-    // androidNativeX64()
-    // androidNativeX86()
-    // androidNativeArm64()
-    // androidNativeArm32()
+    androidNativeX64()
+    androidNativeX86()
+    androidNativeArm64()
+    androidNativeArm32()
 }
 
 fun KotlinMultiplatformExtension.jsTarget(
@@ -67,6 +70,24 @@ fun KotlinMultiplatformExtension.jsTarget(
     }
 }
 
+@OptIn(ExperimentalWasmDsl::class)
+fun KotlinMultiplatformExtension.wasmJsTarget(
+    supportsNode: Boolean = true,
+    supportsBrowser: Boolean = true,
+) {
+    wasmJs {
+        if (supportsNode) nodejs()
+        if (supportsBrowser) browser()
+    }
+}
+
+@OptIn(ExperimentalWasmDsl::class)
+fun KotlinMultiplatformExtension.wasmWasiTarget() {
+    wasmWasi {
+        nodejs()
+    }
+}
+
 fun KotlinMultiplatformExtension.jvmTarget(
     jdkVersion: Int = 8,
     jdkAdditionalTestVersions: Set<Int> = setOf(11, 17, 21),

build-settings/src/main/kotlin/rsocketsettings.repositories.settings.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ kotlinx-coroutines = "1.10.1"
 kotlinx-benchmark = "0.4.8"
 kotlinx-bcv = "0.17.0"
 
-ktor = "3.0.3"
+ktor = "3.1.0"
 
 netty = "4.1.117.Final"
 netty-quic = "0.0.70.Final"

ktor-plugins/ktor-client-rsocket/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ plugins {
 description = "rsocket-kotlin ktor client plugin"
 
 kotlin {
-    jvmTarget()
-    jsTarget()
-    nativeTargets()
+    allTargets(
+        supportsWasi = false,
+    )
 
     sourceSets {
         commonMain.dependencies {

ktor-plugins/ktor-server-rsocket/build.gradle.kts

@@ -23,8 +23,10 @@ plugins {
 description = "rsocket-kotlin ktor server plugin"
 
 kotlin {
-    jvmTarget()
-    nixTargets()
+    allTargets(
+        supportsWasi = false,
+        supportsBrowser = false
+    )
 
     sourceSets {
         commonMain.dependencies {

ktor-plugins/ktor-tests/build.gradle.kts

@@ -21,8 +21,10 @@ plugins {
 }
 
 kotlin {
-    jvmTarget()
-    nixTargets()
+    allTargets(
+        supportsWasi = false,
+        supportsBrowser = false
+    )
 
     sourceSets {
         commonTest.dependencies {

ktor-plugins/ktor-tests/src/commonTest/kotlin/io/rsocket/kotlin/ktor/tests/WebSocketConnectionTest.kt

@@ -76,12 +76,12 @@ class WebSocketConnectionTest : SuspendTest {
     }
 
     override suspend fun before() {
-        server.start()
+        server.startSuspend()
         delay(1000)
     }
 
     override suspend fun after() {
-        server.stop()
+        server.stopSuspend()
         client.coroutineContext.job.cancelAndJoin()
     }
 

ktor-plugins/rsocket-ktor-client/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ plugins {
 description = "OLD ARTIFACT - migrate to ktor-client-rsocket"
 
 kotlin {
-    jvmTarget()
-    jsTarget()
-    nativeTargets()
+    allTargets(
+        supportsWasi = false,
+    )
 
     sourceSets {
         commonMain.dependencies {

ktor-plugins/rsocket-ktor-server/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,10 @@ plugins {
 description = "OLD ARTIFACT - migrate to ktor-server-rsocket"
 
 kotlin {
-    jvmTarget()
-    nixTargets()
+    allTargets(
+        supportsWasi = false,
+        supportsBrowser = false
+    )
 
     sourceSets {
         commonMain.dependencies {

rsocket-core/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,7 @@ plugins {
 description = "rsocket-kotlin core functionality"
 
 kotlin {
-    jvmTarget()
-    jsTarget()
-    nativeTargets()
+    allTargets()
 
     sourceSets {
         commonMain.dependencies {

rsocket-core/src/commonTest/kotlin/io/rsocket/kotlin/internal/RSocketRequesterTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package io.rsocket.kotlin.internal
 
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.frame.*
+import io.rsocket.kotlin.internal.io.*
 import io.rsocket.kotlin.keepalive.*
 import io.rsocket.kotlin.payload.*
 import io.rsocket.kotlin.test.*
@@ -102,7 +103,7 @@ class RSocketRequesterTest : TestWithConnection() {
             val flow = requester.requestStream(Payload.Empty).take(2).flowOn(PrefetchStrategy(1, 0))
 
             expectNoEventsIn(200)
-            flow.launchIn(connection + anotherDispatcher)
+            flow.launchIn(connection + Dispatchers.IoCompatible)
 
             awaitFrame { frame ->
                 assertTrue(frame is RequestFrame)

rsocket-core/src/commonTest/kotlin/io/rsocket/kotlin/transport/internal/PrioritizationFrameQueueTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package io.rsocket.kotlin.transport.internal
 
+import io.rsocket.kotlin.internal.io.*
 import io.rsocket.kotlin.test.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
@@ -62,7 +63,7 @@ class PrioritizationFrameQueueTest : SuspendTest {
     @Test
     fun testAsyncReceive() = test {
         val deferred = CompletableDeferred<Source?>()
-        launch(anotherDispatcher) {
+        launch(Dispatchers.IoCompatible) {
             deferred.complete(queue.dequeueFrame())
         }
         delay(100)