Redesign websocket by MartinHjelmare · Pull Request #401 · Danielhiversen/pyTibber

MartinHjelmare · 2026-04-03T19:05:43Z

Refactor the websocket connection in the realtime module.
Separate the TibberHome feature from the realtime module and make the realtime module unaware of TibberHome. The TibberHome is aware of the realtime feature but not the other way around. The realtime module should focus on the websocket connection and not handle specifics of the Tibber data features.
Remove the custom watchdog and replace it with the builtin keep alive features of the gql websocket connection.
```
keep_alive_timeout=90,
ping_interval=30,
pong_timeout=20,
```
If there's a keep alive / ping-pong timeout the websocket connection will be closed.
Use the reconnecting feature of the gql client to automatically reconnect in the background when the connection is closed.
Configure reconnect back-off and jitter via the tenacity library according to the Tibber developer docs recommendations. The only thing we don't follow yet is to handle an authentication failure specifically. This can be added later. Note that we don't currently on the master branch handle an authentication failure specifically in the websocket connection, so there's no regression in that sense.
Make sure we still reconnect the websocket connection after a token refresh.
Add tests of the changed code.
I've made some additional changes like making a base exception for the library that all exceptions inherit and added some debug logging that helped me when I've been testing my changes.

This is a big PR. Let me know what I can do to help with the review.

MartinHjelmare · 2026-04-03T19:12:11Z

+        self,
+        callback: Callable[..., Any],
+        *,
+        on_error: Callable[[Exception], None] | None = None,


The on_error callback will allow users of the library to react on errors with the subscription, like changing the state of instances that rely on the subscription when there's an error.

MartinHjelmare · 2026-04-03T19:13:30Z

-                and live_data.get("power") is None
-            ):
-                live_data["power"] = 0
+    def _add_extra_data(self, data: dict[str, Any]) -> dict[str, Any]:


I've broken out the extra data addition to a helper method to keep things better separated. I've not changed how or what extra data is added.

I recommend to review the PR with whitespace changes hidden, to make it clear that this part wasn't changed.

MartinHjelmare · 2026-04-03T19:14:48Z

+KEEP_ALIVE_TIMEOUT = 90
 LOCK_CONNECT = asyncio.Lock()
+MIN_RECONNECT_INTERVAL = 1
+MAX_RECONNECT_INTERVAL = 60
+PING_INTERVAL = 30
+PONG_TIMEOUT = 20


Here are the keep alive and reconnect settings.

MartinHjelmare · 2026-04-03T19:16:50Z

+                raise WebsocketReconnectedError("Websocket reconnected") from err
+            raise WebsocketTransportError(err) from err
+
+    async def set_subscription_endpoint(self, url: str) -> None:


We now reconnect if the subscription endpoint changes. This wasn't done before. That's why I've changed to a coroutine function for setting the endpoint.

+    with pytest.raises(WebsocketReconnectedError):
+        await anext(tibber_rt.subscribe(MagicMock(), on_error=None))
+
+    await unblock_task


Danielhiversen · 2026-04-04T06:25:54Z

Remove the custom watchdog and replace it with the builtin keep alive features of the gql websocket connection.

That will only reconnect if we dont get an answer to the ping?
That has not always been enough. It can happen that websocket connection is alive, but we dont receive any data from the Tibber pulse.

MartinHjelmare · 2026-04-04T10:41:51Z

Ok, I didn't know that. Is it enough to resubscribe the home if the Pulse is not responding?

I think we can have a simple timer task per home that checks if it's more than 60 seconds since the last message, and resubscribes in that case, otherwise sleeps another 60 seconds.

We use a single websocket connection that can have multiple home subscriptions running at the same time.

Danielhiversen · 2026-04-05T04:56:01Z

I think that should be fine

Danielhiversen · 2026-04-09T04:43:57Z

+    ) -> None:
+        """Subscribe to Tibber."""
+        try:
+            async for _data in self._tibber_control.realtime.subscribe(


Suggested change

async for _data in self._tibber_control.realtime.subscribe(

self._last_rt_data_received = time.time()

async for _data in self._tibber_control.realtime.subscribe(

Otherwise, I think we will never reconnect if we dont get the first data?
(Then we should rename _last_rt_data_received to something like _rt_last_activity ?)

I think we can adjust the None check in _rt_subscription_timeout instead to achieve the same thing. 👍

MartinHjelmare · 2026-04-17T22:29:11Z

+        if not (data := await self._tibber_control.execute(REAL_TIME_CONSUMPTION_ENABLED % self._home_id)):
+            _LOGGER.error("Could not get the data.")
+            return
+        self.info["viewer"]["home"]["features"]["realTimeConsumptionEnabled"] = data["viewer"]["home"]["features"][


This is fragile as it needs the info attribute to already been set with the data structure. I need to improve this.

Redesign websocket

0f5fc7d

MartinHjelmare commented Apr 3, 2026

View reviewed changes

MartinHjelmare mentioned this pull request Apr 3, 2026

Change handling of "stale" data. #400

Open

github-advanced-security AI found potential problems Apr 4, 2026

View reviewed changes

Comment thread test/test_realtime.py

with pytest.raises(WebsocketReconnectedError):

await anext(tibber_rt.subscribe(MagicMock(), on_error=None))

await unblock_task

Add home rt watchdog

bf7313a

MartinHjelmare marked this pull request as draft April 5, 2026 19:46

Odatas mentioned this pull request Apr 6, 2026

fix(realtime): fix watchdog reconnect using stale websocket transport #402

Open

3 tasks

MartinHjelmare added 2 commits April 8, 2026 10:22

Log error when connection closed waiting for reconnect

7163035

Schedule resubscribe instead of awaiting it

035cd85

Danielhiversen reviewed Apr 9, 2026

View reviewed changes

dns13 mentioned this pull request Apr 12, 2026

Still problem with Tibber with 2026.4.2 home-assistant/core#168007

Open

MartinHjelmare added 11 commits April 17, 2026 16:58

Handle missing first data in _last_rt_data_received

82c930d

Simplify home subscription method parameters

3b834d4

Always set subscription url and check realtime status before subscribing

521952d

Minimize realtime consumption enabled query

e29f982

Reconnect websocket on subscription timeout according to guide

9f1316e

Add callback check back

97ed62c

Fix test_rt_subscribe_on_error_called_on_exception

8b85c35

Wait for http calls in tests

dda72b5

Merge branch 'master' into redesign

964c32d

Wait some random time before resubscribing

d98513d

Handle connect timeout correctly

baa999e

MartinHjelmare commented Apr 17, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Redesign websocket#401

Redesign websocket#401
MartinHjelmare wants to merge 15 commits intoDanielhiversen:masterfrom
MartinHjelmare:redesign

MartinHjelmare commented Apr 3, 2026 •

edited

Loading

Uh oh!

MartinHjelmare Apr 3, 2026

Uh oh!

MartinHjelmare Apr 3, 2026 •

edited

Loading

Uh oh!

MartinHjelmare Apr 3, 2026

Uh oh!

MartinHjelmare Apr 3, 2026

Uh oh!

Danielhiversen commented Apr 4, 2026

Uh oh!

MartinHjelmare commented Apr 4, 2026

Uh oh!

Danielhiversen commented Apr 5, 2026

Uh oh!

Danielhiversen Apr 9, 2026

Uh oh!

MartinHjelmare Apr 17, 2026

Uh oh!

MartinHjelmare Apr 17, 2026

Uh oh!

MartinHjelmare Apr 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	async for _data in self._tibber_control.realtime.subscribe(
	self._last_rt_data_received = time.time()
	async for _data in self._tibber_control.realtime.subscribe(

Uh oh!

Conversation

MartinHjelmare commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MartinHjelmare Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

MartinHjelmare Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MartinHjelmare Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

MartinHjelmare Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

Danielhiversen commented Apr 4, 2026

Uh oh!

MartinHjelmare commented Apr 4, 2026

Uh oh!

Danielhiversen commented Apr 5, 2026

Uh oh!

Danielhiversen Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

MartinHjelmare Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

MartinHjelmare Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

MartinHjelmare Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MartinHjelmare commented Apr 3, 2026 •

edited

Loading

MartinHjelmare Apr 3, 2026 •

edited

Loading