Fix gameserver spawning bug

mzsawicki · Jun 3, 2023 · 1f2ce93 · 1f2ce93
1 parent 856389b
commit 1f2ce93
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/superego/application/interfaces.py b/superego/application/interfaces.py
@@ -7,7 +7,7 @@
 
 class GameServer(metaclass=ABCMeta):
     @abstractmethod
-    def run(self) -> None:
+    async def run(self) -> None:
         raise NotImplemented
 
     @abstractmethod

diff --git a/superego/application/usecases.py b/superego/application/usecases.py
@@ -153,6 +153,8 @@ def __call__(self, player_guids: List[UUID]) -> GameServer:
         lobby_members = [LobbyMember(name, guid) for name, guid in people.items()]
         game_settings = GameSettings(deck, 1)
         lobby = Lobby(lobby_members[0], game_settings)
+        for member in lobby_members:
+            lobby.add_member(member)
         game_server = self._creator.create(lobby)
         return game_server
 

diff --git a/superego/infrastructure/http/server.py b/superego/infrastructure/http/server.py
@@ -1,3 +1,4 @@
+import asyncio
 import json
 from uuid import UUID
 
@@ -109,6 +110,7 @@ async def start_game(request):
 
         game_server = start_game_(player_guids)
         request.app['game_server_pool'].store(game_server)
+        asyncio.create_task(game_server.run())
         return web.Response(status=200)
 
 async def ongoing_game(request):

diff --git a/superego/infrastructure/websockets/gameserver.py b/superego/infrastructure/websockets/gameserver.py
@@ -162,8 +162,8 @@ def __init__(
         self._stopped: asyncio.Future = self._loop.create_future()
         self._loop.add_signal_handler(signal.SIGINT, self.stop)
 
-    def run(self) -> None:
-        self._loop.run_until_complete(self._serve())
+    async def run(self) -> None:
+        await self._serve()
 
     def stop(self) -> None:
         self._stopped.set_result(True)

diff --git a/tests/subscribe_client.py b/tests/subscribe_client.py
@@ -13,7 +13,7 @@ async def listen(uri):
     async with connect(uri) as websocket:
         dict_ = {
             'action': 'SUBSCRIBE',
-            'issuer': 'a7da476f-c81b-4bc7-ac17-e7e675ccc95f'
+            'issuer': '55ae1d15-3aa1-4277-90e1-fd711aad6d0d'
         }
         message = json.dumps(dict_)
         data = message.encode(ENCODING)
@@ -22,7 +22,7 @@ async def listen(uri):
         print(response)
         dict_ = {
             'action': 'READ',
-            'issuer': 'a7da476f-c81b-4bc7-ac17-e7e675ccc95f'
+            'issuer': '55ae1d15-3aa1-4277-90e1-fd711aad6d0d'
         }
         message = json.dumps(dict_)
         data = message.encode(ENCODING)