parent
4b88c7cb82
commit
07f661a94c
2 changed files with 12 additions and 4 deletions
|
|
@ -19,6 +19,7 @@ import kotlinx.atomicfu.atomic
|
||||||
import kotlinx.atomicfu.update
|
import kotlinx.atomicfu.update
|
||||||
import kotlinx.collections.immutable.PersistentMap
|
import kotlinx.collections.immutable.PersistentMap
|
||||||
import kotlinx.collections.immutable.toPersistentMap
|
import kotlinx.collections.immutable.toPersistentMap
|
||||||
|
import kotlinx.coroutines.awaitCancellation
|
||||||
|
|
||||||
private val logger = KotlinLogging.logger {}
|
private val logger = KotlinLogging.logger {}
|
||||||
|
|
||||||
|
|
@ -91,6 +92,8 @@ internal suspend fun ServerSSESession.mcpSseEndpoint(
|
||||||
server.createSession(transport)
|
server.createSession(transport)
|
||||||
|
|
||||||
logger.debug { "Server connected to transport for sessionId: ${transport.sessionId}" }
|
logger.debug { "Server connected to transport for sessionId: ${transport.sessionId}" }
|
||||||
|
|
||||||
|
awaitCancellation()
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun ServerSSESession.mcpSseTransport(
|
internal fun ServerSSESession.mcpSseTransport(
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,11 @@ import io.ktor.server.sse.ServerSSESession
|
||||||
import io.modelcontextprotocol.kotlin.sdk.JSONRPCMessage
|
import io.modelcontextprotocol.kotlin.sdk.JSONRPCMessage
|
||||||
import io.modelcontextprotocol.kotlin.sdk.shared.AbstractTransport
|
import io.modelcontextprotocol.kotlin.sdk.shared.AbstractTransport
|
||||||
import io.modelcontextprotocol.kotlin.sdk.shared.McpJson
|
import io.modelcontextprotocol.kotlin.sdk.shared.McpJson
|
||||||
|
import kotlinx.coroutines.InternalCoroutinesApi
|
||||||
import kotlinx.coroutines.job
|
import kotlinx.coroutines.job
|
||||||
import kotlin.concurrent.atomics.AtomicBoolean
|
import kotlin.concurrent.atomics.AtomicBoolean
|
||||||
import kotlin.concurrent.atomics.ExperimentalAtomicApi
|
import kotlin.concurrent.atomics.ExperimentalAtomicApi
|
||||||
|
import kotlin.coroutines.cancellation.CancellationException
|
||||||
import kotlin.uuid.ExperimentalUuidApi
|
import kotlin.uuid.ExperimentalUuidApi
|
||||||
import kotlin.uuid.Uuid
|
import kotlin.uuid.Uuid
|
||||||
|
|
||||||
|
|
@ -53,10 +55,13 @@ public class SseServerTransport(private val endpoint: String, private val sessio
|
||||||
data = "${endpoint.encodeURLPath()}?$SESSION_ID_PARAM=$sessionId",
|
data = "${endpoint.encodeURLPath()}?$SESSION_ID_PARAM=$sessionId",
|
||||||
)
|
)
|
||||||
|
|
||||||
try {
|
@OptIn(InternalCoroutinesApi::class)
|
||||||
session.coroutineContext.job.join()
|
session.coroutineContext.job.invokeOnCompletion {
|
||||||
} finally {
|
if (it != null && it !is CancellationException) {
|
||||||
_onClose.invoke()
|
_onError.invoke(it)
|
||||||
|
} else {
|
||||||
|
_onClose.invoke()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue