@fanboynz/network-scanner 2.0.35 → 2.0.36

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/package.json

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