Updated event argument types

theSlyest · theSlyest · commit 40044a244418 · 2025-06-23T16:38:46.000Z
diff --git a/Parse/Abstractions/Platform/LiveQueries/IParseLiveQuerySubscription.cs b/Parse/Abstractions/Platform/LiveQueries/IParseLiveQuerySubscription.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Platform.Objects;
 using Parse.Platform.LiveQueries;
 
 namespace Parse.Abstractions.Platform.LiveQueries;
@@ -68,4 +68,10 @@ public interface IParseLiveQuerySubscription
     /// <param name="cancellationToken">A token to monitor for cancellation requests. If triggered, the cancellation process will halt.</param>
     /// <returns>A task that represents the asynchronous operation of canceling the subscription.</returns>
     Task CancelAsync(CancellationToken cancellationToken = default);
+
+    internal void OnCreate(IObjectState objectState);
+    internal void OnEnter(IObjectState objectState, IObjectState originalState);
+    internal void OnUpdate(IObjectState objectState, IObjectState originalState);
+    internal void OnLeave(IObjectState objectState, IObjectState originalState);
+    internal void OnDelete(IObjectState objectState);
 }
diff --git a/Parse/Infrastructure/LateInitializedMutableServiceHub.cs b/Parse/Infrastructure/LateInitializedMutableServiceHub.cs
@@ -110,7 +110,7 @@ public IParseQueryController QueryController
 
     public IParseLiveQueryController LiveQueryController
     {
-        get => LateInitializer.GetValue<IParseLiveQueryController>(() => new ParseLiveQueryController(WebSocketClient));
+        get => LateInitializer.GetValue<IParseLiveQueryController>(() => new ParseLiveQueryController(WebSocketClient, Decoder));
         set => LateInitializer.SetValue(value);
     }
 
diff --git a/Parse/Infrastructure/MutableServiceHub.cs b/Parse/Infrastructure/MutableServiceHub.cs
@@ -97,7 +97,7 @@ public MutableServiceHub SetDefaults(IServerConnectionData connectionData = defa
         FileController ??= new ParseFileController(CommandRunner);
         ObjectController ??= new ParseObjectController(CommandRunner, Decoder, ServerConnectionData);
         QueryController ??= new ParseQueryController(CommandRunner, Decoder);
-        LiveQueryController ??= new ParseLiveQueryController(WebSocketClient);
+        LiveQueryController ??= new ParseLiveQueryController(WebSocketClient, Decoder);
         SessionController ??= new ParseSessionController(CommandRunner, Decoder);
         UserController ??= new ParseUserController(CommandRunner, Decoder);
         CurrentUserController ??= new ParseCurrentUserController(CacheController, ClassController, Decoder);
diff --git a/Parse/Infrastructure/ServiceHub.cs b/Parse/Infrastructure/ServiceHub.cs
@@ -59,7 +59,7 @@ public class ServiceHub : IServiceHub
     public IParseFileController FileController => LateInitializer.GetValue(() => new ParseFileController(CommandRunner));
     public IParseObjectController ObjectController => LateInitializer.GetValue(() => new ParseObjectController(CommandRunner, Decoder, ServerConnectionData));
     public IParseQueryController QueryController => LateInitializer.GetValue(() => new ParseQueryController(CommandRunner, Decoder));
-    public IParseLiveQueryController LiveQueryController => LateInitializer.GetValue(() => new ParseLiveQueryController(WebSocketClient));
+    public IParseLiveQueryController LiveQueryController => LateInitializer.GetValue(() => new ParseLiveQueryController(WebSocketClient, Decoder));
     public IParseSessionController SessionController => LateInitializer.GetValue(() => new ParseSessionController(CommandRunner, Decoder));
     public IParseUserController UserController => LateInitializer.GetValue(() => new ParseUserController(CommandRunner, Decoder));
     public IParseCurrentUserController CurrentUserController => LateInitializer.GetValue(() => new ParseCurrentUserController(CacheController, ClassController, Decoder));
diff --git a/Parse/Platform/LiveQueries/ParseLiveQueryController.cs b/Parse/Platform/LiveQueries/ParseLiveQueryController.cs
@@ -4,8 +4,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Data;
 using Parse.Abstractions.Infrastructure.Execution;
 using Parse.Abstractions.Platform.LiveQueries;
+using Parse.Infrastructure.Data;
 using Parse.Infrastructure.Utilities;
 
 namespace Parse.Platform.LiveQueries;
@@ -16,6 +18,7 @@ namespace Parse.Platform.LiveQueries;
 /// </summary>
 public class ParseLiveQueryController : IParseLiveQueryController
 {
+    private IParseDataDecoder Decoder { get; }
     private IWebSocketClient WebSocketClient { get; }
 
     private int LastRequestId { get; set; } = 0;
@@ -62,7 +65,19 @@ public enum ParseLiveQueryState
         /// has been terminated, and no data updates are being received.
         /// </summary>
         Closed,
+
+        /// <summary>
+        /// Represents the state where the live query connection is in the process of being established.
+        /// This indicates that the client is actively attempting to connect to the live query server,
+        /// but the connection has not yet been fully established.
+        /// </summary>
         Connecting,
+
+        /// <summary>
+        /// Represents the state where the live query connection has been successfully established.
+        /// This state indicates that the client is actively connected to the Parse LiveQuery server
+        /// and is receiving real-time data updates.
+        /// </summary>
         Connected
     }
 
@@ -79,34 +94,33 @@ public enum ParseLiveQueryState
     /// </remarks>
     public ParseLiveQueryState State { get; private set; }
 
-    HashSet<int> SubscriptionIds { get; } = new HashSet<int> { };
-
     CancellationTokenSource ConnectionSignal { get; set; }
     private IDictionary<int, CancellationTokenSource> SubscriptionSignals { get; } = new Dictionary<int, CancellationTokenSource> { };
     private IDictionary<int, CancellationTokenSource> UnsubscriptionSignals { get; } = new Dictionary<int, CancellationTokenSource> { };
-    private IDictionary<int, CancellationTokenSource> SubscriptionUpdateSignals { get; } = new Dictionary<int, CancellationTokenSource> { };
-
-    private IDictionary<int, ParseLiveQuerySubscription> Subscriptions { get; set; } = new Dictionary<int, ParseLiveQuerySubscription> { };
+    private IDictionary<int, IParseLiveQuerySubscription> Subscriptions { get; set; } = new Dictionary<int, IParseLiveQuerySubscription> { };
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ParseLiveQueryController"/> class.
     /// </summary>
     /// <param name="webSocketClient">
     /// The <see cref="IWebSocketClient"/> implementation to use for the live query connection.
     /// </param>
+    /// <param name="decoder"></param>
     /// <remarks>
     /// This constructor is used to initialize a new instance of the <see cref="ParseLiveQueryController"/> class
-    public ParseLiveQueryController(IWebSocketClient webSocketClient)
+    /// </remarks>
+    public ParseLiveQueryController(IWebSocketClient webSocketClient, IParseDataDecoder decoder)
     {
         WebSocketClient = webSocketClient;
         State = ParseLiveQueryState.Closed;
+        Decoder = decoder;
     }
 
     private void ProcessMessage(IDictionary<string, object> message)
     {
         int requestId;
         string clientId;
-        ParseLiveQuerySubscription subscription;
+        IParseLiveQuerySubscription subscription;
         switch (message["op"] as string)
         {
             case "connected":
@@ -120,7 +134,6 @@ private void ProcessMessage(IDictionary<string, object> message)
                 if (clientId == ClientId)
                 {
                     requestId = Convert.ToInt32(message["requestId"]);
-                    SubscriptionIds.Add(requestId);
                     if (SubscriptionSignals.TryGetValue(requestId, out CancellationTokenSource subscriptionSignal))
                     {
                         subscriptionSignal?.Cancel();
@@ -133,7 +146,6 @@ private void ProcessMessage(IDictionary<string, object> message)
                 if (clientId == ClientId)
                 {
                     requestId = Convert.ToInt32(message["requestId"]);
-                    SubscriptionIds.Remove(requestId);
                     if (UnsubscriptionSignals.TryGetValue(requestId, out CancellationTokenSource unsubscriptionSignal))
                     {
                         unsubscriptionSignal?.Cancel();
@@ -156,8 +168,7 @@ private void ProcessMessage(IDictionary<string, object> message)
                     requestId = Convert.ToInt32(message["requestId"]);
                     if (Subscriptions.TryGetValue(requestId, out subscription))
                     {
-                        ParseLiveQueryEventArgs args = new ParseLiveQueryEventArgs(message["object"]);
-                        subscription.OnCreate(args);
+                        subscription.OnCreate(ParseObjectCoder.Instance.Decode(message["object"] as IDictionary<string, object>, Decoder, ParseClient.Instance.Services));
                     }
                 }
                 break;
@@ -169,10 +180,9 @@ private void ProcessMessage(IDictionary<string, object> message)
                     requestId = Convert.ToInt32(message["requestId"]);
                     if (Subscriptions.TryGetValue(requestId, out subscription))
                     {
-                        ParseLiveQueryEventArgs args = new ParseLiveQueryEventArgs(
-                            message["object"],
-                            message["original"]);
-                        subscription.OnEnter(args);
+                        subscription.OnEnter(
+                            ParseObjectCoder.Instance.Decode(message["object"] as IDictionary<string, object>, Decoder, ParseClient.Instance.Services),
+                            ParseObjectCoder.Instance.Decode(message["original"] as IDictionary<string, object>, Decoder, ParseClient.Instance.Services));
                     }
                 }
                 break;
@@ -184,10 +194,9 @@ private void ProcessMessage(IDictionary<string, object> message)
                     requestId = Convert.ToInt32(message["requestId"]);
                     if (Subscriptions.TryGetValue(requestId, out subscription))
                     {
-                        ParseLiveQueryEventArgs args = new ParseLiveQueryEventArgs(
-                            message["object"],
-                            message["original"]);
-                        subscription.OnUpdate(args);
+                        subscription.OnUpdate(
+                            ParseObjectCoder.Instance.Decode(message["object"] as IDictionary<string, object>, Decoder, ParseClient.Instance.Services),
+                            ParseObjectCoder.Instance.Decode(message["original"] as IDictionary<string, object>, Decoder, ParseClient.Instance.Services));
                     }
                 }
                 break;
@@ -199,10 +208,9 @@ private void ProcessMessage(IDictionary<string, object> message)
                     requestId = Convert.ToInt32(message["requestId"]);
                     if (Subscriptions.TryGetValue(requestId, out subscription))
                     {
-                        ParseLiveQueryEventArgs args = new ParseLiveQueryEventArgs(
-                            message["object"],
-                            message["original"]);
-                        subscription.OnLeave(args);
+                        subscription.OnLeave(
+                            ParseObjectCoder.Instance.Decode(message["object"] as IDictionary<string, object>, Decoder, ParseClient.Instance.Services),
+                            ParseObjectCoder.Instance.Decode(message["original"] as IDictionary<string, object>, Decoder, ParseClient.Instance.Services));
                     }
                 }
                 break;
@@ -214,8 +222,7 @@ private void ProcessMessage(IDictionary<string, object> message)
                     requestId = Convert.ToInt32(message["requestId"]);
                     if (Subscriptions.TryGetValue(requestId, out subscription))
                     {
-                        ParseLiveQueryEventArgs args = new ParseLiveQueryEventArgs(message["object"]);
-                        subscription.OnDelete(args);
+                        subscription.OnDelete(ParseObjectCoder.Instance.Decode(message["object"] as IDictionary<string, object>, Decoder, ParseClient.Instance.Services));
                     }
                 }
                 break;
@@ -351,7 +358,7 @@ public async Task<IParseLiveQuerySubscription> SubscribeAsync<T>(ParseLiveQuery<
         completionSignal.Dispose();
         if (signalReceived)
         {
-            ParseLiveQuerySubscription subscription = new ParseLiveQuerySubscription(liveQuery.Services, requestId);
+            ParseLiveQuerySubscription<T> subscription = new ParseLiveQuerySubscription<T>(liveQuery.Services, liveQuery.ClassName, requestId);
             Subscriptions.Add(requestId, subscription);
             return subscription;
         }
@@ -386,6 +393,15 @@ public async Task UpdateSubscriptionAsync<T>(ParseLiveQuery<T> liveQuery, int re
             { "query", liveQuery.BuildParameters() }
         };
         await SendMessage(await AppendSessionToken(message), cancellationToken);
+        CancellationTokenSource completionSignal = new CancellationTokenSource();
+        SubscriptionSignals.Add(requestId, completionSignal);
+        bool signalReceived = completionSignal.Token.WaitHandle.WaitOne(TimeOut);
+        SubscriptionSignals.Remove(requestId);
+        completionSignal.Dispose();
+        if (!signalReceived)
+        {
+            throw new TimeoutException();
+        }
     }
 
     /// <summary>
@@ -437,7 +453,6 @@ public async Task CloseAsync(CancellationToken cancellationToken = default)
         State = ParseLiveQueryState.Closed;
         SubscriptionSignals.Clear();
         UnsubscriptionSignals.Clear();
-        SubscriptionUpdateSignals.Clear();
         Subscriptions.Clear();
     }
 }
diff --git a/Parse/Platform/LiveQueries/ParseLiveQueryEventArgs.cs b/Parse/Platform/LiveQueries/ParseLiveQueryEventArgs.cs
@@ -10,30 +10,29 @@ namespace Parse.Platform.LiveQueries;
 public class ParseLiveQueryEventArgs : EventArgs
 {
     /// <summary>
-    /// Event arguments for events triggered by Parse's Live Query service.
+    /// Represents the event arguments provided to Live Query event handlers in the Parse platform.
+    /// This class provides information about the current and original state of the Parse object
+    /// involved in the Live Query operation.
     /// </summary>
-    /// <remarks>
-    /// This class handles the encapsulation of event-related details for Live Query operations,
-    /// such as the current Parse object state and the original state before updates.
-    /// </remarks>
-    internal ParseLiveQueryEventArgs(object current, object original = null)
+    internal ParseLiveQueryEventArgs(ParseObject current, ParseObject original = null)
     {
         Object = current;
         Original = original;
     }
 
     /// <summary>
-    /// Gets the associated object involved in the live query event.
-    /// This property provides the current state of the Parse object
-    /// that triggered the event. The object may vary depending on the live query event
-    /// type, such as create, update, enter, or leave.
+    /// Gets the current state of the Parse object associated with the live query event.
+    /// This property provides the details of the Parse object as it existed at the time
+    /// the event was triggered, reflecting any changes made during operations such as
+    /// an update or creation.
     /// </summary>
-    public object Object { get; private set; }
+    public ParseObject Object { get; private set; }
 
     /// <summary>
-    /// Gets the original state of the Parse object before the live query event occurred.
-    /// This property holds the state of the object as it was prior to the event that
-    /// triggered the live query event, such as an update or leave operation.
+    /// Gets the state of the Parse object before the live query event was triggered.
+    /// This property represents the original data of the Parse object prior to any updates,
+    /// providing a snapshot of its previous state for comparison purposes during events
+    /// such as updates or deletes.
     /// </summary>
-    public object Original { get; private set; }
+    public ParseObject Original { get; private set; }
 }
diff --git a/Parse/Platform/LiveQueries/ParseLiveQuerySubscription.cs b/Parse/Platform/LiveQueries/ParseLiveQuerySubscription.cs

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public IParseQueryController QueryController`
`110`	`110`
`111`	`111`	`public IParseLiveQueryController LiveQueryController`
`112`	`112`	`{`
`113`		`- get => LateInitializer.GetValue<IParseLiveQueryController>(() => new ParseLiveQueryController(WebSocketClient));`
	`113`	`+ get => LateInitializer.GetValue<IParseLiveQueryController>(() => new ParseLiveQueryController(WebSocketClient, Decoder));`
`114`	`114`	`set => LateInitializer.SetValue(value);`
`115`	`115`	`}`
`116`	`116`