fix: background handlers

pubnub · Jul 20, 2023 · b2fdbe3 · b2fdbe3
1 parent 4bff839
commit b2fdbe3
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/src/Api/PubnubApi/EventEngine/Core/EffectDispatcher.cs b/src/Api/PubnubApi/EventEngine/Core/EffectDispatcher.cs
@@ -18,8 +18,13 @@ public async Task Dispatch<T>(T invocation) where T : IEffectInvocation {
 
 			if (invocation is IEffectCancelInvocation) {
 				await effectInvocationHandlerMap[invocation.GetType()].Cancel();
-			} else {
-				await ((IEffectHandler<T>)effectInvocationHandlerMap[invocation.GetType()]).Run(invocation);
+			} else
+			{
+				var handler = ((IEffectHandler<T>)effectInvocationHandlerMap[invocation.GetType()]);
+				if (handler.IsBackground(invocation))
+					handler.Run(invocation).Start();
+				else
+					await handler.Run(invocation);
 			}
 		}
 

diff --git a/src/Api/PubnubApi/EventEngine/Core/EventEngineInterfaces.cs b/src/Api/PubnubApi/EventEngine/Core/EventEngineInterfaces.cs
@@ -17,6 +17,7 @@ internal interface IEffectHandler {
 	/// <typeparam name="T">Associated invocation</typeparam>
 	internal interface IEffectHandler<in T> : IEffectHandler where T : IEffectInvocation {
 		Task Run(T invocation);
+		bool IsBackground(T invocation);
 	}
 
 	/// <summary>

diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/Effects/HandshakeEffectHandler.cs b/src/Api/PubnubApi/EventEngine/Subscribe/Effects/HandshakeEffectHandler.cs
@@ -29,7 +29,7 @@ public HandshakeEffectHandler(SubscribeManager2 manager, EventQueue eventQueue)
             this.eventQueue = eventQueue;
         }
 
-        public Task Run(HandshakeReconnectInvocation invocation)
+        public async Task Run(HandshakeReconnectInvocation invocation)
         {
             if (!ReconnectionDelayUtil.shouldRetry(invocation.Policy, invocation.AttemptedRetries, invocation.MaxConnectionRetry))
             {
@@ -38,11 +38,15 @@ public Task Run(HandshakeReconnectInvocation invocation)
             else
             {
                 retryDelay = new Delay(ReconnectionDelayUtil.CalculateDelay(invocation.Policy, invocation.AttemptedRetries));
-                // Run in the background
-                retryDelay.Start().ContinueWith((_) => this.Run((HandshakeInvocation)invocation));
+                await retryDelay.Start();
+                if (!retryDelay.Cancelled)
+                    await Run((HandshakeInvocation)invocation);
             }
+        }
 
-            return Utils.EmptyTask;
+        public bool IsBackground(HandshakeReconnectInvocation invocation)
+        {
+            return true;
         }
 
         public async Task Run(HandshakeInvocation invocation)
@@ -66,8 +70,13 @@ public async Task Run(HandshakeInvocation invocation)
 
             }
         }
-
-
+
+        public bool IsBackground(HandshakeInvocation invocation)
+        {
+            return false;
+        }
+
+
         private async Task<System.Tuple<SubscriptionCursor, PNStatus>> MakeHandshakeRequest(HandshakeInvocation invocation)
         {
             var resp = await manager.HandshakeRequest<string>(

diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/Effects/ReceivingEffectHandler.cs b/src/Api/PubnubApi/EventEngine/Subscribe/Effects/ReceivingEffectHandler.cs
@@ -45,6 +45,11 @@ public Task Run(ReceiveReconnectInvocation invocation)
             return Utils.EmptyTask;
         }
 
+        public bool IsBackground(ReceiveReconnectInvocation invocation)
+        {
+            return true;
+        }
+
         public async Task Run(ReceiveMessagesInvocation invocation)
         {
             var response = await MakeReceiveMessagesRequest(invocation);
@@ -65,10 +70,14 @@ public async Task Run(ReceiveMessagesInvocation invocation)
                     List<PNMessageResult<object>> listOfMessages = null;
                     eventQueue.Enqueue(new Events.ReceiveSuccessEvent() { Cursor = response.Item1, Messages= listOfMessages, Status = response.Item2 });
                     break;
-
             }
         }
 
+        public bool IsBackground(ReceiveMessagesInvocation invocation)
+        {
+            return true;
+        }
+
         private async Task<System.Tuple<SubscriptionCursor, PNStatus>> MakeReceiveMessagesRequest(ReceiveMessagesInvocation invocation)
         {
             var resp = await manager.ReceiveRequest<string>(

diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/SubscribeEventEngine.cs b/src/Api/PubnubApi/EventEngine/Subscribe/SubscribeEventEngine.cs
@@ -14,6 +14,7 @@ public SubscribeEventEngine(SubscribeManager2 subscribeManager) {
 			// initialize the handler, pass dependencies
 			var handshakeHandler = new Effects.HandshakeEffectHandler(subscribeManager, eventQueue);
 			dispatcher.Register<Invocations.HandshakeInvocation, Effects.HandshakeEffectHandler>(handshakeHandler);
+			dispatcher.Register<Invocations.HandshakeReconnectInvocation, Effects.HandshakeEffectHandler>(handshakeHandler);
 			dispatcher.Register<Invocations.CancelHandshakeInvocation, Effects.HandshakeEffectHandler>(handshakeHandler);
 
 			currentState = new UnsubscribedState();