@fanboynz/network-scanner 2.0.12 → 2.0.14

package/lib/fingerprint.js

@@ -399,6 +399,10 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
           const automationProps = [
             'callPhantom', '_phantom', '__nightmare', '_selenium', '__selenium_unwrapped',
             '__webdriver_evaluate', '__driver_evaluate', '__webdriver_script_function',
+            '__fxdriver_evaluate', '__fxdriver_unwrapped', '__webdriver_script_fn',
+            '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'
           ];
           
@@ -449,15 +453,38 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
           let plugins = [];
           if (userAgent.includes('Chrome')) {
             plugins = [
-              { name: 'Chrome PDF Plugin', description: 'Portable Document Format', filename: 'internal-pdf-viewer' },
-              { name: 'Chrome PDF Viewer', description: 'PDF Viewer', filename: 'mhjfbmdgcfjbbpaeojofohoefgiehjai' }
+              { 
+                name: 'Chrome PDF Plugin', 
+                description: 'Portable Document Format', 
+                filename: 'internal-pdf-viewer',
+                length: 1,
+                version: ''
+              },
+              { 
+                name: 'Chrome PDF Viewer', 
+                description: '', 
+                filename: 'mhjfbmdgcfjbbpaeojofohoefgiehjai',
+                length: 1,
+                version: ''
+              }
             ];
           } else if (userAgent.includes('Firefox')) {
             plugins = [
-              { name: 'PDF.js', description: 'Portable Document Format', filename: 'internal-pdf-js' }
+              { 
+                name: 'PDF.js', 
+                description: 'Portable Document Format', 
+                filename: 'internal-pdf-js',
+                length: 2,
+                version: '5.4.70'
+              }
             ];
+          } else if (userAgent.includes('Safari')) {
+            // Safari typically has no plugins in modern versions
+            plugins = [];
           }
-          safeDefinePropertyLocal(navigator, 'plugins', { get: () => plugins });
+          // Create array-like object with length property
+          const pluginsArray = Object.assign(plugins, { length: plugins.length });
+          safeDefinePropertyLocal(navigator, 'plugins', { get: () => pluginsArray });
         }, 'plugins spoofing');
 
         // Spoof languages
@@ -482,6 +509,69 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
           safeDefinePropertyLocal(navigator, 'product', { get: () => product });
         }, 'vendor/product spoofing');
 
+        // Enhanced OS fingerprinting protection based on actual user agent content
+        safeExecute(() => {
+          let osType = 'windows';
+          let browserType = 'chrome';
+          
+          // Detect OS from user agent string patterns
+          if (userAgent.includes('Macintosh') || userAgent.includes('Mac OS X')) {
+            osType = 'mac';
+          } else if (userAgent.includes('X11; Linux') || userAgent.includes('Ubuntu')) {
+            osType = 'linux';
+          } else if (userAgent.includes('Windows NT')) {
+            osType = 'windows';
+          }
+          
+          // Detect browser type
+          if (userAgent.includes('Firefox/')) {
+            browserType = 'firefox';
+          } else if (userAgent.includes('Safari/') && !userAgent.includes('Chrome/')) {
+            browserType = 'safari';
+          }
+          
+          // Apply OS-specific navigator properties
+          if (osType === 'windows') {
+            if (browserType === 'firefox') {
+              safeDefinePropertyLocal(navigator, 'oscpu', { get: () => 'Windows NT 10.0; Win64; x64' });
+              safeDefinePropertyLocal(navigator, 'buildID', { get: () => '20100101' });
+            }
+            if (window.screen) {
+              safeDefinePropertyLocal(window.screen, 'fontSmoothingEnabled', { get: () => true });
+            }
+          } else if (osType === 'mac') {
+            if (browserType === 'firefox') {
+              safeDefinePropertyLocal(navigator, 'oscpu', { get: () => 'Intel Mac OS X 10.15' });
+              safeDefinePropertyLocal(navigator, 'buildID', { get: () => '20100101' });
+            }
+          } else if (osType === 'linux') {
+            if (browserType === 'firefox') {
+              safeDefinePropertyLocal(navigator, 'oscpu', { get: () => 'Linux x86_64' });
+              safeDefinePropertyLocal(navigator, 'buildID', { get: () => '20100101' });
+            }
+          }
+        }, 'enhanced OS fingerprinting protection');
+
+        // Screen resolution fingerprinting protection
+        safeExecute(() => {
+          // Common realistic resolutions to avoid fingerprinting
+          const commonResolutions = [
+            { width: 1920, height: 1080 },
+            { width: 2560, height: 1440 },
+            { width: 3840, height: 2160 },
+            { width: 1280, height: 720 },
+            { width: 1366, height: 768 },
+            { width: 1440, height: 900 },
+            { width: 1536, height: 864 }
+          ];
+          const resolution = commonResolutions[Math.floor(Math.random() * commonResolutions.length)];
+          
+          safeDefinePropertyLocal(window.screen, 'width', { get: () => resolution.width });
+          safeDefinePropertyLocal(window.screen, 'height', { get: () => resolution.height });
+          safeDefinePropertyLocal(window.screen, 'availWidth', { get: () => resolution.width });
+          safeDefinePropertyLocal(window.screen, 'availHeight', { get: () => resolution.height - 40 });
+        }, 'screen resolution protection');
+
         // Spoof MIME types
         safeExecute(() => {
           let mimeTypes = [];
@@ -567,6 +657,134 @@ async function applyUserAgentSpoofing(page, siteConfig, forceDebug, currentUrl)
           }
         }, 'WebGL spoofing');
 
+        // Permissions API spoofing
+        safeExecute(() => {
+          if (navigator.permissions?.query) {
+            const originalQuery = navigator.permissions.query;
+            navigator.permissions.query = function(descriptor) {
+              return Promise.resolve({ state: Math.random() > 0.5 ? 'granted' : 'prompt' });
+            };
+          }
+        }, 'permissions API spoofing');
+
+        // Media Device Spoofing
+        safeExecute(() => {
+          if (navigator.mediaDevices?.enumerateDevices) {
+            navigator.mediaDevices.enumerateDevices = function() {
+              return Promise.resolve([
+                { deviceId: 'default', kind: 'audioinput', label: 'Default - Microphone (Realtek Audio)', groupId: 'group1' },
+                { deviceId: 'default', kind: 'audiooutput', label: 'Default - Speakers (Realtek Audio)', groupId: 'group1' },
+                { deviceId: 'default', kind: 'videoinput', label: 'HD WebCam (USB Camera)', groupId: 'group2' }
+              ]);
+            };
+          }
+        }, 'media device spoofing');
+        
+        // Fetch Request Headers Normalization
+        safeExecute(() => {
+          const originalFetch = window.fetch;
+          window.fetch = function(url, options = {}) {
+            const headers = { ...(options.headers || {}) };
+            
+            // Add common browser headers if missing
+            if (!headers['Accept']) {
+              headers['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8';
+            }
+            if (!headers['Accept-Language']) {
+              headers['Accept-Language'] = 'en-US,en;q=0.5';
+            }
+            if (!headers['Accept-Encoding']) {
+              headers['Accept-Encoding'] = 'gzip, deflate, br';
+            }
+            
+            return originalFetch.call(this, url, { ...options, headers });
+          };
+        }, 'fetch headers normalization');
+        
+        // Image Loading Pattern Obfuscation
+        safeExecute(() => {
+          const originalImageSrc = Object.getOwnPropertyDescriptor(HTMLImageElement.prototype, 'src');
+          if (originalImageSrc) {
+            Object.defineProperty(HTMLImageElement.prototype, 'src', {
+              set: function(value) {
+                // Add random delay to image loading (0-50ms)
+                setTimeout(() => {
+                  originalImageSrc.set.call(this, value);
+                }, Math.random() * 50);
+              },
+              get: originalImageSrc.get,
+              configurable: true
+            });
+          }
+        }, 'image loading obfuscation');
+
+        // CSS Media Query Spoofing
+        safeExecute(() => {
+          const originalMatchMedia = window.matchMedia;
+          window.matchMedia = function(query) {
+            const result = originalMatchMedia.call(this, query);
+            // Add slight randomization to avoid fingerprinting for device queries
+            if (query.includes('device-width') || query.includes('device-height') || 
+                query.includes('aspect-ratio') || query.includes('color-gamut')) {
+              Object.defineProperty(result, 'matches', {
+                get: () => Math.random() > 0.1 ? originalMatchMedia.call(window, query).matches : !originalMatchMedia.call(window, query).matches,
+                configurable: true
+              });
+            }
+            return result;
+          };
+        }, 'CSS media query spoofing');
+
+        // Enhanced WebRTC Spoofing
+        safeExecute(() => {
+          if (window.RTCPeerConnection) {
+            const OriginalRTC = window.RTCPeerConnection;
+            window.RTCPeerConnection = function(...args) {
+              const pc = new OriginalRTC(...args);
+              const originalCreateOffer = pc.createOffer;
+              pc.createOffer = function() {
+                return Promise.reject(new Error('WebRTC disabled'));
+              };
+              return pc;
+            };
+            Object.setPrototypeOf(window.RTCPeerConnection, OriginalRTC);
+          }
+        }, 'WebRTC spoofing');
+
+        // 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'
+          ];
+          
+          // Override font detection methods
+          const originalOffsetWidth = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'offsetWidth');
+          const originalOffsetHeight = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'offsetHeight');
+          
+          if (originalOffsetWidth && originalOffsetHeight) {
+            Object.defineProperty(HTMLElement.prototype, 'offsetWidth', {
+              get: function() {
+                if (this.style && this.style.fontFamily) {
+                  return Math.floor(originalOffsetWidth.get.call(this) + (Math.random() - 0.5) * 2);
+                }
+                return originalOffsetWidth.get.call(this);
+              },
+              configurable: true
+            });
+          }
+        }, 'font fingerprinting protection');
+
+        // Performance timing obfuscation
+        safeExecute(() => {
+          const originalNow = performance.now;
+          performance.now = function() {
+            return originalNow.call(this) + (Math.random() - 0.5) * 2; // +/- 1ms variation
+          };
+        }, 'performance timing obfuscation');
+
         // Canvas fingerprinting protection
         safeExecute(() => {
           const originalToDataURL = HTMLCanvasElement.prototype.toDataURL;
@@ -811,6 +1029,17 @@ async function applyFingerprintProtection(page, siteConfig, forceDebug, currentU
       // Memory spoofing
       safeDefinePropertyLocal(navigator, 'deviceMemory', { get: () => spoof.deviceMemory });
       safeDefinePropertyLocal(navigator, 'hardwareConcurrency', { get: () => spoof.hardwareConcurrency });
+
+      // Connection type spoofing
+      safeDefinePropertyLocal(navigator, 'connection', {
+        get: () => ({
+          effectiveType: ['slow-2g', '2g', '3g', '4g'][Math.floor(Math.random() * 4)],
+          type: Math.random() > 0.5 ? 'cellular' : 'wifi',
+          saveData: Math.random() > 0.8,
+          downlink: 1.5 + Math.random() * 8,
+          rtt: 50 + Math.random() * 200
+        })
+      });
       
       // Screen properties spoofing
       ['width', 'height', 'availWidth', 'availHeight', 'colorDepth', 'pixelDepth'].forEach(prop => {

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v2.0.12 ===
+// === Network scanner script (nwss.js) v2.0.14 ===
 
 // puppeteer for browser automation, fs for file system operations, psl for domain parsing.
 // const pLimit = require('p-limit'); // Will be dynamically imported
@@ -130,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.12'; // Script version
+const VERSION = '2.0.14'; // Script version
 
 // get startTime
 const startTime = Date.now();
@@ -2025,9 +2025,9 @@ function setupFrameHandling(page, forceDebug) {
        chrome: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.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/140.0.0.0 Safari/537.36",
        chrome_linux: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36",
-       firefox: "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:142.0) Gecko/20100101 Firefox/142.0",
-       firefox_mac: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:142.0) Gecko/20100101 Firefox/142.0",
-       firefox_linux: "Mozilla/5.0 (X11; Linux x86_64; rv:142.0) Gecko/20100101 Firefox/142.0",
+       firefox: "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:142.0) Gecko/20100101 Firefox/143.0",
+       firefox_mac: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:142.0) Gecko/20100101 Firefox/143.0",
+       firefox_linux: "Mozilla/5.0 (X11; Linux x86_64; rv:142.0) Gecko/20100101 Firefox/143.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"
      };
      curlUserAgent = userAgents[siteConfig.userAgent.toLowerCase()] || '';
@@ -3278,11 +3278,20 @@ function setupFrameHandling(page, forceDebug) {
             
           if (forceDebug) console.log(formatLogMessage('debug', `Standard reload #${i} completed for ${currentUrl}`));
         } catch (standardReloadErr) {
-            // Only warn for non-timeout errors
-            if (!standardReloadErr.message.includes('timeout')) {
+            // Categorize errors into expected vs unexpected
+            const isExpectedError = standardReloadErr.message.includes('timeout') ||
+                                   standardReloadErr.message.includes('detached Frame') ||
+                                   standardReloadErr.message.includes('Attempted to use detached') ||
+                                   standardReloadErr.message.includes('Navigating frame was detached') ||
+                                   standardReloadErr.message.includes('document invalid') ||
+                                   standardReloadErr.message.includes('Page document invalid');
+            
+            if (!isExpectedError) {
+              // Only warn for truly unexpected errors
               console.warn(messageColors.warn(`[standard reload #${i} failed] ${currentUrl}: ${standardReloadErr.message}`));
             } else if (forceDebug) {
-              console.log(formatLogMessage('debug', `Reload #${i} timed out for ${currentUrl}, continuing anyway`));
+              // Expected errors only shown in debug mode
+              console.log(formatLogMessage('debug', `[reload #${i}] Expected error for ${currentUrl}: ${standardReloadErr.message}`));
             }
           
           // Check if this is a persistent failure that should skip remaining reloads
@@ -3993,4 +4002,4 @@ function setupFrameHandling(page, forceDebug) {
   if (forceDebug) console.log(formatLogMessage('debug', `About to exit process...`));
   process.exit(0);
   
-})();
+})();

package/package.json

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