Update index.js

index.js

@@ -50,7 +50,10 @@ async function handleCloudflare(page, url) {
         try {
             console.log(`[Cloudflare] Navigating to ${url}`);
 
-            let gotCfFromListener = false;
+            let cookieFoundTime = 0;
+            let finalCookieValue = "";
+            let hasReloadedAfterCookie = false;
+
             page.on('response', async resp => {
                 try {
                     const headers = resp.headers();
@@ -59,8 +62,13 @@ async function handleCloudflare(page, url) {
                     if (setCookie) {
                         const cookieStr = Array.isArray(setCookie) ? setCookie.join(' ') : setCookie;
                         if (cookieStr.includes('cf_clearance')) {
-                            gotCfFromListener = true;
-                            console.log(`[Cloudflare] 🔥 FAST DETECT: cf_clearance found in response headers from ${resp.url()}`);
+                            if (cookieFoundTime === 0) {
+                                cookieFoundTime = Date.now();
+                                console.log(`[Cloudflare] 🔥 FAST DETECT: cf_clearance found! Waiting for page redirect...`);
+
+                                const match = cookieStr.match(/cf_clearance=([^;]+)/);
+                                if (match) finalCookieValue = match[1];
+                            }
                         }
                     }
                 } catch(e){}
@@ -80,32 +88,61 @@ async function handleCloudflare(page, url) {
                     const cookies = await page.cookies();
 
                     const cfCookie = cookies.find(c => c.name === 'cf_clearance');
+                    if (cfCookie && cookieFoundTime === 0) {
+                        cookieFoundTime = Date.now();
+                        finalCookieValue = cfCookie.value;
+                        console.log(`[Cloudflare] Cookie found in storage. Waiting for page redirect...`);
+                    }
 
                     const isChallengePage = title.includes("Just a moment") || 
                                           content.includes("challenge-platform") || 
                                           title.includes("Cloudflare");
 
-                    if (!isChallengePage || cfCookie || gotCfFromListener) {
+                    if (!isChallengePage) {
                         clearInterval(loop);
                         clearTimeout(timeout);
                         
                         const ua = await page.evaluate(() => navigator.userAgent);
-                        const finalCookie = cfCookie ? cfCookie.value : "";
-
-                        console.log(`[Cloudflare] Success! (Source: ${cfCookie ? "Cookie Found" : (gotCfFromListener ? "Listener" : "Page Change")})`);
+                        console.log(`[Cloudflare] Success! Page Title: ${title}`);
                         
                         resolve({
                             status: "success",
                             userAgent: ua,
                             cookies_full: cookies,
-                            cookie: finalCookie,
+                            cookie: cfCookie ? cfCookie.value : finalCookieValue,
                             title: title
                         });
                         return;
                     }
 
-                    if ((currentTime - startTime) > 30000 && reloadCount < 2) {
-                        console.log("[Cloudflare] Stuck detected (>30s). Reloading page...");
+                    if (cookieFoundTime > 0) {
+                        const timeSinceCookie = currentTime - cookieFoundTime;
+
+                        if (timeSinceCookie > 5000 && !hasReloadedAfterCookie) {
+                            console.log("[Cloudflare] Have cookie but page stuck. Forcing reload to apply cookie...");
+                            await page.reload({ waitUntil: "domcontentloaded" });
+                            hasReloadedAfterCookie = true;
+                        }
+
+                        if (timeSinceCookie > 15000) {
+                            clearInterval(loop);
+                            clearTimeout(timeout);
+                            console.log("[Cloudflare] Success (Force Resolve). Cookie obtained, but page title didn't update.");
+                            
+                            const ua = await page.evaluate(() => navigator.userAgent);
+                            resolve({
+                                status: "success",
+                                userAgent: ua,
+                                cookies_full: cookies,
+                                cookie: cfCookie ? cfCookie.value : finalCookieValue,
+                                title: title
+                            });
+                            return;
+                        }
+                    }
+
+                    if (cookieFoundTime === 0 && (currentTime - startTime) > 30000 && reloadCount < 2) {
+                        console.log("[Cloudflare] No cookie yet & stuck. Reloading...");
                         reloadCount++;
                         startTime = Date.now();
                         await page.reload({ waitUntil: "domcontentloaded" });
@@ -114,11 +151,9 @@ async function handleCloudflare(page, url) {
 
                     try {
                         await page.mouse.move(Math.floor(Math.random() * 500), Math.floor(Math.random() * 500));
-                        if (Math.random() > 0.9) await page.click('body').catch(()=>{});
                     } catch (err) {}
 
-                } catch (e) {
-                }
+                } catch (e) {}
             }, 1000); 
 
         } catch (e) {