From c4f8bcc60725668642b6ef082ccb8b9bc20bdf48 Mon Sep 17 00:00:00 2001 From: Bruno Gale Date: Fri, 20 Nov 2026 12:39:09 +0100 Subject: [PATCH] fix(realtime): do not drop a message that arrives before the first heartbeat --- .../Socket/SocketHandlerDispatchTests.cs | 10 ++++++++++ packages/Realtime/Realtime/RealtimeSocket.cs | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/Realtime/Realtime.Tests/Socket/SocketHandlerDispatchTests.cs b/packages/Realtime/Realtime.Tests/Socket/SocketHandlerDispatchTests.cs index 4445f6ee..0b7a2a68 100644 --- a/packages/Realtime/Realtime.Tests/Socket/SocketHandlerDispatchTests.cs +++ b/packages/Realtime/Realtime.Tests/Socket/SocketHandlerDispatchTests.cs @@ -195,6 +195,16 @@ public async Task MessageHandler_ShouldReceiveTheNextFrame_GivenOneThatIsNotJson this.calls.Should().Be(1, "a frame the socket cannot decode must not stop the next one"); } + [TestMethod] + public async Task MessageHandler_ShouldReceiveTheFrame_GivenNoRefBeforeTheFirstHeartbeat() + { + var server = new FakeWebsocketClient(); + this.SocketOver(server).AddMessageReceivedHandler((_, _) => this.calls++); + await this.socket.Connect(); + server.Receive("""{"topic":"room","event":"broadcast","ref":null,"payload":{}}"""); + this.calls.Should().Be(1, "a frame without a ref is not the reply to a heartbeat"); + } + [TestMethod] public async Task StateHandler_ShouldNotStopTheNextHandler_GivenItThrows() { diff --git a/packages/Realtime/Realtime/RealtimeSocket.cs b/packages/Realtime/Realtime/RealtimeSocket.cs index 787128df..54f5cc94 100644 --- a/packages/Realtime/Realtime/RealtimeSocket.cs +++ b/packages/Realtime/Realtime/RealtimeSocket.cs @@ -496,7 +496,7 @@ private void HandleSocketMessage(ResponseMessage args) Debugger.Instance.Log(this, $"Socket Message Received:\n\t{args.Text}"); // Send Separate heartbeat event - if (decoded!.Ref == this.pendingHeartbeatRef) + if (decoded!.Ref != null && decoded.Ref == this.pendingHeartbeatRef) { this.hasPendingHeartbeat = false; var status = decoded.Payload?.Status == PhoenixStatusOk ? HeartbeatStatus.Ok : HeartbeatStatus.Error;