Skip to content

Commit 4d426d0

Browse files
committed
SseClientTransport -> HttpClientTransport
1 parent ef3372f commit 4d426d0

21 files changed

+67
-67
lines changed

samples/ProtectedMcpClient/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
builder.AddConsole();
2626
});
2727

28-
var transport = new SseClientTransport(new()
28+
var transport = new HttpClientTransport(new()
2929
{
3030
Endpoint = new Uri(serverUrl),
3131
Name = "Secure Weather Client",

samples/QuickstartClient/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if (command == "http")
2020
{
2121
// make sure AspNetCoreMcpServer is running
22-
clientTransport = new SseClientTransport(new()
22+
clientTransport = new HttpClientTransport(new()
2323
{
2424
Endpoint = new Uri("http://localhost:3001")
2525
});

src/ModelContextProtocol.Core/Client/AutoDetectingClientSessionTransport.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ namespace ModelContextProtocol.Client;
1212
/// </summary>
1313
internal sealed partial class AutoDetectingClientSessionTransport : ITransport
1414
{
15-
private readonly SseClientTransportOptions _options;
15+
private readonly HttpClientTransportOptions _options;
1616
private readonly McpHttpClient _httpClient;
1717
private readonly ILoggerFactory? _loggerFactory;
1818
private readonly ILogger _logger;
1919
private readonly string _name;
2020
private readonly Channel<JsonRpcMessage> _messageChannel;
2121

22-
public AutoDetectingClientSessionTransport(string endpointName, SseClientTransportOptions transportOptions, McpHttpClient httpClient, ILoggerFactory? loggerFactory)
22+
public AutoDetectingClientSessionTransport(string endpointName, HttpClientTransportOptions transportOptions, McpHttpClient httpClient, ILoggerFactory? loggerFactory)
2323
{
2424
Throw.IfNull(transportOptions);
2525
Throw.IfNull(httpClient);

src/ModelContextProtocol.Core/Client/SseClientTransport.cs renamed to src/ModelContextProtocol.Core/Client/HttpClientTransport.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ namespace ModelContextProtocol.Client;
1313
/// Unlike the <see cref="StdioClientTransport"/>, this transport connects to an existing server
1414
/// rather than launching a new process.
1515
/// </remarks>
16-
public sealed class SseClientTransport : IClientTransport, IAsyncDisposable
16+
public sealed class HttpClientTransport : IClientTransport, IAsyncDisposable
1717
{
18-
private readonly SseClientTransportOptions _options;
18+
private readonly HttpClientTransportOptions _options;
1919
private readonly McpHttpClient _mcpHttpClient;
2020
private readonly ILoggerFactory? _loggerFactory;
2121

2222
private readonly HttpClient? _ownedHttpClient;
2323

2424
/// <summary>
25-
/// Initializes a new instance of the <see cref="SseClientTransport"/> class.
25+
/// Initializes a new instance of the <see cref="HttpClientTransport"/> class.
2626
/// </summary>
2727
/// <param name="transportOptions">Configuration options for the transport.</param>
2828
/// <param name="loggerFactory">Logger factory for creating loggers used for diagnostic output during transport operations.</param>
29-
public SseClientTransport(SseClientTransportOptions transportOptions, ILoggerFactory? loggerFactory = null)
29+
public HttpClientTransport(HttpClientTransportOptions transportOptions, ILoggerFactory? loggerFactory = null)
3030
: this(transportOptions, new HttpClient(), loggerFactory, ownsHttpClient: true)
3131
{
3232
}
3333

3434
/// <summary>
35-
/// Initializes a new instance of the <see cref="SseClientTransport"/> class with a provided HTTP client.
35+
/// Initializes a new instance of the <see cref="HttpClientTransport"/> class with a provided HTTP client.
3636
/// </summary>
3737
/// <param name="transportOptions">Configuration options for the transport.</param>
3838
/// <param name="httpClient">The HTTP client instance used for requests.</param>
@@ -41,7 +41,7 @@ public SseClientTransport(SseClientTransportOptions transportOptions, ILoggerFac
4141
/// <see langword="true"/> to dispose of <paramref name="httpClient"/> when the transport is disposed;
4242
/// <see langword="false"/> if the caller is retaining ownership of the <paramref name="httpClient"/>'s lifetime.
4343
/// </param>
44-
public SseClientTransport(SseClientTransportOptions transportOptions, HttpClient httpClient, ILoggerFactory? loggerFactory = null, bool ownsHttpClient = false)
44+
public HttpClientTransport(HttpClientTransportOptions transportOptions, HttpClient httpClient, ILoggerFactory? loggerFactory = null, bool ownsHttpClient = false)
4545
{
4646
Throw.IfNull(transportOptions);
4747
Throw.IfNull(httpClient);

src/ModelContextProtocol.Core/Client/SseClientTransportOptions.cs renamed to src/ModelContextProtocol.Core/Client/HttpClientTransportOptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace ModelContextProtocol.Client;
44

55
/// <summary>
6-
/// Provides options for configuring <see cref="SseClientTransport"/> instances.
6+
/// Provides options for configuring <see cref="HttpClientTransport"/> instances.
77
/// </summary>
8-
public sealed class SseClientTransportOptions
8+
public sealed class HttpClientTransportOptions
99
{
1010
/// <summary>
1111
/// Gets or sets the base address of the server for SSE connections.

src/ModelContextProtocol.Core/Client/SseClientSessionTransport.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ModelContextProtocol.Client;
1515
internal sealed partial class SseClientSessionTransport : TransportBase
1616
{
1717
private readonly McpHttpClient _httpClient;
18-
private readonly SseClientTransportOptions _options;
18+
private readonly HttpClientTransportOptions _options;
1919
private readonly Uri _sseEndpoint;
2020
private Uri? _messageEndpoint;
2121
private readonly CancellationTokenSource _connectionCts;
@@ -29,7 +29,7 @@ internal sealed partial class SseClientSessionTransport : TransportBase
2929
/// </summary>
3030
public SseClientSessionTransport(
3131
string endpointName,
32-
SseClientTransportOptions transportOptions,
32+
HttpClientTransportOptions transportOptions,
3333
McpHttpClient httpClient,
3434
Channel<JsonRpcMessage>? messageChannel,
3535
ILoggerFactory? loggerFactory)
@@ -42,7 +42,7 @@ public SseClientSessionTransport(
4242
_sseEndpoint = transportOptions.Endpoint;
4343
_httpClient = httpClient;
4444
_connectionCts = new CancellationTokenSource();
45-
_logger = (ILogger?)loggerFactory?.CreateLogger<SseClientTransport>() ?? NullLogger.Instance;
45+
_logger = (ILogger?)loggerFactory?.CreateLogger<HttpClientTransport>() ?? NullLogger.Instance;
4646
_connectionEstablished = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
4747
}
4848

src/ModelContextProtocol.Core/Client/StreamableHttpClientSessionTransport.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal sealed partial class StreamableHttpClientSessionTransport : TransportBa
1717
private static readonly MediaTypeWithQualityHeaderValue s_textEventStreamMediaType = new("text/event-stream");
1818

1919
private readonly McpHttpClient _httpClient;
20-
private readonly SseClientTransportOptions _options;
20+
private readonly HttpClientTransportOptions _options;
2121
private readonly CancellationTokenSource _connectionCts;
2222
private readonly ILogger _logger;
2323

@@ -29,7 +29,7 @@ internal sealed partial class StreamableHttpClientSessionTransport : TransportBa
2929

3030
public StreamableHttpClientSessionTransport(
3131
string endpointName,
32-
SseClientTransportOptions transportOptions,
32+
HttpClientTransportOptions transportOptions,
3333
McpHttpClient httpClient,
3434
Channel<JsonRpcMessage>? messageChannel,
3535
ILoggerFactory? loggerFactory)
@@ -41,7 +41,7 @@ public StreamableHttpClientSessionTransport(
4141
_options = transportOptions;
4242
_httpClient = httpClient;
4343
_connectionCts = new CancellationTokenSource();
44-
_logger = (ILogger?)loggerFactory?.CreateLogger<SseClientTransport>() ?? NullLogger.Instance;
44+
_logger = (ILogger?)loggerFactory?.CreateLogger<HttpClientTransport>() ?? NullLogger.Instance;
4545

4646
// We connect with the initialization request with the MCP transport. This means that any errors won't be observed
4747
// until the first call to SendMessageAsync. Fortunately, that happens internally in McpClient.ConnectAsync
@@ -291,7 +291,7 @@ internal static void CopyAdditionalHeaders(
291291
{
292292
if (!headers.TryAddWithoutValidation(header.Key, header.Value))
293293
{
294-
throw new InvalidOperationException($"Failed to add header '{header.Key}' with value '{header.Value}' from {nameof(SseClientTransportOptions.AdditionalHeaders)}.");
294+
throw new InvalidOperationException($"Failed to add header '{header.Key}' with value '{header.Value}' from {nameof(HttpClientTransportOptions.AdditionalHeaders)}.");
295295
}
296296
}
297297
}

tests/ModelContextProtocol.AspNetCore.Tests/AuthEventTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public async Task CanAuthenticate_WithResourceMetadataFromEvent()
106106

107107
await app.StartAsync(TestContext.Current.CancellationToken);
108108

109-
await using var transport = new SseClientTransport(
109+
await using var transport = new HttpClientTransport(
110110
new()
111111
{
112112
Endpoint = new(McpServerUrl),
@@ -142,7 +142,7 @@ public async Task CanAuthenticate_WithDynamicClientRegistration_FromEvent()
142142

143143
DynamicClientRegistrationResponse? dcrResponse = null;
144144

145-
await using var transport = new SseClientTransport(
145+
await using var transport = new HttpClientTransport(
146146
new()
147147
{
148148
Endpoint = new(McpServerUrl),

tests/ModelContextProtocol.AspNetCore.Tests/AuthTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public async Task CanAuthenticate()
9797

9898
await app.StartAsync(TestContext.Current.CancellationToken);
9999

100-
await using var transport = new SseClientTransport(new()
100+
await using var transport = new HttpClientTransport(new()
101101
{
102102
Endpoint = new(McpServerUrl),
103103
OAuth = new()
@@ -124,7 +124,7 @@ public async Task CannotAuthenticate_WithoutOAuthConfiguration()
124124

125125
await app.StartAsync(TestContext.Current.CancellationToken);
126126

127-
await using var transport = new SseClientTransport(new()
127+
await using var transport = new HttpClientTransport(new()
128128
{
129129
Endpoint = new(McpServerUrl),
130130
}, HttpClient, LoggerFactory);
@@ -146,7 +146,7 @@ public async Task CannotAuthenticate_WithUnregisteredClient()
146146

147147
await app.StartAsync(TestContext.Current.CancellationToken);
148148

149-
await using var transport = new SseClientTransport(new()
149+
await using var transport = new HttpClientTransport(new()
150150
{
151151
Endpoint = new(McpServerUrl),
152152
OAuth = new()
@@ -174,7 +174,7 @@ public async Task CanAuthenticate_WithDynamicClientRegistration()
174174

175175
await app.StartAsync(TestContext.Current.CancellationToken);
176176

177-
await using var transport = new SseClientTransport(new()
177+
await using var transport = new HttpClientTransport(new()
178178
{
179179
Endpoint = new(McpServerUrl),
180180
OAuth = new ClientOAuthOptions()
@@ -205,7 +205,7 @@ public async Task CanAuthenticate_WithTokenRefresh()
205205

206206
await app.StartAsync(TestContext.Current.CancellationToken);
207207

208-
await using var transport = new SseClientTransport(new()
208+
await using var transport = new HttpClientTransport(new()
209209
{
210210
Endpoint = new(McpServerUrl),
211211
OAuth = new()
@@ -236,7 +236,7 @@ public async Task CanAuthenticate_WithExtraParams()
236236

237237
await app.StartAsync(TestContext.Current.CancellationToken);
238238

239-
await using var transport = new SseClientTransport(new()
239+
await using var transport = new HttpClientTransport(new()
240240
{
241241
Endpoint = new(McpServerUrl),
242242
OAuth = new()
@@ -270,7 +270,7 @@ public async Task CannotOverrideExistingParameters_WithExtraParams()
270270

271271
await app.StartAsync(TestContext.Current.CancellationToken);
272272

273-
await using var transport = new SseClientTransport(new()
273+
await using var transport = new HttpClientTransport(new()
274274
{
275275
Endpoint = new(McpServerUrl),
276276
OAuth = new()

tests/ModelContextProtocol.AspNetCore.Tests/HttpServerIntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public override void Dispose()
2121
base.Dispose();
2222
}
2323

24-
protected abstract SseClientTransportOptions ClientTransportOptions { get; }
24+
protected abstract HttpClientTransportOptions ClientTransportOptions { get; }
2525

2626
private Task<McpClient> GetClientAsync(McpClientOptions? options = null)
2727
{

0 commit comments

Comments
 (0)