Update server.js

server.js

@@ -1,4 +1,4 @@
-// server.js (Complete Playwright Version with CF Bypass)
+// server.js (Complete Playwright Version with CF Bypass - Updated)
 
 import express, { json } from "express";
 import cors from "cors";
@@ -24,7 +24,7 @@ let browserPool;
 const cache = new LRUCache({ max: 500, ttl: 15 * 60 * 1000 });
 const limit = pLimit(2);
 
-// Complete Turnstile bypass function
+// Updated Turnstile bypass function
 async function handleSpecificTurnstile(page, domain) {
     try {
         // Wait for the page to fully load
@@ -37,6 +37,7 @@ async function handleSpecificTurnstile(page, domain) {
             console.log(`[${domain}] No Turnstile detected`);
             return;
         }
+
         console.log(`[${domain}] Turnstile detected - bypassing...`);
         
         // Wait for the turnstile to be interactive
@@ -66,6 +67,7 @@ async function handleSpecificTurnstile(page, domain) {
                 form.submit();
             });
         });
+
         // Wait for navigation or network idle
         try {
             await Promise.race([
@@ -77,17 +79,21 @@ async function handleSpecificTurnstile(page, domain) {
         }
         
         console.log(`[${domain}] Turnstile bypass completed`);
+
     } catch (error) {
         console.warn(`[${domain}] Turnstile bypass warning: ${error.message}`);
     }
 }
+
 async function extractFirstIframeSrc(page, domain) {
     try {
+        // Wait for iframe to be available
         await page.waitForSelector('#player_iframe', { 
             state: 'attached',
             timeout: 15000 
         });
         
+        // Get the iframe URL
         const frame = await page.frame('#player_iframe');
         return frame ? frame.url() : null;
     } catch (error) {
@@ -98,13 +104,15 @@ async function extractFirstIframeSrc(page, domain) {
 
 async function extractFinalIframeSrc(page, domain) {
     try {
+        // Wait for content to load
         await page.waitForFunction(() => {
             return document.querySelectorAll('script, iframe').length > 0;
         }, { timeout: 15000 });
 
+        // Get all frames and find the visible one
         const frames = await page.frames();
         const visibleFrame = frames.find(frame => {
-            return !frame.$('iframe[style*="display:none"]');
+            return !await frame.$('iframe[style*="display:none"]');
         });
 
         return visibleFrame?.url();
@@ -173,7 +181,8 @@ async function scrapeProvider(domain, url, signal) {
             userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
             ignoreHTTPSErrors: true,
             javaScriptEnabled: true,
-            bypassCSP: true
+            bypassCSP: true,
+            viewport: { width: 1920, height: 1080 }
         });
 
         await context.addInitScript(() => {
@@ -203,10 +212,14 @@ async function scrapeProvider(domain, url, signal) {
         // Stage 1: Initial page
         console.log(`[${domain}] Navigating and waiting for network to be idle...`);
         await page.goto(url, { 
-            waitUntil: 'networkidle',
+            waitUntil: 'domcontentloaded',
             timeout: 60000 
         });
         
+        // Wait a bit more for any dynamic content
+        await page.waitForTimeout(5000);
+        
+        // Handle turnstile
         await handleSpecificTurnstile(page, domain);
 
         const firstIframeSrc = await extractFirstIframeSrc(page, domain);
@@ -216,9 +229,14 @@ async function scrapeProvider(domain, url, signal) {
         // Stage 2: First iframe
         const iframePage = await context.newPage();
         await iframePage.goto(firstIframeSrc, { 
-            waitUntil: 'networkidle',
+            waitUntil: 'domcontentloaded',
             timeout: 60000 
         });
+        
+        // Wait a bit more for any dynamic content
+        await iframePage.waitForTimeout(5000);
+        
+        // Handle turnstile in iframe
         await handleSpecificTurnstile(iframePage, domain);
 
         const finalIframeSrc = await extractFinalIframeSrc(iframePage, domain);