diff --git a/glebby-server/glebby/model.py b/glebby-server/glebby/model.py index 4d44ec5..e5707e8 100644 --- a/glebby-server/glebby/model.py +++ b/glebby-server/glebby/model.py @@ -33,6 +33,8 @@ class Model: self.connection_manager.on_message = self.handle_incoming self.connection_manager.on_close = self.remove_client + # Event handlers + async def add_client(self, client_id: int) -> None: print(f'<{client_id}|OPEN>') @@ -53,16 +55,6 @@ class Model: 'type': 'leave' }) - async def send_to(self, client_id_from: Optional[int], client_id_to: int, payload: Any) -> None: - await self.connection_manager.send_to(client_id_to, json.dumps({ - 'from': client_id_from, - 'payload': payload - })) - - async def broadcast(self, client_id_from: Optional[int], payload: Any) -> None: - for client_id_to in self.clients: - await self.send_to(client_id_from, client_id_to, payload) - async def handle_incoming(self, client_id: int, data: str) -> None: print(f'<{client_id}|DATA> {data}') @@ -115,4 +107,15 @@ class Model: ], 'board': self.board } - + + # Message sending + + async def send_to(self, client_id_from: Optional[int], client_id_to: int, payload: Any) -> None: + await self.connection_manager.send_to(client_id_to, json.dumps({ + 'from': client_id_from, + 'payload': payload + })) + + async def broadcast(self, client_id_from: Optional[int], payload: Any) -> None: + for client_id_to in self.clients: + await self.send_to(client_id_from, client_id_to, payload)