qqmusic-api-python 0.3.6__tar.gz → 0.4.0__tar.gz

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qqmusic-api-python
-Version: 0.3.6
+Version: 0.4.0
 Summary: QQ音乐API封装库
 Project-URL: homepage, https://luren-dc.github.io/QQMusicApi/
 Project-URL: repository, https://github.com/luren-dc/QQMusicApi
@@ -23,6 +23,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Requires-Dist: aiocache>=0.12.3
 Requires-Dist: cryptography<45.0.6,>=45.0.5
+Requires-Dist: httpx-ws>=0.8.2
 Requires-Dist: httpx[http2]>=0.27.0
 Requires-Dist: orjson>=3.10.15
 Requires-Dist: typing-extensions>=4.12.2
@@ -30,19 +31,19 @@ Description-Content-Type: text/markdown
 
 <div align="center">
     <a>
-        <img src="https://socialify.git.ci/luren-dc/QQMusicApi/image?description=1&font=Source%20Code%20Pro&language=1&logo=https%3A%2F%2Fy.qq.com%2Fmediastyle%2Fmod%2Fmobile%2Fimg%2Flogo.svg&name=1&pattern=Overlapping%20Hexagons&theme=Auto">
+        <img src="https://socialify.git.ci/l-1124/QQMusicApi/image?description=1&font=Source%20Code%20Pro&language=1&logo=https%3A%2F%2Fy.qq.com%2Fmediastyle%2Fmod%2Fmobile%2Fimg%2Flogo.svg&name=1&pattern=Overlapping%20Hexagons&theme=Auto">
     </a>
     <a href="https://www.python.org">
         <img src="https://img.shields.io/badge/Python-3.10|3.11|3.12|3.13-blue" alt="Python">
     </a>
-    <a href="https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file">
-        <img src="https://img.shields.io/github/license/luren-dc/QQMusicApi" alt="GitHub license">
+    <a href="https://github.com/l-1124/QQMusicApi?tab=MIT-1-ov-file">
+        <img src="https://img.shields.io/github/license/l-1124/QQMusicApi" alt="GitHub license">
     </a>
-    <a href="https://github.com/luren-dc/QQMusicApi/stargazers">
-        <img src="https://img.shields.io/github/stars/luren-dc/QQMusicApi?color=yellow&label=Github%20Stars" alt="STARS">
+    <a href="https://github.com/l-1124/QQMusicApi/stargazers">
+        <img src="https://img.shields.io/github/stars/l-1124/QQMusicApi?color=yellow&label=Github%20Stars" alt="STARS">
     </a>
-    <a href="https://github.com/luren-dc/QQMusicApi/actions/workflows/testing.yml">
-        <img src="https://github.com/luren-dc/QQMusicApi/actions/workflows/testing.yml/badge.svg?branch=main" alt="Testing">
+    <a href="https://github.com/l-1124/QQMusicApi/actions/workflows/testing.yml">
+        <img src="https://github.com/l-1124/QQMusicApi/actions/workflows/testing.yml/badge.svg?branch=main" alt="Testing">
     </a>
 </div>
 
@@ -53,9 +54,9 @@ Description-Content-Type: text/markdown
 >
 > **音乐平台不易，请尊重版权，支持正版。**
 
-**文档**: <a href="https://luren-dc.github.io/QQMusicApi" target="_blank">https://luren-dc.github.io/QQMusicApi</a>
+**文档**: <a href="https://l-1124.github.io/QQMusicApi" target="_blank">https://l-1124.github.io/QQMusicApi</a>
 
-**源代码**: <a href="https://github.com/luren-dc/QQMusicApi" target="_blank">https://github.com/luren-dc/QQMusicApi</a>
+**源代码**: <a href="https://github.com/l-1124/QQMusicApi" target="_blank">https://github.com/l-1124/QQMusicApi</a>
 
 ## 介绍
 
@@ -102,7 +103,7 @@ asyncio.run(main())
 
 ## License
 
-本项目基于 **[MIT License](https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file)** 许可证发行。
+本项目基于 **[MIT License](https://github.com/l-1124/QQMusicApi?tab=MIT-1-ov-file)** 许可证发行。
 
 ## 免责声明
 
@@ -110,4 +111,4 @@ asyncio.run(main())
 
 ## 贡献者
 
-[![Contributor](https://contrib.rocks/image?repo=luren-dc/QQMusicApi)](https://github.com/luren-dc/QQMusicApi/graphs/contributors)
+[![Contributor](https://contrib.rocks/image?repo=l-1124/QQMusicApi)](https://github.com/l-1124/QQMusicApi/graphs/contributors)

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/README.md

@@ -1,18 +1,18 @@
 <div align="center">
     <a>
-        <img src="https://socialify.git.ci/luren-dc/QQMusicApi/image?description=1&font=Source%20Code%20Pro&language=1&logo=https%3A%2F%2Fy.qq.com%2Fmediastyle%2Fmod%2Fmobile%2Fimg%2Flogo.svg&name=1&pattern=Overlapping%20Hexagons&theme=Auto">
+        <img src="https://socialify.git.ci/l-1124/QQMusicApi/image?description=1&font=Source%20Code%20Pro&language=1&logo=https%3A%2F%2Fy.qq.com%2Fmediastyle%2Fmod%2Fmobile%2Fimg%2Flogo.svg&name=1&pattern=Overlapping%20Hexagons&theme=Auto">
     </a>
     <a href="https://www.python.org">
         <img src="https://img.shields.io/badge/Python-3.10|3.11|3.12|3.13-blue" alt="Python">
     </a>
-    <a href="https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file">
-        <img src="https://img.shields.io/github/license/luren-dc/QQMusicApi" alt="GitHub license">
+    <a href="https://github.com/l-1124/QQMusicApi?tab=MIT-1-ov-file">
+        <img src="https://img.shields.io/github/license/l-1124/QQMusicApi" alt="GitHub license">
     </a>
-    <a href="https://github.com/luren-dc/QQMusicApi/stargazers">
-        <img src="https://img.shields.io/github/stars/luren-dc/QQMusicApi?color=yellow&label=Github%20Stars" alt="STARS">
+    <a href="https://github.com/l-1124/QQMusicApi/stargazers">
+        <img src="https://img.shields.io/github/stars/l-1124/QQMusicApi?color=yellow&label=Github%20Stars" alt="STARS">
     </a>
-    <a href="https://github.com/luren-dc/QQMusicApi/actions/workflows/testing.yml">
-        <img src="https://github.com/luren-dc/QQMusicApi/actions/workflows/testing.yml/badge.svg?branch=main" alt="Testing">
+    <a href="https://github.com/l-1124/QQMusicApi/actions/workflows/testing.yml">
+        <img src="https://github.com/l-1124/QQMusicApi/actions/workflows/testing.yml/badge.svg?branch=main" alt="Testing">
     </a>
 </div>
 
@@ -23,9 +23,9 @@
 >
 > **音乐平台不易，请尊重版权，支持正版。**
 
-**文档**: <a href="https://luren-dc.github.io/QQMusicApi" target="_blank">https://luren-dc.github.io/QQMusicApi</a>
+**文档**: <a href="https://l-1124.github.io/QQMusicApi" target="_blank">https://l-1124.github.io/QQMusicApi</a>
 
-**源代码**: <a href="https://github.com/luren-dc/QQMusicApi" target="_blank">https://github.com/luren-dc/QQMusicApi</a>
+**源代码**: <a href="https://github.com/l-1124/QQMusicApi" target="_blank">https://github.com/l-1124/QQMusicApi</a>
 
 ## 介绍
 
@@ -72,7 +72,7 @@ asyncio.run(main())
 
 ## License
 
-本项目基于 **[MIT License](https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file)** 许可证发行。
+本项目基于 **[MIT License](https://github.com/l-1124/QQMusicApi?tab=MIT-1-ov-file)** 许可证发行。
 
 ## 免责声明
 
@@ -80,4 +80,4 @@ asyncio.run(main())
 
 ## 贡献者
 
-[![Contributor](https://contrib.rocks/image?repo=luren-dc/QQMusicApi)](https://github.com/luren-dc/QQMusicApi/graphs/contributors)
+[![Contributor](https://contrib.rocks/image?repo=l-1124/QQMusicApi)](https://github.com/l-1124/QQMusicApi/graphs/contributors)

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/pyproject.toml

@@ -10,6 +10,7 @@ dependencies = [
   "httpx[http2]>=0.27.0",
   "aiocache>=0.12.3",
   "orjson>=3.10.15",
+  "httpx-ws>=0.8.2",
 ]
 requires-python = ">=3.10"
 readme = "README.md"

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/qqmusic_api/__init__.py

@@ -1,13 +1,21 @@
 import logging
+import os
+import sys
 
 from . import album, comment, login, lyric, mv, search, singer, song, songlist, top, user
 from .utils.credential import Credential
 from .utils.session import Session, get_session, set_session
 
-__version__ = "0.3.6"
+__version__ = "0.4.0"
 
 logger = logging.getLogger("qqmusicapi")
 
+# Change to the "Selector" event loop if platform is Windows
+if sys.platform.lower() == "win32" or os.name.lower() == "nt":
+    from asyncio import WindowsSelectorEventLoopPolicy, set_event_loop_policy
+
+    set_event_loop_policy(WindowsSelectorEventLoopPolicy())
+
 
 __all__ = [
     "Credential",

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/qqmusic_api/comment.py

@@ -1,8 +1,6 @@
 """评论 API"""
 
-from typing import Any, cast
-
-from .utils.network import api_request
+from .utils.network import NO_PROCESSOR, api_request
 
 
 @api_request("music.globalComment.CommentCountSrv", "GetCmCount")
@@ -18,65 +16,7 @@ async def get_comment_count(biz_id: str):
             "biz_type": 1,
             "biz_sub_type": 2,
         },
-    }, lambda data: cast(dict[str, Any], data.get("response", {}))
-
-
-def _processor(data: dict[str, Any]):
-    """处理并返回结构化评论数据:
-
-    返回结构:
-    [
-        {
-            "Avatar": str,          # 用户头像 URL
-            "CmId": str,            # 评论 ID (后续需要获取全部子评论时需用到)
-            "PraiseNum": int,       # 点赞数
-            "Nick": str,            # 昵称
-            "Pic": str,             # 评论配图 (可能为空)
-            "Content": str,         # 评论内容
-            "SeqNo": str,           # 评论序号 ID 可以用于传递给 参数: last_comment_seq_no
-            "SubComments": [        # 子评论列表
-                {
-                    "Avatar": str,
-                    "Nick": str,
-                    "Content": str,
-                    "Pic": str,
-                    "PraiseNum": int,
-                    "SeqNo": str
-                }
-            ]
-        },
-        ...
-    ]
-    """
-    comments = data.get("CommentList", {}).get("Comments", [])
-    result = []
-
-    for comment in comments:
-        item = {
-            "Avatar": comment.get("Avatar"),
-            "CmId": comment.get("CmId"),
-            "PraiseNum": comment.get("PraiseNum"),
-            "Nick": comment.get("Nick"),
-            "Pic": comment.get("Pic"),
-            "Content": comment.get("Content"),
-            "SeqNo": comment.get("SeqNo"),
-            "SubComments": [],
-        }
-
-        for sub in comment.get("SubComments", []):
-            sub_item = {
-                "Avatar": sub.get("Avatar"),
-                "Nick": sub.get("Nick"),
-                "Content": sub.get("Content"),
-                "Pic": sub.get("Pic"),
-                "PraiseNum": sub.get("PraiseNum"),
-                "SeqNo": sub.get("SeqNo"),
-            }
-            item["SubComments"].append(sub_item)
-
-        result.append(item)
-
-    return result
+    }, NO_PROCESSOR
 
 
 @api_request("music.globalComment.CommentRead", "GetHotCommentList")
@@ -105,7 +45,7 @@ async def get_hot_comments(
         "PicEnable": 1,
     }
 
-    return params, _processor
+    return params, NO_PROCESSOR
 
 
 @api_request("music.globalComment.CommentRead", "GetNewCommentList")
@@ -140,7 +80,7 @@ async def get_new_comments(
         "AudioEnable": 1,
     }
 
-    return params, _processor
+    return params, NO_PROCESSOR
 
 
 @api_request("music.globalComment.CommentRead", "GetRecCommentList")
@@ -180,4 +120,28 @@ async def get_recommend_comments(
         "AudioEnable": 1,
     }
 
-    return params, _processor
+    return params, NO_PROCESSOR
+
+
+@api_request("music.globalComment.SongTsComment", "GetSongTsCmList")
+async def get_moment_comments(
+    biz_id: str,
+    page_size: int = 15,
+    last_comment_seq_no: str = "",
+):
+    """获取时刻评论
+
+    Args:
+        biz_id: 歌曲 ID
+        page_size: 每页数量
+        last_comment_seq_no: 上一页最后一条评论ID
+    """
+    params = {
+        "LastPos": last_comment_seq_no,
+        "HashTagID": "",
+        "SeekTs": -1,
+        "Size": page_size,
+        "BizType": 1,
+        "BizId": biz_id,
+    }
+    return params, NO_PROCESSOR

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/qqmusic_api/login.py

@@ -3,6 +3,7 @@
 import mimetypes
 import random
 import re
+from collections.abc import AsyncGenerator
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
@@ -15,6 +16,8 @@ import httpx
 from .exceptions.api_exception import CredentialExpiredError, LoginError, ResponseCodeError
 from .utils.common import hash33
 from .utils.credential import Credential
+from .utils.mqtt import Client as MqttClient
+from .utils.mqtt import MqttRedirectError, PropertyId
 from .utils.network import ApiRequest
 from .utils.session import get_session
 
@@ -30,7 +33,6 @@ async def check_expired(credential: Credential) -> bool:
         "GetLoginUserInfo",
         params={},
         credential=credential,
-        cacheable=False,
     )
 
     try:
@@ -65,7 +67,6 @@ async def refresh_cookies(credential: Credential) -> bool:
         common={"tmeLoginType": str(credential.login_type)},
         params=params,
         credential=credential,
-        cacheable=False,
     )
 
     try:
@@ -124,10 +125,12 @@ class QRLoginType(Enum):
 
     + QQ: QQ登录
     + WX: 微信登录
+    + MOBILE: 手机客户端登录
     """
 
     QQ = "qq"
     WX = "wx"
+    MOBILE = "mobile"
 
 
 @dataclass()
@@ -138,7 +141,7 @@ class QR:
         data: 二维码图像数据
         qr_type: 二维码类型
         mimetype: 二维码图像类型
-        identitfier: 标识符
+        identifier: 标识符
     """
 
     data: bytes
@@ -164,10 +167,13 @@ class QR:
         return file_path
 
 
+# 修改 qqmusic_api/login.py 中的 get_qrcode 函数
 async def get_qrcode(login_type: QRLoginType) -> QR:
     """获取登录二维码"""
     if login_type == QRLoginType.WX:
         return await _get_wx_qr()
+    if login_type == QRLoginType.MOBILE:
+        return await _get_mobile_qr()
     return await _get_qq_qr()
 
 
@@ -218,6 +224,27 @@ async def _get_wx_qr() -> QR:
     return QR(qrcode_data, QRLoginType.WX, "image/jpeg", uuid)
 
 
+async def _get_mobile_qr() -> QR:
+    import base64
+
+    res = await ApiRequest[[], dict[str, Any]](
+        "music.login.LoginServer",
+        "CreateQRCode",
+        params={
+            "tmeAppID": "qqmusic",
+            "ct": 11,
+            "cv": 13020508,
+        },
+    )()
+
+    return QR(
+        data=base64.b64decode(res["qrcode"].split(",")[-1]),
+        qr_type=QRLoginType.MOBILE,
+        mimetype="image/png",
+        identifier=res["qrcodeID"],
+    )
+
+
 async def check_qrcode(qrcode: QR) -> tuple[QRCodeLoginEvents, Credential | None]:
     """检查二维码状态"""
     if qrcode.qr_type == QRLoginType.WX:
@@ -302,6 +329,95 @@ async def _check_wx_qr(qrcode: QR) -> tuple[QRCodeLoginEvents, Credential | None
     return event, None
 
 
+async def check_mobile_qr(qrcode: QR) -> AsyncGenerator[tuple[QRCodeLoginEvents, Credential | None], None]:  # noqa: C901
+    """检查手机客户端登录二维码状态
+
+    Args:
+        qrcode: 二维码对象
+    """
+    if qrcode.qr_type != QRLoginType.MOBILE:
+        raise ValueError(f"不支持{qrcode.qr_type}类型的二维码")
+    client_id = f"{int(time() * 1000)}{random.randint(1000, 9999)}"
+    client = MqttClient(client_id=client_id, host="mu.y.qq.com", port=443, path="/ws/handshake", keep_alive=45)
+    async with client:
+        max_redirects = 3
+        for attempt in range(max_redirects + 1):
+            try:
+                await client.connect(
+                    properties={
+                        PropertyId.AUTH_METHOD: "pass",
+                        PropertyId.USER_PROPERTY: [
+                            ("tmeAppID", "qqmusic"),
+                            ("business", "management"),
+                            ("hashTag", qrcode.identifier),
+                            ("clientTag", "management.user"),
+                            ("userID", qrcode.identifier),
+                        ],
+                    },
+                    headers={
+                        "Origin": "https://y.qq.com",
+                        "Referer": "https://y.qq.com/",
+                        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
+                    },
+                )
+                break
+            except MqttRedirectError as e:
+                if attempt == max_redirects:
+                    raise LoginError("[MobileLogin] 重定向次数过多") from e
+
+                client.path = f"/ws/handshake/{e.new_address}"
+                continue
+        await client.subscribe(
+            f"management.qrcode_login/{qrcode.identifier}",
+            properties={
+                PropertyId.USER_PROPERTY: [
+                    ("authorization", "tmelogin"),
+                    ("pubsub", "unicast"),
+                ]
+            },
+        )
+        yield QRCodeLoginEvents.SCAN, None
+        async for msg in client.messages():
+            event_type = msg.properties.get("type")
+
+            match event_type:
+                case "scanned":
+                    yield QRCodeLoginEvents.CONF, None
+
+                case "cookies":
+                    data = msg.json
+                    if data:
+                        cookies: dict[str, Any] = {
+                            k: v.get("value") if isinstance(v, dict) else v for k, v in data.get("cookies", {}).items()
+                        }
+                        res = await ApiRequest[[], dict[str, Any]](
+                            "music.login.LoginServer",
+                            "Login",
+                            params={
+                                "musicid": int(cookies.get("qqmusic_uin", 0)),
+                                "qrCodeID": qrcode.identifier,
+                                "token": cookies.get("qqmusic_key", ""),
+                            },
+                            common={"tmeLoginType": "6"},
+                        )()
+
+                        yield QRCodeLoginEvents.DONE, Credential.from_cookies_dict(res)
+                    else:
+                        yield QRCodeLoginEvents.OTHER, None
+                    break
+                case "canceled":
+                    yield QRCodeLoginEvents.REFUSE, None
+                    break
+                case "timeout":
+                    yield QRCodeLoginEvents.TIMEOUT, None
+                    break
+                case "loginFailed":
+                    yield QRCodeLoginEvents.OTHER, None
+                    break
+                case _:
+                    pass
+
+
 async def _authorize_qq_qr(uin: str, sigx: str) -> Credential:
     session = get_session()
     resp = await session.get(
@@ -363,7 +479,6 @@ async def _authorize_qq_qr(uin: str, sigx: str) -> Credential:
             "QQLogin",
             common={"tmeLoginType": "2"},
             params={"code": code},
-            cacheable=False,
         )
         return Credential.from_cookies_dict(await api())
     except CredentialExpiredError:
@@ -381,7 +496,6 @@ async def _authorize_wx_qr(code: str) -> Credential:
             "Login",
             common={"tmeLoginType": "1"},
             params={"code": code, "strAppid": "wx48db31d50e334801"},
-            cacheable=False,
         )
         return Credential.from_cookies_dict(await api())
     except CredentialExpiredError:
@@ -405,7 +519,6 @@ async def send_authcode(phone: int, country_code: int = 86) -> tuple[PhoneLoginE
             "areaCode": str(country_code),
         },
         ignore_code=True,
-        cacheable=False,
     )()
 
     match resp["code"]:
@@ -432,7 +545,6 @@ async def phone_authorize(phone: int, auth_code: int, country_code: int = 86) ->
         common={"tmeLoginMethod": "3", "tmeLoginType": "0"},
         params={"code": str(auth_code), "phoneNo": str(phone), "areaCode": str(country_code), "loginMode": 1},
         ignore_code=True,
-        cacheable=False,
     )()
     match resp["code"]:
         case 20274:

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/qqmusic_api/mv.py

@@ -43,7 +43,7 @@ async def get_detail(vids: list[str]):
     }, NO_PROCESSOR
 
 
-@api_request("music.stream.MvUrlProxy", "GetMvUrls", exclude_params=["guid"])
+@api_request("music.stream.MvUrlProxy", "GetMvUrls")
 async def get_mv_urls(vids: list[str]):
     """获取 MV 播放链接
 

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/qqmusic_api/search.py

@@ -33,13 +33,13 @@ class SearchType(Enum):
     AUDIO = 18
 
 
-@api_request("music.musicsearch.HotkeyService", "GetHotkeyForQQMusicMobile", exclude_params=["search_id"])
+@api_request("music.musicsearch.HotkeyService", "GetHotkeyForQQMusicMobile")
 async def hotkey():
     """获取热搜词"""
     return {"search_id": get_searchID()}, NO_PROCESSOR
 
 
-@api_request("music.smartboxCgi.SmartBoxCgi", "GetSmartBoxResult", exclude_params=["search_id"])
+@api_request("music.smartboxCgi.SmartBoxCgi", "GetSmartBoxResult")
 async def complete(keyword: str):
     """搜索词补全
 
@@ -70,7 +70,7 @@ async def quick_search(keyword: str) -> dict[str, Any]:
     return resp.json()["data"]
 
 
-@api_request("music.adaptor.SearchAdaptor", "do_search_v2", exclude_params=["searchid"])
+@api_request("music.adaptor.SearchAdaptor", "do_search_v2")
 async def general_search(
     keyword: str,
     page: int = 1,
@@ -94,7 +94,7 @@ async def general_search(
     }, NO_PROCESSOR
 
 
-@api_request("music.search.SearchCgiService", "DoSearchForQQMusicMobile", exclude_params=["searchid"])
+@api_request("music.search.SearchCgiService", "DoSearchForQQMusicMobile")
 async def search_by_type(
     keyword: str,
     search_type: SearchType = SearchType.SONG,

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/qqmusic_api/singer.py

@@ -237,7 +237,7 @@ async def get_tab_detail(mid: str, tab_type: TabType, page: int = 1, num: int =
 
     def _processor(data: dict[str, Any]) -> list[dict[str, Any]]:
         data = data[tab_type.tab_name]
-        return data.get("List", data.get("VideoList", data.get("AlbumList", data)))
+        return data.get("List") or data.get("VideoList") or data.get("AlbumList") or []
 
     return params, _processor
 

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/qqmusic_api/song.py

@@ -159,14 +159,16 @@ async def get_song_urls(
         urls = {}
         data = res["midurlinfo"]
         for info in data:
-            song_url = domain + info["wifiurl"] if info["wifiurl"] else ""
+            song_url = (
+                domain + info.get("purl") or info.get("wifiurl") if info.get("purl") or info.get("wifiurl") else ""
+            )
             if not encrypted:
                 urls[info["songmid"]] = song_url
             else:
                 urls[info["songmid"]] = (song_url, info["ekey"])
         return urls
 
-    rg = RequestGroup(credential=credential)
+    rg = RequestGroup(common={"ct": "19"}, credential=credential)
     for mid in mid_list:
         # 构造请求参数
         file_name = [f"{file_type.s}{_}{_}{file_type.e}" for _ in mid]
@@ -181,8 +183,6 @@ async def get_song_urls(
             api_data[1],
             params=params,
             credential=credential,
-            exclude_params=["guid"],
-            cacheable=False,
         )
         req.processor = _processor
         rg.add_request(req)
@@ -194,12 +194,7 @@ async def get_song_urls(
     return result
 
 
-@api_request(
-    "music.vkey.GetVkey",
-    "UrlGetVkey",
-    exclude_params=["guid"],
-    cacheable=False,
-)
+@api_request("music.vkey.GetVkey", "UrlGetVkey")
 async def get_try_url(mid: str, vs: str):
     """获取试听文件链接
 
@@ -217,7 +212,7 @@ async def get_try_url(mid: str, vs: str):
         "guid": get_guid(),
         "songmid": [mid],
         "songtype": [1],
-    }, lambda res: f"https://isure.stream.qqmusic.qq.com/{url}" if (url := res["midurlinfo"][0]["wifiurl"]) else ""
+    }, lambda res: f"https://isure.stream.qqmusic.qq.com/{url}" if (url := res["midurlinfo"][0]["wifiurl"]) else None
 
 
 @api_request("music.pf_song_detail_svr", "get_song_detail_yqq")

{qqmusic_api_python-0.3.6 → qqmusic_api_python-0.4.0}/qqmusic_api/songlist.py

@@ -78,9 +78,9 @@ async def get_songlist(
     return songs
 
 
-@api_request("music.musicasset.PlaylistBaseWrite", "AddPlaylist", verify=True, cacheable=False)
+@api_request("music.musicasset.PlaylistBaseWrite", "AddPlaylist", verify=True)
 async def create(dirname: str, *, credential: Credential | None = None):
-    """添加歌单, 重名会在名称后面添加时间戳
+    """创建歌单, 重名会在名称后面添加时间戳
 
     Args:
         dirname: 歌单名称
@@ -94,7 +94,7 @@ async def create(dirname: str, *, credential: Credential | None = None):
     }, lambda data: cast(dict[str, Any], data["result"])
 
 
-@api_request("music.musicasset.PlaylistBaseWrite", "DelPlaylist", verify=True, cacheable=False)
+@api_request("music.musicasset.PlaylistBaseWrite", "DelPlaylist", verify=True)
 async def delete(dirid: int, *, credential: Credential | None = None):
     """删除歌单
 
@@ -110,7 +110,7 @@ async def delete(dirid: int, *, credential: Credential | None = None):
     }, lambda data: data["result"]["dirId"] == dirid
 
 
-@api_request("music.musicasset.PlaylistDetailWrite", "AddSonglist", verify=True, cacheable=False)
+@api_request("music.musicasset.PlaylistDetailWrite", "AddSonglist", verify=True)
 async def add_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Credential | None = None):
     """添加歌曲到歌单
 
@@ -128,7 +128,7 @@ async def add_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Cre
     }, lambda data: bool(data["result"]["updateTime"])
 
 
-@api_request("music.musicasset.PlaylistDetailWrite", "DelSonglist", verify=True, cacheable=False)
+@api_request("music.musicasset.PlaylistDetailWrite", "DelSonglist", verify=True)
 async def del_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Credential | None = None):
     """删除歌单歌曲