@fanboynz/network-scanner 2.0.10 → 2.0.11

package/lib/fingerprint.js

@@ -173,6 +173,23 @@ function generateCSIData() {
   };
 }
 
+/**
+ * Validates page state before script injection to avoid timeouts
+ */
+async function validatePageForInjection(page, currentUrl, forceDebug) {
+  try {
+    if (page.isClosed()) return false;
+    await Promise.race([
+      page.evaluate(() => document.readyState),
+      new Promise((_, reject) => setTimeout(() => reject(new Error('Page unresponsive')), 3000))
+    ]);
+    return true;
+  } catch (validationErr) {
+    if (forceDebug) console.log(`[debug] Skipping fingerprint protection - page unresponsive: ${currentUrl}`);
+    return false;
+  }
+}
+
 /**
  * Creates mock fingerprinting objects
  */
@@ -251,6 +268,9 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
 
   if (forceDebug) console.log(`[debug] User agent spoofing: ${siteConfig.userAgent}`);
 
+  // Validate page state before injection
+  if (!(await validatePageForInjection(page, currentUrl, forceDebug))) return;
+
   const selectedUserAgents = USER_AGENT_COLLECTIONS[siteConfig.userAgent.toLowerCase()];
   const ua = selectedUserAgents ? selectedUserAgents[Math.floor(Math.random() * selectedUserAgents.length)] : null;
   
@@ -660,6 +680,12 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
 
       }, ua, forceDebug);
     } catch (stealthErr) {
+      if (stealthErr.message.includes('Session closed') || 
+          stealthErr.message.includes('addScriptToEvaluateOnNewDocument timed out') ||
+          stealthErr.message.includes('Target closed')) {
+        if (forceDebug) console.log(`[debug] Page closed during stealth injection: ${currentUrl}`);
+        return;
+      }
       console.warn(`[stealth protection failed] ${currentUrl}: ${stealthErr.message}`);
     }
   }
@@ -672,8 +698,23 @@ async function applyBraveSpoofing(page, siteConfig, forceDebug, currentUrl) {
   if (!siteConfig.isBrave) return;
 
   if (forceDebug) console.log(`[debug] Brave spoofing enabled for ${currentUrl}`);
+
+  // Validate page state before injection
+  if (!(await validatePageForInjection(page, currentUrl, forceDebug))) return;
   
-  await page.evaluateOnNewDocument((debugEnabled) => {
+  try {
+    await page.evaluateOnNewDocument((debugEnabled) => {
+      // ... existing Brave spoofing code ...
+    }, forceDebug);
+  } catch (braveErr) {
+    if (braveErr.message.includes('Session closed') || 
+        braveErr.message.includes('addScriptToEvaluateOnNewDocument timed out') ||
+        braveErr.message.includes('Target closed')) {
+      if (forceDebug) console.log(`[debug] Page closed during Brave injection: ${currentUrl}`);
+      return;
+    }
+    if (forceDebug) console.log(`[debug] Brave spoofing failed: ${currentUrl} - ${braveErr.message}`);
+  }
     try {
       Object.defineProperty(navigator, 'brave', {
         get: () => ({
@@ -695,7 +736,6 @@ async function applyBraveSpoofing(page, siteConfig, forceDebug, currentUrl) {
     } catch (err) {
       if (debugEnabled) console.log(`[fingerprint] Brave spoofing error: ${err.message}`);
     }
-  }, forceDebug);
 }
 
 /**
@@ -707,6 +747,9 @@ async function applyFingerprintProtection(page, siteConfig, forceDebug, currentU
 
   if (forceDebug) console.log(`[debug] Fingerprint protection enabled for ${currentUrl}`);
   
+  // Validate page state before injection
+  if (!(await validatePageForInjection(page, currentUrl, forceDebug))) return;
+  
   const spoof = fingerprintSetting === 'random' ? getRandomFingerprint() : {
     deviceMemory: 8, 
     hardwareConcurrency: 4,
@@ -796,6 +839,12 @@ async function applyFingerprintProtection(page, siteConfig, forceDebug, currentU
       
     }, { spoof, debugEnabled: forceDebug });
   } catch (err) {
+    if (err.message.includes('Session closed') || 
+        err.message.includes('addScriptToEvaluateOnNewDocument timed out') ||
+        err.message.includes('Target closed')) {
+      if (forceDebug) console.log(`[debug] Page closed during fingerprint injection: ${currentUrl}`);
+      return;
+    }
     console.warn(`[fingerprint protection failed] ${currentUrl}: ${err.message}`);
   }
 }

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v2.0.10 ===
+// === Network scanner script (nwss.js) v2.0.11 ===
 
 // puppeteer for browser automation, fs for file system operations, psl for domain parsing.
 // const pLimit = require('p-limit'); // Will be dynamically imported
@@ -55,19 +55,20 @@ function fastTimeout(ms) {
 
 // --- Configuration Constants ---
 const TIMEOUTS = {
-  DEFAULT_PAGE: 30000,
-  DEFAULT_NAVIGATION: 25000,
+  DEFAULT_PAGE: 35000,                // Standard page load timeout (35s)
+  DEFAULT_NAVIGATION: 25000,          // Navigation operation timeout
   DEFAULT_NAVIGATION_REDUCED: 20000,  // Reduced timeout for faster failures
-  DEFAULT_PAGE_REDUCED: 15000,        // Reduced page timeout
-  FRAME_LOAD_WAIT: 2000,
-  NETWORK_IDLE: 2000,
-  NETWORK_IDLE_MAX: 10000,
-  FAST_SITE_THRESHOLD: 15000,
-  EMERGENCY_RESTART_DELAY: 2000,
-  BROWSER_STABILIZE_DELAY: 1000,
-  CURL_HANDLER_DELAY: 3000,
-  PROTOCOL_TIMEOUT: 160000,
-  REDIRECT_JS_TIMEOUT: 5000
+  DEFAULT_PAGE_REDUCED: 15000,        // Faster page timeout for quick failures
+  FRAME_LOAD_WAIT: 2000,              // Wait time for iframes to load 
+  DEFAULT_DELAY: 6000,                // Default delay: after page load
+  NETWORK_IDLE: 2000,                 // Network idle detection time
+  NETWORK_IDLE_MAX: 10000,            // Maximum network idle wait time
+  FAST_SITE_THRESHOLD: 15000,         // Threshold for "fast site" optimizations
+  EMERGENCY_RESTART_DELAY: 2000,      // Delay after emergency browser restart
+  BROWSER_STABILIZE_DELAY: 1000,      // Browser stabilization after restart
+  CURL_HANDLER_DELAY: 3000,           // Wait for async curl operations
+  PROTOCOL_TIMEOUT: 180000,           // Chrome DevTools Protocol timeout
+  REDIRECT_JS_TIMEOUT: 5000           // JavaScript redirect detection timeout
 };
 
 const CACHE_LIMITS = {
@@ -129,7 +130,7 @@ const { navigateWithRedirectHandling, handleRedirectTimeout } = require('./lib/r
 const { monitorBrowserHealth, isBrowserHealthy, isQuicklyResponsive, performGroupWindowCleanup, performRealtimeWindowCleanup, trackPageForRealtime, updatePageUsage, cleanupPageBeforeReload } = require('./lib/browserhealth');
 
 // --- Script Configuration & Constants --- 
-const VERSION = '2.0.10'; // Script version
+const VERSION = '2.0.11'; // Script version
 
 // get startTime
 const startTime = Date.now();
@@ -3140,7 +3141,7 @@ function setupFrameHandling(page, forceDebug) {
         await performPageInteraction(page, currentUrl, interactionConfig, forceDebug);
       }
 
-      const delayMs = siteConfig.delay || 4000;
+      const delayMs = DEFAULT_DELAY;
       
       // Optimized delays for Puppeteer 23.x performance
       const isFastSite = timeout <= TIMEOUTS.FAST_SITE_THRESHOLD;
@@ -3309,7 +3310,7 @@ function setupFrameHandling(page, forceDebug) {
       // Only add delay if we're continuing with more reloads
       if (i < totalReloads) {
     // Reduce delay for problematic sites
-    const adjustedDelay = i > 1 ? Math.min(delayMs, 2000) : delayMs;
+    const adjustedDelay = i > 1 ? Math.min(DEFAULT_DELAY, 2000) : DEFAULT_DELAY;
     await fastTimeout(adjustedDelay);
       }
     }

package/package.json

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