Update index.js

index.js

@@ -49,10 +49,10 @@ async function handleCloudflare(page, url) {
 
         try {
             console.log(`[Cloudflare] Navigating to ${url}`);
-
+            
             let cookieFoundTime = 0;
             let finalCookieValue = "";
-            let hasReloadedAfterCookie = false;
+            let hasForcedNavigated = false;
 
             page.on('response', async resp => {
                 try {
@@ -64,8 +64,7 @@ async function handleCloudflare(page, url) {
                         if (cookieStr.includes('cf_clearance')) {
                             if (cookieFoundTime === 0) {
                                 cookieFoundTime = Date.now();
-                                console.log(`[Cloudflare] 🔥 FAST DETECT: cf_clearance found! Waiting for page redirect...`);
-
+                                console.log(`[Cloudflare] 🔥 FAST DETECT: cf_clearance found via Listener!`);
                                 const match = cookieStr.match(/cf_clearance=([^;]+)/);
                                 if (match) finalCookieValue = match[1];
                             }
@@ -75,10 +74,7 @@ async function handleCloudflare(page, url) {
             });
 
             await page.bringToFront();
-            await page.goto(url, { waitUntil: "domcontentloaded", timeout: 90000 });
-
-            let reloadCount = 0;
-            let startTime = Date.now();
+            await page.goto(url, { waitUntil: "domcontentloaded", timeout: 60000 });
 
             const loop = setInterval(async () => {
                 try {
@@ -88,10 +84,10 @@ 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...`);
+                    if (cfCookie) {
+                         if (cookieFoundTime === 0) console.log(`[Cloudflare] Cookie found in storage.`);
+                         cookieFoundTime = cookieFoundTime || Date.now();
+                         finalCookieValue = cfCookie.value;
                     }
 
                     const isChallengePage = title.includes("Just a moment") || 
@@ -101,51 +97,39 @@ async function handleCloudflare(page, url) {
                     if (!isChallengePage) {
                         clearInterval(loop);
                         clearTimeout(timeout);
-                        
                         const ua = await page.evaluate(() => navigator.userAgent);
                         console.log(`[Cloudflare] Success! Page Title: ${title}`);
-                        
                         resolve({
                             status: "success",
                             userAgent: ua,
                             cookies_full: cookies,
-                            cookie: cfCookie ? cfCookie.value : finalCookieValue,
+                            cookie: finalCookieValue,
                             title: title
                         });
                         return;
                     }
 
-                    if (cookieFoundTime > 0) {
-                        const timeSinceCookie = currentTime - cookieFoundTime;
+                    if (cookieFoundTime > 0 && (currentTime - cookieFoundTime) > 5000 && !hasForcedNavigated) {
+                        console.log("[Cloudflare] Cookie found but stuck in loop. Performing FORCE NAVIGATION...");
+                        hasForcedNavigated = true;
 
-                        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;
-                        }
+                        await page.goto(url, { waitUntil: "networkidle0", timeout: 30000 }).catch(e => console.log("Nav error (ignored):", e.message));
+                        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" });
+                    if (hasForcedNavigated && (currentTime - cookieFoundTime) > 20000) {
+                        clearInterval(loop);
+                        clearTimeout(timeout);
+                        console.log("[Cloudflare] Giving up waiting for title change. Returning valid cookie anyway.");
+                        
+                        const ua = await page.evaluate(() => navigator.userAgent);
+                        resolve({
+                            status: "success",
+                            userAgent: ua,
+                            cookies_full: cookies,
+                            cookie: finalCookieValue,
+                            title: title
+                        });
                         return;
                     }