Update main.py

main.py

@@ -14,7 +14,6 @@ async def get_page(uid: str, fast_mode=False):
         '--no-sandbox', 
         '--disable-setuid-sandbox', 
         '--disable-dev-shm-usage',
-        '--disable-accelerated-2d-canvas',
         '--disable-gpu'
     ])
     context = await browser.new_context(
@@ -23,21 +22,17 @@ async def get_page(uid: str, fast_mode=False):
     )
     page = await context.new_page()
 
-    # CHẶN TỐI ĐA ĐỂ TĂNG TỐC BĂNG THÔNG
+    # CHẶN RÁC ĐỂ TĂNG TỐC
     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:
+        if any(x in route.request.url for x in ["google", "analytics", "doubleclick"]):
             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)
+    await page.goto(f"https://enka.network/u/{uid}/", wait_until="domcontentloaded", timeout=60000)
     return browser, page
 
 @app.get("/info")
@@ -45,51 +40,51 @@ async def info(uid: str):
     start_time = time.time()
     browser, page = await get_page(uid, fast_mode=True)
     try:
-        # 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)
+        # CLICK NAMECARD (Dùng try/except thay cho .catch)
+        try:
+            await page.click('button[data-icon="cards"]', timeout=3000)
+            await page.wait_for_selector('.Loda .bg', timeout=3000)
+        except:
+            pass # Bỏ qua nếu không có namecard hoặc quá chậm
         
         data = await page.evaluate("""
-            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], 
+            () => {
+                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;
+                
+                const characters = 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: {
+                        name: document.querySelector('.details h1')?.innerText,
+                        signature: document.querySelector('.signature')?.innerText,
+                        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 
-                    };
+                        stats: stats
+                    },
+                    characters: characters
                 };
-
-                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() };
             }
         """)
         
@@ -106,17 +101,34 @@ async def generate(uid: str, char: str = None):
     try:
         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
+            try:
+                await page.click(f"//figure[contains(@style, '{target}')]", timeout=5000)
+                await asyncio.sleep(0.8)
+            except: pass
 
         await page.click('button[data-icon="image"]')
-        img_el = await page.wait_for_selector('.Loda img[src^="blob:"]', timeout=15000)
+        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); }); }")
+        img_base64 = await page.evaluate("""
+            async () => {
+                const img = document.querySelector('.Loda img');
+                const res = await fetch(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)
+        res = requests.post("https://api.imgbb.com/1/upload", data={"key": IMGBB_API_KEY, "image": img_base64}, timeout=20)
         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:
         if 'browser' in locals(): await browser.close()
         return {"error": str(e)}
+
+@app.get("/")
+def home():
+    return {"status": "Enka API Fixed & Running"}