Skip to content

Commit 094c294

Browse files
devcrocoddevcrocod
committed
Updated Transport.send method signature across all implementations to include TransportSendOptions. Added support for optional resumption tokens and progress callbacks in request handling.
# Conflicts: # kotlin-sdk-server/api/kotlin-sdk-server.api
1 parent f24c801 commit 094c294

File tree

20 files changed

+291
-80
lines changed

20 files changed

+291
-80
lines changed

‎kotlin-sdk-client/api/kotlin-sdk-client.api‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ public final class io/modelcontextprotocol/kotlin/sdk/client/SseClientTransport
6666
public synthetic fun <init> (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
6767
public synthetic fun <init> (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
6868
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
69-
public fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
69+
public fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
7070
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
7171
}
7272

7373
public final class io/modelcontextprotocol/kotlin/sdk/client/StdioClientTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
7474
public fun <init> (Lkotlinx/io/Source;Lkotlinx/io/Sink;)V
7575
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
76-
public fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
76+
public fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
7777
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
7878
}
7979

@@ -83,8 +83,8 @@ public final class io/modelcontextprotocol/kotlin/sdk/client/StreamableHttpClien
8383
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
8484
public final fun getProtocolVersion ()Ljava/lang/String;
8585
public final fun getSessionId ()Ljava/lang/String;
86+
public fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
8687
public final fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
87-
public fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
8888
public static synthetic fun send$default (Lio/modelcontextprotocol/kotlin/sdk/client/StreamableHttpClientTransport;Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
8989
public final fun setProtocolVersion (Ljava/lang/String;)V
9090
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

‎kotlin-sdk-client/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/client/SSEClientTransport.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import io.ktor.http.append
1515
import io.ktor.http.isSuccess
1616
import io.ktor.http.protocolWithAuthority
1717
import io.modelcontextprotocol.kotlin.sdk.shared.AbstractTransport
18+
import io.modelcontextprotocol.kotlin.sdk.shared.TransportSendOptions
1819
import io.modelcontextprotocol.kotlin.sdk.types.JSONRPCMessage
1920
import io.modelcontextprotocol.kotlin.sdk.types.McpJson
2021
import kotlinx.coroutines.CancellationException
@@ -98,7 +99,7 @@ public class SseClientTransport(
9899
}
99100

100101
@OptIn(ExperimentalCoroutinesApi::class)
101-
override suspend fun send(message: JSONRPCMessage) {
102+
override suspend fun send(message: JSONRPCMessage, options: TransportSendOptions?) {
102103
check(initialized.load()) { "SseClientTransport is not initialized!" }
103104
check(job?.isActive == true) { "SseClientTransport is closed!" }
104105
check(endpoint.isCompleted) { "Not connected!" }

‎kotlin-sdk-client/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/client/StdioClientTransport.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging
44
import io.modelcontextprotocol.kotlin.sdk.internal.IODispatcher
55
import io.modelcontextprotocol.kotlin.sdk.shared.AbstractTransport
66
import io.modelcontextprotocol.kotlin.sdk.shared.ReadBuffer
7+
import io.modelcontextprotocol.kotlin.sdk.shared.TransportSendOptions
78
import io.modelcontextprotocol.kotlin.sdk.shared.serializeMessage
89
import io.modelcontextprotocol.kotlin.sdk.types.JSONRPCMessage
910
import kotlinx.coroutines.CoroutineName
@@ -100,7 +101,7 @@ public class StdioClientTransport(private val input: Source, private val output:
100101
}
101102
}
102103

103-
override suspend fun send(message: JSONRPCMessage) {
104+
override suspend fun send(message: JSONRPCMessage, options: TransportSendOptions?) {
104105
if (!initialized.load()) {
105106
error("Transport not started")
106107
}

‎kotlin-sdk-client/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/client/StreamableHttpClientTransport.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import io.ktor.http.contentType
2222
import io.ktor.http.isSuccess
2323
import io.ktor.utils.io.readUTF8Line
2424
import io.modelcontextprotocol.kotlin.sdk.shared.AbstractTransport
25+
import io.modelcontextprotocol.kotlin.sdk.shared.TransportSendOptions
2526
import io.modelcontextprotocol.kotlin.sdk.types.JSONRPCMessage
2627
import io.modelcontextprotocol.kotlin.sdk.types.JSONRPCNotification
2728
import io.modelcontextprotocol.kotlin.sdk.types.JSONRPCRequest
@@ -89,8 +90,8 @@ public class StreamableHttpClientTransport(
8990
/**
9091
* Sends a single message with optional resumption support
9192
*/
92-
override suspend fun send(message: JSONRPCMessage) {
93-
send(message, null)
93+
override suspend fun send(message: JSONRPCMessage, options: TransportSendOptions?) {
94+
send(message, options?.resumptionToken, options?.onResumptionToken)
9495
}
9596

9697
/**

‎kotlin-sdk-client/src/commonTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/MockTransport.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.modelcontextprotocol.kotlin.sdk.client
22

33
import io.modelcontextprotocol.kotlin.sdk.shared.Transport
4+
import io.modelcontextprotocol.kotlin.sdk.shared.TransportSendOptions
45
import io.modelcontextprotocol.kotlin.sdk.types.CallToolResult
56
import io.modelcontextprotocol.kotlin.sdk.types.Implementation
67
import io.modelcontextprotocol.kotlin.sdk.types.InitializeResult
@@ -25,7 +26,7 @@ class MockTransport : Transport {
2526

2627
override suspend fun start() = Unit
2728

28-
override suspend fun send(message: JSONRPCMessage) {
29+
override suspend fun send(message: JSONRPCMessage, options: TransportSendOptions?) {
2930
mutex.withLock {
3031
_sentMessages += message
3132
}

‎kotlin-sdk-client/src/commonTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/OldSchemaMockTransport.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import io.modelcontextprotocol.kotlin.sdk.JSONRPCRequest
88
import io.modelcontextprotocol.kotlin.sdk.JSONRPCResponse
99
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
1010
import io.modelcontextprotocol.kotlin.sdk.shared.Transport
11+
import io.modelcontextprotocol.kotlin.sdk.shared.TransportSendOptions
1112
import kotlinx.coroutines.sync.Mutex
1213
import kotlinx.coroutines.sync.withLock
1314

@@ -25,7 +26,7 @@ class OldSchemaMockTransport : Transport {
2526

2627
override suspend fun start() = Unit
2728

28-
override suspend fun send(message: JSONRPCMessage) {
29+
override suspend fun send(message: JSONRPCMessage, options: TransportSendOptions?) {
2930
mutex.withLock {
3031
_sentMessages += message
3132
}

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

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,8 @@ public abstract class io/modelcontextprotocol/kotlin/sdk/shared/Protocol {
433433
public final fun getRequestHandlers ()Ljava/util/Map;
434434
public final fun getResponseHandlers ()Ljava/util/Map;
435435
public final fun getTransport ()Lio/modelcontextprotocol/kotlin/sdk/shared/Transport;
436-
public final fun notification (Lio/modelcontextprotocol/kotlin/sdk/types/Notification;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
436+
public final fun notification (Lio/modelcontextprotocol/kotlin/sdk/types/Notification;Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
437+
public static synthetic fun notification$default (Lio/modelcontextprotocol/kotlin/sdk/shared/Protocol;Lio/modelcontextprotocol/kotlin/sdk/types/Notification;Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
437438
public fun onClose ()V
438439
public fun onError (Ljava/lang/Throwable;)V
439440
public final fun removeNotificationHandler (Lio/modelcontextprotocol/kotlin/sdk/types/Method;)V
@@ -453,12 +454,19 @@ public final class io/modelcontextprotocol/kotlin/sdk/shared/ProtocolKt {
453454
}
454455

455456
public class io/modelcontextprotocol/kotlin/sdk/shared/ProtocolOptions {
456-
public synthetic fun <init> (ZJILkotlin/jvm/internal/DefaultConstructorMarker;)V
457-
public synthetic fun <init> (ZJLkotlin/jvm/internal/DefaultConstructorMarker;)V
457+
public fun <init> ()V
458+
public fun <init> (ZLjava/util/List;)V
459+
public synthetic fun <init> (ZLjava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
460+
public final fun component1 ()Z
461+
public final fun component2 ()Ljava/util/List;
462+
public fun copy (ZLjava/util/List;)Lio/modelcontextprotocol/kotlin/sdk/shared/ProtocolOptions;
463+
public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/shared/ProtocolOptions;ZLjava/util/List;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/shared/ProtocolOptions;
464+
public fun equals (Ljava/lang/Object;)Z
465+
public final fun getDebouncedNotificationMethods ()Ljava/util/List;
458466
public final fun getEnforceStrictCapabilities ()Z
459-
public final fun getTimeout-UwyO8pc ()J
467+
public fun hashCode ()I
460468
public final fun setEnforceStrictCapabilities (Z)V
461-
public final fun setTimeout-LRDsOJo (J)V
469+
public fun toString ()Ljava/lang/String;
462470
}
463471

464472
public final class io/modelcontextprotocol/kotlin/sdk/shared/ReadBuffer {
@@ -476,13 +484,13 @@ public final class io/modelcontextprotocol/kotlin/sdk/shared/RequestHandlerExtra
476484
public fun <init> ()V
477485
}
478486

479-
public final class io/modelcontextprotocol/kotlin/sdk/shared/RequestOptions {
480-
public synthetic fun <init> (Lkotlin/jvm/functions/Function1;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
481-
public synthetic fun <init> (Lkotlin/jvm/functions/Function1;JLkotlin/jvm/internal/DefaultConstructorMarker;)V
482-
public final fun component1 ()Lkotlin/jvm/functions/Function1;
483-
public final fun component2-UwyO8pc ()J
484-
public final fun copy-HG0u8IE (Lkotlin/jvm/functions/Function1;J)Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;
485-
public static synthetic fun copy-HG0u8IE$default (Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/jvm/functions/Function1;JILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;
487+
public final class io/modelcontextprotocol/kotlin/sdk/shared/RequestOptions : io/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions {
488+
public synthetic fun <init> (Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
489+
public synthetic fun <init> (Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;JLkotlin/jvm/internal/DefaultConstructorMarker;)V
490+
public final fun component4 ()Lkotlin/jvm/functions/Function1;
491+
public final fun component5-UwyO8pc ()J
492+
public final fun copy-9VgGkz4 (Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;J)Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;
493+
public static synthetic fun copy-9VgGkz4$default (Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;JILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;
486494
public fun equals (Ljava/lang/Object;)Z
487495
public final fun getOnProgress ()Lkotlin/jvm/functions/Function1;
488496
public final fun getTimeout-UwyO8pc ()J
@@ -495,16 +503,38 @@ public abstract interface class io/modelcontextprotocol/kotlin/sdk/shared/Transp
495503
public abstract fun onClose (Lkotlin/jvm/functions/Function0;)V
496504
public abstract fun onError (Lkotlin/jvm/functions/Function1;)V
497505
public abstract fun onMessage (Lkotlin/jvm/functions/Function2;)V
498-
public abstract fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
506+
public abstract fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
507+
public static synthetic fun send$default (Lio/modelcontextprotocol/kotlin/sdk/shared/Transport;Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
499508
public abstract fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
500509
}
501510

511+
public final class io/modelcontextprotocol/kotlin/sdk/shared/Transport$DefaultImpls {
512+
public static synthetic fun send$default (Lio/modelcontextprotocol/kotlin/sdk/shared/Transport;Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
513+
}
514+
515+
public class io/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions {
516+
public fun <init> ()V
517+
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
518+
public synthetic fun <init> (Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
519+
public final fun component1 ()Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;
520+
public final fun component2 ()Ljava/lang/String;
521+
public final fun component3 ()Lkotlin/jvm/functions/Function1;
522+
public fun copy (Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;
523+
public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;
524+
public fun equals (Ljava/lang/Object;)Z
525+
public final fun getOnResumptionToken ()Lkotlin/jvm/functions/Function1;
526+
public final fun getRelatedRequestId ()Lio/modelcontextprotocol/kotlin/sdk/types/RequestId;
527+
public final fun getResumptionToken ()Ljava/lang/String;
528+
public fun hashCode ()I
529+
public fun toString ()Ljava/lang/String;
530+
}
531+
502532
public abstract class io/modelcontextprotocol/kotlin/sdk/shared/WebSocketMcpTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
503533
public fun <init> ()V
504534
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
505535
protected abstract fun getSession ()Lio/ktor/websocket/WebSocketSession;
506536
protected abstract fun initializeSession (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
507-
public fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
537+
public fun send (Lio/modelcontextprotocol/kotlin/sdk/types/JSONRPCMessage;Lio/modelcontextprotocol/kotlin/sdk/shared/TransportSendOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
508538
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
509539
}
510540

0 commit comments

Comments
 (0)