modelcontextprotocol/csharp-sdk
Watch
1
0
Fork
You've already forked csharp-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove warnings from build (#29)

Browse source 
* Remove warnings from build

* More fixes.

* Using const for transport types
This commit is contained in:
Toni Wenzel 2025-03-06 21:02:13 +01:00 • committed by GitHub
commit 7d69499ad5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 277 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/mcpdotnet/Shared/McpJsonRpcEndpoint.cs
View file

@ -1,11 +1,11 @@
using System.Collections.Concurrent;
using System.Text.Json;
using Microsoft.Extensions.Logging;
using McpDotNet.Client;
using McpDotNet.Logging;
using McpDotNet.Protocol.Messages;
using McpDotNet.Protocol.Transport;
using McpDotNet.Utils.Json;
using McpDotNet.Logging;
using Microsoft.Extensions.Logging;
namespace McpDotNet.Shared;
@ -21,10 +21,8 @@ internal abstract class McpJsonRpcEndpoint
private readonly ITransport _transport;
private readonly ConcurrentDictionary<RequestId, TaskCompletionSource<IJsonRpcMessage>> _pendingRequests;
private readonly ConcurrentDictionary<string, List<Func<JsonRpcNotification, Task>>> _notificationHandlers;
private readonly Dictionary<string, Func<JsonRpcRequest, Task<object>>> _requestHandlers = new();
private readonly Dictionary<string, Func<JsonRpcRequest, Task<object>>> _requestHandlers = [];
private int _nextRequestId;
private Task? _messageProcessingTask;
private CancellationTokenSource? _cts;
private readonly JsonSerializerOptions _jsonOptions;
private readonly ILogger<McpClient> _logger;
@ -33,7 +31,7 @@ internal abstract class McpJsonRpcEndpoint
/// </summary>
/// <param name="transport">An MCP transport implementation.</param>
/// <param name="loggerFactory">The logger factory.</param>
public McpJsonRpcEndpoint(ITransport transport, ILoggerFactory loggerFactory)
protected McpJsonRpcEndpoint(ITransport transport, ILoggerFactory loggerFactory)
{
_transport = transport;
_pendingRequests = new();
@ -330,7 +328,7 @@ internal abstract class McpJsonRpcEndpoint
/// <param name="handler">The async handler function to process notifications.</param>
public void OnNotification(string method, Func<JsonRpcNotification, Task> handler)
{
var handlers = _notificationHandlers.GetOrAdd(method, _ => new());
var handlers = _notificationHandlers.GetOrAdd(method, _ => []);
lock (handlers)
{
handlers.Add(handler);
@ -351,12 +349,9 @@ internal abstract class McpJsonRpcEndpoint
/// <typeparam name="TResponse">Type of response payload (not full RPC response</typeparam>
/// <param name="method">Method identifier to register for</param>
/// <param name="handler">Handler to be called when a request with specified method identifier is received</param>
protected void SetRequestHandler<TRequest, TResponse>(string method, Func<TRequest, Task<TResponse>> handler)
protected void SetRequestHandler<TRequest, TResponse>(string method, Func<TRequest?, Task<TResponse>> handler) where TResponse : class
{
if (handler is null)
{
throw new ArgumentNullException(nameof(handler));
}
ArgumentNullException.ThrowIfNull(handler);
_requestHandlers[method] = async (request) =>
{
@ -371,20 +366,12 @@ internal abstract class McpJsonRpcEndpoint
/// <summary>
/// Task that processes incoming messages from the transport.
/// </summary>
protected Task? MessageProcessingTask
{
get => _messageProcessingTask;
set => _messageProcessingTask = value;
}
protected Task? MessageProcessingTask { get; set; }
/// <summary>
/// CancellationTokenSource used to cancel the message processing task.
/// </summary>
protected CancellationTokenSource? CancellationTokenSource
{
get => _cts;
set => _cts = value;
}
protected CancellationTokenSource? CancellationTokenSource { get; set; }
/// <summary>
/// Cleans up the endpoint and releases resources.
@ -394,13 +381,14 @@ internal abstract class McpJsonRpcEndpoint
{
_logger.CleaningUpEndpoint(EndpointName);
_cts?.Cancel();
if (CancellationTokenSource != null)
await CancellationTokenSource.CancelAsync();
if (_messageProcessingTask != null)
if (MessageProcessingTask != null)
{
try
{
await _messageProcessingTask.ConfigureAwait(false);
await MessageProcessingTask.ConfigureAwait(false);
}
catch (OperationCanceledException)
{
@ -416,7 +404,7 @@ internal abstract class McpJsonRpcEndpoint
_pendingRequests.Clear();
await _transport.DisposeAsync().ConfigureAwait(false);
_cts?.Dispose();
CancellationTokenSource?.Dispose();
IsInitialized = false;