@fanboynz/network-scanner 1.0.76 → 1.0.77

package/lib/cloudflare.js

@@ -1,13 +1,13 @@
 /**
  * Cloudflare bypass and challenge handling module - Optimized with smart detection and adaptive timeouts
- * Version: 2.2.0 - Enhanced with retry logic, caching, and improved error handling
+ * Version: 2.3.0 - Support iframe CF, and better error handling
  * Handles phishing warnings, Turnstile challenges, and modern Cloudflare protections
  */
 
 /**
  * Module version information
  */
-const CLOUDFLARE_MODULE_VERSION = '2.2.0';
+const CLOUDFLARE_MODULE_VERSION = '2.3.0';
 
 /**
  * Timeout constants for various operations (in milliseconds)
@@ -749,6 +749,144 @@ async function attemptChallengeSolve(page, currentUrl, challengeInfo, forceDebug
   return result;
 }
 
+ /**
+ * Enhanced embedded iframe challenge detection and interaction
+ */
+async function handleEmbeddedIframeChallenge(page, forceDebug = false) {
+  const result = {
+    success: false,
+    error: null
+  };
+
+  try {
+    if (forceDebug) console.log(`[debug][cloudflare] Checking for embedded iframe challenges`);
+
+    // Enhanced iframe selectors including challenges.cloudflare.com
+    const iframeSelectors = [
+      'iframe[src*="challenges.cloudflare.com"]',
+      'iframe[title*="Verify you are human"]',
+      'iframe[title*="Cloudflare security challenge"]',
+      'iframe[title*="Widget containing a Cloudflare"]'
+    ];
+
+    // Wait for iframe to appear
+    let iframeFound = false;
+    for (const selector of iframeSelectors) {
+      try {
+        await Promise.race([
+          page.waitForSelector(selector, { timeout: FAST_TIMEOUTS.SELECTOR_WAIT }),
+          new Promise((_, reject) => setTimeout(() => reject(new Error('Timeout')), FAST_TIMEOUTS.SELECTOR_WAIT + 1000))
+        ]);
+        iframeFound = true;
+        if (forceDebug) console.log(`[debug][cloudflare] Found iframe: ${selector}`);
+        break;
+      } catch (e) {
+        continue;
+      }
+    }
+
+    if (!iframeFound) {
+      result.error = 'No embedded iframe found';
+      return result;
+    }
+
+    // Find challenge frame using existing frame detection logic
+    const frames = await page.frames();
+    const challengeFrame = frames.find(frame => {
+      const frameUrl = frame.url();
+      return frameUrl.includes('challenges.cloudflare.com') ||
+             frameUrl.includes('/turnstile/if/') ||
+             frameUrl.includes('captcha-delivery.com') ||
+             frameUrl.includes('/challenge-platform/') ||
+             frameUrl.includes('turnstile');
+    });
+
+    if (!challengeFrame) {
+      result.error = 'Challenge iframe not accessible';
+      return result;
+    }
+
+    if (forceDebug) console.log(`[debug][cloudflare] Interacting with iframe: ${challengeFrame.url()}`);
+
+    // Reuse existing checkbox interaction logic
+    const checkboxSelectors = [
+      'input[type="checkbox"]',
+      '.ctp-checkbox',
+      'input.ctp-checkbox',
+      '.cf-turnstile input',
+      '.ctp-checkbox-label'
+    ];
+    
+    let checkboxInteractionSuccess = false;
+    for (const selector of checkboxSelectors) {
+      try {
+        await Promise.race([
+          challengeFrame.waitForSelector(selector, { timeout: FAST_TIMEOUTS.SELECTOR_WAIT }),
+          new Promise((_, reject) => setTimeout(() => reject(new Error('Timeout')), FAST_TIMEOUTS.SELECTOR_WAIT + 1000))
+        ]);
+        
+        await waitForTimeout(page, FAST_TIMEOUTS.ELEMENT_INTERACTION_DELAY);
+        await challengeFrame.click(selector);
+        
+        if (forceDebug) console.log(`[debug][cloudflare] Clicked iframe element: ${selector}`);
+        checkboxInteractionSuccess = true;
+        break;
+      } catch (e) {
+        continue;
+      }
+    }
+
+    // Try alternative interaction only if standard selectors failed
+    if (!checkboxInteractionSuccess) {
+      if (forceDebug) console.log(`[debug][cloudflare] Checkbox interactions failed, trying container fallback`);
+      await waitForTimeout(page, 1000);
+
+      try {
+        // Try clicking on the iframe container itself as fallback
+        const iframeElement = await page.$('iframe[src*="challenges.cloudflare.com"]');
+        if (iframeElement) {
+          await iframeElement.click();
+          if (forceDebug) console.log(`[debug][cloudflare] Clicked iframe container as fallback`);
+        }
+      } catch (containerClickError) {
+        if (forceDebug) console.log(`[debug][cloudflare] Container click failed: ${containerClickError.message}`);
+      }
+    } else {
+      if (forceDebug) console.log(`[debug][cloudflare] Checkbox interaction successful, skipping container fallback`);
+    }
+
+    // Reuse existing completion check pattern with error handling
+    try {
+      await Promise.race([
+        page.waitForFunction(
+          () => {
+            const responseInput = document.querySelector('input[name="cf-turnstile-response"]');
+            const hasResponse = responseInput && responseInput.value && responseInput.value.length > 0;
+            const hasClearance = document.cookie.includes('cf_clearance');
+            const noChallenge = !document.body.textContent.includes('Verify you are human');
+            
+            return hasResponse || hasClearance || noChallenge;
+          },
+          { timeout: TIMEOUTS.TURNSTILE_COMPLETION }
+        ),
+        new Promise((_, reject) => setTimeout(() => reject(new Error('Completion check timeout')), TIMEOUTS.TURNSTILE_COMPLETION_BUFFER))
+      ]);
+
+      result.success = true;
+      if (forceDebug) console.log(`[debug][cloudflare] Embedded iframe challenge completed`);
+    } catch (completionError) {
+      result.error = `Challenge completion check failed: ${completionError.message}`;
+      if (forceDebug) console.log(`[debug][cloudflare] Completion check failed: ${completionError.message}`);
+    }
+
+  } catch (error) {
+    result.error = `Embedded iframe handling failed: ${error.message}`;
+    if (forceDebug) console.log(`[debug][cloudflare] ${result.error}`);
+  }
+
+  return result;
+}
+
 /**
  * Waits for JS challenge completion with timeout protection and enhanced debug logging
  */
@@ -796,6 +934,14 @@ async function handleTurnstileChallenge(page, forceDebug = false) {
     error: null
   };
 
+  // Try embedded iframe approach first
+  const iframeResult = await handleEmbeddedIframeChallenge(page, forceDebug);
+  if (iframeResult.success) {
+    return { ...result, success: true };
+  }
+  
+  if (forceDebug) console.log(`[debug][cloudflare] Embedded iframe failed: ${iframeResult.error}, trying legacy method`);
+
   try {
     // Use fast timeout for Turnstile operations
     const turnstileTimeout = FAST_TIMEOUTS.TURNSTILE_OPERATION;
@@ -1276,6 +1422,29 @@ async function parallelChallengeDetection(page, forceDebug = false) {
   };
 }
 
+/**
+ * Enhanced parallel detection including embedded iframe challenges
+ */
+async function enhancedParallelChallengeDetection(page, forceDebug = false) {
+  const existingDetection = await parallelChallengeDetection(page, forceDebug);
+  
+  try {
+    const hasEmbeddedIframe = await page.evaluate(() => {
+      return document.querySelector('iframe[src*="challenges.cloudflare.com"]') !== null ||
+             document.querySelector('iframe[title*="Verify you are human"]') !== null;
+    });
+    
+    if (hasEmbeddedIframe && !existingDetection.challenges.includes('embedded_iframe')) {
+      existingDetection.challenges.push('embedded_iframe');
+      existingDetection.hasAnyChallenge = true;
+    }
+  } catch (e) {
+    // Ignore detection errors
+  }
+  
+  return existingDetection;
+}
+
 /**
  * Gets cache statistics for performance monitoring
  */
@@ -1300,6 +1469,8 @@ module.exports = {
   waitForJSChallengeCompletion,
   handleLegacyCheckbox,
   checkChallengeCompletion,
+  handleEmbeddedIframeChallenge,
+  enhancedParallelChallengeDetection,
   quickCloudflareDetection,
   getModuleInfo,
   CLOUDFLARE_MODULE_VERSION,

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v1.0.76 ===
+// === Network scanner script (nwss.js) v1.0.77 ===
 
 // puppeteer for browser automation, fs for file system operations, psl for domain parsing.
 // const pLimit = require('p-limit'); // Will be dynamically imported
@@ -123,7 +123,7 @@ const { navigateWithRedirectHandling, handleRedirectTimeout } = require('./lib/r
 const { monitorBrowserHealth, isBrowserHealthy } = require('./lib/browserhealth');
 
 // --- Script Configuration & Constants --- 
-const VERSION = '1.0.76'; // Script version
+const VERSION = '1.0.77'; // Script version
 
 // get startTime
 const startTime = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fanboynz/network-scanner",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "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": {