Improved subscription tracking, zyanfx#3.

yallie · Feb 20, 2019 · 9e61ef6 · 9e61ef6
1 parent e7ab2e3
commit 9e61ef6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/source/Zyan.Communication/ServerSession.cs b/source/Zyan.Communication/ServerSession.cs
@@ -91,19 +91,19 @@ internal SubscriptionTracker RemoteSubscriptionTracker
 		}
 
 		/// <summary>
-		/// Adds remote subscription to the trackers.
+		/// Adds remote subscriptions to the tracker.
 		/// </summary>
-		internal string AddRemoteSubscription(DelegateCorrelationInfo delegateCorrelationInfo)
+		internal string TrackRemoteSubscriptions(IEnumerable<DelegateCorrelationInfo> delegateCorrelationSet)
 		{
- 			return RemoteSubscriptionTracker.Add(new[] { delegateCorrelationInfo });
+ 			return RemoteSubscriptionTracker.Add(delegateCorrelationSet);
 		}
 
 		/// <summary>
-		/// Removes remote subscription from the tracker.
+		/// Removes remote subscriptions from the tracker.
 		/// </summary>
-		internal string RemoveRemoteSubscription(DelegateCorrelationInfo delegateCorrelationInfo)
+		internal string UntrackRemoteSubscriptions(IEnumerable<DelegateCorrelationInfo> delegateCorrelationSet)
 		{
- 			return RemoteSubscriptionTracker.Remove(new[] { delegateCorrelationInfo });
+ 			return RemoteSubscriptionTracker.Remove(delegateCorrelationSet);
 		}
 
 		/// <summary>

diff --git a/source/Zyan.Communication/ZyanConnection.cs b/source/Zyan.Communication/ZyanConnection.cs
@@ -993,6 +993,7 @@ private void ReconnectRemoteEventsCore()
 		{
 			var subscriptions = AliveProxies.Select(p => p.GetActiveSubscriptions()).Where(s => !s.DelegateCorrelationSet.IsNullOrEmpty()).ToArray();
 			var correlationSets = subscriptions.SelectMany(s => s.DelegateCorrelationSet).ToArray();
+			PrepareCallContext(false);
 			RemoteDispatcher.ReconnectEventHandlers(subscriptions);
 			_localSubscriptionTracker.Reset(correlationSets);
 		}

diff --git a/source/Zyan.Communication/ZyanDispatcher.cs b/source/Zyan.Communication/ZyanDispatcher.cs
@@ -86,7 +86,7 @@ private void CreateClientServerWires(Type type, EventStub eventStub, IEnumerable
 							{
 								eventStub.RemoveHandler(correlationInfo.DelegateMemberName, dynamicEventWire.InDelegate);
 								wiringList.Remove(correlationInfo.CorrelationID);
-								currentSession.RemoveRemoteSubscription(correlationInfo);
+								currentSession.UntrackRemoteSubscriptions(new[] { correlationInfo });
 							}
 
 							_host.OnSubscriptionCanceled(new SubscriptionEventArgs
@@ -108,14 +108,15 @@ private void CreateClientServerWires(Type type, EventStub eventStub, IEnumerable
 					}
 				}
 
-				currentSession.AddRemoteSubscription(correlationInfo);
 				_host.OnSubscriptionAdded(new SubscriptionEventArgs
 				{
 					ComponentType = type,
 					DelegateMemberName = correlationInfo.DelegateMemberName,
 					CorrelationID = correlationInfo.CorrelationID,
 				});
 			}
+
+			currentSession.TrackRemoteSubscriptions(delegateCorrelationSet);
 		}
 
 		/// <summary>
@@ -143,10 +144,6 @@ private void RemoveClientServerWires(Type type, EventStub eventStub, IEnumerable
 						var dynamicWireDelegate = wiringList[correlationInfo.CorrelationID];
 						eventStub.RemoveHandler(correlationInfo.DelegateMemberName, dynamicWireDelegate);
 						wiringList.Remove(correlationInfo.CorrelationID);
-						if (currentSession != null)
-						{
-							currentSession.RemoveRemoteSubscription(correlationInfo);
-						}
 					}
 
 					_host.OnSubscriptionRemoved(new SubscriptionEventArgs
@@ -157,6 +154,11 @@ private void RemoveClientServerWires(Type type, EventStub eventStub, IEnumerable
 					});
 				}
 			}
+
+			if (currentSession != null)
+			{
+				currentSession.UntrackRemoteSubscriptions(delegateCorrelationSet);
+			}
 		}
 
 		/// <summary>