Merge branch 'eventengine-poc' into eventengine/handshake-handler

MikeDobrzan · MikeDobrzan · commit 83d3929d7ddd · 2023-07-24T12:51:29.000+02:00
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,8 +1,13 @@
 name: c-sharp
-version: "6.16.0"
+version: "6.17.0"
 schema: 1
 scm: github.com/pubnub/c-sharp
 changelog:
+  - date: 2023-07-10
+    version: v6.17.0
+    changes:
+      - type: improvement
+        text: "Validate json string before deserialization."
   - date: 2023-05-18
     version: v6.16.0
     changes:
@@ -720,7 +725,7 @@ features:
     - QUERY-PARAM
 supported-platforms:
   -
-    version: Pubnub 'C#' 6.16.0
+    version: Pubnub 'C#' 6.17.0
     platforms:
       - Windows 10 and up
       - Windows Server 2008 and up
@@ -730,7 +735,7 @@ supported-platforms:
       - .Net Framework 4.5
       - .Net Framework 4.6.1+
   -
-    version: PubnubPCL 'C#' 6.16.0
+    version: PubnubPCL 'C#' 6.17.0
     platforms:
       - Xamarin.Android
       - Xamarin.iOS
@@ -750,7 +755,7 @@ supported-platforms:
       - .Net Core
       - .Net 6.0
   -
-    version: PubnubUWP 'C#' 6.16.0
+    version: PubnubUWP 'C#' 6.17.0
     platforms:
       - Windows Phone 10
       - Universal Windows Apps
@@ -774,7 +779,7 @@ sdks:
             distribution-type: source
             distribution-repository: GitHub
             package-name: Pubnub
-            location: https://github.com/pubnub/c-sharp/releases/tag/v6.16.0.0
+            location: https://github.com/pubnub/c-sharp/releases/tag/v6.17.0.0
             requires:
               -
                 name: ".Net"
@@ -1057,7 +1062,7 @@ sdks:
             distribution-type: source
             distribution-repository: GitHub
             package-name: PubNubPCL
-            location: https://github.com/pubnub/c-sharp/releases/tag/v6.16.0.0
+            location: https://github.com/pubnub/c-sharp/releases/tag/v6.17.0.0
             requires:
               -
                 name: ".Net Core"
@@ -1416,7 +1421,7 @@ sdks:
             distribution-type: source
             distribution-repository: GitHub
             package-name: PubnubUWP
-            location: https://github.com/pubnub/c-sharp/releases/tag/v6.16.0.0
+            location: https://github.com/pubnub/c-sharp/releases/tag/v6.17.0.0
             requires:
               -
                 name: "Universal Windows Platform Development"
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+v6.17.0 - July 10 2023
+-----------------------------
+- Modified: validate json string before deserialization.
+
 v6.16.0 - May 18 2023
 -----------------------------
 - Modified: replaced ConcurrentDictionary class file with System.Collections.Concurrent package for all target frameworks except .net 3.5/4.0.
diff --git a/src/Api/PubnubApi/Builder/StatusBuilder.cs b/src/Api/PubnubApi/Builder/StatusBuilder.cs
@@ -55,7 +55,11 @@ public PNStatus CreateStatusResponse<T>(PNOperationType type, PNStatusCategory c
                 }
                 else
                 {
-                    Dictionary<string, object> deserializeStatus = jsonLibrary.DeserializeToDictionaryOfObject(targetException.Message);
+                    Dictionary<string, object> deserializeStatus = null;
+                    if (jsonLibrary.IsDictionaryCompatible(targetException.Message, type))
+                    {
+                        deserializeStatus = jsonLibrary.DeserializeToDictionaryOfObject(targetException.Message);
+                    }
                     if (deserializeStatus != null && deserializeStatus.Count >= 1 
                         && deserializeStatus.ContainsKey("error") && string.Equals(deserializeStatus["error"].ToString(), "true", StringComparison.OrdinalIgnoreCase)
                         && deserializeStatus.ContainsKey("status") && Int32.TryParse(deserializeStatus["status"].ToString(), out serverErrorStatusCode))
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/Events/SubscriptionEvents.cs b/src/Api/PubnubApi/EventEngine/Subscribe/Events/SubscriptionEvents.cs
@@ -2,6 +2,9 @@
 using PubnubApi.EventEngine.Subscribe.Common;
 
 namespace PubnubApi.EventEngine.Subscribe.Events {
+	public class UnsubscribeAllEvent : Core.IEvent {
+	}
+	
 	public class SubscriptionChangedEvent : Core.IEvent {
 		public IEnumerable<string> Channels;
 		public IEnumerable<string> ChannelGroups;
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeFailedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeFailedState.cs
@@ -14,6 +14,10 @@ public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
+                Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState() 
+                {
+                },
+
                 Events.SubscriptionChangedEvent subscriptionChanged => new HandshakingState()
                 {
                     Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups,
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeReconnectingState.cs
@@ -13,7 +13,6 @@ internal class HandshakeReconnectingState : Core.State
         public int MaxConnectionRetry;
         public int AttemptedRetries;
 
-
         public override IEnumerable<IEffectInvocation> OnEntry => new HandshakeReconnectInvocation()
             { Channels = this.Channels, ChannelGroups = this.ChannelGroups, Policy = this.RetryPolicy, MaxConnectionRetry = this.MaxConnectionRetry, AttemptedRetries = this.AttemptedRetries }.AsArray();
         public override IEnumerable<IEffectInvocation> OnExit { get; } = new CancelHandshakeReconnectInvocation().AsArray();
@@ -22,6 +21,10 @@ public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
+                Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState() 
+                {
+                },
+
                 Events.SubscriptionChangedEvent subscriptionChanged => new HandshakingState()
                 {
                     Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups,
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeStoppedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeStoppedState.cs
@@ -14,6 +14,10 @@ public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
+                Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState() 
+                {
+                },
+
                 Events.SubscriptionChangedEvent subscriptionChanged => new HandshakingState()
                 {
                     Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups,
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakingState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakingState.cs
@@ -19,6 +19,10 @@ public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
+                Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState() 
+                {
+                },
+
                 Events.SubscriptionChangedEvent subscriptionChanged => new States.HandshakingState()
                 {
                     Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveFailedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveFailedState.cs
@@ -19,6 +19,10 @@ public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
+                Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState() 
+                {
+                },
+
                 Events.SubscriptionChangedEvent subscriptionChanged => new ReceivingState()
                 {
                     Channels = subscriptionChanged.Channels,
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveReconnectingState.cs
@@ -22,6 +22,10 @@ public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
+                Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState() 
+                {
+                },
+
                 Events.SubscriptionChangedEvent subscriptionChanged => new ReceivingState()
                 {
                     Channels = subscriptionChanged.Channels,
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveStoppedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveStoppedState.cs
@@ -16,6 +16,10 @@ public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
+                Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState() 
+                {
+                },
+
                 Events.SubscriptionChangedEvent subscriptionChanged => new ReceivingState()
                 {
                     Channels = subscriptionChanged.Channels,
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceivingState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceivingState.cs
@@ -21,6 +21,10 @@ public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
+                Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState() 
+                {
+                },
+
                 Events.ReceiveSuccessEvent receiveSuccess => new ReceivingState()
                 {
                     Channels = receiveSuccess.Channels,
diff --git a/src/Api/PubnubApi/NewtonsoftJsonDotNet.cs b/src/Api/PubnubApi/NewtonsoftJsonDotNet.cs
@@ -100,7 +100,7 @@ public object BuildJsonObject(string jsonString)
         public bool IsDictionaryCompatible(string jsonString, PNOperationType operationType)
         {
             bool ret = false;
-            if (IsValidJson(jsonString, operationType))
+            if (JsonFastCheck(jsonString) && IsValidJson(jsonString, operationType))
             {
                 try
                 {
@@ -1234,14 +1234,19 @@ public virtual T DeserializeToObject<T>(List<object> listObject)
 
         public Dictionary<string, object> DeserializeToDictionaryOfObject(string jsonString)
         {
+            Dictionary<string, object> result = null;
             try
             {
-                return JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString);
+                if (JsonFastCheck(jsonString))
+                {
+                    result = JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString);
+                }
             }
             catch
             {
-                return null;
+                //ignore
             }
+            return result;
         }
 
         public Dictionary<string, object> ConvertToDictionaryObject(object localContainer)
@@ -1369,6 +1374,10 @@ public object[] ConvertToObjectArray(object localContainer)
             return ret;
         }
 
+        public static bool JsonFastCheck(string rawJson) {
+	        var c = rawJson.TrimStart()[0];
+	        return c == '[' || c == '{';
+        }
         private static object ConvertJTokenToObject(JToken token)
         {
             if (token == null)
diff --git a/src/Api/PubnubApi/Properties/AssemblyInfo.cs b/src/Api/PubnubApi/Properties/AssemblyInfo.cs
@@ -11,8 +11,8 @@
 [assembly: AssemblyProduct("Pubnub C# SDK")]
 [assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("6.16.0.0")]
-[assembly: AssemblyFileVersion("6.16.0.0")]
+[assembly: AssemblyVersion("6.17.0.0")]
+[assembly: AssemblyFileVersion("6.17.0.0")]
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
diff --git a/src/Api/PubnubApi/PubnubCoreBase.cs b/src/Api/PubnubApi/PubnubCoreBase.cs
@@ -1414,7 +1414,11 @@ private PNStatus GetStatusIfError<T>(RequestState<T> asyncRequestState, string j
                 else if (deserializeStatus.Count >= 1 && deserializeStatus.ContainsKey("error") && deserializeStatus.ContainsKey("status") && Int32.TryParse(deserializeStatus["status"].ToString(), out statusCode) && statusCode > 0)
                 {
                     string errorMessageJson = deserializeStatus["error"].ToString();
-                    Dictionary<string, object> errorDic = jsonLib.DeserializeToDictionaryOfObject(errorMessageJson);
+                    Dictionary<string, object> errorDic = null;
+                    if (jsonLib.IsDictionaryCompatible(errorMessageJson, type))
+                    {
+                        errorDic = jsonLib.DeserializeToDictionaryOfObject(errorMessageJson);
+                    }
                     if (errorDic != null && errorDic.Count > 0 && errorDic.ContainsKey("message")
                         && statusCode != 200 && pubnubConfig.TryGetValue(PubnubInstance.InstanceId, out currentConfig))
                     {
@@ -1425,8 +1429,12 @@ private PNStatus GetStatusIfError<T>(RequestState<T> asyncRequestState, string j
                 }
                 else if (deserializeStatus.Count >= 1 && deserializeStatus.ContainsKey("status") && string.Equals(deserializeStatus["status"].ToString(), "error", StringComparison.OrdinalIgnoreCase) && deserializeStatus.ContainsKey("error"))
                 {
+                    Dictionary<string, object> errorDic = null;
                     string errorMessageJson = deserializeStatus["error"].ToString();
-                    Dictionary<string, object> errorDic = jsonLib.DeserializeToDictionaryOfObject(errorMessageJson);
+                    if (jsonLib.IsDictionaryCompatible(errorMessageJson, type))
+                    {
+                        errorDic = jsonLib.DeserializeToDictionaryOfObject(errorMessageJson);
+                    }
                     if (errorDic != null && errorDic.Count > 0 && errorDic.ContainsKey("code") && errorDic.ContainsKey("message"))
                     {
                         statusCode = PNStatusCodeHelper.GetHttpStatusCode(errorDic["code"].ToString());
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -15,16 +15,15 @@
 
   <PropertyGroup>
     <PackageId>PubnubPCL</PackageId>
-    <PackageVersion>6.16.0.0</PackageVersion>
+    <PackageVersion>6.17.0.0</PackageVersion>
     <Title>PubNub C# .NET - Web Data Push API</Title>
     <Authors>Pandu Masabathula</Authors>
     <Owners>PubNub</Owners>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
-    <PackageReleaseNotes>Replaced ConcurrentDictionary class file with System.Collections.Concurrent package for all target frameworks except .net 3.5/4.0.
-Addressed threading issue on reading ConcurrentDictionary keys.</PackageReleaseNotes>
+    <PackageReleaseNotes>Validate json string before deserialization.</PackageReleaseNotes>
     <PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
     <!--<Summary>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Summary>-->
     <Description>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Description>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -16,16 +16,15 @@
 
   <PropertyGroup>
     <PackageId>PubnubUWP</PackageId>
-    <PackageVersion>6.16.0.0</PackageVersion>
+    <PackageVersion>6.17.0.0</PackageVersion>
     <Title>PubNub C# .NET - Web Data Push API</Title>
     <Authors>Pandu Masabathula</Authors>
     <Owners>PubNub</Owners>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
-    <PackageReleaseNotes>Replaced ConcurrentDictionary class file with System.Collections.Concurrent package for all target frameworks except .net 3.5/4.0.
-Addressed threading issue on reading ConcurrentDictionary keys.</PackageReleaseNotes>
+    <PackageReleaseNotes>Validate json string before deserialization.</PackageReleaseNotes>
     <PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
     <!--<Summary>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Summary>-->
     <Description>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Description>
diff --git a/src/UnitTests/AcceptanceTests/Steps/GrantTokenSteps.cs b/src/UnitTests/AcceptanceTests/Steps/GrantTokenSteps.cs
@@ -393,7 +393,7 @@ public async Task WhenIGrantATokenSpecifyingThosePermissions()
                 .ExecuteAsync();
             grantResult = pamGrantResult.Result;
             pnStatus = pamGrantResult.Status;
-            if (pnStatus.Error)
+            if (pnStatus != null && pnStatus.Error)
             {
                 pnError = pn.JsonPluggableLibrary.DeserializeToObject<PubnubError>(pnStatus.ErrorData.Information);
             }
@@ -421,7 +421,7 @@ public async Task WhenIAttemptToGrantATokenSpecifyingThosePermissions()
                 .ExecuteAsync();
             grantResult = pamGrantResult.Result;
             pnStatus = pamGrantResult.Status;
-            if (pnStatus.Error)
+            if (pnStatus != null && pnStatus.Error)
             {
                 pnError = pn.JsonPluggableLibrary.DeserializeToObject<PubnubError>(pnStatus.ErrorData.Information);
             }
diff --git a/src/UnitTests/AcceptanceTests/Steps/ObjectsV2ChannelMetadataSteps.cs b/src/UnitTests/AcceptanceTests/Steps/ObjectsV2ChannelMetadataSteps.cs
diff --git a/src/UnitTests/AcceptanceTests/Steps/ObjectsV2MembersMetadataSteps.cs b/src/UnitTests/AcceptanceTests/Steps/ObjectsV2MembersMetadataSteps.cs
diff --git a/src/UnitTests/AcceptanceTests/Steps/ObjectsV2MembershipsMetadataSteps.cs b/src/UnitTests/AcceptanceTests/Steps/ObjectsV2MembershipsMetadataSteps.cs
diff --git a/src/UnitTests/AcceptanceTests/Steps/ObjectsV2UuidMetadataSteps.cs b/src/UnitTests/AcceptanceTests/Steps/ObjectsV2UuidMetadataSteps.cs
diff --git a/src/UnitTests/AcceptanceTests/Steps/RevokeTokenSteps.cs b/src/UnitTests/AcceptanceTests/Steps/RevokeTokenSteps.cs

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,11 @@ public PNStatus CreateStatusResponse<T>(PNOperationType type, PNStatusCategory c`
`55`	`55`	`}`
`56`	`56`	`else`
`57`	`57`	`{`
`58`		`- Dictionary<string, object> deserializeStatus = jsonLibrary.DeserializeToDictionaryOfObject(targetException.Message);`
	`58`	`+ Dictionary<string, object> deserializeStatus = null;`
	`59`	`+ if (jsonLibrary.IsDictionaryCompatible(targetException.Message, type))`
	`60`	`+ {`
	`61`	`+ deserializeStatus = jsonLibrary.DeserializeToDictionaryOfObject(targetException.Message);`
	`62`	`+ }`
`59`	`63`	`if (deserializeStatus != null && deserializeStatus.Count >= 1`
`60`	`64`	`&& deserializeStatus.ContainsKey("error") && string.Equals(deserializeStatus["error"].ToString(), "true", StringComparison.OrdinalIgnoreCase)`
`61`	`65`	`&& deserializeStatus.ContainsKey("status") && Int32.TryParse(deserializeStatus["status"].ToString(), out serverErrorStatusCode))`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ public override TransitionResult Transition(IEvent e)`
`14`	`14`	`{`
`15`	`15`	`return e switch`
`16`	`16`	`{`
	`17`	`+ Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState()`
	`18`	`+ {`
	`19`	`+ },`
	`20`	`+`
`17`	`21`	`Events.SubscriptionChangedEvent subscriptionChanged => new HandshakingState()`
`18`	`22`	`{`
`19`	`23`	`Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups,`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ internal class HandshakeReconnectingState : Core.State`
`13`	`13`	`public int MaxConnectionRetry;`
`14`	`14`	`public int AttemptedRetries;`
`15`	`15`
`16`		`-`
`17`	`16`	`public override IEnumerable<IEffectInvocation> OnEntry => new HandshakeReconnectInvocation()`
`18`	`17`	`{ Channels = this.Channels, ChannelGroups = this.ChannelGroups, Policy = this.RetryPolicy, MaxConnectionRetry = this.MaxConnectionRetry, AttemptedRetries = this.AttemptedRetries }.AsArray();`
`19`	`18`	`public override IEnumerable<IEffectInvocation> OnExit { get; } = new CancelHandshakeReconnectInvocation().AsArray();`
`@@ -22,6 +21,10 @@ public override TransitionResult Transition(IEvent e)`
`22`	`21`	`{`
`23`	`22`	`return e switch`
`24`	`23`	`{`
	`24`	`+ Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState()`
	`25`	`+ {`
	`26`	`+ },`
	`27`	`+`
`25`	`28`	`Events.SubscriptionChangedEvent subscriptionChanged => new HandshakingState()`
`26`	`29`	`{`
`27`	`30`	`Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups,`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ public override TransitionResult Transition(IEvent e)`
`19`	`19`	`{`
`20`	`20`	`return e switch`
`21`	`21`	`{`
	`22`	`+ Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState()`
	`23`	`+ {`
	`24`	`+ },`
	`25`	`+`
`22`	`26`	`Events.SubscriptionChangedEvent subscriptionChanged => new States.HandshakingState()`
`23`	`27`	`{`
`24`	`28`	`Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,10 @@ public override TransitionResult Transition(IEvent e)`
`22`	`22`	`{`
`23`	`23`	`return e switch`
`24`	`24`	`{`
	`25`	`+ Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState()`
	`26`	`+ {`
	`27`	`+ },`
	`28`	`+`
`25`	`29`	`Events.SubscriptionChangedEvent subscriptionChanged => new ReceivingState()`
`26`	`30`	`{`
`27`	`31`	`Channels = subscriptionChanged.Channels,`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@ public override TransitionResult Transition(IEvent e)`
`16`	`16`	`{`
`17`	`17`	`return e switch`
`18`	`18`	`{`
	`19`	`+ Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState()`
	`20`	`+ {`
	`21`	`+ },`
	`22`	`+`
`19`	`23`	`Events.SubscriptionChangedEvent subscriptionChanged => new ReceivingState()`
`20`	`24`	`{`
`21`	`25`	`Channels = subscriptionChanged.Channels,`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,10 @@ public override TransitionResult Transition(IEvent e)`
`21`	`21`	`{`
`22`	`22`	`return e switch`
`23`	`23`	`{`
	`24`	`+ Events.UnsubscribeAllEvent unsubscribeAll => new UnsubscribedState()`
	`25`	`+ {`
	`26`	`+ },`
	`27`	`+`
`24`	`28`	`Events.ReceiveSuccessEvent receiveSuccess => new ReceivingState()`
`25`	`29`	`{`
`26`	`30`	`Channels = receiveSuccess.Channels,`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public object BuildJsonObject(string jsonString)`
`100`	`100`	`public bool IsDictionaryCompatible(string jsonString, PNOperationType operationType)`
`101`	`101`	`{`
`102`	`102`	`bool ret = false;`
`103`		`- if (IsValidJson(jsonString, operationType))`
	`103`	`+ if (JsonFastCheck(jsonString) && IsValidJson(jsonString, operationType))`
`104`	`104`	`{`
`105`	`105`	`try`
`106`	`106`	`{`
`@@ -1234,14 +1234,19 @@ public virtual T DeserializeToObject<T>(List<object> listObject)`
`1234`	`1234`
`1235`	`1235`	`public Dictionary<string, object> DeserializeToDictionaryOfObject(string jsonString)`
`1236`	`1236`	`{`
	`1237`	`+ Dictionary<string, object> result = null;`
`1237`	`1238`	`try`
`1238`	`1239`	`{`
`1239`		`- return JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString);`
	`1240`	`+ if (JsonFastCheck(jsonString))`
	`1241`	`+ {`
	`1242`	`+ result = JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString);`
	`1243`	`+ }`
`1240`	`1244`	`}`
`1241`	`1245`	`catch`
`1242`	`1246`	`{`
`1243`		`- return null;`
	`1247`	`+ //ignore`
`1244`	`1248`	`}`
	`1249`	`+ return result;`
`1245`	`1250`	`}`
`1246`	`1251`
`1247`	`1252`	`public Dictionary<string, object> ConvertToDictionaryObject(object localContainer)`
`@@ -1369,6 +1374,10 @@ public object[] ConvertToObjectArray(object localContainer)`
`1369`	`1374`	`return ret;`
`1370`	`1375`	`}`
`1371`	`1376`
	`1377`	`+ public static bool JsonFastCheck(string rawJson) {`
	`1378`	`+ var c = rawJson.TrimStart()[0];`
	`1379`	`+ return c == '[' \|\| c == '{';`
	`1380`	`+ }`
`1372`	`1381`	`private static object ConvertJTokenToObject(JToken token)`
`1373`	`1382`	`{`
`1374`	`1383`	`if (token == null)`
Original file line number	Diff line number	Diff line change
`@@ -1414,7 +1414,11 @@ private PNStatus GetStatusIfError<T>(RequestState<T> asyncRequestState, string j`
`1414`	`1414`	`else if (deserializeStatus.Count >= 1 && deserializeStatus.ContainsKey("error") && deserializeStatus.ContainsKey("status") && Int32.TryParse(deserializeStatus["status"].ToString(), out statusCode) && statusCode > 0)`
`1415`	`1415`	`{`
`1416`	`1416`	`string errorMessageJson = deserializeStatus["error"].ToString();`
`1417`		`- Dictionary<string, object> errorDic = jsonLib.DeserializeToDictionaryOfObject(errorMessageJson);`
	`1417`	`+ Dictionary<string, object> errorDic = null;`
	`1418`	`+ if (jsonLib.IsDictionaryCompatible(errorMessageJson, type))`
	`1419`	`+ {`
	`1420`	`+ errorDic = jsonLib.DeserializeToDictionaryOfObject(errorMessageJson);`
	`1421`	`+ }`
`1418`	`1422`	`if (errorDic != null && errorDic.Count > 0 && errorDic.ContainsKey("message")`
`1419`	`1423`	`&& statusCode != 200 && pubnubConfig.TryGetValue(PubnubInstance.InstanceId, out currentConfig))`
`1420`	`1424`	`{`
`@@ -1425,8 +1429,12 @@ private PNStatus GetStatusIfError<T>(RequestState<T> asyncRequestState, string j`
`1425`	`1429`	`}`
`1426`	`1430`	`else if (deserializeStatus.Count >= 1 && deserializeStatus.ContainsKey("status") && string.Equals(deserializeStatus["status"].ToString(), "error", StringComparison.OrdinalIgnoreCase) && deserializeStatus.ContainsKey("error"))`
`1427`	`1431`	`{`
	`1432`	`+ Dictionary<string, object> errorDic = null;`
`1428`	`1433`	`string errorMessageJson = deserializeStatus["error"].ToString();`
`1429`		`- Dictionary<string, object> errorDic = jsonLib.DeserializeToDictionaryOfObject(errorMessageJson);`
	`1434`	`+ if (jsonLib.IsDictionaryCompatible(errorMessageJson, type))`
	`1435`	`+ {`
	`1436`	`+ errorDic = jsonLib.DeserializeToDictionaryOfObject(errorMessageJson);`
	`1437`	`+ }`
`1430`	`1438`	`if (errorDic != null && errorDic.Count > 0 && errorDic.ContainsKey("code") && errorDic.ContainsKey("message"))`
`1431`	`1439`	`{`
`1432`	`1440`	`statusCode = PNStatusCodeHelper.GetHttpStatusCode(errorDic["code"].ToString());`
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ public async Task WhenIGrantATokenSpecifyingThosePermissions()`
`393`	`393`	`.ExecuteAsync();`
`394`	`394`	`grantResult = pamGrantResult.Result;`
`395`	`395`	`pnStatus = pamGrantResult.Status;`
`396`		`- if (pnStatus.Error)`
	`396`	`+ if (pnStatus != null && pnStatus.Error)`
`397`	`397`	`{`
`398`	`398`	`pnError = pn.JsonPluggableLibrary.DeserializeToObject<PubnubError>(pnStatus.ErrorData.Information);`
`399`	`399`	`}`
`@@ -421,7 +421,7 @@ public async Task WhenIAttemptToGrantATokenSpecifyingThosePermissions()`
`421`	`421`	`.ExecuteAsync();`
`422`	`422`	`grantResult = pamGrantResult.Result;`
`423`	`423`	`pnStatus = pamGrantResult.Status;`
`424`		`- if (pnStatus.Error)`
	`424`	`+ if (pnStatus != null && pnStatus.Error)`
`425`	`425`	`{`
`426`	`426`	`pnError = pn.JsonPluggableLibrary.DeserializeToObject<PubnubError>(pnStatus.ErrorData.Information);`
`427`	`427`	`}`