Update app/fetch.py

app/fetch.py

@@ -1,95 +1,53 @@
-import random
-import json
+import httpx
 from fastapi import HTTPException
-from playwright.async_api import async_playwright, TimeoutError
+from urllib.parse import quote_plus
 
-UAS = [
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
-    "(KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 "
-    "(KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-]
 
-PROXY = {
-    "server": "http://proxy.scrapingant.com:8080",
-    "username": "scrapingant&proxy_type=residential&proxy_country=VN&browser=false",
-    "password": "fdd15bd8d6f042f893d8bb93a8e47722",
-}
+SCRAPINGANT_KEY = "fdd15bd8d6f042f893d8bb93a8e47722"
+SCRAPINGANT_ENDPOINT = "https://api.scrapingant.com/v2/general"
 
 
 class Fetcher:
-    def __init__(self):
-        self.pw = None
-        self.browser = None
-
     async def start(self):
-        self.pw = await async_playwright().start()
-        self.browser = await self.pw.chromium.launch(
-            headless=True,
-            proxy=PROXY,
-            args=[
-                "--no-sandbox",
-                "--disable-dev-shm-usage",
-                "--disable-blink-features=AutomationControlled",
-            ],
-        )
+        # không cần init gì
+        pass
 
     async def stop(self):
-        if self.browser:
-            await self.browser.close()
-        if self.pw:
-            await self.pw.stop()
+        pass
 
     async def fetch(self, url: str):
-        context = await self.browser.new_context(
-            user_agent=random.choice(UAS),
-            locale="en-US",
-            timezone_id="Asia/Ho_Chi_Minh",
-            extra_http_headers={
-                "Accept": "application/json, text/plain, */*",
-                "Accept-Language": "en-US,en;q=0.9",
-            },
-        )
-
-        page = await context.new_page()
+        params = {
+            "url": url,
+            "x-api-key": SCRAPINGANT_KEY,
+            "proxy_type": "residential",
+            "proxy_country": "VN",
+            "browser": "false",
+        }
 
         try:
-            # warm CF
-            await page.goto(
-                "https://ihentai.dog/",
-                wait_until="domcontentloaded",
-                timeout=20000,
-            )
-            await page.wait_for_timeout(1500)
-
-            resp = await page.goto(
-                url,
-                wait_until="domcontentloaded",
-                timeout=20000,
-            )
-
-            if not resp:
-                raise HTTPException(500, "No response")
-
-            status = resp.status
-            body = await resp.text()
-
-            if status >= 400:
-                raise HTTPException(status, "Upstream error")
-
+            async with httpx.AsyncClient(timeout=20) as client:
+                resp = await client.get(
+                    SCRAPINGANT_ENDPOINT,
+                    params=params,
+                    headers={
+                        "Accept": "application/json, text/plain, */*",
+                        "User-Agent": "Mozilla/5.0",
+                    },
+                )
+
+            if resp.status_code != 200:
+                raise HTTPException(
+                    status_code=resp.status_code,
+                    detail="Upstream error",
+                )
+
+            text = resp.text.strip()
+
+            # ScrapingAnt trả JSON thẳng nếu API
             try:
-                data = json.loads(body)
+                return resp.json()
             except Exception:
-                data = body
-
-            return {
-                "status": status,
-                "data": data,
-            }
-
-        except TimeoutError:
-            raise HTTPException(504, "Timeout")
+                return {"raw": text}
 
-        finally:
-            await page.close()
-            await context.close()
+        except httpx.RequestError as e:
+            raise HTTPException(502, f"Proxy error: {str(e)}")