chore: добавлена возможность передавать локатор для выбора элемента сигнализирующего о странице антибот защиты

src/antibot/base.py

@@ -26,6 +26,7 @@ class ChallengeInfo:
 	provider: str  # "cloudflare_turnstile", "datadome", "hcaptcha", "recaptcha_v2", ...
 	success: bool = False
 	success_locator: str | None = None  # локатор на странице за защитой
+	detect_locator: str | None = None  # локатор на странице за защитой
 	site_key: str | None = None  # для стадии C, чтобы передать в 2captcha
 	meta: dict | None = None  # что-то специфичное для провайдера
 
@@ -55,6 +56,7 @@ class AntiBotProvider:
 	_solver_cls: Type[Solver]
 	_detector_cls: Type[Detector]
 	_success_locator: str | None = None
+	_detect_locator: str | None = None
 
 	def __init__(self):
 		self.detector = self._detector_cls()
@@ -64,6 +66,7 @@ class AntiBotProvider:
 			stage = Stage.INTERSTITIAL,
 			provider = self.provider,
 			success_locator = self._success_locator,
+			detect_locator = self._detect_locator,
 		)
 		# обновление info
 		await self.detector.detect(page, info)
@@ -72,9 +75,10 @@ class AntiBotProvider:
 	async def solve(self, page: Page, info: ChallengeInfo):
 		await self.solver.solve(page, info)
 
-	def configure(self, success_locator=None, **kwargs):
+	def configure(self, success_locator=None, detect_locator=None, **kwargs):
 		self.solver = self._solver_cls(**kwargs)
 		self._success_locator = success_locator
+		self._detect_locator = detect_locator
 
 	def clear(self):
 		del self.solver

src/antibot/known_providers/recaptcha.py

@@ -42,7 +42,7 @@ class ReCaptchaDetector(Detector):
 		interactive_marker_selector = "body > div:nth-child(2) > div:nth-child(4) > iframe:nth-child(1)"
 
 		# попытка определить что мы вообще на странице блокировки
-		marker_selector = "#captcha-form"
+		marker_selector = info.detect_locator or "#captcha-form"
 		if not await page.query_selector(marker_selector):
 			log.debug("Page is not a challenge form")
 			if info.success_locator:

src/antibot/orchestrator.py

@@ -25,7 +25,11 @@ class ChallengeOutcome:
 
 
 async def pass_challenges(
-	antibot_name, page, *, captcha=None, success_locator: str | None = None, timeout_ms=120_000) -> ChallengeOutcome:
+	antibot_name, page, *,
+	captcha=None,
+	success_locator: str | None = None,
+	detect_locator: str | None = None,
+	timeout_ms=120_000) -> ChallengeOutcome:
 	# установка дедлайна
 	deadline = time.monotonic() + timeout_ms / 1000
 
@@ -36,7 +40,11 @@ async def pass_challenges(
 		else:
 			captcha_solver = None
 		provider = await select_one(
-			page, antibot_name, captcha_solver=captcha_solver, success_locator=success_locator)
+			page, antibot_name,
+			captcha_solver=captcha_solver,
+			success_locator=success_locator,
+			detect_locator=detect_locator,
+		)
 	except ProviderNotDetected:
 		return ChallengeOutcome(False, None, None, "Provider not detected")