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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2025-02-10 00:06:49 +02:00
parent 97b405297b
commit 6ffaa8d6bd
6 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
kvmd/clients/kvmd.py
View File

@@ -51,16 +51,16 @@ class _BaseApiPart:
for (key, value) in params.items()
if value is not None
},
) as response:
htclient.raise_not_200(response)
) as resp:
htclient.raise_not_200(resp)
class _AuthApiPart(_BaseApiPart):
async def check(self) -> bool:
session = self._ensure_http_session()
try:
async with session.get("/auth/check") as response:
htclient.raise_not_200(response)
async with session.get("/auth/check") as resp:
htclient.raise_not_200(resp)
return True
except aiohttp.ClientResponseError as ex:
if ex.status in [400, 401, 403]:
@@ -71,9 +71,9 @@ class _AuthApiPart(_BaseApiPart):
class _StreamerApiPart(_BaseApiPart):
async def get_state(self) -> dict:
session = self._ensure_http_session()
async with session.get("/streamer") as response:
htclient.raise_not_200(response)
return (await response.json())["result"]
async with session.get("/streamer") as resp:
htclient.raise_not_200(resp)
return (await resp.json())["result"]
async def set_params(self, quality: (int | None)=None, desired_fps: (int | None)=None) -> None:
await self._set_params(
@@ -86,9 +86,9 @@ class _StreamerApiPart(_BaseApiPart):
class _HidApiPart(_BaseApiPart):
async def get_keymaps(self) -> tuple[str, set[str]]:
session = self._ensure_http_session()
async with session.get("/hid/keymaps") as response:
htclient.raise_not_200(response)
result = (await response.json())["result"]
async with session.get("/hid/keymaps") as resp:
htclient.raise_not_200(resp)
result = (await resp.json())["result"]
return (result["keymaps"]["default"], set(result["keymaps"]["available"]))
async def print(self, text: str, limit: int, keymap_name: str) -> None:
@@ -97,8 +97,8 @@ class _HidApiPart(_BaseApiPart):
url="/hid/print",
params={"limit": limit, "keymap": keymap_name},
data=text,
) as response:
htclient.raise_not_200(response)
) as resp:
htclient.raise_not_200(resp)
async def set_params(self, keyboard_output: (str | None)=None, mouse_output: (str | None)=None) -> None:
await self._set_params(
@@ -111,9 +111,9 @@ class _HidApiPart(_BaseApiPart):
class _AtxApiPart(_BaseApiPart):
async def get_state(self) -> dict:
session = self._ensure_http_session()
async with session.get("/atx") as response:
htclient.raise_not_200(response)
return (await response.json())["result"]
async with session.get("/atx") as resp:
htclient.raise_not_200(resp)
return (await resp.json())["result"]
async def switch_power(self, action: str) -> bool:
session = self._ensure_http_session()
@@ -121,8 +121,8 @@ class _AtxApiPart(_BaseApiPart):
async with session.post(
url="/atx/power",
params={"action": action},
) as response:
htclient.raise_not_200(response)
) as resp:
htclient.raise_not_200(resp)
return True
except aiohttp.ClientResponseError as ex:
if ex.status == 409:

26
kvmd/clients/streamer.py
View File

@@ -117,25 +117,25 @@ class StreamerSnapshot:
class HttpStreamerClientSession(BaseHttpClientSession):
async def get_state(self) -> dict:
session = self._ensure_http_session()
async with session.get("/state") as response:
htclient.raise_not_200(response)
return (await response.json())["result"]
async with session.get("/state") as resp:
htclient.raise_not_200(resp)
return (await resp.json())["result"]
async def take_snapshot(self, timeout: float) -> StreamerSnapshot:
session = self._ensure_http_session()
async with session.get(
url="/snapshot",
timeout=aiohttp.ClientTimeout(total=timeout),
) as response:
) as resp:
htclient.raise_not_200(response)
htclient.raise_not_200(resp)
return StreamerSnapshot(
online=(response.headers["X-UStreamer-Online"] == "true"),
width=int(response.headers["X-UStreamer-Width"]),
height=int(response.headers["X-UStreamer-Height"]),
online=(resp.headers["X-UStreamer-Online"] == "true"),
width=int(resp.headers["X-UStreamer-Width"]),
height=int(resp.headers["X-UStreamer-Height"]),
headers=tuple(
(key, value)
for (key, value) in tools.sorted_kvs(dict(response.headers))
for (key, value) in tools.sorted_kvs(dict(resp.headers))
if key.lower().startswith("x-ustreamer-") or key.lower() in [
"x-timestamp",
"access-control-allow-origin",
@@ -144,7 +144,7 @@ class HttpStreamerClientSession(BaseHttpClientSession):
"expires",
]
),
data=bytes(await response.read()),
data=bytes(await resp.read()),
)
@@ -187,10 +187,10 @@ class HttpStreamerClient(BaseHttpClient, BaseStreamerClient):
connect=session.timeout.total,
sock_read=session.timeout.total,
),
) as response:
) as resp:
htclient.raise_not_200(response)
reader = aiohttp.MultipartReader.from_response(response)
htclient.raise_not_200(resp)
reader = aiohttp.MultipartReader.from_response(resp)
self.__patch_stream_reader(reader.resp.content)
async def read_frame(key_required: bool) -> dict: