Update signature to include Push in returned task

supabase-community · May 22, 2024 · 85249b0 · 85249b0
1 parent 598643b
commit 85249b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Realtime/Interfaces/IRealtimePresence.cs b/Realtime/Interfaces/IRealtimePresence.cs
@@ -1,6 +1,7 @@
 using Supabase.Realtime.Socket;
 using System;
 using System.Threading.Tasks;
+using Supabase.Realtime.Channel;
 using Supabase.Realtime.Models;
 using static Supabase.Realtime.Constants;
 
@@ -40,14 +41,14 @@ public enum EventType
     /// </summary>
     /// <param name="payload"></param>
     /// <param name="timeoutMs"></param>
-    Task Track(object? payload, int timeoutMs = DefaultTimeout);
+    Task<Push> Track(object? payload, int timeoutMs = DefaultTimeout);
 
     /// <summary>
     /// Untracks a client
     /// </summary>
     /// <param name="payload"></param>
     /// <param name="timeoutMs"></param>
-    Task Untrack();
+    Task<Push> Untrack();
 
     /// <summary>
     /// Add a presence event handler

diff --git a/Realtime/RealtimePresence.cs b/Realtime/RealtimePresence.cs
@@ -152,7 +152,7 @@ public void TriggerDiff(SocketResponse response)
     /// </summary>
     /// <param name="payload"></param>
     /// <param name="timeoutMs"></param>
-    public Task Track(object? payload, int timeoutMs = DefaultTimeout)
+    public Task<Push> Track(object? payload, int timeoutMs = DefaultTimeout)
     {
         var eventName = Core.Helpers.GetMappedToAttr(ChannelEventName.Presence).Mapping;
         var push = new Push(_channel.Socket, _channel, eventName, "track",
@@ -169,7 +169,9 @@ void Handler(IRealtimePush<RealtimeChannel, SocketResponse> chanel, SocketRespon
 
         push.OnTimeout += (sender, args) =>
         {
-            tcs.SetException(new RealtimeException(args.ToString()) { Reason = FailureHint.Reason.PushTimeout });
+            if (sender is Push p)
+                tcs.SetException(new RealtimeException($"Failed to send push [{p.Ref}])")
+                    { Reason = FailureHint.Reason.PushTimeout });
         };
 
         _channel.Enqueue(push);
@@ -180,7 +182,7 @@ void Handler(IRealtimePush<RealtimeChannel, SocketResponse> chanel, SocketRespon
     /// <summary>
     /// Untracks an event.
     /// </summary>
-    public Task Untrack()
+    public Task<Push> Untrack()
     {
         var eventName = Core.Helpers.GetMappedToAttr(ChannelEventName.Presence).Mapping;
         var push = new Push(_channel.Socket, _channel, eventName, "untrack",
@@ -197,8 +199,9 @@ void Handler(IRealtimePush<RealtimeChannel, SocketResponse> chanel, SocketRespon
 
         push.OnTimeout += (sender, args) =>
         {
-            tcs.TrySetException(new RealtimeException((sender as Push)!.Ref)
-                { Reason = FailureHint.Reason.PushTimeout });
+            if (sender is Push p)
+                tcs.TrySetException(new RealtimeException($"Failed to send push [{p.Ref}])")
+                    { Reason = FailureHint.Reason.PushTimeout });
         };
 
         _channel.Enqueue(push);