Merge pull request #47 from WeihanLi/dev

2.2.0 preview 2

Author: WeihanLi

Directory.Packages.props

@@ -2,21 +2,22 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
-    <!-- https://learn.microsoft.com/en-us/nuget/concepts/auditing-packages -->    
-    <NuGetAudit>true</NuGetAudit>    
+    <!-- https://learn.microsoft.com/en-us/nuget/concepts/auditing-packages -->
+    <NuGetAudit>true</NuGetAudit>
     <NuGetAuditMode>all</NuGetAuditMode>
     <!-- https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904 -->
     <WarningsAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsAsErrors>
-    <AspNet8PackageVersion>8.0.14</AspNet8PackageVersion>
-    <AspNet9PackageVersion>9.0.3</AspNet9PackageVersion>
-    <AspNet10PackageVersion>10.0.0-preview.3.25172.1</AspNet10PackageVersion>
+    <AspNet8PackageVersion>8.0.16</AspNet8PackageVersion>
+    <AspNet9PackageVersion>9.0.5</AspNet9PackageVersion>
+    <AspNet10PackageVersion>10.0.0-preview.4.25258.110</AspNet10PackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Condition="'$(TargetFramework)'=='net8.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNet8PackageVersion)" />
     <PackageVersion Condition="'$(TargetFramework)'=='net9.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNet9PackageVersion)" />
     <PackageVersion Condition="'$(TargetFramework)'=='net10.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNet10PackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspNet10PackageVersion)" />
-    <PackageVersion Include="Scalar.AspNetCore" Version="2.1.17" />
-    <PackageVersion Include="WeihanLi.Common" Version="1.0.77" />
+    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.2.0-preview.1" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.4.3" />
+    <PackageVersion Include="WeihanLi.Common" Version="1.0.78" />
   </ItemGroup>
 </Project>

README.md

@@ -4,6 +4,8 @@ ASP.NET Core Web extensions
 
 [![WeihanLi.Web.Extensions](https://img.shields.io/nuget/v/WeihanLi.Web.Extensions)](https://www.nuget.org/packages/WeihanLi.Web.Extensions/)
 
+[![WeihanLi.Web.Extensions](https://img.shields.io/nuget/vpre/WeihanLi.Web.Extensions)](https://www.nuget.org/packages/WeihanLi.Web.Extensions/absoluteLatest)
+
 [![Azure Pipelines Build Status](https://weihanli.visualstudio.com/Pipelines/_apis/build/status/WeihanLi.WeihanLi.Web.Extensions?branchName=dev)](https://weihanli.visualstudio.com/Pipelines/_build/latest?definitionId=19&branchName=dev)
 
 [![Github Actions Build Status](https://github.com/WeihanLi/WeihanLi.Web.Extensions/workflows/dotnetcore/badge.svg)](https://github.com/WeihanLi/WeihanLi.Web.Extensions/actions?query=workflow%3Adotnetcore)

samples/WeihanLi.Web.Extensions.Samples/McpToolExtension.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Weihan Li. All rights reserved.
+// Licensed under the MIT license.
+
+namespace WeihanLi.Web.Extensions.Samples;
+
+public interface IMcpToolEndpointMetadata
+{
+    string Name { get; set; }
+    string Description { get; set; }
+}
+
+public class McpToolEndpointMetadata : IMcpToolEndpointMetadata
+{
+    public string Name { get; set; } = string.Empty;
+    public string Description { get; set; } = string.Empty;
+}
+
+public static class McpToolExtension
+{
+    public static IEndpointConventionBuilder AsMcpTool<TBuilder>(this TBuilder builder, Action<McpToolEndpointMetadata>? toolConfigure = null)
+        where TBuilder : IEndpointConventionBuilder
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        var metadata = new McpToolEndpointMetadata();
+        toolConfigure?.Invoke(metadata);
+        builder.Add(c =>
+        {
+            if (string.IsNullOrEmpty(metadata.Name))
+            {
+                metadata.Name = c.DisplayName!;
+            }
+            if (string.IsNullOrEmpty(metadata.Description))
+            {
+                metadata.Description = c.DisplayName!;
+            }
+            c.Metadata.Add(metadata);
+        });
+        return builder;
+    }
+}

samples/WeihanLi.Web.Extensions.Samples/Program.cs

@@ -87,7 +87,7 @@
     options.UserIdFactory = static context => $"{context.GetUserIP()}";
 });
 
-// builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddOpenApi();
 
 builder.Host.UseFluentAspectsServiceProviderFactory(options =>
@@ -101,6 +101,11 @@
         )
     );
 
+builder.Services.AddMcpServer()
+    .WithToolsFromAssembly()
+    .WithHttpTransport()
+    ;
+
 var app = builder.Build();
 
 app.MapRuntimeInfo().ShortCircuit();
@@ -185,13 +190,25 @@
 // });
 
 app.MapConfigInspector()
+    .AsMcpTool(tool =>
+    {
+        tool.Description = "Get configurations";
+    })
     // .RequireAuthorization(x => x
     //     .AddAuthenticationSchemes("ApiKey")
     //     .RequireAuthenticatedUser()
     // )
     ;
 app.MapControllers();
 
+app.MapGet("/mcp-tools", (EndpointDataSource endpointDataSource) =>
+{
+    var tools = endpointDataSource.Endpoints.Where(x => x.Metadata.Any(m => m is McpToolEndpointMetadata))
+        .Select(x => x.Metadata.OfType<McpToolEndpointMetadata>().First())
+        .ToArray();
+    return tools;
+});
+
 await app.RunAsync();
 
 

samples/WeihanLi.Web.Extensions.Samples/WeihanLi.Web.Extensions.Samples.csproj

@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="ModelContextProtocol.AspNetCore" />
     <PackageReference Include="Scalar.AspNetCore" />
   </ItemGroup>
 </Project>

src/WeihanLi.Web.Extensions/Authentication/BasicAuthentication/BasicAuthenticationDefaults.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 namespace WeihanLi.Web.Authentication.BasicAuthentication;
+
 public static class BasicAuthenticationDefaults
 {
     public const string AuthenticationScheme = "Basic";

src/WeihanLi.Web.Extensions/Authentication/BasicAuthentication/BasicAuthenticationHandler.cs

@@ -8,6 +8,7 @@
 using AuthenticateResult = Microsoft.AspNetCore.Authentication.AuthenticateResult;
 
 namespace WeihanLi.Web.Authentication.BasicAuthentication;
+
 public sealed class BasicAuthenticationHandler : AuthenticationHandler<BasicAuthenticationOptions>
 {
     public BasicAuthenticationHandler(IOptionsMonitor<BasicAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder)

src/WeihanLi.Web.Extensions/Authentication/BasicAuthentication/BasicAuthenticationOptions.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 namespace WeihanLi.Web.Authentication.BasicAuthentication;
+
 public sealed class BasicAuthenticationOptions : AuthenticationSchemeOptions
 {
     public string? UserName { get; set; }