@fanboynz/network-scanner 1.0.40 → 1.0.41

package/lib/nettools.js

@@ -725,8 +725,9 @@ function createNetToolsHandler(config) {
   const hasDig = digTerms && Array.isArray(digTerms) && digTerms.length > 0;
   const hasDigOr = digOrTerms && Array.isArray(digOrTerms) && digOrTerms.length > 0;
   
-  // Add deduplication cache for nettools lookups
-  const processedDomains = new Set();
+  // Add separate deduplication caches for different lookup types
+  const processedWhoisDomains = new Set();
+  const processedDigDomains = new Set();
   
   
   return async function handleNetToolsCheck(domain, originalDomain) {
@@ -761,18 +762,25 @@ function createNetToolsHandler(config) {
       }
     }
     
-    // Skip if we've already processed this domain
-    if (processedDomains.has(domain)) {
+    // Determine which domain will be used for dig lookup
+    const digDomain = digSubdomain && originalDomain ? originalDomain : domain;
+    
+    // Check if we need to perform any lookups
+    const needsWhoisLookup = (hasWhois || hasWhoisOr) && !processedWhoisDomains.has(domain);
+    const needsDigLookup = (hasDig || hasDigOr) && !processedDigDomains.has(digDomain);
+    
+    // Skip if we don't need to perform any lookups
+    if (!needsWhoisLookup && !needsDigLookup) {
       if (forceDebug) {
-        logToConsoleAndFile(`${messageColors.highlight('[nettools]')} Skipping duplicate lookup for ${domain}`);
+        logToConsoleAndFile(`${messageColors.highlight('[nettools]')} Skipping duplicate lookups for ${domain} (whois: ${!needsWhoisLookup}, dig: ${!needsDigLookup})`);
       }
       return;
     }
     
-    // Mark domain as being processed
-    processedDomains.add(domain);
+
     if (forceDebug) {
-      logToConsoleAndFile(`${messageColors.highlight('[nettools]')} Processing new domain: ${domain} (${processedDomains.size} total processed)`);
+      const totalProcessed = processedWhoisDomains.size + processedDigDomains.size;
+      logToConsoleAndFile(`${messageColors.highlight('[nettools]')} Processing domain: ${domain} (whois: ${needsWhoisLookup}, dig: ${needsDigLookup}) (${totalProcessed} total processed)`);
     }
 
       // Log site-specific whois delay if different from default
@@ -816,6 +824,7 @@ function createNetToolsHandler(config) {
         logToConsoleAndFile(`${messageColors.highlight('[nettools]')} digSubdomain setting: ${digSubdomain}`);
         logToConsoleAndFile(`${messageColors.highlight('[nettools]')} domain parameter: ${domain}`);
         logToConsoleAndFile(`${messageColors.highlight('[nettools]')} originalDomain parameter: ${originalDomain}`);
+        logToConsoleAndFile(`${messageColors.highlight('[nettools]')} Final digDomain will be: ${digDomain}`);
         if (whoisServer) {
           const serverInfo = Array.isArray(whoisServer) 
             ? `randomized from [${whoisServer.join(', ')}]` 
@@ -824,13 +833,6 @@ function createNetToolsHandler(config) {
         }
       }
       
-      // Determine which domain to use for dig lookup
-      const digDomain = digSubdomain && originalDomain ? originalDomain : domain;
-      
-      if (forceDebug) {
-        logToConsoleAndFile(`${messageColors.highlight('[nettools]')} Final digDomain will be: ${digDomain}`);
-      }
-      
       // Enhanced dry run logging
       if (dryRunCallback && forceDebug) {
         logToConsoleAndFile(`${messageColors.highlight('[nettools-dryrun]')} Processing ${domain} (original: ${originalDomain})`);
@@ -863,7 +865,10 @@ function createNetToolsHandler(config) {
       }
       
       // Perform whois lookup if either whois or whois-or is configured
-      if (hasWhois || hasWhoisOr) {
+      if (needsWhoisLookup) {
+        // Mark whois domain as being processed
+        processedWhoisDomains.add(domain);
+        
         const selectedServer = selectWhoisServer(whoisServer, whoisServerMode);
         
         if (forceDebug) {
@@ -1014,7 +1019,10 @@ function createNetToolsHandler(config) {
       }
       
       // Perform dig lookup if configured
-      if (hasDig || hasDigOr) {
+      if (needsDigLookup) {
+        // Mark dig domain as being processed
+        processedDigDomains.add(digDomain);
+        
         if (forceDebug) {
           const digTypes = [];
           if (hasDig) digTypes.push('dig-and');

package/nwss.js

@@ -1,4 +1,4 @@
-// === Network scanner script (nwss.js) v1.0.40 ===
+// === Network scanner script (nwss.js) v1.0.41 ===
 
 // puppeteer for browser automation, fs for file system operations, psl for domain parsing.
 // const pLimit = require('p-limit'); // Will be dynamically imported
@@ -33,7 +33,7 @@ const { navigateWithRedirectHandling, handleRedirectTimeout } = require('./lib/r
 const { monitorBrowserHealth, isBrowserHealthy } = require('./lib/browserhealth');
 
 // --- Script Configuration & Constants ---
-const VERSION = '1.0.40'; // Script version
+const VERSION = '1.0.41'; // Script version
 
 // get startTime
 const startTime = Date.now();

package/package.json

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