Update main.py

main.py

@@ -18,19 +18,47 @@ async def get_page(uid: str, fast_mode=False):
     page = await context.new_page()
 
     if fast_mode:
-        await page.route("**/*", lambda route: route.abort() if route.request.resource_type in ["image", "media", "font", "stylesheet"] else route.continue_())
+        # Chặn bớt tài nguyên nhưng vẫn để lại Images vì cần link Namecard và Stats icon
+        await page.route("**/*", lambda route: route.abort() if route.request.resource_type in ["media", "font"] else route.continue_())
 
     url = f"https://enka.network/u/{uid}/"
-    await page.goto(url, wait_until="domcontentloaded", timeout=60000)
+    await page.goto(url, wait_until="networkidle", timeout=60000)
     return browser, page
 
-# --- ENDPOINTS ---
-
 @app.get("/info")
 async def info(uid: str):
     start_time = time.time()
     browser, page = await get_page(uid, fast_mode=True)
     try:
+        # BƯỚC MỚI: Click lấy Namecard
+        namecard_url = None
+        try:
+            # Tìm nút Danh Thiếp qua data-icon="cards"
+            card_btn = 'button[data-icon="cards"]'
+            await page.wait_for_selector(card_btn, timeout=5000)
+            await page.click(card_btn)
+            
+            # Đợi panel Loda hiện lên
+            namecard_selector = '.Loda .bg'
+            await page.wait_for_selector(namecard_selector, timeout=5000)
+            
+            # Lấy link ảnh từ background-image
+            namecard_url = await page.evaluate("""
+                () => {
+                    const bgDiv = document.querySelector('.Loda .bg');
+                    if (!bgDiv) return null;
+                    const style = bgDiv.style.backgroundImage;
+                    const match = style.match(/url\\(["']?(.*?)["']?\\)/);
+                    return match ? "https://enka.network" + match[1] : null;
+                }
+            """)
+            
+            # Đóng panel để tránh block UI (không bắt buộc nhưng nên làm)
+            await page.keyboard.press("Escape")
+        except Exception as e:
+            print(f"Lỗi lấy Namecard: {e}")
+
+        # LẤY CÁC THÔNG TIN CÒN LẠI
         data = await page.evaluate("""
             () => {
                 const name = document.querySelector('.details h1')?.innerText;
@@ -70,49 +98,24 @@ async def info(uid: str):
                     return { name: charName, level, icon: "https://enka.network" + icon_path };
                 }).filter(i => i !== null);
 
-                return { player: { name, ar, wl, signature, avatar: avatar_img ? "https://enka.network" + avatar_img : null, stats }, characters };
-            }
-        """)
-        await browser.close()
-        return {"execution_time": f"{round(time.time() - start_time, 2)}s", "uid": uid, **data}
-    except Exception as e:
-        await browser.close()
-        return {"error": str(e)}
-
-@app.get("/namecard")
-async def namecard(uid: str):
-    """Lấy link ảnh Danh Thiếp hiện tại"""
-    start_time = time.time()
-    # Fast mode = False vì cần click và chờ hiện element
-    browser, page = await get_page(uid, fast_mode=False)
-    try:
-        # Click nút Danh Thiếp
-        btn_selector = 'button[data-icon="cards"]'
-        await page.wait_for_selector(btn_selector, timeout=15000)
-        await page.click(btn_selector)
-        
-        # Đợi modal Danh Thiếp hiện ra và lấy background-image
-        img_selector = '.Loda .bg'
-        await page.wait_for_selector(img_selector, timeout=15000)
-        
-        namecard_url = await page.evaluate("""
-            () => {
-                const el = document.querySelector('.Loda .bg');
-                if (!el) return null;
-                const style = el.getAttribute('style');
-                const match = style.match(/url\\(["']?(.*?)["']?\\)/);
-                return match ? "https://enka.network" + match[1] : null;
+                return {
+                    player: { name, ar, wl, signature, avatar: avatar_img ? "https://enka.network" + avatar_img : null, stats },
+                    characters: characters
+                };
             }
         """)
         
         await browser.close()
+        # Gộp Namecard vào JSON kết quả
+        data['player']['namecard'] = namecard_url
+        
         return {
             "execution_time": f"{round(time.time() - start_time, 2)}s",
             "uid": uid,
-            "namecard_url": namecard_url
+            **data
         }
     except Exception as e:
-        await browser.close()
+        if 'browser' in locals(): await browser.close()
         return {"error": str(e)}
 
 @app.get("/gen")
@@ -126,7 +129,7 @@ async def generate(uid: str, char: str = None):
             try:
                 await page.wait_for_selector(char_selector, timeout=5000)
                 await page.click(char_selector)
-                await asyncio.sleep(1.5)
+                await asyncio.sleep(1)
             except: pass
 
         await page.click('button[data-icon="image"]')
@@ -146,11 +149,15 @@ async def generate(uid: str, char: str = None):
         """)
         await browser.close()
         res = requests.post("https://api.imgbb.com/1/upload", data={"key": IMGBB_API_KEY, "image": img_base64})
-        return {"execution_time": f"{round(time.time() - start_time, 2)}s", "uid": uid, "card_url": res.json().get('data', {}).get('url')}
+        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 browser.close()
+        if 'browser' in locals(): await browser.close()
         return {"error": str(e)}
 
 @app.get("/")
 def home():
-    return {"status": "Enka API Ultimate Live", "endpoints": ["/info", "/gen", "/namecard"]}
+    return {"status": "Enka API Pro Max is Live"}