Merge pull request #51 from TrueRou/develop

fix: invalid wechat cookies

Author: TrueRou

docs/examples.md

@@ -1,5 +1,9 @@
 # 例子
 
+::: danger
+1.4.0 版本说明：由于机台登录方式修改，导致 maimai.py 的 **ArcadeProvider** 暂时无法使用。我们正在积极研究新的登录方式，争取尽快恢复机台数据源的功能。
+:::
+
 所有的例子完全摘抄自 [maimai.py 单元测试](https://github.com/TrueRou/maimai.py/tree/main/tests)，仅推荐有经验的开发者阅读。
 
 如果你阅读下面的内容有困难，建议先阅读 [开始 章节](./get-started.md)。

docs/get-started.md

@@ -1,5 +1,9 @@
 # 开始
 
+::: danger
+1.4.0 版本说明：由于机台登录方式修改，导致 maimai.py 的 **ArcadeProvider** 暂时无法使用。我们正在积极研究新的登录方式，争取尽快恢复机台数据源的功能。
+:::
+
 安装方式：
 
 ```bash

docs/index.md

@@ -28,6 +28,6 @@ features:
   - title: 上传数据
     details: 支持将玩家成绩上传至数据源：目前支持上传分数至水鱼和落雪查分器。
   - title: 扩展查分
-    details: 特别的，我们支持从机台数据源获取成绩：目前支持通过微信代理或玩家二维码来查询成绩。
+    details: 因国服1.53更新，该功能目前暂不可用。
 ---
 

docs/providers/arcade.md

@@ -1,5 +1,9 @@
 # ArcadeProvider
 
+::: danger
+1.4.0 版本说明：由于机台登录方式修改，导致 maimai.py 的 **ArcadeProvider** 暂时无法使用。我们正在积极研究新的登录方式，争取尽快恢复机台数据源的功能。
+:::
+
 来自舞萌机台的接口，通过玩家二维码获取玩家加密 userId，进而获取分数等信息
 
 实现：IPlayerProvider, IScoreProvider, IRegionProvider, IPlayerIdentifierProvider

maimai_py/providers/arcade.py

@@ -59,6 +59,7 @@ async def _deser_score(score: dict, songs: "MaimaiSongs") -> Optional[Score]:
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(TitleServerNetworkError), reraise=True)
     async def get_player(self, identifier: PlayerIdentifier, client: "MaimaiClient") -> ArcadePlayer:
+        raise NotImplementedError("ArcadeProvider does not support new 1.53+ login method.")
         maimai_icons = await client.items(PlayerIcon)
         maimai_trophies = await client.items(PlayerTrophy)
         maimai_nameplates = await client.items(PlayerNamePlate)
@@ -76,6 +77,7 @@ async def get_player(self, identifier: PlayerIdentifier, client: "MaimaiClient")
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(TitleServerNetworkError), reraise=True)
     async def get_scores_all(self, identifier: PlayerIdentifier, client: "MaimaiClient") -> list[Score]:
+        raise NotImplementedError("ArcadeProvider does not support new 1.53+ login method.")
         maimai_songs = await client.songs()
         if identifier.credentials and isinstance(identifier.credentials, str):
             resp_list = await arcade.get_user_scores(identifier.credentials.encode(), http_proxy=self._http_proxy)
@@ -85,6 +87,7 @@ async def get_scores_all(self, identifier: PlayerIdentifier, client: "MaimaiClie
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(TitleServerNetworkError), reraise=True)
     async def get_regions(self, identifier: PlayerIdentifier, client: "MaimaiClient") -> list[PlayerRegion]:
+        raise NotImplementedError("ArcadeProvider does not support new 1.53+ login method.")
         if identifier.credentials and isinstance(identifier.credentials, str):
             resp_dict = await arcade.get_user_region(identifier.credentials.encode(), http_proxy=self._http_proxy)
             return [
@@ -100,5 +103,6 @@ async def get_regions(self, identifier: PlayerIdentifier, client: "MaimaiClient"
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type((TimeoutException, NetworkError)), reraise=True)
     async def get_identifier(self, code: Union[str, dict[str, str]], client: "MaimaiClient") -> PlayerIdentifier:
+        raise NotImplementedError("ArcadeProvider does not support new 1.53+ login method.")
         resp_bytes: bytes = await arcade.get_uid_encrypted(str(code), http_proxy=self._http_proxy)
         return PlayerIdentifier(credentials=resp_bytes.decode())

maimai_py/providers/wechat.py

@@ -120,17 +120,28 @@ async def get_player(self, identifier: PlayerIdentifier, client: "MaimaiClient")
 
     @retry(stop=stop_after_attempt(3), retry=retry_if_exception_type(RequestError), reraise=True)
     async def get_identifier(self, code: Union[str, dict[str, str]], client: "MaimaiClient") -> PlayerIdentifier:
+        wechat_ua = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 NetType/WIFI MicroMessenger/7.0.20.1781(0x6700143B) WindowsWechat(0x6307001e)"
+
         if isinstance(code, dict) and all([code.get("r"), code.get("t"), code.get("code"), code.get("state")]):
             headers = {
-                "User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 NetType/WIFI MicroMessenger/7.0.20.1781(0x6700143B) WindowsWechat(0x6307001e)",
                 "Host": "tgk-wcaime.wahlap.com",
+                "Upgrade-Insecure-Requests": "1",
                 "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+                "Sec-Fetch-Site": "none",
+                "Sec-Fetch-Mode": "navigate",
+                "Sec-Fetch-User": "?1",
+                "Sec-Fetch-Dest": "document",
+                "Accept-Encoding": "gzip, deflate, br",
+                "Accept-Language": "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7",
             }
             resp = await client._client.get(
-                "https://tgk-wcaime.wahlap.com/wc_auth/oauth/callback/maimai-dx", params=code, headers=headers
+                "https://tgk-wcaime.wahlap.com/wc_auth/oauth/callback/maimai-dx",
+                headers={"User-Agent": wechat_ua, **headers},
+                params=code,
             )
             if resp.status_code == 302 and resp.next_request:
-                resp_next = await client._client.get(resp.next_request.url, headers=headers)
+                resp_next = await client._client.get(resp.next_request.url, headers={"User-Agent": wechat_ua})
+                print(resp_next)
                 return PlayerIdentifier(credentials=dict(resp_next.cookies))
             else:
                 raise InvalidWechatTokenError("Invalid or expired Wechat token")