p115client 0.0.5.9.2__tar.gz → 0.0.5.10__tar.gz

{p115client-0.0.5.9.2 → p115client-0.0.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.9.2
+Version: 0.0.5.10
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -108,7 +108,7 @@ client = P115Client(Path("~/115-cookies.txt").expanduser(), check_for_relogin=Tr
 
 如果你有一个申请通过的开放接口的应用，则可以创建开放接口的客户端实例
 
-你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权）
+你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权），如果不提供 `app_id`，则使用默认值
 
 ```python
 app_id = <开放接口应用的 AppID>
@@ -143,7 +143,7 @@ from p115client import P115Client, P115OpenClient
 from pathlib import Path
 
 client = P115Client(Path("~/115-cookies.txt").expanduser(), check_for_relogin=True)
-client_open = client.login_another_open(app_id)
+client_open = client.login_another_open()
 ```
 
 ### 2. 接口调用

{p115client-0.0.5.9.2 → p115client-0.0.5.10}/p115client/client.py

@@ -16,23 +16,20 @@ from collections.abc import (
     ItemsView, Iterable, Iterator, Mapping, MutableMapping, Sequence, 
 )
 from datetime import date, datetime, timedelta
-from errno import EBUSY, EEXIST, EFBIG, EINVAL, EIO, EISDIR, ENODATA, ENOENT, ENOSPC, ENOSYS, ENOTSUP
 from functools import partial
 from hashlib import md5, sha1
 from http.cookiejar import Cookie, CookieJar
 from http.cookies import Morsel
 from inspect import isawaitable
-from itertools import count, cycle, dropwhile, product, repeat
+from itertools import count, cycle, product, repeat
 from math import nan
 from operator import itemgetter
-from os import fsdecode, fstat, isatty, stat, PathLike, path as ospath
+from os import fsdecode, fstat, isatty, PathLike, path as ospath
 from pathlib import Path, PurePath
 from platform import system
 from posixpath import splitext
 from re import compile as re_compile, MULTILINE
 from string import digits
-from sys import exc_info
-from _thread import start_new_thread
 from tempfile import TemporaryFile
 from threading import Lock
 from time import time
@@ -57,17 +54,20 @@ from http_response import get_total_length
 from httpfile import HTTPFileReader, AsyncHTTPFileReader
 from iterutils import run_gen_step
 from orjson import dumps, loads
-from p115cipher.fast import rsa_encode, rsa_decode, ecdh_encode_token, ecdh_aes_encode, ecdh_aes_decode, make_upload_payload
+from p115cipher.fast import (
+    rsa_encode, rsa_decode, ecdh_encode_token, ecdh_aes_encode, ecdh_aes_decode, make_upload_payload, 
+)
 from property import locked_cacheproperty
 from re import compile as re_compile
 from startfile import startfile, startfile_async # type: ignore
 from undefined import undefined
 from yarl import URL
 
-from .const import CLASS_TO_TYPE, CLIENT_API_MAP, SSOENT_TO_APP, SUFFIX_TO_TYPE
+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, 
+    P115OSError, OperationalError, P115Warning, P115FileExistsError, 
+    P115FileNotFoundError, P115IsADirectoryError, 
 )
 from .type import RequestKeywords, MultipartResumeData, P115Cookies, P115URL
 from ._upload import buffer_length, make_dataiter, oss_upload, oss_multipart_upload
@@ -229,7 +229,7 @@ def json_loads(content: Buffer, /):
     except Exception as e:
         if isinstance(content, memoryview):
             content = content.tobytes()
-        raise DataError(ENODATA, content) from e
+        raise DataError(errno.ENODATA, content) from e
 
 
 def default_parse(resp, content: Buffer, /):
@@ -350,7 +350,7 @@ def check_response(resp: dict | Awaitable[dict], /) -> dict | Coroutine[Any, Any
     """
     def check(resp, /) -> dict:
         if not isinstance(resp, dict):
-            raise P115OSError(EIO, resp)
+            raise P115OSError(errno.EIO, resp)
         if resp.get("state", True):
             return resp
         if code := get_first(resp, "errno", "errNo", "errcode", "errCode", "code"):
@@ -360,121 +360,206 @@ def check_response(resp: dict | Awaitable[dict], /) -> dict | Coroutine[Any, Any
             match code:
                 # {"state": false, "errno": 99, "error": "请重新登录"}
                 case 99:
-                    raise LoginError(EIO, resp)
+                    raise LoginError(errno.EAUTH, resp)
                 # {"state": false, "errno": 911, "error": "请验证账号"}
                 case 911:
-                    raise AuthenticationError(EIO, resp)
+                    raise AuthenticationError(errno.EAUTH, resp)
                 # {"state": false, "errno": 20001, "error": "目录名称不能为空"}
                 case 20001:
-                    raise OperationalError(EINVAL, resp)
+                    raise OperationalError(errno.EINVAL, resp)
                 # {"state": false, "errno": 20004, "error": "该目录名称已存在。"}
                 case 20004:
-                    raise FileExistsError(EEXIST, resp)
+                    raise P115FileExistsError(errno.EEXIST, resp)
                 # {"state": false, "errno": 20009, "error": "父目录不存在。"}
                 case 20009:
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
                 # {"state": false, "errno": 20018, "error": "文件不存在或已删除。"}
                 # {"state": false, "errno": 50015, "error": "文件不存在或已删除。"}
                 # {"state": false, "errno": 90008, "error": "文件（夹）不存在或已经删除。"}
                 # {"state": false, "errno": 430004, "error": "文件（夹）不存在或已删除。"}
                 case 20018 | 50015 | 90008 | 430004:
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
                 # {"state": false, "errno": 20020, "error": "后缀名不正确，请重新输入"}
-                case 20020:
-                    raise OperationalError(ENOTSUP, resp)
                 # {"state": false, "errno": 20021, "error": "后缀名不正确，请重新输入"}
-                case 20021:
-                    raise OperationalError(ENOTSUP, resp)
+                case 20020 | 20021:
+                    raise OperationalError(errno.EINVAL, resp)
                 # {"state": false, "errno": 31001, "error": "所预览的文件不存在。"}
                 case 31001:
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
                 # {"state": false, "errno": 31004, "error": "文档未上传完整，请上传完成后再进行查看。"}
                 case 31004:
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
                 # {"state": false, "errno": 50003, "error": "很抱歉，该文件提取码不存在。"}
                 case 50003:
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
                 # {"state": false, "errno": 91002, "error": "不能将文件复制到自身或其子目录下。"}
                 case 91002:
-                    raise NotSupportedError(ENOTSUP, resp)
+                    raise NotSupportedError(errno.ENOTSUP, resp)
                 # {"state": false, "errno": 91004, "error": "操作的文件(夹)数量超过5万个"}
                 case 91004:
-                    raise NotSupportedError(ENOTSUP, resp)
+                    raise NotSupportedError(errno.ENOTSUP, resp)
                 # {"state": false, "errno": 91005, "error": "空间不足，复制失败。"}
                 case 91005:
-                    raise OperationalError(ENOSPC, resp)
+                    raise OperationalError(errno.ENOSPC, resp)
                 # {"state": false, "errno": 231011, "error": "文件已删除，请勿重复操作"}
                 case 231011:
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
                 # {"state": false, "errno": 300104, "error": "文件超过200MB，暂不支持播放"}
                 case 300104:
-                    raise P115OSError(EFBIG, resp)
+                    raise P115OSError(errno.EFBIG, resp)
                 # {"state": false, "errno": 590075, "error": "操作太频繁，请稍候再试"}
                 case 590075:
-                    raise BusyOSError(EBUSY, resp)
+                    raise BusyOSError(errno.EBUSY, resp)
                 # {"state": false, "errno": 800001, "error": "目录不存在。"}
                 case 800001:
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
                 # {"state": false, "errno": 980006, "error": "404 Not Found"}
                 case 980006:
-                    raise NotSupportedError(ENOSYS, resp)
+                    raise NotSupportedError(errno.ENOSYS, resp)
                 # {"state": false, "errno": 990001, "error": "登陆超时，请重新登陆。"}
                 case 990001:
                     # NOTE: 可能就是被下线了
-                    raise AuthenticationError(EIO, resp)
+                    raise AuthenticationError(errno.EAUTH, resp)
                 # {"state": false, "errno": 990002, "error": "参数错误。"}
                 case 990002:
-                    raise P115OSError(EINVAL, resp)
+                    raise OperationalError(errno.EINVAL, resp)
                 # {"state": false, "errno": 990003, "error": "操作失败。"}
                 case 990003:
-                    raise OperationalError(EIO, resp)
+                    raise OperationalError(errno.EIO, resp)
                 # {"state": false, "errno": 990005, "error": "你的账号有类似任务正在处理，请稍后再试！"}
                 case 990005:
-                    raise BusyOSError(EBUSY, resp)
+                    raise BusyOSError(errno.EBUSY, resp)
                 # {"state": false, "errno": 990009, "error": "删除[...]操作尚未执行完成，请稍后再试！"}
                 # {"state": false, "errno": 990009, "error": "还原[...]操作尚未执行完成，请稍后再试！"}
                 # {"state": false, "errno": 990009, "error": "复制[...]操作尚未执行完成，请稍后再试！"}
                 # {"state": false, "errno": 990009, "error": "移动[...]操作尚未执行完成，请稍后再试！"}
                 case 990009:
-                    raise BusyOSError(EBUSY, resp)
+                    raise BusyOSError(errno.EBUSY, resp)
                 # {"state": false, "errno": 990023, "error": "操作的文件(夹)数量超过5万个"}
                 case 990023:
-                    raise OperationalError(ENOTSUP, resp)
+                    raise OperationalError(errno.ENOTSUP, resp)
                 # {"state": 0, "errno": 40100000, "error": "参数错误！"}
+                # {"state": 0, "errno": 40100000, "error": "参数缺失"}
                 case 40100000:
-                    raise OperationalError(EINVAL, resp)
+                    raise OperationalError(errno.EINVAL, resp)
                 # {"state": 0, "errno": 40101004, "error": "IP登录异常,请稍候再登录！"}
                 case 40101004:
-                    raise LoginError(EIO, resp)
+                    raise LoginError(errno.EAUTH, resp)
                 # {"state": 0, "errno": 40101017, "error": "用户验证失败！"}
                 case 40101017:
-                    raise AuthenticationError(EIO, resp)
+                    raise AuthenticationError(errno.EAUTH, resp)
                 # {"state": 0, "errno": 40101032, "error": "请重新登录"}
                 case 40101032:
-                    raise LoginError(EIO, resp)
+                    raise LoginError(errno.EAUTH, resp)
+                #################################################################
+                # Reference: https://www.yuque.com/115yun/open/rnq0cbz8tt7cu43i #
+                #################################################################
+                # {"state": 0, "errno": 40110000, "error": "请求异常需要重试"}
+                case 40110000:
+                    raise OperationalError(errno.EAGAIN, resp)
+                # {"state": 0, "errno": 40140100, "error": "client_id 错误"}
+                case 40140100:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140101, "error": "code_challenge 必填"}
+                case 40140101:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140102, "error": "code_challenge_method 必须是 sha256、sha1、md5 之一"}
+                case 40140102:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140103, "error": "sign 必填"}
+                case 40140103:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140104, "error": "sign 签名失败"}
+                case 40140104:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140105, "error": "生成二维码失败"}
+                case 40140105:
+                    raise OperationalError(errno.EIO, resp)
+                # {"state": 0, "errno": 40140106, "error": "APP ID 无效"}
+                case 40140106:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140107, "error": "应用不存在"}
+                case 40140107:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140108, "error": "应用未审核通过"}
+                case 40140108:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140109, "error": "应用已被停用"}
+                case 40140109:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140110, "error": "应用已过期"}
+                case 40140110:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140111, "error": "APP Secret 错误"}
+                case 40140111:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140112, "error": "code_verifier 长度要求43~128位"}
+                case 40140112:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140113, "error": "code_verifier 验证失败"}
+                case 40140113:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140114, "error": "refresh_token 格式错误（防篡改）"}
+                case 40140114:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140115, "error": "refresh_token 签名校验失败（防篡改）"}
+                case 40140115:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140116, "error": "refresh_token 无效（已解除授权）"}
+                case 40140116:
+                    raise OperationalError(errno.EIO, resp)
+                # {"state": 0, "errno": 40140117, "error": "access_token 刷新太频繁"}
+                case 40140117:
+                    raise BusyOSError(errno.EBUSY, resp)
+                # {"state": 0, "errno": 40140118, "error": "开发者认证已过期"}
+                case 40140118:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140119, "error": "refresh_token 已过期"}
+                case 40140119:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140120, "error": "refresh_token 检验失败（防篡改）"}
+                case 40140120:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140121, "error": "access_token 刷新失败"}
+                case 40140121:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140122, "error": "超出授权应用个数上限"}
+                case 40140122:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140123, "error": "access_token 格式错误（防篡改）"}
+                case 40140123:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140124, "error": "access_token 签名校验失败（防篡改）"}
+                case 40140124:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140125, "error": "access_token 无效（已过期或者已解除授权）"}
+                case 40140125:
+                    raise OperationalError(errno.EINVAL, resp)
+                # {"state": 0, "errno": 40140126, "error": "access_token 校验失败（防篡改）"}
+                case 40140126:
+                    raise OperationalError(errno.EINVAL, resp)
         elif "msg_code" in resp:
             match resp["msg_code"]:
                 case 50028:
-                    raise P115OSError(EFBIG, resp)
+                    raise P115OSError(errno.EFBIG, resp)
                 case 70004:
-                    raise IsADirectoryError(EISDIR, resp)
+                    raise P115IsADirectoryError(errno.EISDIR, resp)
                 case 70005 | 70008:
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
         elif "error" in resp:
             match resp["error"]:
                 case "目录不存在或已转移":
-                    raise FileNotFoundError(ENOENT, resp)
+                    raise P115FileNotFoundError(errno.ENOENT, resp)
                 case "更新的数据为空":
-                    raise OperationalError(EINVAL, resp)
-        raise P115OSError(EIO, resp)
+                    raise OperationalError(errno.EINVAL, resp)
+        raise P115OSError(errno.EIO, resp)
     if isinstance(resp, dict):
         return check(resp)
     elif isawaitable(resp):
         async def check_await() -> dict:
             return check(await resp)
         return check_await()
-    else:
-        raise P115OSError(EIO, resp)
+    raise P115OSError(errno.EIO, resp)
 
 
 def normalize_attr_web(
@@ -1767,11 +1852,11 @@ class ClientRequestMixin:
                         print("[status=2] qrcode: signed in")
                         break
                     case -1:
-                        raise LoginError(EIO, "[status=-1] qrcode: expired")
+                        raise LoginError(errno.EAUTH, "[status=-1] qrcode: expired")
                     case -2:
-                        raise LoginError(EIO, "[status=-2] qrcode: canceled")
+                        raise LoginError(errno.EAUTH, "[status=-2] qrcode: canceled")
                     case _:
-                        raise LoginError(EIO, f"qrcode: aborted with {resp!r}")
+                        raise LoginError(errno.EAUTH, f"qrcode: aborted with {resp!r}")
             if app:
                 return cls.login_qrcode_scan_result(
                     login_uid, 
@@ -1865,11 +1950,11 @@ class ClientRequestMixin:
                         print("[status=2] qrcode: signed in")
                         break
                     case -1:
-                        raise LoginError(EIO, "[status=-1] qrcode: expired")
+                        raise LoginError(errno.EAUTH, "[status=-1] qrcode: expired")
                     case -2:
-                        raise LoginError(EIO, "[status=-2] qrcode: canceled")
+                        raise LoginError(errno.EAUTH, "[status=-2] qrcode: canceled")
                     case _:
-                        raise LoginError(EIO, f"qrcode: aborted with {resp!r}")
+                        raise LoginError(errno.EAUTH, f"qrcode: aborted with {resp!r}")
             return cls.login_qrcode_access_token_open(
                 login_uid, 
                 async_=async_, 
@@ -2597,8 +2682,8 @@ class P115OpenClient(ClientRequestMixin):
             for fid, info in resp["data"].items():
                 url = info["url"]
                 if strict and not url:
-                    raise IsADirectoryError(
-                        EISDIR, 
+                    raise P115IsADirectoryError(
+                        errno.EISDIR, 
                         f"{fid} is a directory, with response {resp}", 
                     )
                 return P115URL(
@@ -2611,8 +2696,8 @@ class P115OpenClient(ClientRequestMixin):
                     is_directory=not url, 
                     headers=resp["headers"], 
                 )
-            raise FileNotFoundError(
-                ENOENT, 
+            raise P115FileNotFoundError(
+                errno.ENOENT, 
                 f"no such pickcode: {pickcode!r}, with response {resp}", 
             )
         if async_:
@@ -3977,7 +4062,7 @@ class P115OpenClient(ClientRequestMixin):
                 case 1:
                     bucket, object, callback = data["bucket"], data["object"], data["callback"]
                 case _:
-                    raise P115OSError(EINVAL, resp)
+                    raise OperationalError(errno.EINVAL, resp)
             url = self.upload_endpoint_url(bucket, object)
             token = self.upload_token
             if partsize <= 0:
@@ -5427,7 +5512,7 @@ class P115Client(P115OpenClient):
                 headers["cookie"] = self.cookies_str
             for i in count(0):
                 try:
-                    if need_fetch_cert_first is None:
+                    if fetch_cert_headers is None:
                         if is_open_api:
                             cert: str = headers["authorization"]
                         else:
@@ -6530,8 +6615,8 @@ class P115Client(P115OpenClient):
                 for fid, info in resp["data"].items():
                     url = info["url"]
                     if strict and not url:
-                        raise IsADirectoryError(
-                            EISDIR, 
+                        raise P115IsADirectoryError(
+                            errno.EISDIR, 
                             f"{fid} is a directory, with response {resp}", 
                         )
                     return P115URL(
@@ -6544,8 +6629,8 @@ class P115Client(P115OpenClient):
                         is_directory=not url, 
                         headers=resp["headers"], 
                     )
-                raise FileNotFoundError(
-                    ENOENT, 
+                raise P115FileNotFoundError(
+                    errno.ENOENT, 
                     f"no such pickcode: {pickcode!r}, with response {resp}", 
                 )
         if async_:
@@ -17444,7 +17529,7 @@ class P115Client(P115OpenClient):
         else:
             payload = dict(payload)
         if url:
-            from .tool import share_extract_payload
+            from .tool.util import share_extract_payload
             share_payload = share_extract_payload(url)
             payload["share_code"] = share_payload["share_code"]
             payload["receive_code"] = share_payload["receive_code"] or ""
@@ -17456,14 +17541,14 @@ class P115Client(P115OpenClient):
             info = check_response(resp)["data"]
             file_id = payload["file_id"]
             if not info:
-                raise FileNotFoundError(
-                    ENOENT, 
+                raise P115FileNotFoundError(
+                    errno.ENOENT, 
                     f"no such id: {file_id!r}, with response {resp}", 
                 )
             url = info["url"]
             if strict and not url:
-                raise IsADirectoryError(
-                    EISDIR, 
+                raise P115IsADirectoryError(
+                    errno.EISDIR, 
                     f"{file_id} is a directory, with response {resp}", 
                 )
             return P115URL(
@@ -18208,14 +18293,14 @@ class P115Client(P115OpenClient):
             info = check_response(resp)["data"]
             file_id = payload["file_id"]
             if not info:
-                raise FileNotFoundError(
-                    ENOENT, 
+                raise P115FileNotFoundError(
+                    errno.ENOENT, 
                     f"no such id: {file_id!r}, with response {resp}", 
                 )
             url = info["url"]
             if strict and not url:
-                raise IsADirectoryError(
-                    EISDIR, 
+                raise P115IsADirectoryError(
+                    errno.EISDIR, 
                     f"{file_id} is a directory, with response {resp}", 
                 )
             return P115URL(
@@ -19939,7 +20024,7 @@ class P115Client(P115OpenClient):
             elif status == 1 and statuscode == 0:
                 bucket, object, callback = resp["bucket"], resp["object"], resp["callback"]
             else:
-                raise P115OSError(EINVAL, resp)
+                raise OperationalError(errno.EINVAL, resp)
             url = self.upload_endpoint_url(bucket, object)
             token = self.upload_token
             if partsize <= 0: