[0.8.6] add more cookie

Author: Radekyspec

app_state/__init__.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass, field
 from functools import partial
 from json import dumps, loads
+from platform import node
 from queue import Queue
 from typing import Optional, Any, List
 
@@ -129,10 +130,14 @@ def create_session(h_type: HeadersType) -> Session:
         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",
                         path="/")
+    session.cookies.set("device_name", node(), domain="bilibili.com",
+                        path="/")
+    session.cookies.set("device_platform", "Windows Version: 10.0 x86_64",
+                        domain="bilibili.com", path="/")
+    cookiejar_from_dict(cookies_dict,
+                        cookiejar=session.cookies)
     session.headers.update({
         "buvid": app_settings.app_buvid,
     })

models/workers/credentials/credential_manager.py

@@ -46,7 +46,7 @@ def reset_default():
         app_state.stream_status_default()
 
     @staticmethod
-    def add_cookie():
+    def add_cookie(allow_duplicate: bool = False) -> str:
         """
         Adds a new cookie credential to the credential manager.
 
@@ -64,9 +64,11 @@ def add_cookie():
         cookie_key = f"cookies|{uid}"
         CredentialManagerWorker.get_cookie_indices()
         if cookie_key in app_state.cookie_indices:
-            raise CredentialDuplicatedError(cookie_key)
-        app_state.cookie_indices.append(cookie_key)
-        app_state.usernames[cookie_key] = cookie_key
+            if not allow_duplicate:
+                raise CredentialDuplicatedError(cookie_key)
+        if cookie_key not in app_state.cookie_indices:
+            app_state.cookie_indices.append(cookie_key)
+            app_state.usernames[cookie_key] = cookie_key
         set_password(KEYRING_SERVICE_NAME, cookie_key,
                      dumps(app_state.cookies_dict))
         set_password(KEYRING_SERVICE_NAME, KEYRING_COOKIES_INDEX,

models/workers/login/__init__.py

@@ -1,2 +1,3 @@
+from .buvid_ticket import TicketFetchWorker
 from .fetch_login import FetchLoginWorker
 from .fetch_qr import FetchQRWorker

models/workers/login/buvid_ticket.py

@@ -0,0 +1,59 @@
+from time import time
+from urllib.parse import quote
+
+from PySide6.QtCore import Slot
+
+# local package import
+import app_state
+from constant import *
+from models.log import get_logger
+from models.workers.base import BaseWorker, run_wrapper
+from sign import ticket_hmac_sha256
+
+
+class TicketFetchWorker(BaseWorker):
+    def __init__(self):
+        super().__init__(name="ticket获取", headers_type=HeadersType.WEB)
+        self.logger = get_logger(self.__class__.__name__)
+
+    @Slot()
+    @run_wrapper
+    def run(self, /):
+        if int(app_state.cookies_dict.get("bili_ticket_expires", 0)) < int(
+                time()):
+            self.logger.info("buvid_ticket Request")
+            ticket_param = {
+                "key_id": "ec02",
+                "hexsign": ticket_hmac_sha256(int(time())),
+                "context[ts]": int(time()),
+                "csrf": app_state.cookies_dict.get("bili_jct", "")
+            }
+            response = self._session.post(
+                "https://api.bilibili.com/bapis/bilibili.api.ticket.v1.Ticket/GenWebTicket",
+                params=ticket_param)
+            self.logger.info("buvid_ticket Response")
+            response = response.json()
+            app_state.cookies_dict["bili_ticket"] = response["data"]["ticket"]
+            app_state.cookies_dict["bili_ticket_expires"] = str(
+                response["data"][
+                    "created_at"] + \
+                response["data"][
+                    "ttl"])
+
+        if not app_state.cookies_dict.get(
+                "buvid3") or not app_state.cookies_dict.get("buvid4"):
+            self.logger.info("buvid3 Request")
+            response = self._session.get(
+                "https://api.bilibili.com/x/frontend/finger/spi")
+            self.logger.info("buvid3 Response")
+            response = response.json()
+            app_state.cookies_dict["buvid3"] = response["data"]["b_3"]
+            app_state.cookies_dict["buvid4"] = quote(response["data"]["b_4"])
+
+    @Slot()
+    def on_finished(self):
+        from models.workers.credentials.credential_manager import \
+            CredentialManagerWorker
+
+        CredentialManagerWorker.add_cookie(True)
+        self._session.close()

models/workers/login/fetch_login.py

@@ -14,6 +14,7 @@
 from models.workers.announce import FetchAnnounceWorker
 from models.workers.area import FetchAreaWorker
 from models.workers.base import LongLiveWorker, run_wrapper
+from models.workers.login.buvid_ticket import TicketFetchWorker
 from models.workers.pre_live import FetchPreLiveWorker, FetchRoomStatusWorker
 from models.workers.usernames import FetchUsernamesWorker
 
@@ -28,6 +29,11 @@ def __init__(self, state: LoginState):
     @staticmethod
     def post_login(parent: "MainWindow", state: LoginState):
         if app_state.scan_status["scanned"]:
+            fetch_ticket = TicketFetchWorker()
+            parent.add_thread(
+                fetch_ticket,
+                on_finished=fetch_ticket.on_finished,
+            )
             fetch_status = FetchRoomStatusWorker()
             parent.add_thread(
                 fetch_status,

models/workers/usernames/fetch_usernames.py

@@ -7,7 +7,6 @@
 
 # local package import
 import app_state
-import constant
 from constant import *
 from models.log import get_logger
 from models.workers.base import BaseWorker, run_wrapper
@@ -34,11 +33,7 @@ def run(self, /) -> None:
             sleep(1)
             cookies = loads(cookies)
             self.logger.info(f"fetch username of {key} Request")
-            self._session.cookies.clear()
             self._session.cookies.update(cookies)
-            self._session.cookies.set("appkey", constant.APP_KEY,
-                                      domain="bilibili.com",
-                                      path="/")
             response = self._session.get(
                 url,
                 params=livehime_sign({},

sign/__init__.py

@@ -1,2 +1,3 @@
 from .app_sign import livehime_sign, order_payload
+from .bili_ticket import ticket_hmac_sha256
 from .gen_buvid import gen_buvid

sign/bili_ticket.py

@@ -0,0 +1,19 @@
+import hashlib
+import hmac
+
+
+def ticket_hmac_sha256(timestamp: int) -> str:
+    # 将密钥和消息转换为字节串
+    key = "XgwSnGZ1p".encode('utf-8')
+    message = f"ts{timestamp}".encode('utf-8')
+
+    # 创建HMAC对象，使用SHA256哈希算法
+    hmac_obj = hmac.new(key, message, hashlib.sha256)
+
+    # 计算哈希值
+    hash_value = hmac_obj.digest()
+
+    # 将哈希值转换为十六进制字符串
+    hash_hex = hash_value.hex()
+
+    return hash_hex