Update app.py

app.py

@@ -1,12 +1,14 @@
 import os, asyncio, time
 from fastapi import FastAPI, HTTPException, Header, Response
 from pydantic import BaseModel, HttpUrl
-import undetected_chromedriver as uc
+from seleniumbase import Driver
 
 API_KEY = os.getenv("OPENER_API_KEY", "")
-PROFILE = "/tmp/uc-profile"
+PROFILE = os.getenv("SB_PROFILE_DIR", os.path.abspath("./.sb-profile"))
 UA = os.getenv("UA", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36")
-CHROME_BIN = os.getenv("CHROME_BIN", "/usr/bin/chromium")
+HEADLESS = os.getenv("HEADLESS", "1") != "0"
+PLS = os.getenv("SB_PAGE_LOAD_STRATEGY", "normal")
+MIN_GAP_MS = int(os.getenv("MIN_GAP_MS", "800"))
 
 SIGNS = (
     "/sorry/", "consent.google.com", "detected unusual traffic",
@@ -20,6 +22,7 @@ drv = None
 queue = None
 worker = None
 last_status = {"ts": 0, "url": "", "captcha": False, "sig": "", "title": ""}
+_last_open_ms = 0
 
 class OpenPayload(BaseModel):
     url: HttpUrl
@@ -33,12 +36,37 @@ def _check_captcha():
             return True, s
     return False, ""
 
+def _warmup():
+    drv.get("https://www.google.com/?hl=th")
+    time.sleep(1.2)
+    drv.set_window_size(1280, 900)
+    drv.execute_script("window.scrollTo(0, 300);")
+    time.sleep(0.6)
+
+def _respect_rate_limit():
+    global _last_open_ms
+    now = int(time.time() * 1000)
+    wait = _last_open_ms + MIN_GAP_MS - now
+    if wait > 0:
+        time.sleep(wait / 1000)
+    _last_open_ms = int(time.time() * 1000)
+
+def _open_with_retry(url: str):
+    _respect_rate_limit()
+    drv.get(url)
+    bad, sig = _check_captcha()
+    if bad:
+        _warmup()
+        _respect_rate_limit()
+        drv.get(url)
+        bad, sig = _check_captcha()
+    return bad, sig
+
 async def _worker():
     while True:
         url = await queue.get()
         try:
-            await asyncio.to_thread(drv.get, url)
-            bad, sig = _check_captcha()
+            bad, sig = await asyncio.to_thread(_open_with_retry, url)
             last_status.update({"ts": int(time.time()), "url": drv.current_url or url, "captcha": bad, "sig": sig, "title": drv.title or ""})
             print("[check]", {"captcha": bad, "sig": sig, "url": last_status["url"]})
             print("[open] done", url)
@@ -48,20 +76,18 @@ async def _worker():
 @app.on_event("startup")
 async def startup():
     global drv, queue, worker
-    os.environ["HOME"] = "/tmp"
-    os.makedirs("/tmp/.local/share", exist_ok=True)
     os.makedirs(PROFILE, exist_ok=True)
-    o = uc.ChromeOptions()
-    o.headless = True
-    o.binary_location = CHROME_BIN
-    o.add_argument(f"--user-data-dir={PROFILE}")
-    o.add_argument("--no-sandbox")
-    o.add_argument("--disable-dev-shm-usage")
-    o.add_argument("--disable-gpu")
-    o.add_argument(f"--user-agent={UA}")
-    o.add_argument("--lang=th-TH")
-    drv = uc.Chrome(options=o, use_subprocess=True)
-    drv.get("data:text/html,ready")
+    drv = Driver(
+        uc=True,
+        headless=HEADLESS,
+        incognito=False,
+        user_data_dir=PROFILE,
+        page_load_strategy=PLS,
+        agent=UA,
+        locale_code="th",
+    )
+    drv.set_window_size(1280, 900)
+    _warmup()
     queue = asyncio.Queue()
     worker = asyncio.create_task(_worker())
     print("[startup] browser ready")
@@ -83,8 +109,8 @@ async def health():
 async def last():
     return last_status
 
-async def _enqueue(payload: OpenPayload, x_opener_key: str | None):
-    if API_KEY and x_opener_key != API_KEY:
+async def _enqueue(payload: OpenPayload, key: str | None):
+    if API_KEY and key != API_KEY:
         raise HTTPException(status_code=401, detail="bad key")
     print("[recv]", str(payload.url))
     await queue.put(str(payload.url))