Update main.py

main.py

@@ -1,199 +1,122 @@
-import time
 import asyncio
-import aiohttp
+import requests
+import time
 from fastapi import FastAPI
 from playwright.async_api import async_playwright
-from cachetools import TTLCache
-
-# ================= CONFIG =================
-IMGBB_API_KEY = "093dee93ec19418d26cc76f40e053725"
-ENKA_URL = "https://enka.network/u/{uid}/"
-
-# cache RAM: 100 UID, sống 60s
-INFO_CACHE = TTLCache(maxsize=100, ttl=60)
 
-# playwright globals
-playwright = None
-browser = None
-context = None
+app = FastAPI()
 
-app = FastAPI(title="Enka API Pro Max")
-
-
-# ================= STARTUP / SHUTDOWN =================
-@app.on_event("startup")
-async def startup():
-    global playwright, browser, context
-
-    playwright = await async_playwright().start()
-    browser = await playwright.chromium.launch(
-        headless=True,
-        args=[
-            "--no-sandbox",
-            "--disable-dev-shm-usage",
-            "--disable-gpu",
-            "--disable-background-networking",
-            "--disable-extensions",
-            "--disable-sync",
-            "--disable-default-apps",
-        ]
-    )
+IMGBB_API_KEY = "093dee93ec19418d26cc76f40e053725"
 
+async def get_page(uid: str, fast_mode=False):
+    p = await async_playwright().start()
+    browser = await p.chromium.launch(headless=True, args=[
+        '--no-sandbox', 
+        '--disable-setuid-sandbox', 
+        '--disable-dev-shm-usage',
+        '--disable-accelerated-2d-canvas',
+        '--disable-gpu'
+    ])
     context = await browser.new_context(
-        viewport={"width": 1280, "height": 800},
-        user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
+        viewport={'width': 1280, 'height': 800},
+        user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
     )
-
-
-@app.on_event("shutdown")
-async def shutdown():
-    await context.close()
-    await browser.close()
-    await playwright.stop()
-
-
-# ================= UTILS =================
-async def new_page(fast_mode=True):
     page = await context.new_page()
 
-    if fast_mode:
-        await page.route(
-            "**/*",
-            lambda route: route.abort()
-            if route.request.resource_type in [
-                "media", "font", "stylesheet", "other"
-            ]
-            else route.continue_()
-        )
+    # CHẶN TỐI ĐA ĐỂ TĂNG TỐC BĂNG THÔNG
+    async def block_waste(route):
+        bad_types = ["media", "font", "other"]
+        if fast_mode: bad_types.extend(["image", "stylesheet"])
+        
+        if route.request.resource_type in bad_types or "google" in route.request.url:
+            await route.abort()
+        else:
+            await route.continue_()
+
+    await page.route("**/*", block_waste)
+    
+    url = f"https://enka.network/u/{uid}/"
+    # wait_until="commit" là nhanh nhất, bắt đầu ngay khi có phản hồi từ server
+    await page.goto(url, wait_until="domcontentloaded", timeout=60000)
+    return browser, page
 
-    return page
-
-
-# ================= /INFO =================
 @app.get("/info")
 async def info(uid: str):
-    if uid in INFO_CACHE:
-        return {"cached": True, **INFO_CACHE[uid]}
-
-    start = time.time()
-    page = await new_page(fast_mode=True)
-
+    start_time = time.time()
+    browser, page = await get_page(uid, fast_mode=True)
     try:
-        await page.goto(
-            ENKA_URL.format(uid=uid),
-            wait_until="domcontentloaded",
-            timeout=30000
-        )
-
+        # Thực hiện Click Namecard song song với việc lấy Data để tiết kiệm thời gian
+        await page.click('button[data-icon="cards"]', timeout=3000).catch(lambda e: None)
+        
         data = await page.evaluate("""
-        () => {
-            const q = s => document.querySelector(s);
-            const bg = el => {
-                const m = el?.style?.backgroundImage?.match(/url\\(["']?(.*?)["']?\\)/);
-                return m ? "https://enka.network" + m[1] : null;
-            };
-
-            const arText = q('.ar')?.innerText || "";
-
-            return {
-                player: {
-                    name: q('.details h1')?.innerText || null,
-                    signature: q('.signature')?.innerText || null,
-                    avatar: q('.avatar-icon img')?.src
-                        ? "https://enka.network" + q('.avatar-icon img').getAttribute("src")
-                        : null,
-                    ar: arText.match(/AR\\s*(\\d+)/)?.[1] || null,
-                    wl: arText.match(/WL\\s*(\\d+)/)?.[1] || null,
-                },
-                characters: [...document.querySelectorAll('.CharacterList .avatar')]
-                    .map(e => {
-                        const f = e.querySelector('figure');
-                        if (!f) return null;
-                        const icon = f.style.backgroundImage
-                            ?.match(/url\\((.*)\\)/)?.[1];
-                        return icon ? {
-                            icon: "https://enka.network" + icon.replace(/['"]/g, ""),
-                            level: e.querySelector('.level')?.innerText || "0"
-                        } : null;
-                    })
-                    .filter(Boolean)
-            };
-        }
+            async () => {
+                const getPlayer = () => {
+                    const name = document.querySelector('.details h1')?.innerText;
+                    const signature = document.querySelector('.signature')?.innerText;
+                    const arText = document.querySelector('.ar')?.innerText || "";
+                    const stats = Array.from(document.querySelectorAll('tr.stat')).map(tr => {
+                        const style = tr.querySelector('td.icon')?.getAttribute('style') || "";
+                        const iconMatch = style.match(/url\\(["']?(.*?)["']?\\)/);
+                        return {
+                            value: tr.querySelector('td:first-child')?.innerText.trim(),
+                            label: tr.querySelector('td:last-child')?.innerText.trim(),
+                            icon: iconMatch ? "https://enka.network" + iconMatch[1].replace(/\\\\/g, "") : null
+                        };
+                    });
+                    const ncBg = document.querySelector('.Loda .bg')?.style.backgroundImage;
+                    const ncMatch = ncBg ? ncBg.match(/url\\(["']?(.*?)["']?\\)/) : null;
+                    
+                    return { 
+                        name, 
+                        signature, 
+                        ar: arText.match(/AR\\s*(\\d+)/i)?.[1], 
+                        wl: arText.match(/WL\\s*(\\d+)/i)?.[1],
+                        avatar: "https://enka.network" + document.querySelector('.avatar-icon img')?.getAttribute('src'),
+                        namecard: ncMatch ? "https://enka.network" + ncMatch[1] : null,
+                        stats 
+                    };
+                };
+
+                const getChars = () => {
+                    return Array.from(document.querySelectorAll('.CharacterList .avatar')).map(el => {
+                        const style = el.querySelector('figure.chara')?.getAttribute('style') || "";
+                        const path = style.match(/url\\((.*)\\)/)?.[1].replace(/["']/g, "");
+                        return {
+                            name: path?.split('_').pop().split('.')[0],
+                            level: el.querySelector('.level')?.innerText,
+                            icon: "https://enka.network" + path
+                        };
+                    }).filter(i => i.name);
+                };
+
+                return { player: getPlayer(), characters: getChars() };
+            }
         """)
-
-        await page.close()
-
-        result = {
-            "uid": uid,
-            "execution_time": f"{round(time.time() - start, 2)}s",
-            **data
-        }
-
-        INFO_CACHE[uid] = result
-        return result
-
+        
+        await browser.close()
+        return {"execution_time": f"{round(time.time() - start_time, 2)}s", "uid": uid, **data}
     except Exception as e:
-        await page.close()
+        if 'browser' in locals(): await browser.close()
         return {"error": str(e)}
 
-
-# ================= /GEN =================
 @app.get("/gen")
-async def generate(uid: str):
-    start = time.time()
-    page = await new_page(fast_mode=False)
-
+async def generate(uid: str, char: str = None):
+    start_time = time.time()
+    browser, page = await get_page(uid, fast_mode=False)
     try:
-        await page.goto(
-            ENKA_URL.format(uid=uid),
-            wait_until="domcontentloaded",
-            timeout=30000
-        )
+        if char:
+            target = char.strip().capitalize()
+            await page.click(f"//figure[contains(@style, '{target}')]", timeout=5000).catch(lambda e: None)
+            await asyncio.sleep(0.8) # Giảm sleep xuống mức tối thiểu
 
         await page.click('button[data-icon="image"]')
-        await page.wait_for_selector('.Loda img[src^="blob:"]', timeout=20000)
-
-        img_base64 = await page.evaluate("""
-        async () => {
-            const img = document.querySelector('.Loda img');
-            const res = await fetch(img.src);
-            const blob = await res.blob();
-
-            return await new Promise(resolve => {
-                const r = new FileReader();
-                r.onloadend = () => resolve(r.result.split(',')[1]);
-                r.readAsDataURL(blob);
-            });
-        }
-        """)
-
-        await page.close()
-
-        async with aiohttp.ClientSession() as session:
-            async with session.post(
-                "https://api.imgbb.com/1/upload",
-                data={
-                    "key": IMGBB_API_KEY,
-                    "image": img_base64
-                }
-            ) as r:
-                js = await r.json()
-
-        return {
-            "uid": uid,
-            "execution_time": f"{round(time.time() - start, 2)}s",
-            "card_url": js.get("data", {}).get("url")
-        }
-
+        img_el = await page.wait_for_selector('.Loda img[src^="blob:"]', timeout=15000)
+        
+        img_base64 = await page.evaluate("async () => { const res = await fetch(document.querySelector('.Loda img').src); const blob = await res.blob(); return new Promise(r => { const rd = new FileReader(); rd.onloadend = () => r(rd.result.split(',')[1]); rd.readAsDataURL(blob); }); }")
+        
+        await browser.close()
+        res = requests.post("https://api.imgbb.com/1/upload", data={"key": IMGBB_API_KEY, "image": img_base64}, timeout=15)
+        return {"execution_time": f"{round(time.time() - start_time, 2)}s", "uid": uid, "card_url": res.json().get('data', {}).get('url')}
     except Exception as e:
-        await page.close()
+        if 'browser' in locals(): await browser.close()
         return {"error": str(e)}
-
-
-# ================= ROOT =================
-@app.get("/")
-def home():
-    return {
-        "status": "Enka API Pro Max is Live",
-        "cache_size": len(INFO_CACHE)
-    }