完善虎牙账号管理并规范Cookie

core/huya/http_client.py

@@ -14,6 +14,7 @@ import urllib.parse
 import urllib.request
 from typing import Optional, Callable
 
+from .cookie_utils import cookie_pairs, normalize_cookie_pairs, normalize_huya_cookie
 from .taf_protocol import TafOutputStream, TafInputStream, TafType, TafStruct
 from .wup_protocol import WupRequest, WupResponse
 
@@ -122,16 +123,8 @@ class HuyaHttpClient:
     @staticmethod
     def _normalize_cookie(cookie: str) -> str:
         """HTTP 业务 UserId.sCookie 需要带 huya_ua 前缀，避免重复写入。"""
-        import re
-        cookie = (cookie or "").strip()
-        normalized = f"huya_ua={HTTP_HUYA_UA}"
-        if re.search(r"(?:^|;\s*)huya_ua=", cookie):
-            return re.sub(r"(^|;\s*)huya_ua=[^;]*",
-                          lambda m: f"{m.group(1)}{normalized}",
-                          cookie, count=1)
-        if not cookie:
-            return normalized
-        return f"{normalized}; {cookie}"
+        pairs = [(key, value) for key, value in cookie_pairs(normalize_huya_cookie(cookie)) if key != "huya_ua"]
+        return normalize_cookie_pairs([("huya_ua", HTTP_HUYA_UA), *pairs])
 
     @staticmethod
     def _build_user(uid: int, guid: str, cookie: str):
@@ -176,7 +169,7 @@ class HuyaHttpClient:
         user = ActivityUserId()
         user.lUid = uid
         user.sHuYaUA = HTTP_HUYA_UA
-        user.sCookie = cookie or ""
+        user.sCookie = normalize_huya_cookie(cookie)
         return user
 
     def call_rpc(self, service: str, method: str,