aioqzone 1.9.0.dev1__tar.gz → 1.9.2.dev1__tar.gz

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: aioqzone
-Version: 1.9.0.dev1
+Version: 1.9.2.dev1
 Summary: A Python wrapper for Qzone login and H5 APIs.
-Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
 Keywords: qzone-api,autologin,asyncio-spider
 Author: aioqzone
-Author-email: zzzzss990315@gmail.com
+Author-email: 22952836+JamzumSum@users.noreply.github.com
 Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -33,6 +32,7 @@ Requires-Dist: tylisten (>=2.1.4,<3.0.0)
 Project-URL: Bug Tracker, https://github.com/aioqzone/aioqzone/issues
 Project-URL: Documentation, https://aioqzone.github.io/aioqzone
 Project-URL: Discussion, https://t.me/aioqzone_chatroom
+Project-URL: Homepage, https://github.com/aioqzone/aioqzone
 Project-URL: Repository, https://github.com/aioqzone/aioqzone
 Description-Content-Type: text/markdown
 
@@ -98,7 +98,7 @@ __在做了:__
 ## 许可证
 
 ```
-Copyright (C) 2022-2024 aioqzone.
+Copyright (C) 2022-2025 aioqzone.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/README.md

@@ -60,7 +60,7 @@ __在做了:__
 ## 许可证
 
 ```
-Copyright (C) 2022-2024 aioqzone.
+Copyright (C) 2022-2025 aioqzone.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/pyproject.toml

@@ -1,8 +1,8 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.9.0.dev1"
+version = "1.9.2.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
-authors = ["aioqzone <zzzzss990315@gmail.com>"]
+authors = ["aioqzone <22952836+JamzumSum@users.noreply.github.com>"]
 license = "AGPL-3.0"
 readme = "README.md"
 homepage = "https://github.com/aioqzone/aioqzone"
@@ -48,7 +48,7 @@ optional = false
 
 [tool.poetry.group.test.dependencies]
 pytest = "^8.2.0"
-pytest-asyncio = "~0.21.2"
+pytest-asyncio = "~0.25.2"
 
 [tool.poetry.group.dev]
 optional = true
@@ -87,6 +87,7 @@ build-backend = "poetry.core.masonry.api"
 pythonpath = 'src'
 log_cli = 1
 log_cli_level = 'WARNING'
+asyncio_default_fixture_loop_scope = "module"
 
 [tool.isort]
 profile = "black"
@@ -99,3 +100,4 @@ target-version = ['py39']
 [tool.pyright]
 pythonVersion = "3.9"
 pythonPlatform = "All"
+reportIncompatibleVariableOverride = "information"

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/aioqzone/model/api/feed.py

@@ -1,4 +1,3 @@
-import sys
 import typing as t
 from enum import IntEnum
 
@@ -15,15 +14,6 @@ from pydantic import (
 
 __all__ = ["FeedData"]
 
-if sys.version_info >= (3, 9):
-    removeprefix = str.removeprefix
-else:
-
-    def removeprefix(self: str, prefix: str, /):
-        if self.startswith(prefix):
-            return self[len(prefix) :]
-        return self
-
 
 class UgcRight(IntEnum):
     unknown = 0
@@ -225,13 +215,13 @@ class Share(HasCommon):
 
 class FeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
     @model_validator(mode="before")
-    def remove_prefix(cls, v: dict):
-        return {removeprefix(k, "cell_"): i for k, i in v.items()}
+    def remove_prefix(cls, v: dict[str, t.Any]):
+        return {k.removeprefix("cell_"): i for k, i in v.items()}
 
     @field_validator("summary")
     @classmethod
     def remove_colon(cls, v: FeedSummary):
-        v.summary = removeprefix(v.summary, "：")
+        v.summary = v.summary.removeprefix("：")
         return v
 
 

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/aioqzone/model/api/profile.py

@@ -21,7 +21,6 @@ from .feed import (
     Share,
     ShareInfo,
     UserInfo,
-    removeprefix,
 )
 
 
@@ -89,13 +88,13 @@ class ProfileComment(FeedComment):
 
 class ProfileFeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
     @model_validator(mode="before")
-    def remove_prefix(cls, v: dict):
-        return {removeprefix(k, "cell_"): i for k, i in v.items()}
+    def remove_prefix(cls, v: dict[str, t.Any]):
+        return {k.removeprefix("cell_"): i for k, i in v.items()}
 
     @field_validator("summary")
     @classmethod
     def remove_colon(cls, v: FeedSummary):
-        v.summary = removeprefix(v.summary, "：")
+        v.summary = v.summary.removeprefix("：")
         return v
 
 

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/aioqzone/model/api/response.py

@@ -4,19 +4,28 @@ from contextlib import suppress
 
 from aiohttp import ClientResponse
 from lxml.html import HtmlElement, document_fromstring
-from pydantic import AliasChoices, AliasPath, BaseModel, Field, HttpUrl, model_validator
+from pydantic import (
+    AliasChoices,
+    AliasPath,
+    BaseModel,
+    Field,
+    HttpUrl,
+    TypeAdapter,
+    model_validator,
+)
 from tenacity import TryAgain
 from typing_extensions import Self
 
 from aioqzone.exception import QzoneError
 from aioqzone.utils.regex import entire_closing, response_callback
 from qqqr.utils.iter import firstn
-from qqqr.utils.jsjson import JsonValue, json_loads
+from qqqr.utils.jsjson import json_loads
 
 from .feed import FeedData
 from .profile import ProfileFeedData, QzoneProfile
 
-StrDict = t.Dict[str, JsonValue]
+StrDict = t.Dict[str, t.Any]
+
 
 __all__ = [
     "QzoneResponse",
@@ -37,6 +46,9 @@ __all__ = [
     "ProfileFeedData",
 ]
 
+validate_strdict = TypeAdapter(StrDict).validate_python
+validate_str = TypeAdapter(str).validate_python
+
 
 class QzoneResponse(BaseModel):
     _errno_key: t.ClassVar[t.Union[str, AliasPath, AliasChoices, None]] = AliasChoices(
@@ -120,7 +132,7 @@ class IndexPageResp(FeedPageResp):
     qzonetoken: str = ""
 
     @classmethod
-    async def response_to_object(cls, response: ClientResponse):
+    async def response_to_object(cls, response: ClientResponse) -> StrDict:
         html = await response.text()
         scripts: t.List[HtmlElement] = document_fromstring(html).xpath(
             'body/script[@type="application/javascript"]'
@@ -142,9 +154,11 @@ class IndexPageResp(FeedPageResp):
         if m is None:
             raise TryAgain("page data not found")
         data = script[m.end() - 1 : m.end() + entire_closing(script[m.end() - 1 :])]
-        data = json_loads(data)
+        data = validate_strdict(json_loads(data))
+
         with suppress(TypeError):
-            data["data"]["qzonetoken"] = qzonetoken  # type: ignore
+            assert isinstance(data["data"], dict)
+            data["data"]["qzonetoken"] = qzonetoken
 
         return data
 
@@ -206,9 +220,9 @@ class ProfilePagePesp(QzoneResponse):
     @classmethod
     def from_response_object(cls, obj: "StrDict") -> Self:
         return cls(
-            info=QzoneInfo.from_response_object(obj["info"]),  # type: ignore
-            feedpage=ProfileResp.from_response_object(obj["feedpage"]),  # type: ignore
-            qzonetoken=obj["qzonetoken"],  # type: ignore
+            info=QzoneInfo.from_response_object(validate_strdict(obj["info"])),
+            feedpage=ProfileResp.from_response_object(validate_strdict(obj["feedpage"])),
+            qzonetoken=validate_str(obj.get("qzonetoken", "")),
         )
 
 
@@ -245,10 +259,10 @@ class UploadPicResponse(QzoneResponse):
     filemd5: str
 
     @classmethod
-    async def response_to_object(cls, response: ClientResponse):
+    async def response_to_object(cls, response: ClientResponse) -> StrDict:
         m = response_callback.search(await response.text())
         assert m
-        return json_loads(m.group(1))
+        return validate_strdict(json_loads(m.group(1)))
 
 
 class PicInfo(QzoneResponse):
@@ -268,7 +282,7 @@ class PhotosPreuploadResponse(QzoneResponse):
     photos: t.List[PicInfo] = Field(default_factory=list)
 
     @classmethod
-    async def response_to_object(cls, response: ClientResponse):
+    async def response_to_object(cls, response: ClientResponse) -> StrDict:
         m = response_callback.search(await response.text())
         assert m
 

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/qqqr/up/_model.py

@@ -2,17 +2,17 @@
 
 import typing as t
 
-from pydantic import BaseModel, Field, HttpUrl
+from pydantic import BaseModel, Field, HttpUrl, TypeAdapter
 
 from qqqr.type import RedirectCookies
 
 
-class CheckResp(BaseModel):
+class CheckResp(t.NamedTuple):
     code: int
     """code = 0/2/3 hideVC; code = 1 showVC
     """
     verifycode: str
-    salt_repr: str = Field(alias="salt")
+    salt_repr: t.Annotated[str, Field(alias="salt")]
     verifysession: str
     isRandSalt: int
     ptdrvs: str
@@ -40,3 +40,6 @@ class VerifyResp(BaseModel):
     ticket: str
     errMessage: str
     sess: str
+
+
+CheckRespValidator = TypeAdapter(CheckResp)

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/qqqr/up/captcha/__init__.py

@@ -16,9 +16,10 @@ from qqqr.message import solve_select_captcha, solve_slide_captcha
 
 from ...utils.net import ClientAdapter
 from .._model import VerifyResp
-from ._model import PrehandleResp
+from ._model import PrehandleResp, PrehandleRespValidator
 from .capsess import BaseTcaptchaSession as TcaptchaSession
-from .select._types import SelectCaptchaSession
+from .click import ClickCaptchaSession
+from .select import SelectCaptchaSession
 
 PREHANDLE_URL = "https://t.captcha.qq.com/cap_union_prehandle"
 SHOW_NEW_URL = "https://t.captcha.qq.com/cap_union_new_show"
@@ -127,11 +128,13 @@ class Captcha(_CaptchaHookMixin):
                 m = re.search(CALLBACK + r"\((\{.*\})\)", await r.text("utf8"))
 
             assert m
-            return PrehandleResp.model_validate_json(m.group(1))
+            return PrehandleRespValidator.validate_json(m.group(1))
 
         sess = TcaptchaSession.factory(sid, await retry_closure())
         if isinstance(sess, SelectCaptchaSession):
             sess.solve_captcha_hook = self.solve_select_captcha
+        elif isinstance(sess, ClickCaptchaSession):
+            raise NotImplementedError("“依次点击”类验证码正在施工")
         else:
             sess.solve_captcha_hook = self.solve_slide_captcha
         return sess
@@ -178,9 +181,9 @@ class Captcha(_CaptchaHookMixin):
             "collect": collect,
             "tlg": len(collect),
             "eks": info.strip("'"),
-            "sess": sess.prehandle.sess,
+            "sess": sess.prehandle["sess"],
             "ans": json.dumps([ans]),
-            "pow_answer": hex_add(sess.conf.common.pow_cfg.prefix, sess.pow_ans),
+            "pow_answer": hex_add(sess.conf["common"]["pow_cfg"]["prefix"], sess.pow_ans),
             "pow_calc_time": sess.duration,
         }
         log.debug(f"verify post data: {data}")

aioqzone-1.9.2.dev1/src/qqqr/up/captcha/_model.py

@@ -0,0 +1,77 @@
+import typing as t
+
+from pydantic import AliasPath, BaseModel, Field, TypeAdapter
+from typing_extensions import TypedDict
+
+
+class PowCfg(TypedDict):
+    prefix: str
+    md5: str
+
+
+class CommonCaptchaConf(TypedDict):
+    pow_cfg: PowCfg
+    """Ians, duration = match_md5(pow_cfg)"""
+    tdc_path: str
+    """relative path to get tdc.js"""
+
+
+class CommonClickConf(TypedDict):
+    data_type: t.Annotated[str, Field(validation_alias=AliasPath("data_type", 0))]
+    mark_style: str
+
+
+class CommonBgElmConf(BaseModel):
+    cfg: CommonClickConf = Field(validation_alias="click_cfg")
+
+
+class CommonRender(BaseModel):
+    bg: CommonBgElmConf = Field(validation_alias="bg_elem_cfg")
+
+
+class Sprite(BaseModel):
+    """Represents a sprite from a source material."""
+
+    size_2d: t.List[int]
+    """sprite size (w, h)"""
+    sprite_pos: t.List[int]
+    """sprite position on material (x, y)"""
+
+    @property
+    def height(self):
+        return self.size_2d[1]
+
+    @property
+    def width(self):
+        return self.size_2d[0]
+
+    @property
+    def box(self):
+        l, t = self.sprite_pos
+        return (l, t, l + self.width, l + self.height)
+
+
+class CaptchaData(TypedDict):
+    common: t.Annotated[CommonCaptchaConf, Field(alias="comm_captcha_cfg")]
+    render: t.Annotated[dict[str, t.Any], Field(alias="dyn_show_info")]
+
+
+class PrehandleResp(TypedDict):
+    captcha: t.Annotated[t.Optional[CaptchaData], Field(alias="data", default=None)]
+    sess: str
+
+    capclass: t.Annotated[int, Field(default=0)]
+    log_js: t.Annotated[str, Field(default="")]
+    randstr: t.Annotated[str, Field(default="")]
+    sid: t.Annotated[str, Field(default="")]
+    src_1: t.Annotated[str, Field(default="")]
+    src_2: t.Annotated[str, Field(default="")]
+    src_3: t.Annotated[str, Field(default="")]
+    state: t.Annotated[int, Field(default=0)]
+    subcapclass: t.Annotated[int, Field(default=0)]
+    ticket: t.Annotated[str, Field(default="")]
+    uip: t.Annotated[str, Field(default="")]
+    """ipv4 / ipv6"""
+
+
+PrehandleRespValidator = TypeAdapter(PrehandleResp)

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/qqqr/up/captcha/capsess.py

@@ -1,19 +1,23 @@
 import asyncio
+import logging
 import typing as t
 from abc import ABC, abstractmethod
 from hashlib import md5
 from time import time
 
+from pydantic import ValidationError
 from tylisten import HookSpec
 from yarl import URL
 
 from qqqr.utils.net import ClientAdapter
 
-from ._model import PrehandleResp
+from ._model import CommonRender, PrehandleResp
+
+log = logging.getLogger(__name__)
 
 
 class BaseTcaptchaSession(ABC):
-    data_type: str = "DynAnswerType_UC"
+    data_type: str
     mouse_track: "asyncio.Future[t.Optional[t.List[t.Tuple[int, int]]]]"
     solve_captcha_hook: HookSpec
 
@@ -32,7 +36,8 @@ class BaseTcaptchaSession(ABC):
         self.mouse_track = asyncio.get_event_loop().create_future()
 
     def parse_captcha_data(self):
-        self.conf = self.prehandle.captcha
+        assert self.prehandle["captcha"]
+        self.conf = self.prehandle["captcha"]
 
     def solve_workload(self, *, timeout: float = 30.0):
         """
@@ -44,9 +49,9 @@ class BaseTcaptchaSession(ABC):
         :return: None
         """
 
-        pow_cfg = self.conf.common.pow_cfg
-        nonce = str(pow_cfg.prefix).encode()
-        target = pow_cfg.md5.lower()
+        pow_cfg = self.conf["common"]["pow_cfg"]
+        nonce = str(pow_cfg["prefix"]).encode()
+        target = pow_cfg["md5"].lower()
 
         start = time()
         cnt = 0
@@ -65,7 +70,9 @@ class BaseTcaptchaSession(ABC):
 
     def _tdx_js_url(self):
         assert self.conf
-        return URL("https://t.captcha.qq.com").with_path(self.conf.common.tdc_path, encoded=True)
+        return URL("https://t.captcha.qq.com").with_path(
+            self.conf["common"]["tdc_path"], encoded=True
+        )
 
     def _vmslide_js_url(self):
         raise NotImplementedError
@@ -82,7 +89,7 @@ class BaseTcaptchaSession(ABC):
             r.raise_for_status()
             self.tdc = prepare(
                 await r.text("utf8"),
-                ip=ip or self.prehandle.uip,
+                ip=ip or self.prehandle["uip"],
                 ua=ua or client.headers["User-Agent"],
                 mouse_track=await self.mouse_track,
             )
@@ -97,10 +104,21 @@ class BaseTcaptchaSession(ABC):
 
     @classmethod
     def factory(cls, session: str, prehandle: PrehandleResp):
-        render = prehandle.captcha.render
-        if "json_payload" in render:
-            from .select._types import SelectCaptchaSession as cls
+        assert prehandle["captcha"]
+
+        try:
+            render = CommonRender.model_validate(prehandle["captcha"]["render"])
+        except ValidationError:
+            log.error(prehandle["captcha"]["render"])
+            raise
+
+        if render.bg.cfg["data_type"] == "DynAnswerType_UC":
+            from .select import SelectCaptchaSession as cls
+        elif render.bg.cfg["data_type"] == "DynAnswerType_POS":
+            log.error(prehandle["captcha"]["render"])
+            raise NotImplementedError("“依次点击”类验证码正在施工")
+            from .click import ClickCaptchaSession as cls
         else:
-            from .slide._types import SlideCaptchaSession as cls
+            from .slide import SlideCaptchaSession as cls
 
         return cls(session=session, prehandle=prehandle)

aioqzone-1.9.2.dev1/src/qqqr/up/captcha/click/__init__.py

@@ -0,0 +1,3 @@
+from ._types import ClickCaptchaSession
+
+__all__ = ["ClickCaptchaSession"]

aioqzone-1.9.2.dev1/src/qqqr/up/captcha/click/_types.py

@@ -0,0 +1,8 @@
+from .._model import PrehandleResp
+from ..capsess import BaseTcaptchaSession
+
+
+class ClickCaptchaSession(BaseTcaptchaSession):
+    def __init__(self, session: str, prehandle: PrehandleResp) -> None:
+        super().__init__(session, prehandle)
+        self.mouse_track.set_result(None)

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/qqqr/up/captcha/select/_types.py

@@ -10,15 +10,14 @@ from qqqr.utils.iter import first
 from qqqr.utils.jsjson import json_loads
 from qqqr.utils.net import ClientAdapter
 
-from .._model import ClickCfg, PrehandleResp, Sprite
+from .._model import CommonBgElmConf, CommonRender, PrehandleResp, Sprite
 from ..capsess import BaseTcaptchaSession
 from ..pil_utils import *
 
 log = logging.getLogger(__name__)
 
 
-class SelectBgElemCfg(Sprite):
-    click_cfg: ClickCfg
+class SelectBgElemCfg(CommonBgElmConf, Sprite):
     img_url: str
 
 
@@ -40,7 +39,7 @@ class SelectJsonPayload(BaseModel):
         return len(self.picture_ids)
 
 
-class SelectCaptchaDisplay(BaseModel):
+class SelectRender(CommonRender):
     instruction: str
     bg: SelectBgElemCfg = Field(alias="bg_elem_cfg")
     verify_trigger_cfg: dict
@@ -56,15 +55,14 @@ class SelectCaptchaDisplay(BaseModel):
 class SelectCaptchaSession(BaseTcaptchaSession):
     solve_captcha_hook: solve_select_captcha.TyInst
 
-    def __init__(self, session: str, prehandle: PrehandleResp) -> None:
+    def __init__(self, session: str, prehandle: "PrehandleResp") -> None:
         super().__init__(session, prehandle)
         self.mouse_track.set_result(None)
 
     def parse_captcha_data(self):
         super().parse_captcha_data()
-        self.render = SelectCaptchaDisplay.model_validate(self.conf.render)
-        if self.render.bg.click_cfg.data_type:
-            self.data_type = self.render.bg.click_cfg.data_type[0]
+        self.render = SelectRender.model_validate(self.conf["render"])
+        self.data_type = self.render.bg.cfg["data_type"]
 
     async def get_captcha_problem(self, client: ClientAdapter):
         async with client.get(self._cdn_join(self.render.bg.img_url)) as r:

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/qqqr/up/captcha/slide/_types.py

@@ -4,13 +4,13 @@ import typing as t
 from contextlib import suppress
 from random import choices, randint
 
-from pydantic import BaseModel, Field
+from pydantic import AliasPath, BaseModel, Field
 
 from qqqr.message import solve_slide_captcha
 from qqqr.utils.iter import first, firstn
 from qqqr.utils.net import ClientAdapter
 
-from .._model import FgBindingCfg, FgElemCfg, Sprite
+from .._model import CommonBgElmConf, CommonRender, Sprite
 from ..capsess import BaseTcaptchaSession
 from ..pil_utils import *
 
@@ -58,14 +58,33 @@ except ImportError:
         return noise_x, noise_y
 
 
-class SlideBgElemCfg(Sprite):
+class MoveCfg(BaseModel):
+    track_limit: str
+    move_factor: t.List[int]
+    data_type: str = Field(validation_alias=AliasPath("data_type", 0))
+
+
+class FgElemCfg(Sprite):
+    id: int
+    init_pos: t.List[int]
+    move_cfg: t.Optional[MoveCfg] = None
+
+
+class FgBindingCfg(BaseModel):
+    master: int
+    slave: int
+    bind_type: str
+    bind_factor: int
+
+
+class SlideBgElemCfg(CommonBgElmConf, Sprite):
     img_url: str
     """relative url to get jigsaw puzzle image (background with dimmed piece shape)."""
     init_pos: t.List[int] = Field(default=[0, 0])
     """sprite init position on captcha (x, y)"""
 
 
-class SlideCaptchaDisplay(BaseModel):
+class SlideRender(CommonRender):
     bg: SlideBgElemCfg = Field(alias="bg_elem_cfg")
     """Background (puzzle)"""
     fg_binding_list: t.List[FgBindingCfg] = Field(default=[])
@@ -80,7 +99,8 @@ class SlideCaptchaSession(BaseTcaptchaSession):
 
     def parse_captcha_data(self):
         super().parse_captcha_data()
-        self.render = SlideCaptchaDisplay.model_validate(self.conf.render)
+        self.render = SlideRender.model_validate(self.conf["render"])
+
         self.cdn_urls = (
             self._cdn_join(self.render.bg.img_url),
             self._cdn_join(self.render.sprite_url),
@@ -89,8 +109,7 @@ class SlideCaptchaSession(BaseTcaptchaSession):
 
         self.piece_sprite = first(self.render.sprites, lambda s: s.move_cfg)
         assert self.piece_sprite.move_cfg
-        if self.piece_sprite.move_cfg.data_type:
-            self.data_type = self.piece_sprite.move_cfg.data_type[0]
+        self.data_type = self.piece_sprite.move_cfg.data_type
 
     async def get_captcha_problem(self, client: ClientAdapter):
         """

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/qqqr/up/h5.py

@@ -4,7 +4,7 @@ from random import random
 
 from yarl import URL
 
-from ._model import CheckResp
+from ._model import CheckRespValidator
 from .web import UpWebLogin, UpWebSession
 
 log = logging.getLogger(__name__)
@@ -43,13 +43,7 @@ class UpH5Login(UpWebLogin):
             r.raise_for_status()
             rl = re.findall(r"'(.*?)'[,\)]", await r.text())
 
-        rdict = dict(
-            zip(
-                ["code", "verifycode", "salt", "verifysession", "isRandSalt", "ptdrvs", "session"],
-                rl,
-            )
-        )
-        sess.set_check_result(CheckResp.model_validate(rdict))
+        sess.set_check_result(CheckRespValidator.validate_python(rl))
 
     async def _make_login_param(self, sess: UpWebSession):
         const = {

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/qqqr/up/web.py

@@ -16,7 +16,7 @@ from qqqr.type import APPID, PT_QR_APP, Proxy
 from qqqr.utils.iter import firstn
 from qqqr.utils.net import ClientAdapter, get_all_cookie
 
-from ._model import CheckResp, LoginResp, RedirectCookies, VerifyResp
+from ._model import CheckResp, CheckRespValidator, LoginResp, RedirectCookies, VerifyResp
 from .captcha import Captcha
 from .encrypt import PasswdEncoder, TeaEncoder
 
@@ -160,13 +160,7 @@ class UpWebLogin(LoginBase[UpWebSession], _UpHookMixin):
             r.raise_for_status()
             rl = re.findall(r"'(.*?)'[,\)]", await r.text())
 
-        rdict = dict(
-            zip(
-                ["code", "verifycode", "salt", "verifysession", "isRandSalt", "ptdrvs", "session"],
-                rl,
-            )
-        )
-        sess.set_check_result(CheckResp.model_validate(rdict))
+        sess.set_check_result(CheckRespValidator.validate_python(rl))
 
     async def send_sms_code(self, sess: UpWebSession):
         """Send verify sms (to get dynamic code)

{aioqzone-1.9.0.dev1 → aioqzone-1.9.2.dev1}/src/qqqr/utils/jsjson.py

@@ -4,9 +4,10 @@ from textwrap import dedent
 from typing import Dict, List, Union
 
 logger = logging.getLogger(__name__)
-JsonDict = Dict[Union[str, int], "JsonValue"]
+BaseTypes = Union[int, float, bool, str]
+JsonDict = Dict[BaseTypes, "JsonValue"]
 JsonList = List["JsonValue"]
-JsonValue = Union[bool, int, str, JsonDict, JsonList]
+JsonValue = Union[BaseTypes, JsonDict, JsonList]
 
 
 class AstLoader:
@@ -27,7 +28,7 @@ class AstLoader:
         def visit_Name(self, node: ast.Name):
             if node.id in self.const:
                 return self.const[node.id]
-            return ast.Str(s=node.id)
+            return ast.Constant(value=node.id)
 
     @classmethod
     def json_loads(cls, js: str, filename: str = "stdin") -> JsonValue:

aioqzone-1.9.0.dev1/src/qqqr/up/captcha/_model.py

@@ -1,84 +0,0 @@
-from typing import List, Optional
-
-from pydantic import BaseModel, Field
-
-
-class PowCfg(BaseModel):
-    prefix: str
-    md5: str
-
-
-class CommonCaptchaConf(BaseModel):
-    pow_cfg: PowCfg
-    """Ians, duration = match_md5(pow_cfg)"""
-    tdc_path: str
-    """relative path to get tdc.js"""
-
-
-class Sprite(BaseModel):
-    """Represents a sprite from a source material."""
-
-    size_2d: List[int]
-    """sprite size (w, h)"""
-    sprite_pos: List[int]
-    """sprite position on material (x, y)"""
-
-    @property
-    def height(self):
-        return self.size_2d[1]
-
-    @property
-    def width(self):
-        return self.size_2d[0]
-
-    @property
-    def box(self):
-        l, t = self.sprite_pos
-        return (l, t, l + self.width, l + self.height)
-
-
-class ClickCfg(BaseModel):
-    mark_style: str
-    data_type: List[str]
-
-
-class MoveCfg(BaseModel):
-    track_limit: str
-    move_factor: List[int]
-    data_type: Optional[List[str]] = None
-
-
-class FgElemCfg(Sprite):
-    id: int
-    init_pos: List[int]
-    move_cfg: Optional[MoveCfg] = None
-
-
-class FgBindingCfg(BaseModel):
-    master: int
-    slave: int
-    bind_type: str
-    bind_factor: int
-
-
-class CaptchaData(BaseModel):
-    common: CommonCaptchaConf = Field(alias="comm_captcha_cfg")
-    render: dict = Field(alias="dyn_show_info")
-
-
-class PrehandleResp(BaseModel):
-    captcha: CaptchaData = Field(alias="data", default=None)
-    sess: str
-
-    capclass: int = 0
-    log_js: str = ""
-    randstr: str = ""
-    sid: str = ""
-    src_1: str = ""
-    src_2: str = ""
-    src_3: str = ""
-    state: int = 0
-    subcapclass: int = 0
-    ticket: str = ""
-    uip: str = ""
-    """ipv4 / ipv6"""