refactor: 移除reCAPTCHA任务的异常处理和超时逻辑以简化代码

This commit is contained in:
晓丰 2025-05-31 05:24:40 +08:00
parent 7c645e93ca
commit 8470c1f21a

70
onoe.py
View File

@ -262,43 +262,43 @@ def solve_recaptcha_v3_with_proxy(
last_error = None
for attempt in range(1, max_task_retries + 1):
try:
encoded_query = quote(keyword, safe="")
payload = {
"clientKey": "CAP-A76C932D4C6CCB3CA748F77FDC07D996",
"task": {
"type": "ReCaptchaV3Task",
"websiteURL": f"https://www.dailymotion.com/search/{encoded_query}/top-results",
"websiteKey": "6LeOJBIrAAAAAPMIjyYvo-eN_9W1HDOkrEqHR8tM",
"pageAction": "",
"minScore": 0.5
}
# try:
encoded_query = quote(keyword, safe="")
payload = {
"clientKey": "CAP-A76C932D4C6CCB3CA748F77FDC07D996",
"task": {
"type": "ReCaptchaV3Task",
"websiteURL": f"https://www.dailymotion.com/search/{encoded_query}/top-results",
"websiteKey": "6LeOJBIrAAAAAPMIjyYvo-eN_9W1HDOkrEqHR8tM",
"pageAction": "",
"minScore": 0.5
}
resp = requests.post(create_url, json=payload, headers=headers, timeout=30)
logger.info(f"[token] 发送 payload:{payload}")
resp.raise_for_status()
task_id = resp.json()["taskId"]
logger.info(f"task_id: {resp.text}")
# 轮询获取结果
check_payload = {"clientKey": "CAP-A76C932D4C6CCB3CA748F77FDC07D996", "taskId": task_id}
for i in range(max_poll_attempts):
r = requests.post(result_url, json=check_payload, headers=headers, timeout=10)
r.raise_for_status()
result = r.json()
logger.info(f"{i}次,task_id:{task_id},结果:{result}")
if result.get("status") == "ready":
return result["solution"]["token"]
time.sleep(polling_interval)
}
resp = requests.post(create_url, json=payload, headers=headers, timeout=30)
logger.info(f"[token] 发送 payload:{payload}")
resp.raise_for_status()
task_id = resp.json()["taskId"]
logger.info(f"task_id: {resp.text}")
# 轮询获取结果
check_payload = {"clientKey": "CAP-A76C932D4C6CCB3CA748F77FDC07D996", "taskId": task_id}
for i in range(max_poll_attempts):
r = requests.post(result_url, json=check_payload, headers=headers, timeout=10)
r.raise_for_status()
result = r.json()
logger.info(f"{i}次,task_id:{task_id},结果:{result}")
if result.get("status") == "ready":
return result["solution"]["token"]
time.sleep(polling_interval)
raise TimeoutError(f"任务 {task_id} 在轮询 {max_poll_attempts} 次后未完成")
except Exception as e:
last_error = e
if attempt < max_task_retries:
time.sleep(2)
continue
else:
break
# raise TimeoutError(f"任务 {task_id} 在轮询 {max_poll_attempts} 次后未完成")
#
# except Exception as e:
# last_error = e
# if attempt < max_task_retries:
# time.sleep(2)
# continue
# else:
# break
raise Exception(f"创建或获取 reCAPTCHA v3 token 失败: {last_error}")