Update build configuration

kpavlov · kpavlov · commit 83739292197b · 2025-10-15T19:10:20.000+03:00
- Add Netty convention plugin
- Update Kotlin compiler and junit platform settings
- Mock DELETE /mcp in StreamableHttpClientTest; Refactor Mokksy calls
diff --git a/buildSrc/src/main/kotlin/mcp.multiplatform.gradle.kts b/buildSrc/src/main/kotlin/mcp.multiplatform.gradle.kts
@@ -1,7 +1,9 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -11,10 +13,44 @@ plugins {
 }
 
 kotlin {
+
+    compilerOptions {
+        freeCompilerArgs =
+            listOf(
+                "-Wextra",
+                "-Xmulti-dollar-interpolation",
+            )
+    }
+
+    coreLibrariesVersion = "2.0.10"
+
     jvm {
-        compilerOptions.jvmTarget = JvmTarget.JVM_1_8
-        tasks.withType<Test> {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_1_8
+            javaParameters = true
+            jvmDefault = JvmDefaultMode.ENABLE
+            freeCompilerArgs.addAll(
+                "-Xdebug",
+            )
+        }
+
+        tasks.withType<Test>().configureEach {
+
             useJUnitPlatform()
+
+            maxParallelForks = Runtime.getRuntime().availableProcessors()
+            forkEvery = 100
+            testLogging {
+                exceptionFormat = TestExceptionFormat.SHORT
+                showStandardStreams = true
+                events("failed")
+            }
+            systemProperty("kotest.output.ansi", "true")
+            reports {
+                junitXml.required.set(true)
+                junitXml.includeSystemOutLog.set(true)
+                junitXml.includeSystemErrLog.set(true)
+            }
         }
     }
     macosX64()
diff --git a/buildSrc/src/main/kotlin/netty-convention.gradle.kts b/buildSrc/src/main/kotlin/netty-convention.gradle.kts
@@ -0,0 +1,61 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+/**
+ * Netty convention plugin that adds platform-specific Netty native transport libraries
+ * to the jvmTest source set. This is similar to how Maven handles OS-specific dependencies
+ * with profile activation.
+ *
+ * This plugin should be applied to any module that uses Netty for testing.
+ */
+val nettyVersion = "4.2.7.Final"
+plugins {
+    id("org.gradle.base")
+}
+
+// This plugin is applied to projects that already have the kotlin multiplatform plugin applied
+// It adds the Netty native transport libraries to the jvmTest source set
+
+afterEvaluate {
+
+    extensions.findByType<KotlinMultiplatformExtension>()?.apply {
+        sourceSets.findByName("jvmTest")?.apply {
+            dependencies {
+                // Netty native transport libraries for different platforms
+                val osName = System.getProperty("os.name").lowercase()
+                val osArch = System.getProperty("os.arch").lowercase()
+
+                // Add the base Netty platform
+                implementation(project.dependencies.platform("io.netty:netty-bom:$nettyVersion"))
+
+                when {
+                    osName.contains("linux") -> {
+                        val archClassifier =
+                            if (osArch.contains("aarch64")) {
+                                "linux-aarch_64"
+                            } else {
+                                "linux-x86_64"
+                            }
+                        runtimeOnly(
+                            "io.netty:netty-transport-native-epoll:$nettyVersion:$archClassifier",
+                        )
+                    }
+
+                    osName.contains("mac") -> {
+                        val archClassifier =
+                            if (osArch.contains("aarch64")) {
+                                "osx-aarch_64"
+                            } else {
+                                "osx-x86_64"
+                            }
+                        runtimeOnly(
+                            "io.netty:netty-transport-native-kqueue:$nettyVersion:$archClassifier",
+                        )
+                        runtimeOnly(
+                            "io.netty:netty-resolver-dns-native-macos:$nettyVersion:$archClassifier",
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ dokka = "2.0.0"
 atomicfu = "0.29.0"
 ktlint = "13.1.0"
 kover = "0.9.2"
+netty = "4.2.7.Final"
 mavenPublish = "0.34.0"
 binaryCompatibilityValidatorPlugin = "0.18.1"
 
@@ -48,6 +49,7 @@ ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging"}
 ktor-client-apache5 = { group = "io.ktor", name = "ktor-client-apache5" }
 ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp" }
 ktor-server-sse = { group = "io.ktor", name = "ktor-server-sse", version.ref = "ktor" }
+ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty" }
 ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" }
 ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
 
@@ -60,6 +62,7 @@ ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref =
 ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host", version.ref = "ktor" }
 mokksy = { group = "dev.mokksy", name = "mokksy", version.ref = "mokksy" }
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
+netty-bom = { group = "io.netty", name = "netty-bom", version.ref = "netty" }
 
 # Samples
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
diff --git a/kotlin-sdk-client/build.gradle.kts b/kotlin-sdk-client/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     id("mcp.publishing")
     id("mcp.dokka")
     alias(libs.plugins.kotlinx.binary.compatibility.validator)
+    `netty-convention`
 }
 
 kotlin {
@@ -52,6 +53,7 @@ kotlin {
                 implementation(libs.mokksy)
                 implementation(libs.awaitility)
                 implementation(libs.ktor.client.apache5)
+                implementation(dependencies.platform(libs.netty.bom))
                 runtimeOnly(libs.slf4j.simple)
             }
         }
diff --git a/kotlin-sdk-client/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/StreamableHttpClientTest.kt b/kotlin-sdk-client/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/StreamableHttpClientTest.kt
@@ -8,6 +8,8 @@ import io.ktor.client.engine.apache5.Apache5
 import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.plugins.sse.SSE
+import io.ktor.http.ContentType
+import io.ktor.http.HttpMethod
 import io.ktor.http.HttpStatusCode
 import io.ktor.sse.ServerSentEvent
 import io.modelcontextprotocol.kotlin.sdk.ClientCapabilities
@@ -27,6 +29,12 @@ import kotlin.test.AfterTest
 import kotlin.test.Test
 import kotlin.time.Duration.Companion.milliseconds
 
+/**
+ * Integration tests for the `StreamableHttpClientTransport` implementation
+ * using the [Mokksy](https://mokksy.dev) library
+ * to simulate Streaming HTTP with server-sent events (SSE).
+ * @author Konstantin Pavlov
+ */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class StreamableHttpClientTest {
 
@@ -43,6 +51,7 @@ class StreamableHttpClientTest {
     }
 
     @Test
+    @Suppress("LongMethod")
     fun `test streamableHttpClient`(): Unit = runBlocking {
         val client = Client(
             clientInfo = Implementation(name = "sample-client", version = "1.0.0"),
@@ -53,7 +62,7 @@ class StreamableHttpClientTest {
 
         val sessionId = UUID.randomUUID().toString()
 
-        mockPostRequest(
+        mockRequest(
             method = "initialize",
             sessionId = sessionId,
         ) {
@@ -81,7 +90,7 @@ class StreamableHttpClientTest {
             """.trimIndent()
         }
 
-        mockPostRequest(
+        mockRequest(
             method = "notifications/initialized",
             sessionId = sessionId,
             statusCode = HttpStatusCode.Accepted,
@@ -103,15 +112,15 @@ class StreamableHttpClientTest {
                         ServerSentEvent(
                             event = "message",
                             id = "1",
-                            data = @Suppress("ktlint:standard:max-line-length")
+                            data = @Suppress("MaxLineLength")
                             //language=json
                             """{"jsonrpc":"2.0","method":"notifications/progress","params":{"progressToken":"upload-123","progress":50,"total":100}}""",
                         ),
                     )
                     delay(200.milliseconds)
                     emit(
                         ServerSentEvent(
-                            data = @Suppress("ktlint:standard:max-line-length")
+                            data = @Suppress("MaxLineLength")
                             //language=json
                             """{"jsonrpc":"2.0","method":"notifications/progress","params":{"progressToken":"upload-123","progress":50,"total":100}}""",
                         ),
@@ -121,7 +130,7 @@ class StreamableHttpClientTest {
 
         client.connect(
             StreamableHttpClientTransport(
-                url = "http://localhost:${mokksy.port()}/mcp",
+                url = mokksy.baseUrl() + "/mcp",
                 client = HttpClient(Apache5) {
                     install(SSE)
                     install(Logging) {
@@ -133,45 +142,45 @@ class StreamableHttpClientTest {
 
         // TODO: get notifications
 
-        mockPostRequest(
+        mockRequest(
             method = "tools/list",
             sessionId = sessionId,
         ) {
             // language=json
             """
-                             {
-                              "jsonrpc": "2.0",
-                              "id": 3,
-                              "result": {
-                                "tools": [
-                                  {
-                                    "name": "get_weather",
-                                    "title": "Weather Information Provider",
-                                    "description": "Get current weather information for a location",
-                                    "inputSchema": {
-                                      "type": "object",
-                                      "properties": {
-                                        "location": {
-                                          "type": "string",
-                                          "description": "City name or zip code"
-                                        }
-                                      },
-                                      "required": ["location"]
-                                    },
-                                    "outputSchema": {
-                                      "type": "object",
-                                      "properties": {
-                                        "temperature": {
-                                          "type": "number",
-                                          "description": "Temperature, Celsius"
-                                        }
-                                      },
-                                      "required": ["temperature"]
-                                    }
-                                  }
-                                ]
-                              }
-                            }
+             {
+              "jsonrpc": "2.0",
+              "id": 3,
+              "result": {
+                "tools": [
+                  {
+                    "name": "get_weather",
+                    "title": "Weather Information Provider",
+                    "description": "Get current weather information for a location",
+                    "inputSchema": {
+                      "type": "object",
+                      "properties": {
+                        "location": {
+                          "type": "string",
+                          "description": "City name or zip code"
+                        }
+                      },
+                      "required": ["location"]
+                    },
+                    "outputSchema": {
+                      "type": "object",
+                      "properties": {
+                        "temperature": {
+                          "type": "number",
+                          "description": "Temperature, Celsius"
+                        }
+                      },
+                      "required": ["temperature"]
+                    }
+                  }
+                ]
+              }
+            }
             """.trimIndent()
         }
 
@@ -203,16 +212,34 @@ class StreamableHttpClientTest {
             ),
             annotations = null,
         )
+
+        mockDisconnect(sessionId = sessionId)
+    }
+
+    fun mockDisconnect(sessionId: String) {
+        mokksy.delete(
+            configuration = StubConfiguration(removeAfterMatch = true),
+            requestType = JSONRPCRequest::class,
+        ) {
+            path("/mcp")
+            containsHeader("Mcp-Session-Id", sessionId)
+        } respondsWith {
+            body = null
+        }
     }
 
-    private fun mockPostRequest(
+    @Suppress("LongParameterList")
+    private fun mockRequest(
+        httpMethod: HttpMethod = HttpMethod.Post,
         method: String,
         sessionId: String,
+        contentType: ContentType = ContentType.Application.Json,
         statusCode: HttpStatusCode = HttpStatusCode.OK,
         bodyBuilder: () -> String,
     ) {
-        mokksy.post(
+        mokksy.method(
             configuration = StubConfiguration(removeAfterMatch = true),
+            httpMethod = httpMethod,
             requestType = JSONRPCRequest::class,
         ) {
             path("/mcp")
@@ -226,7 +253,7 @@ class StreamableHttpClientTest {
             )
         } respondsWith {
             body = bodyBuilder.invoke()
-            headers += "Content-Type" to "application/json; charset=utf-8"
+            this.contentType = contentType
             headers += "Mcp-Session-Id" to sessionId
             httpStatus = statusCode
         }
diff --git a/kotlin-sdk-client/src/jvmTest/resources/junit-platform.properties b/kotlin-sdk-client/src/jvmTest/resources/junit-platform.properties
@@ -3,4 +3,4 @@ junit.jupiter.execution.parallel.enabled=true
 junit.jupiter.execution.parallel.config.strategy=dynamic
 junit.jupiter.execution.parallel.mode.default=concurrent
 junit.jupiter.execution.parallel.mode.classes.default=concurrent
-junit.jupiter.execution.timeout.default=90s
+junit.jupiter.execution.timeout.default=2m

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ plugins {`
`7`	`7`	`id("mcp.publishing")`
`8`	`8`	`id("mcp.dokka")`
`9`	`9`	`alias(libs.plugins.kotlinx.binary.compatibility.validator)`
	`10`	+ `netty-convention`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`kotlin {`
`@@ -52,6 +53,7 @@ kotlin {`
`52`	`53`	`implementation(libs.mokksy)`
`53`	`54`	`implementation(libs.awaitility)`
`54`	`55`	`implementation(libs.ktor.client.apache5)`
	`56`	`+ implementation(dependencies.platform(libs.netty.bom))`
`55`	`57`	`runtimeOnly(libs.slf4j.simple)`
`56`	`58`	`}`
`57`	`59`	`}`