@fanboynz/network-scanner 2.0.29 → 2.0.30

package/lib/fingerprint.js

@@ -59,7 +59,7 @@ const PRECOMPILED_MOCKS = Object.freeze({
       postMessage: () => {},
       disconnect: () => {}
     }),
-    getManifest: () => Object.freeze({ name: "Chrome", version: "141.0.0.0" }),
+    getManifest: () => Object.freeze({ name: "Chrome", version: "142.0.0.0" }),
     getURL: (path) => `chrome-extension://invalid/${path}`,
     id: undefined
   }),
@@ -89,22 +89,15 @@ const BUILT_IN_PROPERTIES = new Set([
 ]);
 
 // User agent collections with latest versions
-const USER_AGENT_COLLECTIONS = {
-  chrome: [
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36",
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36",
-    "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36"
-  ],
-  firefox: [
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:144.0) Gecko/20100101 Firefox/144.0",
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:144.0) Gecko/20100101 Firefox/144.0",
-    "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:144.0) Gecko/20100101 Firefox/144.0"
-  ],
-  safari: [
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.6 Safari/605.1.15",
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.6 Safari/605.1.15"
-  ]
-};
+const USER_AGENT_COLLECTIONS = Object.freeze(new Map([
+  ['chrome', "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"],
+  ['chrome_mac', "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"],
+  ['chrome_linux', "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"],
+  ['firefox', "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:144.0) Gecko/20100101 Firefox/144.0"],
+  ['firefox_mac', "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:144.0) Gecko/20100101 Firefox/144.0"],
+  ['firefox_linux', "Mozilla/5.0 (X11; Linux x86_64; rv:144.0) Gecko/20100101 Firefox/144.0"],
+  ['safari', "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.6 Safari/605.1.15"]
+]));
 
 // Timezone configuration with offsets
 const TIMEZONE_CONFIG = {
@@ -366,8 +359,7 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
   // 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;
+  const ua = USER_AGENT_COLLECTIONS.get(siteConfig.userAgent.toLowerCase());
   
   if (ua) {
     await page.setUserAgent(ua);
@@ -512,7 +504,10 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
             'phantomjs', '_Selenium_IDE_Recorder', 'callSelenium', '_selenium',
             '__phantomas', '__selenium_evaluate', '__driver_unwrapped',
             'webdriver-evaluate', '__webdriverFunc', 'driver-evaluate', '__driver-evaluate', '__selenium-evaluate',
-            'spawn', 'emit', 'Buffer', 'domAutomation', 'domAutomationController'
+            'spawn', 'emit', 'Buffer', 'domAutomation', 'domAutomationController',
+            'cdc_adoQpoasnfa76pfcZLmcfl_JSON', 'cdc_adoQpoasnfa76pfcZLmcfl_Object',
+            'cdc_adoQpoasnfa76pfcZLmcfl_Proxy', 'cdc_adoQpoasnfa76pfcZLmcfl_Reflect',
+            '$cdc_asdjflasutopfhvcZLmcfl_', '$chrome_asyncScriptInfo', '__$webdriverAsyncExecutor'
           ];
           
           automationProps.forEach(prop => {
@@ -541,7 +536,7 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
                 }),
                 getManifest: () => ({ 
                   name: "Chrome", 
-                  version: "141.0.0.0",
+                  version: "142.0.0.0",
                   manifest_version: 3,
                   description: "Chrome Browser"
                 }),
@@ -1075,12 +1070,28 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
         // Font fingerprinting protection
         //
         safeExecute(() => {
-          // Standardize available fonts to common system fonts
-          const standardFonts = [
-            'Arial', 'Helvetica', 'Times New Roman', 'Times', 'Courier New', 'Courier',
-            'Verdana', 'Georgia', 'Palatino', 'Garamond', 'Bookman', 'Comic Sans MS',
-            'Trebuchet MS', 'Arial Black', 'Impact', 'Tahoma', 'Lucida Console'
-          ];
+          // OS-specific font profiles for better realism
+          const getOSFonts = (userAgent) => {
+            if (userAgent.includes('Windows') || userAgent.includes('Win')) {
+              return ['Arial', 'Times New Roman', 'Courier New', 'Verdana', 'Tahoma', 'Trebuchet MS', 'Georgia', 'Impact', 'Comic Sans MS', 'Segoe UI'];
+            } else if (userAgent.includes('Macintosh') || userAgent.includes('Mac OS X')) {
+              return ['Arial', 'Times New Roman', 'Courier New', 'Helvetica', 'Times', 'Courier', 'Verdana', 'Georgia', 'Palatino', 'San Francisco'];
+            } else {
+              return ['Arial', 'Times New Roman', 'Courier New', 'Liberation Sans', 'Liberation Serif', 'DejaVu Sans', 'Ubuntu'];
+            }
+          };
+          const standardFonts = getOSFonts(navigator.userAgent);
+          
+          // CRITICAL: Block font enumeration
+          if (document.fonts) {
+            Object.defineProperty(document.fonts, 'values', {
+              value: () => standardFonts.map(font => ({ family: font, style: 'normal', weight: '400' }))[Symbol.iterator]()
+            });
+            Object.defineProperty(document.fonts, 'forEach', {
+              value: (callback) => standardFonts.forEach((font, i) => callback({ family: font, style: 'normal', weight: '400' }, i))
+            });
+            Object.defineProperty(document.fonts, 'size', { get: () => standardFonts.length });
+          }
           
           // Intercept font availability detection
           if (document.fonts && document.fonts.check) {

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v2.0.28 ===
+// === Network scanner script (nwss.js) v2.0.29 ===
 
 // puppeteer for browser automation, fs for file system operations, psl for domain parsing.
 // const pLimit = require('p-limit'); // Will be dynamically imported
@@ -89,9 +89,9 @@ const CONCURRENCY_LIMITS = Object.freeze({
 
 // V8 Optimization: Use Map for user agent lookups instead of object
 const USER_AGENTS = Object.freeze(new Map([
-  ['chrome', "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36"],
-  ['chrome_mac', "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36"],
-  ['chrome_linux', "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36"],
+  ['chrome', "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"],
+  ['chrome_mac', "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"],
+  ['chrome_linux', "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"],
   ['firefox', "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:144.0) Gecko/20100101 Firefox/144.0"],
   ['firefox_mac', "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:144.0) Gecko/20100101 Firefox/144.0"],
   ['firefox_linux', "Mozilla/5.0 (X11; Linux x86_64; rv:144.0) Gecko/20100101 Firefox/144.0"],
@@ -143,7 +143,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.28'; // Script version
+const VERSION = '2.0.29'; // Script version
 
 // get startTime
 const startTime = Date.now();
@@ -1965,14 +1965,14 @@ function setupFrameHandling(page, forceDebug) {
           }
                     
           await page.setExtraHTTPHeaders({
-            'Sec-CH-UA': '"Chromium";v="141", "Not=A?Brand";v="24", "Google Chrome";v="141"',
+            'Sec-CH-UA': '"Chromium";v="142", "Not=A?Brand";v="24", "Google Chrome";v="142"',
             'Sec-CH-UA-Platform': `"${platform}"`,
             'Sec-CH-UA-Platform-Version': `"${platformVersion}"`,
             'Sec-CH-UA-Mobile': '?0',
             'Sec-CH-UA-Arch': `"${arch}"`,
             'Sec-CH-UA-Bitness': '"64"',
-            'Sec-CH-UA-Full-Version': '"141.0.7390.55"',
-            'Sec-CH-UA-Full-Version-List': '"Chromium";v="141.0.7390.55", "Not=A?Brand";v="24.0.0.0", "Google Chrome";v="141.0.7390.55"'
+            'Sec-CH-UA-Full-Version': '"142.0.7444,69"',
+            'Sec-CH-UA-Full-Version-List': '"Chromium";v="142.0.7444,69", "Not=A?Brand";v="24.0.0.0", "Google Chrome";v="142.0.7444,69"'
           });
         }
       } catch (fingerprintErr) {
@@ -3560,21 +3560,39 @@ function setupFrameHandling(page, forceDebug) {
     }
   }
 
-  // Hang detection for debugging concurrency issues
-  let currentBatchInfo = { batchStart: 0, batchSize: 0 };
-  const hangDetectionInterval = setInterval(() => {
-  // Only show hang detection messages in debug mode
-  if (forceDebug) {
-    const currentBatch = Math.floor(currentBatchInfo.batchStart / RESOURCE_CLEANUP_INTERVAL) + 1;
-    const totalBatches = Math.ceil(totalUrls / RESOURCE_CLEANUP_INTERVAL);
-    console.log(formatLogMessage('debug', `[HANG CHECK] Processed: ${processedUrlCount}/${totalUrls} URLs, Batch: ${currentBatch}/${totalBatches}, Current batch size: ${currentBatchInfo.batchSize}`));
-    console.log(formatLogMessage('debug', `[HANG CHECK] URLs since cleanup: ${urlsSinceLastCleanup}, Recent failures: ${results.slice(-3).filter(r => !r.success).length}/3`));
-    }
-  }, 30000); // Check every 30 seconds
+ // Enhanced hang detection with browser restart recovery
+ let currentBatchInfo = { batchStart: 0, batchSize: 0 };
+ let lastProcessedCount = 0;
+ let hangCheckCount = 0;
+ let forceRestartFlag = false; // Flag to trigger restart on next iteration
+ 
+ const hangDetectionInterval = setInterval(() => {
+   if (forceDebug) {
+     const currentBatch = Math.floor(currentBatchInfo.batchStart / RESOURCE_CLEANUP_INTERVAL) + 1;
+     const totalBatches = Math.ceil(totalUrls / RESOURCE_CLEANUP_INTERVAL);
+     console.log(formatLogMessage('debug', `[HANG CHECK] Processed: ${processedUrlCount}/${totalUrls} URLs, Batch: ${currentBatch}/${totalBatches}, Current batch size: ${currentBatchInfo.batchSize}`));
+     console.log(formatLogMessage('debug', `[HANG CHECK] URLs since cleanup: ${urlsSinceLastCleanup}, Recent failures: ${results.slice(-3).filter(r => !r.success).length}/3`));
+     
+     // Check progress and trigger browser restart if hung
+     if (processedUrlCount === lastProcessedCount) {
+       hangCheckCount++;
+       console.log(formatLogMessage('warn', `[HANG CHECK] No progress for ${hangCheckCount * 30}s`));
+       if (hangCheckCount >= 5) {
+         console.log(formatLogMessage('error', `[HANG CHECK] Hung for 2.5 minutes. Triggering emergency browser restart.`));
+         forceRestartFlag = true; // Set flag instead of exiting
+         hangCheckCount = 0; // Reset counter for next cycle
+       }
+     } else {
+       hangCheckCount = 0;
+     }
+     lastProcessedCount = processedUrlCount;
+   }
+ }, 30000);
 
-  // Process URLs in batches to maintain concurrency while allowing browser restarts
-  let siteGroupIndex = 0;
-  for (let batchStart = 0; batchStart < totalUrls; batchStart += RESOURCE_CLEANUP_INTERVAL) {
+ // Process URLs in batches with exception handling
+ let siteGroupIndex = 0;
+ try {
+   for (let batchStart = 0; batchStart < totalUrls; batchStart += RESOURCE_CLEANUP_INTERVAL) {
     const batchEnd = Math.min(batchStart + RESOURCE_CLEANUP_INTERVAL, totalUrls);
     const currentBatch = allTasks.slice(batchStart, batchEnd);
 
@@ -3603,14 +3621,22 @@ function setupFrameHandling(page, forceDebug) {
         hasCriticalErrors ||
         urlsSinceLastCleanup > RESOURCE_CLEANUP_INTERVAL * 0.9  // Very close to cleanup limit
     )) {
-      healthCheck = await monitorBrowserHealth(browser, {}, {
-        siteIndex: Math.floor(batchStart / RESOURCE_CLEANUP_INTERVAL),
-        totalSites: Math.ceil(totalUrls / RESOURCE_CLEANUP_INTERVAL),
-        urlsSinceCleanup: urlsSinceLastCleanup,
-        cleanupInterval: RESOURCE_CLEANUP_INTERVAL,
-        forceDebug,
-        silentMode
-      });
+     try {
+       healthCheck = await Promise.race([
+         monitorBrowserHealth(browser, {}, {
+           siteIndex: Math.floor(batchStart / RESOURCE_CLEANUP_INTERVAL),
+           totalSites: Math.ceil(totalUrls / RESOURCE_CLEANUP_INTERVAL),
+           urlsSinceCleanup: urlsSinceLastCleanup,
+           cleanupInterval: RESOURCE_CLEANUP_INTERVAL,
+           forceDebug,
+           silentMode
+         }),
+         new Promise((_, reject) => setTimeout(() => reject(new Error('Health check timeout')), 30000))
+       ]);
+     } catch (healthError) {
+       console.log(formatLogMessage('warn', `[HEALTH CHECK] Timeout, assuming restart needed`));
+       healthCheck = { shouldRestart: true, reason: 'Health check timeout' };
+     }
     } else if (forceDebug && urlsSinceLastCleanup > 10) {
       console.log(formatLogMessage('debug', `Skipping health check: failure rate ${Math.round(recentFailureRate * 100)}%, critical errors: ${hasCriticalErrors ? 'yes' : 'no'}`));
     }
@@ -3628,11 +3654,13 @@ function setupFrameHandling(page, forceDebug) {
       !healthCheck.reason?.includes('Scheduled cleanup') && 
       (healthCheck.reason?.includes('Critical') || healthCheck.reason?.includes('disconnected'));
     
-    // Restart browser if we've processed enough URLs, health check suggests it, and this isn't the last site
-    if ((wouldExceedLimit || shouldRestartFromHealth || (hasHighFailureRate && recentResults.length >= 6)) && urlsSinceLastCleanup > 8 && isNotLastBatch) {
-      
+    // Restart browser if we've processed enough URLs, health check suggests it, hang detected, and this isn't the last site
+    if ((wouldExceedLimit || shouldRestartFromHealth || forceRestartFlag || (hasHighFailureRate && recentResults.length >= 6)) && urlsSinceLastCleanup > 8 && isNotLastBatch) {      
       let restartReason = 'Unknown';
-      if (shouldRestartFromHealth) {
+      if (forceRestartFlag) {
+        restartReason = 'Emergency restart due to 2.5-minute hang detection';
+        forceRestartFlag = false; // Reset the flag
+      } else if (shouldRestartFromHealth) {
         restartReason = healthCheck.reason;
       } else if (hasHighFailureRate) {
         restartReason = `High failure rate: ${Math.round(recentFailureRate * 100)}% in recent batch`;
@@ -3701,9 +3729,34 @@ function setupFrameHandling(page, forceDebug) {
       console.log(formatLogMessage('debug', `[CONCURRENCY] Starting ${batchSize} concurrent tasks with limit ${MAX_CONCURRENT_SITES}`));
     }
     
-    // Create tasks with current browser instance and process them with TRUE concurrency
-    const batchTasks = currentBatch.map(task => originalLimit(() => processUrl(task.url, task.config, browser)));
-    const batchResults = await Promise.all(batchTasks);
+ // Create tasks with timeout protection
+ const batchTasks = currentBatch.map(task => originalLimit(() => processUrl(task.url, task.config, browser)));
+ 
+ let batchResults;
+ try {
+   batchResults = await Promise.race([
+     Promise.all(batchTasks),
+     new Promise((_, reject) => 
+       setTimeout(() => reject(new Error('Batch timeout')), 600000) // 10 min timeout
+     )
+   ]);
+ } catch (timeoutError) {
+   if (timeoutError.message.includes('timeout')) {
+     console.log(formatLogMessage('error', `[TIMEOUT] Batch hung. Restarting browser.`));
+     try {
+       await handleBrowserExit(browser, { forceDebug, timeout: 5000, exitOnFailure: false });
+       browser = await createBrowser();
+       urlsSinceLastCleanup = 0;
+     } catch (restartErr) {
+       throw restartErr;
+     }
+     batchResults = currentBatch.map(task => ({
+       success: false, error: 'Batch timeout', needsImmediateRestart: true, url: task.url
+     }));
+   } else {
+     throw timeoutError;
+   }
+ }
 
     // IMPROVED: Much more conservative emergency restart logic
     const criticalRestartCount = batchResults.filter(r => r.needsImmediateRestart).length;
@@ -3817,6 +3870,26 @@ function setupFrameHandling(page, forceDebug) {
         if (forceDebug) console.log(formatLogMessage('debug', `Emergency restart failed: ${emergencyRestartErr.message}`));
       }
     }
+    // Handle hang detection flag if it's still set (e.g., on last batch where normal restart wouldn't trigger)
+    if (forceRestartFlag && batchEnd < totalUrls) {
+      console.log(`\n${messageColors.fileOp('🔄 Emergency hang detection restart:')} Browser appears hung, forcing restart`);
+      try {
+        await handleBrowserExit(browser, { forceDebug, timeout: 5000, exitOnFailure: false, cleanTempFiles: true });
+        browser = await createBrowser();
+        urlsSinceLastCleanup = 0;
+        forceRestartFlag = false; // Reset flag
+        await fastTimeout(TIMEOUTS.EMERGENCY_RESTART_DELAY);
+        if (forceDebug) console.log(formatLogMessage('debug', `Emergency hang detection restart completed`));
+      } catch (hangRestartErr) {
+        if (forceDebug) console.log(formatLogMessage('debug', `Hang detection restart failed: ${hangRestartErr.message}`));
+        // Continue anyway - better to try processing remaining URLs than exit
+      }
+    }
+  }
+ } catch (processingError) {
+   console.log(formatLogMessage('error', `Critical error: ${processingError.message}`));
+   clearInterval(hangDetectionInterval);
+   throw processingError;
   }
 
   // Clear hang detection interval

package/package.json

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