Fix: Shared HTTP client usage

Author: defnull

bbblb/api/bbbapi.py

@@ -4,7 +4,6 @@
 import hmac
 import typing
 import uuid
-import lxml.builder
 import lxml.etree
 import logging
 from sqlalchemy import update

bbblb/api/bbblbapi.py

@@ -124,16 +124,17 @@ async def trigger_callback(
     params: typing.Mapping[str, str] | None = None,
     data: bytes | typing.Mapping[str, str] | None = None,
 ):
-    for i in range(config.WEBHOOK_RETRY):
-        try:
-            async with bbblib.HTTP.request(method, url, params=params, data=data) as rs:
-                rs.raise_for_status()
-        except aiohttp.ClientError:
-            LOG.warning(
-                f"Failed to forward callback {url} ({i + 1}/{config.WEBHOOK_RETRY})"
-            )
-            await asyncio.sleep(10 * i)
-            continue
+    async with await bbblib.get_client() as client:
+        for i in range(config.WEBHOOK_RETRY):
+            try:
+                async with client.request(method, url, params=params, data=data) as rs:
+                    rs.raise_for_status()
+            except aiohttp.ClientError:
+                LOG.warning(
+                    f"Failed to forward callback {url} ({i + 1}/{config.WEBHOOK_RETRY})"
+                )
+                await asyncio.sleep(10 * i)
+                continue
 
 
 async def fire_callback(callback: model.Callback, payload: dict, clear=True):

bbblb/bbblib.py

@@ -27,6 +27,10 @@ async def get_pool():
     return CONNPOOL
 
 
+async def get_client():
+    return aiohttp.ClientSession(connector=await get_pool(), connector_owner=False)
+
+
 async def close_pool():
     if CONNPOOL and not CONNPOOL.closed:
         await CONNPOOL.close()
@@ -87,9 +91,7 @@ async def get_session(self):
         # Hint: Closing a session does nothing if it does not own the connector,
         # so we do not need to close it.
         if not self.session or self.session.closed:
-            self.session = aiohttp.ClientSession(
-                connector=await get_pool(), connector_owner=False
-            )
+            self.session = await get_client()
         return self.session
 
     def encode_uri(self, endpoint: str, query: dict[str, str]):