aioqzone 1.8.0.dev1__tar.gz → 1.8.2.dev1__tar.gz

{aioqzone-1.8.0.dev1 → aioqzone-1.8.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.8.0.dev1
+Version: 1.8.2.dev1
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
@@ -19,17 +19,15 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Provides-Extra: captcha
+Provides-Extra: slide-captcha
 Requires-Dist: aiohttp (>=3.8.5,<4.0.0)
-Requires-Dist: cssselect (>=1.1.0,<2.0.0)
 Requires-Dist: exceptiongroup (>=1.1.1,<2.0.0)
-Requires-Dist: lxml (>=4.9.1,<5.0.0)
 Requires-Dist: pillow (>=10.0.1,<11.0.0)
-Requires-Dist: pychaosvm (>=0.3.2,<0.4.0)
+Requires-Dist: pychaosvm (>=0.3.4,<0.4.0)
 Requires-Dist: pydantic (>=2.0.3,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.0.2,<3.0.0)
 Requires-Dist: rsa (>=4.8,<5.0)
-Requires-Dist: slide-tc (>=0.1.1,<0.2.0) ; extra == "captcha"
+Requires-Dist: slide-tc (>=0.1.1,<0.2.0) ; extra == "slide-captcha"
 Requires-Dist: tenacity (>=8.2.3,<9.0.0)
 Requires-Dist: tylisten (>=2.1.3,<3.0.0)
 Project-URL: Bug Tracker, https://github.com/aioqzone/aioqzone/issues

{aioqzone-1.8.0.dev1 → aioqzone-1.8.2.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.8.0.dev1"
+version = "1.8.2.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -32,17 +32,15 @@ aiohttp = "^3.8.5"
 pydantic = "^2.0.3"
 pydantic-settings = "^2.0.2"
 rsa = "^4.8"
-lxml = "^4.9.1"
-cssselect = "^1.1.0"
 tenacity = "^8.2.3"
 exceptiongroup = "^1.1.1"
 tylisten = "^2.1.3"
 pillow = "^10.0.1"
-pychaosvm = { version = "~0.3.2", source = "aioqzone-index" }
+pychaosvm = { version = "~0.3.4", source = "aioqzone-index" }
 slide-tc = {version = "~0.1.1", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
-captcha = ["slide-tc"]
+slide-captcha = ["slide-tc"]
 
 # dependency groups
 [tool.poetry.group.test]

{aioqzone-1.8.0.dev1 → aioqzone-1.8.2.dev1}/src/aioqzone/api/h5/model.py

@@ -61,7 +61,7 @@ class QzoneH5API:
         async for attempt in self._relogin_retry:
             with attempt:
                 if (gtk := self.login.gtk) == 0:
-                    raise TryAgain
+                    raise TryAgain("no login state")
                 if api.attach_token:
                     params["g_tk"] = gtk
                     hostuin: int = getattr(api.params, "hostuin", self.login.uin)

{aioqzone-1.8.0.dev1 → aioqzone-1.8.2.dev1}/src/aioqzone/api/login/__init__.py

@@ -118,6 +118,7 @@ class UpLoginManager(Loginable):
             client=self.client,
             uin=self.config.uin,
             pwd=self.config.pwd.get_secret_value(),
+            fake_ip=self.config.fake_ip and str(self.config.fake_ip),
             h5=enable,
         )
         self.sms_code_input = self.uplogin.sms_code_input

{aioqzone-1.8.0.dev1 → aioqzone-1.8.2.dev1}/src/aioqzone/model/protocol/config.py

@@ -1,6 +1,7 @@
-from typing import Literal, Union
+import typing as t
+from ipaddress import IPv4Address
 
-from pydantic import Field, SecretStr
+from pydantic import AnyUrl, Field, SecretStr
 from pydantic_settings import BaseSettings
 
 
@@ -13,6 +14,12 @@ class UpLoginConfig(LoginConfig):
     pwd: SecretStr = Field(default="")
     """User password."""
 
+    fake_ip: t.Optional[IPv4Address] = None
+    """Fake IP used when collecting network environment.
+
+    .. versionadded:: 1.8.2
+    """
+
 
 class QrLoginConfig(LoginConfig):
     max_refresh_times: int = 6

{aioqzone-1.8.0.dev1 → aioqzone-1.8.2.dev1}/src/qqqr/up/captcha/__init__.py

@@ -52,7 +52,13 @@ class Captcha(_CaptchaHookMixin):
     solve_select_captcha: solve_select_captcha.TyInst
     solve_slide_captcha: solve_slide_captcha.TyInst
 
-    def __init__(self, client: ClientAdapter, appid: int, xlogin_url: str):
+    def __init__(
+        self,
+        client: ClientAdapter,
+        appid: int,
+        xlogin_url: str,
+        fake_ip: t.Optional[str] = None,
+    ):
         """
         :param client: network client
         :param appid: Specify the appid of the application
@@ -64,6 +70,7 @@ class Captcha(_CaptchaHookMixin):
         self.appid = appid
         self.xlogin_url = xlogin_url
         self.client.headers["Referer"] = "https://xui.ptlogin2.qq.com/"
+        self.fake_ip = fake_ip
 
     @property
     def base64_ua(self):
@@ -149,7 +156,7 @@ class Captcha(_CaptchaHookMixin):
             return await sess.solve_captcha()
 
         async def get_tdc_collect(client: ClientAdapter) -> str:
-            await sess.get_tdc(client)
+            await sess.get_tdc(client, ip=self.fake_ip)
             return unquote(str(sess.tdc.getData(None, True)))
 
         ans, collect, _ = await asyncio.gather(

{aioqzone-1.8.0.dev1 → aioqzone-1.8.2.dev1}/src/qqqr/up/captcha/capsess.py

@@ -70,7 +70,9 @@ class BaseTcaptchaSession(ABC):
     def _vmslide_js_url(self):
         raise NotImplementedError
 
-    async def get_tdc(self, client: ClientAdapter, ua: t.Optional[str] = None):
+    async def get_tdc(
+        self, client: ClientAdapter, ua: t.Optional[str] = None, ip: t.Optional[str] = None
+    ):
         """
         .. note:: If :obj:`.mouse_track` should be set, set it before calling this method.
         """
@@ -80,7 +82,7 @@ class BaseTcaptchaSession(ABC):
             r.raise_for_status()
             self.tdc = prepare(
                 await r.text("utf8"),
-                ip=self.prehandle.uip,
+                ip=ip or self.prehandle.uip,
                 ua=ua or client.headers["User-Agent"],
                 mouse_track=await self.mouse_track,
             )

{aioqzone-1.8.0.dev1 → aioqzone-1.8.2.dev1}/src/qqqr/up/web.py

@@ -123,11 +123,14 @@ class UpWebLogin(LoginBase[UpWebSession], _UpHookMixin):
         app: t.Optional[APPID] = None,
         proxy: t.Optional[Proxy] = None,
         info: t.Optional[PT_QR_APP] = None,
+        fake_ip: t.Optional[str] = None,
     ):
         super().__init__(client, uin=uin, h5=h5, app=app, proxy=proxy, info=info)
         self.pwd = pwd
         self.pwder = TeaEncoder(pwd)
-        self.captcha = Captcha(self.client, self.app.appid, str(self.login_page_url))
+        self.captcha = Captcha(
+            self.client, self.app.appid, str(self.login_page_url), fake_ip=fake_ip
+        )
 
     async def new(self):
         """Create a :class:`UpWebSession`. This will call `check` api of Qzone, and receive result