Update endpoints/cloudflare-cookies.js

endpoints/cloudflare-cookies.js

@@ -25,49 +25,47 @@ async function cloudflareCookies({ domain, cookies = [], proxy, mobile = false }
       await page.setViewport({ width: 980, height: 1743 });
     }
 
-    // Handle cookies - bisa string panjang seperti contoh Anda
-    if (cookies && cookies.length > 0) {
-      const cookieObjects = [];
+    // Simpan cookies input asli untuk nanti
+    const originalCookiesString = typeof cookies === 'string' ? cookies : cookies.join('; ');
+    
+    // Parse cookies input untuk diset ke browser
+    let cookiesToSet = [];
+    let cookiesArray = [];
+    
+    if (cookies) {
+      if (typeof cookies === 'string') {
+        cookiesArray = cookies.split(';').map(cookie => cookie.trim()).filter(cookie => cookie);
+      } else {
+        cookiesArray = cookies;
+      }
       
-      for (const cookie of cookies) {
+      for (const cookie of cookiesArray) {
         if (typeof cookie === 'string') {
-          // Parse string cookies seperti: "name=value; name2=value2"
-          const cookiePairs = cookie.split(';').map(pair => pair.trim());
+          const [name, ...valueParts] = cookie.split('=');
+          const value = valueParts.join('=');
           
-          for (const pair of cookiePairs) {
-            if (pair.includes('=')) {
-              const [name, ...valueParts] = pair.split('=');
-              const value = valueParts.join('=');
-              
-              if (name && value) {
-                cookieObjects.push({
-                  name: name.trim(),
-                  value: value.trim(),
-                  domain: new URL(domain).hostname,
-                  path: '/',
-                  secure: true,
-                  httpOnly: name.startsWith('_') || name.includes('token'),
-                  sameSite: 'Lax'
-                });
-              }
-            }
+          if (name && value) {
+            cookiesToSet.push({
+              name: name.trim(),
+              value: value.trim(),
+              domain: new URL(domain).hostname
+            });
           }
         } else {
-          // Jika sudah object, langsung push
-          cookieObjects.push({
+          cookiesToSet.push({
             ...cookie,
             domain: cookie.domain || new URL(domain).hostname
           });
         }
       }
 
-      // Set cookies ke browser
-      if (cookieObjects.length > 0) {
-        for (const cookie of cookieObjects) {
+      // Set cookies ke browser (termasuk cf_clearance lama)
+      if (cookiesToSet.length > 0) {
+        for (const cookie of cookiesToSet) {
           try {
             await page.setCookie(cookie);
           } catch (e) {
-            console.log('Failed to set cookie:', cookie.name);
+            // Ignore cookie errors
           }
         }
       }
@@ -79,69 +77,87 @@ async function cloudflareCookies({ domain, cookies = [], proxy, mobile = false }
       timeout: timeout 
     });
 
-    // Cloudflare challenge detection and solving logic
-    let challengeDetected = false;
-    let clearanceCookie = null;
+    // Cloudflare challenge detection and solving
+    let challengeSolved = false;
+    let newClearanceCookie = null;
     const startTime = Date.now();
 
-    while (Date.now() - startTime < timeout && !clearanceCookie) {
+    while (Date.now() - startTime < timeout && !challengeSolved) {
       // Check for Cloudflare challenge
-      const hasChallenge = await page.evaluate(() => {
-        return document.querySelector('#challenge-form') !== null ||
-               document.querySelector('.cf-browser-verification') !== null ||
-               document.body.innerHTML.includes('Checking if the site connection is secure') ||
-               document.body.innerHTML.includes('cf-browser-verification');
+      const challengeState = await page.evaluate(() => {
+        const hasChallenge = document.querySelector('#challenge-form') !== null ||
+                           document.querySelector('.cf-browser-verification') !== null ||
+                           document.body.innerHTML.includes('Checking if the site connection is secure') ||
+                           document.body.innerHTML.includes('Just a moment...');
+        
+        const challengeButton = document.querySelector('input[type="submit"]') || 
+                               document.querySelector('button[type="submit"]');
+        
+        return { hasChallenge, challengeButton: !!challengeButton };
       });
 
-      if (hasChallenge && !challengeDetected) {
-        challengeDetected = true;
+      if (challengeState.hasChallenge && !challengeSolved) {
         console.log('Cloudflare challenge detected, solving...');
         
         // Try to click challenge button if exists
-        try {
-          const submitButton = await page.$('input[type="submit"]');
-          if (submitButton) {
-            await submitButton.click();
+        if (challengeState.challengeButton) {
+          try {
+            await page.click('input[type="submit"], button[type="submit"]');
             await page.waitForTimeout(5000);
+          } catch (e) {
+            // Continue if button click fails
           }
-        } catch (e) {
-          // Continue if button click fails
         }
+        
+        await page.waitForTimeout(3000);
       }
 
-      // Check for clearance cookie
+      // Check for new clearance cookie
       const currentCookies = await page.cookies();
-      clearanceCookie = currentCookies.find(cookie => cookie.name === 'cf_clearance');
-      
-      if (clearanceCookie) break;
+      newClearanceCookie = currentCookies.find(cookie => cookie.name === 'cf_clearance');
       
+      if (newClearanceCookie) {
+        challengeSolved = true;
+        break;
+      }
+
       await page.waitForTimeout(1000);
     }
 
-    // Get final results
+    // Get final cookies
     const finalCookies = await page.cookies();
     const finalUrl = page.url();
     const userAgent = await page.evaluate(() => navigator.userAgent);
+    
+    // Find the new clearance cookie
+    newClearanceCookie = finalCookies.find(cookie => cookie.name === 'cf_clearance');
 
     isResolved = true;
     clearTimeout(cl);
 
-    if (!clearanceCookie) {
-      throw new Error("Failed to obtain Cloudflare clearance cookie");
+    if (!newClearanceCookie) {
+      throw new Error("Failed to get new Cloudflare clearance cookie");
     }
 
-    // Format cookies to string like your example
-    const cookieString = finalCookies.map(cookie => 
-      `${cookie.name}=${cookie.value}`
-    ).join('; ');
+    // BUAT COOKIE_STRING BARU: Gunakan cookies input asli, tapi ganti cf_clearance dengan yang baru
+    let updatedCookieString = originalCookiesString;
+    
+    // Replace cf_clearance lama dengan yang baru
+    if (originalCookiesString.includes('cf_clearance=')) {
+      const oldClearanceRegex = /cf_clearance=[^;]+/;
+      updatedCookieString = originalCookiesString.replace(oldClearanceRegex, `cf_clearance=${newClearanceCookie.value}`);
+    } else {
+      // Jika tidak ada cf_clearance di input, tambahkan
+      updatedCookieString = originalCookiesString + `; cf_clearance=${newClearanceCookie.value}`;
+    }
 
     return {
       url: finalUrl,
       cookies: finalCookies,
-      cookie_string: cookieString, // Format seperti contoh panjang Anda
-      clearance: clearanceCookie,
+      cookie_string: updatedCookieString, // String panjang SAMA dengan input, tapi cf_clearance DIUPDATE
+      clearance: newClearanceCookie,
       user_agent: userAgent,
-      cf_clearance: clearanceCookie.value,
+      cf_clearance: newClearanceCookie.value,
       success: true
     };