@fanboynz/network-scanner 1.0.99 → 2.0.2

package/lib/cloudflare.js

@@ -1,5 +1,6 @@
 /**
  * Cloudflare bypass and challenge handling module - Optimized with smart detection and adaptive timeouts
+ * Version: 2.5.0 - Fix Frame Lifecycle issue, Timing and Race condition
  * Version: 2.4.1 - Bump timeout values
  * Version: 2.4.0 - Fix possible endless loops with retry logic and loop detection
  * Version: 2.3.1 - Colorize CF
@@ -15,7 +16,7 @@ const { formatLogMessage } = require('./colorize');
 /**
  * Module version information
  */
-const CLOUDFLARE_MODULE_VERSION = '2.4.0';
+const CLOUDFLARE_MODULE_VERSION = '2.5.0';
 
 /**
  * Timeout constants for various operations (in milliseconds)
@@ -67,6 +68,7 @@ const ERROR_TYPES = {
   ELEMENT_NOT_FOUND: 'element_not_found',
   EVALUATION_FAILED: 'evaluation_failed',
   NAVIGATION_FAILED: 'navigation_failed',
+  DETACHED_FRAME: 'detached_frame',
   UNKNOWN: 'unknown'
 };
 
@@ -118,7 +120,7 @@ const RETRY_CONFIG = {
   baseDelay: 1000,
   maxDelay: 8000,
   backoffMultiplier: 2,
-  retryableErrors: [ERROR_TYPES.NETWORK, ERROR_TYPES.TIMEOUT, ERROR_TYPES.ELEMENT_NOT_FOUND]
+  retryableErrors: [ERROR_TYPES.NETWORK, ERROR_TYPES.TIMEOUT, ERROR_TYPES.ELEMENT_NOT_FOUND, ERROR_TYPES.DETACHED_FRAME]
 };
 
 /**
@@ -260,6 +262,10 @@ async function waitForTimeout(page, timeout) {
  */
 function categorizeError(error) {
   const errorMessage = error.message || '';
+
+  if (errorMessage.includes('detached Frame') || errorMessage.includes('Attempted to use detached')) {
+    return ERROR_TYPES.DETACHED_FRAME;
+  }
   
   if (errorMessage.includes('timeout') || errorMessage.includes('Timeout')) {
     return ERROR_TYPES.TIMEOUT;
@@ -297,6 +303,17 @@ async function safePageEvaluate(page, func, timeout = TIMEOUTS.PAGE_EVALUATION_S
   
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {
+      // Validate page/frame state before evaluation
+      if (page.isClosed()) {
+        throw new Error('Page is closed');
+      }
+      
+      // Check if main frame is still attached
+      const mainFrame = page.mainFrame();
+      if (mainFrame.isDetached()) {
+        throw new Error('Main frame is detached');
+      }
+
       const result = await Promise.race([
         page.evaluate(func),
         new Promise((_, reject) => 
@@ -316,6 +333,16 @@ async function safePageEvaluate(page, func, timeout = TIMEOUTS.PAGE_EVALUATION_S
       if (forceDebug) {
         console.warn(formatLogMessage('cloudflare', `Page evaluation failed (attempt ${attempt}/${maxRetries}): ${error.message} [${errorType}]`));
       }
+
+      // Handle detached frame errors specifically
+      if (errorType === ERROR_TYPES.DETACHED_FRAME) {
+        if (forceDebug) {
+          console.warn(formatLogMessage('cloudflare', `Detached frame detected on attempt ${attempt}/${maxRetries} - using longer delay`));
+        }
+        // For detached frames, wait longer and don't retry as aggressively
+        await new Promise(resolve => setTimeout(resolve, 2000)); // Longer delay
+        continue;
+      }
       
       // Don't retry if error type is not retryable or if it's the last attempt
       if (!RETRY_CONFIG.retryableErrors.includes(errorType) || attempt === maxRetries) {
@@ -336,6 +363,20 @@ async function safePageEvaluate(page, func, timeout = TIMEOUTS.PAGE_EVALUATION_S
     }
   }
   
+  // If all retries failed due to detached frames, return safe defaults
+  if (lastError?.message.includes('detached Frame') || lastError?.message.includes('Attempted to use detached')) {
+    return {
+      isChallengePresent: false,
+      isPhishingWarning: false,
+      isTurnstile: false,
+      isJSChallenge: false,
+      isChallengeCompleted: false,
+      error: 'Frame detached - skipping evaluation',
+      errorType: ERROR_TYPES.DETACHED_FRAME,
+      attempts: maxRetries
+    };
+  }
+
   return {
     isChallengePresent: false,
     isPhishingWarning: false,
@@ -1209,7 +1250,6 @@ async function handleTurnstileChallenge(page, forceDebug = false) {
       
       const checkboxSelectors = [
         'input[type="checkbox"].ctp-checkbox',
-        'input[type="checkbox"]',
         '.ctp-checkbox-label',
         '.ctp-checkbox'
       ];

package/lib/output.js

@@ -80,7 +80,7 @@ function extractDomainFromRule(rule) {
   } else if (rule.startsWith('{ +block } .')) {
     // Privoxy format: { +block } .domain.com
     return rule.substring(12);
-  } else if (rule.match(/^\(\^\|\\?\.\)/)) {
+  } else if (rule.match(/^\(\^\|\\\.\)/)) {
     // Pi-hole regex format: (^|\.)domain\.com$
     return rule.replace(/^\(\^\|\\?\.\)/, '').replace(/\\\./g, '.').replace(/\$$/, '');
   }
@@ -660,4 +660,4 @@ module.exports = {
   mapResourceTypeToAdblockModifier,
   matchesIgnoreDomain,
   extractDomainFromRule
-};
+};

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v1.0.99 ===
+// === Network scanner script (nwss.js) v2.0.2 ===
 
 // puppeteer for browser automation, fs for file system operations, psl for domain parsing.
 // const pLimit = require('p-limit'); // Will be dynamically imported
@@ -127,7 +127,7 @@ const { navigateWithRedirectHandling, handleRedirectTimeout } = require('./lib/r
 const { monitorBrowserHealth, isBrowserHealthy, isQuicklyResponsive, performGroupWindowCleanup, performRealtimeWindowCleanup, trackPageForRealtime, updatePageUsage } = require('./lib/browserhealth');
 
 // --- Script Configuration & Constants --- 
-const VERSION = '1.0.99'; // Script version
+const VERSION = '2.0.2'; // Script version
 
 // get startTime
 const startTime = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fanboynz/network-scanner",
-  "version": "1.0.99",
+  "version": "2.0.2",
   "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": {
@@ -13,7 +13,7 @@
     "lru-cache": "^10.4.3",
     "p-limit": "^4.0.0",
     "psl": "^1.15.0",
-    "puppeteer": ">=20.0.0 <23.0.0"
+    "puppeteer": ">=20.0.0"
   },
   "overrides": {
     "tar-fs": "3.1.0",