Rename CanReadUri to IsMatch

- Improve comments

Author: halter73

src/ModelContextProtocol.AspNetCore/HttpServerTransportOptions.cs

@@ -23,11 +23,12 @@ public class HttpServerTransportOptions
     public Func<HttpContext, McpServer, CancellationToken, Task>? RunSessionHandler { get; set; }
 
     /// <summary>
-    /// Gets or sets whether the server should run in a stateless mode which allows for load balancing without session affinity.
+    /// Gets or sets whether the server should run in a stateless mode which does not track state between requests
+    /// allowing for load balancing without session affinity.
     /// </summary>
     /// <remarks>
-    /// If <see langword="true"/>, <see cref="RunSessionHandler"/> is called once for every request for each request,
-    /// the "/sse" endpoint will be disabled, and  the "MCP-Session-Id" header will not be used.
+    /// If <see langword="true"/>, <see cref="McpSession.SessionId"/> will be null, and the "MCP-Session-Id" header will not be used,
+    /// the <see cref="RunSessionHandler"/> will be called once for for each request, and the "/sse" endpoint will be disabled.
     /// Unsolicited server-to-client messages and all server-to-client requests are also unsupported, because any responses
     /// may arrive at another ASP.NET Core application process.
     /// Client sampling and roots capabilities are also disabled in stateless mode, because the server cannot make requests.

src/ModelContextProtocol.Core/McpException.cs

@@ -12,8 +12,8 @@ namespace ModelContextProtocol;
 ///
 /// This exception type can be thrown by MCP tools or tool call filters to propagate detailed error messages
 /// from <see cref="Exception.Message"/> when a tool execution fails via a <see cref="CallToolResult"/>.
-/// For non-tool calls, this exception controls the message propogated via a <see cref="JsonRpcError"/>.
-/// 
+/// For non-tool calls, this exception controls the message propagated via a <see cref="JsonRpcError"/>.
+///
 /// <see cref="McpProtocolException"/> is a derived type that can be used to also specify the
 /// <see cref="McpErrorCode"/> that should be used for the resulting <see cref="JsonRpcError"/>.
 /// </remarks>

src/ModelContextProtocol.Core/Server/AIFunctionMcpServerResource.cs

@@ -314,7 +314,7 @@ private AIFunctionMcpServerResource(AIFunction function, ResourceTemplate resour
     public override IReadOnlyList<object> Metadata => _metadata;
 
     /// <inheritdoc />
-    public override bool CanReadUri(string uri)
+    public override bool IsMatch(string uri)
     {
         Throw.IfNull(uri);
         return TryMatch(uri, out _);

src/ModelContextProtocol.Core/Server/DelegatingMcpServerResource.cs

@@ -26,7 +26,7 @@ protected DelegatingMcpServerResource(McpServerResource innerResource)
     public override ResourceTemplate ProtocolResourceTemplate => _innerResource.ProtocolResourceTemplate;
 
     /// <inheritdoc />
-    public override bool CanReadUri(string uri) => _innerResource.CanReadUri(uri);
+    public override bool IsMatch(string uri) => _innerResource.IsMatch(uri);
 
     /// <inheritdoc />
     public override ValueTask<ReadResourceResult> ReadAsync(RequestContext<ReadResourceRequestParams> request, CancellationToken cancellationToken = default) =>

src/ModelContextProtocol.Core/Server/McpServerImpl.cs

@@ -372,7 +372,7 @@ await originalListResourceTemplatesHandler(request, cancellationToken).Configure
                         // Fall back to an O(N) lookup, trying to match against each URI template.
                         foreach (var resourceTemplate in resources)
                         {
-                            if (resourceTemplate.CanReadUri(uri))
+                            if (resourceTemplate.IsMatch(uri))
                             {
                                 request.MatchedPrimitive = resourceTemplate;
                                 break;

src/ModelContextProtocol.Core/Server/McpServerResource.cs

@@ -167,8 +167,10 @@ protected McpServerResource()
     /// and can be used as the <see cref="ReadResourceRequestParams.Uri"/> passed to <see cref="ReadAsync"/>.
     /// </summary>
     /// <param name="uri">The URI being evaluated for this resource.</param>
-    /// <returns><see langword="true"/> if the <paramref name="uri"/> matches the <see cref="ProtocolResourceTemplate"/>; otherwise, <see langword="false"/>.</returns>
-    public abstract bool CanReadUri(string uri);
+    /// <returns>
+    /// <see langword="true"/> if the <paramref name="uri"/> matches the <see cref="ProtocolResourceTemplate"/>; otherwise, <see langword="false"/>.
+    /// </returns>
+    public abstract bool IsMatch(string uri);
 
     /// <summary>
     /// Gets the resource, rendering it with the provided request parameters and returning the resource result.

tests/ModelContextProtocol.Tests/Server/McpServerResourceTests.cs

@@ -286,7 +286,7 @@ public async Task UriTemplate_NonMatchingUri_DoesNotMatch(string uri)
     {
         McpServerResource t = McpServerResource.Create((string arg1) => arg1, new() { Name = "Hello" });
         Assert.Equal("resource://mcp/Hello{?arg1}", t.ProtocolResourceTemplate.UriTemplate);
-        Assert.False(t.CanReadUri(uri));
+        Assert.False(t.IsMatch(uri));
         await Assert.ThrowsAsync<InvalidOperationException>(async () => await t.ReadAsync(
             new RequestContext<ReadResourceRequestParams>(new Mock<McpServer>().Object, CreateTestJsonRpcRequest()) { Params = new() { Uri = uri } },
             TestContext.Current.CancellationToken));

tests/ModelContextProtocol.Tests/Server/McpServerTests.cs

@@ -369,7 +369,7 @@ await Can_Handle_Requests(
             new ServerCapabilities
             {
                 Resources = new()
-            }, 
+            },
             method: RequestMethods.ResourcesRead,
             configureOptions: options =>
             {
@@ -438,7 +438,7 @@ public async Task Can_Handle_List_Prompts_Requests_Throws_Exception_If_No_Handle
     public async Task Can_Handle_Get_Prompts_Requests()
     {
         await Can_Handle_Requests(
-            new ServerCapabilities 
+            new ServerCapabilities
             {
                 Prompts = new()
             },
@@ -466,7 +466,7 @@ public async Task Can_Handle_Get_Prompts_Requests_Throws_Exception_If_No_Handler
     public async Task Can_Handle_List_Tools_Requests()
     {
         await Can_Handle_Requests(
-            new ServerCapabilities 
+            new ServerCapabilities
             {
                 Tools = new()
             },
@@ -504,7 +504,7 @@ await Can_Handle_Requests(
             new ServerCapabilities
             {
                 Tools = new()
-            }, 
+            },
             method: RequestMethods.ToolsCall,
             configureOptions: options =>
             {
@@ -626,7 +626,7 @@ await transport.SendMessageAsync(
             TestContext.Current.CancellationToken
         );
 
-        var error = await receivedMessage.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
+        var error = await receivedMessage.Task.WaitAsync(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken);
         Assert.NotNull(error);
         Assert.NotNull(error.Error);
         Assert.Equal((int)errorCode, error.Error.Code);
@@ -662,7 +662,7 @@ await transport.SendMessageAsync(
         }
         );
 
-        var response = await receivedMessage.Task.WaitAsync(TimeSpan.FromSeconds(5));
+        var response = await receivedMessage.Task.WaitAsync(TimeSpan.FromSeconds(10));
         Assert.NotNull(response);
 
         assertResult(server, response.Result);
@@ -779,7 +779,7 @@ public override Task<JsonRpcResponse> SendRequestAsync(JsonRpcRequest request, C
             };
 
             return Task.FromResult(new JsonRpcResponse
-            { 
+            {
                 Id = new RequestId("0"),
                 Result = JsonSerializer.SerializeToNode(result, McpJsonUtilities.DefaultOptions),
             });