fix proxy ip
This commit is contained in:
Yuriy Yuriev
+72
-47
@@ -20,6 +20,21 @@ from services.socks5_to_http_proxy import Socks5ProxyPool
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _get_proxy_locale(proxy_config: dict) -> str:
|
||||
"""Возвращает locale без script-тега для IP прокси (ru-Cyrl-RU → ru-RU)."""
|
||||
try:
|
||||
from camoufox.utils import get_geolocation
|
||||
ip = proxy_config.get("server", "").replace("http://", "").split(":")[0]
|
||||
geo = get_geolocation(ip)
|
||||
lang = geo.locale.language
|
||||
region = geo.locale.region
|
||||
if lang and region:
|
||||
return f"{lang}-{region}"
|
||||
except Exception:
|
||||
pass
|
||||
return "en-US"
|
||||
|
||||
|
||||
@dataclass
|
||||
class VisitResult:
|
||||
"""Результат посещения страницы."""
|
||||
@@ -58,29 +73,27 @@ class BrowserService:
|
||||
settings.DEFAULT_MAX_READING
|
||||
)
|
||||
|
||||
for attempt in range(3):
|
||||
proxy = None
|
||||
use_socks5 = False
|
||||
proxy = None
|
||||
use_socks5 = False
|
||||
|
||||
try:
|
||||
# Получаем прокси
|
||||
if self.proxy_manager.has_proxies():
|
||||
proxy = await self.proxy_manager.acquire_proxy(timeout=30)
|
||||
try:
|
||||
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]:
|
||||
proxy_config = await self.socks5_pool.get_proxy_config(proxy)
|
||||
use_socks5 = True
|
||||
logger.info(f"Using SOCKS5 tunnel for: {proxy.id}")
|
||||
elif proxy:
|
||||
proxy_config = proxy.proxy_config
|
||||
logger.info(f"Using HTTP proxy: {proxy.id}")
|
||||
else:
|
||||
proxy_config = None
|
||||
logger.info("Direct connection")
|
||||
if proxy and proxy.proxy_type in [ProxyType.SOCKS5, ProxyType.SOCKS4]:
|
||||
proxy_config = await self.socks5_pool.get_proxy_config(proxy)
|
||||
use_socks5 = True
|
||||
logger.info(f"Using SOCKS5 tunnel for: {proxy.id}")
|
||||
elif proxy:
|
||||
proxy_config = proxy.proxy_config
|
||||
logger.info(f"Using HTTP proxy: {proxy.id}")
|
||||
else:
|
||||
proxy_config = None
|
||||
logger.info("Direct connection")
|
||||
|
||||
# Запускаем браузер
|
||||
if proxy_config:
|
||||
if proxy_config:
|
||||
# Сначала пробуем с geoip — fingerprint соответствует региону прокси
|
||||
try:
|
||||
async with AsyncCamoufox(
|
||||
headless=True,
|
||||
geoip=True,
|
||||
@@ -94,42 +107,54 @@ class BrowserService:
|
||||
proxy.id if proxy else "direct",
|
||||
reading_time
|
||||
)
|
||||
else:
|
||||
except ValueError:
|
||||
# Camoufox на Linux формирует locale с script-тегом (ru-Cyrl-RU),
|
||||
# которого нет в базе browserforge — передаём базовую locale без script
|
||||
try:
|
||||
geo = _get_proxy_locale(proxy_config)
|
||||
except Exception:
|
||||
geo = "ru-RU"
|
||||
logger.warning(f"geoip script-locale unavailable, retrying with base locale: {geo}")
|
||||
async with AsyncCamoufox(
|
||||
headless=True,
|
||||
geoip=False,
|
||||
geoip=True,
|
||||
humanize=True,
|
||||
locale="ru-RU",
|
||||
exclude_addons=[DefaultAddons.UBO]
|
||||
os="windows",
|
||||
locale=geo,
|
||||
exclude_addons=[DefaultAddons.UBO],
|
||||
proxy=proxy_config
|
||||
) as browser:
|
||||
result = await self._browse_page(
|
||||
browser, url, "direct", reading_time
|
||||
browser, url,
|
||||
proxy.id if proxy else "direct",
|
||||
reading_time
|
||||
)
|
||||
else:
|
||||
async with AsyncCamoufox(
|
||||
headless=True,
|
||||
geoip=False,
|
||||
humanize=True,
|
||||
locale="ru-RU",
|
||||
exclude_addons=[DefaultAddons.UBO]
|
||||
) as browser:
|
||||
result = await self._browse_page(
|
||||
browser, url, "direct", reading_time
|
||||
)
|
||||
|
||||
# Освобождаем
|
||||
if proxy:
|
||||
await self.proxy_manager.release_proxy(proxy, result.success)
|
||||
if use_socks5:
|
||||
await self.socks5_pool.release(proxy)
|
||||
if proxy:
|
||||
await self.proxy_manager.release_proxy(proxy, result.success)
|
||||
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}")
|
||||
if proxy:
|
||||
await self.proxy_manager.release_proxy(proxy, success=False)
|
||||
if use_socks5:
|
||||
await self.socks5_pool.release(proxy)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Visit error: {e}", exc_info=True)
|
||||
if proxy:
|
||||
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)")
|
||||
except Exception as e:
|
||||
logger.error(f"Visit error: {e}", exc_info=True)
|
||||
if proxy:
|
||||
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))
|
||||
|
||||
async def _browse_page(
|
||||
self, browser, url: str, proxy_info: str, reading_time: int
|
||||
|
||||
Reference in New Issue
Block a user