做了什么:
- 包改为分层: 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
102 lines
3.4 KiB
Python
102 lines
3.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
"""
|
|
代理 IP 提取与格式化 (用于绕过腾讯天御的 IP 级滚动风控)
|
|
|
|
腾讯验证码按出口 IP 做滚动窗口风控, 触发时会返回 `errorCode=12` (f_limit)。
|
|
本模块从常见的「代理 IP 提取 API」取一个可用代理, 供 `TencentCaptchaClient(proxy=...)`
|
|
与 `OneMsAdapter(proxy=...)` 使用。
|
|
|
|
已适配的返回格式:
|
|
* JSON: {"status":100,"data":[{"ip":"1.2.3.4","port":"8080"}]} (讯客 xkdaili 等)
|
|
* JSON: {"data":{"ip":"1.2.3.4","port":8080}} / [{"ip":..,"port":..}]
|
|
* 纯文本: 一行一个 "1.2.3.4:8080" 或 "1.2.3.4,8080"
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
from typing import List, Optional
|
|
|
|
import httpx
|
|
|
|
_IP_PORT_RE = re.compile(r"(\d{1,3}(?:\.\d{1,3}){3})\s*[:,]\s*(\d{1,5})")
|
|
|
|
|
|
def format_proxy(ip: str, port, scheme: str = "http") -> str:
|
|
return f"{scheme}://{ip}:{port}"
|
|
|
|
|
|
def parse_proxies(payload: str, scheme: str = "http") -> List[str]:
|
|
"""从 API 返回体里解析出全部代理 (兼容 JSON 与纯文本两种格式)"""
|
|
out: List[str] = []
|
|
text = (payload or "").strip()
|
|
if not text:
|
|
return out
|
|
|
|
try:
|
|
import json
|
|
|
|
data = json.loads(text)
|
|
|
|
def walk(node):
|
|
if isinstance(node, dict):
|
|
ip = node.get("ip") or node.get("host") or node.get("server")
|
|
port = node.get("port")
|
|
if ip and port:
|
|
out.append(format_proxy(str(ip), port, scheme))
|
|
for key in ("data", "result", "proxy", "list", "proxies"):
|
|
if key in node:
|
|
walk(node[key])
|
|
elif isinstance(node, list):
|
|
for item in node:
|
|
walk(item)
|
|
|
|
walk(data)
|
|
if out:
|
|
return out
|
|
except Exception:
|
|
pass
|
|
|
|
for ip, port in _IP_PORT_RE.findall(text):
|
|
out.append(format_proxy(ip, port, scheme))
|
|
return out
|
|
|
|
|
|
def fetch_proxy(api_url: str, scheme: str = "http", timeout: float = 15.0) -> Optional[str]:
|
|
"""调用代理提取 API 并返回第一个可用代理字符串, 例如 http://1.2.3.4:8080"""
|
|
import logging
|
|
_log = logging.getLogger("proxy")
|
|
resp = httpx.get(api_url, timeout=timeout, trust_env=False, follow_redirects=True)
|
|
proxies = parse_proxies(resp.text, scheme=scheme)
|
|
if not proxies:
|
|
try:
|
|
import json
|
|
err = json.loads(resp.text)
|
|
if "info" in err or "message" in err:
|
|
_log.error("代理 API 返回失败: %s", err.get("info") or err.get("message"))
|
|
except Exception:
|
|
pass
|
|
return proxies[0] if proxies else None
|
|
|
|
|
|
def check_proxy(proxy: str, url: str = "https://turing.captcha.qcloud.com/",
|
|
timeout: float = 20.0) -> bool:
|
|
"""探测代理是否可用 (能连上目标域名即可, 不判断业务状态码)"""
|
|
try:
|
|
httpx.get(url, proxy=proxy, timeout=timeout, trust_env=False,
|
|
follow_redirects=True, headers={"User-Agent": "Mozilla/5.0"})
|
|
return True
|
|
except Exception:
|
|
return False
|
|
|
|
|
|
if __name__ == "__main__":
|
|
import argparse
|
|
|
|
ap = argparse.ArgumentParser(description="从代理 API 取一个可用代理")
|
|
ap.add_argument("api_url")
|
|
ap.add_argument("--scheme", default="http")
|
|
args = ap.parse_args()
|
|
proxy = fetch_proxy(args.api_url, scheme=args.scheme)
|
|
print(proxy or "未取到代理")
|