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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2022-11-03 18:27:50 +03:00
parent 260f118820
commit 1a28038543
2 changed files with 67 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kvmd/apps/vnc/rfb/__init__.py
View File

@@ -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,6 +175,7 @@ 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)
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:
@@ -183,35 +185,39 @@ class RfbClient(RfbClientStream): # pylint: disable=too-many-instance-attribute
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
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)
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.__reset_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.__reset_h264 = False
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
async with self.__lock:
await self._write_fb_update("resize FBUR", width, height, RfbEncodings.RESIZE)
self._width = width
self._height = height
self.__reset_h264 = True
self.__fb_reset_h264 = True
async def _send_rename(self, name: str) -> None:
assert self._encodings.has_rename
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
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)

5
kvmd/apps/vnc/server.py
View File

@@ -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,13 +177,11 @@ 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)
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"])
@@ -274,7 +270,6 @@ 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"]