做了什么:
- 包改为分层: tcaptcha/{protocol,telemetry,solvers,ocr,adapters,models,tests}
* protocol/ client.py transport.py proxy.py
* telemetry/ crypto.py values.py key.py opcodes.py
disasm.py program.py layout.py modules.py
* solvers/ text_click.py icon_click.py icon_click_rotate.py slider.py
* ocr/ engines.py slicer.py
* adapters/ one_ms.py
- tools/ 里原本是**包运行时依赖**的 tdc_{disasm,program,layout,modules}.py 并入 telemetry/
(放在 tools/ 属于分层倒置),tools/ 只留 CLI: tdc_key_pure.py / tdc_profile.py / cdp_*.js
- crypto.py 529 -> 340 行: 切除「成功样本模板回填」与「Node 插桩兜底」两条老路;
generate_telemetry 只剩 python_values 一种模式,传别的会直接报错并说明原因
- 求解器改名分清: solver.py -> solvers/icon_click.py(client 实际在用的 YOLO+ResNet18 ONNX),
icon_click_solver.py -> solvers/icon_click_rotate.py(仅测试在用,留作对照)
- pyproject: 去掉 ultralytics/onnx(训练栈已删),补上真正在用的 onnxruntime
删除了什么:
- 雨云整条线 + dist/rainyun_qinglong(104M 旧快照)
- 模板回填: models/success_collect_template.b64、tdc_worker.js、analyze_collect_layout.py
- 「补环境」时代浏览器 JS: chrome_fetch/manual_captcha/probe_captcha/solve_in_browser/tdc_browser
- 旧 VM 探索工具 10 个(tdc_collectgen/tdc_slotmap/tdc_lift/tdc_vm_run/tdc_query/tdc_probe 等)
+ 8 个基于它们的旧 verify 脚本
- 训练/标注/评估: train_classifier/train_detector/prepare_yolo/web_labeler/collector/
siamese/evaluate/benchmark_verify
- tcaptcha/core_js/(60 个分析产物)、TOOLCHAIN_REPORT.md(整篇在描述已删工具)
- 3 个已无任何引用的 PyTorch 权重:icon_classifier.pt 43M / yolo_detector.pt 5.9M /
siamese_matcher.pt 1.6M —— 线上只跑 onnx,tcaptcha/ 117M -> 66M
为什么:
- 项目后面要专门承载「滑块 / 文字点选 / 图标点选」三种求解器;扁平包 + 运行时依赖混在
tools/ + 两条已废弃的 collect 生成路线,会让后续扩展持续踩坑
怎么验证:
- .venv/bin/python -m tcaptcha.selftest 全绿
- scripts/verify/verify_offline.py 逐槽全等 + 分段几何一致
- scripts/verify/verify_values.py 4 份真机明文 152/152 逐槽全等
- scripts/verify/send_test.py --mode python_values 1ms 签到页文字点选 errorCode=0
- 回滚点: tag backup/pre-refactor-20261012
79 lines
3.3 KiB
Python
79 lines
3.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
"""
|
|
HTTP 传输层可选实现 —— 为 `TencentCaptchaClient` 提供"浏览器级"传输指纹。
|
|
|
|
背景 (2026-10-11 实测, 见 har/1ms_dianxuan/ANALYSIS.md §7.6):
|
|
同一 aid (1ms 195672344)、同一套腾讯云登录 cookie、同一 prehandle 参数下,
|
|
**真实浏览器**对 cap_union_new_verify 只会得到 50 / 9 / 0 (从不 12);
|
|
而 httpx 客户端(HTTP/1.1 + OpenSSL, 头序与浏览器不同) 永远得到 12。
|
|
即 12 的自变量不在"载荷内容"(答案已对、密钥已用真机密钥), 而在"谁在发这个 HTTP"。
|
|
|
|
本模块用 curl_cffi 复刻 Chrome 的网络指纹(**JA3/JA4 + HTTP/2 + 头序 + 头大小写**),
|
|
对上层暴露与 `httpx.Client` 相同的最小接口 (get / post / close), 便于单变量对照。
|
|
|
|
用法::
|
|
|
|
TencentCaptchaClient(..., transport="curl", impersonate="chrome")
|
|
|
|
依赖: `curl_cffi` (uv add curl_cffi)。
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import Any, Dict, Optional
|
|
|
|
logger = logging.getLogger("tcaptcha_http")
|
|
|
|
try: # 依赖可选: 未安装时只影响 transport="curl"
|
|
from curl_cffi import requests as _cr
|
|
except Exception: # pragma: no cover
|
|
_cr = None
|
|
|
|
|
|
class CurlCffiClient:
|
|
"""`httpx.Client` 的最小兼容壳 —— 走 curl_cffi 的浏览器指纹。"""
|
|
|
|
def __init__(self, base_url: str, headers: Dict[str, str], timeout: float = 15.0,
|
|
proxy: Optional[str] = None, impersonate: str = "chrome",
|
|
follow_redirects: bool = True) -> None:
|
|
if _cr is None:
|
|
raise RuntimeError("curl_cffi 未安装: 先执行 `uv add curl_cffi`")
|
|
self._base = base_url.rstrip("/")
|
|
self._headers = {k: v for k, v in headers.items() if v is not None}
|
|
self._timeout = timeout
|
|
self._proxy = proxy
|
|
self._follow = follow_redirects
|
|
self._session = _cr.Session(impersonate=impersonate)
|
|
logger.debug("CurlCffiClient 就绪 (impersonate=%s)", impersonate)
|
|
|
|
# ------------------------------------------------------------------ 兼容面
|
|
def _url(self, path: str) -> str:
|
|
return path if str(path).startswith("http") else self._base + str(path)
|
|
|
|
def _proxy_kw(self) -> Dict[str, Any]:
|
|
if not self._proxy:
|
|
return {}
|
|
return {"proxies": {"http": self._proxy, "https": self._proxy}}
|
|
|
|
def _merge(self, extra: Optional[Dict[str, str]]) -> Dict[str, str]:
|
|
out = dict(self._headers)
|
|
if extra:
|
|
out.update({k: v for k, v in extra.items() if v is not None})
|
|
return out
|
|
|
|
def get(self, path: str, **kw: Any):
|
|
headers = self._merge(kw.pop("headers", None))
|
|
return self._session.get(self._url(path), headers=headers, timeout=self._timeout,
|
|
allow_redirects=self._follow, **self._proxy_kw(), **kw)
|
|
|
|
def post(self, path: str, **kw: Any):
|
|
headers = self._merge(kw.pop("headers", None))
|
|
return self._session.post(self._url(path), headers=headers, timeout=self._timeout,
|
|
allow_redirects=self._follow, **self._proxy_kw(), **kw)
|
|
|
|
def close(self) -> None:
|
|
try:
|
|
self._session.close()
|
|
except Exception: # pragma: no cover
|
|
pass
|