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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim 2020-05-17 21:30:22 +03:00
parent 8a13f62911
commit 0447358f5e
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kvmd/clients/kvmd.py
View File

@ -33,7 +33,7 @@ from .. import make_user_agent
# ===== # =====
class KvmdError(Exception): class KvmdError(Exception):
def __init__(self, err: Exception): def __init__(self, err: Exception):
super().__init__(f"{type(err).__name__} {err}") super().__init__(f"{type(err).__name__}: {err}")
# ===== # =====
@ -57,10 +57,7 @@ class KvmdClient:
async def authorize(self, user: str, passwd: str) -> bool: async def authorize(self, user: str, passwd: str) -> bool:
try: try:
async with self.__make_session(user, passwd) as session: async with self.__make_session(user, passwd) as session:
async with session.get( async with session.get(f"http://{self.__host}:{self.__port}/auth/check") as response:
url=f"http://{self.__host}:{self.__port}/auth/check",
timeout=self.__timeout,
) as response:
response.raise_for_status() response.raise_for_status()
if response.status == 200: if response.status == 200:
return True return True
@ -76,10 +73,7 @@ class KvmdClient:
async def ws(self, user: str, passwd: str) -> AsyncGenerator[aiohttp.ClientWebSocketResponse, None]: async def ws(self, user: str, passwd: str) -> AsyncGenerator[aiohttp.ClientWebSocketResponse, None]:
try: try:
async with self.__make_session(user, passwd) as session: async with self.__make_session(user, passwd) as session:
async with session.ws_connect( async with session.ws_connect(f"http://{self.__host}:{self.__port}/ws") as ws:
url=f"http://{self.__host}:{self.__port}/ws",
timeout=self.__timeout,
) as ws:
yield ws yield ws
except aiohttp.ClientError as err: except aiohttp.ClientError as err:
raise KvmdError(err) raise KvmdError(err)
@ -89,11 +83,7 @@ class KvmdClient:
async with self.__make_session(user, passwd) as session: async with self.__make_session(user, passwd) as session:
async with session.post( async with session.post(
url=f"http://{self.__host}:{self.__port}/streamer/set_params", url=f"http://{self.__host}:{self.__port}/streamer/set_params",
timeout=self.__timeout, params={"quality": quality, "desired_fps": desired_fps},
params={
"quality": quality,
"desired_fps": desired_fps,
},
) as response: ) as response:
response.raise_for_status() response.raise_for_status()
except aiohttp.ClientError as err: except aiohttp.ClientError as err:
@ -108,6 +98,7 @@ class KvmdClient:
"X-KVMD-Passwd": passwd, "X-KVMD-Passwd": passwd,
"User-Agent": make_user_agent("KVMD-VNC"), "User-Agent": make_user_agent("KVMD-VNC"),
}, },
"timeout": aiohttp.ClientTimeout(total=self.__timeout),
} }
if self.__unix_path: if self.__unix_path:
kwargs["connector"] = aiohttp.UnixConnector(path=self.__unix_path) kwargs["connector"] = aiohttp.UnixConnector(path=self.__unix_path)

2
kvmd/clients/streamer.py
View File

@ -30,7 +30,7 @@ import aiohttp
# ===== # =====
class StreamerError(Exception): class StreamerError(Exception):
def __init__(self, err: Exception): def __init__(self, err: Exception):
super().__init__(f"{type(err).__name__} {err}") super().__init__(f"{type(err).__name__}: {err}")
# ===== # =====