files

Author: KSemenenko

ManagedCode.Communication.Extensions/CommunicationHubFilter.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
+
+namespace ManagedCode.Communication.Extensions;
+
+public class CommunicationHubFilter : IHubFilter
+{
+    public async ValueTask<object?> InvokeMethodAsync(HubInvocationContext invocationContext, Func<HubInvocationContext, ValueTask<object?>> next)
+    {
+        try
+        {
+            return await next(invocationContext);
+        }
+        catch (Exception ex)
+        {
+            var result = Result.Fail(HttpStatusCode.InternalServerError, ex.Message);
+            return result;
+        }
+    }
+}

ManagedCode.Communication.Extensions/CommunicationMiddleware.cs

@@ -25,19 +25,15 @@ public CommunicationMiddleware(ILogger<CommunicationMiddleware> logger, RequestD
 
     public async Task Invoke(HttpContext httpContext)
     {
-        var sw = Stopwatch.StartNew();
-
         try
         {
             await _next(httpContext);
-            sw.Stop();
-            httpContext.Response.Headers.Add("executionTime", sw.Elapsed.ToString());
         }
         catch (Exception ex)
         {
-            sw.Stop();
-     
-            httpContext.Response.Headers.Add("executionTime", sw.Elapsed.ToString());
+            if (httpContext.Response.HasStarted)
+                throw; 
+            
             httpContext.Response.Headers.CacheControl = "no-cache,no-store";
             httpContext.Response.Headers.Pragma = "no-cache";
             httpContext.Response.Headers.Expires = "-1";

ManagedCode.Communication.Extensions/Extensions/CommunicationAppBuilderExtensions.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace ManagedCode.Communication.Extensions;
 

ManagedCode.Communication.Extensions/Extensions/ControllerExtensions.cs

@@ -14,4 +14,4 @@ public static Microsoft.AspNetCore.Http.IResult ToHttpResult<T>(this Result<T> r
     {
         return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.GetError()?.Message);
     }
-}
+}

ManagedCode.Communication.Extensions/Extensions/HubOptionsExtensions.cs

@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.SignalR;
+
+namespace ManagedCode.Communication.Extensions;
+
+public static class HubOptionsExtensions
+{
+    public static void AddCommunicationHubFilter(this HubOptions result)
+    {
+        result.AddFilter<CommunicationHubFilter>();
+    }
+}

ManagedCode.Communication.Tests/ControllerTests/MiddlewareTests.cs

@@ -3,7 +3,9 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using ManagedCode.Communication.Tests.TestApp;
+using ManagedCode.Communication.Tests.TestApp.Controllers;
 using ManagedCode.Communication.Tests.TestApp.Grains;
+using Microsoft.AspNetCore.SignalR.Client;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -42,4 +44,26 @@ public async Task InvalidDataException()
         result.IsFailed.Should().BeTrue();
         result.GetError().Value.Message.Should().Be("InvalidDataException");
     }
+    
+    [Fact]
+    public async Task ValidationExceptionSginalR()
+    {
+        var connection = _application.CreateSignalRClient(nameof(TestHub));
+        await connection.StartAsync();
+        connection.State.Should().Be(HubConnectionState.Connected);
+        var result = await connection.InvokeAsync<Result<int>>("DoTest");
+        result.IsSuccess.Should().BeTrue();
+        result.Value.Should().Be(5);
+    }
+    
+    [Fact]
+    public async Task InvalidDataExceptionSignalR()
+    {
+        var connection = _application.CreateSignalRClient(nameof(TestHub));
+        await connection.StartAsync();
+        connection.State.Should().Be(HubConnectionState.Connected);
+        var result = await connection.InvokeAsync<Result<int>>("Throw");
+        result.IsFailed.Should().BeTrue();
+        result.GetError().Value.Message.Should().Be("InvalidDataException");
+    }
 }

ManagedCode.Communication.Tests/TestApp/Controllers/TestHub.cs

@@ -1,13 +1,19 @@
 using System;
+using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR;
 
 namespace ManagedCode.Communication.Tests.TestApp.Controllers;
 
 public class TestHub : Hub
 {
-    public Task<int> DoTest()
+    public Task<Result<int>> DoTest()
     {
-        return Task.FromResult(new Random().Next());
+        return Result.Succeed(5).AsTask();
+    }
+    
+    public Task<Result<int>> Throw()
+    {
+        throw new InvalidDataException("InvalidDataException");
     }
 }

ManagedCode.Communication.Tests/TestApp/HttpHostProgram.cs

@@ -1,6 +1,7 @@
 using ManagedCode.Communication.Extensions;
 using ManagedCode.Communication.Tests.TestApp.Controllers;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ManagedCode.Communication.Tests.TestApp;
@@ -12,7 +13,7 @@ public static void Main(string[] args)
         var builder = WebApplication.CreateBuilder(args);
 
         builder.Services.AddControllers();
-        builder.Services.AddSignalR();
+        builder.Services.AddSignalR(options => options.AddCommunicationHubFilter());
 
 
         var app = builder.Build();
@@ -21,8 +22,6 @@ public static void Main(string[] args)
         app.MapControllers();
         app.MapHub<TestHub>(nameof(TestHub));
 
-        app.UseExceptionHandler("/error");
-        
         app.UseCommunication();
 
         app.Run();

ManagedCode.Communication.Tests/TestApp/TestClusterApplication.cs

@@ -41,8 +41,7 @@ public HubConnection CreateSignalRClient(string hubUrl, Action<HubConnectionBuil
     {
         var builder = new HubConnectionBuilder();
         configure?.Invoke(builder);
-        return builder.WithUrl(new Uri(Server.BaseAddress, hubUrl),
-                o => o.HttpMessageHandlerFactory = _ => Server.CreateHandler())
+        return builder.WithUrl(new Uri(Server.BaseAddress, hubUrl), o => o.HttpMessageHandlerFactory = _ => Server.CreateHandler())
             .Build();
     }