yml2213
344eea2194
做了什么:
- 包改为分层: 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
100 lines
3.6 KiB
Python
100 lines
3.6 KiB
Python
# -*- coding: utf-8 -*-
|
|
"""
|
|
在线抓取**全新**样本（2026-10-12 起，只使用本脚本产出的数据）。
|
|
|
|
抓什么:
|
|
1. prehandle -> sess / comm_captcha_cfg.tdc_path
|
|
2. 连抓 N 份 tdc.js（同一个 URL **每次请求都返回不同构建**，账本 #29）
|
|
3. 每份都算出: XTEA 密钥、eks、37 模块的字符串指纹、槽位序
|
|
|
|
产出目录: har/online/<时间戳>/
|
|
用法:
|
|
.venv/bin/python scripts/fetch_online_samples.py --n 4
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import hashlib
|
|
import json
|
|
import random
|
|
import sys
|
|
import time
|
|
from pathlib import Path
|
|
|
|
ROOT = Path(__file__).resolve().parents[1]
|
|
sys.path.insert(0, str(ROOT))
|
|
sys.path.insert(0, str(ROOT / "tools"))
|
|
|
|
from tcaptcha.protocol.client import TencentCaptchaClient # noqa: E402
|
|
from tcaptcha.telemetry.crypto import extract_eks # noqa: E402
|
|
from tcaptcha.telemetry.key import extract_xtea_key_pure # noqa: E402
|
|
|
|
OUT = ROOT / "har" / "online"
|
|
|
|
|
|
def main() -> int:
|
|
ap = argparse.ArgumentParser(description="在线抓取全新 tdc.js 样本")
|
|
ap.add_argument("--n", type=int, default=4, help="抓几份 tdc.js")
|
|
ap.add_argument("--aid", default="2039519451", help="雨云 aid（宽松，适合取样）")
|
|
ap.add_argument("--tag", default=None, help="输出子目录名（默认时间戳）")
|
|
ap.add_argument("--gap", type=float, default=1.0, help="两次抓取间隔秒")
|
|
args = ap.parse_args()
|
|
|
|
tag = args.tag or time.strftime("%Y%m%d-%H%M%S")
|
|
d = OUT / tag
|
|
d.mkdir(parents=True, exist_ok=True)
|
|
print("输出目录:", d)
|
|
|
|
client = TencentCaptchaClient(aid=args.aid,
|
|
entry_url="https://app.rainyun.com/account/reward/earn#")
|
|
try:
|
|
tkid = str(random.randint(100000000, 999999999))
|
|
ch, cfg, sid = client.prehandle(tkid)
|
|
print("prehandle: sess=%s sid=%s kind=%s" % (ch.sess[:16], sid, ch.kind))
|
|
tdc_path = cfg.get("tdc_path", "")
|
|
if not tdc_path:
|
|
print("❌ prehandle 没给 tdc_path")
|
|
return 1
|
|
print("tdc_path:", tdc_path[:90])
|
|
(d / "meta.json").write_text(json.dumps({
|
|
"aid": args.aid, "sess": ch.sess, "sid": sid,
|
|
"tdc_path": tdc_path, "kind": ch.kind,
|
|
"fetched_at": time.strftime("%Y-%m-%d %H:%M:%S"),
|
|
}, ensure_ascii=False, indent=1), encoding="utf-8")
|
|
|
|
seen = set()
|
|
got = 0
|
|
for i in range(args.n * 3): # 允许重试，直到拿到 n 份不同构建
|
|
if got >= args.n:
|
|
break
|
|
body = client.fetch_tdc(tdc_path)
|
|
md5 = hashlib.md5(body.encode("utf-8")).hexdigest()
|
|
if md5 in seen:
|
|
time.sleep(args.gap)
|
|
continue
|
|
seen.add(md5)
|
|
got += 1
|
|
name = "tdc_%02d_%s.js" % (got, md5[:8])
|
|
(d / name).write_text(body, encoding="utf-8")
|
|
|
|
info = {"md5": md5, "bytes": len(body), "index": got}
|
|
try:
|
|
info["key"] = extract_xtea_key_pure(body)["key"]
|
|
except Exception as e:
|
|
info["key_error"] = "%s: %s" % (type(e).__name__, str(e)[:120])
|
|
info["eks"] = extract_eks(body)[:40]
|
|
print(" [%d] %s %6d B md5=%s key=%s"
|
|
% (got, name, len(body), md5[:12], info.get("key")))
|
|
(d / (name[:-3] + ".json")).write_text(
|
|
json.dumps(info, ensure_ascii=False, indent=1), encoding="utf-8")
|
|
time.sleep(args.gap)
|
|
print()
|
|
print(">>> 拿到 %d 份互不相同的新构建 -> %s" % (got, d))
|
|
return 0 if got else 1
|
|
finally:
|
|
client.close()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|