aioqzone 0.12.13.dev2__tar.gz → 0.13.0.dev2__tar.gz

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 0.12.13.dev2
+Version: 0.13.0.dev2
 Summary: Python wrapper for Qzone login and Qzone HTTP APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
@@ -19,13 +19,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Provides-Extra: captcha
-Provides-Extra: lxml
-Requires-Dist: cssselect (>=1.1.0,<2.0.0) ; extra == "lxml"
+Requires-Dist: cssselect (>=1.1.0,<2.0.0)
 Requires-Dist: exceptiongroup (>=1.1.1,<2.0.0) ; python_version < "3.11"
-Requires-Dist: httpx (>=0.23.0,<0.25.0)
-Requires-Dist: lxml (>=4.9.1,<5.0.0) ; extra == "lxml"
+Requires-Dist: httpx (>=0.24.0,<0.25.0)
+Requires-Dist: lxml (>=4.9.1,<5.0.0)
 Requires-Dist: numpy (>=1.22.3,<2.0.0) ; extra == "captcha"
 Requires-Dist: pillow (>=9.4.0,<10.0.0) ; extra == "captcha"
+Requires-Dist: pychaosvm (>=0.2.3,<0.3.0) ; extra == "captcha"
 Requires-Dist: pydantic (>=1.10.4,<2.0.0)
 Requires-Dist: rsa (>=4.8,<5.0)
 Project-URL: Bug Tracker, https://github.com/aioqzone/aioqzone/issues
@@ -39,7 +39,6 @@ Description-Content-Type: text/markdown
 aioqzone封装了一些Qzone接口。
 
 [![python](https://img.shields.io/pypi/pyversions/aioqzone?logo=python&logoColor=white)][home]
-[![QQQR](https://github.com/aioqzone/aioqzone/actions/workflows/qqqr.yml/badge.svg?branch=beta&event=schedule)](https://github.com/aioqzone/aioqzone/actions/workflows/qqqr.yml)
 [![version](https://img.shields.io/pypi/v/aioqzone?logo=python)][pypi]
 [![style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![discuss](https://img.shields.io/badge/dynamic/xml?style=social&logo=telegram&label=Discuss&query=%2F%2Fdiv%5B%40class%3D%22tgme_page_extra%22%5D&url=https%3A%2F%2Ft.me%2Faioqzone_chatroom)](https://t.me/aioqzone_chatrooom)
@@ -76,19 +75,11 @@ __在做了:__
 
 - [ ] 完善的测试覆盖
 
-## node 依赖
-
-- `jssupport.jsjson.AstLoader` 不需要借助其他进程；
-- 要使用 `jssupport.execjs` 和 `jssupport.jsjson.NodeLoader`，您（至少）需要安装 `Node.js` >= v14；
-- 要使用 `jssupport.jsdom`，您需要安装 `jsdom` 和 `canvas` 两个 npm 包。
-- 验证码部分需要使用 `canvas`，因此您需要正确配置运行环境内的 font config ([#45](https://github.com/aioqzone/aioqzone/issues/45)).
-
 ## 包描述
 
 |包名    |简述  |
 |-----------|-------------------|
 |aioqzone   |封装Qzone API  |
-|jssupport  |执行JS            |
 |qqqr       |网页登录    |
 
 ## 例子

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/README.md

@@ -3,7 +3,6 @@
 aioqzone封装了一些Qzone接口。
 
 [![python](https://img.shields.io/pypi/pyversions/aioqzone?logo=python&logoColor=white)][home]
-[![QQQR](https://github.com/aioqzone/aioqzone/actions/workflows/qqqr.yml/badge.svg?branch=beta&event=schedule)](https://github.com/aioqzone/aioqzone/actions/workflows/qqqr.yml)
 [![version](https://img.shields.io/pypi/v/aioqzone?logo=python)][pypi]
 [![style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![discuss](https://img.shields.io/badge/dynamic/xml?style=social&logo=telegram&label=Discuss&query=%2F%2Fdiv%5B%40class%3D%22tgme_page_extra%22%5D&url=https%3A%2F%2Ft.me%2Faioqzone_chatroom)](https://t.me/aioqzone_chatrooom)
@@ -40,19 +39,11 @@ __在做了:__
 
 - [ ] 完善的测试覆盖
 
-## node 依赖
-
-- `jssupport.jsjson.AstLoader` 不需要借助其他进程；
-- 要使用 `jssupport.execjs` 和 `jssupport.jsjson.NodeLoader`，您（至少）需要安装 `Node.js` >= v14；
-- 要使用 `jssupport.jsdom`，您需要安装 `jsdom` 和 `canvas` 两个 npm 包。
-- 验证码部分需要使用 `canvas`，因此您需要正确配置运行环境内的 font config ([#45](https://github.com/aioqzone/aioqzone/issues/45)).
-
 ## 包描述
 
 |包名    |简述  |
 |-----------|-------------------|
 |aioqzone   |封装Qzone API  |
-|jssupport  |执行JS            |
 |qqqr       |网页登录    |
 
 ## 例子

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "0.12.13.dev2"
+version = "0.13.0.dev2"
 description = "Python wrapper for Qzone login and Qzone HTTP APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -18,7 +18,6 @@ classifiers = [
 
 packages = [
     { include = "aioqzone", from = "src" },
-    { include = "jssupport", from = "src" },
     { include = "qqqr", from = "src" },
 ]
 exclude = ["*.js"]
@@ -29,27 +28,26 @@ exclude = ["*.js"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-httpx = ">=0.23.0,<0.25.0"
+httpx = "^0.24.0"
 pydantic = "^1.10.4"
 rsa = "^4.8"
-exceptiongroup = { version = "^1.1.1", python = "<3.11" }
+lxml = "^4.9.1"
+cssselect = "^1.1.0"
+exceptiongroup = { version = "^1.1.1", python = "<3.11"}
 
-lxml = { version = "^4.9.1", optional = false }
-cssselect = { version = "^1.1.0", optional = false }
-
-numpy = { version = "^1.22.3", optional = false }
-pillow = { version = "^9.4.0", optional = false }
+numpy = { version = "^1.22.3", optional = true}
+pillow = { version = "^9.4.0", optional = true}
+pychaosvm = { version = "^0.2.3", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
-captcha = ["numpy", "pillow"]
-lxml = ["lxml", "cssselect"]
+captcha = ["numpy", "pillow", "pychaosvm"]
 
 # dependency groups
 [tool.poetry.group.test]
 optional = false
 
 [tool.poetry.group.test.dependencies]
-pytest = "^7.2.1"
+pytest = "^7.4.0"
 pytest-asyncio = "~0.21.0"
 
 [tool.poetry.group.dev]
@@ -64,12 +62,21 @@ isort = "*"
 optional = true
 
 [tool.poetry.group.docs.dependencies]
-Sphinx = "^6.1.3"
+Sphinx = "^7.0.1"
 autodoc-pydantic = "*"
 sphinx-autodoc-typehints = "^1.19.5"
-sphinx-rtd-theme = "*"
+furo = "*"
 sphinx-intl = "*"
 
+[[tool.poetry.source]]
+name = "aioqzone-index"
+url = "https://aioqzone.github.io/aioqzone-index/simple"
+priority = "supplemental"
+
+[[tool.poetry.source]]
+name = "PyPI"
+priority = "primary"
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/src/aioqzone/api/h5/raw.py

@@ -9,7 +9,8 @@ from aioqzone.api.loginman import Loginable
 from aioqzone.exception import QzoneError
 from aioqzone.utils.catch import HTTPStatusErrorDispatch, QzoneErrorDispatch
 from aioqzone.utils.regex import entire_closing, response_callback
-from jssupport.jsjson import JsonValue, json_loads
+from qqqr.utils.iter import firstn
+from qqqr.utils.jsjson import JsonValue, json_loads
 from qqqr.utils.net import ClientAdapter
 
 StrDict = Dict[str, JsonValue]
@@ -102,7 +103,8 @@ class QzoneH5RawAPI:
             """
 
             with QzoneErrorDispatch() as qze, HTTPStatusErrorDispatch() as hse:
-                qze.dispatch(-3000, suppress=lambda e: "登录" in e.msg)  # -3000: 请先登录
+                # NOTE: 尽管只有“-3000: 请先登录”明确要求重新登录，但似乎任何原因的-3000错误值都意味着cookie过期。因此移除了对message的校验
+                qze.dispatch(-3000)
                 qze.dispatch(-10000)
                 hse.dispatch(302, 403)
                 return await func(*args, **kwds)
@@ -150,13 +152,13 @@ class QzoneH5RawAPI:
 
         assert isinstance(r, dict)
 
-        err = next(filter(lambda i: i is not None, (r.get(i) for i in errno_key)), None)
+        err = firstn((r.get(i) for i in errno_key), lambda i: i is not None)
         assert err is not None, f"no {errno_key} in {r.keys()}"
         assert isinstance(err, (int, str))
         err = int(err)
 
         if err != 0:
-            msg = next(filter(None, (r.get(i) for i in msg_key)), None)
+            msg = firstn((r.get(i) for i in msg_key), lambda i: i is not None)
             if msg:
                 raise QzoneError(err, msg, rdict=r)
             else:
@@ -183,7 +185,7 @@ class QzoneH5RawAPI:
             raise RuntimeError("script tag not found")
 
         texts: List[str] = [s.text for s in scripts]
-        script = next(filter(lambda s: "shine0callback" in s, texts), None)
+        script = firstn(texts, lambda s: "shine0callback" in s)
         if not script:
             raise RuntimeError("data script not found")
 

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/src/aioqzone/api/loginman/__init__.py

@@ -11,7 +11,6 @@ from httpx import ConnectError, HTTPError
 
 from aioqzone.event.login import LoginMethod, QREvent, UPEvent
 from aioqzone.exception import LoginError, SkipLoginInterrupt
-from jssupport.exception import JsImportError, JsRuntimeError, NodeNotFoundError
 from qqqr.constant import QzoneH5Proxy, StatusCode
 from qqqr.event import Emittable, EventManager
 from qqqr.exception import HookError, TencentLoginError, UserBreak
@@ -21,7 +20,6 @@ from qqqr.utils.net import ClientAdapter
 from ._base import Loginable
 
 log = logging.getLogger(__name__)
-JsError = JsRuntimeError, JsImportError, NodeNotFoundError
 
 
 class _NextMethodInterrupt(RuntimeError):
@@ -95,10 +93,6 @@ class UPLoginMan(Loginable, Emittable[UPEvent]):
             raise TencentLoginError(
                 StatusCode.NeedSmsVerify, "Dynamic code verify not implemented"
             ) from e
-        except JsError as e:
-            log.error(str(e), exc_info=e)
-            emit_hook(self.hook.LoginFailed(meth, "JS调用出错"))
-            raise TencentLoginError(StatusCode.NeedCaptcha, "Failed to pass captcha") from e
         except HookError as e:
             log.warning(f"HookError occured in {e.hook}", exc_info=e)
             emit_hook(self.hook.LoginFailed(meth, str(e)))

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/src/aioqzone/api/web/raw.py

@@ -17,8 +17,8 @@ from aioqzone.type.internal import AlbumData, LikeData
 from aioqzone.utils.catch import HTTPStatusErrorDispatch, QzoneErrorDispatch
 from aioqzone.utils.regex import response_callback
 from aioqzone.utils.time import time_ms
-from jssupport.jsjson import JsonValue, json_loads
-from qqqr.utils.daug import du
+from qqqr.utils.iter import firstn
+from qqqr.utils.jsjson import JsonValue, json_loads
 from qqqr.utils.net import ClientAdapter, raise_for_status
 
 logger = logging.getLogger(__name__)
@@ -156,13 +156,13 @@ class QzoneWebRawAPI:
         r = json_loads(rtext)
         assert isinstance(r, dict)
 
-        err = next(filter(lambda i: i is not None, (r.get(i) for i in errno_key)), None)
+        err = firstn((r.get(i) for i in errno_key), lambda i: i is not None)
         assert err is not None, f"no {errno_key} in {r.keys()}"
         assert isinstance(err, (int, str))
         err = int(err)
 
         if err != 0:
-            msg = next(filter(None, (r.get(i) for i in msg_key)), None)
+            msg = firstn((r.get(i) for i in msg_key), lambda i: i is not None)
             if msg:
                 raise QzoneError(err, msg, rdict=r)
             else:
@@ -238,10 +238,11 @@ class QzoneWebRawAPI:
             "usertime": time_ms(),
             "externparam": external,
         }
+        query.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_get(const.feeds3_html_more, du(default, query)) as r:
+            async with self.host_get(const.feeds3_html_more, query) as r:
                 r.raise_for_status()
                 rtext = r.text
 
@@ -288,11 +289,12 @@ class QzoneWebRawAPI:
             "tid": tid,
             "feedsType": feedstype,
         }
-        logger.debug("emotion_getcomments post data:", body)
+        logger.debug(f"emotion_getcomments post data: {body}")
+        body.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(const.emotion_getcomments, data=du(default, body)) as r:
+            async with self.host_post(const.emotion_getcomments, data=body) as r:
                 r.raise_for_status()
                 rtext = r.text
 
@@ -326,10 +328,11 @@ class QzoneWebRawAPI:
             "need_private_comment": 1,
         }
         query = {"uin": owner, "tid": fid}
+        query.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_get(const.emotion_msgdetail, params=du(default, query)) as r:
+            async with self.host_get(const.emotion_msgdetail, params=query) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 
@@ -387,12 +390,14 @@ class QzoneWebRawAPI:
             "abstime": likedata.abstime,
             "fid": likedata.fid,
         }
-        logger.debug("like_app post data:", body)
+        logger.debug(f"like_app post data: {body}")
+
+        body.update(default)
         url = const.internal_dolike_app if like else const.internal_unlike_app
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(url, data=du(default, body)) as r:
+            async with self.host_post(url, data=body) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text, errno_key=("code", "ret"))
 
@@ -454,10 +459,11 @@ class QzoneWebRawAPI:
             "t": randint(int(1e8), int(1e9 - 1))
             # The distribution is not consistent with photo.js; but the format is.
         }
+        query.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_get(const.floatview_photo_list, du(default, query)) as r:
+            async with self.host_get(const.floatview_photo_list, query) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 
@@ -506,9 +512,12 @@ class QzoneWebRawAPI:
             "need_private_comment": 1,
         }
 
+        if pos:
+            param.update(add)
+
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_get(const.emotion_msglist, du(param, add) if pos else param) as r:
+            async with self.host_get(const.emotion_msglist, param) as r:
                 r.raise_for_status()
                 rtext = r.text
             return self._rtext_handler(rtext)
@@ -551,11 +560,12 @@ class QzoneWebRawAPI:
             "feedversion": 1,
             "hostuin": self.login.uin,
         }
-        logger.debug("emotion_publish post data:", body)
+        logger.debug(f"emotion_publish post data: {body}")
+        body.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(const.emotion_publish, data=du(default, body)) as r:
+            async with self.host_post(const.emotion_publish, data=body) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 
@@ -649,11 +659,12 @@ class QzoneWebRawAPI:
             "hostuin": uin or self.login.uin,
             # 'pic_bo': ''
         }
-        logger.debug("emotion_update post data:", body)
+        logger.debug(f"emotion_update post data: {body}")
+        body.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(const.emotion_update, data=du(default, body)) as r:
+            async with self.host_post(const.emotion_update, data=body) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 
@@ -706,11 +717,12 @@ class QzoneWebRawAPI:
             private=int(is_private),
             paramstr=1,
         )
-        logger.debug("emotion_re_feeds post data:", data)
+        logger.debug(f"emotion_re_feeds post data: {data}")
+        data.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(const.emotion_re_feeds, data=du(default, data)) as r:
+            async with self.host_post(const.emotion_re_feeds, data=data) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/src/aioqzone/utils/html.py

@@ -7,12 +7,13 @@ Use this module to get some data from Qzone html feed.
 """
 import logging
 import re
+from contextlib import suppress
 from typing import Iterable, List, Optional, Union, cast
 
 from lxml.html import HtmlElement, fromstring
-from pydantic import BaseModel, HttpUrl
+from pydantic import BaseModel, HttpUrl, ValidationError
 
-from qqqr.utils.daug import di
+from qqqr.utils.iter import firstn
 
 from ..type.entity import ConEntity
 from ..type.internal import AlbumData
@@ -81,7 +82,7 @@ class HtmlContent(BaseModel):
         img_data = lambda a: {k[5:]: v for k, v in a.attrib.items() if k.startswith("data-")}
 
         def load_src(a: Iterable[HtmlElement]) -> Optional[HttpUrl]:
-            o: Optional[HtmlElement] = next(filter(lambda i: i.tag == "img", a), None)
+            o = firstn(a, lambda i: i.tag == "img")
             if o is None:
                 return
             src: str = o.get("src", "")
@@ -101,11 +102,11 @@ class HtmlContent(BaseModel):
 
         finfo: HtmlElement = mxsafe(root.cssselect("div.f-info"))
         lia: List[HtmlElement] = root.cssselect("div.f-ct a.img-item")
+        (d := img_data(lia[0]))["hostuin"] = hostuin
 
-        try:
-            album = AlbumData.parse_obj(di(img_data(lia[0]), hostuin=hostuin))
-        except:
-            album = None
+        album = None
+        with suppress(ValidationError):
+            album = AlbumData.parse_obj(d)
 
         pic = [
             PicRep(

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/src/qqqr/qr/__init__.py

@@ -11,7 +11,6 @@ from ..constant import StatusCode
 from ..event import Emittable, hook_guard
 from ..event.login import QrEvent
 from ..exception import UserBreak
-from ..utils.daug import du
 from ..utils.encrypt import hash33
 
 log = logging.getLogger(__name__)
@@ -86,7 +85,7 @@ class QrLogin(LoginBase[QrSession], Emittable[QrEvent]):
             "daid": self.app.daid,
         }
 
-        async with self.client.get(POLL_QR, params=du(data, const)) as r:
+        async with self.client.get(POLL_QR, params=data.update(const) or data) as r:
             r.raise_for_status()
             rl = re.findall(r"'(.*?)'[,\)]", r.text)
 

{aioqzone-0.12.13.dev2 → aioqzone-0.13.0.dev2}/src/qqqr/up/captcha/__init__.py

@@ -3,20 +3,21 @@ import base64
 import json
 import logging
 import re
+from contextlib import suppress
 from hashlib import md5
 from ipaddress import IPv4Address
 from random import random
 from time import time
-from typing import List, Type, TypeVar
+from typing import List
 
+from chaosvm import prepare
+from chaosvm.proxy.dom import TDC
 from httpx import URL
 
-from ...utils.daug import du
 from ...utils.iter import first
 from ...utils.net import ClientAdapter
 from ..type import PrehandleResp, VerifyResp
 from .jigsaw import Jigsaw, imitate_drag
-from .vm import CollectEnv
 
 PREHANDLE_URL = "https://t.captcha.qq.com/cap_union_prehandle"
 SHOW_NEW_URL = "https://t.captcha.qq.com/cap_union_new_show"
@@ -27,8 +28,6 @@ time_ms = lambda: int(1e3 * time())
 rnd6 = lambda: str(random())[2:8]
 log = logging.getLogger(__name__)
 
-_TDC_TY = TypeVar("_TDC_TY", bound=CollectEnv)
-
 
 def hex_add(h: str, o: int):
     if h.endswith("#"):
@@ -56,8 +55,8 @@ class TcaptchaSession:
         self.cdn_imgs: List[bytes] = []
         self.piece_sprite = first(self.conf.render.sprites, lambda s: s.move_cfg)
 
-    def set_js_env(self, tdc: CollectEnv):
-        self.tdc = tdc
+    def set_drag_track(self, xs: List[float], ys: List[float]):
+        self.mouse_track = list(zip(xs, ys))
 
     def solve_workload(self, *, timeout: float = 30.0):
         """
@@ -88,6 +87,9 @@ class TcaptchaSession:
     def set_captcha_answer(self, left: int, top: int):
         self.jig_ans = left, top
 
+    def set_js_env(self, tdc: TDC):
+        self.tdc = tdc
+
     def _cdn(self, rel_path: str) -> URL:
         return URL("https://t.captcha.qq.com").join(rel_path)
 
@@ -163,7 +165,7 @@ class Captcha:
             "subsid": 1,
             "callback": CALLBACK,
         }
-        async with self.client.get(PREHANDLE_URL, params=du(const, data)) as r:
+        async with self.client.get(PREHANDLE_URL, params=data.update(const) or data) as r:
             r.raise_for_status()
             m = re.search(CALLBACK + r"\((\{.*\})\)", r.text)
 
@@ -187,35 +189,11 @@ class Captcha:
             # BUG: should always bypass client's proxy settings
             async with self.client.get("https://" + api) as r:
                 cand = r.text.strip()
-                try:
+                with suppress(ValueError):
                     IPv4Address(cand)
                     return cand
-                except ValueError:
-                    continue
         return ""
 
-    async def get_tdc(self, sess: TcaptchaSession, *, cls: Type[_TDC_TY] = CollectEnv):
-        """
-        The get_tdc function is a coroutine that sets an instance of the :class:`TDC` class to `sess`.
-
-        :param sess: captcha session
-        :param cls: Specify the type of :class:`TDC` instance to be returned, default as :class:`TDC`.
-        :return: None
-        """
-        js_url = sess.tdx_js_url()
-        tdc = cls(
-            xlogin_url=self.xlogin_url,
-            ipv4=await self.get_ipv4(),
-            ua=self.client.headers["User-Agent"],
-            # iframe=await self.iframe(),
-        )
-
-        async with self.client.get(js_url) as r:
-            r.raise_for_status()
-            tdc.load_vm(r.text)
-
-        sess.set_js_env(tdc)
-
     async def get_captcha_problem(self, sess: TcaptchaSession):
         """
         The get_captcha_problem function is a coroutine that accepts a TcaptchaSession object as an argument.
@@ -263,37 +241,54 @@ class Captcha:
         sess.set_captcha_answer(left, jig.top)
 
         xs, ys = imitate_drag(sess.piece_sprite.init_pos[0], left, jig.top)
-        sess.tdc.run.append(
-            "async function main(){await simulate_slide(%s, %s)}" % (str(xs), str(ys))
-        )
-        sess.tdc.add_run("main")
+        sess.set_drag_track(xs, ys)  # type: ignore
+
+    async def get_tdc(self, sess: TcaptchaSession):
+        """
+        The get_tdc function is a coroutine that sets an instance of the :class:`TDC` class to `sess`.
+
+        :param sess: captcha session
+        :return: None
+        """
+        async with self.client.get(sess.tdx_js_url()) as r:
+            r.raise_for_status()
+            tdc = prepare(
+                r.text,
+                ip=await self.get_ipv4(),
+                ua=self.client.headers["User-Agent"],
+                mouse_track=sess.mouse_track,
+            )
+
+        sess.set_js_env(tdc)
 
     async def verify(self):
         sess = await self.new()
-        await self.get_tdc(sess)
-
-        sess.solve_workload()
 
         await self.get_captcha_problem(sess)
+        sess.solve_workload()
         self.solve_captcha(sess)
+        await self.get_tdc(sess)
+
+        assert sess.piece_sprite.move_cfg
+        assert sess.piece_sprite.move_cfg.data_type
 
-        collect = await sess.tdc.get_data()
+        collect = str(sess.tdc.getData(None, True))  # BUG: maybe a String(), convert to str
 
         ans = dict(
             elem_id=1,
-            type=sess.piece_sprite.move_cfg.data_type[0],  # type: ignore
+            type=sess.piece_sprite.move_cfg.data_type[0],
             data="{0},{1}".format(*sess.jig_ans),
         )
         data = {
             "collect": collect,
             "tlg": len(collect),
-            "eks": (await sess.tdc.get_info())["info"],
+            "eks": sess.tdc.getInfo()["info"],
             "sess": sess.prehandle.sess,
             "ans": json.dumps(ans),
             "pow_answer": hex_add(sess.conf.common.pow_cfg.prefix, sess.pow_ans),
             "pow_calc_time": sess.duration,
         }
-        log.debug("verify post data:", data)
+        log.debug(f"verify post data: {data}")
 
         async with self.client.post(VERIFY_URL, data=data) as r:
             r = VerifyResp.parse_raw(r.text)