GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-13 01:30:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed unnecessary broadcasting

Browse Source
This commit is contained in:
Devaev Maxim 2020-09-22 01:20:23 +03:00
parent c86b20f1b1
commit f4eabde86e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kvmd/apps/kvmd/server.py
View File

@ -250,9 +250,9 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
await client.ws.prepare(request) await client.ws.prepare(request)
await self.__register_ws_client(client) await self.__register_ws_client(client)
try: try:
await self.__broadcast_event("gpio_model_state", await self.__user_gpio.get_model()) await self.__send_event(client.ws, "gpio_model_state", await self.__user_gpio.get_model())
await asyncio.gather(*[ await asyncio.gather(*[
self.__broadcast_event(component.event_type, await component.get_state()) self.__send_event(client.ws, component.event_type, await component.get_state())
for component in self.__components for component in self.__components
if component.get_state if component.get_state
]) ])
@ -278,7 +278,7 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
@exposed_ws("ping") @exposed_ws("ping")
async def __ws_ping_handler(self, ws: aiohttp.web.WebSocketResponse, _: Dict) -> None: async def __ws_ping_handler(self, ws: aiohttp.web.WebSocketResponse, _: Dict) -> None:
await ws.send_str(json.dumps({"event_type": "pong", "event": {}})) await self.__send_event(ws, "pong", {})
# ===== SYSTEM STUFF # ===== SYSTEM STUFF
@ -363,13 +363,16 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
except Exception: except Exception:
logger.exception("Cleanup error on %s", component.name) logger.exception("Cleanup error on %s", component.name)
async def __send_event(self, ws: aiohttp.web.WebSocketResponse, event_type: str, event: Optional[Dict]) -> None:
await ws.send_str(json.dumps({
"event_type": event_type,
"event": event,
}))
async def __broadcast_event(self, event_type: str, event: Optional[Dict]) -> None: async def __broadcast_event(self, event_type: str, event: Optional[Dict]) -> None:
if self.__ws_clients: if self.__ws_clients:
await asyncio.gather(*[ await asyncio.gather(*[
client.ws.send_str(json.dumps({ self.__send_event(client.ws, event_type, event)
"event_type": event_type,
"event": event,
}))
for client in list(self.__ws_clients) for client in list(self.__ws_clients)
if ( if (
not client.ws.closed not client.ws.closed