feat(captcha): 增加全题型图片落盘、字形一致性强校验与防秒换拟人交互机制
- 题目图片自动下载: 所有题型原图统一落盘至 scratch/captcha_debug,文字点选自动生成带编号红圈标注图便于肉眼核验 - 字形严格一致性校验: 在 SolveResult 增加 text_match_ok 检查,对图字不符或混淆干扰题直接拒答换题,避免错答引发 errorCode=12 - 防秒换与拟人延时: 遇到非预期题目换题等待 2.8~4.2s (对齐 HAR 真实抓包),求解失败等待 2.5~3.8s,作答前模拟交互 5.5~7.5s - 代理容错增强: 在 OneMsAdapter 捕获代理断流与鉴权异常,支持动态轮换新代理重试
This commit is contained in:
@@ -55,7 +55,7 @@ class OneMsAdapter:
|
||||
|
||||
def __init__(self, cookie: Optional[str] = None, user_agent: str = DEFAULT_USER_AGENT,
|
||||
timeout: float = 15.0, proxy: Optional[str] = None,
|
||||
proxy_api: Optional[str] = None, telemetry_mode: str = "python"):
|
||||
proxy_api: Optional[str] = None, telemetry_mode: str = "probe"):
|
||||
self.user_agent = user_agent
|
||||
self.timeout = timeout
|
||||
# 腾讯天御按出口 IP 做滚动风控 (errorCode=12); 给了 proxy_api 就能自动换 IP 重试
|
||||
@@ -113,12 +113,18 @@ class OneMsAdapter:
|
||||
return None, None, {"error": f"暂只支持 tencent provider, 实际为 {params.provider}"}
|
||||
|
||||
proxy = self.proxy
|
||||
if not proxy and self.proxy_api:
|
||||
from tcaptcha.proxy import fetch_proxy
|
||||
|
||||
proxy = fetch_proxy(self.proxy_api)
|
||||
logger.info("从代理池初始化出口代理: %s", proxy)
|
||||
|
||||
last: Dict = {}
|
||||
for rotation in range(max(1, max_proxy_rotations)):
|
||||
client = TencentCaptchaClient(
|
||||
aid=params.app_id,
|
||||
entry_url=DEFAULT_REFERER,
|
||||
referer=ONE_MS_BASE + "/",
|
||||
referer=DEFAULT_REFERER,
|
||||
wb="1",
|
||||
accept_kinds=(KIND_TEXT_CLICK,),
|
||||
proxy=proxy,
|
||||
@@ -126,19 +132,27 @@ class OneMsAdapter:
|
||||
)
|
||||
try:
|
||||
result = client.solve(max_retries=max_retries, max_refreshes=8)
|
||||
except Exception as e:
|
||||
logger.error("客户端解题发生异常 (可能代理失效或超时): %s", e)
|
||||
result = {"success": False, "error": str(e)}
|
||||
finally:
|
||||
client.close()
|
||||
|
||||
last = result
|
||||
if result.get("success"):
|
||||
return result.get("ticket") or None, result.get("randstr") or None, result
|
||||
if "12" not in str(result.get("error", "")) or not self.proxy_api:
|
||||
break
|
||||
from tcaptcha.proxy import fetch_proxy
|
||||
|
||||
proxy = fetch_proxy(self.proxy_api)
|
||||
logger.warning("触发 errorCode=12, 换出口 IP 重试 (%d/%d): %s",
|
||||
rotation + 1, max_proxy_rotations, proxy)
|
||||
if not proxy:
|
||||
if not self.proxy_api:
|
||||
break
|
||||
|
||||
from tcaptcha.proxy import fetch_proxy
|
||||
new_proxy = fetch_proxy(self.proxy_api)
|
||||
if new_proxy:
|
||||
proxy = new_proxy
|
||||
logger.warning("换出口 IP 继续尝试 (%d/%d): %s",
|
||||
rotation + 1, max_proxy_rotations, proxy)
|
||||
else:
|
||||
logger.warning("未能从代理 API 取到新代理,终止重试")
|
||||
break
|
||||
return None, None, last
|
||||
|
||||
|
||||
Reference in New Issue
Block a user