diff options
Diffstat (limited to 'kvmd')
| -rw-r--r-- | kvmd/apps/vnc/rfb/__init__.py | 64 | ||||
| -rw-r--r-- | kvmd/apps/vnc/server.py | 71 |
2 files changed, 68 insertions, 67 deletions
diff --git a/kvmd/apps/vnc/rfb/__init__.py b/kvmd/apps/vnc/rfb/__init__.py index 54c9648f..d6cdf6d8 100644 --- a/kvmd/apps/vnc/rfb/__init__.py +++ b/kvmd/apps/vnc/rfb/__init__.py @@ -86,10 +86,11 @@ class RfbClient(RfbClientStream): # pylint: disable=too-many-instance-attribute self.__rfb_version = 0 self._encodings = RfbClientEncodings(frozenset()) - self.__reset_h264 = False - self.__fb_notifier = aiotools.AioNotifier() self.__fb_cont_updates = False + self.__fb_reset_h264 = False + + self.__lock = asyncio.Lock() # ===== @@ -174,46 +175,51 @@ class RfbClient(RfbClientStream): # pylint: disable=too-many-instance-attribute assert self._encodings.has_tight assert self._encodings.tight_jpeg_quality > 0 assert len(data) <= 4194303, len(data) - await self._write_fb_update("JPEG FBUR", self._width, self._height, RfbEncodings.TIGHT, drain=False) - length = len(data) - if length <= 127: - length_bytes = bytes([0b10011111, length & 0x7F]) - elif length <= 16383: - length_bytes = bytes([0b10011111, length & 0x7F | 0x80, length >> 7 & 0x7F]) - else: - length_bytes = bytes([0b10011111, length & 0x7F | 0x80, length >> 7 & 0x7F | 0x80, length >> 14 & 0xFF]) - await self._write_struct("JPEG length + data", "", length_bytes, data) - self.__reset_h264 = True - if self.__fb_cont_updates: - self.__fb_notifier.notify() + async with self.__lock: + await self._write_fb_update("JPEG FBUR", self._width, self._height, RfbEncodings.TIGHT, drain=False) + length = len(data) + if length <= 127: + length_bytes = bytes([0b10011111, length & 0x7F]) + elif length <= 16383: + length_bytes = bytes([0b10011111, length & 0x7F | 0x80, length >> 7 & 0x7F]) + else: + length_bytes = bytes([0b10011111, length & 0x7F | 0x80, length >> 7 & 0x7F | 0x80, length >> 14 & 0xFF]) + await self._write_struct("JPEG length + data", "", length_bytes, data) + self.__fb_reset_h264 = True + if self.__fb_cont_updates: + self.__fb_notifier.notify() async def _send_fb_h264(self, data: bytes) -> None: assert self._encodings.has_h264 assert len(data) <= 0xFFFFFFFF, len(data) - await self._write_fb_update("H264 FBUR", self._width, self._height, RfbEncodings.H264, drain=False) - await self._write_struct("H264 length + flags", "LL", len(data), int(self.__reset_h264), drain=False) - await self._write_struct("H264 data", "", data) - self.__reset_h264 = False - if self.__fb_cont_updates: - self.__fb_notifier.notify() + async with self.__lock: + await self._write_fb_update("H264 FBUR", self._width, self._height, RfbEncodings.H264, drain=False) + await self._write_struct("H264 length + flags", "LL", len(data), int(self.__fb_reset_h264), drain=False) + await self._write_struct("H264 data", "", data) + self.__fb_reset_h264 = False + if self.__fb_cont_updates: + self.__fb_notifier.notify() async def _send_resize(self, width: int, height: int) -> None: assert self._encodings.has_resize - await self._write_fb_update("resize FBUR", width, height, RfbEncodings.RESIZE) - self._width = width - self._height = height - self.__reset_h264 = True + async with self.__lock: + await self._write_fb_update("resize FBUR", width, height, RfbEncodings.RESIZE) + self._width = width + self._height = height + self.__fb_reset_h264 = True async def _send_rename(self, name: str) -> None: assert self._encodings.has_rename - await self._write_fb_update("new server name FBUR", 0, 0, RfbEncodings.RENAME, drain=False) - await self._write_reason("new server name data", name) - self.__name = name + async with self.__lock: + await self._write_fb_update("new server name FBUR", 0, 0, RfbEncodings.RENAME, drain=False) + await self._write_reason("new server name data", name) + self.__name = name async def _send_leds_state(self, caps: bool, scroll: bool, num: bool) -> None: assert self._encodings.has_leds_state - await self._write_fb_update("new LEDs state FBUR", 0, 0, RfbEncodings.LEDS_STATE, drain=False) - await self._write_struct("new LEDs state data", "B", int(scroll) | int(num) << 1 | int(caps) << 2) + async with self.__lock: + await self._write_fb_update("new LEDs state FBUR", 0, 0, RfbEncodings.LEDS_STATE, drain=False) + await self._write_struct("new LEDs state data", "B", int(scroll) | int(num) << 1 | int(caps) << 2) # ===== diff --git a/kvmd/apps/vnc/server.py b/kvmd/apps/vnc/server.py index 366a4a91..2bf6e79e 100644 --- a/kvmd/apps/vnc/server.py +++ b/kvmd/apps/vnc/server.py @@ -128,8 +128,6 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes self.__mouse_buttons: dict[str, (bool | None)] = dict.fromkeys(["left", "right", "middle"], None) self.__mouse_move = {"x": -1, "y": -1} - self.__lock = asyncio.Lock() - self.__modifiers = 0 # ===== @@ -179,15 +177,13 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes else: if isinstance(host, str): name = f"PiKVM: {host}" - async with self.__lock: - if self._encodings.has_rename: - await self._send_rename(name) + if self._encodings.has_rename: + await self._send_rename(name) self.__shared_params.name = name elif event_type == "hid_state": - async with self.__lock: - if self._encodings.has_leds_state: - await self._send_leds_state(**event["keyboard"]["leds"]) + if self._encodings.has_leds_state: + await self._send_leds_state(**event["keyboard"]["leds"]) # ===== @@ -274,38 +270,37 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes if self.__fb_queue.qsize() == 0: break - async with self.__lock: - if self._width != last["width"] or self._height != last["height"]: - self.__shared_params.width = last["width"] - self.__shared_params.height = last["height"] - if not self._encodings.has_resize: - msg = ( - f"Resoultion changed: {self._width}x{self._height}" - f" -> {last['width']}x{last['height']}\nPlease reconnect" - ) - await self._send_fb_jpeg((await self.__make_text_frame(msg))["data"]) - continue - await self._send_resize(last["width"], last["height"]) - - if len(last["data"]) == 0: - # Вдруг какой-то баг - await self._send_fb_allow_again() + if self._width != last["width"] or self._height != last["height"]: + self.__shared_params.width = last["width"] + self.__shared_params.height = last["height"] + if not self._encodings.has_resize: + msg = ( + f"Resoultion changed: {self._width}x{self._height}" + f" -> {last['width']}x{last['height']}\nPlease reconnect" + ) + await self._send_fb_jpeg((await self.__make_text_frame(msg))["data"]) continue - - if last["format"] == StreamFormats.JPEG: - await self._send_fb_jpeg(last["data"]) - elif last["format"] == StreamFormats.H264: - if not self._encodings.has_h264: - raise RfbError("The client doesn't want to accept H264 anymore") - if has_h264_key: - self.__fb_key_required = False - await self._send_fb_h264(last["data"]) - else: - self.__fb_key_required = True - await self._send_fb_allow_again() + await self._send_resize(last["width"], last["height"]) + + if len(last["data"]) == 0: + # Вдруг какой-то баг + await self._send_fb_allow_again() + continue + + if last["format"] == StreamFormats.JPEG: + await self._send_fb_jpeg(last["data"]) + elif last["format"] == StreamFormats.H264: + if not self._encodings.has_h264: + raise RfbError("The client doesn't want to accept H264 anymore") + if has_h264_key: + self.__fb_key_required = False + await self._send_fb_h264(last["data"]) else: - raise RuntimeError(f"Unknown format: {last['format']}") - last["data"] = b"" + self.__fb_key_required = True + await self._send_fb_allow_again() + else: + raise RuntimeError(f"Unknown format: {last['format']}") + last["data"] = b"" # ===== |