Merge branch 'main' into devcrocod/update-dependabot

Author: e5l

gradle/libs.versions.toml

@@ -4,14 +4,14 @@ kotlin = "2.2.0"
 dokka = "2.0.0"
 
 # libraries version
-serialization = "1.8.1"
+serialization = "1.9.0"
 coroutines = "1.10.2"
 ktor = "3.1.3"
-mockk = "1.13.13"
+mockk = "1.14.4"
 logging = "7.0.7"
 jreleaser = "1.17.0"
 binaryCompatibilityValidatorPlugin = "0.18.0"
-slf4j = "2.0.16"
+slf4j = "2.0.17"
 kotest = "5.9.1"
 
 [libraries]

src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/client/SSEClientTransport.kt

@@ -12,6 +12,7 @@ import io.ktor.http.HttpHeaders
 import io.ktor.http.Url
 import io.ktor.http.append
 import io.ktor.http.isSuccess
+import io.ktor.http.protocolWithAuthority
 import io.modelcontextprotocol.kotlin.sdk.JSONRPCMessage
 import io.modelcontextprotocol.kotlin.sdk.shared.AbstractTransport
 import io.modelcontextprotocol.kotlin.sdk.shared.McpJson
@@ -24,7 +25,6 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.launch
-import kotlinx.serialization.encodeToString
 import kotlin.concurrent.atomics.AtomicBoolean
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
 import kotlin.properties.Delegates
@@ -55,7 +55,18 @@ public class SseClientTransport(
     private var job: Job? = null
 
     private val baseUrl by lazy {
-        session.call.request.url.toString().removeSuffix("/sse")
+        val requestUrl = session.call.request.url.toString()
+        val url = Url(requestUrl)
+        var path = url.encodedPath
+        if (path.isEmpty()) {
+            url.protocolWithAuthority
+        } else if (path.endsWith("/")) {
+            url.protocolWithAuthority + path.removeSuffix("/")
+        } else {
+            // the last item is not a directory, so will not be taken into account
+            path = path.substring(0, path.lastIndexOf("/"))
+            url.protocolWithAuthority + path
+        }
     }
 
     override suspend fun start() {
@@ -68,7 +79,7 @@ public class SseClientTransport(
 
         session = urlString?.let {
             client.sseSession(
-                urlString = "$it/sse",
+                urlString = it,
                 reconnectionTime = reconnectionTime,
                 block = requestBuilder,
             )
@@ -95,8 +106,7 @@ public class SseClientTransport(
                             val eventData = event.data ?: ""
 
                             // check url correctness
-                            val maybeEndpoint = Url(baseUrl + eventData)
-
+                            val maybeEndpoint = Url("$baseUrl/${if (eventData.startsWith("/")) eventData.substring(1) else eventData}")
                             endpoint.complete(maybeEndpoint.toString())
                         } catch (e: Exception) {
                             _onError(e)

src/commonTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/SseTransportTest.kt

@@ -6,6 +6,7 @@ import io.ktor.server.application.install
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.routing.post
+import io.ktor.server.routing.route
 import io.ktor.server.routing.routing
 import io.ktor.server.sse.sse
 import io.ktor.util.collections.ConcurrentMap
@@ -82,4 +83,43 @@ class SseTransportTest : BaseTransportTest() {
         testClientRead(client)
         server.stopSuspend()
     }
+
+    @Test
+    fun `test sse path not root path`() = runTest {
+        val port = 3007
+        val server = embeddedServer(CIO, port = port) {
+            install(io.ktor.server.sse.SSE)
+            val transports = ConcurrentMap<String, SseServerTransport>()
+            routing {
+                route("/sse") {
+                    sse {
+                        mcpSseTransport("", transports).apply {
+                            onMessage {
+                                send(it)
+                            }
+
+                            start()
+                        }
+                    }
+
+                    post {
+                        mcpPostEndpoint(transports)
+                    }
+                }
+            }
+        }.startSuspend(wait = false)
+
+        val client = HttpClient {
+            install(SSE)
+        }.mcpSseTransport {
+            url {
+                host = "localhost"
+                this.port = port
+                pathSegments = listOf("sse")
+            }
+        }
+
+        testClientRead(client)
+        server.stopSuspend()
+    }
 }

src/commonTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/SseIntegrationTest.kt

@@ -2,9 +2,11 @@ package io.modelcontextprotocol.kotlin.sdk.integration
 
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.sse.SSE
+import io.ktor.server.application.install
 import io.ktor.server.cio.CIOApplicationEngine
 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
@@ -52,7 +54,12 @@ class SseIntegrationTest {
             ServerOptions(capabilities = ServerCapabilities()),
         )
 
-        return embeddedServer(ServerCIO, host = URL, port = PORT) { mcp { server } }.startSuspend(wait = false)
+        return embeddedServer(ServerCIO, host = URL, port = PORT) { 
+            install(io.ktor.server.sse.SSE)
+            routing { 
+                mcp { server } 
+            } 
+        }.startSuspend(wait = false)
     }
 
     companion object {