Use the same session for the bot and graphql

This also moves the creation of the connector to the async start_bot func

Author: ChrisLovering

bot/__main__.py

@@ -1,8 +1,10 @@
 import asyncio
 import inspect
 import pkgutil
+import socket
 from typing import Iterator, NoReturn
 
+import aiohttp
 from discord import AllowedMentions, Intents
 
 from . import settings
@@ -31,16 +33,24 @@ def on_error(name: str) -> NoReturn:
 
 async def start_bot() -> None:
     """Load in extensions and start running the bot."""
-    bot = Friendo(
-        command_prefix=settings.COMMAND_PREFIX, help_command=None, intents=Intents.all(),
-        allowed_mentions=AllowedMentions(everyone=False),
+    resolver = aiohttp.AsyncResolver()
+    connector = aiohttp.TCPConnector(
+        resolver=resolver,
+        family=socket.AF_INET,
     )
-
-    for cog in _get_cogs():
-        await bot.load_extension(cog)
-
-    async with bot:
-        await bot.start(settings.TOKEN)
+    async with aiohttp.ClientSession(connector=connector) as session:
+        bot = Friendo(
+            command_prefix=settings.COMMAND_PREFIX, help_command=None, intents=Intents.all(),
+            allowed_mentions=AllowedMentions(everyone=False),
+            session=session,
+            connector=connector,
+            resolver=resolver,
+        )
+        for cog in _get_cogs():
+            await bot.load_extension(cog)
+
+        async with bot:
+            await bot.start(settings.TOKEN)
 
 if __name__ == "__main__":
     asyncio.run(start_bot())

bot/bot.py

@@ -1,6 +1,4 @@
-import asyncio
 import logging
-import socket
 
 import aiohttp
 from discord.ext.commands import Bot, CommandError, Context
@@ -15,23 +13,24 @@
 class Friendo(Bot):
     """Base Class for the discord bot."""
 
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(
+        self,
+        session: aiohttp.ClientSession,
+        connector: aiohttp.TCPConnector,
+        resolver: aiohttp.AsyncResolver,
+        *args,
+        **kwargs,
+    ) -> None:
         super().__init__(*args, **kwargs)
 
-        # Setting the loop.
-        self.loop = asyncio.get_event_loop()
-
-        self._resolver = aiohttp.AsyncResolver()
-        self._connector = aiohttp.TCPConnector(
-            resolver=self._resolver,
-            family=socket.AF_INET,
-        )
         # Client.login() will call HTTPClient.static_login() which will create a session using
         # this connector attribute.
-        self.http.connector = self._connector
+        self.http.connector = connector
 
-        self.session = aiohttp.ClientSession(connector=self._connector)
-        self.graphql = GraphQLClient(connector=self._connector)
+        self.session = session
+        self._connector = connector
+        self._resolver = resolver
+        self.graphql = GraphQLClient(session=session)
 
     @staticmethod
     async def on_ready() -> None:

bot/graphql.py

@@ -23,8 +23,8 @@ def filter(self, record: logging.LogRecord) -> bool:
 class GraphQLClient:
     """Friendo GraphQL API wrapper."""
 
-    def __init__(self, **session_kwargs):
-        self.session = aiohttp.ClientSession(raise_for_status=True, **session_kwargs)
+    def __init__(self, session: aiohttp.ClientSession):
+        self.session = session
         self.token = None
         self.url = settings.FRIENDO_API_URL
         self.headers = None
@@ -44,10 +44,9 @@ async def refresh_token(self) -> None:
         )
         variables = {
             "username": settings.FRIENDO_API_USER,
-            "password": settings.FRIENDO_API_PASS
+            "password": settings.FRIENDO_API_PASS,
         }
         resp = await self._post(json={"query": query, "variables": variables})
-
         self.token = resp["data"]["login"]["token"]
         self.headers = {
             "Authorization": f"Bearer {self.token}"
@@ -78,7 +77,5 @@ async def _post(self, **kwargs) -> dict:
         """Make a GraphQL API POST call."""
         async with self.session.post(self.url, headers=self.headers, **kwargs) as resp:
             resp = await resp.json()
-
             log.info(resp)
-
             return resp