feat: fix cookies checking

Update pyproject.toml

Author: TrueRou

maimai_py/maimai.py

@@ -1217,7 +1217,10 @@ async def updates_chain(
                 if source_mode == "parallel" or (source_mode == "fallback" and len(source_tasks) == 0):
                     source_task = asyncio.create_task(self.scores(ident, sp))
                     if source_callback is not None:
-                        source_task.add_done_callback(lambda t, k=kwargs: source_callback(t.result(), t.exception(), k))
+                        empty_scores = await MaimaiScores(self).configure([])
+                        source_task.add_done_callback(
+                            lambda t, k=kwargs: source_callback(t.result() if not t.exception() else empty_scores, t.exception(), k)
+                        )
                     source_tasks.append(source_task)
         source_gather_results = await asyncio.gather(*source_tasks, return_exceptions=True)
         maimai_scores_list = [result for result in source_gather_results if isinstance(result, MaimaiScores)]

maimai_py/providers/wechat.py

@@ -31,6 +31,14 @@ class WechatProvider(IScoreProvider, IPlayerProvider, IPlayerIdentifierProvider,
     def _hash(self) -> str:
         return hashlib.md5(b"wechat").hexdigest()
 
+    @staticmethod
+    def _ensure_cookies(identifier: PlayerIdentifier) -> Cookies:
+        if isinstance(identifier.credentials, dict):
+            return Cookies(identifier.credentials)
+        if isinstance(identifier.credentials, Cookies):
+            return identifier.credentials
+        raise InvalidPlayerIdentifierError("Wahlap wechat cookies are required to fetch data")
+
     @staticmethod
     async def _deser_score(score: HTMLScore, songs: "MaimaiSongs") -> Optional[Score]:
         if song := await songs.by_title(score.title):
@@ -70,17 +78,13 @@ async def _crawl_scores(self, client: "MaimaiClient", cookies: Cookies, maimai_s
 
     async def get_scores_all(self, identifier: PlayerIdentifier, client: "MaimaiClient") -> list[Score]:
         maimai_songs = await client.songs()  # Ensure songs are loaded in cache
-        if not identifier.credentials or not isinstance(identifier.credentials, Cookies):
-            raise InvalidPlayerIdentifierError("Wahlap wechat cookies are required to fetch scores")
-        scores = await self._crawl_scores(client, identifier.credentials, maimai_songs)
+        scores = await self._crawl_scores(client, self._ensure_cookies(identifier), maimai_songs)
         return list(scores)
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(RequestError), reraise=True)
     async def get_player(self, identifier: PlayerIdentifier, client: "MaimaiClient") -> WechatPlayer:
         trophies = await client.items(PlayerTrophy)
-        if not identifier.credentials or not isinstance(identifier.credentials, Cookies):
-            raise InvalidPlayerIdentifierError("Wahlap wechat cookies are required to fetch player information")
-        resp = await client._client.get("https://maimai.wahlap.com/maimai-mobile/friend/userFriendCode/", cookies=identifier.credentials)
+        resp = await client._client.get("https://maimai.wahlap.com/maimai-mobile/friend/userFriendCode/", cookies=self._ensure_cookies(identifier))
         if resp.status_code == 302:
             raise InvalidPlayerIdentifierError("Failed to fetch player information, possibly due to invalid cookies or maintenance.")
         player = wmdx_html2player(str(resp.text))
@@ -112,16 +116,15 @@ async def get_identifier(self, code: Union[str, dict[str, str]], client: "Maimai
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(RequestError), reraise=True)
     async def get_friends(self, identifier: PlayerIdentifier, client: "MaimaiClient") -> list[WechatPlayer]:
         trophies = await client.items(PlayerTrophy)
-        if not identifier.credentials or not isinstance(identifier.credentials, Cookies):
-            raise InvalidPlayerIdentifierError("Wahlap wechat cookies are required to fetch friends")
+        cookies = self._ensure_cookies(identifier)
         # Prefetch the first page of friends, in order to get the total number of friends
-        resp = await client._client.get("https://maimai.wahlap.com/maimai-mobile/friend/", cookies=identifier.credentials)
+        resp = await client._client.get("https://maimai.wahlap.com/maimai-mobile/friend/", cookies=cookies)
         if resp.status_code == 302:
             raise InvalidPlayerIdentifierError("Failed to fetch friends, possibly due to invalid cookies or maintenance.")
         friend_num, players = wmdx_html2players(str(resp.text))
         # Fetch all friends by iterating through pages, 10 friends per page
         for page in range(2, (friend_num // 10) + 2):
-            resp = await client._client.get(f"https://maimai.wahlap.com/maimai-mobile/friend/pages/?idx={page}", cookies=identifier.credentials)
+            resp = await client._client.get(f"https://maimai.wahlap.com/maimai-mobile/friend/pages/?idx={page}", cookies=cookies)
             players.extend(wmdx_html2players(str(resp.text))[1])
         return [
             WechatPlayer(
@@ -137,32 +140,26 @@ async def get_friends(self, identifier: PlayerIdentifier, client: "MaimaiClient"
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(RequestError), reraise=True)
     async def set_rival_on(self, identifier: PlayerIdentifier, rival: WechatPlayer, client: "MaimaiClient") -> None:
-        if not identifier.credentials or not isinstance(identifier.credentials, Cookies):
-            raise InvalidPlayerIdentifierError("Wahlap wechat cookies are required to set rival status")
         resp = await client._client.post(
             "https://maimai.wahlap.com/maimai-mobile/friend/rivalOn/",
-            cookies=identifier.credentials,
+            cookies=self._ensure_cookies(identifier),
             data={"idx": rival.friend_code, "token": rival.token},
         )
         resp.raise_for_status()
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(RequestError), reraise=True)
     async def set_rival_off(self, identifier: PlayerIdentifier, rival: WechatPlayer, client: "MaimaiClient") -> None:
-        if not identifier.credentials or not isinstance(identifier.credentials, Cookies):
-            raise InvalidPlayerIdentifierError("Wahlap wechat cookies are required to set rival status")
         resp = await client._client.post(
             "https://maimai.wahlap.com/maimai-mobile/friend/rivalOff/",
-            cookies=identifier.credentials,
+            cookies=self._ensure_cookies(identifier),
             data={"idx": rival.friend_code, "token": rival.token},
         )
         resp.raise_for_status()
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(RequestError), reraise=True)
     async def get_records(self, identifier: PlayerIdentifier, client: "MaimaiClient") -> list[Score]:
         maimai_songs = await client.songs()  # Ensure songs are loaded in cache
-        if not identifier.credentials or not isinstance(identifier.credentials, Cookies):
-            raise InvalidPlayerIdentifierError("Wahlap wechat cookies are required to fetch scores")
-        resp = await client._client.get(f"https://maimai.wahlap.com/maimai-mobile/record/", cookies=identifier.credentials)
+        resp = await client._client.get(f"https://maimai.wahlap.com/maimai-mobile/record/", cookies=self._ensure_cookies(identifier))
         if resp.status_code == 302:
             raise InvalidPlayerIdentifierError("Failed to fetch records, possibly due to invalid cookies or maintenance.")
         scores = wmdx_html2record(str(resp.text))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "maimai-py"
-version = "1.3.7rc5"
+version = "1.3.7rc6"
 description = "The definitive python wrapper for MaimaiCN."
 authors = ["Usagi no Niku <chenbohan911@163.com>"]
 license = "MIT"