Fix kotlin-mcp-server sample (#459)

This commit is contained in:
Pavel Gorgulov 2025-12-08 22:25:55 +01:00 • committed by GitHub
commit 363eab6327
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 43 additions and 18 deletions

View file

@ -31,6 +31,7 @@ import io.modelcontextprotocol.kotlin.sdk.types.ServerCapabilities
import io.modelcontextprotocol.kotlin.sdk.types.TextContent import io.modelcontextprotocol.kotlin.sdk.types.TextContent
import io.modelcontextprotocol.kotlin.sdk.types.TextResourceContents import io.modelcontextprotocol.kotlin.sdk.types.TextResourceContents
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.awaitCancellation
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.io.asSink import kotlinx.io.asSink
import kotlinx.io.asSource import kotlinx.io.asSource
@ -102,13 +103,13 @@ fun configureServer(): Server {
return server return server
} }
fun runSseMcpServerWithPlainConfiguration(port: Int, wait: Boolean = true) { fun runSseMcpServerWithPlainConfiguration(port: Int, wait: Boolean = true): EmbeddedServer<*, *> {
printBanner(port = port, path = "/sse") printBanner(port = port, path = "/sse")
val serverSessions = ConcurrentMap<String, ServerSession>() val serverSessions = ConcurrentMap<String, ServerSession>()
val server = configureServer() val server = configureServer()
embeddedServer(CIO, host = "127.0.0.1", port = port) { val ktorServer = embeddedServer(CIO, host = "127.0.0.1", port = port) {
installCors() installCors()
install(SSE) install(SSE)
routing { routing {
@ -121,6 +122,7 @@ fun runSseMcpServerWithPlainConfiguration(port: Int, wait: Boolean = true) {
println("Server session closed for: ${transport.sessionId}") println("Server session closed for: ${transport.sessionId}")
serverSessions.remove(transport.sessionId) serverSessions.remove(transport.sessionId)
} }
awaitCancellation()
} }
post("/message") { post("/message") {
val sessionId: String? = call.request.queryParameters["sessionId"] val sessionId: String? = call.request.queryParameters["sessionId"]
@ -139,6 +141,8 @@ fun runSseMcpServerWithPlainConfiguration(port: Int, wait: Boolean = true) {
} }
} }
}.start(wait = wait) }.start(wait = wait)
return ktorServer
} }
/** /**

View file

@ -0,0 +1,17 @@
import io.ktor.server.engine.EmbeddedServer
import io.modelcontextprotocol.sample.server.runSseMcpServerUsingKtorPlugin
import io.modelcontextprotocol.sample.server.runSseMcpServerWithPlainConfiguration
enum class McpServerType(
val sseEndpoint: String,
val serverFactory: (port: Int) -> EmbeddedServer<*, *>
) {
KTOR_PLUGIN(
sseEndpoint = "",
serverFactory = { port -> runSseMcpServerUsingKtorPlugin(port, wait = false) }
),
PLAIN_CONFIGURATION(
sseEndpoint = "/sse",
serverFactory = { port -> runSseMcpServerWithPlainConfiguration(port, wait = false) }
)
}

View file

@ -11,9 +11,9 @@ import kotlin.test.assertNotNull
import kotlin.test.assertNull import kotlin.test.assertNull
import kotlin.test.assertTrue import kotlin.test.assertTrue
class SseServerIntegrationTest { abstract class SseServerIntegrationTestBase {
private val client: Client = TestEnvironment.client abstract val client: Client
@Test @Test
fun `should list tools`(): Unit = runBlocking { fun `should list tools`(): Unit = runBlocking {
@ -88,3 +88,13 @@ class SseServerIntegrationTest {
assertEquals(expected = "text", actual = "${content.type}".lowercase()) assertEquals(expected = "text", actual = "${content.type}".lowercase())
} }
} }
class SseServerKtorPluginIntegrationTest : SseServerIntegrationTestBase() {
private val testEnvironment = TestEnvironment(McpServerType.KTOR_PLUGIN)
override val client: Client = testEnvironment.client
}
class SseServerPlainConfigurationIntegrationTest : SseServerIntegrationTestBase() {
private val testEnvironment = TestEnvironment(McpServerType.PLAIN_CONFIGURATION)
override val client: Client = testEnvironment.client
}

View file

@ -1,34 +1,34 @@
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.engine.cio.CIO import io.ktor.client.engine.cio.CIO
import io.ktor.client.plugins.sse.SSE import io.ktor.client.plugins.sse.SSE
import io.modelcontextprotocol.kotlin.sdk.Implementation import io.ktor.server.engine.EmbeddedServer
import io.modelcontextprotocol.kotlin.sdk.client.Client import io.modelcontextprotocol.kotlin.sdk.client.Client
import io.modelcontextprotocol.kotlin.sdk.client.mcpSseTransport import io.modelcontextprotocol.kotlin.sdk.client.mcpSseTransport
import io.modelcontextprotocol.sample.server.runSseMcpServerUsingKtorPlugin import io.modelcontextprotocol.kotlin.sdk.types.Implementation
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
object TestEnvironment { class TestEnvironment(private val serverConfig: McpServerType) {
val server = runSseMcpServerUsingKtorPlugin(0, wait = false) val server: EmbeddedServer<*, *> = serverConfig.serverFactory(0)
val client: Client val client: Client
init { init {
client = runBlocking { client = runBlocking {
val port = server.engine.resolvedConnectors().single().port val port = server.engine.resolvedConnectors().single().port
initClient(port) initClient(port, serverConfig)
} }
Runtime.getRuntime().addShutdownHook( Runtime.getRuntime().addShutdownHook(
Thread { Thread {
println("🏁 Shutting down server") println("🏁 Shutting down server (${serverConfig.name})")
server.stop(500, 700, TimeUnit.MILLISECONDS) server.stop(500, 700, TimeUnit.MILLISECONDS)
println("☑️ Shutdown complete") println("☑️ Shutdown complete")
}, },
) )
} }
private suspend fun initClient(port: Int): Client { private suspend fun initClient(port: Int, config: McpServerType): Client {
val client = Client( val client = Client(
Implementation(name = "test-client", version = "0.1.0"), Implementation(name = "test-client", version = "0.1.0"),
) )
@ -37,13 +37,7 @@ object TestEnvironment {
install(SSE) install(SSE)
} }
// Create a transport wrapper that captures the session ID and received messages val transport = httpClient.mcpSseTransport("http://127.0.0.1:$port/${config.sseEndpoint}")
val transport = httpClient.mcpSseTransport {
url {
this.host = "127.0.0.1"
this.port = port
}
}
client.connect(transport) client.connect(transport)
return client return client
} }