@fanboynz/network-scanner 1.0.37 → 1.0.38

package/lib/cloudflare.js

@@ -1,8 +1,25 @@
 /**
- * Cloudflare bypass and challenge handling module - Enhanced with timeout handling
+ * Cloudflare bypass and challenge handling module - Optimized with smart detection and adaptive timeouts
+ * Version: 2.1.0 - Enhanced with quick detection, adaptive timeouts, and comprehensive debug logging
  * Handles phishing warnings, Turnstile challenges, and modern Cloudflare protections
  */
 
+/**
+ * Module version information
+ */
+const CLOUDFLARE_MODULE_VERSION = '2.1.0';
+
+/**
+ * Gets module version information
+ * @returns {object} Version information object
+ */
+function getModuleInfo() {
+  return {
+    version: CLOUDFLARE_MODULE_VERSION,
+    name: 'Cloudflare Protection Handler'
+  };
+}
+
 /**
  * Cross-version compatible timeout function for Puppeteer with timeout protection
  */
@@ -86,7 +103,61 @@ async function safeWaitForNavigation(page, timeout = 15000) {
 }
 
 /**
- * Analyzes the current page to detect Cloudflare challenges - Enhanced with timeout protection
+ * Quick Cloudflare detection - faster initial check to avoid unnecessary waiting
+ */
+async function quickCloudflareDetection(page, forceDebug = false) {
+  try {
+    const quickCheck = await safePageEvaluate(page, () => {
+      const title = document.title || '';
+      const bodyText = document.body ? document.body.textContent.substring(0, 500) : '';
+      const url = window.location.href;
+      
+      // Quick indicators of Cloudflare presence
+      const hasCloudflareIndicators = 
+        title.includes('Just a moment') ||
+        title.includes('Checking your browser') ||
+        title.includes('Attention Required') ||
+        bodyText.includes('Cloudflare') ||
+        bodyText.includes('cf-ray') ||
+        bodyText.includes('Verify you are human') ||
+        bodyText.includes('This website has been reported for potential phishing') ||
+        bodyText.includes('Please wait while we verify') ||
+        url.includes('/cdn-cgi/challenge-platform/') ||
+        url.includes('cloudflare.com') ||
+        document.querySelector('[data-ray]') ||
+        document.querySelector('[data-cf-challenge]') ||
+        document.querySelector('.cf-challenge-running') ||
+        document.querySelector('.cf-challenge-container') ||
+        document.querySelector('.cf-turnstile') ||
+        document.querySelector('.ctp-checkbox-container') ||
+        document.querySelector('iframe[src*="challenges.cloudflare.com"]') ||
+        document.querySelector('iframe[title*="Cloudflare security challenge"]') ||
+        document.querySelector('script[src*="/cdn-cgi/challenge-platform/"]') ||
+        document.querySelector('a[href*="continue"]');
+      
+      return {
+        hasIndicators: hasCloudflareIndicators,
+        title,
+        url,
+        bodySnippet: bodyText.substring(0, 200)
+      };
+    }, 3000); // Quick 3-second timeout
+    
+    if (forceDebug && quickCheck.hasIndicators) {
+      console.log(`[debug][cloudflare] Quick detection found Cloudflare indicators on ${quickCheck.url}`);
+    } else if (forceDebug && !quickCheck.hasIndicators) {
+      console.log(`[debug][cloudflare] Quick detection found no Cloudflare indicators on ${quickCheck.url}`);
+    }
+    
+    return quickCheck;
+  } catch (error) {
+    if (forceDebug) console.log(`[debug][cloudflare] Quick detection failed: ${error.message}`);
+    return { hasIndicators: false, error: error.message };
+  }
+}
+
+/**
+ * Analyzes the current page to detect Cloudflare challenges - Enhanced with timeout protection and detailed debug logging
  */
 async function analyzeCloudflareChallenge(page) {
   try {
@@ -161,7 +232,7 @@ async function analyzeCloudflareChallenge(page) {
         url: window.location.href,
         bodySnippet: bodyText.substring(0, 200)
       };
-    }, 10000); // 10 second timeout for page evaluation
+    }, 8000); // Reduced from 10 to 8 seconds
   } catch (error) {
     return {
       isChallengePresent: false,
@@ -175,7 +246,7 @@ async function analyzeCloudflareChallenge(page) {
 }
 
 /**
- * Handles Cloudflare phishing warnings with timeout protection
+ * Handles Cloudflare phishing warnings with timeout protection and enhanced debug logging
  */
 async function handlePhishingWarning(page, currentUrl, forceDebug = false) {
   const result = {
@@ -198,13 +269,16 @@ async function handlePhishingWarning(page, currentUrl, forceDebug = false) {
       result.details = challengeInfo;
       
       if (forceDebug) {
-        console.log(`[debug][cloudflare] Phishing warning detected on ${currentUrl}`);
+        console.log(`[debug][cloudflare] Phishing warning detected on ${currentUrl}:`);
+        console.log(`[debug][cloudflare]   Page Title: "${challengeInfo.title}"`);
+        console.log(`[debug][cloudflare]   Current URL: ${challengeInfo.url}`);
+        console.log(`[debug][cloudflare]   Body snippet: ${challengeInfo.bodySnippet}`);
       }
 
       try {
         // Use safe click with shorter timeout
         await safeClick(page, 'a[href*="continue"]', 3000);
-        await safeWaitForNavigation(page, 10000);
+        await safeWaitForNavigation(page, 8000);
         
         result.success = true;
         if (forceDebug) console.log(`[debug][cloudflare] Successfully bypassed phishing warning for ${currentUrl}`);
@@ -225,7 +299,7 @@ async function handlePhishingWarning(page, currentUrl, forceDebug = false) {
 }
 
 /**
- * Attempts to solve Cloudflare challenges with timeout protection
+ * Attempts to solve Cloudflare challenges with timeout protection and enhanced debug logging
  */
 async function handleVerificationChallenge(page, currentUrl, forceDebug = false) {
   const result = {
@@ -233,14 +307,15 @@ async function handleVerificationChallenge(page, currentUrl, forceDebug = false)
     attempted: false,
     error: null,
     details: null,
-    requiresHuman: false
+    requiresHuman: false,
+    method: null
   };
 
   try {
     if (forceDebug) console.log(`[debug][cloudflare] Checking for verification challenge on ${currentUrl}`);
     
-    // Shorter wait for challenges
-    await waitForTimeout(page, 2000);
+    // Reduced wait time
+    await waitForTimeout(page, 1000);
 
     const challengeInfo = await analyzeCloudflareChallenge(page);
     result.details = challengeInfo;
@@ -249,7 +324,20 @@ async function handleVerificationChallenge(page, currentUrl, forceDebug = false)
       result.attempted = true;
       
       if (forceDebug) {
-        console.log(`[debug][cloudflare] Challenge detected on ${currentUrl}`);
+        console.log(`[debug][cloudflare] Challenge detected on ${currentUrl}:`);
+        console.log(`[debug][cloudflare]   Page Title: "${challengeInfo.title}"`);
+        console.log(`[debug][cloudflare]   Current URL: ${challengeInfo.url}`);
+        console.log(`[debug][cloudflare]   Is Turnstile: ${challengeInfo.isTurnstile}`);
+        console.log(`[debug][cloudflare]   Is JS Challenge: ${challengeInfo.isJSChallenge}`);
+        console.log(`[debug][cloudflare]   Has Legacy Checkbox: ${challengeInfo.hasLegacyCheckbox}`);
+        console.log(`[debug][cloudflare]   Has Turnstile Iframe: ${challengeInfo.hasTurnstileIframe}`);
+        console.log(`[debug][cloudflare]   Has Turnstile Container: ${challengeInfo.hasTurnstileContainer}`);
+        console.log(`[debug][cloudflare]   Has Turnstile Checkbox: ${challengeInfo.hasTurnstileCheckbox}`);
+        console.log(`[debug][cloudflare]   Has CAPTCHA: ${challengeInfo.hasCaptcha}`);
+        console.log(`[debug][cloudflare]   Has Challenge Running: ${challengeInfo.hasChallengeRunning}`);
+        console.log(`[debug][cloudflare]   Has Data Ray: ${challengeInfo.hasDataRay}`);
+        console.log(`[debug][cloudflare]   Has Turnstile Response: ${challengeInfo.hasTurnstileResponse}`);
+        console.log(`[debug][cloudflare]   Body snippet: ${challengeInfo.bodySnippet}`);
       }
 
       // Check for CAPTCHA that requires human intervention
@@ -264,6 +352,7 @@ async function handleVerificationChallenge(page, currentUrl, forceDebug = false)
       const solveResult = await attemptChallengeSolveWithTimeout(page, currentUrl, challengeInfo, forceDebug);
       result.success = solveResult.success;
       result.error = solveResult.error;
+      result.method = solveResult.method;
       
     } else {
       if (forceDebug) console.log(`[debug][cloudflare] No verification challenge detected on ${currentUrl}`);
@@ -288,11 +377,11 @@ async function attemptChallengeSolveWithTimeout(page, currentUrl, challengeInfo,
   };
 
   try {
-    // Overall timeout for all challenge solving attempts
+    // Reduced timeout for challenge solving
     return await Promise.race([
       attemptChallengeSolve(page, currentUrl, challengeInfo, forceDebug),
       new Promise((_, reject) => 
-        setTimeout(() => reject(new Error('Challenge solving timeout')), 30000)
+        setTimeout(() => reject(new Error('Challenge solving timeout')), 20000)
       )
     ]);
   } catch (error) {
@@ -303,7 +392,7 @@ async function attemptChallengeSolveWithTimeout(page, currentUrl, challengeInfo,
 }
 
 /**
- * Attempts to solve a Cloudflare challenge with modern techniques
+ * Attempts to solve a Cloudflare challenge with modern techniques and enhanced debug logging
  */
 async function attemptChallengeSolve(page, currentUrl, challengeInfo, forceDebug = false) {
   const result = {
@@ -325,7 +414,7 @@ async function attemptChallengeSolve(page, currentUrl, challengeInfo, forceDebug
         return result;
       }
     } catch (jsError) {
-      if (forceDebug) console.log(`[debug][cloudflare] JS challenge wait error: ${jsError.message}`);
+      if (forceDebug) console.log(`[debug][cloudflare] JS challenge wait failed for ${currentUrl}: ${jsError.message}`);
     }
   }
 
@@ -342,7 +431,7 @@ async function attemptChallengeSolve(page, currentUrl, challengeInfo, forceDebug
         return result;
       }
     } catch (turnstileError) {
-      if (forceDebug) console.log(`[debug][cloudflare] Turnstile method error: ${turnstileError.message}`);
+      if (forceDebug) console.log(`[debug][cloudflare] Turnstile method failed for ${currentUrl}: ${turnstileError.message}`);
     }
   }
 
@@ -359,7 +448,7 @@ async function attemptChallengeSolve(page, currentUrl, challengeInfo, forceDebug
         return result;
       }
     } catch (legacyError) {
-      if (forceDebug) console.log(`[debug][cloudflare] Legacy checkbox method error: ${legacyError.message}`);
+      if (forceDebug) console.log(`[debug][cloudflare] Legacy checkbox method failed for ${currentUrl}: ${legacyError.message}`);
     }
   }
 
@@ -371,7 +460,7 @@ async function attemptChallengeSolve(page, currentUrl, challengeInfo, forceDebug
 }
 
 /**
- * Waits for JS challenge completion with timeout protection
+ * Waits for JS challenge completion with timeout protection and enhanced debug logging
  */
 async function waitForJSChallengeCompletion(page, forceDebug = false) {
   const result = {
@@ -382,7 +471,7 @@ async function waitForJSChallengeCompletion(page, forceDebug = false) {
   try {
     if (forceDebug) console.log(`[debug][cloudflare] Waiting for JS challenge completion`);
     
-    // Wait for challenge to complete automatically with shorter timeout
+    // Reduced timeout for JS challenge completion
     await Promise.race([
       page.waitForFunction(
         () => {
@@ -391,23 +480,25 @@ async function waitForJSChallengeCompletion(page, forceDebug = false) {
                  !document.querySelector('.cf-challenge-running') &&
                  !document.querySelector('[data-cf-challenge]');
         },
-        { timeout: 20000 }
+        { timeout: 15000 }
       ),
       new Promise((_, reject) => 
-        setTimeout(() => reject(new Error('JS challenge timeout')), 25000)
+        setTimeout(() => reject(new Error('JS challenge timeout')), 18000)
       )
     ]);
     
     result.success = true;
+    if (forceDebug) console.log(`[debug][cloudflare] JS challenge completed automatically`);
   } catch (error) {
     result.error = `JS challenge timeout: ${error.message}`;
+    if (forceDebug) console.log(`[debug][cloudflare] JS challenge wait failed: ${error.message}`);
   }
 
   return result;
 }
 
 /**
- * Handles modern Turnstile challenges with timeout protection
+ * Handles modern Turnstile challenges with timeout protection and enhanced debug logging
  */
 async function handleTurnstileChallenge(page, forceDebug = false) {
   const result = {
@@ -416,8 +507,8 @@ async function handleTurnstileChallenge(page, forceDebug = false) {
   };
 
   try {
-    // Much shorter timeout for Turnstile operations
-    const turnstileTimeout = 10000; // 10 seconds
+    // Reduced timeout for Turnstile operations
+    const turnstileTimeout = 8000; // Reduced from 10 to 8 seconds
     
     const turnstileSelectors = [
       'iframe[src*="challenges.cloudflare.com"]',
@@ -429,8 +520,8 @@ async function handleTurnstileChallenge(page, forceDebug = false) {
     for (const selector of turnstileSelectors) {
       try {
         await Promise.race([
-          page.waitForSelector(selector, { timeout: 3000 }),
-          new Promise((_, reject) => setTimeout(() => reject(new Error('Selector timeout')), 4000))
+          page.waitForSelector(selector, { timeout: 2000 }),
+          new Promise((_, reject) => setTimeout(() => reject(new Error('Selector timeout')), 2500))
         ]);
         
         const frames = await page.frames();
@@ -438,14 +529,20 @@ async function handleTurnstileChallenge(page, forceDebug = false) {
           frame.url().includes('challenges.cloudflare.com') ||
           frame.url().includes('turnstile')
         );
-        if (turnstileFrame) break;
+        if (turnstileFrame) {
+          if (forceDebug) console.log(`[debug][cloudflare] Found Turnstile iframe using selector: ${selector}`);
+          break;
+        }
       } catch (e) {
+        if (forceDebug) console.log(`[debug][cloudflare] Selector ${selector} not found or timed out`);
         continue;
       }
     }
 
     if (turnstileFrame) {
-      if (forceDebug) console.log(`[debug][cloudflare] Found Turnstile iframe`);
+      if (forceDebug) {
+        console.log(`[debug][cloudflare] Found Turnstile iframe with URL: ${turnstileFrame.url()}`);
+      }
       
       const checkboxSelectors = [
         'input[type="checkbox"].ctp-checkbox',
@@ -457,8 +554,8 @@ async function handleTurnstileChallenge(page, forceDebug = false) {
       for (const selector of checkboxSelectors) {
         try {
           await Promise.race([
-            turnstileFrame.waitForSelector(selector, { timeout: 3000 }),
-            new Promise((_, reject) => setTimeout(() => reject(new Error('Checkbox timeout')), 4000))
+            turnstileFrame.waitForSelector(selector, { timeout: 2000 }),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('Checkbox timeout')), 2500))
           ]);
           
           await waitForTimeout(page, 500);
@@ -467,36 +564,75 @@ async function handleTurnstileChallenge(page, forceDebug = false) {
           if (forceDebug) console.log(`[debug][cloudflare] Clicked Turnstile checkbox: ${selector}`);
           break;
         } catch (e) {
+          if (forceDebug) console.log(`[debug][cloudflare] Checkbox selector ${selector} not found or failed to click`);
           continue;
         }
       }
       
-      // Wait for Turnstile completion with timeout
+      // Wait for Turnstile completion with reduced timeout
       await Promise.race([
         page.waitForFunction(
           () => {
             const responseInput = document.querySelector('input[name="cf-turnstile-response"]');
             return responseInput && responseInput.value && responseInput.value.length > 0;
           },
-          { timeout: 15000 }
+          { timeout: 12000 }
         ),
-        new Promise((_, reject) => setTimeout(() => reject(new Error('Turnstile completion timeout')), 20000))
+        new Promise((_, reject) => setTimeout(() => reject(new Error('Turnstile completion timeout')), 15000))
       ]);
       
+      if (forceDebug) console.log(`[debug][cloudflare] Turnstile response token generated successfully`);
       result.success = true;
     } else {
-      result.error = 'Turnstile iframe not found';
+      // Try container-based Turnstile (non-iframe)
+      if (forceDebug) console.log(`[debug][cloudflare] No Turnstile iframe found, trying container-based approach`);
+      
+      const containerSelectors = [
+        '.cf-turnstile',
+        '.ctp-checkbox-container',
+        '.ctp-checkbox-label'
+      ];
+      
+      for (const selector of containerSelectors) {
+        try {
+          await Promise.race([
+            page.waitForSelector(selector, { timeout: 2000 }),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('Container timeout')), 2500))
+          ]);
+          
+          await waitForTimeout(page, 500);
+          await page.click(selector);
+          
+          if (forceDebug) console.log(`[debug][cloudflare] Clicked Turnstile container: ${selector}`);
+          
+          const completionCheck = await checkChallengeCompletion(page);
+          if (completionCheck.isCompleted) {
+            result.success = true;
+            if (forceDebug) console.log(`[debug][cloudflare] Container-based Turnstile completed successfully`);
+            break;
+          }
+        } catch (e) {
+          if (forceDebug) console.log(`[debug][cloudflare] Container selector ${selector} not found or failed`);
+          continue;
+        }
+      }
+      
+      if (!result.success) {
+        result.error = 'Turnstile iframe/container not found or not interactive';
+        if (forceDebug) console.log(`[debug][cloudflare] ${result.error}`);
+      }
     }
     
   } catch (error) {
     result.error = `Turnstile handling failed: ${error.message}`;
+    if (forceDebug) console.log(`[debug][cloudflare] Turnstile handling error: ${error.message}`);
   }
 
   return result;
 }
 
 /**
- * Handles legacy checkbox challenges with timeout protection
+ * Handles legacy checkbox challenges with timeout protection and enhanced debug logging
  */
 async function handleLegacyCheckbox(page, forceDebug = false) {
   const result = {
@@ -505,6 +641,8 @@ async function handleLegacyCheckbox(page, forceDebug = false) {
   };
 
   try {
+    if (forceDebug) console.log(`[debug][cloudflare] Attempting legacy checkbox challenge`);
+    
     const legacySelectors = [
       'input[type="checkbox"]#challenge-form',
       'input[type="checkbox"][name="cf_captcha_kind"]',
@@ -514,8 +652,8 @@ async function handleLegacyCheckbox(page, forceDebug = false) {
     for (const selector of legacySelectors) {
       try {
         await Promise.race([
-          page.waitForSelector(selector, { timeout: 3000 }),
-          new Promise((_, reject) => setTimeout(() => reject(new Error('Legacy selector timeout')), 4000))
+          page.waitForSelector(selector, { timeout: 2000 }),
+          new Promise((_, reject) => setTimeout(() => reject(new Error('Legacy selector timeout')), 2500))
         ]);
         
         const checkbox = await page.$(selector);
@@ -526,27 +664,31 @@ async function handleLegacyCheckbox(page, forceDebug = false) {
           const completionCheck = await checkChallengeCompletion(page);
           if (completionCheck.isCompleted) {
             result.success = true;
+            if (forceDebug) console.log(`[debug][cloudflare] Legacy checkbox challenge completed successfully`);
             break;
           }
         }
       } catch (e) {
+        if (forceDebug) console.log(`[debug][cloudflare] Legacy selector ${selector} failed: ${e.message}`);
         continue;
       }
     }
 
     if (!result.success) {
       result.error = 'No interactive legacy checkbox found';
+      if (forceDebug) console.log(`[debug][cloudflare] ${result.error}`);
     }
     
   } catch (error) {
     result.error = `Legacy checkbox handling failed: ${error.message}`;
+    if (forceDebug) console.log(`[debug][cloudflare] Legacy checkbox error: ${error.message}`);
   }
 
   return result;
 }
 
 /**
- * Checks if challenge has been completed with timeout protection
+ * Checks if challenge has been completed with timeout protection and enhanced debug logging
  */
 async function checkChallengeCompletion(page) {
   try {
@@ -563,7 +705,7 @@ async function checkChallengeCompletion(page) {
       return (noChallengeRunning && noChallengeContainer && noChallengePage) ||
              hasClearanceCookie ||
              hasTurnstileResponse;
-    }, 5000);
+    }, 3000); // Reduced timeout
     
     return { isCompleted };
   } catch (error) {
@@ -572,9 +714,28 @@ async function checkChallengeCompletion(page) {
 }
 
 /**
- * Main function to handle all Cloudflare challenges with comprehensive timeout protection
+ * Main function to handle all Cloudflare challenges with smart detection and adaptive timeouts
  */
 async function handleCloudflareProtection(page, currentUrl, siteConfig, forceDebug = false) {
+  if (forceDebug) {
+    console.log(`[debug][cloudflare] Using Cloudflare module v${CLOUDFLARE_MODULE_VERSION} for ${currentUrl}`);
+  }
+  // Quick detection first - exit early if no Cloudflare detected and no explicit config
+  const quickDetection = await quickCloudflareDetection(page, forceDebug);
+  
+  // Only proceed if we have indicators OR explicit config enables Cloudflare handling
+  if (!quickDetection.hasIndicators && !siteConfig.cloudflare_phish && !siteConfig.cloudflare_bypass) {
+    if (forceDebug) console.log(`[debug][cloudflare] No Cloudflare indicators found and no explicit config, skipping protection handling for ${currentUrl}`);
+    if (forceDebug) console.log(`[debug][cloudflare] Quick detection details: title="${quickDetection.title}", bodySnippet="${quickDetection.bodySnippet}"`);
+    return {
+      phishingWarning: { attempted: false, success: true },
+      verificationChallenge: { attempted: false, success: true },
+      overallSuccess: true,
+      errors: [],
+      skippedNoIndicators: true
+    };
+  }
+
   const result = {
     phishingWarning: { attempted: false, success: false },
     verificationChallenge: { attempted: false, success: false },
@@ -583,30 +744,45 @@ async function handleCloudflareProtection(page, currentUrl, siteConfig, forceDeb
   };
 
   try {
-    // Overall timeout for all Cloudflare operations
+    // Adaptive timeout based on detection results and explicit config
+    let adaptiveTimeout;
+    if (siteConfig.cloudflare_phish || siteConfig.cloudflare_bypass) {
+      // Explicit config - give more time
+      adaptiveTimeout = quickDetection.hasIndicators ? 25000 : 20000;
+    } else {
+      // Auto-detected only - shorter timeout
+      adaptiveTimeout = quickDetection.hasIndicators ? 15000 : 10000;
+    }
+
+    if (forceDebug) {
+      console.log(`[debug][cloudflare] Using adaptive timeout of ${adaptiveTimeout}ms for ${currentUrl} (indicators: ${quickDetection.hasIndicators}, explicit config: ${!!(siteConfig.cloudflare_phish || siteConfig.cloudflare_bypass)})`);
+    }
+    
     return await Promise.race([
       performCloudflareHandling(page, currentUrl, siteConfig, forceDebug),
       new Promise((resolve) => {
         setTimeout(() => {
-          console.warn(`[cloudflare] Overall timeout for ${currentUrl} - continuing with scan`);
+        console.warn(`[cloudflare] Adaptive timeout (${adaptiveTimeout}ms) for ${currentUrl} - continuing with scan`);
           resolve({
             phishingWarning: { attempted: false, success: true },
             verificationChallenge: { attempted: false, success: true },
             overallSuccess: true,
-            errors: ['Cloudflare handling timed out']
+            errors: ['Cloudflare handling timed out'],
+            timedOut: true
           });
-        }, 45000); // 45 second overall timeout
+        }, adaptiveTimeout);
       })
     ]);
   } catch (error) {
     result.overallSuccess = false;
     result.errors.push(`Cloudflare handling failed: ${error.message}`);
+    if (forceDebug) console.log(`[debug][cloudflare] Overall handling failed: ${error.message}`);
     return result;
   }
 }
 
 /**
- * Performs the actual Cloudflare handling
+ * Performs the actual Cloudflare handling with enhanced debug logging
  */
 async function performCloudflareHandling(page, currentUrl, siteConfig, forceDebug = false) {
   const result = {
@@ -616,19 +792,30 @@ async function performCloudflareHandling(page, currentUrl, siteConfig, forceDebu
     errors: []
   };
 
+  if (forceDebug) console.log(`[debug][cloudflare] Starting Cloudflare protection handling for ${currentUrl}`);
+
   // Handle phishing warnings if enabled
   if (siteConfig.cloudflare_phish === true) {
+    if (forceDebug) console.log(`[debug][cloudflare] Phishing warning bypass enabled for ${currentUrl}`);
+    
     const phishingResult = await handlePhishingWarning(page, currentUrl, forceDebug);
     result.phishingWarning = phishingResult;
     
     if (phishingResult.attempted && !phishingResult.success) {
       result.overallSuccess = false;
       result.errors.push(`Phishing warning bypass failed: ${phishingResult.error}`);
+      if (forceDebug) console.log(`[debug][cloudflare] Phishing warning handling failed: ${phishingResult.error}`);
+    } else if (phishingResult.attempted && phishingResult.success) {
+      if (forceDebug) console.log(`[debug][cloudflare] Phishing warning handled successfully`);
     }
+  } else if (forceDebug) {
+    console.log(`[debug][cloudflare] Phishing warning bypass disabled for ${currentUrl}`);
   }
 
   // Handle verification challenges if enabled
   if (siteConfig.cloudflare_bypass === true) {
+    if (forceDebug) console.log(`[debug][cloudflare] Challenge bypass enabled for ${currentUrl}`);
+    
     const challengeResult = await handleVerificationChallenge(page, currentUrl, forceDebug);
     result.verificationChallenge = challengeResult;
     
@@ -636,12 +823,19 @@ async function performCloudflareHandling(page, currentUrl, siteConfig, forceDebu
       result.overallSuccess = false;
       if (challengeResult.requiresHuman) {
         result.errors.push(`Human intervention required: ${challengeResult.error}`);
+        if (forceDebug) console.log(`[debug][cloudflare] Human intervention required: ${challengeResult.error}`);
       } else {
         result.errors.push(`Challenge bypass failed: ${challengeResult.error}`);
+        if (forceDebug) console.log(`[debug][cloudflare] Challenge bypass failed: ${challengeResult.error}`);
       }
+    } else if (challengeResult.attempted && challengeResult.success) {
+      if (forceDebug) console.log(`[debug][cloudflare] Challenge handled successfully using method: ${challengeResult.method || 'unknown'}`);
     }
+  } else if (forceDebug) {
+    console.log(`[debug][cloudflare] Challenge bypass disabled for ${currentUrl}`);
   }
 
+  // Log overall result
   if (!result.overallSuccess && forceDebug) {
     console.log(`[debug][cloudflare] Overall Cloudflare handling failed for ${currentUrl}:`);
     result.errors.forEach(error => {
@@ -649,6 +843,8 @@ async function performCloudflareHandling(page, currentUrl, siteConfig, forceDebu
     });
   } else if ((result.phishingWarning.attempted || result.verificationChallenge.attempted) && forceDebug) {
     console.log(`[debug][cloudflare] Successfully handled Cloudflare protections for ${currentUrl}`);
+  } else if (forceDebug) {
+    console.log(`[debug][cloudflare] No Cloudflare protections detected or enabled for ${currentUrl}`);
   }
 
   return result;
@@ -663,5 +859,8 @@ module.exports = {
   handleTurnstileChallenge,
   waitForJSChallengeCompletion,
   handleLegacyCheckbox,
-  checkChallengeCompletion
+  checkChallengeCompletion,
+  quickCloudflareDetection,
+  getModuleInfo,
+  CLOUDFLARE_MODULE_VERSION
 };

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v1.0.37 ===
+// === Network scanner script (nwss.js) v1.0.38 ===
 
 // puppeteer for browser automation, fs for file system operations, psl for domain parsing.
 // const pLimit = require('p-limit'); // Will be dynamically imported
@@ -33,9 +33,9 @@ const { navigateWithRedirectHandling, handleRedirectTimeout } = require('./lib/r
 const { monitorBrowserHealth, isBrowserHealthy } = require('./lib/browserhealth');
 
 // --- Script Configuration & Constants ---
-const VERSION = '1.0.37'; // Script version
-const MAX_CONCURRENT_SITES = 5;
-const RESOURCE_CLEANUP_INTERVAL = 80; // Close browser and restart every N sites to free resources
+const VERSION = '1.0.38'; // Script version
+const MAX_CONCURRENT_SITES = 12;
+const RESOURCE_CLEANUP_INTERVAL = 180; // Close browser and restart every N sites to free resources
 
 // get startTime
 const startTime = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fanboynz/network-scanner",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "A Puppeteer-based network scanner for analyzing web traffic, generating adblock filter rules, and identifying third-party requests. Features include fingerprint spoofing, Cloudflare bypass, content analysis with curl/grep, and multiple output formats.",
   "main": "nwss.js",
   "scripts": {