fix issue with connections

KSemenenko · KSemenenko · commit a9d3d1383bf1 · 2025-11-19T08:14:14.000+01:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -26,8 +26,8 @@
         <RepositoryUrl>https://github.com/managedcode/Orleans.SignalR</RepositoryUrl>
         <PackageProjectUrl>https://github.com/managedcode/Orleans.SignalR</PackageProjectUrl>
         <Product>Managed Code - Orleans SignalR</Product>
-        <Version>10.0.2</Version>
-        <PackageVersion>10.0.2</PackageVersion>
+        <Version>10.0.3</Version>
+        <PackageVersion>10.0.3</PackageVersion>
 
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/IObserverConnectionManager.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/IObserverConnectionManager.cs
@@ -9,10 +9,11 @@ public interface IObserverConnectionManager : IGrain
     [AlwaysInterleave]
     Task AddConnection(string connectionId, ISignalRObserver observer);
 
+    [OneWay]
     [AlwaysInterleave]
     Task RemoveConnection(string connectionId, ISignalRObserver observer);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task Ping(ISignalRObserver observer);
 }
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRConnectionCoordinatorGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRConnectionCoordinatorGrain.cs
@@ -15,19 +15,19 @@ public interface ISignalRConnectionCoordinatorGrain : IGrainWithStringKey
     [AlwaysInterleave]
     Task<int> GetPartitionForConnection(string connectionId);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToAll(HubMessage message);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToAllExcept(HubMessage message, string[] excludedConnectionIds);
 
     [AlwaysInterleave]
     Task<bool> SendToConnection(HubMessage message, string connectionId);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToConnections(HubMessage message, string[] connectionIds);
 
     [AlwaysInterleave]
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRConnectionHeartbeatGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRConnectionHeartbeatGrain.cs
@@ -10,7 +10,7 @@ public interface ISignalRConnectionHeartbeatGrain : IGrainWithStringKey
     [AlwaysInterleave]
     Task Start(ConnectionHeartbeatRegistration registration);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task Stop();
 }
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRConnectionHolderGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRConnectionHolderGrain.cs
@@ -7,18 +7,18 @@ namespace ManagedCode.Orleans.SignalR.Core.Interfaces;
 
 public interface ISignalRConnectionHolderGrain : IGrainWithStringKey, IObserverConnectionManager
 {
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToAll(HubMessage message);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToAllExcept(HubMessage message, string[] excludedConnectionIds);
 
     [AlwaysInterleave]
     Task<bool> SendToConnection(HubMessage message, string connectionId);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToConnections(HubMessage message, string[] connectionIds);
 }
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRConnectionPartitionGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRConnectionPartitionGrain.cs
@@ -7,18 +7,18 @@ namespace ManagedCode.Orleans.SignalR.Core.Interfaces;
 
 public interface ISignalRConnectionPartitionGrain : IGrainWithIntegerKey, IObserverConnectionManager
 {
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToPartition(HubMessage message);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToPartitionExcept(HubMessage message, string[] excludedConnectionIds);
 
     [AlwaysInterleave]
     Task<bool> SendToConnection(HubMessage message, string connectionId);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToConnections(HubMessage message, string[] connectionIds);
 }
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRGroupCoordinatorGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRGroupCoordinatorGrain.cs
@@ -19,12 +19,12 @@ public interface ISignalRGroupCoordinatorGrain : IGrainWithStringKey
     [OneWay]
     Task SendToGroup(string groupName, HubMessage message);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToGroupExcept(string groupName, HubMessage message, string[] excludedConnectionIds);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToGroups(string[] groupNames, HubMessage message);
 
     [AlwaysInterleave]
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRGroupGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRGroupGrain.cs
@@ -7,11 +7,11 @@ namespace ManagedCode.Orleans.SignalR.Core.Interfaces;
 
 public interface ISignalRGroupGrain : IGrainWithStringKey, IObserverConnectionManager
 {
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToGroup(HubMessage message);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToGroupExcept(HubMessage message, string[] excludedConnectionIds);
 }
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRGroupPartitionGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRGroupPartitionGrain.cs
@@ -7,12 +7,12 @@ namespace ManagedCode.Orleans.SignalR.Core.Interfaces;
 
 public interface ISignalRGroupPartitionGrain : IGrainWithIntegerKey, IObserverConnectionManager
 {
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToGroups(HubMessage message, string[] groupNames);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToGroupsExcept(HubMessage message, string[] groupNames, string[] excludedConnectionIds);
 
     [AlwaysInterleave]
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRInvocationGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRInvocationGrain.cs
@@ -8,8 +8,8 @@ namespace ManagedCode.Orleans.SignalR.Core.Interfaces;
 
 public interface ISignalRInvocationGrain : IGrainWithStringKey, IObserverConnectionManager
 {
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task TryCompleteResult(string connectionId, HubMessage message);
 
     [AlwaysInterleave]
diff --git a/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRUserGrain.cs b/ManagedCode.Orleans.SignalR.Core/Interfaces/ISignalRUserGrain.cs
@@ -7,11 +7,11 @@ namespace ManagedCode.Orleans.SignalR.Core.Interfaces;
 
 public interface ISignalRUserGrain : IGrainWithStringKey, IObserverConnectionManager
 {
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task SendToUser(HubMessage message);
 
-    [AlwaysInterleave]
     [OneWay]
+    [AlwaysInterleave]
     Task RequestMessage();
 }
diff --git a/ManagedCode.Orleans.SignalR.Core/SignalR/OrleansHubLifetimeManager.cs b/ManagedCode.Orleans.SignalR.Core/SignalR/OrleansHubLifetimeManager.cs
@@ -599,15 +599,13 @@ private void OnApplicationStopping()
 
             if (subscription is null)
             {
-                return;
+                continue;
             }
 
             foreach (var grain in subscription.Grains)
             {
-                tasks.Add(grain.RemoveConnection(connection.ConnectionId, subscription.Reference));
+                _ = grain.RemoveConnection(connection.ConnectionId, subscription.Reference);
             }
         }
-
-        _ = Task.Run(() => Task.WhenAll(tasks));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public interface ISignalRConnectionHeartbeatGrain : IGrainWithStringKey`
`10`	`10`	`[AlwaysInterleave]`
`11`	`11`	`Task Start(ConnectionHeartbeatRegistration registration);`
`12`	`12`
`13`		`- [AlwaysInterleave]`
`14`	`13`	`[OneWay]`
	`14`	`+ [AlwaysInterleave]`
`15`	`15`	`Task Stop();`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ namespace ManagedCode.Orleans.SignalR.Core.Interfaces;`
`7`	`7`
`8`	`8`	`public interface ISignalRGroupGrain : IGrainWithStringKey, IObserverConnectionManager`
`9`	`9`	`{`
`10`		`- [AlwaysInterleave]`
`11`	`10`	`[OneWay]`
	`11`	`+ [AlwaysInterleave]`
`12`	`12`	`Task SendToGroup(HubMessage message);`
`13`	`13`
`14`		`- [AlwaysInterleave]`
`15`	`14`	`[OneWay]`
	`15`	`+ [AlwaysInterleave]`
`16`	`16`	`Task SendToGroupExcept(HubMessage message, string[] excludedConnectionIds);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ namespace ManagedCode.Orleans.SignalR.Core.Interfaces;`
`8`	`8`
`9`	`9`	`public interface ISignalRInvocationGrain : IGrainWithStringKey, IObserverConnectionManager`
`10`	`10`	`{`
`11`		`- [AlwaysInterleave]`
`12`	`11`	`[OneWay]`
	`12`	`+ [AlwaysInterleave]`
`13`	`13`	`Task TryCompleteResult(string connectionId, HubMessage message);`
`14`	`14`
`15`	`15`	`[AlwaysInterleave]`