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

kvmd/client: removed queue machinery

Browse Source
This commit is contained in:
Maxim Devaev 2025-05-23 23:46:57 +03:00
parent 310b23edad
commit 183a6c2553
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
kvmd/clients/kvmd.py
View File

@ -20,7 +20,6 @@
# ========================================================================== # # ========================================================================== #
import asyncio
import contextlib import contextlib
import struct import struct
@ -161,47 +160,23 @@ class _SwitchApiPart(_BaseApiPart):
class KvmdClientWs: class KvmdClientWs:
def __init__(self, ws: aiohttp.ClientWebSocketResponse) -> None: def __init__(self, ws: aiohttp.ClientWebSocketResponse) -> None:
self.__ws = ws self.__ws = ws
self.__writer_queue: "asyncio.Queue[tuple[str, dict] | bytes]" = asyncio.Queue()
self.__communicated = False self.__communicated = False
async def communicate(self) -> AsyncGenerator[tuple[str, dict], None]: # pylint: disable=too-many-branches async def communicate(self) -> AsyncGenerator[tuple[str, dict], None]: # pylint: disable=too-many-branches
assert not self.__communicated assert not self.__communicated
self.__communicated = True self.__communicated = True
recv_task: (asyncio.Task | None) = None
writer_task: (asyncio.Task | None) = None
try: try:
while True: async for msg in self.__ws:
if recv_task is None: match msg.type:
recv_task = asyncio.create_task(self.__ws.receive()) case aiohttp.WSMsgType.TEXT:
if writer_task is None:
writer_task = asyncio.create_task(self.__writer_queue.get())
done = (await aiotools.wait_first(recv_task, writer_task))[0]
if recv_task in done:
msg = recv_task.result()
if msg.type == aiohttp.WSMsgType.TEXT:
yield htserver.parse_ws_event(msg.data) yield htserver.parse_ws_event(msg.data)
elif msg.type == aiohttp.WSMsgType.CLOSE: case aiohttp.WSMsgType.CLOSE:
await self.__ws.close() await self.__ws.close()
elif msg.type == aiohttp.WSMsgType.CLOSED: case aiohttp.WSMsgType.CLOSED:
break break
else: case _:
raise RuntimeError(f"Unhandled WS message type: {msg!r}") raise RuntimeError(f"Unhandled WS message type: {msg!r}")
recv_task = None
if writer_task in done:
payload = writer_task.result()
if isinstance(payload, bytes):
await self.__ws.send_bytes(payload)
else:
await htserver.send_ws_event(self.__ws, *payload)
writer_task = None
finally: finally:
if recv_task:
recv_task.cancel()
if writer_task:
writer_task.cancel()
try: try:
await aiotools.shield_fg(self.__ws.close()) await aiotools.shield_fg(self.__ws.close())
except Exception: except Exception:
@ -211,20 +186,31 @@ class KvmdClientWs:
async def send_key_event(self, key: int, state: bool) -> None: async def send_key_event(self, key: int, state: bool) -> None:
mask = (0b10000000 | int(bool(state))) mask = (0b10000000 | int(bool(state)))
await self.__writer_queue.put(struct.pack(">BBH", 1, mask, key)) await self.__send_struct(">BBH", 1, mask, key)
async def send_mouse_button_event(self, button: int, state: bool) -> None: async def send_mouse_button_event(self, button: int, state: bool) -> None:
mask = (0b10000000 | int(bool(state))) mask = (0b10000000 | int(bool(state)))
await self.__writer_queue.put(struct.pack(">BBH", 2, mask, button)) await self.__send_struct(">BBH", 2, mask, button)
async def send_mouse_move_event(self, to_x: int, to_y: int) -> None: async def send_mouse_move_event(self, to_x: int, to_y: int) -> None:
await self.__writer_queue.put(struct.pack(">Bhh", 3, to_x, to_y)) await self.__send_struct(">Bhh", 3, to_x, to_y)
async def send_mouse_relative_event(self, delta_x: int, delta_y: int) -> None: async def send_mouse_relative_event(self, delta_x: int, delta_y: int) -> None:
await self.__writer_queue.put(struct.pack(">BBbb", 4, 0, delta_x, delta_y)) await self.__send_struct(">BBbb", 4, 0, delta_x, delta_y)
async def send_mouse_wheel_event(self, delta_x: int, delta_y: int) -> None: async def send_mouse_wheel_event(self, delta_x: int, delta_y: int) -> None:
await self.__writer_queue.put(struct.pack(">BBbb", 5, 0, delta_x, delta_y)) await self.__send_struct(">BBbb", 5, 0, delta_x, delta_y)
async def __send_struct(self, fmt: str, *values: int) -> None:
if not self.__communicated:
return
data = struct.pack(fmt, *values)
try:
await self.__ws.send_bytes(data)
except Exception:
# XXX: We don't care about any connection errors
# since they will be handled with communication()
pass
class KvmdClientSession(BaseHttpClientSession): class KvmdClientSession(BaseHttpClientSession):