fix shared sessions (#114)

livekit · Dec 5, 2023 · e653e4e · e653e4e
1 parent 20c95e1
commit e653e4e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/livekit-api/livekit/api/_service.py b/livekit-api/livekit/api/_service.py
@@ -9,7 +9,7 @@
 
 class Service(ABC):
     def __init__(
-        self, host: str, api_key: str, api_secret: str, session: aiohttp.ClientSession
+        self, session: aiohttp.ClientSession, host: str, api_key: str, api_secret: str
     ):
         self._client = TwirpClient(session, host, "livekit")
         self.api_key = api_key

diff --git a/livekit-api/livekit/api/_twirp_client.py b/livekit-api/livekit/api/_twirp_client.py
@@ -59,8 +59,6 @@ def __init__(
         pkg: str,
         prefix: str = DEFAULT_PREFIX,
     ) -> None:
-        self._session = aiohttp.ClientSession()
-
         parse_res = urlparse(host)
         scheme = parse_res.scheme
         if scheme.startswith("ws"):
@@ -70,6 +68,7 @@ def __init__(
         self.host = host.rstrip("/")
         self.pkg = pkg
         self.prefix = prefix
+        self._session = session
 
     async def request(
         self,

diff --git a/livekit-api/livekit/api/livekit_api.py b/livekit-api/livekit/api/livekit_api.py
@@ -26,9 +26,9 @@ def __init__(
             raise ValueError("api_key and api_secret must be set")
 
         self._session = aiohttp.ClientSession(timeout=timeout)
-        self._room = RoomService(url, api_key, api_secret, self._session)
-        self._ingress = IngressService(url, api_key, api_secret, self._session)
-        self._egress = EgressService(url, api_key, api_secret, self._session)
+        self._room = RoomService(self._session, url, api_key, api_secret)
+        self._ingress = IngressService(self._session, url, api_key, api_secret)
+        self._egress = EgressService(self._session, url, api_key, api_secret)
 
     @property
     def room(self):