@fanboynz/network-scanner 2.0.17 → 2.0.19

package/lib/nettools.js

@@ -418,15 +418,17 @@ async function whoisLookupWithRetry(domain, timeout = 10000, whoisServer = null,
     
     // Add delay between retry attempts to prevent rate limiting
     if (attemptCount > 1) {
-      if (debugMode) {
-        if (logFunc) {
-          logFunc(`${messageColors.highlight('[whois-retry]')} Adding ${whoisDelay}ms delay before retry attempt...`);
-        } else {
-          console.log(formatLogMessage('debug', `${messageColors.highlight('[whois-retry]')} Adding ${whoisDelay}ms delay before retry attempt...`));
+      if (whoisDelay > 0) {
+        if (debugMode) {
+          if (logFunc) {
+            logFunc(`${messageColors.highlight('[whois-retry]')} Adding ${whoisDelay}ms delay before retry attempt...`);
+          } else {
+            console.log(formatLogMessage('debug', `${messageColors.highlight('[whois-retry]')} Adding ${whoisDelay}ms delay before retry attempt...`));
+          }
         }
+        await new Promise(resolve => setTimeout(resolve, whoisDelay));
       }
       
-      await new Promise(resolve => setTimeout(resolve, whoisDelay));
     } else if (whoisDelay > 0) {
       // Add initial delay on first attempt if configured
       if (debugMode) {
@@ -437,6 +439,13 @@ async function whoisLookupWithRetry(domain, timeout = 10000, whoisServer = null,
         }
       }
       await new Promise(resolve => setTimeout(resolve, whoisDelay));
+    } else if (debugMode) {
+      // Log when delay is skipped due to whoisDelay being 0
+      if (logFunc) {
+        logFunc(`${messageColors.highlight('[whois-retry]')} Skipping delay (whoisDelay: ${whoisDelay}ms)`);
+      } else {
+        console.log(formatLogMessage('debug', `${messageColors.highlight('[whois-retry]')} Skipping delay (whoisDelay: ${whoisDelay}ms)`));
+      }
    }
     
     try {

package/lib/output.js

@@ -338,8 +338,8 @@ function removeDuplicates(lines) {
 function buildOutputLines(results, options = {}) {
   const { showTitles = false, removeDupes = false, ignoreDomains = [], forLogFile = false } = options;
   
-  // Filter and collect successful results with rules
-  const finalSiteRules = [];
+  // Consolidate rules from all results, handling multiple results for same URL
+  const consolidatedRules = new Map(); // URL -> Set of rules
   let successfulPageLoads = 0;
   
   results.forEach(result => {
@@ -348,10 +348,29 @@ function buildOutputLines(results, options = {}) {
         successfulPageLoads++;
       }
       if (result.rules && result.rules.length > 0) {
-        finalSiteRules.push({ url: result.url, rules: result.rules });
+        // Consolidate rules by URL to handle multiple site entries for same URL
+        if (!consolidatedRules.has(result.url)) {
+          consolidatedRules.set(result.url, new Set());
+        }
+        
+        // Add all rules from this result to the consolidated set
+        result.rules.forEach(rule => {
+          consolidatedRules.get(result.url).add(rule);
+        });
       }
     }
   });
+
+  // Convert consolidated rules back to array format
+  const finalSiteRules = [];
+  consolidatedRules.forEach((rulesSet, url) => {
+    if (rulesSet.size > 0) {
+      finalSiteRules.push({ 
+        url: url, 
+        rules: Array.from(rulesSet) 
+      });
+    }
+  });
   
   // Build output lines
   const outputLines = [];

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v2.0.17 ===
+// === Network scanner script (nwss.js) v2.0.19 ===
 
 // 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.17'; // Script version
+const VERSION = '2.0.19'; // Script version
 
 // get startTime
 const startTime = Date.now();
@@ -2555,7 +2555,7 @@ function setupFrameHandling(page, forceDebug) {
               const netToolsHandler = createNetToolsHandler({
                 whoisTerms,
                 whoisOrTerms,
-                whoisDelay: siteConfig.whois_delay || whois_delay,
+                whoisDelay: siteConfig.whois_delay !== undefined ? siteConfig.whois_delay : whois_delay,
                 whoisServer,
                 whoisServerMode: siteConfig.whois_server_mode || whois_server_mode,
                 debugLogFile,
@@ -2662,7 +2662,7 @@ function setupFrameHandling(page, forceDebug) {
              const netToolsHandler = createNetToolsHandler({
                whoisTerms,
                whoisOrTerms,
-               whoisDelay: siteConfig.whois_delay || whois_delay, // Site-specific or global fallback
+               whoisDelay: siteConfig.whois_delay !== undefined ? siteConfig.whois_delay : whois_delay, // Site-specific or global fallback
 	       whoisServer, // Pass whois server configuration
                whoisServerMode: siteConfig.whois_server_mode || whois_server_mode,
                debugLogFile, // Pass debug log file for whois error logging

package/package.json

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