🚧 HubContext

Author: AigioL

src/BD.Common8.Bcl/IO/Pipelines/DuplexPipeStream.cs

@@ -169,32 +169,41 @@ private async ValueTask<int> ReadAsyncInternal(Memory<byte> destination, Cancell
     {
         while (true)
         {
-            var result = await input.ReadAsync(cancellationToken);
-            var readableBuffer = result.Buffer;
             try
             {
-                if (throwOnCancelled && result.IsCanceled && cancelCalled)
+                var result = await input.ReadAsync(cancellationToken);
+                var readableBuffer = result.Buffer;
+                try
                 {
-                    // Reset the bool
-                    cancelCalled = false;
-                    throw new OperationCanceledException();
+                    if (throwOnCancelled && result.IsCanceled && cancelCalled)
+                    {
+                        // Reset the bool
+                        cancelCalled = false;
+                        throw new OperationCanceledException();
+                    }
+
+                    if (!readableBuffer.IsEmpty)
+                    {
+                        // buffer.Count is int
+                        var count = (int)Math.Min(readableBuffer.Length, destination.Length);
+                        readableBuffer = readableBuffer.Slice(0, count);
+                        readableBuffer.CopyTo(destination.Span);
+                        return count;
+                    }
+
+                    if (result.IsCompleted)
+                    {
+                        return 0;
+                    }
                 }
-
-                if (!readableBuffer.IsEmpty)
+                finally
                 {
-                    // buffer.Count is int
-                    var count = (int)Math.Min(readableBuffer.Length, destination.Length);
-                    readableBuffer = readableBuffer.Slice(0, count);
-                    readableBuffer.CopyTo(destination.Span);
-                    return count;
+                    input.AdvanceTo(readableBuffer.End, readableBuffer.End);
                 }
-
-                if (result.IsCompleted)
-                    return 0;
             }
-            finally
+            catch (OperationCanceledException)
             {
-                input.AdvanceTo(readableBuffer.End, readableBuffer.End);
+                return -1;
             }
         }
     }

src/BD.Common8.Ipc.Server/Services/Implementation/IpcServerService.cs

@@ -186,7 +186,11 @@ static bool IsUsePort(IPAddress address, int port)
         builder.Services.AddRoutingCore();
         builder.Services.AddLogging(ConfigureLogging);
         builder.Services.ConfigureHttpJsonOptions(ConfigureHttpJsonOptions);
-        ConfigureSignalRProtocol(builder.Services.AddSignalR(ConfigureSignalR));
+        builder.Services.AddSingleton(
+            typeof(HubConnectionHandler<>),
+            typeof(FixHubConnectionHandler<>));
+        var signalRServerBuilder = builder.Services.AddSignalR(ConfigureSignalR);
+        ConfigureSignalRProtocol(signalRServerBuilder);
         builder.Services.AddHttpContextAccessor();
         ConfigureAuthentication(builder.Services.AddAuthentication(DefaultAuthenticationScheme));
 
@@ -421,6 +425,9 @@ protected virtual void ConfigureHub(HttpConnectionDispatcherOptions options)
 
     public IServiceProvider Services => app.ThrowIsNull().Services;
 
+    public abstract bool TryGetHubContext([NotNullWhen(true)] out IHubContext? hubContext);
+
+    [Obsolete("use TryGetHubContext", true)]
     public abstract IHubContext HubContext { get; }
 
     readonly Dictionary<string, Type> hubTypes = [];
@@ -636,4 +643,32 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
         var result = HandleAuthenticate();
         return Task.FromResult(result);
     }
+}
+
+file sealed class FixHubConnectionHandler<
+    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] THub>(
+    HubLifetimeManager<THub> lifetimeManager,
+    IHubProtocolResolver protocolResolver,
+    IOptions<HubOptions> globalHubOptions,
+    IOptions<HubOptions<THub>> hubOptions,
+    ILoggerFactory loggerFactory,
+    IUserIdProvider userIdProvider,
+    IServiceScopeFactory serviceScopeFactory) :
+    HubConnectionHandler<THub>(lifetimeManager, protocolResolver, globalHubOptions,
+        hubOptions, loggerFactory, userIdProvider,
+        serviceScopeFactory)
+    where THub : Hub
+{
+    /// <inheritdoc/>
+    public sealed override async Task OnConnectedAsync(ConnectionContext connection)
+    {
+        try
+        {
+            await base.OnConnectedAsync(connection);
+        }
+        catch (ObjectDisposedException)
+        {
+            // 应用程序退出时引发 Ioc 被释放异常忽略
+        }
+    }
 }