Skip to content

Commit 18a4174

Browse files
committed
Remove Protocol from Server
1 parent 4b26a7b commit 18a4174

File tree

7 files changed

+198
-613
lines changed

7 files changed

+198
-613
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
@@ -156,12 +156,14 @@ public open class Client(private val clientInfo: Implementation, options: Client
156156
serverVersion = result.serverInfo
157157

158158
notification(InitializedNotification())
159-
} catch (error: CancellationException) {
160-
throw IllegalStateException("Error connecting to transport: ${error.message}")
161159
} catch (error: Throwable) {
162-
logger.error(error) { "Failed to initialize client" }
160+
logger.error(error) { "Failed to initialize client: ${error.message}" }
163161
close()
164162

163+
if (error !is CancellationException) {
164+
throw IllegalStateException("Error connecting to transport: ${error.message}")
165+
}
166+
165167
throw error
166168
}
167169
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3312,11 +3312,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/client/KtorClientKt {
33123312
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;
33133313
}
33143314

3315-
public final class io/modelcontextprotocol/kotlin/sdk/client/MainKt {
3316-
public static final fun main ()V
3317-
public static synthetic fun main ([Ljava/lang/String;)V
3318-
}
3319-
33203315
public final class io/modelcontextprotocol/kotlin/sdk/client/SseClientTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
33213316
public synthetic fun <init> (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
33223317
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
@@ -58,6 +58,12 @@ public fun Routing.mcp(block: ServerSSESession.() -> Server) {
5858
}
5959
}
6060

61+
@Suppress("FunctionName")
62+
@Deprecated("Use mcp() instead", ReplaceWith("mcp(block)"), DeprecationLevel.ERROR)
63+
public fun Application.MCP(block: () -> Server) {
64+
mcp(block)
65+
}
66+
6167
@KtorDsl
6268
public fun Application.mcp(block: ServerSSESession.() -> Server) {
6369
install(SSE)
@@ -81,7 +87,7 @@ internal suspend fun ServerSSESession.mcpSseEndpoint(
8187
sseTransportManager.removeTransport(transport.sessionId)
8288
}
8389

84-
server.connectSession(transport)
90+
server.connect(transport)
8591

8692
logger.debug { "Server connected to transport for sessionId: ${transport.sessionId}" }
8793
}

0 commit comments

Comments
 (0)