Merge pull request #156 from Glimpse-Analytics/fix/session-management-cleanup

Fix unclosed aiohttp client session warnings in session management

Author: malmeloo

findmy/reports/account.py

@@ -375,6 +375,7 @@ def __init__(
 
         self._http: HttpSession = HttpSession()
         self._reports: LocationReportsFetcher = LocationReportsFetcher(self)
+        self._closed: bool = False
 
     def _set_login_state(
         self,
@@ -473,8 +474,21 @@ async def close(self) -> None:
 
         Should be called when the object will no longer be used.
         """
-        await self._anisette.close()
-        await self._http.close()
+        if self._closed:
+            return  # Already closed, make it idempotent
+
+        self._closed = True
+
+        # Close in proper order: anisette first, then HTTP session
+        try:
+            await self._anisette.close()
+        except (RuntimeError, OSError, ConnectionError) as e:
+            logger.warning("Error closing anisette provider: %s", e)
+
+        try:
+            await self._http.close()
+        except (RuntimeError, OSError, ConnectionError) as e:
+            logger.warning("Error closing HTTP session: %s", e)
 
     @require_login_state(LoginState.LOGGED_OUT)
     @override

findmy/reports/anisette.py

@@ -171,6 +171,7 @@ def __init__(self, server_url: str) -> None:
 
         self._anisette_data: dict[str, str] | None = None
         self._anisette_data_expires_at: float = 0
+        self._closed = False
 
     @override
     def serialize(self) -> dict:
@@ -217,6 +218,10 @@ async def get_headers(
         with_client_info: bool = False,
     ) -> dict[str, str]:
         """See `BaseAnisetteProvider.get_headers`_."""
+        if self._closed:
+            msg = "RemoteAnisetteProvider has been closed and cannot be used"
+            raise RuntimeError(msg)
+
         if self._anisette_data is None or time.time() >= self._anisette_data_expires_at:
             logger.info("Fetching anisette data from %s", self._server_url)
 
@@ -229,7 +234,15 @@ async def get_headers(
     @override
     async def close(self) -> None:
         """See `AnisetteProvider.close`."""
-        await self._http.close()
+        if self._closed:
+            return  # Already closed, make it idempotent
+
+        self._closed = True
+
+        try:
+            await self._http.close()
+        except (RuntimeError, OSError, ConnectionError) as e:
+            logger.warning("Error closing anisette HTTP session: %s", e)
 
 
 class LocalAnisetteProvider(BaseAnisetteProvider):

findmy/util/http.py

@@ -75,8 +75,13 @@ def __init__(self) -> None:  # noqa: D107
         super().__init__()
 
         self._session: ClientSession | None = None
+        self._closed: bool = False
 
     async def _get_session(self) -> ClientSession:
+        if self._closed:
+            msg = "HttpSession has been closed and cannot be used"
+            raise RuntimeError(msg)
+
         if self._session is not None:
             return self._session
 
@@ -87,10 +92,19 @@ async def _get_session(self) -> ClientSession:
     @override
     async def close(self) -> None:
         """Close the underlying session. Should be called when session will no longer be used."""
+        if self._closed:
+            return  # Already closed, make it idempotent
+
+        self._closed = True
+
         if self._session is not None:
             logger.debug("Closing aiohttp session")
-            await self._session.close()
-            self._session = None
+            try:
+                await self._session.close()
+            except (RuntimeError, OSError, ConnectionError) as e:
+                logger.warning("Error closing aiohttp session: %s", e)
+            finally:
+                self._session = None
 
     async def request(
         self,