From d50b555ef4633b9a8eb0ad83a4dd75a6d2ce9c9f Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 2 Mar 2026 01:58:13 +0900 Subject: [PATCH 1/2] Fix "Invalid event" error when server sent heartbeats --- mastodon/streaming.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mastodon/streaming.py b/mastodon/streaming.py index e9bf799..0bb79fe 100644 --- a/mastodon/streaming.py +++ b/mastodon/streaming.py @@ -185,6 +185,9 @@ def _parse_line(self, line, event): return event def _dispatch(self, event): + if not event: + return + try: name = event['event'] data = event['data'] From 3962d2ef73495720fb7db519a1bdbb133ff330d5 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 2 Mar 2026 11:19:44 +0900 Subject: [PATCH 2/2] Add test for empty event after heartbeat --- tests/test_streaming.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/test_streaming.py b/tests/test_streaming.py index 0f66519..b793ec8 100644 --- a/tests/test_streaming.py +++ b/tests/test_streaming.py @@ -115,6 +115,14 @@ def test_heartbeat(): assert listener.heartbeats == 2 + +def test_heartbeat_empty_line(): + """Empty event after heartbeat should not raise an error.""" + listener = Listener() + # Heartbeat followed by empty line triggers _dispatch with empty event + listener.handle_stream_([':thump', '']) + assert listener.heartbeats == 1 + def test_status(): listener = Listener() listener.handle_stream_([