Update endpoints/cloudflare-cookies.js

endpoints/cloudflare-cookies.js

@@ -1,164 +1,54 @@
-async function cloudflareCookies({ domain, cookies = [], proxy, mobile = false }, page) {
-  if (!domain) throw new Error("Missing domain parameter");
-
-  const timeout = global.timeOut || 60000;
-  let isResolved = false;
-
-  const cl = setTimeout(() => {
-    if (!isResolved) {
-      throw new Error("Timeout Error");
-    }
-  }, timeout);
+async function cloudflareCookies(page, originalCookiesString, cl, opts = {}) {
+  const timeout = typeof opts.timeout === 'number' ? opts.timeout : 60000;
+  const start = Date.now();
+  let newClearanceCookie = null;
 
   try {
-    // Authenticate proxy if provided
-    if (proxy?.username && proxy?.password) {
-      await page.authenticate({
-        username: proxy.username,
-        password: proxy.password,
-      });
-    }
-
-    // Set mobile user agent and viewport if requested
-    if (mobile) {
-      await page.setUserAgent('Mozilla/5.0 (Linux; Android 14; CPH2641 Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.7390.97 Mobile Safari/537.36');
-      await page.setViewport({ width: 980, height: 1743 });
-    }
+    const wait = ms => new Promise(res => setTimeout(res, ms));
 
-    // 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 cookiesArray) {
-        if (typeof cookie === 'string') {
-          const [name, ...valueParts] = cookie.split('=');
-          const value = valueParts.join('=');
-          
-          if (name && value) {
-            cookiesToSet.push({
-              name: name.trim(),
-              value: value.trim(),
-              domain: new URL(domain).hostname
-            });
-          }
-        } else {
-          cookiesToSet.push({
-            ...cookie,
-            domain: cookie.domain || new URL(domain).hostname
-          });
-        }
-      }
+    while (Date.now() - start < timeout) {
+      const content = await page.content();
+      const lower = content.toLowerCase();
 
-      // Set cookies ke browser (termasuk cf_clearance lama)
-      if (cookiesToSet.length > 0) {
-        for (const cookie of cookiesToSet) {
-          try {
-            await page.setCookie(cookie);
-          } catch (e) {
-            // Ignore cookie errors
-          }
-        }
+      if (lower.includes('just a moment') || lower.includes('turnstile')) {
+        await page.waitForNavigation({ waitUntil: 'networkidle', timeout: 30000 }).catch(() => {});
+        await wait(1000);
+        continue;
       }
-    }
-
-    // Navigate to the domain
-    await page.goto(domain, { 
-      waitUntil: "networkidle2",
-      timeout: timeout 
-    });
 
-    // Cloudflare challenge detection and solving
-    let challengeSolved = false;
-    let newClearanceCookie = null;
-    const startTime = Date.now();
+      const cookies = await page.cookies();
+      newClearanceCookie = cookies.find(c => c.name === 'cf_clearance');
+      if (newClearanceCookie) break;
 
-    while (Date.now() - startTime < timeout && !challengeSolved) {
-      // Check for Cloudflare challenge
-      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 (challengeState.hasChallenge && !challengeSolved) {
-        console.log('Cloudflare challenge detected, solving...');
-        
-        // Try to click challenge button if exists
-        if (challengeState.challengeButton) {
-          try {
-            await page.click('input[type="submit"], button[type="submit"]');
-            await page.waitForTimeout(5000);
-          } catch (e) {
-            // Continue if button click fails
-          }
-        }
-        
-        await page.waitForTimeout(3000);
-      }
-
-      // Check for new clearance cookie
-      const currentCookies = await page.cookies();
-      newClearanceCookie = currentCookies.find(cookie => cookie.name === 'cf_clearance');
-      
-      if (newClearanceCookie) {
-        challengeSolved = true;
-        break;
-      }
-
-      await page.waitForTimeout(1000);
+      await wait(1000);
     }
 
-    // Get final cookies
+    clearTimeout(cl);
+
     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);
+    newClearanceCookie = newClearanceCookie || finalCookies.find(c => c.name === 'cf_clearance');
+    if (!newClearanceCookie) throw new Error('Gagal mendapatkan cf_clearance (Turnstile belum selesai)');
 
-    if (!newClearanceCookie) {
-      throw new Error("Failed to get new Cloudflare clearance cookie");
-    }
+    let updatedCookieString = (originalCookiesString || '').trim();
+    if (updatedCookieString && !updatedCookieString.endsWith(';')) updatedCookieString += ';';
 
-    // 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}`);
+    if (/cf_clearance=[^;]+/.test(updatedCookieString)) {
+      updatedCookieString = updatedCookieString.replace(/cf_clearance=[^;]+/, `cf_clearance=${newClearanceCookie.value}`);
     } else {
-      // Jika tidak ada cf_clearance di input, tambahkan
-      updatedCookieString = originalCookiesString + `; cf_clearance=${newClearanceCookie.value}`;
+      updatedCookieString += ` cf_clearance=${newClearanceCookie.value};`;
     }
 
     return {
+      success: true,
       url: finalUrl,
       cookies: finalCookies,
-      cookie_string: updatedCookieString, // String panjang SAMA dengan input, tapi cf_clearance DIUPDATE
+      cookie_string: updatedCookieString.trim(),
       clearance: newClearanceCookie,
-      user_agent: userAgent,
       cf_clearance: newClearanceCookie.value,
-      success: true
+      user_agent: userAgent
     };
 
   } catch (e) {