moar

cah/constructors.py

@@ -5,8 +5,35 @@ class CAHClient:
                  resource: str,
                  platform: str,
                  csid: str,
-                 connected_at: int):
+                 connected_at: int,
+                 current_game: str | None):
         self.resource: str = resource
         self.platform: str = platform
         self.csid: str = csid
-        self.connected_at: int = connected_at
+        self.connected_at: int = connected_at
+        self.current_game: str | None = current_game
+
+    def __iter__(self):
+        return [value for value in self.__dict__.values() if isinstance(value, int) or isinstance(value, float)].__iter__()
+
+class CAHGame:
+
+    def __init__(self,
+                 id: str,
+                 rounds: int,
+                 players: list[dict],
+                 created_at: int,
+                 state: int,
+                 started_at: int,
+                 state_changed_at: int,
+                 ):
+        self.id: str = id
+        self.rounds: int = rounds
+        self.players: list[dict] = players
+        self.created_at: int = created_at
+        self.state: int = state
+        self.started_at: int = started_at
+        self.state_changed_at: int = state_changed_at
+
+    def __iter__(self):
+        return [value for value in self.__dict__.values() if isinstance(value, int) or isinstance(value, float)].__iter__()

cah/websocket_conn.py

@@ -17,6 +17,36 @@ class ConnectionManager:
         for connection in self.active_connections:
             if connection.get('csid') == csid:
                 return connection
+            
+    async def send_client_and_game_lists(self, state, websocket: WebSocket):
+        clients = []
+        games = [game for game in state.games]
+        
+        for ws, client in self.active_connections.items():
+            print(f"Client: {client}")
+            _client = client.get('client')
+            clients.append({
+                'resource': _client.resource,
+                'platform': _client.platform,
+                'connected_at': _client.connected_at,
+                'current_game': _client.current_game.id if _client.current_game else None,
+            })
+        
+        await websocket.send_json({
+            "event": "client_list",
+            "ts": int(time.time()),
+            "data": {
+                "clients": clients
+            }
+        })
+        await websocket.send_json({
+            "event": "game_list",
+            "ts": int(time.time()),
+            "data":
+            {
+                "games": [str(game.id) for game in games],
+            }
+        })
     
     async def connect(self, websocket: WebSocket):
         await websocket.accept()
@@ -27,22 +57,28 @@ class ConnectionManager:
  
 
     async def handshake_complete(self,
-                           websocket: WebSocket,
-                           csid: str,
-                           handshakedClient: CAHClient):
-        self.active_connections[websocket] = {
-            'websocket': websocket,
-            'csid': csid,
-            'client': handshakedClient,
-        }
-        
-        await self.broadcast({
-            "event": "client_connected",
-            "ts": int(time.time()),
-            "data": {
-                "connected_resource": handshakedClient.resource, 
-            }
-        })        
+                                 state,
+                                 websocket: WebSocket,
+                                 csid: str,
+                                 handshakedClient: CAHClient):
+          
+          self.active_connections[websocket] = {
+              'websocket': websocket,
+              'csid': csid,
+              'client': handshakedClient,
+              }
+          
+          await self.broadcast({
+                "event": "client_connected",
+                "ts": int(time.time()),
+                "data": {
+                    "connected_resource": handshakedClient.resource,
+                    "connected_platform": handshakedClient.platform, 
+                }
+            })
+          
+          await self.send_client_and_game_lists(state, 
+                                                websocket)        
 
     def disconnect(self, websocket: WebSocket, csid: str = None):
         self.active_connections.pop(websocket)