Skip to content

Fix SignalR client disconnection issue by reverting to default timeouts #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haefele merged 2 commits into from
Jan 12, 2026
Merged

Fix SignalR client disconnection issue by reverting to default timeouts #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8891e6e
Fix SignalR client disconnection issue by reverting to default timeouts
haefele Jan 12, 2026
43cd35d
Fix race condition in ConnectionGrain during connection teardown
haefele Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/RemoteViewer.Server/Orleans/Grains/ConnectionGrain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using Microsoft.AspNetCore.SignalR;
using RemoteViewer.Server.Hubs;
using RemoteViewer.Shared;
Expand Down Expand Up @@ -28,7 +28,9 @@ public sealed partial class ConnectionGrain(ILogger<ConnectionGrain> logger, IHu

public async Task UpdateProperties(string signalrConnectionId, ConnectionProperties properties)
{
if (this._presenter?.GetPrimaryKeyString() != signalrConnectionId)
this.EnsureInitialized();

if (this._presenter.GetPrimaryKeyString() != signalrConnectionId)
{
this.LogNonPresenterUpdateAttempt(signalrConnectionId, this.GetPrimaryKeyString());
return;
Expand Down Expand Up @@ -149,6 +151,8 @@ await hubContext.Clients
}
async Task IConnectionGrain.Internal_AddViewer(IClientGrain viewer)
{
this.EnsureInitialized();

if (this._viewers.Contains(viewer))
{
this.LogViewerAlreadyInConnection(this.GetPrimaryKeyString(), viewer.GetPrimaryKeyString());
Expand Down Expand Up @@ -190,11 +194,17 @@ async Task IConnectionGrain.Internal_RemoveClient(IClientGrain client)

await hubContext.Clients.Client(client.GetPrimaryKeyString()).ConnectionStopped(this.GetPrimaryKeyString());

await this.NotifyConnectionChangedAsync();
// Only notify if presenter still exists - during teardown the presenter may have already
// disconnected and nullified _presenter, so we skip notification since the connection is dead
if (this._presenter is not null)
{
await this.NotifyConnectionChangedAsync();
}
}
}
async Task IConnectionGrain.Internal_DisplayNameChanged()
{
this.EnsureInitialized();
await this.NotifyConnectionChangedAsync();
}

Expand Down
5 changes: 1 addition & 4 deletions src/RemoteViewer.Server/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Nerdbank.MessagePack.SignalR;
using Nerdbank.MessagePack.SignalR;
using RemoteViewer.Server.Hubs;
using RemoteViewer.Server.Services;
using RemoteViewer.Shared;
Expand Down Expand Up @@ -26,9 +26,6 @@
.AddSignalR(options =>
{
options.MaximumReceiveMessageSize = null;

options.ClientTimeoutInterval = TimeSpan.FromMinutes(2);
options.KeepAliveInterval = TimeSpan.FromSeconds(30);
})
.AddMessagePackProtocol(Witness.GeneratedTypeShapeProvider);
builder.Services.AddSerilog();
Expand Down