qqmusic-api-python 0.1.5__tar.gz → 0.1.6__tar.gz

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qqmusic-api-python
-Version: 0.1.5
+Version: 0.1.6
 Summary: QQ音乐API封装库
 Keywords: music,api,qqmusic,tencentmusic
 Home-page: https://github.com/luren-dc/QQMusicApi
@@ -22,9 +22,8 @@ Project-URL: Repository, https://github.com/luren-dc/QQMusicApi
 Project-URL: Documentation, https://github.com/luren-dc/QQMusicApi
 Requires-Python: <4.0,>=3.9
 Requires-Dist: cryptography<42.0.0,>=41.0.2
-Requires-Dist: requests<3.0.0,>=2.31.0
-Requires-Dist: aiohttp<4.0.0,>=3.9.5
 Requires-Dist: typing-extensions>=4.12.2
+Requires-Dist: httpx>=0.27.0
 Description-Content-Type: text/markdown
 
 <div align="center">
@@ -71,9 +70,10 @@ Description-Content-Type: text/markdown
 
 ## 依赖
 
-- [AIOHTTP](https://docs.aiohttp.org/)
-- [Requests](https://requests.readthedocs.io/)
+- ~~[AIOHTTP](https://docs.aiohttp.org/)~~
+- ~~[Requests](https://requests.readthedocs.io/)~~
 - [Cryptography](https://cryptography.io/)
+- [HTTPX](https://github.com/encode/httpx/)
 
 ## 快速上手
 

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/README.md

@@ -42,9 +42,10 @@
 
 ## 依赖
 
-- [AIOHTTP](https://docs.aiohttp.org/)
-- [Requests](https://requests.readthedocs.io/)
+- ~~[AIOHTTP](https://docs.aiohttp.org/)~~
+- ~~[Requests](https://requests.readthedocs.io/)~~
 - [Cryptography](https://cryptography.io/)
+- [HTTPX](https://github.com/encode/httpx/)
 
 ## 快速上手
 

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/pyproject.toml

@@ -12,9 +12,8 @@ authors = [
 ]
 dependencies = [
     "cryptography<42.0.0,>=41.0.2",
-    "requests<3.0.0,>=2.31.0",
-    "aiohttp<4.0.0,>=3.9.5",
     "typing-extensions>=4.12.2",
+    "httpx>=0.27.0",
 ]
 requires-python = "<4.0,>=3.9"
 readme = "README.md"
@@ -40,7 +39,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dynamic = []
-version = "0.1.5"
+version = "0.1.6"
 
 [project.license]
 text = "MIT"
@@ -73,7 +72,6 @@ docs = [
 ]
 mypy = [
     "mypy>=1.11.0",
-    "types-requests>=2.32.0.20240712",
 ]
 linting = [
     "ruff>=0.5.4",
@@ -121,9 +119,11 @@ convention = "google"
 "tests/*" = [
     "D",
 ]
+"examples/*" = [
+    "D",
+    "T",
+]
 "qqmusic_api/login.py" = [
-    "F405",
-    "F403",
     "D102",
 ]
 "qqmusic_api/__init__.py" = [

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/qqmusic_api/__init__.py

@@ -1,19 +1,21 @@
 from . import album, login, mv, search, singer, song, songlist, top
 from .utils.credential import Credential
-from .utils.network import get_aiohttp_session, set_aiohttp_session
+from .utils.network import get_session, set_session
+from .utils.sync import sync
 
-__version__ = "0.1.5"
+__version__ = "0.1.6"
 
 __all__ = [
     "album",
     "Credential",
-    "get_aiohttp_session",
+    "get_session",
     "login",
     "mv",
     "search",
-    "set_aiohttp_session",
+    "set_session",
     "singer",
     "song",
     "songlist",
+    "sync",
     "top",
 ]

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/qqmusic_api/album.py

@@ -2,7 +2,6 @@
 
 from typing import Optional
 
-from .song import Song
 from .utils.network import Api
 from .utils.utils import get_api
 
@@ -14,27 +13,44 @@ class Album:
 
     Attributes:
         mid: 专辑 mid
+        id:  专辑 id
     """
 
     def __init__(
         self,
+        *,
         mid: Optional[str] = None,
         id: Optional[int] = None,
     ):
-        """初始化专辑类
+        """/// admonition | 注意
+        歌曲 mid 和 id，两者至少提供一个
+        ///
 
         Args:
             mid: 专辑 mid
-            id: 专辑 id
+            id:  专辑 id
         """
-        # ID 检查
         if mid is None and id is None:
             raise ValueError("mid or id must be provided")
         self.mid = mid
         self.id = id
+        self._info: Optional[dict] = None
 
-    def __repr__(self) -> str:
-        return f"Album(mid={self.mid}, id={self.id})"
+    async def get_mid(self) -> str:
+        """获取专辑 mid
+
+        Returns:
+            专辑 mid
+        """
+        return (await self.get_detail())["basicInfo"]["albumMid"]
+
+    async def get_id(self) -> int:
+        """获取专辑 id
+
+        Returns:
+            专辑 id
+        """
+        return (await self.get_detail())["basicInfo"]["albumID"]
 
     async def get_detail(self) -> dict:
         """获取专辑详细信息
@@ -42,13 +58,15 @@ class Album:
         Returns:
             专辑详细信息
         """
-        return await Api(**API["detail"]).update_params(albumMid=self.mid, albumId=self.id).result
+        if not self._info:
+            self._info = await Api(**API["detail"]).update_params(albumMid=self.mid, albumId=self.id).result
+        return self._info
 
-    async def get_song(self) -> list[Song]:
+    async def get_song(self) -> list[dict]:
         """获取专辑歌曲
 
         Returns:
             歌曲列表
         """
         result = await Api(**API["song"]).update_params(albumMid=self.mid, albumId=self.id, begin=0, num=0).result
-        return [Song.from_dict(song["songInfo"]) for song in result["songList"]]
+        return [song["songInfo"] for song in result["songList"]]

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/qqmusic_api/data/api/login.json

@@ -3,7 +3,10 @@
         "module": "QQConnectLogin.LoginServer",
         "method": "QQLogin",
         "params": {
-            "code": "str 鉴权码"
+            "code": "str 鉴权码",
+            "musicid": "int",
+            "musickey": "str",
+            "refresh_key": "str"
         },
         "extra_common": {
             "tmeLoginType": "str 2"
@@ -15,7 +18,11 @@
         "method": "Login",
         "params": {
             "strAppid": "wx48db31d50e334801",
-            "code": "str 鉴权码"
+            "code": "str 鉴权码",
+            "str_musicid": "str",
+            "musickey": "str",
+            "refresh_key": "str",
+            "loginMode": "int 2"
         },
         "extra_common": {
             "tmeLoginType": "str 1"
@@ -47,23 +54,5 @@
             "tmeLoginMethod": "str 3"
         },
         "comment": "发送验证码"
-    },
-    "refresh": {
-        "module": "music.login.LoginServer",
-        "method": "Login",
-        "params": {
-            "openid": "str",
-            "access_token": "str",
-            "refresh_token": "str",
-            "expired_in": "int",
-            "musicid": "str 必须",
-            "musickey": "str",
-            "refresh_key": "str 必须",
-            "loginMode": "int 2"
-        },
-        "extra_common": {
-            "tmeLoginMethod": "str 可填2"
-        },
-        "comment": "刷新cookies"
     }
 }

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/qqmusic_api/data/api/search.json

@@ -11,10 +11,10 @@
         "module": "tencent_music_soso_smartbox_cgi.SmartBoxCgi",
         "method": "GetSmartBoxResult",
         "params": {
+            "search_id": "int 随机生成",
             "query": "str 搜索词",
             "num_per_page": "int 每页返回数量",
-            "highlight": "int 是否高亮搜索词",
-            "page_idx": "int 页数"
+            "page_idx": "int 1"
         },
         "comment": "获取搜索词补全"
     },
@@ -30,12 +30,13 @@
         "module": "music.adaptor.SearchAdaptor",
         "method": "do_search_v2",
         "params": {
-            "search_id": "int 随机生成",
+            "searchid": "int 随机生成",
             "search_type": "int 100",
             "query": "str 搜索词",
-            "highlight": "int 是否高亮搜索词",
             "grp": "int 是否返回歌曲其他版本",
-            "page_id": "int 页数"
+            "highlight": "int 是否高亮搜索词",
+            "page_id": "int 页数",
+            "page_num": "int 15"
         },
         "comment": "综合搜索"
     },
@@ -46,10 +47,9 @@
             "search_id": "int 随机生成",
             "search_type": "int 搜索类型",
             "query": "str 搜索词",
-            "highlight": "int 是否高亮搜索词",
-            "page_id": "int 页数",
             "page_num": "int 页数",
             "num_per_page": "int 每页返回数量",
+            "highlight": "int 是否高亮搜索词",
             "selectors": "dict 选择器"
         },
         "comment": "桌面端搜索"
@@ -58,13 +58,12 @@
         "module": "music.search.SearchCgiService",
         "method": "DoSearchForQQMusicMobile",
         "params": {
-            "search_id": "int 随机生成",
+            "searchid": "int 随机生成",
             "search_type": "int 搜索类型",
             "query": "str 搜索词",
-            "highlight": "int 是否高亮搜索词",
-            "page_id": "int 页数",
             "page_num": "int 页数",
             "grp": "int 是否返回歌曲其他版本",
+            "highlight": "int 是否高亮搜索词",
             "num_per_page": "int 每页返回数量",
             "selectors": "dict 选择器"
         },

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/qqmusic_api/data/api/song.json

@@ -50,7 +50,8 @@
         "method": "GetSongRelatedMv",
         "params": {
             "songid": "int 歌曲 ID",
-            "songmid": "str 歌曲 mid"
+            "songtype": "int 1",
+            "lastmvid": "用于刷新列表"
         },
         "comment": "获取相关MV"
     },

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/qqmusic_api/login.py

@@ -9,7 +9,7 @@ from abc import ABC, abstractmethod
 from enum import Enum
 from typing import Optional
 
-import aiohttp
+import httpx
 
 if sys.version_info >= (3, 12):
     from typing import override
@@ -60,7 +60,7 @@ class Login(ABC):
     """登录基类
 
     Attributes:
-        auth_url: 验证链接，用于鉴权和滑块验证
+        auth_url:   验证链接，用于鉴权和滑块验证
         credential: 用户凭证
     """
 
@@ -73,7 +73,8 @@ class QRCodeLogin(Login):
     """二维码登录基类
 
     Attributes:
-        musicid: 登录账号
+        musicid:    登录账号
+        credential: 用户凭证
     """
 
     def __init__(self) -> None:
@@ -81,12 +82,17 @@ class QRCodeLogin(Login):
         self.musicid = ""
         self._state: Optional[QrCodeLoginEvents] = None
         self._qrcode_data: Optional[bytes] = None
-        self._session = aiohttp.ClientSession()
+        self._session = httpx.AsyncClient(
+            timeout=20,
+            headers={
+                "User-Agent": "Mozilla/5.0 (Windows NT 11.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/116.0.1938.54",
+            },
+        )
 
     async def close(self):
         """关闭登录会话"""
-        if not self._session.closed:
-            await self._session.close()
+        if not self._session.is_closed:
+            await self._session.aclose()
 
     async def __aenter__(self):
         await self._session.__aenter__()
@@ -126,10 +132,13 @@ class QRCodeLogin(Login):
         """
 
 
-# TODO: 优化扫码登录流程
 class QQLogin(QRCodeLogin):
     """QQ登录"""
 
+    def __init__(self) -> None:
+        super().__init__()
+        self._session.headers.update({"Referer": "https://xui.ptlogin2.qq.com/"})
+
     @override
     async def get_qrcode(self):
         if self._qrcode_data and self._state not in [
@@ -138,7 +147,7 @@ class QQLogin(QRCodeLogin):
             QrCodeLoginEvents.DONE,
         ]:
             return self._qrcode_data
-        async with self._session.get(
+        res = await self._session.get(
             "https://xui.ptlogin2.qq.com/cgi-bin/xlogin",
             params={
                 "appid": "716027609",
@@ -154,9 +163,10 @@ class QQLogin(QRCodeLogin):
                 "theme": "2",
                 "verify_theme": "",
             },
-        ) as res:
-            self.sig = res.cookies.get("pt_login_sig").value
-        async with self._session.get(
+        )
+        self._sig = res.cookies["pt_login_sig"]
+
+        res = await self._session.get(
             "https://ssl.ptlogin2.qq.com/ptqrshow",
             params={
                 "appid": "716027609",
@@ -169,20 +179,20 @@ class QQLogin(QRCodeLogin):
                 "daid": "383",
                 "pt_3rd_aid": "100497308",
             },
-        ) as res:
-            self.ptqrtoken = hash33(res.cookies.get("qrsig").value)
-            self._qrcode_data = await res.read()
-            return self._qrcode_data
+        )
+        self._ptqrtoken = hash33(res.cookies["qrsig"])
+        self._qrcode_data = res.read()
+        return self._qrcode_data
 
     @override
     async def get_qrcode_state(self):
         if not self._qrcode_data:
             raise LoginException("请先获取二维码")
-        async with self._session.get(
+        res = await self._session.get(
             "https://ssl.ptlogin2.qq.com/ptqrlogin",
             params={
                 "u1": "https://graph.qq.com/oauth2.0/login_jump",
-                "ptqrtoken": self.ptqrtoken,
+                "ptqrtoken": self._ptqrtoken,
                 "ptredirect": "0",
                 "h": "1",
                 "t": "1",
@@ -192,15 +202,16 @@ class QQLogin(QRCodeLogin):
                 "action": f"0-0-{int(time.time() * 1000)}",
                 "js_ver": "20102616",
                 "js_type": "1",
-                "login_sig": self.sig,
+                "login_sig": self._sig,
                 "pt_uistyle": "40",
                 "aid": "716027609",
                 "daid": "383",
                 "pt_3rd_aid": "100497308",
                 "has_onekey": "1",
             },
-        ) as res:
-            data = await res.text()
+        )
+        data = res.text
+
         text_to_state = {
             "二维码未失效": QrCodeLoginEvents.SCAN,
             "二维码认证中": QrCodeLoginEvents.CONF,
@@ -208,12 +219,16 @@ class QQLogin(QRCodeLogin):
             "本次登录已被拒绝": QrCodeLoginEvents.REFUSE,
             "登录成功": QrCodeLoginEvents.DONE,
         }
+
         state = QrCodeLoginEvents.OTHER
+
         for text, value in text_to_state.items():
             if text in data:
                 state = value
                 break
+
         self._state = state
+
         if state == QrCodeLoginEvents.DONE:
             self.musicid = re.findall(r"&uin=(.+?)&service", data)[0]
             self.auth_url = re.findall(r"'(https:.*?)'", data)[0]
@@ -223,24 +238,15 @@ class QQLogin(QRCodeLogin):
     async def authorize(self):
         if self.credential:
             return self.credential
-        if self._state != QrCodeLoginEvents.DONE:
+        if self._state != QrCodeLoginEvents.DONE or self.auth_url is None:
             raise LoginException("未完成二维码认证")
-        # TODO: 优化获取 p_skey
-        async with self._session.get(self.auth_url, allow_redirects=False) as res:  # type: ignore
-            from http import cookies
-
-            set_cookie_header = res.headers.getall("Set-Cookie", [])
-            for header in set_cookie_header:
-                cookie: cookies.SimpleCookie = cookies.SimpleCookie()
-                cookie.load(header)
-                for key, morsel in cookie.items():
-                    if morsel.value:
-                        self._session.cookie_jar.update_cookies(cookie)
-
-        skey = self._session.cookie_jar.filter_cookies(self.auth_url).get("p_skey").value  # type: ignore
-        async with self._session.post(
+        res = await self._session.get(self.auth_url, follow_redirects=True)
+
+        skey = self._session.cookies["p_skey"]
+
+        res = await self._session.post(
             "https://graph.qq.com/oauth2.0/authorize",
-            params={
+            headers={
                 "Referer": "https://graph.qq.com/oauth2.0/show?which=Login&display=pc&response_type=code&client_id"
                 "=100497308&redirect_uri=https://y.qq.com/portal/wx_redirect.html?login_type=1&surl=https"
                 "://y.qq.com/portal/profile.html#stat=y_new.top.user_pic&stat=y_new.top.pop.logout"
@@ -263,10 +269,10 @@ class QQLogin(QRCodeLogin):
                 "auth_time": str(int(time.time())),
                 "ui": uuid.uuid4(),
             },
-            allow_redirects=False,
-        ) as res:
-            location = res.headers.get("Location", "")
-            code = re.findall(r"(?<=code=)(.+?)(?=&)", location)[0]
+            follow_redirects=False,
+        )
+        location = res.headers.get("Location", "")
+        code = re.findall(r"(?<=code=)(.+?)(?=&)", location)[0]
         res = await Api(**API["QQ_login"]).update_params(code=code).update_extra_common(tmeLoginType="2").result
         self.credential = Credential.from_cookies(res)
         return self.credential
@@ -287,7 +293,7 @@ class WXLogin(QRCodeLogin):
             QrCodeLoginEvents.DONE,
         ]:
             return self._qrcode_data
-        async with self._session.get(
+        res = await self._session.get(
             "https://open.weixin.qq.com/connect/qrconnect",
             params={
                 "appid": "wx48db31d50e334801",
@@ -297,9 +303,9 @@ class WXLogin(QRCodeLogin):
                 "state": "STATE",
                 "href": "https://y.qq.com/mediastyle/music_v17/src/css/popup_wechat.css#wechat_redirect",
             },
-        ) as res:
-            self.__uuid = re.findall(r"uuid=(.+?)\"", await res.text())[0]
-        async with self._session.get(
+        )
+        self.__uuid = re.findall(r"uuid=(.+?)\"", res.text)[0]
+        res = await self._session.get(
             f"https://open.weixin.qq.com/connect/qrcode/{self.__uuid}",
             headers={
                 "referer": "https://open.weixin.qq.com/connect/qrconnect?appid=wx48db31d50e334801"
@@ -310,25 +316,30 @@ class WXLogin(QRCodeLogin):
                 "&href=https%3A%2F%2Fy.qq.com%2Fmediastyle%2Fmusic_v17%2Fsrc%2Fcss%2Fpopup_wechat.css"
                 "%23wechat_redirect"
             },
-        ) as res:
-            self._qrcode_data = await res.read()
-            return self._qrcode_data
+        )
+        self._qrcode_data = res.read()
+        return self._qrcode_data
 
     @override
     async def get_qrcode_state(self):
         if not self._qrcode_data:
             raise LoginException("请先获取二维码")
-        async with self._session.get(
-            "https://lp.open.weixin.qq.com/connect/l/qrconnect",
-            headers={
-                "referer": "https://open.weixin.qq.com/",
-            },
-            params={
-                "uuid": self.__uuid,
-                "_": str(int(round(time.time() * 1000))),
-            },
-        ) as res:
-            data = await res.text()
+
+        try:
+            res = await self._session.get(
+                "https://lp.open.weixin.qq.com/connect/l/qrconnect",
+                headers={
+                    "referer": "https://open.weixin.qq.com/",
+                },
+                params={
+                    "uuid": self.__uuid,
+                    "_": str(int(round(time.time() * 1000))),
+                },
+            )
+        except httpx.ReadTimeout:
+            return QrCodeLoginEvents.SCAN
+
+        data = res.text
 
         text_to_state = {
             "408": QrCodeLoginEvents.SCAN,
@@ -338,10 +349,12 @@ class WXLogin(QRCodeLogin):
         }
         state = QrCodeLoginEvents.OTHER
         for text, value in text_to_state.items():
-            if text in await res.text():
+            if text in data:
                 state = value
                 break
+
         self._state = state
+
         if state == QrCodeLoginEvents.DONE:
             self.musicid = re.findall(r"wx_code='(.+?)';", data)[0]
             self.auth_url = (
@@ -364,7 +377,7 @@ class WXLogin(QRCodeLogin):
             return self.credential
         if self._state != QrCodeLoginEvents.DONE:
             raise LoginException("未完成二维码认证")
-        await self._session.get(self.auth_url, allow_redirects=False)  # type: ignore
+        await self._session.get(self.auth_url, follow_redirects=False)  # type: ignore
         res = (
             await Api(**API["WX_login"])
             .update_params(strAppid="wx48db31d50e334801", code=self.musicid)
@@ -391,6 +404,7 @@ class PhoneLogin(Login):
         Raises:
             ValueError: 非法手机号
         """
+        super().__init__()
         if not re.compile(r"^1[3-9]\d{9}$").match(phone):
             raise ValueError("非法手机号")
         self.phone = phone
@@ -428,6 +442,8 @@ class PhoneLogin(Login):
         Raises:
             LoginException: 鉴权失败
         """
+        if self.credential:
+            return self.credential
         if not authcode:
             raise ValueError("authcode 为空")
         params = {"code": str(authcode), "phoneNo": self.phone, "loginMode": 1}
@@ -443,7 +459,8 @@ class PhoneLogin(Login):
                 raise LoginException("验证码过期或错误")
             else:
                 raise LoginException("未知情况，请提交 issue")
-        return Credential.from_cookies(res)
+        self.credential = Credential.from_cookies(res)
+        return self.credential
 
 
 async def refresh_cookies(credential: Credential) -> Credential:
@@ -452,19 +469,17 @@ async def refresh_cookies(credential: Credential) -> Credential:
     Args:
         credential: 用户凭证
 
-    Return:
+    Returns:
         新的用户凭证
     """
     credential.raise_for_cannot_refresh()
     params = {
         "refresh_key": credential.refresh_key,
+        "refresh_token": credential.refresh_token,
+        "musickey": credential.musickey,
         "musicid": credential.musicid,
-        "loginMode": 2,
     }
-    res = (
-        await Api(**API["refresh"])
-        .update_params(**params)
-        .update_extra_common(tmeLoginType=str(credential.login_type))
-        .result
-    )
+
+    api = API["WX_login"] if credential.login_type == 1 else API["QQ_login"]
+    res = await Api(**api).update_params(**params).update_extra_common(tmeLoginType=str(credential.login_type)).result
     return Credential.from_cookies(res)

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.6}/qqmusic_api/mv.py

@@ -2,7 +2,7 @@
 
 import random
 
-from .song import query_by_id
+from .song import query_song
 from .utils.network import Api
 from .utils.utils import get_api
 
@@ -24,9 +24,6 @@ class MV:
         """
         self.vid = vid
 
-    def __repr__(self) -> str:
-        return f"MV(vid={self.vid})"
-
     async def get_detail(self) -> dict:
         """获取 MV 详细信息
 
@@ -72,7 +69,7 @@ class MV:
             "required": ["related_songs"],
         }
         song_id = (await Api(**API["detail"]).update_params(**param).result)[self.vid]["related_songs"]
-        return await query_by_id(song_id)
+        return await query_song(song_id)
 
     async def get_url(self) -> dict:
         """获取 MV 播放链接