p115client 0.0.5.10.6__tar.gz → 0.0.5.10.7__tar.gz

{p115client-0.0.5.10.6 → p115client-0.0.5.10.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.10.6
+Version: 0.0.5.10.7
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -247,7 +247,7 @@ class MyCustom115Client(P115Client):
 
 ### 3. 检查响应
 
-接口被调用后，如果返回的是 dict 类型的数据（说明原本是 JSON），则可以用 `p115client.check_response` 执行检查。首先会查看其中名为 "state" 的键的对应值，如果为  True、1 或不存在，则原样返回被检查的数据；否则，"state" 的对应值大概是 False 或 0，说明有问题出现，会根据实际情况抛出一个异常，但都是 `OSError` 的实例，其中大部分还是 `p115client.P115OSError` 的实例。
+接口被调用后，如果返回的是 dict 类型的数据（说明原本是 JSON），则可以用 `p115client.check_response` 执行检查。首先会查看其中名为 "state" 的键的对应值，如果为  True、1 或不存在，则原样返回被检查的数据；否则，"state" 的对应值大概是 False 或 0，说明有问题出现，会根据实际情况抛出一个异常，但都是 `p115client.P115OSError` 的实例。
 
 ```python
 from p115client import check_response

{p115client-0.0.5.10.6 → p115client-0.0.5.10.7}/p115client/client.py

@@ -65,8 +65,8 @@ from yarl import URL
 
 from .const import CLASS_TO_TYPE, CLIENT_API_MAP, SSOENT_TO_APP, SUFFIX_TO_TYPE, errno
 from .exception import (
-    AuthenticationError, BusyOSError, DataError, LoginError, NotSupportedError, 
-    P115OSError, OperationalError, P115Warning, P115FileExistsError, 
+    AuthenticationError, BusyOSError, DataError, LoginError, OpenAppAuthLimitExceeded, 
+    NotSupportedError, P115OSError, OperationalError, P115Warning, P115FileExistsError, 
     P115FileNotFoundError, P115IsADirectoryError, 
 )
 from .type import RequestKeywords, MultipartResumeData, P115Cookies, P115URL
@@ -339,6 +339,10 @@ def get_first(m: Mapping, /, *keys, default=None):
     return default
 
 
+def contains_any(m: Mapping, /, *keys):
+    return any(k in m for k in keys)
+
+
 @overload
 def check_response(resp: dict, /) -> dict:
     ...
@@ -525,7 +529,7 @@ def check_response(resp: dict | Awaitable[dict], /) -> dict | Coroutine[Any, Any
                     raise OperationalError(errno.EINVAL, resp)
                 # {"state": 0, "errno": 40140122, "error": "超出授权应用个数上限"}
                 case 40140122:
-                    raise OperationalError(errno.EINVAL, resp)
+                    raise OpenAppAuthLimitExceeded(errno.EDQUOT, resp)
                 # {"state": 0, "errno": 40140123, "error": "access_token 格式错误（防篡改）"}
                 case 40140123:
                     raise OperationalError(errno.EINVAL, resp)
@@ -1286,6 +1290,8 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1297,6 +1303,8 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1307,6 +1315,8 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -1319,7 +1329,7 @@ class ClientRequestMixin:
 
         :return: 图片的二进制数据（PNG 图片）
         """
-        api = "https://qrcodeapi.115.com/api/1.0/web/1.0/qrcode"
+        api = complete_api(f"/api/1.0/{app}/1.0/qrcode", base_url=base_url)
         if isinstance(payload, str):
             payload = {"uid": payload}
         request_kwargs.setdefault("parse", False)
@@ -1334,6 +1344,7 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1345,6 +1356,7 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1355,6 +1367,7 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -1371,7 +1384,7 @@ class ClientRequestMixin:
             - uid: str
             - code_verifier: str = <default> 💡 默认字符串是 64 个 "0"
         """
-        api = "https://qrcodeapi.115.com/open/deviceCodeToToken"
+        api = complete_api("/open/deviceCodeToToken", base_url=base_url)
         if isinstance(payload, str):
             payload = {"uid": payload, "code_verifier": _default_code_verifier}
         request_kwargs.setdefault("parse", default_parse)
@@ -1386,6 +1399,7 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1397,6 +1411,7 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1407,6 +1422,7 @@ class ClientRequestMixin:
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -1422,7 +1438,7 @@ class ClientRequestMixin:
         :payload:
             - refresh_token: str
         """
-        api = "https://qrcodeapi.115.com/open/refreshToken"
+        api = complete_api("/open/refreshToken", base_url=base_url)
         if isinstance(payload, str):
             payload = {"refresh_token": payload}
         request_kwargs.setdefault("parse", default_parse)
@@ -1432,53 +1448,137 @@ class ClientRequestMixin:
             return request(url=api, method="POST", data=payload, **request_kwargs)
 
     @overload
-    @staticmethod
+    def login_qrcode_scan(
+        self, 
+        payload: str | dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def login_qrcode_scan(
+        self, 
+        payload: str | dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def login_qrcode_scan(
+        self, 
+        payload: str | dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """扫描二维码，payload 数据取自 `login_qrcode_token` 接口响应
+
+        GET https://qrcodeapi.115.com/api/2.0/prompt.php
+
+        :payload:
+            - uid: str
+        """
+        api = complete_api("/api/2.0/prompt.php", base_url=base_url)
+        if isinstance(payload, str):
+            payload = {"uid": payload}
+        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
+
+    @overload
     def login_qrcode_scan_cancel(
+        self, 
         payload: str | dict, 
         /, 
-        request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> dict:
         ...
     @overload
-    @staticmethod
     def login_qrcode_scan_cancel(
+        self, 
         payload: str | dict, 
         /, 
-        request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
         ...
-    @staticmethod
     def login_qrcode_scan_cancel(
+        self, 
         payload: str | dict, 
         /, 
-        request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """取消扫描二维码，payload 数据取自 `login_qrcode_scan` 接口响应
 
-        GET https://hnqrcodeapi.115.com/api/2.0/cancel.php
+        GET https://qrcodeapi.115.com/api/2.0/cancel.php
 
         :payload:
             - key: str
             - uid: str
             - client: int = 0
         """
-        api = "https://hnqrcodeapi.115.com/api/2.0/cancel.php"
+        api = complete_api("/api/2.0/cancel.php", base_url=base_url)
         if isinstance(payload, str):
             payload = {"key": payload, "uid": payload, "client": 0}
-        request_kwargs.setdefault("parse", default_parse)
-        if request is None:
-            return get_default_request()(url=api, params=payload, async_=async_, **request_kwargs)
-        else:
-            return request(url=api, params=payload, **request_kwargs)
+        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
+
+    @overload
+    def login_qrcode_scan_confirm(
+        self, 
+        payload: str | dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def login_qrcode_scan_confirm(
+        self, 
+        payload: str | dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def login_qrcode_scan_confirm(
+        self, 
+        payload: str | dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """确认扫描二维码，payload 数据取自 `login_qrcode_scan` 接口响应
+
+        GET https://qrcodeapi.115.com/api/2.0/slogin.php
+
+        :payload:
+            - key: str
+            - uid: str
+            - client: int = 0
+        """
+        api = complete_api("/api/2.0/slogin.php", base_url=base_url)
+        if isinstance(payload, str):
+            payload = {"key": payload, "uid": payload, "client": 0}
+        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
 
     @overload
     @staticmethod
@@ -1486,6 +1586,7 @@ class ClientRequestMixin:
         uid: str, 
         app: str = "alipaymini", 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1497,6 +1598,7 @@ class ClientRequestMixin:
         uid: str, 
         app: str = "alipaymini", 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1507,13 +1609,14 @@ class ClientRequestMixin:
         uid: str, 
         app: str = "alipaymini", 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取扫码登录的结果，包含 cookie
 
-        POST https://passportapi.115.com/app/1.0/{app}/1.0/login/qrcode/
+        POST https://qrcodeapi.115.com/app/1.0/{app}/1.0/login/qrcode/
 
         :param uid: 扫码的 uid
         :param app: 绑定的 app
@@ -1525,7 +1628,7 @@ class ClientRequestMixin:
         """
         if app == "desktop":
             app = "web"
-        api = f"http://passportapi.115.com/app/1.0/{app}/1.0/login/qrcode/"
+        api = complete_api(f"/app/1.0/{app}/1.0/login/qrcode/", base_url=base_url)
         payload = {"account": uid}
         request_kwargs.setdefault("parse", default_parse)
         if request is None:
@@ -1539,6 +1642,7 @@ class ClientRequestMixin:
         payload: dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1550,6 +1654,7 @@ class ClientRequestMixin:
         payload: dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1560,6 +1665,7 @@ class ClientRequestMixin:
         payload: dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -1577,7 +1683,7 @@ class ClientRequestMixin:
             - time: int
             - sign: str
         """
-        api = "https://qrcodeapi.115.com/get/status/"
+        api = complete_api("/get/status/", base_url=base_url)
         request_kwargs.setdefault("parse", default_parse)
         if request is None:
             return get_default_request()(url=api, params=payload, async_=async_, **request_kwargs)
@@ -1588,6 +1694,8 @@ class ClientRequestMixin:
     @staticmethod
     def login_qrcode_token(
         request: None | Callable = None, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1597,6 +1705,8 @@ class ClientRequestMixin:
     @staticmethod
     def login_qrcode_token(
         request: None | Callable = None, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1605,6 +1715,8 @@ class ClientRequestMixin:
     @staticmethod
     def login_qrcode_token(
         request: None | Callable = None, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -1613,7 +1725,7 @@ class ClientRequestMixin:
 
         GET https://qrcodeapi.115.com/api/1.0/web/1.0/token/
         """
-        api = "https://qrcodeapi.115.com/api/1.0/web/1.0/token/"
+        api = complete_api(f"/api/1.0/{app}/1.0/token/", base_url=base_url)
         request_kwargs.setdefault("parse", default_parse)
         if request is None:
             return get_default_request()(url=api, async_=async_, **request_kwargs)
@@ -1626,6 +1738,7 @@ class ClientRequestMixin:
         payload: int | str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1637,6 +1750,7 @@ class ClientRequestMixin:
         payload: int | str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1647,6 +1761,7 @@ class ClientRequestMixin:
         payload: int | str | dict, 
         /, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -1678,7 +1793,7 @@ class ClientRequestMixin:
 
             - code_challenge_method: str = <default> 💡 计算 `code_challenge` 的 hash 算法，支持 "md5", "sha1", "sha256"
         """
-        api = "https://qrcodeapi.115.com/open/authDeviceCode"
+        api = complete_api("/open/authDeviceCode", base_url=base_url)
         if isinstance(payload, (int, str)):
             payload = {
                 "client_id": payload, 
@@ -1698,6 +1813,7 @@ class ClientRequestMixin:
         /, 
         app: None | str = "", 
         console_qrcode: bool = True, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1710,6 +1826,7 @@ class ClientRequestMixin:
         /, 
         app: None | str = "", 
         console_qrcode: bool = True, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1721,6 +1838,7 @@ class ClientRequestMixin:
         /, 
         app: None | str = "", 
         console_qrcode: bool = True, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -1821,6 +1939,7 @@ class ClientRequestMixin:
         def gen_step():
             resp = yield cls.login_qrcode_token(
                 async_=async_, 
+                base_url=base_url, 
                 **request_kwargs, 
             )
             qrcode_token = resp["data"]
@@ -1834,7 +1953,7 @@ class ClientRequestMixin:
                 qr.add_data(qrcode)
                 qr.print_ascii(tty=isatty(1))
             else:
-                url = "https://qrcodeapi.115.com/api/1.0/web/1.0/qrcode?uid=" + login_uid
+                url = complete_api(f"/api/1.0/web/1.0/qrcode?uid={login_uid}", base_url=base_url)
                 if async_:
                     yield partial(startfile_async, url)
                 else:
@@ -1843,6 +1962,7 @@ class ClientRequestMixin:
                 try:
                     resp = yield cls.login_qrcode_scan_status(
                         qrcode_token, 
+                        base_url=base_url, 
                         async_=async_, 
                         **request_kwargs, 
                     )
@@ -1866,6 +1986,7 @@ class ClientRequestMixin:
                 return cls.login_qrcode_scan_result(
                     login_uid, 
                     app, 
+                    base_url=base_url, 
                     async_=async_, 
                     **request_kwargs, 
                 )
@@ -1880,6 +2001,7 @@ class ClientRequestMixin:
         /, 
         app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -1892,6 +2014,7 @@ class ClientRequestMixin:
         /, 
         app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -1903,6 +2026,7 @@ class ClientRequestMixin:
         /, 
         app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -1918,6 +2042,7 @@ class ClientRequestMixin:
         def gen_step():
             resp = yield cls.login_qrcode_token_open(
                 app_id, 
+                base_url=base_url, 
                 async_=async_, 
                 **request_kwargs, 
             )
@@ -1932,7 +2057,7 @@ class ClientRequestMixin:
                 qr.add_data(qrcode)
                 qr.print_ascii(tty=isatty(1))
             else:
-                url = "https://qrcodeapi.115.com/api/1.0/web/1.0/qrcode?uid=" + login_uid
+                url = complete_api(f"/api/1.0/web/1.0/qrcode?uid={login_uid}", base_url=base_url)
                 if async_:
                     yield partial(startfile_async, url)
                 else:
@@ -1941,6 +2066,7 @@ class ClientRequestMixin:
                 try:
                     resp = yield cls.login_qrcode_scan_status(
                         qrcode_token, 
+                        base_url=base_url, 
                         async_=async_, 
                         **request_kwargs, 
                     )
@@ -1962,11 +2088,14 @@ class ClientRequestMixin:
                         raise LoginError(errno.EAUTH, f"qrcode: aborted with {resp!r}")
             return cls.login_qrcode_access_token_open(
                 login_uid, 
+                base_url=base_url, 
                 async_=async_, 
                 **request_kwargs, 
             )
         return run_gen_step(gen_step, async_=async_)
 
+    ########## Upload API ##########
+
     upload_endpoint = "http://oss-cn-shenzhen.aliyuncs.com"
 
     def upload_endpoint_url(
@@ -4658,82 +4787,6 @@ class P115Client(P115OpenClient):
             return self
         return run_gen_step(gen_step, async_=async_)
 
-    @overload
-    def login_qrcode_scan(
-        self, 
-        payload: str | dict, 
-        /, 
-        async_: Literal[False] = False, 
-        **request_kwargs, 
-    ) -> dict:
-        ...
-    @overload
-    def login_qrcode_scan(
-        self, 
-        payload: str | dict, 
-        /, 
-        async_: Literal[True], 
-        **request_kwargs, 
-    ) -> Coroutine[Any, Any, dict]:
-        ...
-    def login_qrcode_scan(
-        self, 
-        payload: str | dict, 
-        /, 
-        async_: Literal[False, True] = False, 
-        **request_kwargs, 
-    ) -> dict | Coroutine[Any, Any, dict]:
-        """扫描二维码，payload 数据取自 `login_qrcode_token` 接口响应
-
-        GET https://qrcodeapi.115.com/api/2.0/prompt.php
-
-        :payload:
-            - uid: str
-        """
-        api = "https://qrcodeapi.115.com/api/2.0/prompt.php"
-        if isinstance(payload, str):
-            payload = {"uid": payload}
-        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
-
-    @overload
-    def login_qrcode_scan_confirm(
-        self, 
-        payload: str | dict, 
-        /, 
-        async_: Literal[False] = False, 
-        **request_kwargs, 
-    ) -> dict:
-        ...
-    @overload
-    def login_qrcode_scan_confirm(
-        self, 
-        payload: str | dict, 
-        /, 
-        async_: Literal[True], 
-        **request_kwargs, 
-    ) -> Coroutine[Any, Any, dict]:
-        ...
-    def login_qrcode_scan_confirm(
-        self, 
-        payload: str | dict, 
-        /, 
-        async_: Literal[False, True] = False, 
-        **request_kwargs, 
-    ) -> dict | Coroutine[Any, Any, dict]:
-        """确认扫描二维码，payload 数据取自 `login_qrcode_scan` 接口响应
-
-        GET https://hnqrcodeapi.115.com/api/2.0/slogin.php
-
-        :payload:
-            - key: str
-            - uid: str
-            - client: int = 0
-        """
-        api = "https://hnqrcodeapi.115.com/api/2.0/slogin.php"
-        if isinstance(payload, str):
-            payload = {"key": payload, "uid": payload, "client": 0}
-        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
-
     @overload
     def login_with_app(
         self, 
@@ -14960,10 +15013,125 @@ class P115Client(P115OpenClient):
             return device["icon"]
         return run_gen_step(gen_step, async_=async_)
 
+    @overload
+    def login_open_auth_detail(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def login_open_auth_detail(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def login_open_auth_detail(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        api = complete_api(f"/app/1.0/{app}/1.0/user/getAppAuthDetail", base_url=base_url)
+        if isinstance(payload, (int, str)):
+            payload = {"auth_id": payload}
+        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
+
+    @overload
+    def login_open_auth_list(
+        self, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def login_open_auth_list(
+        self, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def login_open_auth_list(
+        self, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        api = complete_api(f"/app/1.0/{app}/1.0/user/getAppAuthList", base_url=base_url)
+        return self.request(url=api, async_=async_, **request_kwargs)
+
+    @overload
+    def login_open_deauth(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def login_open_deauth(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def login_open_deauth(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        api = complete_api(f"/app/1.0/{app}/1.0/user/deauthApp", base_url=base_url)
+        if isinstance(payload, (int, str)):
+            payload = {"auth_id": payload}
+        return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+
     @overload
     def login_check_sso(
         self, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> dict:
@@ -14972,6 +15140,9 @@ class P115Client(P115OpenClient):
     def login_check_sso(
         self, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
@@ -14979,14 +15150,17 @@ class P115Client(P115OpenClient):
     def login_check_sso(
         self, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """检查当前 cookies 的登录状态信息，并且自最近一次登录的 60 秒后，使当前设备下除最近一次登录外的所有 cookies 失效
 
-        GET https://passportapi.115.com/app/1.0/web/1.0/check/sso
+        GET https://qrcodeapi.115.com/app/1.0/web/1.0/check/sso
         """
-        api = "https://passportapi.115.com/app/1.0/web/1.0/check/sso"
+        api = complete_api(f"/app/1.0/{app}/1.0/check/sso", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
     @overload
@@ -15025,6 +15199,9 @@ class P115Client(P115OpenClient):
     def login_devices(
         self, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> dict:
@@ -15033,6 +15210,9 @@ class P115Client(P115OpenClient):
     def login_devices(
         self, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
@@ -15040,14 +15220,17 @@ class P115Client(P115OpenClient):
     def login_devices(
         self, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取所有的已登录设备的信息，不过当前的 cookies 必须是登录状态（未退出或未失效）
 
-        GET https://passportapi.115.com/app/1.0/web/1.0/login_log/login_devices
+        GET https://qrcodeapi.115.com/app/1.0/web/1.0/login_log/login_devices
         """
-        api = "https://passportapi.115.com/app/1.0/web/1.0/login_log/login_devices"
+        api = complete_api(f"/app/1.0/{app}/1.0/login_log/login_devices", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
     @overload
@@ -15093,6 +15276,8 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict = {}, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -15103,6 +15288,8 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict = {}, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -15112,19 +15299,21 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict = {}, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取登录信息日志列表
 
-        GET https://passportapi.115.com/app/1.0/web/1.0/login_log/log
+        GET https://qrcodeapi.115.com/app/1.0/web/1.0/login_log/log
 
         :payload:
             - start: int = 0
             - limit: int = 100
         """
-        api = "https://passportapi.115.com/app/1.0/web/1.0/login_log/log"
+        api = complete_api(f"/app/1.0/{app}/1.0/login_log/log", base_url=base_url)
         payload = {"start": 0, "limit": 100, **payload}
         return self.request(url=api, params=payload, async_=async_, **request_kwargs)
 
@@ -15133,6 +15322,7 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -15143,6 +15333,7 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -15152,15 +15343,16 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """当前登录的设备总数和最近登录的设备
 
-        GET https://passportapi.115.com/app/1.0/web/1.0/login_log/login_online
+        GET https://qrcodeapi.115.com/app/1.0/web/1.0/login_log/login_online
         """
-        api = f"http://passportapi.115.com/app/1.0/{app}/1.0/login_log/login_online"
+        api = complete_api(f"/app/1.0/{app}/1.0/login_log/login_online", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
     @overload
@@ -15222,6 +15414,7 @@ class P115Client(P115OpenClient):
         /, 
         app: None | str = None, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -15233,6 +15426,7 @@ class P115Client(P115OpenClient):
         /, 
         app: None | str = None, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -15243,13 +15437,14 @@ class P115Client(P115OpenClient):
         /, 
         app: None | str = None, 
         request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> None | Coroutine[Any, Any, None]:
         """退出登录状态（可以把某个客户端下线，所有已登录设备可从 `login_devices` 获取）
 
-        GET https://passportapi.115.com/app/1.0/{app}/1.0/logout/logout
+        GET https://qrcodeapi.115.com/app/1.0/{app}/1.0/logout/logout
 
         :param app: 退出登录的 app
 
@@ -15315,7 +15510,7 @@ class P115Client(P115OpenClient):
                 app = yield self.login_app(async_=async_)
             if app == "desktop":
                 app = "web"
-            api = f"http://passportapi.115.com/app/1.0/{app}/1.0/logout/logout"
+            api = complete_api(f"/app/1.0/{app}/1.0/logout/logout", base_url=base_url)
             request_kwargs["headers"] = {**(request_kwargs.get("headers") or {}), "Cookie": self.cookies_str}
             request_kwargs.setdefault("parse", ...)
             if request is None:
@@ -15329,6 +15524,8 @@ class P115Client(P115OpenClient):
         self, 
         payload: None | str | dict = None, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -15339,6 +15536,8 @@ class P115Client(P115OpenClient):
         self, 
         payload: None | str | dict = None, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -15348,13 +15547,15 @@ class P115Client(P115OpenClient):
         self, 
         payload: None | str | dict = None, 
         /, 
+        app: str = "web", 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """退出登录状态（可以把某个客户端下线，所有已登录设备可从 `login_devices` 获取）
 
-        POST https://passportapi.115.com/app/1.0/web/1.0/logout/mange
+        POST https://qrcodeapi.115.com/app/1.0/web/1.0/logout/mange
 
         :payload:
             - ssoent: str
@@ -15415,7 +15616,7 @@ class P115Client(P115OpenClient):
         | 24    | S1       | harmony    | 115(Harmony端)          |
         +-------+----------+------------+-------------------------+
         """
-        api = "https://passportapi.115.com/app/1.0/web/1.0/logout/mange"
+        api = complete_api(f"/app/1.0/{app}/1.0/logout/mange", base_url=base_url)
         if payload is None:
             payload = {"ssoent": self.login_ssoent or ""}
         elif isinstance(payload, str):

{p115client-0.0.5.10.6 → p115client-0.0.5.10.7}/p115client/const.py

@@ -14,7 +14,7 @@ from typing import Final
 
 
 #: 可用的 AppID 列表
-AVAILABLE_APP_IDS = range(100195123, 100196837, 2)
+AVAILABLE_APP_IDS = range(100195123, 100196845, 2)
 
 
 #: 目前可用的登录设备

{p115client-0.0.5.10.6 → p115client-0.0.5.10.7}/p115client/exception.py

@@ -3,8 +3,9 @@
 
 __all__ = [
     "P115Warning", "P115OSError", "AuthenticationError", "BusyOSError", "DataError", 
-    "LoginError", "MultipartUploadAbort", "NotSupportedError", "OperationalError", 
-    "P115FileExistsError", "P115FileNotFoundError", "P115IsADirectoryError", 
+    "LoginError", "MultipartUploadAbort", "OpenAppAuthLimitExceeded", 
+    "NotSupportedError", "OperationalError", "P115FileExistsError", 
+    "P115FileNotFoundError", "P115IsADirectoryError", 
     "P115NotADirectoryError", "P115PermissionError", "P115TimeoutError", 
 ]
 
@@ -81,6 +82,11 @@ class MultipartUploadAbort(P115OSError):
         return f"{type(self).__module__}.{type(self).__qualname__}({self.ticket})"
 
 
+class OpenAppAuthLimitExceeded(AuthenticationError):
+    """当授权应用数达到上限时抛出
+    """
+
+
 class NotSupportedError(P115OSError):
     """当调用不存在的接口或者接口不支持此操作时抛出
     """

{p115client-0.0.5.10.6 → p115client-0.0.5.10.7}/p115client/tool/iterdir.py

@@ -276,9 +276,6 @@ def get_file_count(
 ) -> int | Coroutine[Any, Any, int]:
     """获取文件总数
 
-    .. caution::
-        我通过一些经验，搭配了多个接口的占比和参数分布，可能不够合理，以后会根据实际情况调整
-
     :param client: 115 客户端或 cookies
     :param cid: 目录 id
     :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
@@ -408,9 +405,6 @@ def get_ancestors(
 ) -> list[dict] | Coroutine[Any, Any, list[dict]]:
     """获取某个节点对应的祖先节点列表（只有 id、parent_id 和 name 的信息）
 
-    .. caution::
-        我通过一些经验，搭配了多个接口的占比和参数分布，可能不够合理，以后会根据实际情况调整
-
     :param client: 115 客户端或 cookies
     :param attr: 待查询节点 `id` 或信息（必须有 `id`，可选有 `parent_id`）
     :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典

{p115client-0.0.5.10.6 → p115client-0.0.5.10.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.10.6"
+version = "0.0.5.10.7"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"

{p115client-0.0.5.10.6 → p115client-0.0.5.10.7}/readme.md

@@ -195,7 +195,7 @@ class MyCustom115Client(P115Client):
 
 ### 3. 检查响应
 
-接口被调用后，如果返回的是 dict 类型的数据（说明原本是 JSON），则可以用 `p115client.check_response` 执行检查。首先会查看其中名为 "state" 的键的对应值，如果为  True、1 或不存在，则原样返回被检查的数据；否则，"state" 的对应值大概是 False 或 0，说明有问题出现，会根据实际情况抛出一个异常，但都是 `OSError` 的实例，其中大部分还是 `p115client.P115OSError` 的实例。
+接口被调用后，如果返回的是 dict 类型的数据（说明原本是 JSON），则可以用 `p115client.check_response` 执行检查。首先会查看其中名为 "state" 的键的对应值，如果为  True、1 或不存在，则原样返回被检查的数据；否则，"state" 的对应值大概是 False 或 0，说明有问题出现，会根据实际情况抛出一个异常，但都是 `p115client.P115OSError` 的实例。
 
 ```python
 from p115client import check_response