Update app.py

app.py

@@ -1,12 +1,6 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, HTTPException
 from pydantic import BaseModel
-import threading, queue, time, os
-
-try:
-    from pyvirtualdisplay import Display
-except Exception:
-    Display = None
-
+import threading, queue, time
 from seleniumbase import SB
 
 app = FastAPI()
@@ -18,60 +12,39 @@ url_queue = queue.Queue()
 sb_ref = {"driver": None}
 
 def browser_worker():
-    display = None
-    sb = None
-    try:
-        try:
-            sb = SB(uc=True, headless=False, xvfb=True)
-        except TypeError:
-            if Display is None:
-                raise RuntimeError("pyvirtualdisplay not available; cannot start Xvfb")
-            display = Display(visible=0, size=(1920, 1080))
-            display.start()
-            sb = SB(uc=True, headless=False)
-
-        with sb:
-            sb_ref["driver"] = sb
-            sb.get("https://www.google.com") 
-            while True:
-                url = url_queue.get()
-                try:
-                    print(f"[open] {url}")
-                    sb.get(url)
-                    time.sleep(0.5)
-                except Exception as e:
-                    print("[error]", e)
-                finally:
-                    url_queue.task_done()
-    finally:
-        try:
-            if sb:
-                sb.driver.quit()
-        except Exception:
-            pass
-        if display:
+    # ใช้เบราว์เซอร์จริง (ไม่ headless) แต่จอถูก Xvfb รับไว้จาก xvfb-run
+    # ระบุ browser="chromium" ให้ตรงกับแพ็กเกจที่ติดตั้ง
+    with SB(browser="chromium", uc=True, headless=False) as sb:
+        sb_ref["driver"] = sb
+        sb.get("https://www.google.com")
+        while True:
+            url = url_queue.get()
             try:
-                display.stop()
-            except Exception:
-                pass
+                print(f"[open] {url}")
+                sb.get(url)
+                time.sleep(0.3)
+            except Exception as e:
+                print("[error]", e)
+            finally:
+                url_queue.task_done()
+
+@app.get("/healthz")
+def healthz():
+    return {"ok": bool(sb_ref.get("driver"))}
 
 @app.get("/cookies")
 def get_cookies():
     sb = sb_ref.get("driver")
-    return sb.get_cookies() if sb else []
+    if not sb:
+        raise HTTPException(503, "Browser not ready")
+    return sb.get_cookies()
 
 @app.post("/open_url")
 async def open_url(request: URLRequest):
+    if not sb_ref.get("driver"):
+        raise HTTPException(503, "Browser not ready")
     print(f"[queue] {request.url}")
     url_queue.put(request.url)
     return {"status": "queued", "url": request.url}
 
-def _start_worker_once():
-    if not getattr(_start_worker_once, "started", False):
-        t = threading.Thread(target=browser_worker, daemon=True)
-        t.start()
-        _start_worker_once.started = True
-
-@app.on_event("startup")
-def on_startup():
-    _start_worker_once()
+threading.Thread(target=browser_worker, daemon=True).start()