fix: sticky session

Author: acesyde

custom_components/eau_agur/__init__.py

@@ -1,3 +1,4 @@
+import aiohttp
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -9,7 +10,8 @@
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up EAU par Agur from a config entry."""
-    session = async_get_clientsession(hass)
+    session = async_get_clientsession(hass=hass)
+    session._cookie_jar = aiohttp.CookieJar(unsafe=False, quote_cookie=False)
 
     config_provider = PROVIDERS.get(entry.data[CONF_PROVIDER], None)
     if config_provider is None:

custom_components/eau_agur/api/agur_api_client.py

@@ -7,6 +7,7 @@
 import logging
 import socket
 import uuid
+from http.cookies import SimpleCookie
 from typing import Any, Mapping
 
 import aiohttp
@@ -57,7 +58,7 @@ def __init__(
         self._token = None
         self._session = session
         self._close_session = False
-        self._cookies: dict[str, str] = {}
+        self._cookies: SimpleCookie | None = None
 
         self._host = host
         self._base_path = base_path
@@ -80,14 +81,12 @@ async def request(
         """Make a request to the Agur API."""
 
         url = URL.build(scheme="https", host=self._host, path=self._base_path).join(URL(uri))
-
-        LOGGER.debug("URL: %s", url)
-        LOGGER.debug("Headers: %s", headers)
-        LOGGER.debug("Cookies: %s", self._cookies)
+        LOGGER.debug("Request URL: %s", url)
 
         if headers is None:
             headers = {}
 
+        headers["User-Agent"] = "homeassistant"
         headers["Content-Type"] = "application/json"
 
         if self._conversation_id is not None:
@@ -97,15 +96,14 @@ async def request(
             headers["Token"] = self._token
 
         if self._session is None:
-            self._session = aiohttp.ClientSession()
-        self._close_session = True
+            self._session = aiohttp.ClientSession(cookie_jar=aiohttp.CookieJar(unsafe=False, quote_cookie=False))
+            self._close_session = True
 
         try:
             async with async_timeout.timeout(self._timeout):
                 response = await self._session.request(
                     method,
                     url,
-                    cookies=self._cookies,
                     data=data,
                     json=json_data,
                     params=params,
@@ -135,7 +133,7 @@ async def generate_temporary_token(self) -> None:
         """Generate a temporary token."""
         try:
             # Generate a conversation id
-            self._conversation_id = f"S-WEB-Netscape-{uuid.uuid4()}"
+            self._conversation_id = f"JS-WEB-Netscape-{uuid.uuid4()}"
 
             response = await self.request(
                 uri=GENERATE_TOKEN_PATH,
@@ -213,6 +211,7 @@ async def __aenter__(self) -> Any:
 
     async def close(self) -> None:
         """Close open client session."""
+        LOGGER.debug("Closing session")
         if self._session and self._close_session:
             await self._session.close()
 

custom_components/eau_agur/config_flow.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import aiohttp
 import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
@@ -38,7 +39,9 @@ async def async_step_user(self, user_input=None) -> config_entries.ConfigFlowRes
                     timeout=config_provider.get("default_timeout", None),
                     client_id=config_provider["client_id"],
                     access_key=config_provider["access_key"],
-                    session=async_create_clientsession(self.hass),
+                    session=async_create_clientsession(
+                        self.hass, cookie_jar=aiohttp.CookieJar(unsafe=False, quote_cookie=False)
+                    ),
                 )
 
                 await api_client.generate_temporary_token()

mise.toml

@@ -47,7 +47,7 @@ run = "uv run pre-commit run --all-files"
 
 [tasks."hassio:start"]
 description = "Start Hassio"
-run = "docker compose -f docker-compose.yml up"
+run = "docker compose -f docker-compose.yml up --remove-orphans"
 
 [tasks."hassio:stop"]
 description = "Stop Hassio"