Update app/aternos_api.py

app/aternos_api.py

@@ -1,5 +1,5 @@
 from playwright.async_api import async_playwright
-import asyncio, time, traceback
+import asyncio, time
 
 PROXY = {
     "server": "http://proxy.scrapingant.com:8080",
@@ -8,68 +8,60 @@ PROXY = {
 }
 
 class AternosAPI:
-    async def check_access(self):
-        try:
-            async with async_playwright() as p:
-                browser = await p.chromium.launch(
-                    headless=True,
-                    proxy=PROXY,
-                    args=[
-                        "--no-sandbox",
-                        "--disable-dev-shm-usage",
-                        "--disable-gpu",
-                        "--single-process",
-                        "--disable-blink-features=AutomationControlled",
-                    ]
-                )
-
-                context = await browser.new_context(
-                    user_agent=(
-                        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
-                        "AppleWebKit/537.36 (KHTML, like Gecko) "
-                        "Chrome/121.0.0.0 Safari/537.36"
-                    ),
-                    locale="en-US",
-                    timezone_id="America/New_York",
-                    viewport={"width": 1366, "height": 768},
-                )
+    def __init__(self):
+        self.pw = None
+        self.browser = None
+        self.context = None
+        self.page = None
 
-                page = await context.new_page()
+    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-gpu",
+                "--disable-blink-features=AutomationControlled",
+            ]
+        )
 
-                await page.goto(
-                    "https://aternos.org/server/",
-                    wait_until="networkidle",
-                    timeout=30000
-                )
+        self.context = await self.browser.new_context(
+            user_agent=(
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+                "AppleWebKit/537.36 (KHTML, like Gecko) "
+                "Chrome/121.0.0.0 Safari/537.36"
+            ),
+            locale="en-US",
+            timezone_id="America/New_York",
+            viewport={"width": 1366, "height": 768},
+        )
 
-                start = time.time()
-                cleared = False
+        self.page = await self.context.new_page()
 
-                while time.time() - start < 30:
-                    title = await page.title()
-                    html = await page.content()
-
-                    if "just a moment" not in title.lower() \
-                       and "cloudflare" not in html.lower():
-                        cleared = True
-                        break
+    async def check_access(self):
+        await self.page.goto(
+            "https://aternos.org/server/",
+            wait_until="networkidle",
+            timeout=60000
+        )
 
-                    await asyncio.sleep(2)
+        start = time.time()
+        while time.time() - start < 40:
+            title = await self.page.title()
+            html = await self.page.content()
 
-                result = {
-                    "ok": cleared,
-                    "final_url": page.url,
-                    "title": await page.title(),
-                    "blocked": not cleared,
-                    "reason": None if cleared else "cloudflare_challenge"
+            if "just a moment" not in title.lower() \
+               and "cloudflare" not in html.lower():
+                return {
+                    "ok": True,
+                    "final_url": self.page.url
                 }
 
-                await browser.close()
-                return result
+            await asyncio.sleep(2)
 
-        except Exception as e:
-            return {
-                "ok": False,
-                "error": str(e),
-                "trace": traceback.format_exc()
-            }
+        return {
+            "ok": False,
+            "reason": "cloudflare_challenge"
+        }