@fanboynz/network-scanner 2.0.3 → 2.0.4

package/lib/cloudflare.js

@@ -1,5 +1,6 @@
 /**
  * Cloudflare bypass and challenge handling module - Optimized with smart detection and adaptive timeouts
+ * Version: 2.6.1 - timeoutId is not defined & race condition fix
  * Version: 2.6.0 - Memory leak fixes and timeout cleanup
  * Version: 2.5.0 - Fix Frame Lifecycle issue, Timing and Race condition
  * Version: 2.4.1 - Bump timeout values
@@ -17,7 +18,7 @@ const { formatLogMessage } = require('./colorize');
 /**
  * Module version information
  */
-const CLOUDFLARE_MODULE_VERSION = '2.6.0';
+const CLOUDFLARE_MODULE_VERSION = '2.6.1';
 
 /**
  * Timeout constants for various operations (in milliseconds)
@@ -319,21 +320,23 @@ async function safePageEvaluate(page, func, timeout = TIMEOUTS.PAGE_EVALUATION_S
   let lastError = null;
   
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    let timeoutId = null;
+    
     try {
-      // Validate page/frame state before evaluation
+      // Validate page 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');
-      }
 
-      let timeoutId = null;
       const result = await Promise.race([
-        page.evaluate(func),
+        page.evaluate(() => {
+          // Validate execution context inside evaluation to prevent race
+          if (typeof window === 'undefined' || !document) {
+            throw new Error('Execution context invalid');
+          }
+          return (func)();
+        }),
         new Promise((_, reject) => {
           timeoutId = setTimeout(() => reject(new Error('Page evaluation timeout')), timeout);
         })
@@ -342,7 +345,6 @@ async function safePageEvaluate(page, func, timeout = TIMEOUTS.PAGE_EVALUATION_S
       // Clear timeout if evaluation completed first 
       if (timeoutId) {
         clearTimeout(timeoutId);
-        timeoutId = null;
       }
       
       if (forceDebug && attempt > 1) {
@@ -354,7 +356,6 @@ async function safePageEvaluate(page, func, timeout = TIMEOUTS.PAGE_EVALUATION_S
       // Ensure timeout is cleared on any error
       if (timeoutId) {
         clearTimeout(timeoutId);
-        timeoutId = null;
       }
 
       lastError = error;
@@ -427,8 +428,7 @@ async function safeClick(page, selector, timeout = TIMEOUTS.CLICK_TIMEOUT) {
     return await Promise.race([
       page.click(selector, { timeout: timeout }),
       new Promise((_, reject) => {
-        const timerId = setTimeout(() => reject(new Error('Click timeout')), timeout + TIMEOUTS.CLICK_TIMEOUT_BUFFER);
-        // Timer will be cleared when promise resolves/rejects
+        setTimeout(() => reject(new Error('Click timeout')), timeout + TIMEOUTS.CLICK_TIMEOUT_BUFFER);
       })
     ]);
   } catch (error) {
@@ -444,8 +444,7 @@ async function safeWaitForNavigation(page, timeout = TIMEOUTS.NAVIGATION_TIMEOUT
     return await Promise.race([
       page.waitForNavigation({ waitUntil: 'domcontentloaded', timeout: timeout }),
       new Promise((_, reject) => {
-        const timerId = setTimeout(() => reject(new Error('Navigation timeout')), timeout + TIMEOUTS.NAVIGATION_TIMEOUT_BUFFER);
-        // Timer will be cleared when promise resolves/rejects
+        setTimeout(() => reject(new Error('Navigation timeout')), timeout + TIMEOUTS.NAVIGATION_TIMEOUT_BUFFER);
       })
     ]);
   } catch (error) {
@@ -963,13 +962,14 @@ async function attemptChallengeSolveWithTimeout(page, currentUrl, challengeInfo,
   const result = {
     success: false,
     error: null,
-    method: null,
-    _timeoutId: null
+    method: null
   };
+  
+  let timeoutId = null;
 
   try {
     const timeoutPromise = new Promise((_, reject) => {
-      result._timeoutId = setTimeout(() => reject(new Error('Challenge solving timeout')), FAST_TIMEOUTS.CHALLENGE_SOLVING);
+      timeoutId = setTimeout(() => reject(new Error('Challenge solving timeout')), FAST_TIMEOUTS.CHALLENGE_SOLVING);
     });
     // Reduced timeout for challenge solving
     const finalResult = await Promise.race([
@@ -977,15 +977,15 @@ async function attemptChallengeSolveWithTimeout(page, currentUrl, challengeInfo,
       timeoutPromise
     ]);
     // Clear timeout if operation completed first
-    if (result._timeoutId) {
-      clearTimeout(result._timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
     }
     return finalResult;
 
   } catch (error) {
     // Clear timeout on error
-    if (result._timeoutId) {
-      clearTimeout(result._timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
     }
     result.error = `Challenge solving timed out: ${error.message}`;
     if (forceDebug) console.log(formatLogMessage('cloudflare', `Challenge solving timeout for ${currentUrl}`));
@@ -1205,15 +1205,16 @@ async function handleEmbeddedIframeChallenge(page, forceDebug = false) {
 async function waitForJSChallengeCompletion(page, forceDebug = false) {
   const result = {
     success: false,
-    error: null,
-    _timeoutId: null
+    error: null
   };
 
+  let timeoutId = null;
+
   try {
     if (forceDebug) console.log(formatLogMessage('cloudflare', `Waiting for JS challenge completion`));
 
     const timeoutPromise = new Promise((_, reject) => {
-      result._timeoutId = setTimeout(() => reject(new Error('JS challenge timeout')), TIMEOUTS.JS_CHALLENGE_BUFFER);
+      timeoutId = setTimeout(() => reject(new Error('JS challenge timeout')), TIMEOUTS.JS_CHALLENGE_BUFFER);
     });
     
     // Reduced timeout for JS challenge completion
@@ -1231,16 +1232,16 @@ async function waitForJSChallengeCompletion(page, forceDebug = false) {
     ]);
 
     // Clear timeout if completion detected first
-    if (result._timeoutId) {
-      clearTimeout(result._timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
     }
     
     result.success = true;
     if (forceDebug) console.log(formatLogMessage('cloudflare', `JS challenge completed automatically`));
   } catch (error) {
     // Clear timeout on error
-    if (result._timeoutId) {
-      clearTimeout(result._timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
     }
 
     result.error = `JS challenge timeout: ${error.message}`;
@@ -1844,4 +1845,4 @@ module.exports = {
   detectChallengeLoop,
   // Memory management
   cleanup
-};
+};

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v2.0.3 ===
+// === Network scanner script (nwss.js) v2.0.4 ===
 
 // 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 = '2.0.3'; // Script version
+const VERSION = '2.0.4'; // Script version
 
 // get startTime
 const startTime = Date.now();

package/package.json

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