@fanboynz/network-scanner 2.0.35 → 2.0.37

package/lib/browserexit.js

@@ -3,6 +3,10 @@
  * Provides graceful and forced browser closure functionality with comprehensive temp file cleanup
  */
 
+
+const fs = require('fs');
+const { execSync } = require('child_process');
+
 // Constants for temp file cleanup
 const CHROME_TEMP_PATHS = [
   '/tmp',
@@ -13,8 +17,7 @@ const CHROME_TEMP_PATHS = [
 const CHROME_TEMP_PATTERNS = [
   '.com.google.Chrome.*',        // Google Chrome temp files
   '.org.chromium.Chromium.*',
-  'puppeteer-*',
-  '.com.google.Chrome.*'         // Ensure Google Chrome pattern is included
+  'puppeteer-*'
 ];
 
 /**
@@ -33,7 +36,6 @@ async function cleanupChromeTempFiles(options = {}) {
   } = options;
 
   try {
-    const { execSync } = require('child_process');
 
     // Base cleanup commands for standard temp directories
     const cleanupCommands = [
@@ -56,17 +58,17 @@ async function cleanupChromeTempFiles(options = {}) {
     
     for (const command of cleanupCommands) {
       try {
-        // Get file count before cleanup for reporting
-        const listCommand = command.replace('rm -rf', 'ls -1d').replace(' 2>/dev/null || true', ' 2>/dev/null | wc -l || echo 0');
-        const fileCount = parseInt(execSync(listCommand, { stdio: 'pipe' }).toString().trim()) || 0;
+        // Extract glob pattern and count matches before deletion
+        const globPattern = command.match(/rm -rf ([^ ]+)/)?.[1];
+        if (!globPattern) continue;
+        const fileCount = parseInt(execSync(`ls -1d ${globPattern} 2>/dev/null | wc -l || echo 0`, { stdio: 'pipe' }).toString().trim()) || 0;
         
         if (fileCount > 0) {
           execSync(command, { stdio: 'ignore' });
           totalCleaned += fileCount;
           
           if (forceDebug) {
-            const pathPattern = command.match(/rm -rf ([^ ]+)/)?.[1] || 'unknown';
-            console.log(`[debug] [temp-cleanup] Cleaned ${fileCount} items from ${pathPattern}`);
+            console.log(`[debug] [temp-cleanup] Cleaned ${fileCount} items from ${globPattern}`);
           }
         }
       } catch (cmdErr) {
@@ -102,7 +104,6 @@ async function comprehensiveChromeTempCleanup(options = {}) {
   const { forceDebug = false, verbose = false } = options;
   
   try {
-    const { execSync } = require('child_process');
     let totalCleaned = 0;
     
     if (verbose && !forceDebug) {
@@ -112,8 +113,7 @@ async function comprehensiveChromeTempCleanup(options = {}) {
     for (const basePath of CHROME_TEMP_PATHS) {
       // Check if the base path exists before trying to clean it
       try {
-        const pathExists = execSync(`test -d "${basePath}" && echo "exists" || echo "missing"`, { stdio: 'pipe' })
-          .toString().trim() === 'exists';
+        const pathExists = fs.existsSync(basePath);
         
         if (!pathExists) {
           if (forceDebug) {
@@ -149,7 +149,7 @@ async function comprehensiveChromeTempCleanup(options = {}) {
     if (verbose && totalCleaned > 0) {
       console.log(`[temp-cleanup] ? Removed ${totalCleaned} temporary file(s)/folder(s)`);
     } else if (verbose && totalCleaned === 0) {
-      console.log(`[temp-cleanup] ??  No temporary files found to remove`);
+      console.log(`[temp-cleanup] ? Clean - no remaining temporary files`);
     } else if (forceDebug) {
       console.log(`[debug] [temp-cleanup] Comprehensive cleanup completed (${totalCleaned} items)`);
     }
@@ -179,7 +179,6 @@ async function cleanupUserDataDir(userDataDir, forceDebug = false) {
   }
 
   try {
-    const fs = require('fs');
     
     if (!fs.existsSync(userDataDir)) {
       if (forceDebug) {
@@ -281,9 +280,7 @@ async function forceBrowserKill(browser, forceDebug = false) {
     const mainPid = browserProcess.pid;
     if (forceDebug) console.log(`[debug] [browser] Main Chrome PID: ${mainPid}`);
 
-    // Find and kill ALL related Chrome processes
-    const { execSync } = require('child_process');
-     
+    // Find and kill ALL related Chrome processes    
     
     try {
       // Find all Chrome processes with puppeteer in command line
@@ -390,9 +387,7 @@ async function forceBrowserKill(browser, forceDebug = false) {
  * @returns {Promise<void>}
  */
 async function killAllPuppeteerChrome(forceDebug = false) {
-  try {
-    const { execSync } = require('child_process');
-    
+  try {    
     if (forceDebug) console.log(`[debug] [browser] Nuclear option: killing all puppeteer Chrome processes...`);
     
     try {
@@ -439,7 +434,7 @@ async function handleBrowserExit(browser, options = {}) {
   
   const results = {
     browserClosed: false,
-    tempFilescleaned: 0,
+    tempFilesCleanedCount: 0,
     userDataCleaned: false,
     success: false,
     errors: []

package/lib/browserhealth.js

@@ -4,7 +4,7 @@
  */
 
 const { formatLogMessage, messageColors } = require('./colorize');
-
+const { execSync } = require('child_process');
 
 // Window cleanup delay constant
 const WINDOW_CLEANUP_DELAY_MS = 15000;
@@ -15,12 +15,23 @@ const REALTIME_CLEANUP_MIN_PAGES = 6; // Minimum pages before cleanup kicks in
 
 // Track page creation order for realtime cleanup
 const pageCreationTracker = new Map(); // Maps page -> creation timestamp
-let pageCreationCounter = 0;
 
 // Track page usage for realtime cleanup safety
 const pageUsageTracker = new Map(); // Maps page -> { lastActivity: timestamp, isProcessing: boolean }
 const PAGE_IDLE_THRESHOLD = 25000; // 25 seconds of inactivity before considering page safe to clean
 
+/**
+ * Format bytes to human readable string
+ * @param {number} bytes
+ * @returns {string}
+ */
+function formatMemory(bytes) {
+  if (bytes >= 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024 * 1024)).toFixed(1)}GB`;
+  if (bytes >= 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+  if (bytes >= 1024) return `${(bytes / 1024).toFixed(1)}KB`;
+  return `${bytes}B`;
+}
+
 /**
  * Performs group-level window cleanup after all URLs in a site group complete
  * Closes all extra windows except the main browser window
@@ -162,6 +173,8 @@ async function performGroupWindowCleanup(browserInstance, groupDescription, forc
           if (forceDebug) {
             console.log(formatLogMessage('debug', `[group_window_cleanup] Closing page: ${pageUrl}`));
           }
+          pageCreationTracker.delete(page);
+          pageUsageTracker.delete(page);
           await page.close();
           return { success: true, url: pageUrl || `page-${index}`, estimatedMemory: pageMemoryEstimates[index] };
         }
@@ -180,19 +193,6 @@ async function performGroupWindowCleanup(browserInstance, groupDescription, forc
       .filter(result => result.success === true)
       .reduce((sum, result) => sum + (result.estimatedMemory || 0), 0);
     
-    // Format memory for human readability
-    const formatMemory = (bytes) => {
-      if (bytes >= 1024 * 1024 * 1024) {
-        return `${(bytes / (1024 * 1024 * 1024)).toFixed(1)}GB`;
-      } else if (bytes >= 1024 * 1024) {
-        return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
-      } else if (bytes >= 1024) {
-        return `${(bytes / 1024).toFixed(1)}KB`;
-      } else {
-        return `${bytes}B`;
-      }
-    };
-    
     if (forceDebug) {
       console.log(formatLogMessage('debug', `[group_window_cleanup] Closed ${successfulCloses}/${pagesToClose.length} old windows for completed group: ${groupDescription} after ${WINDOW_CLEANUP_DELAY_MS}ms delay`));
       console.log(formatLogMessage('debug', `[group_window_cleanup] Estimated memory freed: ${formatMemory(actualMemoryFreed)}`));
@@ -438,6 +438,7 @@ async function performRealtimeWindowCleanup(browserInstance, threshold = REALTIM
         if (!isPageClosed) {
           await page.close();
           pageCreationTracker.delete(page); // Remove from tracker
+          pageUsageTracker.delete(page);
           closedCount++;
           
           if (forceDebug) {
@@ -545,7 +546,7 @@ async function isPageFromPreviousScan(page, forceDebug) {
  * @param {import('puppeteer').Page} page - Page to track
  */
 function trackPageForRealtime(page) {
-  pageCreationTracker.set(page, ++pageCreationCounter);
+  pageCreationTracker.set(page, Date.now());
   updatePageUsage(page, false); // Initialize usage tracking
 }
 
@@ -781,7 +782,6 @@ async function checkBrowserMemory(browserInstance) {
 
     // Try to get process memory info (Linux/Unix)
     try {
-      const { execSync } = require('child_process');
       const memInfo = execSync(`ps -p ${browserProcess.pid} -o rss=`, { encoding: 'utf8', timeout: 2000 });
       const memoryKB = parseInt(memInfo.trim());
       
@@ -1200,18 +1200,3 @@ module.exports = {
   updatePageUsage,
   cleanupPageBeforeReload
 };
-
-// Clean up tracking maps when pages are closed
-const originalPageClose = require('puppeteer').Page.prototype.close;
-if (originalPageClose) {
-  require('puppeteer').Page.prototype.close = async function(...args) {
-    try {
-      // Clean up tracking data
-      pageCreationTracker.delete(this);
-      pageUsageTracker.delete(this);
-    } catch (err) {
-      // Ignore cleanup errors
-    }
-    return originalPageClose.apply(this, args);
-  };
-}

package/package.json

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