Rearrange model code
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Paul Brinkmeier 2023-01-21 22:49:14 +01:00
parent 2761172a7c
commit 772f7d5a9c

View File

@ -33,6 +33,8 @@ class Model:
self.connection_manager.on_message = self.handle_incoming self.connection_manager.on_message = self.handle_incoming
self.connection_manager.on_close = self.remove_client self.connection_manager.on_close = self.remove_client
# Event handlers
async def add_client(self, client_id: int) -> None: async def add_client(self, client_id: int) -> None:
print(f'<{client_id}|OPEN>') print(f'<{client_id}|OPEN>')
@ -53,16 +55,6 @@ class Model:
'type': 'leave' '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: async def handle_incoming(self, client_id: int, data: str) -> None:
print(f'<{client_id}|DATA> {data}') print(f'<{client_id}|DATA> {data}')
@ -115,4 +107,15 @@ class Model:
], ],
'board': self.board '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)