fix(sing): 修复带歌名唱歌无声卡死

HTTPXClient 仅在创建/重置 client 时持锁，避免单个请求拖死 worker；
网易云搜歌与登录状态检查增加 15s 超时，失败走现有兜底文案。

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: TogetsuDo

src/plugins/sing/ncm_login/__init__.py

@@ -1,3 +1,4 @@
+import asyncio
 import re
 
 import httpx
@@ -27,6 +28,7 @@ class NCMLoginConfig(BaseModel, extra="ignore"):
 
 
 ncm_cfg = NCMLoginConfig()
+NCM_SEARCH_TIMEOUT = 15.0
 
 ncm_login_cmd = on_command("网易云登录", priority=10, block=True, permission=permission_for_command("sing.ncm_login"))
 ncm_logout_cmd = on_command("网易云登出", priority=10, block=True, permission=permission_for_command("sing.ncm_logout"))
@@ -138,14 +140,32 @@ async def get_song_id(song_name: str):
     if song_name.isdigit():
         return song_name
 
-    res = await ncm.cloudsearch.GetSearchResult(song_name, 1, 10)
+    try:
+        res = await asyncio.wait_for(
+            ncm.cloudsearch.GetSearchResult(song_name, 1, 10),
+            timeout=NCM_SEARCH_TIMEOUT,
+        )
+    except TimeoutError:
+        logger.warning(f"ncm cloudsearch timeout for song {song_name!r}")
+        return None
+    except Exception as e:
+        logger.warning(f"ncm cloudsearch failed for song {song_name!r}: {e}")
+        return None
+
     if "result" not in res or "songCount" not in res["result"]:
         return None
 
     if res["result"]["songCount"] == 0:
         return None
 
-    logged_in = await is_ncm_logged_in()
+    try:
+        logged_in = await asyncio.wait_for(is_ncm_logged_in(), timeout=NCM_SEARCH_TIMEOUT)
+    except TimeoutError:
+        logger.warning(f"ncm login status check timeout for song {song_name!r}")
+        return None
+    except Exception as e:
+        logger.warning(f"ncm login status check failed for song {song_name!r}: {e}")
+        return None
 
     for song in res["result"]["songs"]:
         # 如果未登录，跳过vip

src/shared/utils/__init__.py

@@ -1,5 +1,4 @@
 import asyncio
-from contextlib import asynccontextmanager
 from typing import Any
 
 import httpx
@@ -40,23 +39,20 @@ class HTTPXClient:
     }
 
     @classmethod
-    @asynccontextmanager
-    async def get_client(cls):
+    async def _ensure_client(cls) -> httpx.AsyncClient:
         async with cls._lock:
             if cls._client is None or cls._client.is_closed:
                 cls._client = httpx.AsyncClient(
                     timeout=cls.DEFAULT_TIMEOUT,
                 )
-            try:
-                yield cls._client
-            except httpx.TransportError as e:
-                logger.error(f"httpx client transport error: {e}")
-                await cls.close()
-                cls._client = None
-                raise
-            except httpx.HTTPError as e:
-                logger.warning(f"httpx client HTTP error: {e}")
-                raise
+            return cls._client
+
+    @classmethod
+    async def _reset_client(cls) -> None:
+        async with cls._lock:
+            if cls._client and not cls._client.is_closed:
+                await cls._client.aclose()
+            cls._client = None
 
     @classmethod
     async def close(cls):
@@ -76,10 +72,15 @@ def configure_defaults(cls, timeout: float = DEFAULT_TIMEOUT, retry_config: dict
     async def get(cls, url: str, **kwargs) -> httpx.Response | None:
         @retry(**cls.DEFAULT_RETRY)
         async def _get():
-            async with cls.get_client() as client:
+            client = await cls._ensure_client()
+            try:
                 response = await client.get(url, **kwargs)
                 response.raise_for_status()
                 return response
+            except httpx.TransportError as e:
+                logger.error(f"httpx client transport error: {e}")
+                await cls._reset_client()
+                raise
 
         try:
             return await _get()
@@ -91,10 +92,15 @@ async def _get():
     async def post(cls, url: str, json: dict[str, Any] | None = None, **kwargs) -> httpx.Response | None:
         @retry(**cls.DEFAULT_RETRY)
         async def _post():
-            async with cls.get_client() as client:
+            client = await cls._ensure_client()
+            try:
                 response = await client.post(url, json=json, **kwargs)
                 response.raise_for_status()
                 return response
+            except httpx.TransportError as e:
+                logger.error(f"httpx client transport error: {e}")
+                await cls._reset_client()
+                raise
 
         try:
             return await _post()
@@ -106,10 +112,15 @@ async def _post():
     async def delete(cls, url: str, **kwargs) -> httpx.Response | None:
         @retry(**cls.DEFAULT_RETRY)
         async def _delete():
-            async with cls.get_client() as client:
+            client = await cls._ensure_client()
+            try:
                 response = await client.delete(url, **kwargs)
                 response.raise_for_status()
                 return response
+            except httpx.TransportError as e:
+                logger.error(f"httpx client transport error: {e}")
+                await cls._reset_client()
+                raise
 
         try:
             return await _delete()