@fanboynz/network-scanner 2.0.47 → 2.0.48

package/lib/adblock.js

@@ -382,6 +382,7 @@ function createMatcher(rules, options = {}) {
   const urlCache = new URLCache(1000);
   let cacheHits = 0;
   let cacheMisses = 0;
+  const hasPartyRules = rules.thirdPartyRules.length > 0 || rules.firstPartyRules.length > 0;
   
   return {
     rules,
@@ -416,22 +417,21 @@ function createMatcher(rules, options = {}) {
           cacheMisses++;
         }
         
-        // OPTIMIZATION #1: Only calculate third-party status if we have rules that need it
-        const hasPartyRules = rules.thirdPartyRules.length > 0 || rules.firstPartyRules.length > 0;
-        const isThirdParty = (sourceUrl && hasPartyRules)
-          ? isThirdPartyRequest(url, sourceUrl)
-          : false;
-        
-        // OPTIMIZATION #2: Calculate hostname parts once and reuse (avoid duplicate split operations)
+        // Calculate hostname parts once and reuse
         const hostnameParts = lowerHostname.split('.');
+
+        // Precompute parent domains once, reused for whitelist and block checks
+        const parentDomains = [];
+        const partsLen = hostnameParts.length;
+        for (let i = 1; i < partsLen; i++) {
+          parentDomains.push(hostnameParts.slice(i).join('.'));
+        }
     
-        // V8 OPT: Extract and cache source page domain for $domain option checking
+        // Extract and cache source page domain for $domain and third-party checks
         let sourceDomain = null;
-        let cachedSourceData = null;
 
         if (sourceUrl) {
-          // Check if sourceUrl is in cache (avoid duplicate URL parsing)
-          cachedSourceData = urlCache.get(sourceUrl);
+          const cachedSourceData = urlCache.get(sourceUrl);
           
           if (cachedSourceData) {
             sourceDomain = cachedSourceData.lowerHostname;
@@ -454,6 +454,11 @@ function createMatcher(rules, options = {}) {
           }
         }
 
+        // Calculate third-party status using already-parsed hostnames
+        const isThirdParty = (sourceDomain && hasPartyRules)
+          ? getBaseDomain(lowerHostname) !== getBaseDomain(sourceDomain)
+          : false;
+
         // === WHITELIST CHECK (exception rules take precedence) ===
         
         // Fast path: Check exact domain in Map (O(1))
@@ -468,10 +473,8 @@ function createMatcher(rules, options = {}) {
         }
         
         // Check parent domains for subdomain matches (e.g., sub.example.com -> example.com)
-        const partsLen = hostnameParts.length;  // V8: Cache array length
-        for (let i = 1; i < partsLen; i++) {
-          const parentDomain = hostnameParts.slice(i).join('.');
-          rule = rules.whitelistMap.get(parentDomain);  // V8: Single Map lookup
+        for (let i = 0; i < parentDomains.length; i++) {
+          rule = rules.whitelistMap.get(parentDomains[i]);
           if (rule) {
             if (enableLogging) {
               console.log(`[Adblock] Whitelisted: ${url} (${rule.raw})`);
@@ -508,9 +511,8 @@ function createMatcher(rules, options = {}) {
         }
         
         // Check parent domains for subdomain matches (e.g., ads.example.com -> example.com)
-        for (let i = 1; i < partsLen; i++) {  // V8: Reuse cached length
-          const parentDomain = hostnameParts.slice(i).join('.');
-          rule = rules.domainMap.get(parentDomain);  // V8: Single Map lookup
+        for (let i = 0; i < parentDomains.length; i++) {
+          rule = rules.domainMap.get(parentDomains[i]);
           if (rule) {
             if (enableLogging) {
               console.log(`[Adblock] Blocked domain: ${url} (${rule.raw})`);
@@ -796,27 +798,6 @@ function matchesRule(rule, url, hostname, isThirdParty, resourceType, sourceDoma
   }
 }
 
-/**
- * Determine if request is third-party
- * @param {string} requestUrl - URL being requested
- * @param {string} sourceUrl - URL of the page making the request
- * @returns {boolean} True if third-party request
- */
-function isThirdPartyRequest(requestUrl, sourceUrl) {
-  try {
-    const requestHostname = new URL(requestUrl).hostname;
-    const sourceHostname = new URL(sourceUrl).hostname;
-    
-    // Extract base domain (handle subdomains)
-    const requestDomain = getBaseDomain(requestHostname);
-    const sourceDomain = getBaseDomain(sourceHostname);
-    
-    return requestDomain !== sourceDomain;
-  } catch (err) {
-    return false;
-  }
-}
-
 /**
  * Extract base domain from hostname
  * @param {string} hostname - Full hostname
@@ -833,6 +814,5 @@ function getBaseDomain(hostname) {
 
 module.exports = {
   parseAdblockRules,
-  isThirdPartyRequest,
   getBaseDomain
 };

package/lib/grep.js

@@ -3,9 +3,6 @@
 
 const fs = require('fs');
 const { spawnSync } = require('child_process');
-const crypto = require('crypto');
-const path = require('path');
-const os = require('os');
 const { colorize, colors, messageColors, tags, formatLogMessage } = require('./colorize');
 
 // === Constants ===
@@ -21,53 +18,9 @@ const GREP_DEFAULTS = {
   GREP_SUCCESS_STATUS: 0,
   GREP_NOT_FOUND_STATUS: 1,
   CURL_SUCCESS_STATUS: 0,
-  VERSION_LINE_INDEX: 0,
-  RANDOM_STRING_LENGTH: 9,
-  TEMP_DIR_PREFIX: 'grep_search_'
+  VERSION_LINE_INDEX: 0
 };
 
-/**
- * Creates a temporary directory and file with content for grep processing
- * Uses mkdtempSync to avoid race conditions from filename collisions
- * @param {string} content - The content to write to temp file
- * @param {string} prefix - Prefix for temp filename
- * @returns {object} Object containing tempDir and tempFile paths
- */
-function createTempFile(content, prefix = 'scanner_grep') {
-  const tempDir = os.tmpdir();
-  
-  // Create a unique temporary directory to avoid race conditions
-  const uniqueTempDir = fs.mkdtempSync(path.join(tempDir, GREP_DEFAULTS.TEMP_DIR_PREFIX));
-  
-  // Use cryptographically secure random ID for additional uniqueness
-  const uniqueId = crypto.randomBytes(8).toString('hex');
-  const tempFile = path.join(uniqueTempDir, `${prefix}_${uniqueId}.tmp`);
-  
-  try {
-    // Write atomically with error handling
-    fs.writeFileSync(tempFile, content, { 
-      encoding: 'utf8',
-      mode: 0o600 // Restrict permissions for security
-    });
-    
-    return { tempDir: uniqueTempDir, tempFile };
-  } catch (error) {
-    // Clean up temp directory on write failure
-    try {
-      if (fs.existsSync(tempFile)) {
-        fs.unlinkSync(tempFile);
-      }
-      if (fs.existsSync(uniqueTempDir)) {
-        fs.rmdirSync(uniqueTempDir);
-      }
-    } catch (cleanupErr) {
-      // Ignore cleanup errors, report original error
-    }
-
-    throw new Error(`Failed to create temp file: ${error.message}`);
-  }
-}
-
 /**
  * Searches content using grep with the provided patterns
  * @param {string} content - The content to search
@@ -86,15 +39,8 @@ async function grepContent(content, searchPatterns, options = {}) {
   if (!content || searchPatterns.length === 0) {
     return { found: false, matchedPattern: null, allMatches: [] };
   }
-
-  let tempFile = null;
-  let tempDir = null;
-  
+ 
   try {
-    // Create temporary directory and file with content
-    const tempResult = createTempFile(content, 'grep_search');
-    tempDir = tempResult.tempDir;
-    tempFile = tempResult.tempFile;
     
     const allMatches = [];
     let firstMatch = null;
@@ -111,12 +57,12 @@ async function grepContent(content, searchPatterns, options = {}) {
       if (wholeWord) grepArgs.push('-w');
       if (!regex) grepArgs.push('-F'); // Fixed strings (literal)
       
-      // Add pattern and file
-      grepArgs.push(pattern, tempFile);
+      grepArgs.push(pattern);
       
       try {
         const result = spawnSync('grep', grepArgs, {
           encoding: 'utf8',
+          input: content,
           timeout: GREP_DEFAULTS.GREP_TIMEOUT,
           maxBuffer: GREP_DEFAULTS.MAX_BUFFER_SIZE
         });
@@ -147,22 +93,6 @@ async function grepContent(content, searchPatterns, options = {}) {
     
   } catch (error) {
     throw new Error(`Grep search failed: ${error.message}`);
-  } finally {
-    // Clean up temporary file and directory
-    if (tempFile) {
-      try {
-        fs.unlinkSync(tempFile);
-      } catch (cleanupErr) {
-        console.warn(formatLogMessage('warn', `[grep] Failed to cleanup temp file ${tempFile}: ${cleanupErr.message}`));
-      }
-    }
-    if (tempDir) {
-      try {
-        fs.rmdirSync(tempDir);
-      } catch (cleanupErr) {
-        console.warn(formatLogMessage('warn', `[grep] Failed to cleanup temp directory ${tempDir}: ${cleanupErr.message}`));
-      }
-    }
   }
 }
 
@@ -418,6 +348,5 @@ module.exports = {
   grepContent,
   downloadAndGrep,
   createGrepHandler,
-  validateGrepAvailability,
-  createTempFile
+  validateGrepAvailability
 };

package/package.json

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