[0.8.4] add buvid to web headers

Author: Radekyspec

app_state/__init__.py

@@ -11,6 +11,7 @@
 
 import constant
 from constant import *
+from constant import HeadersType
 from sign import gen_buvid
 from .app_state_base import StateBase
 
@@ -120,9 +121,12 @@ class RoomInfo(StateBase):
 cookies_dict = {}
 
 
-def create_session() -> Session:
+def create_session(h_type: HeadersType) -> Session:
     session = Session()
-    session.headers.update(constant.HEADERS_APP)
+    if h_type == HeadersType.WEB:
+        session.headers.update(constant.HEADERS_WEB)
+    elif h_type == HeadersType.APP:
+        session.headers.update(constant.HEADERS_APP)
     cookiejar_from_dict(cookies_dict,
                         cookiejar=session.cookies)
     session.cookies.set("appkey", constant.APP_KEY, domain="bilibili.com",

constant/__init__.py

@@ -9,7 +9,7 @@
     "MAX_RECENT_TITLE", "VERSION", "DARK_COVER_CSS", "DARK_CSS", "LIGHT_COVER_CSS",
     "LIGHT_CSS",
     "ProxyMode", "PreferProto", "CoverStatus",
-    "WidgetIndex", "CacheType", "BackgroundMode"
+    "WidgetIndex", "CacheType", "BackgroundMode", "HeadersType"
 ]
 
 
@@ -56,6 +56,12 @@ class BackgroundMode(IntEnum):
     COVER = 3  # 等比适应
 
 
+@unique
+class HeadersType(IntEnum):
+    WEB = 0
+    APP = 1
+
+
 KEYRING_SERVICE_NAME = "StartLive|userCredentials"
 KEYRING_COOKIES = "cookies"
 KEYRING_COOKIES_INDEX = "cookiesIndex"

models/workers/base/BaseWorker.py

@@ -5,6 +5,7 @@
 from requests import Session
 
 from app_state import create_session
+from constant import HeadersType
 
 
 class BaseWorker(QRunnable):
@@ -18,15 +19,16 @@ class Signals(QObject):
     exception: Optional[Exception]
     signals: Signals
 
-    def __init__(self, name: str, *, with_session: bool = True):
+    def __init__(self, name: str, *, with_session: bool = True,
+                 headers_type: HeadersType = HeadersType.APP):
         super().__init__()
         self.name = name
         self.finished = False
         self.exception = None
         self.signals = self.Signals()
         self.setAutoDelete(True)
         if with_session:
-            self._session = create_session()
+            self._session = create_session(headers_type)
         else:
             self._session = None
 

models/workers/base/LongLiveWorker.py

@@ -1,11 +1,14 @@
+from constant import HeadersType
 from .BaseWorker import BaseWorker
 
 
 class LongLiveWorker(BaseWorker):
     is_running: bool
 
-    def __init__(self, name: str, *, with_session: bool = True):
-        super().__init__(name, with_session=with_session)
+    def __init__(self, name: str, *, with_session: bool = True,
+                 headers_type: HeadersType = HeadersType.APP):
+        super().__init__(name, with_session=with_session,
+                         headers_type=headers_type)
         self.is_running = True
 
     def stop(self) -> None:

models/workers/cover/cover_upload.py

@@ -6,7 +6,7 @@
 
 # local package import
 import app_state
-import constant
+from constant import HeadersType
 from exceptions import CoverUploadError
 from models.log import get_logger
 from models.workers.base import BaseWorker, run_wrapper
@@ -15,11 +15,9 @@
 
 class CoverUploadWorker(BaseWorker):
     def __init__(self, data: bytes | bytearray | memoryview):
-        super().__init__(name="封面上传")
+        super().__init__(name="封面上传", headers_type=HeadersType.WEB)
         self.data = data
         self.logger = get_logger(self.__class__.__name__)
-        self._session.headers.clear()
-        self._session.headers.update(constant.HEADERS_WEB)
 
     @Slot()
     @run_wrapper

models/workers/credentials/credential_manager.py

@@ -7,9 +7,9 @@
 
 # local package import
 import app_state
-import constant
 from app_state import dumps
 from constant import *
+from constant import HeadersType
 from exceptions import CredentialExpiredError, CredentialDuplicatedError
 from models.log import get_logger
 from models.states import LoginState
@@ -21,7 +21,7 @@
 
 class CredentialManagerWorker(BaseWorker):
     def __init__(self, cookie_index: int, is_new: bool = False):
-        super().__init__(name="凭据管理")
+        super().__init__(name="凭据管理", headers_type=HeadersType.WEB)
         self.cookie_index = cookie_index
         self.is_new = is_new
         self.logger = get_logger(self.__class__.__name__)
@@ -124,7 +124,6 @@ def run(self, /) -> None:
         saved_cookies = loads(saved_cookies)
         cookiejar_from_dict(saved_cookies,
                             cookiejar=self._session.cookies)
-        self._session.headers.update(constant.HEADERS_WEB)
         nav_url = "https://api.bilibili.com/x/web-interface/nav"
         self.logger.info(f"nav Request")
         response = self._session.get(

models/workers/login/fetch_login.py

@@ -7,7 +7,7 @@
 
 # local package import
 import app_state
-import constant
+from constant import HeadersType
 from exceptions import LoginError
 from models.log import get_logger
 from models.states import LoginState
@@ -20,12 +20,10 @@
 
 class FetchLoginWorker(LongLiveWorker):
     def __init__(self, state: LoginState):
-        super().__init__(name="登录")
+        super().__init__(name="登录", headers_type=HeadersType.WEB)
         self.state = state
         self.logger = get_logger(self.__class__.__name__)
         self.cookie_key = None
-        self._session.headers.clear()
-        self._session.headers.update(constant.HEADERS_WEB)
 
     @staticmethod
     def post_login(parent: "MainWindow", state: LoginState):

models/workers/login/fetch_qr.py

@@ -6,17 +6,15 @@
 
 # local package import
 import app_state
-import constant
+from constant import HeadersType
 from models.log import get_logger
 from models.workers.base import BaseWorker, run_wrapper
 
 
 class FetchQRWorker(BaseWorker):
     def __init__(self):
-        super().__init__(name="登录二维码")
+        super().__init__(name="登录二维码", headers_type=HeadersType.WEB)
         self.logger = get_logger(self.__class__.__name__)
-        self._session.headers.clear()
-        self._session.headers.update(constant.HEADERS_WEB)
 
     @Slot()
     @run_wrapper

models/workers/usernames/fetch_usernames.py

@@ -16,11 +16,9 @@
 
 class FetchUsernamesWorker(BaseWorker):
     def __init__(self, skip_user: str):
-        super().__init__(name="用户名更新")
+        super().__init__(name="用户名更新", headers_type=HeadersType.WEB)
         self._current_user = skip_user
         self.logger = get_logger(self.__class__.__name__)
-        self._session.headers.clear()
-        self._session.headers.update(constant.HEADERS_WEB)
 
     @Slot()
     @run_wrapper