chore: перенос этапа прохождения антибот защиты в метод исполнения команд
это позволит выполнять проверку и обход защиты между командами
This commit is contained in:
1 parent
d6bb88ead2
commit
6124c604d9
2 files changed
+27
-31
No files matched your search
+5
-29
@@ -16,8 +16,6 @@ from fastapi import Response
|
||||
from playwright.async_api import ProxySettings
|
||||
from ua_parser import user_agent_parser
|
||||
|
||||
import captcha
|
||||
from antibot.orchestrator import pass_challenges
|
||||
from engine import actions
|
||||
from engine.schemas import SolveRequest
|
||||
|
||||
@@ -111,17 +109,6 @@ async def solve(
|
||||
config = load_or_create_identity(user_data_dir, user_agent=payload.user_agent)
|
||||
ctx_opts = {**config["context_options"], "config": config["config"]}
|
||||
|
||||
# if payload.captcha:
|
||||
# # "dl.formRow:nth-child(3) > dd:nth-child(2) > div:nth-child(1)"
|
||||
# # hcaptcha
|
||||
# # rucaptcha api_key
|
||||
# captcha_solver = captcha.load_captcha(
|
||||
# payload.captcha,
|
||||
# payload.captcha_type
|
||||
# )
|
||||
# else:
|
||||
# captcha_solver = None
|
||||
|
||||
async with AsyncCamoufox(
|
||||
persistent_context=True,
|
||||
user_data_dir=user_data_dir,
|
||||
@@ -141,27 +128,16 @@ async def solve(
|
||||
|
||||
await page.goto(url=payload.url)
|
||||
|
||||
try:
|
||||
await pass_challenges(
|
||||
payload.captcha_type, page,
|
||||
captcha=payload.captcha, success_locator=payload.captcha_success_selector
|
||||
)
|
||||
except Exception:
|
||||
result = {
|
||||
"status": "err",
|
||||
"user_agent": ctx_opts["user_agent"],
|
||||
"cookies": None,
|
||||
"actions": [],
|
||||
"error": traceback.format_exc(),
|
||||
}
|
||||
return result
|
||||
actions_result = await actions.execute(
|
||||
page, payload.actions, payload.captcha,
|
||||
antibot_name=payload.captcha_type, success_locator=payload.captcha_success_locator
|
||||
)
|
||||
|
||||
actions_result = await actions.execute(page, payload.actions, payload.captcha)
|
||||
# test: is captcha present?
|
||||
status = not "error" in actions_result[-1]
|
||||
error = ["Something error", None][status]
|
||||
cookies = await camoufo.cookies()
|
||||
html = await page.inner_html('html')
|
||||
# TODO: добавить как опцию. передачу скрина в base64.
|
||||
# await page.screenshot(
|
||||
# path=(
|
||||
# f"/home/sokol/PycharmProjects/WebRoboApi/extra/screenshots/"
|
||||
|
||||
Reference in new issue
Block a user