Merge branch 'main' into deps_cio

Author: MukjepScarlet

.github/workflows/codeql.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: '21'

.github/workflows/gradle-publish.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'

.github/workflows/validate-pr.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'

kotlin-sdk-test/build.gradle.kts

@@ -17,6 +17,15 @@ kotlin {
                 implementation(libs.ktor.server.cio)
                 implementation(libs.ktor.server.test.host)
                 implementation(libs.kotlinx.coroutines.test)
+                implementation(libs.kotest.assertions.json)
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation(kotlin("test-junit5"))
+                implementation(libs.kotlin.logging)
+                implementation(libs.ktor.server.cio)
+                implementation(libs.ktor.client.cio)
             }
         }
     }

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/ClientIntegrationTest.kt

@@ -0,0 +1,102 @@
+package io.modelcontextprotocol.kotlin.sdk.integration.kotlin
+
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.sse.SSE
+import io.ktor.server.application.install
+import io.ktor.server.engine.EmbeddedServer
+import io.ktor.server.engine.embeddedServer
+import io.ktor.server.routing.routing
+import io.modelcontextprotocol.kotlin.sdk.Implementation
+import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
+import io.modelcontextprotocol.kotlin.sdk.client.Client
+import io.modelcontextprotocol.kotlin.sdk.client.SseClientTransport
+import io.modelcontextprotocol.kotlin.sdk.integration.utils.Retry
+import io.modelcontextprotocol.kotlin.sdk.server.Server
+import io.modelcontextprotocol.kotlin.sdk.server.ServerOptions
+import io.modelcontextprotocol.kotlin.sdk.server.mcp
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import kotlin.time.Duration.Companion.seconds
+import io.ktor.server.cio.CIO as ServerCIO
+import io.ktor.server.sse.SSE as ServerSSE
+
+@Retry(times = 3)
+abstract class KotlinTestBase {
+
+    protected val host = "localhost"
+    protected abstract val port: Int
+
+    protected lateinit var server: Server
+    protected lateinit var client: Client
+    protected lateinit var serverEngine: EmbeddedServer<*, *>
+
+    protected abstract fun configureServerCapabilities(): ServerCapabilities
+    protected abstract fun configureServer()
+
+    @BeforeEach
+    fun setUp() {
+        setupServer()
+        runBlocking {
+            setupClient()
+        }
+    }
+
+    protected suspend fun setupClient() {
+        val transport = SseClientTransport(
+            HttpClient(CIO) {
+                install(SSE)
+            },
+            "http://$host:$port",
+        )
+        client = Client(
+            Implementation("test", "1.0"),
+        )
+        client.connect(transport)
+    }
+
+    protected fun setupServer() {
+        val capabilities = configureServerCapabilities()
+
+        server = Server(
+            Implementation(name = "test-server", version = "1.0"),
+            ServerOptions(capabilities = capabilities),
+        )
+
+        configureServer()
+
+        serverEngine = embeddedServer(ServerCIO, host = host, port = port) {
+            install(ServerSSE)
+            routing {
+                mcp { server }
+            }
+        }.start(wait = false)
+    }
+
+    @AfterEach
+    fun tearDown() {
+        // close client
+        if (::client.isInitialized) {
+            try {
+                runBlocking {
+                    withTimeout(3.seconds) {
+                        client.close()
+                    }
+                }
+            } catch (e: Exception) {
+                println("Warning: Error during client close: ${e.message}")
+            }
+        }
+
+        // stop server
+        if (::serverEngine.isInitialized) {
+            try {
+                serverEngine.stop(500, 1000)
+            } catch (e: Exception) {
+                println("Warning: Error during server stop: ${e.message}")
+            }
+        }
+    }
+}