@fanboynz/network-scanner 2.0.66 → 3.0.1

package/lib/colorize.js

@@ -3,12 +3,22 @@
 // Provides consistent theming across all modules
 
 /**
- * Detects if color output should be enabled based on command line arguments
- * @returns {boolean} True if --color or --colour flag is present
+ * Decide whether to emit ANSI color escape sequences. Precedence:
+ *   1. FORCE_COLOR env var (any truthy value other than '0'/'false') — on,
+ *      even when piped (useful for `node nwss.js | less -R`).
+ *   2. NO_COLOR env var (any non-empty value, per https://no-color.org) — off.
+ *   3. --no-color / --no-colour CLI flag — off.
+ *   4. Non-TTY stdout (piped, redirected to a file) — off, so log files
+ *      don't end up with raw escape sequences embedded.
+ *   5. Default — on.
+ * @returns {boolean} True when colors should be emitted.
  */
 function shouldEnableColors() {
-  // Colors enabled by default, use --no-color to disable
+  const force = process.env.FORCE_COLOR;
+  if (force && force !== '0' && force !== 'false') return true;
+  if (process.env.NO_COLOR) return false;
   if (process.argv.includes('--no-color') || process.argv.includes('--no-colour')) return false;
+  if (!process.stdout.isTTY) return false;
   return true;
 }
 
@@ -85,7 +95,13 @@ const messageColors = {
   // File operations
   fileOp: (text) => colorize(text, colors.magenta),
   compression: (text) => colorize(text, colors.cyan),
-  
+
+  // Post-processing cleanup summaries (referenced by lib/post-processing.js).
+  // Without this entry the callers were falling through to plain console.log
+  // because their `if (messageColors && messageColors.cleanup)` guard saw
+  // undefined here.
+  cleanup: (text) => colorize(text, colors.brightGreen),
+
   // Cloudflare specific
   cloudflare: (text) => colorize(text, colors.orange)
 };
@@ -111,7 +127,12 @@ const tags = {
   error: createTag('error', colors.red),
   match: createTag('match', colors.green),
   compare: createTag('compare', colors.blue),
-  cloudflare: createTag('cloudflare', colors.orange)
+  cloudflare: createTag('cloudflare', colors.orange),
+  // proxy: referenced by lib/proxy.js and nwss.js via formatLogMessage('proxy', ...).
+  // Was hitting the createTag(tag, colors.white) fallback, allocating a new
+  // tag string per call AND rendering as default-white (indistinguishable
+  // from regular terminal text). Precomputed in cyan for visibility.
+  proxy: createTag('proxy', colors.cyan)
 };
 
 /**
@@ -159,19 +180,15 @@ module.exports = {
   // Core functions
   colorize,
   colors,
-  
+
   // Semantic coloring
   messageColors,
   tags,
   createTag,
   formatLogMessage,
-  
+
   // Utility functions
   isColorEnabled,
   shouldEnableColors,
-  rainbow,
-  
-  // Legacy compatibility - keep original function names
-  colorize: colorize,  // Explicit export for backward compatibility
-  colors: colors       // Explicit export for backward compatibility
+  rainbow
 };

package/lib/compare.js

@@ -1,5 +1,9 @@
 const fs = require('fs');
-const path = require('path');
+const { formatLogMessage, messageColors } = require('./colorize');
+
+// Subsystem tag matches the project convention used by other modules
+// (lib/adblock.js, lib/adblock-rust.js, flowproxy, cloudflare, curl, grep, etc.).
+const COMPARE_TAG = messageColors.processing('[compare]');
 
 // Pre-compiled regexes for rule normalization (shared across functions)
 const RE_ADBLOCK_PREFIX = /^\|\|?/;
@@ -7,9 +11,14 @@ const RE_LOCALHOST_127 = /^127\.0\.0\.1\s+/;
 const RE_LOCALHOST_000 = /^0\.0\.0\.0\s+/;
 const RE_CARET_SUFFIX = /\^.*$/;
 const RE_DOLLAR_SUFFIX = /\$.*$/;
+// Inline hosts-file comments: `0.0.0.0 ads.example.com  # tracker`. Must be
+// stripped before the prefix/suffix passes so the host token isn't left with
+// trailing annotation text that would never match an incoming rule.
+const RE_INLINE_COMMENT = /\s+#.*$/;
 
 function normalizeRuleInline(rule) {
   return rule
+    .replace(RE_INLINE_COMMENT, '')
     .replace(RE_ADBLOCK_PREFIX, '')
     .replace(RE_LOCALHOST_127, '')
     .replace(RE_LOCALHOST_000, '')
@@ -41,7 +50,7 @@ function loadComparisonRules(compareFilePath, forceDebug = false) {
     }
     
     if (forceDebug) {
-      console.log(`[debug] Loaded ${rules.size} comparison rules from ${compareFilePath}`);
+      console.log(formatLogMessage('debug', `${COMPARE_TAG} Loaded ${rules.size} comparison rules from ${compareFilePath}`));
     }
     
     return rules;
@@ -106,7 +115,7 @@ function filterUniqueRules(rules, comparisonRules, forceDebug = false) {
       } else {
         duplicateCount++;
         if (forceDebug) {
-          console.log(`[debug] Filtered duplicate rule: ${rule} (normalized: ${normalized})`);
+          console.log(formatLogMessage('debug', `${COMPARE_TAG} Filtered duplicate rule: ${rule} (normalized: ${normalized})`));
         }
       }
     }
@@ -122,14 +131,14 @@ function filterUniqueRules(rules, comparisonRules, forceDebug = false) {
       // Title with no remaining rules - this is an orphaned title
       orphanedTitles++;
       if (forceDebug) {
-        console.log(`[debug] Filtered orphaned title: ${group.title} (no unique rules remaining)`);
+        console.log(formatLogMessage('debug', `${COMPARE_TAG} Filtered orphaned title: ${group.title} (no unique rules remaining)`));
       }
     }
   }
-  
+
   if (forceDebug) {
-    console.log(`[debug] Filtered ${duplicateCount} duplicate rules and ${orphanedTitles} orphaned titles`);
-    console.log(`[debug] ${result.filter(r => !r.startsWith('!')).length} unique rules remaining`);
+    console.log(formatLogMessage('debug', `${COMPARE_TAG} Filtered ${duplicateCount} duplicate rules and ${orphanedTitles} orphaned titles`));
+    console.log(formatLogMessage('debug', `${COMPARE_TAG} ${result.filter(r => !r.startsWith('!')).length} unique rules remaining`));
   }
   
   return result;
@@ -137,6 +146,5 @@ function filterUniqueRules(rules, comparisonRules, forceDebug = false) {
 
 module.exports = {
   loadComparisonRules,
-  normalizeRule,
   filterUniqueRules
 };

package/lib/compress.js

@@ -2,6 +2,7 @@
 // This module provides gzip compression functionality for log files
 
 const fs = require('fs');
+const { formatLogMessage } = require('./colorize');
 const zlib = require('zlib');
 const path = require('path');
 
@@ -42,7 +43,7 @@ async function compressFile(filePath, removeOriginal = true) {
           fs.unlinkSync(filePath);
         } catch (removeErr) {
           // If we can't remove original, still consider compression successful
-          console.warn(`[warn] Failed to remove original file ${filePath}: ${removeErr.message}`);
+          console.warn(formatLogMessage('warn', `Failed to remove original file ${filePath}: ${removeErr.message}`));
         }
       }
       resolve(compressedPath);