From b4bcc30849b04e0dd2093a8d0848805d66910d19 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 07:44:29 +0100
Subject: [PATCH 01/61] add events

---
 .../Presence/Events/PresenceEvents.cs         | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs b/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
new file mode 100644
index 000000000..2dee9b9e1
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using PubnubApi.Model.Consumer.PNStatus;
+
+namespace PubnubApi.EventEngine.Presence.Events {
+    public class JoinedEvent : Core.IEvent {
+        public IEnumerable<string> Channels { get; set; }
+        public IEnumerable<string> ChannelGroups { get; set; }
+    }
+
+    public class LeftEvent : Core.IEvent {
+        public IEnumerable<string> Channels { get; set; }
+        public IEnumerable<string> ChannelGroups { get; set; }
+    }
+
+    public class LeftAllEvent : Core.IEvent {}
+
+    public class HeartbeatSuccessEvent : Core.IEvent {}
+
+    public class HeartbeatFailureEvent : Core.IEvent {
+        public PNStatus Status { get; set; }
+    }
+
+    public class HeartbeatGiveUpEvent : Core.IEvent {
+        public PNStatus Status { get; set; }
+    }
+
+    public class ReconnectEvent : Core.IEvent {}
+
+    public class DisconnectEvent : Core.IEvent {}
+
+    public class TimesUpEvent : Core.IEvent {}
+}

From c405b5158c208bfbc83f898aa91d4913ce61f6cc Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 07:49:02 +0100
Subject: [PATCH 02/61] proper formatting

---
 .../EventEngine/Presence/Events/PresenceEvents.cs    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs b/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
index 2dee9b9e1..c94a82ec3 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
@@ -2,12 +2,14 @@
 using PubnubApi.Model.Consumer.PNStatus;
 
 namespace PubnubApi.EventEngine.Presence.Events {
-    public class JoinedEvent : Core.IEvent {
+    public class JoinedEvent : Core.IEvent 
+    {
         public IEnumerable<string> Channels { get; set; }
         public IEnumerable<string> ChannelGroups { get; set; }
     }
 
-    public class LeftEvent : Core.IEvent {
+    public class LeftEvent : Core.IEvent 
+    {
         public IEnumerable<string> Channels { get; set; }
         public IEnumerable<string> ChannelGroups { get; set; }
     }
@@ -16,11 +18,13 @@ public class LeftAllEvent : Core.IEvent {}
 
     public class HeartbeatSuccessEvent : Core.IEvent {}
 
-    public class HeartbeatFailureEvent : Core.IEvent {
+    public class HeartbeatFailureEvent : Core.IEvent 
+    {
         public PNStatus Status { get; set; }
     }
 
-    public class HeartbeatGiveUpEvent : Core.IEvent {
+    public class HeartbeatGiveUpEvent : Core.IEvent 
+    {
         public PNStatus Status { get; set; }
     }
 

From 135c876b808ce2d33baf0911cf77fa62a210e10f Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 09:31:22 +0100
Subject: [PATCH 03/61] all states declared

---
 .../EventEngine/Presence/Invocations/Dummy.cs | 10 +++++++
 .../Presence/States/APresenceState.cs         | 17 +++++++++++
 .../Presence/States/CooldownState.cs          | 22 +++++++++++++++
 .../Presence/States/FailedState.cs            | 22 +++++++++++++++
 .../Presence/States/HeartBeatingState.cs      | 22 +++++++++++++++
 .../Presence/States/InactiveState.cs          | 28 +++++++++++++++++++
 .../Presence/States/ReconnectingState.cs      | 22 +++++++++++++++
 .../Presence/States/StoppedState.cs           | 22 +++++++++++++++
 8 files changed, 165 insertions(+)
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Invocations/Dummy.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/Dummy.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/Dummy.cs
new file mode 100644
index 000000000..db39ac82a
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/Dummy.cs
@@ -0,0 +1,10 @@
+// TODO: Dummy Invocation until we have real ones
+namespace PubnubApi.EventEngine.Presence.Invocations {
+    public class DummyInvocation : Core.IEffectInvocation {}
+
+    DummyInvocation[] DummyInvocations() {
+        return new DummyInvocation[] {
+            new DummyInvocation(),
+        };
+    }
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
new file mode 100644
index 000000000..63bdecd75
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
@@ -0,0 +1,17 @@
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Presence.States
+{
+    public abstract class APresenceState : Core.State
+    {
+        public IEnumerable<string> Channels { get; set; }
+        public IEnumerable<string> ChannelGroups { get; set; }
+
+        public bool IsEmpty()
+        {
+            return (Channels == null && ChannelGroups == null)
+                || ((Channels != null && Channels.Count() == 0)
+                        && (ChannelGroups != null && ChannelGroups.Count() == 0));
+        }
+    }
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
new file mode 100644
index 000000000..6602355f0
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -0,0 +1,22 @@
+using PubnubApi.EventEngine.Presence.Invocations;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Presence.States
+{
+    public class CooldownState : APresenceState
+    {
+        // TODO: Dummy Invocation until we have real ones
+        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+
+        // TODO: transitions
+        public override TransitionResult Transition(Transition transition)
+        {
+            return e switch 
+            {
+                _ => null,
+            };
+        }
+    }
+    
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
new file mode 100644
index 000000000..528d3a14e
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -0,0 +1,22 @@
+using PubnubApi.EventEngine.Presence.Invocations;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Presence.States
+{
+    public class FailedState : APresenceState
+    {
+        // TODO: Dummy Invocation until we have real ones
+        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+
+        // TODO: transitions
+        public override TransitionResult Transition(Transition transition)
+        {
+            return e switch 
+            {
+                _ => null,
+            };
+        }
+    }
+    
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
new file mode 100644
index 000000000..ecc20ace9
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -0,0 +1,22 @@
+using PubnubApi.EventEngine.Presence.Invocations;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Presence.States
+{
+    public class HeartbeatingState : APresenceState
+    {
+        // TODO: Dummy Invocation until we have real ones
+        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+
+        // TODO: transitions
+        public override TransitionResult Transition(Transition transition)
+        {
+            return e switch 
+            {
+                _ => null,
+            };
+        }
+    }
+    
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
new file mode 100644
index 000000000..9c0e7d066
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
@@ -0,0 +1,28 @@
+using PubnubApi.EventEngine.Presence.Invocations;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Presence.States
+{
+    public class InactiveState : APresenceState
+    {
+        public InactiveState()
+        {
+            Channels = null;
+            ChannelGroups = null;
+        }
+
+        // TODO: Dummy Invocation until we have real ones
+        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+
+        // TODO: transitions
+        public override TransitionResult Transition(Transition transition)
+        {
+            return e switch 
+            {
+                _ => null,
+            };
+        }
+    }
+    
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
new file mode 100644
index 000000000..9ef54573a
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -0,0 +1,22 @@
+using PubnubApi.EventEngine.Presence.Invocations;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Presence.States
+{
+    public class ReconnectingState : APresenceState
+    {
+        // TODO: Dummy Invocation until we have real ones
+        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+
+        // TODO: transitions
+        public override TransitionResult Transition(Transition transition)
+        {
+            return e switch 
+            {
+                _ => null,
+            };
+        }
+    }
+    
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
new file mode 100644
index 000000000..800a12f73
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -0,0 +1,22 @@
+using PubnubApi.EventEngine.Presence.Invocations;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Presence.States
+{
+    public class StoppedState : APresenceState
+    {
+       // TODO: Dummy Invocation until we have real ones
+        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+
+        // TODO: transitions
+        public override TransitionResult Transition(Transition transition)
+        {
+            return e switch 
+            {
+                _ => null,
+            };
+        }
+    }
+    
+}

From 0ac1abab22635ba647727d47a45e9063666c8c2b Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 09:34:12 +0100
Subject: [PATCH 04/61] fields declared

---
 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs    | 2 ++
 .../PubnubApi/EventEngine/Presence/States/ReconnectingState.cs  | 2 ++
 src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index 528d3a14e..c793831b2 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -5,6 +5,8 @@ namespace PubnubApi.EventEngine.Presence.States
 {
     public class FailedState : APresenceState
     {
+        public PNStatus Reason { get; set; }
+
         // TODO: Dummy Invocation until we have real ones
         public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 9ef54573a..6b0064a1c 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -5,6 +5,8 @@ namespace PubnubApi.EventEngine.Presence.States
 {
     public class ReconnectingState : APresenceState
     {
+        public short RetryCount { get; set; }
+
         // TODO: Dummy Invocation until we have real ones
         public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index 800a12f73..257dc42fe 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -5,6 +5,8 @@ namespace PubnubApi.EventEngine.Presence.States
 {
     public class StoppedState : APresenceState
     {
+        public PNStatus reason { get; set; }
+
        // TODO: Dummy Invocation until we have real ones
         public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();

From 2ffd098cf57754c89a1d17cf2006874e1e01e007 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 10:11:32 +0100
Subject: [PATCH 05/61] joined event

---
 .../Presence/Common/PresenceInput.cs          | 24 +++++++++++++++++++
 .../Presence/Events/PresenceEvents.cs         |  7 +++---
 .../Presence/States/APresenceState.cs         |  8 +++----
 .../Presence/States/CooldownState.cs          |  4 ++++
 .../Presence/States/FailedState.cs            |  4 ++++
 .../Presence/States/HeartBeatingState.cs      |  4 ++++
 .../Presence/States/InactiveState.cs          |  7 ++++--
 .../Presence/States/ReconnectingState.cs      |  4 ++++
 .../Presence/States/StoppedState.cs           |  6 +++--
 9 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
new file mode 100644
index 000000000..adacee656
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
@@ -0,0 +1,24 @@
+namespace PubnubApi.EventEngine.Presence.Common
+{
+    public class PresenceInput
+    {
+        public string[] Channels { get; set; }
+        public string[] ChannelGroups { get; set; }
+
+        public static PresenceInput operator +(PresenceInput a, PresenceInput b)
+        {
+            return new PresenceInput
+            {
+                Channels = a.Channels?.Union(b.Channels ?? new string[0]).ToArray(),
+                ChannelGroups = a.ChannelGroups?.Union(b.ChannelGroups ?? new string[0]).ToArray(),
+            };
+        }
+
+        public bool IsEmpty()
+        {
+            return (Channels == null && ChannelGroups == null)
+                || ((Channels != null && Channels.Count() == 0)
+                        && (ChannelGroups != null && ChannelGroups.Count() == 0));
+        }
+    }
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs b/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
index c94a82ec3..87458fef2 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 using PubnubApi.Model.Consumer.PNStatus;
+using PubnubApi.EventEngine.Presence.Common;
 
 namespace PubnubApi.EventEngine.Presence.Events {
     public class JoinedEvent : Core.IEvent 
     {
-        public IEnumerable<string> Channels { get; set; }
-        public IEnumerable<string> ChannelGroups { get; set; }
+        public PresenceInput Input { get; set; }
     }
 
     public class LeftEvent : Core.IEvent 
     {
-        public IEnumerable<string> Channels { get; set; }
-        public IEnumerable<string> ChannelGroups { get; set; }
+        public PresenceInput Input { get; set; }
     }
 
     public class LeftAllEvent : Core.IEvent {}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
index 63bdecd75..dfc82407c 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
@@ -1,17 +1,15 @@
 using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Presence.Common;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
     public abstract class APresenceState : Core.State
     {
-        public IEnumerable<string> Channels { get; set; }
-        public IEnumerable<string> ChannelGroups { get; set; }
+        public PresenceInput Input { get; set; }
 
         public bool IsEmpty()
         {
-            return (Channels == null && ChannelGroups == null)
-                || ((Channels != null && Channels.Count() == 0)
-                        && (ChannelGroups != null && ChannelGroups.Count() == 0));
+            return Input.IsEmpty();
         }
     }
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index 6602355f0..dd73d721b 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -14,6 +14,10 @@ public override TransitionResult Transition(Transition transition)
         {
             return e switch 
             {
+                Events.JoinedEvent e => new HeartbeatingState()
+                {
+                    Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index c793831b2..e1b55f990 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -16,6 +16,10 @@ public override TransitionResult Transition(Transition transition)
         {
             return e switch 
             {
+                Events.JoinedEvent e => new HeartbeatingState()
+                {
+                    Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index ecc20ace9..c55a34184 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -14,6 +14,10 @@ public override TransitionResult Transition(Transition transition)
         {
             return e switch 
             {
+                Events.JoinedEvent e => new HeartbeatingState()
+                {
+                    Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
index 9c0e7d066..cf2eae9a7 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
@@ -7,8 +7,7 @@ public class InactiveState : APresenceState
     {
         public InactiveState()
         {
-            Channels = null;
-            ChannelGroups = null;
+            Input = null;
         }
 
         // TODO: Dummy Invocation until we have real ones
@@ -20,6 +19,10 @@ public override TransitionResult Transition(Transition transition)
         {
             return e switch 
             {
+                Events.JoinedEvent e => new HeartbeatingState()
+                {
+                    Input = e.Input,
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 6b0064a1c..7fc6b0247 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -16,6 +16,10 @@ public override TransitionResult Transition(Transition transition)
         {
             return e switch 
             {
+                Events.JoinedEvent e => new HeartbeatingState()
+                {
+                    Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index 257dc42fe..7153e7733 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -5,8 +5,6 @@ namespace PubnubApi.EventEngine.Presence.States
 {
     public class StoppedState : APresenceState
     {
-        public PNStatus reason { get; set; }
-
        // TODO: Dummy Invocation until we have real ones
         public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
@@ -16,6 +14,10 @@ public override TransitionResult Transition(Transition transition)
         {
             return e switch 
             {
+                Events.JoinedEvent e => new StoppedState()
+                {
+                    Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
+                },
                 _ => null,
             };
         }

From f61a79a28c0e22ad4d8950a94803ff8f6f13c62a Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 11:18:16 +0100
Subject: [PATCH 06/61] Left event

---
 .../EventEngine/Presence/Common/PresenceInput.cs     |  9 +++++++++
 .../EventEngine/Presence/States/CooldownState.cs     | 11 ++++++++++-
 .../EventEngine/Presence/States/FailedState.cs       | 10 ++++++++++
 .../EventEngine/Presence/States/HeartBeatingState.cs | 10 ++++++++++
 .../EventEngine/Presence/States/ReconnectingState.cs | 12 +++++++++++-
 .../EventEngine/Presence/States/StoppedState.cs      | 12 +++++++++++-
 6 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
index adacee656..b3b296305 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
@@ -14,6 +14,15 @@ public class PresenceInput
             };
         }
 
+        public static PresenceInput operator -(PresenceInput a, PresenceInput b)
+        {
+            return new PresenceInput
+            {
+                Channels = a.Channels?.Except(b.Channels ?? new string[0]).ToArray(),
+                ChannelGroups = a.ChannelGroups?.Except(b.ChannelGroups ?? new string[0]).ToArray(),
+            };
+        }
+
         public bool IsEmpty()
         {
             return (Channels == null && ChannelGroups == null)
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index dd73d721b..e4ded9fe4 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -18,9 +18,18 @@ public override TransitionResult Transition(Transition transition)
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
+                Events.LeftEvent e => () => {
+                    var newInput = this.Input - e.Input;
+
+                    return newInput.IsEmpty()
+                        ? new InactiveState()
+                        : new HeartbeatingState()
+                        {
+                            Input = newInput,
+                        };
+                },
                 _ => null,
             };
         }
     }
-    
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index e1b55f990..3798a7c73 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -20,6 +20,16 @@ public override TransitionResult Transition(Transition transition)
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
+                Events.LeftEvent e => () => {
+                    var newInput = this.Input - e.Input;
+
+                    return newInput.IsEmpty()
+                        ? new InactiveState()
+                        : new HeartbeatingState()
+                        {
+                            Input = newInput,
+                        };
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index c55a34184..0a20d615a 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -18,6 +18,16 @@ public override TransitionResult Transition(Transition transition)
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
+                Events.LeftEvent e => () => {
+                    var newInput = this.Input - e.Input;
+
+                    return newInput.IsEmpty()
+                        ? new InactiveState()
+                        : new HeartbeatingState()
+                        {
+                            Input = newInput,
+                        };
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 7fc6b0247..7e2380909 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -20,7 +20,17 @@ public override TransitionResult Transition(Transition transition)
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
-                _ => null,
+                Events.LeftEvent e => () => {
+                    var newInput = this.Input - e.Input;
+
+                    return newInput.IsEmpty()
+                        ? new InactiveState()
+                        : new HeartbeatingState()
+                        {
+                            Input = newInput,
+                        };
+                },
+                 _ => null,
             };
         }
     }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index 7153e7733..a9cf19661 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -18,7 +18,17 @@ public override TransitionResult Transition(Transition transition)
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
-                _ => null,
+                Events.LeftEvent e => () => {
+                    var newInput = this.Input - e.Input;
+
+                    return newInput.IsEmpty()
+                        ? new InactiveState()
+                        : new StoppedState()
+                        {
+                            Input = newInput,
+                        };
+                },
+                 _ => null,
             };
         }
     }

From 3798d8b9a084409a5ef02bb6f422b61565e2d6b4 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 11:20:54 +0100
Subject: [PATCH 07/61] left all

---
 src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs   | 1 +
 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs     | 1 +
 .../PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs   | 1 +
 .../PubnubApi/EventEngine/Presence/States/ReconnectingState.cs   | 1 +
 src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index e4ded9fe4..8b613130a 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -28,6 +28,7 @@ public override TransitionResult Transition(Transition transition)
                             Input = newInput,
                         };
                 },
+                Events.LeftAllEvent e => new InactiveState(),
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index 3798a7c73..f0382f0c4 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -30,6 +30,7 @@ public override TransitionResult Transition(Transition transition)
                             Input = newInput,
                         };
                 },
+                Events.LeftAllEvent e => new InactiveState(),
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index 0a20d615a..4f4672ed3 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -28,6 +28,7 @@ public override TransitionResult Transition(Transition transition)
                             Input = newInput,
                         };
                 },
+                Events.LeftAllEvent e => new InactiveState(),
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 7e2380909..fbc22b058 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -30,6 +30,7 @@ public override TransitionResult Transition(Transition transition)
                             Input = newInput,
                         };
                 },
+                Events.LeftAllEvent e => new InactiveState(),
                  _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index a9cf19661..a8603f9e1 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -28,6 +28,7 @@ public override TransitionResult Transition(Transition transition)
                             Input = newInput,
                         };
                 },
+                Events.LeftAllEvent e => new InactiveState(),
                  _ => null,
             };
         }

From 13b22a86323cc18b2882dd057fd6d86df4721aea Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 11:23:01 +0100
Subject: [PATCH 08/61] fix function param

---
 src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs  | 2 +-
 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs    | 2 +-
 .../PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs  | 2 +-
 src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs  | 2 +-
 .../PubnubApi/EventEngine/Presence/States/ReconnectingState.cs  | 2 +-
 src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index 8b613130a..89fdb4ac6 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -10,7 +10,7 @@ public class CooldownState : APresenceState
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
 
         // TODO: transitions
-        public override TransitionResult Transition(Transition transition)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch 
             {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index f0382f0c4..2170bab30 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -12,7 +12,7 @@ public class FailedState : APresenceState
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
 
         // TODO: transitions
-        public override TransitionResult Transition(Transition transition)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch 
             {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index 4f4672ed3..25698b0ef 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -10,7 +10,7 @@ public class HeartbeatingState : APresenceState
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
 
         // TODO: transitions
-        public override TransitionResult Transition(Transition transition)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch 
             {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
index cf2eae9a7..b5fb8012f 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
@@ -15,7 +15,7 @@ public InactiveState()
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
 
         // TODO: transitions
-        public override TransitionResult Transition(Transition transition)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch 
             {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index fbc22b058..818bfe6ea 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -12,7 +12,7 @@ public class ReconnectingState : APresenceState
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
 
         // TODO: transitions
-        public override TransitionResult Transition(Transition transition)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch 
             {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index a8603f9e1..6b8776e16 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -10,7 +10,7 @@ public class StoppedState : APresenceState
         public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
 
         // TODO: transitions
-        public override TransitionResult Transition(Transition transition)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch 
             {

From edc602a35c392f1248a93408457240812b52a09b Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 12:05:23 +0100
Subject: [PATCH 09/61] hb fail + transition fix

---
 .../Presence/Events/PresenceEvents.cs         |  2 +-
 .../Presence/States/CooldownState.cs          |  7 ++++++-
 .../Presence/States/FailedState.cs            |  2 +-
 .../Presence/States/HeartBeatingState.cs      | 14 ++++++++++++-
 .../Presence/States/ReconnectingState.cs      | 21 +++++++++++++++++--
 .../Presence/States/StoppedState.cs           |  2 +-
 6 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs b/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
index 87458fef2..598d1a018 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Events/PresenceEvents.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using PubnubApi.Model.Consumer.PNStatus;
+using PubnubApi;
 using PubnubApi.EventEngine.Presence.Common;
 
 namespace PubnubApi.EventEngine.Presence.Events {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index 89fdb4ac6..0b89796b8 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -1,3 +1,4 @@
+using PubnubApi;
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
 
@@ -28,7 +29,11 @@ public override TransitionResult Transition(IEvent e)
                             Input = newInput,
                         };
                 },
-                Events.LeftAllEvent e => new InactiveState(),
+                Events.LeftAllEvent => new InactiveState(),
+                Events.HeartbeatSuccessEvent => new CooldownState()
+                {
+                    Input = this.Input,
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index 2170bab30..144dd931e 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -30,7 +30,7 @@ public override TransitionResult Transition(IEvent e)
                             Input = newInput,
                         };
                 },
-                Events.LeftAllEvent e => new InactiveState(),
+                Events.LeftAllEvent => new InactiveState(),
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index 25698b0ef..d01886c07 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -28,7 +28,19 @@ public override TransitionResult Transition(IEvent e)
                             Input = newInput,
                         };
                 },
-                Events.LeftAllEvent e => new InactiveState(),
+                Events.LeftAllEvent => new InactiveState(),
+                Events.HeartbeatFailureEvent e => () => {
+                    // Request cancellation shouldn't cause any transition because there
+                    // will be another event after this. 
+                    return e.Status.Category == PNStatusCategory.PNCancelledCategory
+                        ? null 
+                        : new ReconnectingState()
+                        {
+                            Input = this.Input,
+                            RetryCount = 1,
+                            Reason = e.Status,
+                        };                
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 818bfe6ea..2358a28f0 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -6,6 +6,7 @@ namespace PubnubApi.EventEngine.Presence.States
     public class ReconnectingState : APresenceState
     {
         public short RetryCount { get; set; }
+        public PNStatus Reason { get; set; }
 
         // TODO: Dummy Invocation until we have real ones
         public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
@@ -30,8 +31,24 @@ public override TransitionResult Transition(IEvent e)
                             Input = newInput,
                         };
                 },
-                Events.LeftAllEvent e => new InactiveState(),
-                 _ => null,
+                Events.LeftAllEvent => new InactiveState(),
+                Events.HeartbeatSuccessEvent => new CooldownState()
+                {
+                    Input = this.Input,
+                },
+                Events.HeartbeatFailureEvent e => () => {
+                    // Request cancellation shouldn't cause any transition because there
+                    // will be another event after this. 
+                    return e.Status.Category == PNStatusCategory.PNCancelledCategory
+                        ? null 
+                        : new ReconnectingState()
+                        {
+                            Input = this.Input,
+                            RetryCount = this.RetryCount + 1,
+                            Reason = e.Status,
+                        };                
+                },
+                _ => null,
             };
         }
     }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index 6b8776e16..f003ae2be 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -28,7 +28,7 @@ public override TransitionResult Transition(IEvent e)
                             Input = newInput,
                         };
                 },
-                Events.LeftAllEvent e => new InactiveState(),
+                Events.LeftAllEvent => new InactiveState(),
                  _ => null,
             };
         }

From 3f4ce7273d4a4ba0649429860957d46c29edd1e6 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 12:06:12 +0100
Subject: [PATCH 10/61] give up

---
 .../EventEngine/Presence/States/ReconnectingState.cs         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 2358a28f0..be9029bc9 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -48,6 +48,11 @@ public override TransitionResult Transition(IEvent e)
                             Reason = e.Status,
                         };                
                 },
+                Events.HeartbeatGiveUpEvent => new FailedState()
+                {
+                    Input = this.Input,
+                    Reason = this.Reason,
+                },
                 _ => null,
             };
         }

From 3881560f814a64dd5b8cd49a30181c6341f6dcce Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 12:08:28 +0100
Subject: [PATCH 11/61] reconnect

---
 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs  | 4 ++++
 src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index 144dd931e..f43b36fba 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -31,6 +31,10 @@ public override TransitionResult Transition(IEvent e)
                         };
                 },
                 Events.LeftAllEvent => new InactiveState(),
+                Events.ReconnectEvent => new HeartbeatingState()
+                {
+                    Input = this.Input,
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index f003ae2be..38b5cb20c 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -29,6 +29,10 @@ public override TransitionResult Transition(IEvent e)
                         };
                 },
                 Events.LeftAllEvent => new InactiveState(),
+                Events.ReconnectEvent => new HeartbeatingState()
+                {
+                    Input = this.Input,
+                },
                  _ => null,
             };
         }

From d0a12d346f26a3fcee1e5df04dc4c92c80f0aa21 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 12:10:41 +0100
Subject: [PATCH 12/61] disconnect

---
 .../PubnubApi/EventEngine/Presence/States/CooldownState.cs    | 4 ++++
 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs  | 4 ++++
 .../EventEngine/Presence/States/HeartBeatingState.cs          | 4 ++++
 .../EventEngine/Presence/States/ReconnectingState.cs          | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index 0b89796b8..cce78111b 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -34,6 +34,10 @@ public override TransitionResult Transition(IEvent e)
                 {
                     Input = this.Input,
                 },
+                Events.DisconnectEvent => new StoppedState()
+                {
+                    Input = this.Input,
+                },
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index f43b36fba..88a633025 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -35,6 +35,10 @@ public override TransitionResult Transition(IEvent e)
                 {
                     Input = this.Input,
                 },
+                Events.DisconnectEvent => new StoppedState()
+                {
+                    Input = this.Input,
+                }, 
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index d01886c07..ce47a7d22 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -41,6 +41,10 @@ public override TransitionResult Transition(IEvent e)
                             Reason = e.Status,
                         };                
                 },
+                Events.DisconnectEvent => new StoppedState()
+                {
+                    Input = this.Input,
+                }, 
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index be9029bc9..26524b4be 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -53,6 +53,10 @@ public override TransitionResult Transition(IEvent e)
                     Input = this.Input,
                     Reason = this.Reason,
                 },
+                Events.DisconnectEvent => new StoppedState()
+                {
+                    Input = this.Input,
+                }, 
                 _ => null,
             };
         }

From d4c7a1e287190bd97d9e8cb560dcee21bde92cef Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 12:12:21 +0100
Subject: [PATCH 13/61] timeup

---
 .../PubnubApi/EventEngine/Presence/States/CooldownState.cs    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index cce78111b..b7ab2be16 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -38,6 +38,10 @@ public override TransitionResult Transition(IEvent e)
                 {
                     Input = this.Input,
                 },
+                Events.TimesUpEvent => new HeartbeatingState()
+                {
+                    Input = this.Input,
+                },
                 _ => null,
             };
         }

From 384ef5dd3829bea69e39458c0af7d926d80fa0b2 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 12:14:07 +0100
Subject: [PATCH 14/61] missing enumerable

---
 src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs   | 1 +
 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs     | 1 +
 .../PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs   | 1 +
 src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs   | 1 +
 .../PubnubApi/EventEngine/Presence/States/ReconnectingState.cs   | 1 +
 src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index b7ab2be16..e9dabcb2c 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -1,6 +1,7 @@
 using PubnubApi;
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
+using System.Collections.Generic;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index 88a633025..7cc728a82 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -1,5 +1,6 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
+using System.Collections.Generic;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index ce47a7d22..e76624df5 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -1,5 +1,6 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
+using System.Collections.Generic;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
index b5fb8012f..457d60ec4 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
@@ -1,5 +1,6 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
+using System.Collections.Generic;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 26524b4be..8073bb8ce 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -1,5 +1,6 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
+using System.Collections.Generic;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index 38b5cb20c..ae304483b 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -1,5 +1,6 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
+using System.Collections.Generic;
 
 namespace PubnubApi.EventEngine.Presence.States
 {

From e371d5985146f43f4a1e3d927acc1b9ee7c1169e Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 13:28:17 +0100
Subject: [PATCH 15/61] building should work

---
 .../Presence/Common/PresenceInput.cs          | 19 ++++---
 .../EventEngine/Presence/Invocations/Dummy.cs |  6 --
 .../Presence/States/APresenceState.cs         | 12 ++++
 .../Presence/States/CooldownState.cs          | 28 ++++------
 .../Presence/States/FailedState.cs            | 26 +++------
 .../Presence/States/HeartBeatingState.cs      | 49 +++++++----------
 .../Presence/States/InactiveState.cs          |  9 +--
 .../Presence/States/ReconnectingState.cs      | 55 ++++++++-----------
 .../Presence/States/StoppedState.cs           | 38 +++++++------
 9 files changed, 113 insertions(+), 129 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
index b3b296305..2478ae4b1 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
@@ -1,16 +1,19 @@
+using System.Collections.Generic;
+using System.Linq;
+
 namespace PubnubApi.EventEngine.Presence.Common
 {
     public class PresenceInput
     {
-        public string[] Channels { get; set; }
-        public string[] ChannelGroups { get; set; }
+        public List<string> Channels { get; set; }
+        public List<string> ChannelGroups { get; set; }
 
         public static PresenceInput operator +(PresenceInput a, PresenceInput b)
         {
             return new PresenceInput
             {
-                Channels = a.Channels?.Union(b.Channels ?? new string[0]).ToArray(),
-                ChannelGroups = a.ChannelGroups?.Union(b.ChannelGroups ?? new string[0]).ToArray(),
+                Channels = a.Channels?.Union(b.Channels ?? new List<string>()).ToList(),
+                ChannelGroups = a.ChannelGroups?.Union(b.ChannelGroups ?? new List<string>()).ToList(),
             };
         }
 
@@ -18,16 +21,16 @@ public class PresenceInput
         {
             return new PresenceInput
             {
-                Channels = a.Channels?.Except(b.Channels ?? new string[0]).ToArray(),
-                ChannelGroups = a.ChannelGroups?.Except(b.ChannelGroups ?? new string[0]).ToArray(),
+                Channels = a.Channels?.Except(b.Channels ?? new List<string>()).ToList(),
+                ChannelGroups = a.ChannelGroups?.Except(b.ChannelGroups ?? new List<string>()).ToList(),
             };
         }
 
         public bool IsEmpty()
         {
             return (Channels == null && ChannelGroups == null)
-                || ((Channels != null && Channels.Count() == 0)
-                        && (ChannelGroups != null && ChannelGroups.Count() == 0));
+                || ((Channels != null && Channels.Count == 0)
+                        && (ChannelGroups != null && ChannelGroups.Count == 0));
         }
     }
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/Dummy.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/Dummy.cs
index db39ac82a..0e6059c0b 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Invocations/Dummy.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/Dummy.cs
@@ -1,10 +1,4 @@
 // TODO: Dummy Invocation until we have real ones
 namespace PubnubApi.EventEngine.Presence.Invocations {
     public class DummyInvocation : Core.IEffectInvocation {}
-
-    DummyInvocation[] DummyInvocations() {
-        return new DummyInvocation[] {
-            new DummyInvocation(),
-        };
-    }
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
index dfc82407c..18d4453c9 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
@@ -11,5 +11,17 @@ public bool IsEmpty()
         {
             return Input.IsEmpty();
         }
+
+        protected TransitionResult HandleLeftEvent(Events.LeftEvent e) 
+        {
+            var newInput = this.Input - e.Input;
+
+            return newInput.IsEmpty()
+                ? (TransitionResult)new InactiveState()
+                : (TransitionResult)new HeartbeatingState()
+                {
+                    Input = newInput,
+                };
+        }
     }
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index e9dabcb2c..57f8bd81a 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -2,44 +2,36 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
 using System.Collections.Generic;
+using System;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
     public class CooldownState : APresenceState
     {
         // TODO: Dummy Invocation until we have real ones
-        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
-        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnEntry => new DummyInvocation().AsArray();
+        public override IEnumerable<IEffectInvocation> OnExit => new DummyInvocation().AsArray();
 
         // TODO: transitions
-        public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent ev)
         {
-            return e switch 
+            return ev switch 
             {
                 Events.JoinedEvent e => new HeartbeatingState()
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
-                Events.LeftEvent e => () => {
-                    var newInput = this.Input - e.Input;
-
-                    return newInput.IsEmpty()
-                        ? new InactiveState()
-                        : new HeartbeatingState()
-                        {
-                            Input = newInput,
-                        };
-                },
-                Events.LeftAllEvent => new InactiveState(),
-                Events.HeartbeatSuccessEvent => new CooldownState()
+                Events.LeftEvent e => HandleLeftEvent(e),
+                Events.LeftAllEvent e => new InactiveState(),
+                Events.HeartbeatSuccessEvent e => new CooldownState()
                 {
                     Input = this.Input,
                 },
-                Events.DisconnectEvent => new StoppedState()
+                Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
                 },
-                Events.TimesUpEvent => new HeartbeatingState()
+                Events.TimesUpEvent e => new HeartbeatingState()
                 {
                     Input = this.Input,
                 },
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index 7cc728a82..8eefb7245 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -1,6 +1,7 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
 using System.Collections.Generic;
+using System;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
@@ -9,34 +10,25 @@ public class FailedState : APresenceState
         public PNStatus Reason { get; set; }
 
         // TODO: Dummy Invocation until we have real ones
-        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
-        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnEntry => new DummyInvocation().AsArray();
+        public override IEnumerable<IEffectInvocation> OnExit => new DummyInvocation().AsArray();
 
         // TODO: transitions
-        public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent ev)
         {
-            return e switch 
+            return ev switch 
             {
                 Events.JoinedEvent e => new HeartbeatingState()
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
-                Events.LeftEvent e => () => {
-                    var newInput = this.Input - e.Input;
-
-                    return newInput.IsEmpty()
-                        ? new InactiveState()
-                        : new HeartbeatingState()
-                        {
-                            Input = newInput,
-                        };
-                },
-                Events.LeftAllEvent => new InactiveState(),
-                Events.ReconnectEvent => new HeartbeatingState()
+                Events.LeftEvent e => HandleLeftEvent(e),
+                Events.LeftAllEvent e => new InactiveState(),
+                Events.ReconnectEvent e => new HeartbeatingState()
                 {
                     Input = this.Input,
                 },
-                Events.DisconnectEvent => new StoppedState()
+                Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
                 }, 
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index e76624df5..b461cbced 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -1,54 +1,47 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
 using System.Collections.Generic;
+using System;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
     public class HeartbeatingState : APresenceState
     {
         // TODO: Dummy Invocation until we have real ones
-        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
-        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnEntry => new DummyInvocation().AsArray();
+        public override IEnumerable<IEffectInvocation> OnExit => new DummyInvocation().AsArray();
 
         // TODO: transitions
-        public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent ev)
         {
-            return e switch 
+            return ev switch 
             {
                 Events.JoinedEvent e => new HeartbeatingState()
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
-                Events.LeftEvent e => () => {
-                    var newInput = this.Input - e.Input;
-
-                    return newInput.IsEmpty()
-                        ? new InactiveState()
-                        : new HeartbeatingState()
-                        {
-                            Input = newInput,
-                        };
-                },
-                Events.LeftAllEvent => new InactiveState(),
-                Events.HeartbeatFailureEvent e => () => {
-                    // Request cancellation shouldn't cause any transition because there
-                    // will be another event after this. 
-                    return e.Status.Category == PNStatusCategory.PNCancelledCategory
-                        ? null 
-                        : new ReconnectingState()
-                        {
-                            Input = this.Input,
-                            RetryCount = 1,
-                            Reason = e.Status,
-                        };                
-                },
-                Events.DisconnectEvent => new StoppedState()
+                Events.LeftEvent e => HandleLeftEvent(e),
+                Events.LeftAllEvent e => new InactiveState(),
+                Events.HeartbeatFailureEvent e => HandleHeartbeatFailureEvent(e), 
+                Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
                 }, 
                 _ => null,
             };
         }
+
+        private TransitionResult HandleHeartbeatFailureEvent(Events.HeartbeatFailureEvent e)
+        {
+            return e.Status.Category == PNStatusCategory.PNCancelledCategory
+                ? (TransitionResult)null 
+                : (TransitionResult)new ReconnectingState()
+                {
+                    Input = this.Input,
+                    RetryCount = 1,
+                    Reason = e.Status,
+                };                
+        }
     }
     
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
index 457d60ec4..74f4f238c 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
@@ -1,6 +1,7 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
 using System.Collections.Generic;
+using System;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
@@ -12,13 +13,13 @@ public InactiveState()
         }
 
         // TODO: Dummy Invocation until we have real ones
-        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
-        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnEntry => new DummyInvocation().AsArray();
+        public override IEnumerable<IEffectInvocation> OnExit => new DummyInvocation().AsArray();
 
         // TODO: transitions
-        public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent ev)
         {
-            return e switch 
+            return ev switch 
             {
                 Events.JoinedEvent e => new HeartbeatingState()
                 {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 8073bb8ce..4ef39e747 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -1,66 +1,59 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
 using System.Collections.Generic;
+using System;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
     public class ReconnectingState : APresenceState
     {
-        public short RetryCount { get; set; }
+        public int RetryCount { get; set; }
         public PNStatus Reason { get; set; }
 
         // TODO: Dummy Invocation until we have real ones
-        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
-        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+        public override IEnumerable<IEffectInvocation> OnEntry => new DummyInvocation().AsArray();
+        public override IEnumerable<IEffectInvocation> OnExit => new DummyInvocation().AsArray();
 
         // TODO: transitions
-        public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent ev)
         {
-            return e switch 
+            return ev switch 
             {
                 Events.JoinedEvent e => new HeartbeatingState()
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
-                Events.LeftEvent e => () => {
-                    var newInput = this.Input - e.Input;
-
-                    return newInput.IsEmpty()
-                        ? new InactiveState()
-                        : new HeartbeatingState()
-                        {
-                            Input = newInput,
-                        };
-                },
-                Events.LeftAllEvent => new InactiveState(),
-                Events.HeartbeatSuccessEvent => new CooldownState()
+                Events.LeftEvent e => HandleLeftEvent(e),
+                Events.LeftAllEvent e => new InactiveState(),
+                Events.HeartbeatSuccessEvent e => new CooldownState()
                 {
                     Input = this.Input,
                 },
-                Events.HeartbeatFailureEvent e => () => {
-                    // Request cancellation shouldn't cause any transition because there
-                    // will be another event after this. 
-                    return e.Status.Category == PNStatusCategory.PNCancelledCategory
-                        ? null 
-                        : new ReconnectingState()
-                        {
-                            Input = this.Input,
-                            RetryCount = this.RetryCount + 1,
-                            Reason = e.Status,
-                        };                
-                },
-                Events.HeartbeatGiveUpEvent => new FailedState()
+                Events.HeartbeatFailureEvent e => HandleHeartbeatFailureEvent(e),
+                Events.HeartbeatGiveUpEvent e => new FailedState()
                 {
                     Input = this.Input,
                     Reason = this.Reason,
                 },
-                Events.DisconnectEvent => new StoppedState()
+                Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
                 }, 
                 _ => null,
             };
         }
+
+        private TransitionResult HandleHeartbeatFailureEvent(Events.HeartbeatFailureEvent e)
+        {
+            return e.Status.Category == PNStatusCategory.PNCancelledCategory
+                ? (TransitionResult)null 
+                : (TransitionResult)new ReconnectingState()
+                {
+                    Input = this.Input,
+                    RetryCount = this.RetryCount + 1,
+                    Reason = e.Status,
+                };                
+        }
     }
     
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
index ae304483b..5e8751b43 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/StoppedState.cs
@@ -1,42 +1,46 @@
 using PubnubApi.EventEngine.Presence.Invocations;
 using PubnubApi.EventEngine.Core;
 using System.Collections.Generic;
+using System;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
     public class StoppedState : APresenceState
     {
-       // TODO: Dummy Invocation until we have real ones
-        public override IEnumerable<IEffectInvocation> OnEntry => DummyInvocations();
-        public override IEnumerable<IEffectInvocation> OnExit => DummyInvocations();
+        // TODO: Dummy Invocation until we have real ones
+        public override IEnumerable<IEffectInvocation> OnEntry => new DummyInvocation().AsArray();
+        public override IEnumerable<IEffectInvocation> OnExit => new DummyInvocation().AsArray();
 
         // TODO: transitions
-        public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent ev)
         {
-            return e switch 
+            return ev switch 
             {
                 Events.JoinedEvent e => new StoppedState()
                 {
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
-                Events.LeftEvent e => () => {
-                    var newInput = this.Input - e.Input;
-
-                    return newInput.IsEmpty()
-                        ? new InactiveState()
-                        : new StoppedState()
-                        {
-                            Input = newInput,
-                        };
-                },
-                Events.LeftAllEvent => new InactiveState(),
-                Events.ReconnectEvent => new HeartbeatingState()
+                Events.LeftEvent e => HandleLeftEvent(e),
+                Events.LeftAllEvent e => new InactiveState(),
+                Events.ReconnectEvent e => new HeartbeatingState()
                 {
                     Input = this.Input,
                 },
                  _ => null,
             };
         }
+
+        protected TransitionResult HandleLeftEvent(Events.LeftEvent e)
+        {
+            var newInput = this.Input - e.Input;
+
+            return newInput.IsEmpty()
+                ? (TransitionResult)new InactiveState()
+                : (TransitionResult)new StoppedState()
+                {
+                    Input = newInput,
+                };
+        }
     }
     
 }

From c6bcba0140875734b7134c58461a5c24a1186afd Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 14:03:18 +0100
Subject: [PATCH 16/61] enumerable instead of list

---
 .../EventEngine/Presence/Common/PresenceInput.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
index 2478ae4b1..d1023f128 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
@@ -5,15 +5,15 @@ namespace PubnubApi.EventEngine.Presence.Common
 {
     public class PresenceInput
     {
-        public List<string> Channels { get; set; }
-        public List<string> ChannelGroups { get; set; }
+        public IEnumerable<string> Channels { get; set; }
+        public IEnumerable<string> ChannelGroups { get; set; }
 
         public static PresenceInput operator +(PresenceInput a, PresenceInput b)
         {
             return new PresenceInput
             {
-                Channels = a.Channels?.Union(b.Channels ?? new List<string>()).ToList(),
-                ChannelGroups = a.ChannelGroups?.Union(b.ChannelGroups ?? new List<string>()).ToList(),
+                Channels = a.Channels?.Union(b.Channels ?? new string[0]),
+                ChannelGroups = a.ChannelGroups?.Union(b.ChannelGroups ?? new string[0]),
             };
         }
 
@@ -21,16 +21,16 @@ public class PresenceInput
         {
             return new PresenceInput
             {
-                Channels = a.Channels?.Except(b.Channels ?? new List<string>()).ToList(),
-                ChannelGroups = a.ChannelGroups?.Except(b.ChannelGroups ?? new List<string>()).ToList(),
+                Channels = a.Channels?.Except(b.Channels ?? new string[0]),
+                ChannelGroups = a.ChannelGroups?.Except(b.ChannelGroups ?? new string[0]),
             };
         }
 
         public bool IsEmpty()
         {
             return (Channels == null && ChannelGroups == null)
-                || ((Channels != null && Channels.Count == 0)
-                        && (ChannelGroups != null && ChannelGroups.Count == 0));
+                || ((Channels != null && Channels.Count() == 0)
+                        && (ChannelGroups != null && ChannelGroups.Count() == 0));
         }
     }
 }

From 9cb95a5275fdd3824ebe946f395f23d231886064 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Tue, 23 Jan 2024 14:55:37 +0100
Subject: [PATCH 17/61] add UT

---
 .../EventEngine/Presence/CooldownState.cs     | 70 +++++++++++++++++
 .../EventEngine/Presence/FailedState.cs       | 70 +++++++++++++++++
 .../EventEngine/Presence/HeartbeatingState.cs | 70 +++++++++++++++++
 .../EventEngine/Presence/InactiveState.cs     | 65 ++++++++++++++++
 .../EventEngine/Presence/ReconnectingState.cs | 75 +++++++++++++++++++
 .../EventEngine/Presence/StoppedState.cs      | 70 +++++++++++++++++
 6 files changed, 420 insertions(+)
 create mode 100644 src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
 create mode 100644 src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
 create mode 100644 src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
 create mode 100644 src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
 create mode 100644 src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
 create mode 100644 src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
new file mode 100644
index 000000000..41a920608
--- /dev/null
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -0,0 +1,70 @@
+using NUnit.Framework;
+using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Presence.Events;
+using PubnubApi.EventEngine.Presence.States;
+
+namespace PubnubApi.Tests.EventEngine.Presence
+{
+    internal class CooldownTransitions
+    {
+        private static readonly object[] testCases = {
+            new object[] {
+                new CooldownState(),
+                new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new CooldownState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new CooldownState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new InactiveState(),
+            },
+            new object[] {
+                new CooldownState(),
+                new LeftAllEvent(),
+                new InactiveState(),
+            },
+            new object[] {
+                new CooldownState(),
+                new HeartbeatSuccessEvent(),
+                null,
+            },
+            new object[] {
+                new CooldownState(),
+                new HeartbeatFailureEvent() { Status = new PNStatus() },
+                null,
+            },
+            new object[] {
+                new CooldownState(),
+                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
+                null,
+            },
+            new object[] {
+                new CooldownState(),
+                new ReconnectEvent(),
+                null,
+            },
+            new object[] {
+                new CooldownState(),
+                new DisconnectEvent(),
+                new StoppedState(),
+            },
+            new object[] {
+                new CooldownState(),
+                new TimesUpEvent(),
+                new HeartbeatingState(),
+            },
+        };
+
+        [TestCasesSource(nameof(testCases))]
+        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        {
+            Assert.AreEqual(expected, sut.Transition(ev));
+        }
+    }
+}
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
new file mode 100644
index 000000000..11a173ca0
--- /dev/null
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
@@ -0,0 +1,70 @@
+using NUnit.Framework;
+using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Presence.Events;
+using PubnubApi.EventEngine.Presence.States;
+
+namespace PubnubApi.Tests.EventEngine.Presence
+{
+    internal class FailedStateTransitions
+    {
+        private static readonly object[] testCases = {
+            new object[] {
+                new FailedState(),
+                new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new FailedState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new FailedState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new InactiveState(),
+            },
+            new object[] {
+                new FailedState(),
+                new LeftAllEvent(),
+                new InactiveState(),
+            },
+            new object[] {
+                new FailedState(),
+                new HeartbeatSuccessEvent(),
+                null,
+            },
+            new object[] {
+                new FailedState(),
+                new HeartbeatFailureEvent() { Status = new PNStatus() },
+                null,
+            },
+            new object[] {
+                new FailedState(),
+                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
+                null,
+            },
+            new object[] {
+                new FailedState(),
+                new ReconnectEvent(),
+                new HeartbeatingState(),
+            },
+            new object[] {
+                new FailedState(),
+                new DisconnectEvent(),
+                new StoppedState(),
+            },
+            new object[] {
+                new FailedState(),
+                new TimesUpEvent(),
+                null,
+            },
+        };
+
+        [TestCasesSource(nameof(testCases))]
+        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        {
+            Assert.AreEqual(expected, sut.Transition(ev));
+        }
+    }
+}
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
new file mode 100644
index 000000000..2286b0c1b
--- /dev/null
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
@@ -0,0 +1,70 @@
+using NUnit.Framework;
+using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Presence.Events;
+using PubnubApi.EventEngine.Presence.States;
+
+namespace PubnubApi.Tests.EventEngine.Presence
+{
+    internal class HeartbeatingStateTransitions
+    {
+        private static readonly object[] testCases = {
+            new object[] {
+                new HeartbeatingState(),
+                new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new InactiveState(),
+            },
+            new object[] {
+                new HeartbeatingState(),
+                new LeftAllEvent(),
+                new InactiveState(),
+            },
+            new object[] {
+                new HeartbeatingState(),
+                new HeartbeatSuccessEvent(),
+                new CooldownState(),
+            },
+            new object[] {
+                new HeartbeatingState(),
+                new HeartbeatFailureEvent() { Status = new PNStatus() },
+                new ReconnectingState(),
+            },
+            new object[] {
+                new HeartbeatingState(),
+                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
+                null,
+            },
+            new object[] {
+                new HeartbeatingState(),
+                new ReconnectEvent(),
+                null,
+            },
+            new object[] {
+                new HeartbeatingState(),
+                new DisconnectEvent(),
+                new StoppedState(),
+            },
+            new object[] {
+                new HeartbeatingState(),
+                new TimesUpEvent(),
+                null,
+            },
+        };
+
+        [TestCasesSource(nameof(testCases))]
+        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        {
+            Assert.AreEqual(expected, sut.Transition(ev));
+        }
+    }
+}
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
new file mode 100644
index 000000000..a2760d6fb
--- /dev/null
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
@@ -0,0 +1,65 @@
+using NUnit.Framework;
+using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Presence.Events;
+using PubnubApi.EventEngine.Presence.States;
+
+namespace PubnubApi.Tests.EventEngine.Presence
+{
+    internal class InactiveStateTransitions
+    {
+        private static readonly object[] testCases = {
+            new object[] {
+                new InactiveState(),
+                new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new InactiveState(),
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                null,
+            },
+            new object[] {
+                new InactiveState(),
+                new LeftAllEvent(),
+                null,
+            },
+            new object[] {
+                new InactiveState(),
+                new HeartbeatSuccessEvent(),
+                null,
+            },
+            new object[] {
+                new InactiveState(),
+                new HeartbeatFailureEvent() { Status = new PNStatus() },
+                null,
+            },
+            new object[] {
+                new InactiveState(),
+                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
+                null,
+            },
+            new object[] {
+                new InactiveState(),
+                new ReconnectEvent(),
+                null,
+            },
+            new object[] {
+                new InactiveState(),
+                new DisconnectEvent(),
+                null,
+            },
+            new object[] {
+                new InactiveState(),
+                new TimesUpEvent(),
+                null,
+            },
+        };
+
+        [TestCasesSource(nameof(testCases))]
+        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        {
+            Assert.AreEqual(expected, sut.Transition(ev));
+        }
+    }
+}
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
new file mode 100644
index 000000000..f068a66ae
--- /dev/null
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
@@ -0,0 +1,75 @@
+using NUnit.Framework;
+using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Presence.Events;
+using PubnubApi.EventEngine.Presence.States;
+
+namespace PubnubApi.Tests.EventEngine.Presence
+{
+    internal class ReconnectingStateTransitions
+    {
+        private static readonly object[] testCases = {
+            new object[] {
+                new ReconnectingState(),
+                new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new ReconnectingState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
+                new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new ReconnectingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new InactiveState(),
+            },
+            new object[] {
+                new ReconnectingState(),
+                new LeftAllEvent(),
+                new InactiveState(),
+            },
+            new object[] {
+                new ReconnectingState(),
+                new HeartbeatSuccessEvent(),
+                new CooldownState(),
+            },
+            new object[] {
+                new ReconnectingState() { RetryCount = 1 },
+                new HeartbeatFailureEvent(),
+                new ReconnectingState() { RetryCount = 2 },
+            },
+            new object[] {
+                new ReconnectingState(),
+                new HeartbeatFailureEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory} },
+                null,
+            },
+            new object[] {
+                new ReconnectingState(),
+                new HeartbeatGiveUpEvent(),
+                new FailedState(),
+            },
+            new object[] {
+                new ReconnectingState(),
+                new ReconnectEvent(),
+                null,
+            },
+            new object[] {
+                new ReconnectingState(),
+                new DisconnectEvent(),
+                new StoppedState(),
+            },
+            new object[] {
+                new ReconnectingState(),
+                new TimesUpEvent(),
+                null,
+            },
+        };
+
+        [TestCasesSource(nameof(testCases))]
+        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        {
+            Assert.AreEqual(expected, sut.Transition(ev));
+        }
+    }
+}
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
new file mode 100644
index 000000000..7e7c0cffc
--- /dev/null
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
@@ -0,0 +1,70 @@
+using NUnit.Framework;
+using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Presence.Events;
+using PubnubApi.EventEngine.Presence.States;
+
+namespace PubnubApi.Tests.EventEngine.Presence
+{
+    internal class StoppedStateTransitions
+    {
+        private static readonly object[] testCases = {
+            new object[] {
+                new StoppedState(),
+                new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new StoppedState(),
+            },
+            new object[] {
+                new StoppedState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
+                new StoppedState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+            },
+            new object[] {
+                new StoppedState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new InactiveState(),
+            },
+            new object[] {
+                new StoppedState(),
+                new LeftAllEvent(),
+                new InactiveState(),
+            },
+            new object[] {
+                new StoppedState(),
+                new HeartbeatSuccessEvent(),
+                null,
+            },
+            new object[] {
+                new StoppedState(),
+                new HeartbeatFailureEvent() { Status = new PNStatus() },
+                null,
+            },
+            new object[] {
+                new StoppedState(),
+                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
+                null,
+            },
+            new object[] {
+                new StoppedState(),
+                new ReconnectEvent(),
+                new HeartbeatingState(),
+            },
+            new object[] {
+                new StoppedState(),
+                new DisconnectEvent(),
+                null,
+            },
+            new object[] {
+                new StoppedState(),
+                new TimesUpEvent(),
+                null,
+            },
+        };
+
+        [TestCasesSource(nameof(testCases))]
+        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        {
+            Assert.AreEqual(expected, sut.Transition(ev));
+        }
+    }
+}

From 3427cbcaaefe3f276f3e122c7618f21d53d379e4 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Thu, 25 Jan 2024 00:36:52 +0530
Subject: [PATCH 18/61] fix/build: missing reference links for effect handlers

---
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index bc14ab3e8..ca0450a59 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -234,6 +234,8 @@
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\Context\ReconnectionDelayUtil.cs" Link="EventEngine\Subscribe\Context\ReconnectionDelayUtil.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\Effects\HandshakeEffectHandler.cs" Link="EventEngine\Subscribe\Effects\HandshakeEffectHandler.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\Effects\ReceivingEffectHandler.cs" Link="EventEngine\Subscribe\Effects\ReceivingEffectHandler.cs" />
+    <Compile Include="..\PubnubApi\EventEngine\Subscribe\Effects\EmitMessagesHandler.cs" Link="EventEngine\Subscribe\Effects\EmitMessagesHandler.cs" />
+    <Compile Include="..\PubnubApi\EventEngine\Subscribe\Effects\EmitStatusEffectHandler.cs" Link="EventEngine\Subscribe\Effects\EmitStatusEffectHandler.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\Events\SubscriptionEvents.cs" Link="EventEngine\Subscribe\Events\SubscriptionEvents.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\Invocations\SubscriptionInvocations.cs" Link="EventEngine\Subscribe\Invocations\SubscriptionInvocations.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\States\HandshakeFailedState.cs" Link="EventEngine\Subscribe\States\HandshakeFailedState.cs" />
@@ -246,6 +248,7 @@
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\States\ReceivingState.cs" Link="EventEngine\Subscribe\States\ReceivingState.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\States\UnsubscribedState.cs" Link="EventEngine\Subscribe\States\UnsubscribedState.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\SubscribeEventEngine.cs" Link="EventEngine\Subscribe\SubscribeEventEngine.cs" />
+    <Compile Include="..\PubnubApi\EventEngine\Subscribe\SubscribeEventEngineFactory.cs" Link="EventEngine\Subscribe\SubscribeEventEngineFactory.cs" />
     <Compile Include="..\PubnubApi\Helper\MobilePushHelper.cs" Link="Helper\MobilePushHelper.cs" />
     <Compile Include="..\PubnubApi\HttpUtility\HttpUtility.cs">
       <Link>HttpUtility\HttpUtility.cs</Link>

From 2581fa91bfeae9a8c7149f5d626aabea5ba48e2b Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Thu, 25 Jan 2024 00:46:03 +0530
Subject: [PATCH 19/61] attempt to fix UWP project build errors

---
 src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
index 59b40e332..729d09fc5 100644
--- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
+++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -345,6 +345,8 @@
     <Compile Include="..\PubnubApi\EventEngine\IEffectInvocationHandler.cs" Link="EventEngine\IEffectInvocationHandler.cs" />
     <Compile Include="..\PubnubApi\EventEngine\ReceiveReconnectingEffectHandler.cs" Link="EventEngine\ReceiveReconnectingEffectHandler.cs" />
     <Compile Include="..\PubnubApi\EventEngine\ReceivingEffectHandler.cs" Link="EventEngine\ReceivingEffectHandler.cs" />
+    <Compile Include="..\PubnubApi\EventEngine\Subscribe\Effects\EmitMessagesHandler.cs" Link="EventEngine\Subscribe\Effects\EmitMessagesHandler.cs" />
+    <Compile Include="..\PubnubApi\EventEngine\Subscribe\Effects\EmitStatusEffectHandler.cs" Link="EventEngine\Subscribe\Effects\EmitStatusEffectHandler.cs" />
     <Compile Include="..\PubnubApi\EventEngine\State.cs" Link="EventEngine\State.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\Common\CommonSubscribeTypes.cs" Link="EventEngine\Subscribe\Common\CommonSubscribeTypes.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\Context\ReconnectionConfiguration.cs" Link="EventEngine\Subscribe\Context\ReconnectionConfiguration.cs" />
@@ -363,6 +365,7 @@
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\States\ReceivingState.cs" Link="EventEngine\Subscribe\States\ReceivingState.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\States\UnsubscribedState.cs" Link="EventEngine\Subscribe\States\UnsubscribedState.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\SubscribeEventEngine.cs" Link="EventEngine\Subscribe\SubscribeEventEngine.cs" />
+    <Compile Include="..\PubnubApi\EventEngine\Subscribe\SubscribeEventEngineFactory.cs" Link="EventEngine\Subscribe\SubscribeEventEngineFactory.cs" />
     <Compile Include="..\PubnubApi\Helper\MobilePushHelper.cs" Link="Helper\MobilePushHelper.cs" />
     <Compile Include="..\PubnubApi\HttpUtility\HttpUtility.cs">
       <Link>HttpUtility\HttpUtility.cs</Link>

From 56ebedd5571a1851a317e70b3985d8d0708b6481 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Thu, 25 Jan 2024 00:55:53 +0530
Subject: [PATCH 20/61] fix CSC : error CS1617: error for language version

---
 src/Api/PubnubApi/PubnubApi.csproj       | 2 +-
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 2 +-
 src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj
index b1ebf5097..710f16c77 100644
--- a/src/Api/PubnubApi/PubnubApi.csproj
+++ b/src/Api/PubnubApi/PubnubApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;net461;net48</TargetFrameworks>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index ca0450a59..369ae84c1 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard1.4;netstandard1.1;netstandard2.0;net6.0</TargetFrameworks>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
index 729d09fc5..b7781292c 100644
--- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
+++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>uap10.0</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>

From 19eb3f3e35e03a7556370b5e5dd6a310e1726949 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Thu, 25 Jan 2024 14:44:17 +0530
Subject: [PATCH 21/61] updating language version to 9 suppoerted by VS2019

---
 src/Api/PubnubApi/PubnubApi.csproj       | 2 +-
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 2 +-
 src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj
index 710f16c77..d73f33cb2 100644
--- a/src/Api/PubnubApi/PubnubApi.csproj
+++ b/src/Api/PubnubApi/PubnubApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;net461;net48</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index 369ae84c1..be39c6cb5 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard1.4;netstandard1.1;netstandard2.0;net6.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
index b7781292c..0563a6aaf 100644
--- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
+++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>uap10.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>

From 9b2637594dc6f6f2864c15e852c9665da6835364 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Thu, 25 Jan 2024 14:56:37 +0530
Subject: [PATCH 22/61] updated LangVersion to `preview`

---
 src/Api/PubnubApi/PubnubApi.csproj       | 2 +-
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 2 +-
 src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj
index d73f33cb2..900059200 100644
--- a/src/Api/PubnubApi/PubnubApi.csproj
+++ b/src/Api/PubnubApi/PubnubApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;net461;net48</TargetFrameworks>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>preview</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index be39c6cb5..95a572af4 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard1.4;netstandard1.1;netstandard2.0;net6.0</TargetFrameworks>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>preview</LangVersion>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
index 0563a6aaf..15d7f3f94 100644
--- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
+++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>uap10.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>preview</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>

From dc61a26c0274a6cef57b00d2d9e2e8cde0bd1217 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Thu, 25 Jan 2024 15:12:33 +0530
Subject: [PATCH 23/61] take-4/fix language version. `default`

---
 src/Api/PubnubApi/PubnubApi.csproj       | 2 +-
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 2 +-
 src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj
index 900059200..fe08ad075 100644
--- a/src/Api/PubnubApi/PubnubApi.csproj
+++ b/src/Api/PubnubApi/PubnubApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;net461;net48</TargetFrameworks>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>default</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index 95a572af4..06621541b 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard1.4;netstandard1.1;netstandard2.0;net6.0</TargetFrameworks>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>default</LangVersion>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
index 15d7f3f94..efa7a430b 100644
--- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
+++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>uap10.0</TargetFramework>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>default</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>

From abd432717b75b9bd0e5b640acbacb28885b750ac Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Thu, 25 Jan 2024 15:20:04 +0530
Subject: [PATCH 24/61] take-5: reverting LangVersion to `latest`

---
 src/Api/PubnubApi/PubnubApi.csproj       | 2 +-
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 2 +-
 src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj
index fe08ad075..710f16c77 100644
--- a/src/Api/PubnubApi/PubnubApi.csproj
+++ b/src/Api/PubnubApi/PubnubApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;net461;net48</TargetFrameworks>
-    <LangVersion>default</LangVersion>
+    <LangVersion>latest</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index 06621541b..369ae84c1 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard1.4;netstandard1.1;netstandard2.0;net6.0</TargetFrameworks>
-    <LangVersion>default</LangVersion>
+    <LangVersion>latest</LangVersion>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
index efa7a430b..b7781292c 100644
--- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
+++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>uap10.0</TargetFramework>
-    <LangVersion>default</LangVersion>
+    <LangVersion>latest</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>

From 491d5c9491ed7642820aff5de14362fd89fc8038 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Sun, 28 Jan 2024 19:48:47 +0530
Subject: [PATCH 25/61] removed `<LangVersion>` overrides

---
 src/Api/PubnubApi/PubnubApi.csproj       | 2 +-
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 2 +-
 src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj
index 710f16c77..f460a6433 100644
--- a/src/Api/PubnubApi/PubnubApi.csproj
+++ b/src/Api/PubnubApi/PubnubApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;net461;net48</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
+    <!-- <LangVersion>latest</LangVersion> -->
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index 369ae84c1..bb5895ead 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard1.4;netstandard1.1;netstandard2.0;net6.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
+    <!-- <LangVersion>latest</LangVersion> -->
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
index b7781292c..2b839d0ba 100644
--- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
+++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>uap10.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
+    <!-- <LangVersion>latest</LangVersion> -->
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>

From 3fff0d17d86fd580adf24916b6163d7161331895 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <mohit.tejani@pubnub.com>
Date: Sun, 28 Jan 2024 19:55:41 +0530
Subject: [PATCH 26/61] reverted 491d5c9

---
 src/Api/PubnubApi/PubnubApi.csproj       | 2 +-
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 2 +-
 src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj
index f460a6433..710f16c77 100644
--- a/src/Api/PubnubApi/PubnubApi.csproj
+++ b/src/Api/PubnubApi/PubnubApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;net461;net48</TargetFrameworks>
-    <!-- <LangVersion>latest</LangVersion> -->
+    <LangVersion>latest</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index bb5895ead..369ae84c1 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard1.4;netstandard1.1;netstandard2.0;net6.0</TargetFrameworks>
-    <!-- <LangVersion>latest</LangVersion> -->
+    <LangVersion>latest</LangVersion>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
index 2b839d0ba..b7781292c 100644
--- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
+++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>uap10.0</TargetFramework>
-    <!-- <LangVersion>latest</LangVersion> -->
+    <LangVersion>latest</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>

From c6b03c643a4d479041580db21f42349714160263 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <60129002+mohitpubnub@users.noreply.github.com>
Date: Thu, 1 Feb 2024 15:50:45 +0530
Subject: [PATCH 27/61] Update run-tests.yml

---
 .github/workflows/run-tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 08e9a6ed3..d34ec8e5c 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -29,8 +29,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: | 
-            2.1.519
+          dotnet-version: |
             5.0.x
             6.0.x
       - name: Build packages

From 39d45f151ee6c8235ebe4a1de0052db5174ebaf6 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <60129002+mohitpubnub@users.noreply.github.com>
Date: Thu, 1 Feb 2024 15:58:46 +0530
Subject: [PATCH 28/61] take-2

---
 src/Api/PubnubApi/global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Api/PubnubApi/global.json b/src/Api/PubnubApi/global.json
index de3243048..2cb2ac9bd 100644
--- a/src/Api/PubnubApi/global.json
+++ b/src/Api/PubnubApi/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.519"
+    "version": "5.0.100"
   }
 }
\ No newline at end of file

From eae330116a7fcfb6ca7ada58c849733e83b9b671 Mon Sep 17 00:00:00 2001
From: Mohit Tejani <60129002+mohitpubnub@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:05:46 +0530
Subject: [PATCH 29/61] take-3

---
 src/Api/PubnubApi/global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Api/PubnubApi/global.json b/src/Api/PubnubApi/global.json
index 2cb2ac9bd..a0ee6a660 100644
--- a/src/Api/PubnubApi/global.json
+++ b/src/Api/PubnubApi/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.100"
+    "version": "5.0"
   }
 }
\ No newline at end of file

From e03a01f80accd93988b8526cc4307b4bf544686a Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 5 Feb 2024 19:19:20 +0100
Subject: [PATCH 30/61] fix state switches

---
 .../PubnubApi/EventEngine/Presence/States/CooldownState.cs    | 4 ----
 .../EventEngine/Presence/States/HeartBeatingState.cs          | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index 57f8bd81a..997548867 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -23,10 +23,6 @@ public override TransitionResult Transition(IEvent ev)
                 },
                 Events.LeftEvent e => HandleLeftEvent(e),
                 Events.LeftAllEvent e => new InactiveState(),
-                Events.HeartbeatSuccessEvent e => new CooldownState()
-                {
-                    Input = this.Input,
-                },
                 Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index b461cbced..b995cc152 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -22,6 +22,10 @@ public override TransitionResult Transition(IEvent ev)
                 },
                 Events.LeftEvent e => HandleLeftEvent(e),
                 Events.LeftAllEvent e => new InactiveState(),
+                Events.HeartbeatSuccessEvent e => new CooldownState()
+                {
+                    Input = this.Input,
+                },
                 Events.HeartbeatFailureEvent e => HandleHeartbeatFailureEvent(e), 
                 Events.DisconnectEvent e => new StoppedState()
                 {

From b2233492d62d9bd7502640a4c37ec778a3b8e14d Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 5 Feb 2024 19:39:34 +0100
Subject: [PATCH 31/61] wip for ci

---
 .../Subscribe/Effects/EmitStatusEffectHandler.cs      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/Effects/EmitStatusEffectHandler.cs b/src/Api/PubnubApi/EventEngine/Subscribe/Effects/EmitStatusEffectHandler.cs
index 1f207894d..16baff877 100644
--- a/src/Api/PubnubApi/EventEngine/Subscribe/Effects/EmitStatusEffectHandler.cs
+++ b/src/Api/PubnubApi/EventEngine/Subscribe/Effects/EmitStatusEffectHandler.cs
@@ -22,7 +22,16 @@ public EmitStatusEffectHandler(Pubnub pn, Action<Pubnub, PNStatus> statusEmitter
 
 		public override async Task Run(EmitStatusInvocation invocation)
 		{
+            if (invocation.Status == null) 
+                throw new Exception("Status is null");
+
+            if (this.statusEmitterFunction == null)
+                throw new Exception("StatusEmitterFunction is null");
+
+            if (this.pubnubInstance == null)
+                throw new Exception("PubnubInstance is null");
+
 			this.statusEmitterFunction(this.pubnubInstance, invocation.Status);
 		}
 	}
-}
\ No newline at end of file
+}

From 8db56214b980838beec3bc3bc9f70533eea1764a Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 5 Feb 2024 19:41:06 +0100
Subject: [PATCH 32/61] leave this branch as is - new branch for testing

---
 .../Subscribe/Effects/EmitStatusEffectHandler.cs         | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/Effects/EmitStatusEffectHandler.cs b/src/Api/PubnubApi/EventEngine/Subscribe/Effects/EmitStatusEffectHandler.cs
index 16baff877..e644a7d11 100644
--- a/src/Api/PubnubApi/EventEngine/Subscribe/Effects/EmitStatusEffectHandler.cs
+++ b/src/Api/PubnubApi/EventEngine/Subscribe/Effects/EmitStatusEffectHandler.cs
@@ -22,15 +22,6 @@ public EmitStatusEffectHandler(Pubnub pn, Action<Pubnub, PNStatus> statusEmitter
 
 		public override async Task Run(EmitStatusInvocation invocation)
 		{
-            if (invocation.Status == null) 
-                throw new Exception("Status is null");
-
-            if (this.statusEmitterFunction == null)
-                throw new Exception("StatusEmitterFunction is null");
-
-            if (this.pubnubInstance == null)
-                throw new Exception("PubnubInstance is null");
-
 			this.statusEmitterFunction(this.pubnubInstance, invocation.Status);
 		}
 	}

From 93f1a1489fce556b1a0a91a244b660e49aeb8099 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Wed, 14 Feb 2024 11:28:07 +0100
Subject: [PATCH 33/61] comment out ee tests

---
 .../AcceptanceTests/Steps/EventEngineSteps.cs | 328 +++++++++---------
 1 file changed, 164 insertions(+), 164 deletions(-)

diff --git a/src/UnitTests/AcceptanceTests/Steps/EventEngineSteps.cs b/src/UnitTests/AcceptanceTests/Steps/EventEngineSteps.cs
index 9b2edae6b..0e453a53f 100644
--- a/src/UnitTests/AcceptanceTests/Steps/EventEngineSteps.cs
+++ b/src/UnitTests/AcceptanceTests/Steps/EventEngineSteps.cs
@@ -172,210 +172,210 @@ public static void AfterFeature(FeatureContext featureContext)
         [BeforeScenario()]
         public void BeforeScenario()
         {
-            currentContract = "";
-            if (_scenarioContext.ScenarioInfo != null && _scenarioContext.ScenarioInfo.Tags.Length > 0)
-            {
-                List<string> tagList = _scenarioContext.ScenarioInfo.Tags.AsEnumerable<string>().ToList();
-                foreach (string tag in tagList)
-                {
-                    if (tag.IndexOf("contract=") == 0)
-                    {
-                        currentContract = tag.Replace("contract=", "");
-                        break;
-                    }
-                }
-                if (!string.IsNullOrEmpty(currentContract) && !bypassMockServer)
-                {
-                    string mockInitContract = string.Format("http://{0}/init?__contract__script__={1}", acceptance_test_origin, currentContract);
-                    System.Diagnostics.Debug.WriteLine(mockInitContract);
-                    HttpClient httpclient = new HttpClient();
-                    string mockInitResponse = httpclient.GetStringAsync(new Uri(mockInitContract)).Result;
-                    System.Diagnostics.Debug.WriteLine(mockInitResponse);
-                }
-            }
+//            currentContract = "";
+//            if (_scenarioContext.ScenarioInfo != null && _scenarioContext.ScenarioInfo.Tags.Length > 0)
+//            {
+//                List<string> tagList = _scenarioContext.ScenarioInfo.Tags.AsEnumerable<string>().ToList();
+//                foreach (string tag in tagList)
+//                {
+//                    if (tag.IndexOf("contract=") == 0)
+//                    {
+//                        currentContract = tag.Replace("contract=", "");
+//                        break;
+//                    }
+//                }
+//                if (!string.IsNullOrEmpty(currentContract) && !bypassMockServer)
+//                {
+//                    string mockInitContract = string.Format("http://{0}/init?__contract__script__={1}", acceptance_test_origin, currentContract);
+//                    System.Diagnostics.Debug.WriteLine(mockInitContract);
+//                    HttpClient httpclient = new HttpClient();
+//                    string mockInitResponse = httpclient.GetStringAsync(new Uri(mockInitContract)).Result;
+//                    System.Diagnostics.Debug.WriteLine(mockInitResponse);
+//                }
+//            }
 
         }
 
         [AfterScenario()]
         public void AfterScenario()
         {
-            if (!bypassMockServer)
-            {
-                string mockExpectContract = string.Format("http://{0}/expect", acceptance_test_origin);
-                System.Diagnostics.Debug.WriteLine(mockExpectContract);
-                WebClient webClient = new WebClient();
-                string mockExpectResponse = webClient.DownloadString(mockExpectContract);
-                System.Diagnostics.Debug.WriteLine(mockExpectResponse);
-            }
+//            if (!bypassMockServer)
+//            {
+//                string mockExpectContract = string.Format("http://{0}/expect", acceptance_test_origin);
+//                System.Diagnostics.Debug.WriteLine(mockExpectContract);
+//                WebClient webClient = new WebClient();
+//                string mockExpectResponse = webClient.DownloadString(mockExpectContract);
+//                System.Diagnostics.Debug.WriteLine(mockExpectResponse);
+//            }
         }
         [Given(@"the demo keyset with event engine enabled")]
         public void GivenTheDemoKeysetWithEventEngineEnabled()
         {
-            unitTest = new PubnubUnitTest();
-            unitTest.Timetoken = 16820876821905844; //Hardcoded timetoken
-            unitTest.RequestId = "myRequestId";
-            unitTest.InternetAvailable = true;
-            unitTest.SdkVersion = "Csharp";
-            unitTest.IncludePnsdk = true;
-            unitTest.IncludeUuid = true;
-
-            config = new PNConfiguration(new UserId("pn-csharp-acceptance-test-uuid"));
-            config.Origin = acceptance_test_origin;
-            config.Secure = false;
-            config.PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY");
-            config.SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY");
-            config.SecretKey = System.Environment.GetEnvironmentVariable("PN_SEC_KEY");
-            if (enableIntenalPubnubLogging)
-            {
-                config.LogVerbosity = PNLogVerbosity.BODY;
-                config.PubnubLog = new InternalPubnubLog();
-            }
-            else
-            {
-                config.LogVerbosity = PNLogVerbosity.NONE;
-            }
-            config.EnableEventEngine = true;
-
-
-            messageReceivedEvent = new ManualResetEvent(false);
-            statusReceivedEvent = new ManualResetEvent(false);
-
-            subscribeCallback = new SubscribeCallbackExt(
-                delegate (Pubnub pnObj, PNMessageResult<object> pubMsg)
-                {
-                    Console.WriteLine($"Message received in listener. {pn.JsonPluggableLibrary.SerializeToJsonString(pubMsg)}");
-                    messageResult = pubMsg;
-                    messageReceivedEvent.Set();
-                },
-                delegate (Pubnub pnObj, PNPresenceEventResult presenceEvnt)
-                {
-                    Console.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(presenceEvnt));
-                },
-                delegate (Pubnub pnObj, PNSignalResult<object> signalMsg)
-                {
-                    Console.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(signalMsg));
-                },
-                delegate (Pubnub pnObj, PNObjectEventResult objectEventObj)
-                {
-                    Console.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(objectEventObj));
-                },
-                delegate (Pubnub pnObj, PNMessageActionEventResult msgActionEvent)
-                {
-                    System.Diagnostics.Debug.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(msgActionEvent));
-                },
-                delegate (Pubnub pnObj, PNFileEventResult fileEvent)
-                {
-                    System.Diagnostics.Debug.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(fileEvent));
-                },
-                delegate (Pubnub pnObj, PNStatus status)
-                {
-                    pnStatus = status;
-                    Console.WriteLine("{0} {1} {2}", pnStatus.Operation, pnStatus.Category, pnStatus.StatusCode);
-                    if (currentContract == "subscribeHandshakeFailure" && pn.PubnubUnitTest.Attempts == 3)
-                    {
-                        statusReceivedEvent.Set();
-                    }
-                    if (pnStatus.Category == PNStatusCategory.PNConnectedCategory)
-                    {
-                        statusReceivedEvent.Set();
-                    }
-                }
-                );
-
+//            unitTest = new PubnubUnitTest();
+//            unitTest.Timetoken = 16820876821905844; //Hardcoded timetoken
+//            unitTest.RequestId = "myRequestId";
+//            unitTest.InternetAvailable = true;
+//            unitTest.SdkVersion = "Csharp";
+//            unitTest.IncludePnsdk = true;
+//            unitTest.IncludeUuid = true;
+//
+//            config = new PNConfiguration(new UserId("pn-csharp-acceptance-test-uuid"));
+//            config.Origin = acceptance_test_origin;
+//            config.Secure = false;
+//            config.PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY");
+//            config.SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY");
+//            config.SecretKey = System.Environment.GetEnvironmentVariable("PN_SEC_KEY");
+//            if (enableIntenalPubnubLogging)
+//            {
+//                config.LogVerbosity = PNLogVerbosity.BODY;
+//                config.PubnubLog = new InternalPubnubLog();
+//            }
+//            else
+//            {
+//                config.LogVerbosity = PNLogVerbosity.NONE;
+//            }
+//            config.EnableEventEngine = true;
+//
+//
+//            messageReceivedEvent = new ManualResetEvent(false);
+//            statusReceivedEvent = new ManualResetEvent(false);
+//
+//            subscribeCallback = new SubscribeCallbackExt(
+//                delegate (Pubnub pnObj, PNMessageResult<object> pubMsg)
+//                {
+//                    Console.WriteLine($"Message received in listener. {pn.JsonPluggableLibrary.SerializeToJsonString(pubMsg)}");
+//                    messageResult = pubMsg;
+//                    messageReceivedEvent.Set();
+//                },
+//                delegate (Pubnub pnObj, PNPresenceEventResult presenceEvnt)
+//                {
+//                    Console.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(presenceEvnt));
+//                },
+//                delegate (Pubnub pnObj, PNSignalResult<object> signalMsg)
+//                {
+//                    Console.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(signalMsg));
+//                },
+//                delegate (Pubnub pnObj, PNObjectEventResult objectEventObj)
+//                {
+//                    Console.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(objectEventObj));
+//                },
+//                delegate (Pubnub pnObj, PNMessageActionEventResult msgActionEvent)
+//                {
+//                    System.Diagnostics.Debug.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(msgActionEvent));
+//                },
+//                delegate (Pubnub pnObj, PNFileEventResult fileEvent)
+//                {
+//                    System.Diagnostics.Debug.WriteLine(pn.JsonPluggableLibrary.SerializeToJsonString(fileEvent));
+//                },
+//                delegate (Pubnub pnObj, PNStatus status)
+//                {
+//                    pnStatus = status;
+//                    Console.WriteLine("{0} {1} {2}", pnStatus.Operation, pnStatus.Category, pnStatus.StatusCode);
+//                    if (currentContract == "subscribeHandshakeFailure" && pn.PubnubUnitTest.Attempts == 3)
+//                    {
+//                        statusReceivedEvent.Set();
+//                    }
+//                    if (pnStatus.Category == PNStatusCategory.PNConnectedCategory)
+//                    {
+//                        statusReceivedEvent.Set();
+//                    }
+//                }
+//                );
+//
         }
 
         [When(@"I subscribe")]
         public void WhenISubscribe()
         {
-            pn = new Pubnub(config);
-            pn.PubnubUnitTest = unitTest;
-            pn.PubnubUnitTest.EventTypeList?.Clear();
-
-            messageReceivedEvent = new ManualResetEvent(false);
-            statusReceivedEvent = new ManualResetEvent(false);
-
-            pn.AddListener(subscribeCallback);
-            pn.Subscribe<object>()
-                .Channels(channel.Split(','))
-                .ChannelGroups(channelGroup.Split(','))
-                .Execute();
-            statusReceivedEvent.WaitOne (60*1000);
-            if (pnStatus != null && pnStatus.Category == PNStatusCategory.PNConnectedCategory)
-            {
-                //All good.
-            }
-            else
-            {
-                if (currentContract == "simpleSubscribe")
-                {
-                    Assert.Fail("WhenISubscribe failed.");
-                }
-            }
+//            pn = new Pubnub(config);
+//            pn.PubnubUnitTest = unitTest;
+//            pn.PubnubUnitTest.EventTypeList?.Clear();
+//
+//            messageReceivedEvent = new ManualResetEvent(false);
+//            statusReceivedEvent = new ManualResetEvent(false);
+//
+//            pn.AddListener(subscribeCallback);
+//            pn.Subscribe<object>()
+//                .Channels(channel.Split(','))
+//                .ChannelGroups(channelGroup.Split(','))
+//                .Execute();
+//            statusReceivedEvent.WaitOne (60*1000);
+//            if (pnStatus != null && pnStatus.Category == PNStatusCategory.PNConnectedCategory)
+//            {
+//                //All good.
+//            }
+//            else
+//            {
+//                if (currentContract == "simpleSubscribe")
+//                {
+//                    Assert.Fail("WhenISubscribe failed.");
+//                }
+//            }
         }
 
         [When(@"I publish a message")]
         public async Task WhenIPublishAMessage()
         {
-           PNResult<PNPublishResult> publishResponse  = await pn.Publish()
-                                        .Channel(channel)
-                                        .Message(publishMsg)
-                                        .ExecuteAsync();
-            publishResult = publishResponse.Result;
-            pnStatus = publishResponse.Status;
+//           PNResult<PNPublishResult> publishResponse  = await pn.Publish()
+//                                        .Channel(channel)
+//                                        .Message(publishMsg)
+//                                        .ExecuteAsync();
+//            publishResult = publishResponse.Result;
+//            pnStatus = publishResponse.Status;
         }
 
         [Then(@"I receive the message in my subscribe response")]
         public async Task ThenIReceiveTheMessageInMySubscribeResponse()
         {
-            await Task.Delay(1000);
-            messageReceivedEvent.WaitOne();
-            Assert.True(messageResult != null);
+//            await Task.Delay(1000);
+//            messageReceivedEvent.WaitOne();
+//            Assert.True(messageResult != null);
         }
 
         [Then(@"I observe the following:")]
         public void ThenIObserveTheFollowing(Table table)
         {
-            if (pn.PubnubUnitTest == null)
-            {
-                Assert.Fail();
-            }
-            System.Diagnostics.Debug.WriteLine($"COUNT = {pn.PubnubUnitTest.EventTypeList.Count} ");
-            for (int i = 0; i < pn.PubnubUnitTest.EventTypeList.Count(); i++)
-            {
-                System.Diagnostics.Debug.WriteLine($"{pn.PubnubUnitTest.EventTypeList[i].Key} - {pn.PubnubUnitTest.EventTypeList[i].Value} ");
-            }
-            IEnumerable<SubscribeResponseRow> expectedRowSet =  table.CreateSet<SubscribeResponseRow>();
-            Assert.True(pn.PubnubUnitTest.EventTypeList.Count() >= expectedRowSet?.Count());
-            bool match = false;
-            for (int rowIndex = 0; rowIndex < expectedRowSet.Count(); rowIndex++)
-            {
-                SubscribeResponseRow row = expectedRowSet.ElementAt(rowIndex);
-                System.Diagnostics.Debug.WriteLine($"{row.type} - {row.name} ");
-                if (row.type == pn.PubnubUnitTest.EventTypeList[rowIndex].Key
-                    && row.name == pn.PubnubUnitTest.EventTypeList[rowIndex].Value)
-                {
-                    match = true;
-                }
-                else
-                {
-                    match = false;
-                    break;
-                }
-            }
-            Assert.True(match == true);
+//            if (pn.PubnubUnitTest == null)
+//            {
+//                Assert.Fail();
+//            }
+//            System.Diagnostics.Debug.WriteLine($"COUNT = {pn.PubnubUnitTest.EventTypeList.Count} ");
+//            for (int i = 0; i < pn.PubnubUnitTest.EventTypeList.Count(); i++)
+//            {
+//                System.Diagnostics.Debug.WriteLine($"{pn.PubnubUnitTest.EventTypeList[i].Key} - {pn.PubnubUnitTest.EventTypeList[i].Value} ");
+//            }
+//            IEnumerable<SubscribeResponseRow> expectedRowSet =  table.CreateSet<SubscribeResponseRow>();
+//            Assert.True(pn.PubnubUnitTest.EventTypeList.Count() >= expectedRowSet?.Count());
+//            bool match = false;
+//            for (int rowIndex = 0; rowIndex < expectedRowSet.Count(); rowIndex++)
+//            {
+//                SubscribeResponseRow row = expectedRowSet.ElementAt(rowIndex);
+//                System.Diagnostics.Debug.WriteLine($"{row.type} - {row.name} ");
+//                if (row.type == pn.PubnubUnitTest.EventTypeList[rowIndex].Key
+//                    && row.name == pn.PubnubUnitTest.EventTypeList[rowIndex].Value)
+//                {
+//                    match = true;
+//                }
+//                else
+//                {
+//                    match = false;
+//                    break;
+//                }
+//            }
+//            Assert.True(match == true);
         }
 
         [Given(@"a linear reconnection policy with (.*) retries")]
         public void GivenALinearReconnectionPolicyWithRetries(int retryCount)
         {
-            config.ReconnectionPolicy = PNReconnectionPolicy.LINEAR;
-            config.ConnectionMaxRetries = retryCount;
+//            config.ReconnectionPolicy = PNReconnectionPolicy.LINEAR;
+//            config.ConnectionMaxRetries = retryCount;
         }
 
         [Then(@"I receive an error")]
         public void ThenIReceiveAnError()
         {
-            Assert.True(pnStatus != null && pnStatus.Error);
+//            Assert.True(pnStatus != null && pnStatus.Error);
         }
 
     }

From 21d6c5328a4ad81a9319a6efdce41451368d22a0 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Wed, 14 Feb 2024 12:15:14 +0100
Subject: [PATCH 34/61] add invocations

---
 .../Invocations/CancelDelayedHeartbeatInvocation.cs  |  6 ++++++
 .../Presence/Invocations/CancelWaitInvocation.cs     |  6 ++++++
 .../Invocations/DelayedHeartbeatInvocation.cs        | 12 ++++++++++++
 .../Presence/Invocations/HearbeatInvocation.cs       | 10 ++++++++++
 .../Presence/Invocations/LeaveInvocation.cs          | 10 ++++++++++
 .../Invocations/TerminateEventEngineInvocation.cs    |  6 ++++++
 .../Presence/Invocations/WaitInvocation.cs           | 10 ++++++++++
 7 files changed, 60 insertions(+)
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelDelayedHeartbeatInvocation.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelWaitInvocation.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Invocations/DelayedHeartbeatInvocation.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Invocations/HearbeatInvocation.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Invocations/LeaveInvocation.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Invocations/TerminateEventEngineInvocation.cs
 create mode 100644 src/Api/PubnubApi/EventEngine/Presence/Invocations/WaitInvocation.cs

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelDelayedHeartbeatInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelDelayedHeartbeatInvocation.cs
new file mode 100644
index 000000000..e74672b78
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelDelayedHeartbeatInvocation.cs
@@ -0,0 +1,6 @@
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Subscribe.Invocations
+{
+    public class CancelDelayedHeartbeatInvocation : Core.IEffectInvocation {}
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelWaitInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelWaitInvocation.cs
new file mode 100644
index 000000000..2782e1702
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelWaitInvocation.cs
@@ -0,0 +1,6 @@
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Subscribe.Invocations
+{
+    public class CancelWaitInvocation : Core.IEffectInvocation {}
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/DelayedHeartbeatInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/DelayedHeartbeatInvocation.cs
new file mode 100644
index 000000000..dbeeeebdc
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/DelayedHeartbeatInvocation.cs
@@ -0,0 +1,12 @@
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Subscribe.Invocations
+{
+    public class DelayedHeartbeatInvocation : Core.IEffectInvocation
+    {
+        public PresenceInput Input { get; set; }
+        public int Attempts { get; set; }
+        public PNStatus Reason { get; set; }
+    }
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/HearbeatInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/HearbeatInvocation.cs
new file mode 100644
index 000000000..2ea951148
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/HearbeatInvocation.cs
@@ -0,0 +1,10 @@
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Subscribe.Invocations
+{
+    public class HeartbeatInvocation : Core.IEffectInvocation
+    {
+        public PresenceInput Input { get; set; }
+    }
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/LeaveInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/LeaveInvocation.cs
new file mode 100644
index 000000000..f2eee47c7
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/LeaveInvocation.cs
@@ -0,0 +1,10 @@
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Subscribe.Invocations
+{
+    public class LeaveInvocation : Core.IEffectInvocation
+    {
+        public PresenceInput Input { get; set; }
+    }
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/TerminateEventEngineInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/TerminateEventEngineInvocation.cs
new file mode 100644
index 000000000..edad12299
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/TerminateEventEngineInvocation.cs
@@ -0,0 +1,6 @@
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Subscribe.Invocations
+{
+    public class TerminateEventEngineInvocation : Core.IEffectInvocation {}
+}
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/WaitInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/WaitInvocation.cs
new file mode 100644
index 000000000..79ada00c2
--- /dev/null
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/WaitInvocation.cs
@@ -0,0 +1,10 @@
+using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Core;
+
+namespace PubnubApi.EventEngine.Subscribe.Invocations
+{
+    public class WaitInvocation : Core.IEffectInvocation
+    {
+        public PresenceInput Input { get; set; }
+    }
+}

From 48731940121cecb964707925d4931b0582b594d2 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Wed, 14 Feb 2024 14:26:02 +0100
Subject: [PATCH 35/61] add invocation for leave event

---
 .../PubnubApi/EventEngine/Presence/States/APresenceState.cs   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
index 18d4453c9..d11da8e5b 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
@@ -16,12 +16,14 @@ protected TransitionResult HandleLeftEvent(Events.LeftEvent e)
         {
             var newInput = this.Input - e.Input;
 
-            return newInput.IsEmpty()
+            var state = newInput.IsEmpty()
                 ? (TransitionResult)new InactiveState()
                 : (TransitionResult)new HeartbeatingState()
                 {
                     Input = newInput,
                 };
+
+            return state.With(new LeaveInvocation(){ Input = e.Input });
         }
     }
 }

From 5a447e7af63e50f69a0fa5dc6111ec7b8bfef633 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 10:37:54 +0100
Subject: [PATCH 36/61] compiling Leave invocation

---
 .../Invocations/CancelDelayedHeartbeatInvocation.cs        | 2 +-
 .../Presence/Invocations/CancelWaitInvocation.cs           | 2 +-
 .../Presence/Invocations/DelayedHeartbeatInvocation.cs     | 2 +-
 .../EventEngine/Presence/Invocations/HearbeatInvocation.cs | 2 +-
 .../EventEngine/Presence/Invocations/LeaveInvocation.cs    | 2 +-
 .../Presence/Invocations/TerminateEventEngineInvocation.cs | 2 +-
 .../EventEngine/Presence/Invocations/WaitInvocation.cs     | 2 +-
 .../EventEngine/Presence/States/APresenceState.cs          | 7 ++++---
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelDelayedHeartbeatInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelDelayedHeartbeatInvocation.cs
index e74672b78..2c8bd81d6 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelDelayedHeartbeatInvocation.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelDelayedHeartbeatInvocation.cs
@@ -1,6 +1,6 @@
 using PubnubApi.EventEngine.Core;
 
-namespace PubnubApi.EventEngine.Subscribe.Invocations
+namespace PubnubApi.EventEngine.Presence.Invocations
 {
     public class CancelDelayedHeartbeatInvocation : Core.IEffectInvocation {}
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelWaitInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelWaitInvocation.cs
index 2782e1702..31958bf02 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelWaitInvocation.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/CancelWaitInvocation.cs
@@ -1,6 +1,6 @@
 using PubnubApi.EventEngine.Core;
 
-namespace PubnubApi.EventEngine.Subscribe.Invocations
+namespace PubnubApi.EventEngine.Presence.Invocations
 {
     public class CancelWaitInvocation : Core.IEffectInvocation {}
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/DelayedHeartbeatInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/DelayedHeartbeatInvocation.cs
index dbeeeebdc..966b36756 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Invocations/DelayedHeartbeatInvocation.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/DelayedHeartbeatInvocation.cs
@@ -1,7 +1,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Core;
 
-namespace PubnubApi.EventEngine.Subscribe.Invocations
+namespace PubnubApi.EventEngine.Presence.Invocations
 {
     public class DelayedHeartbeatInvocation : Core.IEffectInvocation
     {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/HearbeatInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/HearbeatInvocation.cs
index 2ea951148..0a69f12ef 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Invocations/HearbeatInvocation.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/HearbeatInvocation.cs
@@ -1,7 +1,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Core;
 
-namespace PubnubApi.EventEngine.Subscribe.Invocations
+namespace PubnubApi.EventEngine.Presence.Invocations
 {
     public class HeartbeatInvocation : Core.IEffectInvocation
     {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/LeaveInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/LeaveInvocation.cs
index f2eee47c7..2cbb0e97b 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Invocations/LeaveInvocation.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/LeaveInvocation.cs
@@ -1,7 +1,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Core;
 
-namespace PubnubApi.EventEngine.Subscribe.Invocations
+namespace PubnubApi.EventEngine.Presence.Invocations
 {
     public class LeaveInvocation : Core.IEffectInvocation
     {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/TerminateEventEngineInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/TerminateEventEngineInvocation.cs
index edad12299..82c797480 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Invocations/TerminateEventEngineInvocation.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/TerminateEventEngineInvocation.cs
@@ -1,6 +1,6 @@
 using PubnubApi.EventEngine.Core;
 
-namespace PubnubApi.EventEngine.Subscribe.Invocations
+namespace PubnubApi.EventEngine.Presence.Invocations
 {
     public class TerminateEventEngineInvocation : Core.IEffectInvocation {}
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/Invocations/WaitInvocation.cs b/src/Api/PubnubApi/EventEngine/Presence/Invocations/WaitInvocation.cs
index 79ada00c2..5818a36a8 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Invocations/WaitInvocation.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Invocations/WaitInvocation.cs
@@ -1,7 +1,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Core;
 
-namespace PubnubApi.EventEngine.Subscribe.Invocations
+namespace PubnubApi.EventEngine.Presence.Invocations
 {
     public class WaitInvocation : Core.IEffectInvocation
     {
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
index d11da8e5b..e1b3002f8 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
@@ -1,5 +1,6 @@
 using PubnubApi.EventEngine.Core;
 using PubnubApi.EventEngine.Presence.Common;
+using PubnubApi.EventEngine.Presence.Invocations;
 
 namespace PubnubApi.EventEngine.Presence.States
 {
@@ -16,9 +17,9 @@ protected TransitionResult HandleLeftEvent(Events.LeftEvent e)
         {
             var newInput = this.Input - e.Input;
 
-            var state = newInput.IsEmpty()
-                ? (TransitionResult)new InactiveState()
-                : (TransitionResult)new HeartbeatingState()
+            State state = newInput.IsEmpty()
+                ? new InactiveState()
+                : new HeartbeatingState()
                 {
                     Input = newInput,
                 };

From 669da83730fb3abe806c75ca9b66c8a41a949003 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 11:44:36 +0100
Subject: [PATCH 37/61] left all invocations

---
 src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs | 3 ++-
 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs   | 3 ++-
 .../PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs | 3 ++-
 .../PubnubApi/EventEngine/Presence/States/ReconnectingState.cs | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index 997548867..81830f0e1 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -22,7 +22,8 @@ public override TransitionResult Transition(IEvent ev)
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
                 Events.LeftEvent e => HandleLeftEvent(e),
-                Events.LeftAllEvent e => new InactiveState(),
+                Events.LeftAllEvent e => new InactiveState()
+                    .With(new LeaveInvocation(){ Input = this.Input }),
                 Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index 8eefb7245..b12a1ff8f 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -23,7 +23,8 @@ public override TransitionResult Transition(IEvent ev)
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
                 Events.LeftEvent e => HandleLeftEvent(e),
-                Events.LeftAllEvent e => new InactiveState(),
+                Events.LeftAllEvent e => new InactiveState()
+                    .With(new LeaveInvocation(){ Input = this.Input }),
                 Events.ReconnectEvent e => new HeartbeatingState()
                 {
                     Input = this.Input,
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index b995cc152..475da8528 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -21,7 +21,8 @@ public override TransitionResult Transition(IEvent ev)
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
                 Events.LeftEvent e => HandleLeftEvent(e),
-                Events.LeftAllEvent e => new InactiveState(),
+                Events.LeftAllEvent e => new InactiveState()
+                    .With(new LeaveInvocation(){ Input = this.Input }),
                 Events.HeartbeatSuccessEvent e => new CooldownState()
                 {
                     Input = this.Input,
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 4ef39e747..6df6b0263 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -24,7 +24,8 @@ public override TransitionResult Transition(IEvent ev)
                     Input = e.Input != this.Input ? this.Input + e.Input : this.Input,
                 },
                 Events.LeftEvent e => HandleLeftEvent(e),
-                Events.LeftAllEvent e => new InactiveState(),
+                Events.LeftAllEvent e => new InactiveState()
+                    .With(new LeaveInvocation(){ Input = this.Input }),
                 Events.HeartbeatSuccessEvent e => new CooldownState()
                 {
                     Input = this.Input,

From f5f56ec7f1d373244c2195ddb3b1f5962d1c09e9 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 11:52:04 +0100
Subject: [PATCH 38/61] disconnect transitions

---
 src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs  | 2 +-
 src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs    | 2 +-
 .../PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs  | 2 +-
 .../PubnubApi/EventEngine/Presence/States/ReconnectingState.cs  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
index 81830f0e1..83e261fac 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/CooldownState.cs
@@ -27,7 +27,7 @@ public override TransitionResult Transition(IEvent ev)
                 Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
-                },
+                }.With(new LeaveInvocation(){ Input = this.Input }),
                 Events.TimesUpEvent e => new HeartbeatingState()
                 {
                     Input = this.Input,
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index b12a1ff8f..509588dc5 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -28,7 +28,7 @@ public override TransitionResult Transition(IEvent ev)
                 Events.ReconnectEvent e => new HeartbeatingState()
                 {
                     Input = this.Input,
-                },
+                }.With(new LeaveInvocation(){ Input = this.Input }),
                 Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
index 475da8528..3bab13550 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/HeartBeatingState.cs
@@ -31,7 +31,7 @@ public override TransitionResult Transition(IEvent ev)
                 Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
-                }, 
+                }.With(new LeaveInvocation(){ Input = this.Input }), 
                 _ => null,
             };
         }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
index 6df6b0263..afdb5b818 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/ReconnectingState.cs
@@ -39,7 +39,7 @@ public override TransitionResult Transition(IEvent ev)
                 Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
-                }, 
+                }.With(new LeaveInvocation(){ Input = this.Input }), 
                 _ => null,
             };
         }

From 942a8b82cce1ee6180deb7b8cf3fe611f42e1e1e Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 15:27:22 +0100
Subject: [PATCH 39/61] Cooldownstate UT

---
 .../EventEngine/Presence/CooldownState.cs     | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index 41a920608..83179c60b 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -8,63 +8,84 @@ namespace PubnubApi.Tests.EventEngine.Presence
 {
     internal class CooldownTransitions
     {
+        // Test case:
+        // - Current state
+        // - Event
+        // - Expected next state
+        // - Invocations
         private static readonly object[] testCases = {
             new object[] {
                 new CooldownState(),
                 new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                null
             },
             new object[] {
                 new CooldownState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "b" } } } }
             },
             new object[] {
                 new CooldownState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new InactiveState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "a" } } } }
             },
             new object[] {
                 new CooldownState(),
                 new LeftAllEvent(),
                 new InactiveState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new string[] { } } } }
             },
             new object[] {
                 new CooldownState(),
                 new HeartbeatSuccessEvent(),
                 null,
+                null
             },
             new object[] {
                 new CooldownState(),
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 null,
+                null
             },
             new object[] {
                 new CooldownState(),
                 new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
                 null,
+                null
             },
             new object[] {
                 new CooldownState(),
                 new ReconnectEvent(),
                 null,
+                null
             },
             new object[] {
                 new CooldownState(),
                 new DisconnectEvent(),
                 new StoppedState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new string[] { } } } }
             },
             new object[] {
                 new CooldownState(),
                 new TimesUpEvent(),
                 new HeartbeatingState(),
+                null
             },
         };
 
         [TestCasesSource(nameof(testCases))]
-        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        public void TestTransition(State @sut, IEvent @ev, State @expected, IEffectInvocation[] @_)
         {
-            Assert.AreEqual(expected, sut.Transition(ev));
+            Assert.AreEqual(@expected, @sut.Transition(@ev));
+        }
+
+        [TestCasesSource(nameof(testCases))]
+        public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
+        {
+            CollectionAssert.AreEqual(@expected, @sut.Transition(@ev).Invocations);
         }
     }
 }

From d62df5178b30c814d716343754fd1a7c47d128e2 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 15:38:36 +0100
Subject: [PATCH 40/61] sus

---
 .../PubnubApi.Tests/EventEngine/Presence/CooldownState.cs        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index 83179c60b..9bf6c1a77 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -87,5 +87,6 @@ public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInv
         {
             CollectionAssert.AreEqual(@expected, @sut.Transition(@ev).Invocations);
         }
+        is this test even running? 
     }
 }

From 1e403092f94b039e1e2ac41540630334ac6fc293 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 15:46:45 +0100
Subject: [PATCH 41/61] even more sus

---
 src/UnitTests/PubnubApi.Tests/EncryptionTests.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/UnitTests/PubnubApi.Tests/EncryptionTests.cs b/src/UnitTests/PubnubApi.Tests/EncryptionTests.cs
index b7b0dd806..cc38bddb0 100644
--- a/src/UnitTests/PubnubApi.Tests/EncryptionTests.cs
+++ b/src/UnitTests/PubnubApi.Tests/EncryptionTests.cs
@@ -820,5 +820,7 @@ public static string DecodeEncodedNonAsciiCharacters(string value)
                     return ((char)int.Parse(m.Groups["Value"].Value, NumberStyles.HexNumber)).ToString();
                 });
         }
+        
+        Even more sus...
     }
-}
\ No newline at end of file
+}

From 9b4dd94b3271389780bab69f9cd3e1b66da988b0 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 16:22:03 +0100
Subject: [PATCH 42/61] will it run tests?

---
 .github/workflows/run-tests.yml                            | 7 +++++++
 src/UnitTests/PubnubApi.Tests/EncryptionTests.cs           | 2 --
 .../PubnubApi.Tests/EventEngine/Presence/CooldownState.cs  | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index d34ec8e5c..7f168a3c1 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -36,6 +36,13 @@ jobs:
         env:
           WORKSPACE_PATH: ${{ github.workspace }}
         run: .\\.github\\workflows\\release\\build-packages.ps1
+      - name: Run unit tests
+        env: 
+          PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
+          PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
+          PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
+        run: cd ./UnitTests/PubnubApi.Tests && dotnet test --no-build --verbosity normal --logger trx --results-directory ./results
+
       - name: Cancel workflow runs for commit on error
         if: failure()
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure
diff --git a/src/UnitTests/PubnubApi.Tests/EncryptionTests.cs b/src/UnitTests/PubnubApi.Tests/EncryptionTests.cs
index cc38bddb0..64b402fba 100644
--- a/src/UnitTests/PubnubApi.Tests/EncryptionTests.cs
+++ b/src/UnitTests/PubnubApi.Tests/EncryptionTests.cs
@@ -820,7 +820,5 @@ public static string DecodeEncodedNonAsciiCharacters(string value)
                     return ((char)int.Parse(m.Groups["Value"].Value, NumberStyles.HexNumber)).ToString();
                 });
         }
-        
-        Even more sus...
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index 9bf6c1a77..83179c60b 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -87,6 +87,5 @@ public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInv
         {
             CollectionAssert.AreEqual(@expected, @sut.Transition(@ev).Invocations);
         }
-        is this test even running? 
     }
 }

From d7a9a4afb8428f77112a8097c66a6857dafd9170 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 16:29:40 +0100
Subject: [PATCH 43/61] dotnet my only love

---
 .github/workflows/run-tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 7f168a3c1..4e793a992 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -41,8 +41,7 @@ jobs:
           PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
           PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
           PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
-        run: cd ./UnitTests/PubnubApi.Tests && dotnet test --no-build --verbosity normal --logger trx --results-directory ./results
-
+        run: dotnet test ./UnitTests/PubnubApi.Tests --no-build --verbosity normal --logger trx 
       - name: Cancel workflow runs for commit on error
         if: failure()
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure

From 5c0fcb2a263a9b8c611ec14284457940d4afed53 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Thu, 15 Feb 2024 16:53:33 +0100
Subject: [PATCH 44/61] dotnet my only love vol 2 - sequel

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 4e793a992..36a4e18c0 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -41,7 +41,7 @@ jobs:
           PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
           PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
           PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
-        run: dotnet test ./UnitTests/PubnubApi.Tests --no-build --verbosity normal --logger trx 
+        run: dotnet test ./UnitTests/PubnubApi.Tests/PubnubApi.Tests.cs --no-build --verbosity normal --logger trx 
       - name: Cancel workflow runs for commit on error
         if: failure()
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure

From 3bc3f47ecd17919ba22511388650d37bb1fd23f0 Mon Sep 17 00:00:00 2001
From: Mateusz Dahlke <39696234+Xavrax@users.noreply.github.com>
Date: Thu, 15 Feb 2024 22:40:35 +0100
Subject: [PATCH 45/61] =?UTF-8?q?Nie=20przejmuj=20si=C4=99=20bo=20wszystko?=
 =?UTF-8?q?=20b=C4=99dzie=20dobrze?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 36a4e18c0..4daf4d31a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -41,7 +41,7 @@ jobs:
           PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
           PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
           PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
-        run: dotnet test ./UnitTests/PubnubApi.Tests/PubnubApi.Tests.cs --no-build --verbosity normal --logger trx 
+        run: dotnet test .\\src\\UnitTests\\PubnubApi.Tests\\PubnubApi.Tests.cs --no-build --verbosity normal --logger trx 
       - name: Cancel workflow runs for commit on error
         if: failure()
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure

From dce24ff7f4b3a2819b9d491acdaa230716213eec Mon Sep 17 00:00:00 2001
From: Mateusz Dahlke <39696234+Xavrax@users.noreply.github.com>
Date: Thu, 15 Feb 2024 22:57:05 +0100
Subject: [PATCH 46/61] never gonna give you up

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 4daf4d31a..a4c97c901 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -41,7 +41,7 @@ jobs:
           PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
           PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
           PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
-        run: dotnet test .\\src\\UnitTests\\PubnubApi.Tests\\PubnubApi.Tests.cs --no-build --verbosity normal --logger trx 
+        run: dotnet test .\\src\\UnitTests\\PubnubApi.Tests\\PubnubApi.Tests.csproj --no-build --verbosity normal --logger trx 
       - name: Cancel workflow runs for commit on error
         if: failure()
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure

From 5c5ceeda53dd47913649790a1b37fd880438e808 Mon Sep 17 00:00:00 2001
From: Mateusz Dahlke <39696234+Xavrax@users.noreply.github.com>
Date: Thu, 15 Feb 2024 23:05:18 +0100
Subject: [PATCH 47/61] Electric Avenue

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index a4c97c901..68dda2598 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -41,7 +41,7 @@ jobs:
           PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
           PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
           PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
-        run: dotnet test .\\src\\UnitTests\\PubnubApi.Tests\\PubnubApi.Tests.csproj --no-build --verbosity normal --logger trx 
+        run: dotnet test .\\src\\UnitTests\\PubnubApi.Tests\\PubnubApi.Tests.csproj --verbosity normal --logger trx 
       - name: Cancel workflow runs for commit on error
         if: failure()
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure

From c6c6b89309244072bc0cdd71ccd67102e9ab561b Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Fri, 16 Feb 2024 07:13:40 +0100
Subject: [PATCH 48/61] add presence tests

---
 src/UnitTests/PubnubApiPCL.Tests/PubnubApiPCL.Tests.csproj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/UnitTests/PubnubApiPCL.Tests/PubnubApiPCL.Tests.csproj b/src/UnitTests/PubnubApiPCL.Tests/PubnubApiPCL.Tests.csproj
index 714a4e134..141a87c0a 100644
--- a/src/UnitTests/PubnubApiPCL.Tests/PubnubApiPCL.Tests.csproj
+++ b/src/UnitTests/PubnubApiPCL.Tests/PubnubApiPCL.Tests.csproj
@@ -60,6 +60,12 @@
     <Compile Include="..\PubnubApi.Tests\EventEngine\ReceiveStoppedStateTransition.cs" Link="EventEngine\ReceiveStoppedStateTransition.cs" />
     <Compile Include="..\PubnubApi.Tests\EventEngine\ReceivingStateTransition.cs" Link="EventEngine\ReceivingStateTransition.cs" />
     <Compile Include="..\PubnubApi.Tests\EventEngine\UnsubscribedStateTransition.cs" Link="EventEngine\UnsubscribedStateTransition.cs" />
+    <Compile Include="..\PubnubApi.Tests\EventEngine\Presence\CooldownState.cs" Link="EventEngine\Presence\CooldownState.cs" />
+    <Compile Include="..\PubnubApi.Tests\EventEngine\Presence\FailedState.cs" Link="EventEngine\Presence\FailedState.cs" />
+    <Compile Include="..\PubnubApi.Tests\EventEngine\Presence\HeartbeatingState.cs" Link="EventEngine\Presence\HeartbeatingState.cs" />
+    <Compile Include="..\PubnubApi.Tests\EventEngine\Presence\InactiveState.cs" Link="EventEngine\Presence\InactiveState.cs" />
+    <Compile Include="..\PubnubApi.Tests\EventEngine\Presence\ReconnectingState.cs" Link="EventEngine\Presence\ReconnectingState.cs" />
+    <Compile Include="..\PubnubApi.Tests\EventEngine\Presence\StoppedState.cs" Link="EventEngine\Presence\StoppedState.cs" />
     <Compile Include="..\PubnubApi.Tests\GenerateSampleGrant.cs" Link="GenerateSampleGrant.cs" />
     <Compile Include="..\PubnubApi.Tests\PubnubCommon.cs" Link="PubnubCommon.cs" />
     <Compile Include="..\PubnubApi.Tests\PubnubUnitTest.cs" Link="PubnubUnitTest.cs" />

From a126225e54ac002f29130aa75bbd10ad8b23cd06 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Fri, 16 Feb 2024 07:32:49 +0100
Subject: [PATCH 49/61] will it help?

---
 .../PubnubApi.Tests/EventEngine/{Presence => }/CooldownState.cs | 2 +-
 .../PubnubApi.Tests/EventEngine/{Presence => }/FailedState.cs   | 2 +-
 .../EventEngine/{Presence => }/HeartbeatingState.cs             | 2 +-
 .../PubnubApi.Tests/EventEngine/{Presence => }/InactiveState.cs | 2 +-
 .../EventEngine/{Presence => }/ReconnectingState.cs             | 2 +-
 .../PubnubApi.Tests/EventEngine/{Presence => }/StoppedState.cs  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{Presence => }/CooldownState.cs (98%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{Presence => }/FailedState.cs (98%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{Presence => }/HeartbeatingState.cs (98%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{Presence => }/InactiveState.cs (97%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{Presence => }/ReconnectingState.cs (98%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{Presence => }/StoppedState.cs (98%)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/CooldownState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/CooldownState.cs
index 83179c60b..d2bba56d6 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/CooldownState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine.Presence
+namespace PubnubApi.Tests.EventEngine
 {
     internal class CooldownTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/FailedState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/FailedState.cs
index 11a173ca0..cd79e81a3 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/FailedState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine.Presence
+namespace PubnubApi.Tests.EventEngine
 {
     internal class FailedStateTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/HeartbeatingState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/HeartbeatingState.cs
index 2286b0c1b..277f03751 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/HeartbeatingState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine.Presence
+namespace PubnubApi.Tests.EventEngine
 {
     internal class HeartbeatingStateTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/InactiveState.cs
similarity index 97%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/InactiveState.cs
index a2760d6fb..6c71fe191 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/InactiveState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine.Presence
+namespace PubnubApi.Tests.EventEngine
 {
     internal class InactiveStateTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/ReconnectingState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/ReconnectingState.cs
index f068a66ae..1d0e994db 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/ReconnectingState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine.Presence
+namespace PubnubApi.Tests.EventEngine
 {
     internal class ReconnectingStateTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/StoppedState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/StoppedState.cs
index 7e7c0cffc..a60eaedd6 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/StoppedState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine.Presence
+namespace PubnubApi.Tests.EventEngine
 {
     internal class StoppedStateTransitions
     {

From bf830bd0b4a7e971a805129df1f3a2674f14e803 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Fri, 16 Feb 2024 08:06:05 +0100
Subject: [PATCH 50/61] revert

---
 .../PubnubApi.Tests/EventEngine/{ => Presence}/CooldownState.cs | 2 +-
 .../PubnubApi.Tests/EventEngine/{ => Presence}/FailedState.cs   | 2 +-
 .../EventEngine/{ => Presence}/HeartbeatingState.cs             | 2 +-
 .../PubnubApi.Tests/EventEngine/{ => Presence}/InactiveState.cs | 2 +-
 .../EventEngine/{ => Presence}/ReconnectingState.cs             | 2 +-
 .../PubnubApi.Tests/EventEngine/{ => Presence}/StoppedState.cs  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{ => Presence}/CooldownState.cs (98%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{ => Presence}/FailedState.cs (98%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{ => Presence}/HeartbeatingState.cs (98%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{ => Presence}/InactiveState.cs (97%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{ => Presence}/ReconnectingState.cs (98%)
 rename src/UnitTests/PubnubApi.Tests/EventEngine/{ => Presence}/StoppedState.cs (98%)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/CooldownState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index d2bba56d6..83179c60b 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine
+namespace PubnubApi.Tests.EventEngine.Presence
 {
     internal class CooldownTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/FailedState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
index cd79e81a3..11a173ca0 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/FailedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine
+namespace PubnubApi.Tests.EventEngine.Presence
 {
     internal class FailedStateTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/HeartbeatingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/HeartbeatingState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
index 277f03751..2286b0c1b 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/HeartbeatingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine
+namespace PubnubApi.Tests.EventEngine.Presence
 {
     internal class HeartbeatingStateTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
similarity index 97%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/InactiveState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
index 6c71fe191..a2760d6fb 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/InactiveState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine
+namespace PubnubApi.Tests.EventEngine.Presence
 {
     internal class InactiveStateTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/ReconnectingState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
index 1d0e994db..f068a66ae 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/ReconnectingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine
+namespace PubnubApi.Tests.EventEngine.Presence
 {
     internal class ReconnectingStateTransitions
     {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
similarity index 98%
rename from src/UnitTests/PubnubApi.Tests/EventEngine/StoppedState.cs
rename to src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
index a60eaedd6..7e7c0cffc 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/StoppedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
@@ -4,7 +4,7 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 
-namespace PubnubApi.Tests.EventEngine
+namespace PubnubApi.Tests.EventEngine.Presence
 {
     internal class StoppedStateTransitions
     {

From f3b9d57fd11f5bbce360c1ff3b5e8b6263257555 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Fri, 16 Feb 2024 08:24:06 +0100
Subject: [PATCH 51/61] windows masterrace here

---
 .../EventEngine/Presence/CooldownState.cs             | 11 +++--------
 .../EventEngine/Presence/FailedState.cs               |  7 +------
 .../EventEngine/Presence/HeartbeatingState.cs         |  7 +------
 .../EventEngine/Presence/InactiveState.cs             |  7 +------
 .../EventEngine/Presence/ReconnectingState.cs         |  7 +------
 .../EventEngine/Presence/StoppedState.cs              |  7 +------
 6 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index 83179c60b..702c99584 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -3,6 +3,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
+using PubnubApi.EventEngine.Presence.Invocations;
 
 namespace PubnubApi.Tests.EventEngine.Presence
 {
@@ -50,12 +51,6 @@ internal class CooldownTransitions
                 null,
                 null
             },
-            new object[] {
-                new CooldownState(),
-                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
-                null,
-                null
-            },
             new object[] {
                 new CooldownState(),
                 new ReconnectEvent(),
@@ -76,13 +71,13 @@ internal class CooldownTransitions
             },
         };
 
-        [TestCasesSource(nameof(testCases))]
+        [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected, IEffectInvocation[] @_)
         {
             Assert.AreEqual(@expected, @sut.Transition(@ev));
         }
 
-        [TestCasesSource(nameof(testCases))]
+        [TestCaseSource(nameof(testCases))]
         public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
         {
             CollectionAssert.AreEqual(@expected, @sut.Transition(@ev).Invocations);
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
index 11a173ca0..3b20fa082 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
@@ -39,11 +39,6 @@ internal class FailedStateTransitions
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 null,
             },
-            new object[] {
-                new FailedState(),
-                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
-                null,
-            },
             new object[] {
                 new FailedState(),
                 new ReconnectEvent(),
@@ -61,7 +56,7 @@ internal class FailedStateTransitions
             },
         };
 
-        [TestCasesSource(nameof(testCases))]
+        [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
             Assert.AreEqual(expected, sut.Transition(ev));
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
index 2286b0c1b..77998e655 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
@@ -39,11 +39,6 @@ internal class HeartbeatingStateTransitions
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 new ReconnectingState(),
             },
-            new object[] {
-                new HeartbeatingState(),
-                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
-                null,
-            },
             new object[] {
                 new HeartbeatingState(),
                 new ReconnectEvent(),
@@ -61,7 +56,7 @@ internal class HeartbeatingStateTransitions
             },
         };
 
-        [TestCasesSource(nameof(testCases))]
+        [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
             Assert.AreEqual(expected, sut.Transition(ev));
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
index a2760d6fb..e5b47f7f6 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
@@ -34,11 +34,6 @@ internal class InactiveStateTransitions
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 null,
             },
-            new object[] {
-                new InactiveState(),
-                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
-                null,
-            },
             new object[] {
                 new InactiveState(),
                 new ReconnectEvent(),
@@ -56,7 +51,7 @@ internal class InactiveStateTransitions
             },
         };
 
-        [TestCasesSource(nameof(testCases))]
+        [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
             Assert.AreEqual(expected, sut.Transition(ev));
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
index f068a66ae..57e5d5672 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
@@ -39,11 +39,6 @@ internal class ReconnectingStateTransitions
                 new HeartbeatFailureEvent(),
                 new ReconnectingState() { RetryCount = 2 },
             },
-            new object[] {
-                new ReconnectingState(),
-                new HeartbeatFailureEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory} },
-                null,
-            },
             new object[] {
                 new ReconnectingState(),
                 new HeartbeatGiveUpEvent(),
@@ -66,7 +61,7 @@ internal class ReconnectingStateTransitions
             },
         };
 
-        [TestCasesSource(nameof(testCases))]
+        [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
             Assert.AreEqual(expected, sut.Transition(ev));
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
index 7e7c0cffc..e8a0fb366 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
@@ -39,11 +39,6 @@ internal class StoppedStateTransitions
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 null,
             },
-            new object[] {
-                new StoppedState(),
-                new HeartbeatGiveUpEvent() { Status = new PNStatus() { Category = PNStatusCategory.PNCancelledCategory } },
-                null,
-            },
             new object[] {
                 new StoppedState(),
                 new ReconnectEvent(),
@@ -61,7 +56,7 @@ internal class StoppedStateTransitions
             },
         };
 
-        [TestCasesSource(nameof(testCases))]
+        [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
             Assert.AreEqual(expected, sut.Transition(ev));

From 7c7e2cc4be16222976685d07f21a2973e80ae4e0 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Fri, 16 Feb 2024 08:36:27 +0100
Subject: [PATCH 52/61] PCL?

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 68dda2598..f6e3f44bc 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -41,7 +41,7 @@ jobs:
           PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
           PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
           PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
-        run: dotnet test .\\src\\UnitTests\\PubnubApi.Tests\\PubnubApi.Tests.csproj --verbosity normal --logger trx 
+        run: dotnet test .\\src\\UnitTests\\PubnubApiPCL.Tests\\PubnubApiPCL.Tests.csproj --verbosity normal --logger trx 
       - name: Cancel workflow runs for commit on error
         if: failure()
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure

From d361bc355e1f5802738e54fc64ed13f231550491 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Fri, 16 Feb 2024 08:42:36 +0100
Subject: [PATCH 53/61] fix tests

---
 .../PubnubApi.Tests/EventEngine/Presence/CooldownState.cs       | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/FailedState.cs         | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs   | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/InactiveState.cs       | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs   | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/StoppedState.cs        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index 702c99584..7a789d0b4 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -74,7 +74,7 @@ internal class CooldownTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected, IEffectInvocation[] @_)
         {
-            Assert.AreEqual(@expected, @sut.Transition(@ev));
+            Assert.AreEqual(@expected, @sut.Transition(@ev).State);
         }
 
         [TestCaseSource(nameof(testCases))]
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
index 3b20fa082..78db82d6e 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
@@ -59,7 +59,7 @@ internal class FailedStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev));
+            Assert.AreEqual(expected, sut.Transition(ev).State);
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
index 77998e655..2881e60a6 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
@@ -59,7 +59,7 @@ internal class HeartbeatingStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev));
+            Assert.AreEqual(expected, sut.Transition(ev).State);
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
index e5b47f7f6..5180ac4f6 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
@@ -54,7 +54,7 @@ internal class InactiveStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev));
+            Assert.AreEqual(expected, sut.Transition(ev).State);
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
index 57e5d5672..59adcaae0 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
@@ -64,7 +64,7 @@ internal class ReconnectingStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev));
+            Assert.AreEqual(expected, sut.Transition(ev).State);
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
index e8a0fb366..9cf51b8b8 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
@@ -59,7 +59,7 @@ internal class StoppedStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev));
+            Assert.AreEqual(expected, sut.Transition(ev).State);
         }
     }
 }

From 029d11547784b0e4249d25497518830485acf63b Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Fri, 16 Feb 2024 08:52:49 +0100
Subject: [PATCH 54/61] fix tests vol 2

---
 .../PubnubApi.Tests/EventEngine/Presence/CooldownState.cs       | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/FailedState.cs         | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs   | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/InactiveState.cs       | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs   | 2 +-
 .../PubnubApi.Tests/EventEngine/Presence/StoppedState.cs        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index 7a789d0b4..08fc2de17 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -74,7 +74,7 @@ internal class CooldownTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected, IEffectInvocation[] @_)
         {
-            Assert.AreEqual(@expected, @sut.Transition(@ev).State);
+            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
         }
 
         [TestCaseSource(nameof(testCases))]
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
index 78db82d6e..d1d34bcf9 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
@@ -59,7 +59,7 @@ internal class FailedStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev).State);
+            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
index 2881e60a6..c85875da0 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
@@ -59,7 +59,7 @@ internal class HeartbeatingStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev).State);
+            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
index 5180ac4f6..9d19ddf8a 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
@@ -54,7 +54,7 @@ internal class InactiveStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev).State);
+            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
index 59adcaae0..9f8549af5 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
@@ -64,7 +64,7 @@ internal class ReconnectingStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev).State);
+            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
index 9cf51b8b8..32c41e2a8 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
@@ -59,7 +59,7 @@ internal class StoppedStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(expected, sut.Transition(ev).State);
+            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
         }
     }
 }

From d6bfdd2c9ada0c0abd16e61889abbf1d7c0acd58 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 19 Feb 2024 08:47:30 +0100
Subject: [PATCH 55/61] fixes - tests passing

---
 .../Presence/Common/PresenceInput.cs          | 22 +++++++++----
 .../Presence/States/APresenceState.cs         | 10 +++++-
 .../Presence/States/InactiveState.cs          |  3 +-
 .../EventEngine/Presence/CooldownState.cs     | 32 ++++++++++++++++---
 .../EventEngine/Presence/FailedState.cs       | 10 +++++-
 .../EventEngine/Presence/HeartbeatingState.cs | 10 +++++-
 .../EventEngine/Presence/InactiveState.cs     | 10 +++++-
 .../EventEngine/Presence/ReconnectingState.cs | 10 +++++-
 .../EventEngine/Presence/StoppedState.cs      | 10 +++++-
 9 files changed, 99 insertions(+), 18 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
index d1023f128..b3d5874c8 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/Common/PresenceInput.cs
@@ -5,15 +5,15 @@ namespace PubnubApi.EventEngine.Presence.Common
 {
     public class PresenceInput
     {
-        public IEnumerable<string> Channels { get; set; }
-        public IEnumerable<string> ChannelGroups { get; set; }
+        public IEnumerable<string> Channels { get; set; } = Enumerable.Empty<string>();
+        public IEnumerable<string> ChannelGroups { get; set; } = Enumerable.Empty<string>();
 
         public static PresenceInput operator +(PresenceInput a, PresenceInput b)
         {
             return new PresenceInput
             {
-                Channels = a.Channels?.Union(b.Channels ?? new string[0]),
-                ChannelGroups = a.ChannelGroups?.Union(b.ChannelGroups ?? new string[0]),
+                Channels = a.Channels?.Union(b.Channels ?? new string[0]).ToArray(),
+                ChannelGroups = a.ChannelGroups?.Union(b.ChannelGroups ?? new string[0]).ToArray(),
             };
         }
 
@@ -21,8 +21,8 @@ public class PresenceInput
         {
             return new PresenceInput
             {
-                Channels = a.Channels?.Except(b.Channels ?? new string[0]),
-                ChannelGroups = a.ChannelGroups?.Except(b.ChannelGroups ?? new string[0]),
+                Channels = a.Channels?.Except(b.Channels ?? new string[0]).ToArray(),
+                ChannelGroups = a.ChannelGroups?.Except(b.ChannelGroups ?? new string[0]).ToArray(),
             };
         }
 
@@ -32,5 +32,15 @@ public bool IsEmpty()
                 || ((Channels != null && Channels.Count() == 0)
                         && (ChannelGroups != null && ChannelGroups.Count() == 0));
         }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is null || obj is not PresenceInput)
+                return false;
+
+            var typedObj = obj as PresenceInput;
+            return this.Channels.SequenceEqual(typedObj.Channels)
+                && this.ChannelGroups.SequenceEqual(typedObj.ChannelGroups);
+        }
     }
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
index e1b3002f8..473452faf 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/APresenceState.cs
@@ -6,7 +6,7 @@ namespace PubnubApi.EventEngine.Presence.States
 {
     public abstract class APresenceState : Core.State
     {
-        public PresenceInput Input { get; set; }
+        public PresenceInput Input { get; set; } = new PresenceInput(); // empty by default
 
         public bool IsEmpty()
         {
@@ -26,5 +26,13 @@ protected TransitionResult HandleLeftEvent(Events.LeftEvent e)
 
             return state.With(new LeaveInvocation(){ Input = e.Input });
         }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is null || obj is not APresenceState) 
+                return false;
+
+            return this.Input.Equals(((APresenceState)obj).Input);
+        }
     }
 }
diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
index 74f4f238c..74aeace2d 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/InactiveState.cs
@@ -1,4 +1,5 @@
 using PubnubApi.EventEngine.Presence.Invocations;
+using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Core;
 using System.Collections.Generic;
 using System;
@@ -9,7 +10,7 @@ public class InactiveState : APresenceState
     {
         public InactiveState()
         {
-            Input = null;
+            Input = new PresenceInput();
         }
 
         // TODO: Dummy Invocation until we have real ones
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index 08fc2de17..05eee4dda 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -4,6 +4,9 @@
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
 using PubnubApi.EventEngine.Presence.Invocations;
+using System.Linq;
+using System.Security.Policy;
+using System.Collections.Generic;
 
 namespace PubnubApi.Tests.EventEngine.Presence
 {
@@ -61,7 +64,7 @@ internal class CooldownTransitions
                 new CooldownState(),
                 new DisconnectEvent(),
                 new StoppedState(),
-                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new string[] { } } } }
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() } }
             },
             new object[] {
                 new CooldownState(),
@@ -72,15 +75,34 @@ internal class CooldownTransitions
         };
 
         [TestCaseSource(nameof(testCases))]
-        public void TestTransition(State @sut, IEvent @ev, State @expected, IEffectInvocation[] @_)
+        public void TestTransition(APresenceState @sut, IEvent @ev, APresenceState @expected, IEffectInvocation[] @_)
         {
-            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            Assert.AreEqual(@expected, result.State);
         }
 
         [TestCaseSource(nameof(testCases))]
-        public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
+         public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
         {
-            CollectionAssert.AreEqual(@expected, @sut.Transition(@ev).Invocations);
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            foreach (var item in result.Invocations)
+            {
+                Assert.True(expected.Select(i => i.GetType()).Contains(item.GetType()));
+            }
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
index d1d34bcf9..16ec42caf 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
@@ -59,7 +59,15 @@ internal class FailedStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            Assert.AreEqual(@expected.GetType(), result.State.GetType());
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
index c85875da0..87a550386 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
@@ -59,7 +59,15 @@ internal class HeartbeatingStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            Assert.AreEqual(@expected.GetType(), result.State.GetType());
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
index 9d19ddf8a..fdddf15be 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
@@ -54,7 +54,15 @@ internal class InactiveStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            Assert.AreEqual(@expected.GetType(), result.State.GetType());
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
index 9f8549af5..8456b2381 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
@@ -64,7 +64,15 @@ internal class ReconnectingStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            Assert.AreEqual(@expected.GetType(), result.State.GetType());
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
index 32c41e2a8..f94239005 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
@@ -59,7 +59,15 @@ internal class StoppedStateTransitions
         [TestCaseSource(nameof(testCases))]
         public void TestTransition(State @sut, IEvent @ev, State @expected)
         {
-            Assert.AreEqual(@expected.GetType(), @sut.Transition(@ev).State.GetType());
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            Assert.AreEqual(@expected.GetType(), result.State.GetType());
         }
     }
 }

From 72366fb06548872735bf7a510ef2b159cb736da5 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 19 Feb 2024 09:31:46 +0100
Subject: [PATCH 56/61] failed state

---
 .../Presence/States/FailedState.cs            |  4 +--
 .../EventEngine/Presence/FailedState.cs       | 31 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
index 509588dc5..eabc2aea6 100644
--- a/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
+++ b/src/Api/PubnubApi/EventEngine/Presence/States/FailedState.cs
@@ -28,11 +28,11 @@ public override TransitionResult Transition(IEvent ev)
                 Events.ReconnectEvent e => new HeartbeatingState()
                 {
                     Input = this.Input,
-                }.With(new LeaveInvocation(){ Input = this.Input }),
+                },
                 Events.DisconnectEvent e => new StoppedState()
                 {
                     Input = this.Input,
-                }, 
+                }.With(new LeaveInvocation() { Input = this.Input }),
                 _ => null,
             };
         }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
index 16ec42caf..2861a47ab 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
@@ -3,6 +3,8 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
+using PubnubApi.EventEngine.Presence.Invocations;
+using System.Linq;
 
 namespace PubnubApi.Tests.EventEngine.Presence
 {
@@ -13,51 +15,61 @@ internal class FailedStateTransitions
                 new FailedState(),
                 new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                null
             },
             new object[] {
                 new FailedState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "b" } } } }
             },
             new object[] {
                 new FailedState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new InactiveState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "b" } } } }
             },
             new object[] {
                 new FailedState(),
                 new LeftAllEvent(),
                 new InactiveState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new string[] { } } } }
             },
             new object[] {
                 new FailedState(),
                 new HeartbeatSuccessEvent(),
                 null,
+                null
             },
             new object[] {
                 new FailedState(),
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 null,
+                null
             },
             new object[] {
                 new FailedState(),
                 new ReconnectEvent(),
                 new HeartbeatingState(),
+                null
             },
             new object[] {
                 new FailedState(),
                 new DisconnectEvent(),
                 new StoppedState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() } }
+
             },
             new object[] {
                 new FailedState(),
                 new TimesUpEvent(),
                 null,
+                null
             },
         };
 
         [TestCaseSource(nameof(testCases))]
-        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        public void TestTransition(State @sut, IEvent @ev, State @expected, IEffectInvocation[] @_)
         {
             var result = @sut.Transition(@ev);
 
@@ -69,5 +81,22 @@ public void TestTransition(State @sut, IEvent @ev, State @expected)
 
             Assert.AreEqual(@expected.GetType(), result.State.GetType());
         }
+
+        [TestCaseSource(nameof(testCases))]
+        public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
+        {
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            foreach (var item in result.Invocations)
+            {
+                Assert.True(expected.Select(i => i.GetType()).Contains(item.GetType()));
+            }
+        }
     }
 }

From 05229fe2411b64cdb7967abd2df476f53f789bae Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 19 Feb 2024 10:29:29 +0100
Subject: [PATCH 57/61] heartbeating works

---
 .../EventEngine/Presence/CooldownState.cs     |  2 --
 .../EventEngine/Presence/FailedState.cs       |  6 ++--
 .../EventEngine/Presence/HeartbeatingState.cs | 32 +++++++++++++++++--
 .../EventEngine/Presence/InactiveState.cs     | 22 +++++++++++--
 .../EventEngine/Presence/ReconnectingState.cs | 22 +++++++++++--
 .../EventEngine/Presence/StoppedState.cs      | 22 +++++++++++--
 6 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
index 05eee4dda..c9604db5b 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/CooldownState.cs
@@ -5,8 +5,6 @@
 using PubnubApi.EventEngine.Presence.States;
 using PubnubApi.EventEngine.Presence.Invocations;
 using System.Linq;
-using System.Security.Policy;
-using System.Collections.Generic;
 
 namespace PubnubApi.Tests.EventEngine.Presence
 {
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
index 2861a47ab..18dbcd2a6 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/FailedState.cs
@@ -27,7 +27,7 @@ internal class FailedStateTransitions
                 new FailedState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new InactiveState(),
-                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "b" } } } }
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "a" } } } }
             },
             new object[] {
                 new FailedState(),
@@ -69,7 +69,7 @@ internal class FailedStateTransitions
         };
 
         [TestCaseSource(nameof(testCases))]
-        public void TestTransition(State @sut, IEvent @ev, State @expected, IEffectInvocation[] @_)
+        public void TestTransition(APresenceState @sut, IEvent @ev, APresenceState @expected, IEffectInvocation[] @_)
         {
             var result = @sut.Transition(@ev);
 
@@ -79,7 +79,7 @@ public void TestTransition(State @sut, IEvent @ev, State @expected, IEffectInvoc
                 return;
             }
 
-            Assert.AreEqual(@expected.GetType(), result.State.GetType());
+            Assert.AreEqual(@expected, result.State);
         }
 
         [TestCaseSource(nameof(testCases))]
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
index 87a550386..f6cc52b41 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/HeartbeatingState.cs
@@ -3,6 +3,8 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
+using PubnubApi.EventEngine.Presence.Invocations;
+using System.Linq;
 
 namespace PubnubApi.Tests.EventEngine.Presence
 {
@@ -13,51 +15,60 @@ internal class HeartbeatingStateTransitions
                 new HeartbeatingState(),
                 new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                null
             },
             new object[] {
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "b" } } } }
             },
             new object[] {
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new InactiveState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "a" } } } }
             },
             new object[] {
                 new HeartbeatingState(),
                 new LeftAllEvent(),
                 new InactiveState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new string[] { } } } }
             },
             new object[] {
                 new HeartbeatingState(),
                 new HeartbeatSuccessEvent(),
                 new CooldownState(),
+                null
             },
             new object[] {
                 new HeartbeatingState(),
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 new ReconnectingState(),
+                null
             },
             new object[] {
                 new HeartbeatingState(),
                 new ReconnectEvent(),
                 null,
+                null
             },
             new object[] {
                 new HeartbeatingState(),
                 new DisconnectEvent(),
                 new StoppedState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() } }
             },
             new object[] {
                 new HeartbeatingState(),
                 new TimesUpEvent(),
                 null,
+                null
             },
         };
 
         [TestCaseSource(nameof(testCases))]
-        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        public void TestTransition(APresenceState @sut, IEvent @ev, APresenceState @expected, IEffectInvocation[] @_)
         {
             var result = @sut.Transition(@ev);
 
@@ -67,7 +78,24 @@ public void TestTransition(State @sut, IEvent @ev, State @expected)
                 return;
             }
 
-            Assert.AreEqual(@expected.GetType(), result.State.GetType());
+            Assert.AreEqual(@expected, result.State);
+        }
+
+        [TestCaseSource(nameof(testCases))]
+        public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
+        {
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            foreach (var item in result.Invocations)
+            {
+                Assert.True(expected.Select(i => i.GetType()).Contains(item.GetType()));
+            }
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
index fdddf15be..69e37bf37 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
@@ -3,6 +3,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
+using System.Linq;
 
 namespace PubnubApi.Tests.EventEngine.Presence
 {
@@ -52,7 +53,7 @@ internal class InactiveStateTransitions
         };
 
         [TestCaseSource(nameof(testCases))]
-        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        public void TestTransition(APresenceState @sut, IEvent @ev, APresenceState @expected, IEffectInvocation[] @_)
         {
             var result = @sut.Transition(@ev);
 
@@ -62,7 +63,24 @@ public void TestTransition(State @sut, IEvent @ev, State @expected)
                 return;
             }
 
-            Assert.AreEqual(@expected.GetType(), result.State.GetType());
+            Assert.AreEqual(@expected, result.State);
+        }
+
+        [TestCaseSource(nameof(testCases))]
+        public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
+        {
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            foreach (var item in result.Invocations)
+            {
+                Assert.True(expected.Select(i => i.GetType()).Contains(item.GetType()));
+            }
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
index 8456b2381..33bebdc08 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
@@ -3,6 +3,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
+using System.Linq;
 
 namespace PubnubApi.Tests.EventEngine.Presence
 {
@@ -62,7 +63,7 @@ internal class ReconnectingStateTransitions
         };
 
         [TestCaseSource(nameof(testCases))]
-        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        public void TestTransition(APresenceState @sut, IEvent @ev, APresenceState @expected, IEffectInvocation[] @_)
         {
             var result = @sut.Transition(@ev);
 
@@ -72,7 +73,24 @@ public void TestTransition(State @sut, IEvent @ev, State @expected)
                 return;
             }
 
-            Assert.AreEqual(@expected.GetType(), result.State.GetType());
+            Assert.AreEqual(@expected, result.State);
+        }
+
+        [TestCaseSource(nameof(testCases))]
+        public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
+        {
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            foreach (var item in result.Invocations)
+            {
+                Assert.True(expected.Select(i => i.GetType()).Contains(item.GetType()));
+            }
         }
     }
 }
diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
index f94239005..84740395b 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
@@ -3,6 +3,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
+using System.Linq;
 
 namespace PubnubApi.Tests.EventEngine.Presence
 {
@@ -57,7 +58,7 @@ internal class StoppedStateTransitions
         };
 
         [TestCaseSource(nameof(testCases))]
-        public void TestTransition(State @sut, IEvent @ev, State @expected)
+        public void TestTransition(APresenceState @sut, IEvent @ev, APresenceState @expected, IEffectInvocation[] @_)
         {
             var result = @sut.Transition(@ev);
 
@@ -67,7 +68,24 @@ public void TestTransition(State @sut, IEvent @ev, State @expected)
                 return;
             }
 
-            Assert.AreEqual(@expected.GetType(), result.State.GetType());
+            Assert.AreEqual(@expected, result.State);
+        }
+
+        [TestCaseSource(nameof(testCases))]
+        public void TestReturnedInvocations(State @sut, IEvent @ev, State @_, IEffectInvocation[] @expected)
+        {
+            var result = @sut.Transition(@ev);
+
+            if (result == null && expected == null)
+            {
+                // it's expected result
+                return;
+            }
+
+            foreach (var item in result.Invocations)
+            {
+                Assert.True(expected.Select(i => i.GetType()).Contains(item.GetType()));
+            }
         }
     }
 }

From 97f1e9eaf58d2dd783180fecaea3b1a19663fae5 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 19 Feb 2024 11:08:21 +0100
Subject: [PATCH 58/61] inactive

---
 .../PubnubApi.Tests/EventEngine/Presence/InactiveState.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
index 69e37bf37..61e9cec00 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/InactiveState.cs
@@ -14,41 +14,49 @@ internal class InactiveStateTransitions
                 new InactiveState(),
                 new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                null
             },
             new object[] {
                 new InactiveState(),
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 null,
+                null
             },
             new object[] {
                 new InactiveState(),
                 new LeftAllEvent(),
                 null,
+                null
             },
             new object[] {
                 new InactiveState(),
                 new HeartbeatSuccessEvent(),
                 null,
+                null
             },
             new object[] {
                 new InactiveState(),
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 null,
+                null
             },
             new object[] {
                 new InactiveState(),
                 new ReconnectEvent(),
                 null,
+                null
             },
             new object[] {
                 new InactiveState(),
                 new DisconnectEvent(),
                 null,
+                null
             },
             new object[] {
                 new InactiveState(),
                 new TimesUpEvent(),
                 null,
+                null
             },
         };
 

From cb31460264d44a822562f69c28b9690f47dab1f3 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 19 Feb 2024 11:18:40 +0100
Subject: [PATCH 59/61] reconnecting

---
 .../EventEngine/Presence/ReconnectingState.cs       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
index 33bebdc08..37161acf9 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/ReconnectingState.cs
@@ -3,6 +3,7 @@
 using PubnubApi.EventEngine.Presence.Common;
 using PubnubApi.EventEngine.Presence.Events;
 using PubnubApi.EventEngine.Presence.States;
+using PubnubApi.EventEngine.Presence.Invocations;
 using System.Linq;
 
 namespace PubnubApi.Tests.EventEngine.Presence
@@ -14,51 +15,61 @@ internal class ReconnectingStateTransitions
                 new ReconnectingState(),
                 new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                null
             },
             new object[] {
                 new ReconnectingState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
                 new HeartbeatingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "b" } } } }
             },
             new object[] {
                 new ReconnectingState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new InactiveState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new [] { "a" } } } }
             },
             new object[] {
                 new ReconnectingState(),
                 new LeftAllEvent(),
                 new InactiveState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() { Channels = new string[] { } } } }
             },
             new object[] {
                 new ReconnectingState(),
                 new HeartbeatSuccessEvent(),
                 new CooldownState(),
+                null
             },
             new object[] {
                 new ReconnectingState() { RetryCount = 1 },
-                new HeartbeatFailureEvent(),
+                new HeartbeatFailureEvent() { Status = new PNStatus() },
                 new ReconnectingState() { RetryCount = 2 },
+                null
             },
             new object[] {
                 new ReconnectingState(),
                 new HeartbeatGiveUpEvent(),
                 new FailedState(),
+                null
             },
             new object[] {
                 new ReconnectingState(),
                 new ReconnectEvent(),
                 null,
+                null
             },
             new object[] {
                 new ReconnectingState(),
                 new DisconnectEvent(),
                 new StoppedState(),
+                new IEffectInvocation[] { new LeaveInvocation() { Input = new PresenceInput() } }
             },
             new object[] {
                 new ReconnectingState(),
                 new TimesUpEvent(),
                 null,
+                null
             },
         };
 

From b0f11ddd7e5d5aa98a21f9e4b55fd6e8a895e1e6 Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 19 Feb 2024 11:22:43 +0100
Subject: [PATCH 60/61] stopped

---
 .../EventEngine/Presence/StoppedState.cs              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
index 84740395b..516e366d6 100644
--- a/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
+++ b/src/UnitTests/PubnubApi.Tests/EventEngine/Presence/StoppedState.cs
@@ -13,47 +13,56 @@ internal class StoppedStateTransitions
             new object[] {
                 new StoppedState(),
                 new JoinedEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
-                new StoppedState(),
+                new StoppedState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                null
             },
             new object[] {
                 new StoppedState() { Input = new PresenceInput() { Channels = new [] { "a", "b" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "b" } } },
                 new StoppedState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
+                null
             },
             new object[] {
                 new StoppedState() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new LeftEvent() { Input = new PresenceInput() { Channels = new [] { "a" } } },
                 new InactiveState(),
+                null
             },
             new object[] {
                 new StoppedState(),
                 new LeftAllEvent(),
                 new InactiveState(),
+                null
             },
             new object[] {
                 new StoppedState(),
                 new HeartbeatSuccessEvent(),
                 null,
+                null
             },
             new object[] {
                 new StoppedState(),
                 new HeartbeatFailureEvent() { Status = new PNStatus() },
                 null,
+                null
             },
             new object[] {
                 new StoppedState(),
                 new ReconnectEvent(),
                 new HeartbeatingState(),
+                null
             },
             new object[] {
                 new StoppedState(),
                 new DisconnectEvent(),
                 null,
+                null
             },
             new object[] {
                 new StoppedState(),
                 new TimesUpEvent(),
                 null,
+                null
             },
         };
 

From 3d51e99c90ea0c722cbc578b82f666c055e60acf Mon Sep 17 00:00:00 2001
From: Xavrax <matedahlke@gmail.com>
Date: Mon, 19 Feb 2024 11:58:58 +0100
Subject: [PATCH 61/61] .net6 should work

---
 src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
index 369ae84c1..f1fc8e8cf 100644
--- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
+++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -249,6 +249,23 @@
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\States\UnsubscribedState.cs" Link="EventEngine\Subscribe\States\UnsubscribedState.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\SubscribeEventEngine.cs" Link="EventEngine\Subscribe\SubscribeEventEngine.cs" />
     <Compile Include="..\PubnubApi\EventEngine\Subscribe\SubscribeEventEngineFactory.cs" Link="EventEngine\Subscribe\SubscribeEventEngineFactory.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Common\PresenceInput.cs" Link="EventEngine\Presence\Common\PresenceInput.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Events\PresenceEvents.cs" Link="EventEngine\Presence\Events\PresenceEvents.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Invocations\CancelDelayedHeartbeatInvocation.cs" Link="EventEngine\Presence\Invocations\CancelDelayedHeartbeatInvocation.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Invocations\CancelWaitInvocation.cs" Link="EventEngine\Presence\Invocations\CancelWaitInvocation.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Invocations\DelayedHeartbeatInvocation.cs" Link="EventEngine\Presence\Invocations\DelayedHeartbeatInvocation.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Invocations\Dummy.cs" Link="EventEngine\Presence\Invocations\Dummy.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Invocations\HearbeatInvocation.cs" Link="EventEngine\Presence\Invocations\HearbeatInvocation.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Invocations\LeaveInvocation.cs" Link="EventEngine\Presence\Invocations\LeaveInvocation.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Invocations\TerminateEventEngineInvocation.cs" Link="EventEngine\Presence\Invocations\TerminateEventEngineInvocation.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\Invocations\WaitInvocation.cs" Link="EventEngine\Presence\Invocations\WaitInvocation.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\States\APresenceState.cs" Link="EventEngine\Presence\States\APresenceState.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\States\CooldownState.cs" Link="EventEngine\Presence\States\CooldownState.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\States\FailedState.cs" Link="EventEngine\Presence\States\FailedState.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\States\HeartBeatingState.cs" Link="EventEngine\Presence\States\HeartBeatingState.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\States\InactiveState.cs" Link="EventEngine\Presence\States\InactiveState.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\States\ReconnectingState.cs" Link="EventEngine\Presence\States\ReconnectingState.cs" />
+	<Compile Include="..\PubnubApi\EventEngine\Presence\States\StoppedState.cs" Link="EventEngine\Presence\States\StoppedState.cs" />
     <Compile Include="..\PubnubApi\Helper\MobilePushHelper.cs" Link="Helper\MobilePushHelper.cs" />
     <Compile Include="..\PubnubApi\HttpUtility\HttpUtility.cs">
       <Link>HttpUtility\HttpUtility.cs</Link>