@fanboynz/network-scanner 1.0.64 → 1.0.66

package/lib/interaction.js

@@ -164,6 +164,38 @@ const PROBABILITIES = {
   }
 };
 
+// === PERFORMANCE OPTIMIZATION VARIABLES ===
+// Viewport caching to reduce repeated page.viewport() calls
+let cachedViewport = null;
+let lastViewportCheck = 0;
+const VIEWPORT_CACHE_DURATION = 30000; // 30 seconds
+let interactionMemoryCleanupCounter = 0;
+
+/**
+ * Gets viewport dimensions with caching for performance
+ * Caches viewport for 30 seconds to avoid repeated queries
+ * 
+ * @param {import('puppeteer').Page} page - Puppeteer page object
+ * @returns {Promise<object>} Viewport dimensions {width, height}
+ */
+async function getCachedViewport(page) {
+  const now = Date.now();
+  
+  // Return cached viewport if still valid
+  if (cachedViewport && (now - lastViewportCheck) < VIEWPORT_CACHE_DURATION) {
+    return cachedViewport;
+  }
+  
+  try {
+    cachedViewport = await page.viewport();
+    lastViewportCheck = now;
+    return cachedViewport || { width: DEFAULT_VIEWPORT.WIDTH, height: DEFAULT_VIEWPORT.HEIGHT };
+  } catch (viewportErr) {
+    // Return defaults if viewport query fails
+    return { width: DEFAULT_VIEWPORT.WIDTH, height: DEFAULT_VIEWPORT.HEIGHT };
+  }
+}
+
 /**
  * Generates random coordinates within viewport bounds with intelligent placement
  * 
@@ -481,8 +513,8 @@ async function interactWithElements(page, options = {}) {
         return;
       }
 
-      // Shorter timeout for element interaction since body should already exist
-      await page.waitForSelector('body', { timeout: 2000 });
+      // Very short timeout since page should already be loaded
+      await page.waitForSelector('body', { timeout: 1000 });
     } catch (bodyWaitErr) {
       if (options.forceDebug) {
         console.log(`[interaction] Page not ready for element interaction: ${bodyWaitErr.message}`);
@@ -490,10 +522,10 @@ async function interactWithElements(page, options = {}) {
       return;
     }
 
-    // Get viewport dimensions for coordinate bounds
-    const viewport = await page.viewport();
-    const maxX = viewport ? viewport.width : DEFAULT_VIEWPORT.WIDTH;
-    const maxY = viewport ? viewport.height : DEFAULT_VIEWPORT.HEIGHT;
+    // Use cached viewport for better performance
+    const viewport = await getCachedViewport(page);
+    const maxX = viewport.width;
+    const maxY = viewport.height;
 
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       try {
@@ -638,6 +670,33 @@ async function simulateTyping(page, text, options = {}) {
   }
 }
 
+/**
+ * Cleans up interaction-related memory and cached data
+ * Should be called periodically in long-running sessions
+ * 
+ * @param {boolean} force - Force cleanup regardless of timing
+ */
+function cleanupInteractionMemory(force = false) {
+  interactionMemoryCleanupCounter++;
+  
+  // Only cleanup every 10 calls unless forced
+  if (!force && interactionMemoryCleanupCounter % 10 !== 0) {
+    return;
+  }
+  
+  // Clear cached viewport if it's older than cache duration
+  const now = Date.now();
+  if (cachedViewport && (now - lastViewportCheck) > VIEWPORT_CACHE_DURATION) {
+    cachedViewport = null;
+    lastViewportCheck = 0;
+  }
+  
+  // Force garbage collection if available (helps with memory pressure)
+  if (global.gc) {
+    global.gc();
+  }
+}
+
 /**
  * Performs comprehensive page interaction simulation - MAIN ENTRY POINT
  * 
@@ -711,10 +770,9 @@ async function performPageInteraction(page, currentUrl, options = {}, forceDebug
   try {
     // Validate page state before starting interaction
     try {
-      // Use site-specific timeout based on configuration
-      // Sites with longer configured timeouts get more time for body detection
-      const siteTimeout = options.siteTimeout || 30000; // From site config
-      const bodyTimeout = Math.min(Math.max(siteTimeout / 6, 3000), 8000); // 3-8 seconds
+      // Optimized timeout calculation - shorter for better performance
+      const siteTimeout = options.siteTimeout || 20000; // Reduced default
+      const bodyTimeout = Math.min(Math.max(siteTimeout / 8, 2000), 5000); // 2-5 seconds (reduced)
       
       await page.waitForSelector('body', { timeout: bodyTimeout });
       
@@ -735,9 +793,9 @@ async function performPageInteraction(page, currentUrl, options = {}, forceDebug
       }
     } catch (bodyCheckErr) {
       if (forceDebug) {
-        console.log(`[interaction] Page not ready for interaction on ${currentUrl} (waited ${bodyTimeout}ms): ${bodyCheckErr.message}`);
+        console.log(`[interaction] Page not ready for interaction on ${currentUrl} (waited ${Math.min(Math.max((options.siteTimeout || 20000) / 8, 2000), 5000)}ms): ${bodyCheckErr.message}`);
         // For very slow sites, we might want to try a minimal interaction anyway
-        if (bodyTimeout >= 6000 && !bodyCheckErr.message.includes('closed')) {
+        if (Math.min(Math.max((options.siteTimeout || 20000) / 8, 2000), 5000) >= 4000 && !bodyCheckErr.message.includes('closed')) {
           console.log(`[interaction] Attempting minimal mouse movement only for slow-loading ${currentUrl}`);
           return await performMinimalInteraction(page, currentUrl, options, forceDebug);
         }
@@ -745,10 +803,10 @@ async function performPageInteraction(page, currentUrl, options = {}, forceDebug
       return;
     }
 
-    // Get viewport dimensions
-    const viewport = await page.viewport();
-    const maxX = viewport ? viewport.width : DEFAULT_VIEWPORT.WIDTH;
-    const maxY = viewport ? viewport.height : DEFAULT_VIEWPORT.HEIGHT;
+    // Use cached viewport for better performance
+    const viewport = await getCachedViewport(page);
+    const maxX = viewport.width;
+    const maxY = viewport.height;
 
     if (forceDebug) {
       console.log(`[interaction] Starting enhanced interaction simulation for ${new URL(currentUrl).hostname} (${intensity} intensity)`);
@@ -760,7 +818,13 @@ async function performPageInteraction(page, currentUrl, options = {}, forceDebug
     
     // Start with random position
     let currentPos = generateRandomCoordinates(maxX, maxY, { preferEdges: true });
+    
+    // Batch mouse move operations for better performance
+    try {
     await page.mouse.move(currentPos.x, currentPos.y);
+    } catch (mouseMoveErr) {
+      return; // Exit gracefully if mouse operations fail
+    }
 
     const startTime = Date.now();
     const totalDuration = duration * settings.pauseMultiplier;
@@ -812,6 +876,9 @@ async function performPageInteraction(page, currentUrl, options = {}, forceDebug
       });
     }
 
+    // Periodic memory cleanup during interaction
+    cleanupInteractionMemory();
+
     // Final hover position
     const finalPos = generateRandomCoordinates(maxX, maxY);
     await humanLikeMouseMove(page, currentPos.x, currentPos.y, finalPos.x, finalPos.y);
@@ -847,9 +914,9 @@ async function performMinimalInteraction(page, currentUrl, options = {}, forceDe
   try {
     if (page.isClosed()) return;
     
-    const viewport = await page.viewport();
-    const maxX = viewport ? viewport.width : DEFAULT_VIEWPORT.WIDTH;
-    const maxY = viewport ? viewport.height : DEFAULT_VIEWPORT.HEIGHT;
+    const viewport = await getCachedViewport(page);
+    const maxX = viewport.width;
+    const maxY = viewport.height;
     
     if (forceDebug) {
       console.log(`[interaction] Performing minimal interaction for slow page: ${new URL(currentUrl).hostname}`);
@@ -860,7 +927,7 @@ async function performMinimalInteraction(page, currentUrl, options = {}, forceDe
     const endPos = generateRandomCoordinates(maxX, maxY);
     
     await page.mouse.move(startPos.x, startPos.y);
-    await fastTimeout(500);
+    await fastTimeout(200);
     await humanLikeMouseMove(page, startPos.x, startPos.y, endPos.x, endPos.y);
     
   } catch (minimalErr) {
@@ -1016,7 +1083,8 @@ module.exports = {
   // Main interaction functions
   performPageInteraction,
   createInteractionConfig,
-  
+  getCachedViewport,
+  cleanupInteractionMemory,
   // Component functions for custom implementations
   humanLikeMouseMove,
   simulateScrolling,

package/nwss.js

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

package/package.json

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