GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-05 07:27:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: enhance caching mechanism and improve type hints in DoH and workflow modules

Browse Source
This commit is contained in:
jxxghp
2026-06-12 08:09:54 +08:00
parent d26225b998
commit 83cc7ea716
4 changed files with 73 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helper/doh.py
+15 -15
View File
@@ -29,12 +29,12 @@ _doh_lock = Lock()
_orig_getaddrinfo = socket.getaddrinfo
def enable_doh(enable: bool):
def enable_doh(enable: bool) -> None:
"""
对 socket.getaddrinfo 进行补丁
"""
def _patched_getaddrinfo(host, *args, **kwargs):
def _patched_getaddrinfo(host: str, *args, **kwargs):
"""
socket.getaddrinfo的补丁版本。
"""
@@ -42,9 +42,9 @@ def enable_doh(enable: bool):
return _orig_getaddrinfo(host, *args, **kwargs)
# 检查主机是否已解析
with _doh_lock:
ip = _doh_cache.get("host", None)
ip = _doh_cache.get(host, None)
if ip is not None:
logger.info("已解析 [%s] 为 [%s] (缓存)", host, ip)
logger.info(f"已解析 [{host}] 为 [{ip}] (缓存)")
return _orig_getaddrinfo(ip, *args, **kwargs)
# 使用DoH解析主机
futures = []
@@ -53,7 +53,7 @@ def enable_doh(enable: bool):
for future in concurrent.futures.as_completed(futures):
ip = future.result()
if ip is not None:
logger.info("已解析 [%s] 为 [%s]", host, ip)
logger.info(f"已解析 [{host}] 为 [{ip}]")
with _doh_lock:
_doh_cache[host] = ip
host = ip
@@ -73,16 +73,16 @@ class DohHelper(ConfigReloadMixin, metaclass=Singleton):
"""
CONFIG_WATCH = {"DOH_ENABLE", "DOH_DOMAINS", "DOH_RESOLVERS"}
def __init__(self):
def __init__(self) -> None:
enable_doh(settings.DOH_ENABLE)
def on_config_changed(self):
def on_config_changed(self) -> None:
with _doh_lock:
# DOH配置有变动的情况下，清空缓存
_doh_cache.clear()
enable_doh(settings.DOH_ENABLE)
def get_reload_name(self):
def get_reload_name(self) -> str:
return 'DoH'
def _doh_query(resolver: str, host: str) -> Optional[str]:
@@ -121,11 +121,11 @@ def _doh_query(resolver: str, host: str) -> Optional[str]:
b64message = base64.b64encode(message).decode("utf-8").rstrip("=")
url = f"https://{resolver}/dns-query?dns={b64message}"
headers = {"Content-Type": "application/dns-message"}
logger.debug("DoH请求: %s", url)
logger.debug(f"DoH请求: {url}")
request = urllib.request.Request(url, headers=headers, method="GET")
with urllib.request.urlopen(request, timeout=_doh_timeout) as response:
logger.debug("解析器(%s)响应: %s", resolver, response.status)
logger.debug(f"解析器({resolver})响应: {response.status}")
if response.status != 200:
return None
resp_body = response.read()
@@ -138,7 +138,7 @@ def _doh_query(resolver: str, host: str) -> Optional[str]:
# 将rdata转换为IP地址
return socket.inet_ntoa(resp_body[first_rdata_start:first_rdata_end])
except Exception as e:
logger.error("解析器(%s)请求错误: %s", resolver, e)
logger.error(f"解析器({resolver})请求错误: {e}")
return None
@@ -148,17 +148,17 @@ def doh_query_json(resolver: str, host: str) -> Optional[str]:
"""
url = f"https://{resolver}/dns-query?name={host}&type=A"
headers = {"Accept": "application/dns-json"}
logger.debug("DoH请求: %s", url)
logger.debug(f"DoH请求: {url}")
try:
request = urllib.request.Request(url, headers=headers, method="GET")
with urllib.request.urlopen(request, timeout=_doh_timeout) as response:
logger.debug("解析器(%s)响应: %s", resolver, response.status)
logger.debug(f"解析器({resolver})响应: {response.status}")
if response.status != 200:
return None
response_body = response.read().decode("utf-8")
logger.debug("<== body: %s", response_body)
logger.debug(f"<== body: {response_body}")
answer = json.loads(response_body)["Answer"]
return answer[0]["data"]
except Exception as e:
logger.error("解析器(%s)请求错误: %s", resolver, e)
logger.error(f"解析器({resolver})请求错误: {e}")
return None