fix(perverzija): strona i listing przez proxy przy 403 Cloudflare

Od 2026-10-15 ok. 04:31 UTC Cloudflare oddaje 403 na IPv4 VPS-a (IPv6 200).
Ekstraktor nie patrzyl na status, API dawalo 503 i perverzija nie grala
nikomu; listing zwracal [] jak koniec katalogu, a uzupelnianie dlugosci
palilo proby. HTML przez Bright Data tylko przy 403, player bez zmian.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
goon-foss 2026-10-15 12:16:24 +02:00
parent 45fbe0412e
commit 671ba97b52
3 changed files with 41 additions and 5 deletions

View file

@ -34,7 +34,7 @@ from app.connectors.direct_scrapers._browse_base import (
BaseBrowseScraper, BaseBrowseScraper,
compute_thumbnail_phash, compute_thumbnail_phash,
) )
from app.extractors import browser_get from app.extractors.tubes.perverzija import fetch_perverzija
from app.normalize.text import slugify from app.normalize.text import slugify
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -68,13 +68,17 @@ class PerverzijaScraper(BaseBrowseScraper):
def crawl_page(self, page: int) -> list[RawScene] | None: def crawl_page(self, page: int) -> list[RawScene] | None:
url = self._listing_url(page) url = self._listing_url(page)
try: try:
res = browser_get(url, timeout=self._timeout) res = fetch_perverzija(url, timeout=self._timeout)
except Exception as e: except Exception as e:
log.warning("perverzija REST fetch failed (page %d): %s", page, e) log.warning("perverzija REST fetch failed (page %d): %s", page, e)
return None return None
# WP zwraca 400 (rest_post_invalid_page_number) za ostatnią stroną → exhausted. # WP zwraca 400 (rest_post_invalid_page_number) za ostatnią stroną → exhausted.
if res.status_code != 200: # Inny kod (403 Cloudflare, 5xx) to awaria, nie koniec katalogu.
if res.status_code == 400:
return [] return []
if res.status_code != 200:
log.warning("perverzija REST HTTP %s (page %d)", res.status_code, page)
return None
try: try:
posts = json.loads(res.text) posts = json.loads(res.text)
except (json.JSONDecodeError, ValueError): except (json.JSONDecodeError, ValueError):

View file

@ -26,11 +26,32 @@ from __future__ import annotations
import logging import logging
import re import re
from app.config import get_settings
from app.extractors._models import StreamSource from app.extractors._models import StreamSource
from app.extractors import browser_get from app.extractors import browser_get
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def fetch_perverzija(url: str, *, timeout: float):
"""GET strony perverzija, przy blokadzie Cloudflare przez Bright Data.
2026-10-15 ok. 04:31 UTC Cloudflare zaczal odpowiadac 403 z challenge'em na IPv4 VPS-a
(IPv6 dalej 200), dla stron scen i dla REST-a listingu. Ekstraktor nie patrzyl na status,
szedl w zapas embed-iframe, ten tez dostawal 403, API oddawalo 503 i perverzija
przestala grac wszystkim (zgloszenie 1c662356). Proxy (ryczalt, ISP) tylko dla HTML-a,
player xtremestream i segmenty ida jak dotad.
"""
res = browser_get(url, timeout=timeout)
if res.status_code != 403:
return res
proxy = get_settings().brightdata_proxy_url
if not proxy:
log.warning("perverzija: 403 (Cloudflare) na %s, brak proxy", url)
return res
log.info("perverzija: 403 na %s, ponawiam przez proxy", url)
return browser_get(url, timeout=timeout, proxy=proxy)
# iframe playera: https://pervl4.xtremestream.xyz/player/index.php?data=<32 hex> # iframe playera: https://pervl4.xtremestream.xyz/player/index.php?data=<32 hex>
_PLAYER_IFRAME_RE = re.compile( _PLAYER_IFRAME_RE = re.compile(
r"https?://(?P<host>[a-z0-9\-]+\.xtremestream\.[a-z]+)/player/index\.php\?data=(?P<id>[0-9a-f]{16,64})", r"https?://(?P<host>[a-z0-9\-]+\.xtremestream\.[a-z]+)/player/index\.php\?data=(?P<id>[0-9a-f]{16,64})",
@ -44,11 +65,15 @@ _QUALITIES = ("720", "480")
def extract(page_url: str, *, timeout: float = 60.0) -> list[StreamSource] | None: def extract(page_url: str, *, timeout: float = 60.0) -> list[StreamSource] | None:
try: try:
res = browser_get(page_url, timeout=timeout) res = fetch_perverzija(page_url, timeout=timeout)
html = res.text if hasattr(res, "text") else str(res) html = res.text if hasattr(res, "text") else str(res)
except Exception as e: except Exception as e:
log.info("perverzija page fetch failed %s: %s", page_url, e) log.info("perverzija page fetch failed %s: %s", page_url, e)
return None return None
if getattr(res, "status_code", 200) == 403:
# Zapas embed-iframe pobiera strone jeszcze raz bez proxy i tez dostaje 403.
log.warning("perverzija: strona %s nadal 403", page_url)
return None
m = _PLAYER_IFRAME_RE.search(html) m = _PLAYER_IFRAME_RE.search(html)
if not m: if not m:

View file

@ -84,7 +84,14 @@ def _fetch_one(row: tuple) -> tuple:
from app.extractors._fetch import browser_get from app.extractors._fetch import browser_get
try: try:
r = browser_get(page_url, timeout=_FETCH_TIMEOUT, follow_redirects=True) if origin == "tube:perverzijacom":
# Cloudflare blokuje IPv4 VPS-a (403, od 2026-10-14/15); bez proxy kazda proba
# palila sie i wiersz zamykal po trzech bez dlugosci.
from app.extractors.tubes.perverzija import fetch_perverzija
r = fetch_perverzija(page_url, timeout=_FETCH_TIMEOUT)
else:
r = browser_get(page_url, timeout=_FETCH_TIMEOUT, follow_redirects=True)
if r.status_code in (404, 410): if r.status_code in (404, 410):
return (scene_id, None, True) return (scene_id, None, True)
if r.status_code >= 400: if r.status_code >= 400: