@fanboynz/network-scanner 1.0.98 → 2.0.1

package/lib/browserhealth.js

@@ -7,8 +7,9 @@ const { formatLogMessage, messageColors } = require('./colorize');
 
 
 // Window cleanup delay constant
-const WINDOW_CLEANUP_DELAY_MS = 16000;
-const REALTIME_CLEANUP_BUFFER_MS = 3000; // Additional buffer time after site delay
+const WINDOW_CLEANUP_DELAY_MS = 15000;
+// window_clean REALTIME
+const REALTIME_CLEANUP_BUFFER_MS = 15000; // Additional buffer time after site delay. Delay increased to fix missing hits.
 const REALTIME_CLEANUP_THRESHOLD = 8; // Default number of pages to keep
 const REALTIME_CLEANUP_MIN_PAGES = 3; // Minimum pages before cleanup kicks in
 
@@ -18,7 +19,7 @@ let pageCreationCounter = 0;
 
 // Track page usage for realtime cleanup safety
 const pageUsageTracker = new Map(); // Maps page -> { lastActivity: timestamp, isProcessing: boolean }
-const PAGE_IDLE_THRESHOLD = 10000; // 10 seconds of inactivity before considering page safe to clean
+const PAGE_IDLE_THRESHOLD = 15000; // 15 seconds of inactivity before considering page safe to clean
 
 /**
  * Performs group-level window cleanup after all URLs in a site group complete
@@ -990,4 +991,4 @@ if (originalPageClose) {
     }
     return originalPageClose.apply(this, args);
   };
-}
+}

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.98 ===
+// === Network scanner script (nwss.js) v2.0.0 ===
 
 // 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.98'; // Script version
+const VERSION = '2.0.0'; // Script version
 
 // get startTime
 const startTime = Date.now();
@@ -1876,9 +1876,9 @@ function setupFrameHandling(page, forceDebug) {
    let curlUserAgent = '';
    if (useCurl && siteConfig.userAgent) {
      const userAgents = {
-       chrome: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
-       firefox: "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:133.0) Gecko/20100101 Firefox/133.0",
-       safari: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.2 Safari/605.1.15"
+       chrome: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) 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",
+       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()] || '';
    }

package/package.json

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