parent
c2c0df5992
commit
8426228bf8
4 changed files with 64 additions and 22 deletions
|
|
@ -29,7 +29,7 @@ Add the dependency:
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("io.modelcontextprotocol:kotlin-sdk:0.2.0")
|
implementation("io.modelcontextprotocol:kotlin-sdk:0.3.0")
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,9 @@ public class SSEClientTransport(
|
||||||
private var session: ClientSSESession by Delegates.notNull()
|
private var session: ClientSSESession by Delegates.notNull()
|
||||||
private val endpoint = CompletableDeferred<String>()
|
private val endpoint = CompletableDeferred<String>()
|
||||||
|
|
||||||
override var onClose: (() -> Unit)? = null
|
private var _onClose: (() -> Unit) = {}
|
||||||
override var onError: ((Throwable) -> Unit)? = null
|
private var _onError: ((Throwable) -> Unit) = {}
|
||||||
override var onMessage: (suspend ((JSONRPCMessage) -> Unit))? = null
|
private var _onMessage: (suspend ((JSONRPCMessage) -> Unit)) = {}
|
||||||
|
|
||||||
private var job: Job? = null
|
private var job: Job? = null
|
||||||
|
|
||||||
|
|
@ -67,7 +67,7 @@ public class SSEClientTransport(
|
||||||
when (event.event) {
|
when (event.event) {
|
||||||
"error" -> {
|
"error" -> {
|
||||||
val e = IllegalStateException("SSE error: ${event.data}")
|
val e = IllegalStateException("SSE error: ${event.data}")
|
||||||
onError?.invoke(e)
|
_onError(e)
|
||||||
throw e
|
throw e
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -84,7 +84,7 @@ public class SSEClientTransport(
|
||||||
|
|
||||||
endpoint.complete(maybeEndpoint.toString())
|
endpoint.complete(maybeEndpoint.toString())
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
onError?.invoke(e)
|
_onError(e)
|
||||||
close()
|
close()
|
||||||
error(e)
|
error(e)
|
||||||
}
|
}
|
||||||
|
|
@ -93,9 +93,9 @@ public class SSEClientTransport(
|
||||||
else -> {
|
else -> {
|
||||||
try {
|
try {
|
||||||
val message = McpJson.decodeFromString<JSONRPCMessage>(event.data ?: "")
|
val message = McpJson.decodeFromString<JSONRPCMessage>(event.data ?: "")
|
||||||
onMessage?.invoke(message)
|
_onMessage(message)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
onError?.invoke(e)
|
_onError(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -122,7 +122,7 @@ public class SSEClientTransport(
|
||||||
error("Error POSTing to endpoint (HTTP ${response.status}): $text")
|
error("Error POSTing to endpoint (HTTP ${response.status}): $text")
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
onError?.invoke(e)
|
_onError(e)
|
||||||
throw e
|
throw e
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -133,7 +133,31 @@ public class SSEClientTransport(
|
||||||
}
|
}
|
||||||
|
|
||||||
session.cancel()
|
session.cancel()
|
||||||
onClose?.invoke()
|
_onClose()
|
||||||
job?.cancelAndJoin()
|
job?.cancelAndJoin()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onClose(block: () -> Unit) {
|
||||||
|
val old = _onClose
|
||||||
|
_onClose = {
|
||||||
|
old()
|
||||||
|
block()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onError(block: (Throwable) -> Unit) {
|
||||||
|
val old = _onError
|
||||||
|
_onError = { e ->
|
||||||
|
old(e)
|
||||||
|
block(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onMessage(block: suspend (JSONRPCMessage) -> Unit) {
|
||||||
|
val old = _onMessage
|
||||||
|
_onMessage = { message ->
|
||||||
|
old(message)
|
||||||
|
block(message)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,9 @@ public class ServerOptions(
|
||||||
public open class Server(
|
public open class Server(
|
||||||
private val serverInfo: Implementation,
|
private val serverInfo: Implementation,
|
||||||
options: ServerOptions,
|
options: ServerOptions,
|
||||||
public var onCloseCallback: (() -> Unit)? = null
|
|
||||||
) : Protocol(options) {
|
) : Protocol(options) {
|
||||||
|
private var _onInitialized: (() -> Unit) = {}
|
||||||
|
private var _onClose: () -> Unit = {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The client's reported capabilities after initialization.
|
* The client's reported capabilities after initialization.
|
||||||
|
|
@ -49,18 +50,13 @@ public open class Server(
|
||||||
*/
|
*/
|
||||||
public var clientVersion: Implementation? = null
|
public var clientVersion: Implementation? = null
|
||||||
private set
|
private set
|
||||||
|
|
||||||
private val capabilities: ServerCapabilities = options.capabilities
|
private val capabilities: ServerCapabilities = options.capabilities
|
||||||
|
|
||||||
private val tools = mutableMapOf<String, RegisteredTool>()
|
private val tools = mutableMapOf<String, RegisteredTool>()
|
||||||
private val prompts = mutableMapOf<String, RegisteredPrompt>()
|
private val prompts = mutableMapOf<String, RegisteredPrompt>()
|
||||||
private val resources = mutableMapOf<String, RegisteredResource>()
|
private val resources = mutableMapOf<String, RegisteredResource>()
|
||||||
|
|
||||||
/**
|
|
||||||
* A callback invoked when the server has completed the initialization sequence.
|
|
||||||
* After initialization, the server is ready to handle requests.
|
|
||||||
*/
|
|
||||||
public var onInitialized: (() -> Unit)? = null
|
|
||||||
|
|
||||||
init {
|
init {
|
||||||
logger.debug { "Initializing MCP server with capabilities: $capabilities" }
|
logger.debug { "Initializing MCP server with capabilities: $capabilities" }
|
||||||
|
|
||||||
|
|
@ -69,7 +65,7 @@ public open class Server(
|
||||||
handleInitialize(request)
|
handleInitialize(request)
|
||||||
}
|
}
|
||||||
setNotificationHandler<InitializedNotification>(Method.Defined.NotificationsInitialized) {
|
setNotificationHandler<InitializedNotification>(Method.Defined.NotificationsInitialized) {
|
||||||
onInitialized?.invoke()
|
_onInitialized()
|
||||||
CompletableDeferred(Unit)
|
CompletableDeferred(Unit)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -107,13 +103,35 @@ public open class Server(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a callback to be invoked when the server has completed initialization.
|
||||||
|
*/
|
||||||
|
public fun onInitalized(block: () -> Unit) {
|
||||||
|
val old = _onInitialized
|
||||||
|
_onInitialized = {
|
||||||
|
old()
|
||||||
|
block()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a callback to be invoked when the server connection is closing.
|
||||||
|
*/
|
||||||
|
public fun onClose(block: () -> Unit) {
|
||||||
|
val old = _onClose
|
||||||
|
_onClose = {
|
||||||
|
old()
|
||||||
|
block()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when the server connection is closing.
|
* Called when the server connection is closing.
|
||||||
* Invokes [onCloseCallback] if set.
|
* Invokes [onCloseCallback] if set.
|
||||||
*/
|
*/
|
||||||
override fun onClose() {
|
override fun onClose() {
|
||||||
logger.info { "Server connection closing" }
|
logger.info { "Server connection closing" }
|
||||||
onCloseCallback?.invoke()
|
_onClose()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ public interface Transport {
|
||||||
*
|
*
|
||||||
* This should be invoked when close() is called as well.
|
* This should be invoked when close() is called as well.
|
||||||
*/
|
*/
|
||||||
public var onClose: (() -> Unit)?
|
public fun onClose(block: () -> Unit)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Callback for when an error occurs.
|
* Callback for when an error occurs.
|
||||||
|
|
@ -39,10 +39,10 @@ public interface Transport {
|
||||||
* Note that errors are not necessarily fatal; they are used for reporting any kind of
|
* Note that errors are not necessarily fatal; they are used for reporting any kind of
|
||||||
* exceptional condition out of band.
|
* exceptional condition out of band.
|
||||||
*/
|
*/
|
||||||
public var onError: ((Throwable) -> Unit)?
|
public fun onError(block: (Throwable) -> Unit)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Callback for when a message (request or response) is received over the connection.
|
* Callback for when a message (request or response) is received over the connection.
|
||||||
*/
|
*/
|
||||||
public var onMessage: (suspend ((JSONRPCMessage) -> Unit))?
|
public fun onMessage(block: suspend (JSONRPCMessage) -> Unit)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue