Subscription bug fixes

Author: theSlyest

Parse/Infrastructure/Execution/TextWebSocketClient.cs

@@ -54,12 +54,9 @@ public async Task OpenAsync(string serverUri, CancellationToken cancellationToke
     {
         _webSocket ??= new ClientWebSocket();
 
-        Debug.WriteLine($"Status: {_webSocket.State.ToString()}");
         if (_webSocket.State != WebSocketState.Open && _webSocket.State != WebSocketState.Connecting)
         {
-            Debug.WriteLine($"Connecting to: {serverUri}");
             await _webSocket.ConnectAsync(new Uri(serverUri), cancellationToken);
-            Debug.WriteLine($"Status: {_webSocket.State.ToString()}");
             StartListening(cancellationToken);
         }
     }
@@ -141,11 +138,9 @@ private void StartListening(CancellationToken cancellationToken)
     /// </returns>
     public async Task SendAsync(string message, CancellationToken cancellationToken = default)
     {
-        Debug.WriteLine($"Sending: {message}");
         if (_webSocket is not null && _webSocket.State == WebSocketState.Open)
         {
             await _webSocket.SendAsync(Encoding.UTF8.GetBytes(message), WebSocketMessageType.Text, true, cancellationToken);
-            Console.WriteLine("Sent");
         }
     }
 }

Parse/Platform/LiveQueries/ParseLiveQuery.cs

@@ -21,7 +21,7 @@ public class ParseLiveQuery<T> where T : ParseObject
     /// <summary>
     /// Serialized <see langword="where"/> clauses.
     /// </summary>
-    string Filters { get; }
+    IDictionary<string, object> Filters { get; }
 
     /// <summary>
     /// Serialized key selections.
@@ -39,11 +39,11 @@ public class ParseLiveQuery<T> where T : ParseObject
 
     private int RequestId = 0;
 
-    public ParseLiveQuery(IServiceHub serviceHub, string className, object filters, IEnumerable<string> selectedKeys = null, IEnumerable<string> watchedKeys = null)
+    public ParseLiveQuery(IServiceHub serviceHub, string className, IDictionary<string, object> filters, IEnumerable<string> selectedKeys = null, IEnumerable<string> watchedKeys = null)
     {
         Services = serviceHub;
         ClassName = className;
-        Filters = JsonUtilities.Encode(filters);
+        Filters = filters;
 
         if (selectedKeys is not null)
         {
@@ -91,17 +91,15 @@ internal ParseLiveQuery(ParseLiveQuery<T> source, IEnumerable<string> watchedKey
     /// <returns>A new query with the additional constraint.</returns>
     public ParseLiveQuery<T> Watch(string watch) => new(this, new List<string> { watch });
 
-    internal IDictionary<string, string> BuildParameters(bool includeClassName = false)
+    internal IDictionary<string, object> BuildParameters()
     {
-        Dictionary<string, string> result = new Dictionary<string, string>();
-        if (Filters != null)
-            result["where"] = Filters;
+        Dictionary<string, object> result = new Dictionary<string, object>();
+        result["className"] = ClassName;
+        result["where"] = Filters;
         if (KeySelections != null)
-            result["keys"] = String.Join(",", KeySelections.ToArray());
+            result["keys"] = KeySelections.ToArray();
         if (KeyWatchers != null)
-            result["watch"] = String.Join(",", KeyWatchers.ToArray());
-        if (includeClassName)
-            result["className"] = ClassName;
+            result["watch"] = KeyWatchers.ToArray();
         return result;
     }
 

Parse/Platform/LiveQueries/ParseLiveQueryController.cs

@@ -98,7 +98,6 @@ public enum ParseLiveQueryState
     /// This constructor is used to initialize a new instance of the <see cref="ParseLiveQueryController"/> class
     public ParseLiveQueryController(IWebSocketClient webSocketClient)
     {
-        Debug.WriteLine("ParseLiveQueryController initialized.");
         WebSocketClient = webSocketClient;
         State = ParseLiveQueryState.Closed;
     }
@@ -227,16 +226,19 @@ private void ProcessMessage(IDictionary<string, object> message)
         }
     }
 
-    private IDictionary<string, object> AppendSessionToken(IDictionary<string, object> message)
+    private async Task<IDictionary<string, object>> AppendSessionToken(IDictionary<string, object> message)
     {
-        return message.Concat(new Dictionary<string, object> {
-            { "sessionToken", ParseClient.Instance.Services.GetCurrentSessionToken() }
-        }).ToDictionary();
+        string sessionToken = await ParseClient.Instance.Services.GetCurrentSessionToken();
+        return sessionToken is null
+            ? message
+            : message.Concat(new Dictionary<string, object> {
+                { "sessionToken", await ParseClient.Instance.Services.GetCurrentSessionToken() }
+            }).ToDictionary();
     }
 
     private async Task SendMessage(IDictionary<string, object> message, CancellationToken cancellationToken)
     {
-        await WebSocketClient.SendAsync(JsonUtilities.Encode(AppendSessionToken(message)), cancellationToken);
+        await WebSocketClient.SendAsync(JsonUtilities.Encode(message), cancellationToken);
     }
 
     private async Task OpenAsync(CancellationToken cancellationToken = default)
@@ -283,15 +285,15 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default)
                 { "applicationId", ParseClient.Instance.Services.LiveQueryServerConnectionData.ApplicationID },
                 { "windowsKey", ParseClient.Instance.Services.LiveQueryServerConnectionData.Key }
             };
-            await SendMessage(message, cancellationToken);
+            await SendMessage(await AppendSessionToken(message), cancellationToken);
             ConnectionSignal = new CancellationTokenSource();
             bool signalReceived = ConnectionSignal.Token.WaitHandle.WaitOne(TimeOut);
-            State = ParseLiveQueryState.Connected;
-            ConnectionSignal.Dispose();
             if (!signalReceived)
             {
                 throw new TimeoutException();
             }
+            State = ParseLiveQueryState.Connected;
+            ConnectionSignal.Dispose();
         }
         else if (State == ParseLiveQueryState.Connecting)
         {
@@ -339,9 +341,9 @@ public async Task<IParseLiveQuerySubscription> SubscribeAsync<T>(ParseLiveQuery<
         {
             { "op", "subscribe" },
             { "requestId", requestId },
-            { "query", liveQuery.BuildParameters(true) }
+            { "query", liveQuery.BuildParameters() }
         };
-        await SendMessage(message, cancellationToken);
+        await SendMessage(await AppendSessionToken(message), cancellationToken);
         CancellationTokenSource completionSignal = new CancellationTokenSource();
         SubscriptionSignals.Add(requestId, completionSignal);
         bool signalReceived = completionSignal.Token.WaitHandle.WaitOne(TimeOut);
@@ -381,9 +383,9 @@ public async Task UpdateSubscriptionAsync<T>(ParseLiveQuery<T> liveQuery, int re
         {
             { "op", "update" },
             { "requestId", requestId },
-            { "query", liveQuery.BuildParameters(true) }
+            { "query", liveQuery.BuildParameters() }
         };
-        await SendMessage(message, cancellationToken);
+        await SendMessage(await AppendSessionToken(message), cancellationToken);
     }
 
     /// <summary>

Parse/Platform/Queries/ParseQuery.cs

@@ -915,6 +915,6 @@ public override int GetHashCode()
     public ParseLiveQuery<T> GetLive()
     {
         IDictionary<string, object> paramsDict = BuildParameters();
-        return new ParseLiveQuery<T>(Services, ClassName, paramsDict["where"], paramsDict.TryGetValue("keys", out object selectedKey) ? selectedKey as IEnumerable<string> : null);
+        return new ParseLiveQuery<T>(Services, ClassName, paramsDict["where"] as IDictionary<string, object>, KeySelections);
     }
 }

Parse/Platform/Queries/ParseQueryController.cs

@@ -24,7 +24,6 @@ internal class ParseQueryController : IParseQueryController
 
     public ParseQueryController(IParseCommandRunner commandRunner, IParseDataDecoder decoder)
     {
-        Debug.WriteLine("ParseQueryController initialized");
         CommandRunner = commandRunner;
         Decoder = decoder;
     }