Skip to content

Commit fcf25b6

Browse files
committed
Remove Protocol from Server
1 parent f9f1a15 commit fcf25b6

File tree

7 files changed

+198
-604
lines changed

7 files changed

+198
-604
lines changed

kotlin-sdk-client/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/client/Client.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,14 @@ public open class Client(
158158
serverVersion = result.serverInfo
159159

160160
notification(InitializedNotification())
161-
} catch (error: CancellationException) {
162-
throw IllegalStateException("Error connecting to transport: ${error.message}")
163161
} catch (error: Throwable) {
164-
logger.error(error) { "Failed to initialize client" }
162+
logger.error(error) { "Failed to initialize client: ${error.message}" }
165163
close()
166164

165+
if (error !is CancellationException) {
166+
throw IllegalStateException("Error connecting to transport: ${error.message}")
167+
}
168+
167169
throw error
168170
}
169171
}

kotlin-sdk-core/api/kotlin-sdk-core.api

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,11 +3258,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/client/KtorClientKt {
32583258
public static synthetic fun mcpSseTransport-5_5nbZA$default (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/client/SseClientTransport;
32593259
}
32603260

3261-
public final class io/modelcontextprotocol/kotlin/sdk/client/MainKt {
3262-
public static final fun main ()V
3263-
public static synthetic fun main ([Ljava/lang/String;)V
3264-
}
3265-
32663261
public final class io/modelcontextprotocol/kotlin/sdk/client/SseClientTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
32673262
public synthetic fun <init> (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
32683263
public synthetic fun <init> (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V

kotlin-sdk-server/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/server/KtorServer.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ public fun Routing.mcp(block: () -> Server) {
5151
}
5252
}
5353

54+
@Suppress("FunctionName")
55+
@Deprecated("Use mcp() instead", ReplaceWith("mcp(block)"), DeprecationLevel.ERROR)
56+
public fun Application.MCP(block: () -> Server) {
57+
mcp(block)
58+
}
59+
5460
@KtorDsl
5561
public fun Application.mcp(block: () -> Server) {
5662
install(SSE)
@@ -74,7 +80,7 @@ internal suspend fun ServerSSESession.mcpSseEndpoint(
7480
sseTransportManager.removeTransport(transport.sessionId)
7581
}
7682

77-
server.connectSession(transport)
83+
server.connect(transport)
7884

7985
logger.debug { "Server connected to transport for sessionId: ${transport.sessionId}" }
8086
}

0 commit comments

Comments
 (0)