YuraBombitel1/Click
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix headless

Browse Source
This commit is contained in:
Yuriy Yuriev
2026-05-18 18:51:00 +07:00
parent ca8a386f82
commit b3989c6837
1 changed files with 74 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/browser_service.py
+74 -69
View File
@@ -58,72 +58,77 @@ class BrowserService:
settings.DEFAULT_MAX_READING settings.DEFAULT_MAX_READING
) )
proxy = None for attempt in range(3):
use_socks5 = False proxy = None
use_socks5 = False
try:
# Получаем прокси try:
if self.proxy_manager.has_proxies(): # Получаем прокси
proxy = await self.proxy_manager.acquire_proxy(timeout=30) if self.proxy_manager.has_proxies():
proxy = await self.proxy_manager.acquire_proxy(timeout=30)
# Определяем конфигурацию
if proxy and proxy.proxy_type in [ProxyType.SOCKS5, ProxyType.SOCKS4]: # Определяем конфигурацию
# SOCKS5 через локальный HTTP туннель if proxy and proxy.proxy_type in [ProxyType.SOCKS5, ProxyType.SOCKS4]:
proxy_config = await self.socks5_pool.get_proxy_config(proxy) proxy_config = await self.socks5_pool.get_proxy_config(proxy)
use_socks5 = True use_socks5 = True
logger.info(f"Using SOCKS5 tunnel for: {proxy.id}") logger.info(f"Using SOCKS5 tunnel for: {proxy.id}")
elif proxy: elif proxy:
# HTTP прокси напрямую proxy_config = proxy.proxy_config
proxy_config = proxy.proxy_config logger.info(f"Using HTTP proxy: {proxy.id}")
logger.info(f"Using HTTP proxy: {proxy.id}") else:
else: proxy_config = None
# Прямое соединение logger.info("Direct connection")
proxy_config = None
logger.info("Direct connection") # Запускаем браузер
if proxy_config:
# Запускаем браузер async with AsyncCamoufox(
if proxy_config: headless=True,
async with AsyncCamoufox( geoip=True,
headless=True, humanize=True,
geoip=True, exclude_addons=[DefaultAddons.UBO],
humanize=True, proxy=proxy_config
exclude_addons=[DefaultAddons.UBO], ) as browser:
proxy=proxy_config result = await self._browse_page(
) as browser: browser, url,
result = await self._browse_page( proxy.id if proxy else "direct",
browser, url, reading_time
proxy.id if proxy else "direct", )
reading_time else:
) async with AsyncCamoufox(
else: headless=True,
async with AsyncCamoufox( geoip=False,
headless=False, humanize=True,
geoip=False, locale="ru-RU",
humanize=True, exclude_addons=[DefaultAddons.UBO]
locale="ru-RU", ) as browser:
exclude_addons=[DefaultAddons.UBO] result = await self._browse_page(
) as browser: browser, url, "direct", reading_time
result = await self._browse_page( )
browser, url, "direct", reading_time
) # Освобождаем
if proxy:
# Освобождаем await self.proxy_manager.release_proxy(proxy, result.success)
if proxy: if use_socks5:
await self.proxy_manager.release_proxy(proxy, result.success) await self.socks5_pool.release(proxy)
if use_socks5:
await self.socks5_pool.release(proxy) return result
return result except ValueError as e:
logger.warning(f"Visit attempt {attempt + 1} fingerprint error, retrying with new proxy: {e}")
except Exception as e: if proxy:
logger.error(f"Visit error: {e}", exc_info=True) await self.proxy_manager.release_proxy(proxy, success=False)
if use_socks5:
if proxy: await self.socks5_pool.release(proxy)
await self.proxy_manager.release_proxy(proxy, success=False)
if use_socks5: except Exception as e:
await self.socks5_pool.release(proxy) logger.error(f"Visit error: {e}", exc_info=True)
if proxy:
return VisitResult(url=url, success=False, error=str(e)) await self.proxy_manager.release_proxy(proxy, success=False)
if use_socks5:
await self.socks5_pool.release(proxy)
return VisitResult(url=url, success=False, error=str(e))
return VisitResult(url=url, success=False, error="All attempts failed (geoip fingerprint error)")
async def _browse_page( async def _browse_page(
self, browser, url: str, proxy_info: str, reading_time: int self, browser, url: str, proxy_info: str, reading_time: int
@@ -271,15 +276,15 @@ class BrowserService:
proxy_config = None proxy_config = None
browser_kwargs = { browser_kwargs = {
"headless": False, "headless": True,
"geoip": True, "geoip": True,
"humanize": True, "humanize": True,
"exclude_addons": [DefaultAddons.UBO], "exclude_addons": [DefaultAddons.UBO],
} }
if proxy_config: if proxy_config:
browser_kwargs["proxy"] = proxy_config browser_kwargs["proxy"] = proxy_config
async with AsyncCamoufox(**browser_kwargs) as browser: async with AsyncCamoufox(**browser_kwargs) as browser:
result = await self._browse_page( result = await self._browse_page(
browser, browser,