ReceivingReconnect

Author: budgetpreneur

src/Api/PubnubApi/EndPoint/PubSub/SubscribeManager2.cs

@@ -205,7 +205,32 @@ internal void ReceiveRequestCancellation()
             }
             else
             {
-                    LoggingMethod.WriteToLog(pubnubLog, string.Format(CultureInfo.InvariantCulture, "DateTime {0} SubscribeManager => ReceiveRequestCancellation. No request to cancel.", DateTime.Now.ToString(CultureInfo.InvariantCulture)), config.LogVerbosity);
+                    LoggingMethod.WriteToLog(pubnubLog, string.Format(CultureInfo.InvariantCulture, "DateTime {0} SubscribeManager => RequestCancellation. No request to cancel.", DateTime.Now.ToString(CultureInfo.InvariantCulture)), config.LogVerbosity);
+            }
+        }
+
+        internal void ReceiveReconnectRequestCancellation()
+        {
+            if (httpSubscribe != null)
+            {
+                try
+                {
+                    #if !NET35 && !NET40 && !NET45 && !NET461 && !NET48 && !NETSTANDARD10
+                    httpSubscribe.CancelPendingRequests();
+                    #else
+                    httpSubscribe.Abort();
+                    #endif   
+                    httpSubscribe = null;
+                    LoggingMethod.WriteToLog(pubnubLog, string.Format(CultureInfo.InvariantCulture, "DateTime {0} SubscribeManager => ReceiveReconnectRequestCancellation. Done.", DateTime.Now.ToString(CultureInfo.InvariantCulture)), config.LogVerbosity);
+                }
+                catch(Exception ex)
+                {
+                    LoggingMethod.WriteToLog(pubnubLog, string.Format(CultureInfo.InvariantCulture, "DateTime {0} SubscribeManager => ReceiveReconnectRequestCancellation Exception: {1}", DateTime.Now.ToString(CultureInfo.InvariantCulture), ex), config.LogVerbosity);
+                }
+            }
+            else
+            {
+                    LoggingMethod.WriteToLog(pubnubLog, string.Format(CultureInfo.InvariantCulture, "DateTime {0} SubscribeManager => ReceiveReconnectRequestCancellation. No request to cancel.", DateTime.Now.ToString(CultureInfo.InvariantCulture)), config.LogVerbosity);
             }
         }
 

src/Api/PubnubApi/EndPoint/PubSub/SubscribeOperation2.cs

@@ -161,7 +161,7 @@ private void ReceiveReconnectEffect_ReceiveRequested(object sender, ReceiveRecon
         }
         private void ReceiveReconnectEffect_CancelReceiveRequested(object sender, CancelReceiveReconnectRequestEventArgs e)
         {
-            manager.ReceiveRequestCancellation();
+            manager.ReceiveReconnectRequestCancellation();
         }
 
         private void JsonCallback(string json, bool zeroTimeTokenRequest, int messageCount)

src/Api/PubnubApi/EventEngine/EventEngine.cs

@@ -720,7 +720,8 @@ public void Setup<T>(PNConfiguration config)
             receiveReconnectInvocation.Effectype = EventType.ReceiveReconnect;
 
             EffectInvocation cancelReceiveReconnect = new CancelReceiveReconnect();
-            cancelReceiveReconnect.Effectype = EventType.CancelReceiveMessages;
+			cancelReceiveReconnect.Name = "CANCEL_RECEIVE_RECONNECT";
+            cancelReceiveReconnect.Effectype = EventType.CancelReceiveReconnect;
             #endregion
             #region StateType.ReceiveReconnecting
             CreateState(StateType.ReceiveReconnecting)

src/Api/PubnubApi/EventEngine/ReceiveReconnectingEffectHandler.cs

@@ -115,6 +115,7 @@ public void OnReceiveReconnectEffectResponseReceived(string json)
 		{
 			try
 			{
+				pnStatus = null;
 				LogCallback?.Invoke($"OnReceiveReconnectEffectResponseReceived Json Response = {json}");
 				var receivedResponse = JsonConvert.DeserializeObject<ReceiveingResponse<object>>(json);
 				if (receivedResponse != null && receivedResponse.Timetoken != null)
@@ -249,6 +250,10 @@ public void Cancel()
 				LogCallback?.Invoke($"ReceiveReconnectEffectHandler - cancellationTokenSource - cancellion attempted.");
 				cancellationTokenSource.Cancel();
 			}
+			if (timer != null)
+			{
+				timer.Change(Timeout.Infinite, Timeout.Infinite);
+			}
 			LogCallback?.Invoke($"ReceiveReconnectEffectHandler - invoking OnCancelReceiveReconnectRequested.");
 			CancelReceiveReconnectRequestEventArgs args = new CancelReceiveReconnectRequestEventArgs();
 			OnCancelReceiveReconnectRequested(args);				

src/Api/PubnubApi/EventEngine/ReceivingEffectHandler.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -119,6 +118,7 @@ public void OnReceivingEffectResponseReceived(string json)
 		{
 			try
 			{
+				pnStatus = null;
 				var receivedResponse = JsonConvert.DeserializeObject<ReceiveingResponse<object>>(json);
 				if (receivedResponse != null && receivedResponse.Timetoken != null)
 				{