modelcontextprotocol/kotlin-sdk
Watch
1
0
Fork
You've already forked kotlin-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

sse server does not process endpoint correctly when sse path is not a directory (#43)

Browse source 
* fix SSEClientTransport endpoint process with none directory sse path

* fix SSEClientTransport endpoint process with none directory sse path

* Refactor `SseTransportTest` to use `route` for better clarity and update server handling with suspend functions.

---------

Co-authored-by: tpp-builder <tpp-builder@alibaba-inc.com>
Co-authored-by: devcrocod <devcrocod@gmail.com>
Co-authored-by: Leonid Stashevsky <e5l@users.noreply.github.com>
This commit is contained in:
shendaxia 2025-07-04 20:21:11 +08:00 • committed by GitHub
commit 958e5e5ee9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/client/SSEClientTransport.kt
View file

@ -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() {
@ -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)

40
src/commonTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/SseTransportTest.kt
View file

@ -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()
}
}