fix: switch to node-machine-id, which is supposedly faster and just as accurate

Author: brandonkachen

bun.lock

@@ -42,7 +42,6 @@
   "dependencies": {
     "@codebuff/code-map": "workspace:*",
     "@codebuff/common": "workspace:*",
-    "@fingerprintjs/fingerprintjs": "^4.6.2",
     "@types/diff": "5.2.1",
     "@types/micromatch": "^4.0.9",
     "@vscode/ripgrep": "1.15.9",
@@ -56,6 +55,7 @@
     "lodash": "*",
     "micromatch": "^4.0.8",
     "nanoid": "5.0.7",
+    "node-machine-id": "^1.1.12",
     "onetime": "5.1.2",
     "picocolors": "1.1.0",
     "pino": "9.4.0",

npm-app/package.json

@@ -1,8 +1,8 @@
 import { calculateFingerprint } from '../fingerprint'
 
 describe('Fingerprint Integration Test', () => {
-  it('should generate fingerprints and test both enhanced and legacy modes', async () => {
-    console.log('🔍 Testing enhanced fingerprinting implementation...')
+  it('should generate fingerprints and test both enhanced CLI and legacy modes', async () => {
+    console.log('🔍 Testing enhanced CLI fingerprinting implementation...')
 
     // Test multiple fingerprint generations
     const results = []
@@ -14,7 +14,7 @@ describe('Fingerprint Integration Test', () => {
       results.push({
         fingerprint,
         duration,
-        isEnhanced: fingerprint.startsWith('fp-'),
+        isEnhanced: fingerprint.startsWith('enhanced-') || fingerprint.startsWith('fp-'),
         isLegacy: fingerprint.startsWith('legacy-')
       })
 
@@ -59,5 +59,5 @@ describe('Fingerprint Integration Test', () => {
 
     // At least one should succeed
     expect(results.length).toBeGreaterThan(0)
-  }, 30000) // 30 second timeout for browser operations
+  }, 10000) // 10 second timeout for CLI operations
 })

npm-app/src/__tests__/fingerprint-integration.test.ts

@@ -1,7 +1,8 @@
-// Enhanced fingerprinting with FingerprintJS and backward compatibility
+// Enhanced fingerprinting with CLI-only approach and backward compatibility
 // Modified from: https://github.com/andsmedeiros/hw-fingerprint
 
 import { createHash, randomBytes } from 'node:crypto'
+import { networkInterfaces } from 'node:os'
 import {
   bios,
   cpu,
@@ -11,23 +12,82 @@ import {
   system,
   // @ts-ignore
 } from 'systeminformation'
+import { machineId } from 'node-machine-id'
 
-import { findChrome } from './browser-runner'
+import { detectShell } from './utils/detect-shell'
+import { getSystemInfo } from './utils/system-info'
 import { logger } from './utils/logger'
 
-// Type declaration for FingerprintJS result
-declare global {
-  interface Window {
-    fingerprintResult?: {
-      visitorId: string
-      confidence: { score: number }
-      components: Record<string, any>
-    }
-  }
+// Enhanced CLI fingerprint implementation using multiple Node.js data sources
+const getEnhancedFingerprintInfo = async () => {
+  // Get essential system information efficiently
+  const [
+    systemInfo,
+    cpuInfo,
+    osInfo_,
+    machineIdValue,
+    systemInfoBasic,
+    shell,
+    networkInfo
+  ] = await Promise.all([
+    system(),
+    cpu(),
+    osInfo(),
+    machineId().catch(() => 'unknown'),
+    getSystemInfo(),
+    detectShell(),
+    Promise.resolve(networkInterfaces())
+  ])
+
+  // Extract MAC addresses for additional uniqueness
+  const macAddresses = Object.values(networkInfo)
+    .flat()
+    .filter(iface => iface && !iface.internal && iface.mac && iface.mac !== '00:00:00:00:00:00')
+    .map(iface => iface!.mac)
+    .sort()
+
+  return {
+    // Hardware identifiers
+    system: {
+      manufacturer: systemInfo.manufacturer,
+      model: systemInfo.model,
+      serial: systemInfo.serial,
+      uuid: systemInfo.uuid,
+    },
+    cpu: {
+      manufacturer: cpuInfo.manufacturer,
+      brand: cpuInfo.brand,
+      cores: cpuInfo.cores,
+      physicalCores: cpuInfo.physicalCores,
+    },
+    os: {
+      platform: osInfo_.platform,
+      distro: osInfo_.distro,
+      arch: osInfo_.arch,
+      hostname: osInfo_.hostname,
+    },
+    // CLI-specific identifiers
+    runtime: {
+      nodeVersion: systemInfoBasic.nodeVersion,
+      platform: systemInfoBasic.platform,
+      arch: systemInfoBasic.arch,
+      shell,
+      cpuCount: systemInfoBasic.cpus,
+    },
+    // Network identifiers
+    network: {
+      macAddresses,
+      interfaceCount: Object.keys(networkInfo).length,
+    },
+    // Machine ID (OS-specific unique identifier)
+    machineId: machineIdValue,
+    // Timestamp for version tracking
+    fingerprintVersion: '2.0',
+  } as Record<string, any>
 }
 
 // Legacy fingerprint implementation (for backward compatibility)
-const getFingerprintInfo = async () => {
+const getLegacyFingerprintInfo = async () => {
   const { manufacturer, model, serial, uuid } = await system()
   const { vendor, version: biosVersion, releaseDate } = await bios()
   const { manufacturer: cpuManufacturer, brand, speed, cores } = await cpu()
@@ -70,111 +130,56 @@ const getFingerprintInfo = async () => {
   } as Record<string, any>
 }
 
-// Legacy implementation with random suffix (still needed for collision avoidance)
-async function calculateLegacyFingerprint() {
-  const fingerprintInfo = await getFingerprintInfo()
-  const fingerprintString = JSON.stringify(fingerprintInfo)
-  const fingerprintHash = createHash('sha256')
-    .update(fingerprintString)
-    .digest()
-    .toString('base64url')
-
-  // Add 8 random characters to make the fingerprint unique even on identical hardware
-  const randomSuffix = randomBytes(6).toString('base64url').substring(0, 8)
-
-  return `legacy-${fingerprintHash}-${randomSuffix}`
-}
-
-// Enhanced FingerprintJS implementation using headless browser
+// Enhanced CLI-only fingerprint (deterministic, no browser required)
 async function calculateEnhancedFingerprint(): Promise<string> {
   try {
-    const puppeteer = await import('puppeteer-core')
-    
-    const browser = await puppeteer.default.launch({
-      headless: true,
-      args: ['--no-sandbox', '--disable-setuid-sandbox'],
-      executablePath: findChrome(),
-    })
-    
-    const page = await browser.newPage()
-    
-    // Create a minimal HTML page with FingerprintJS
-    const html = `
-      <!DOCTYPE html>
-      <html>
-      <head>
-        <script src="https://cdn.jsdelivr.net/npm/@fingerprintjs/fingerprintjs@4/dist/fp.min.js"></script>
-      </head>
-      <body>
-        <script>
-          (async () => {
-            // Initialize FingerprintJS
-            const fp = await FingerprintJS.load()
-            
-            // Get the visitor identifier
-            const result = await fp.get()
-            
-            // Make the result available to Node.js
-            window.fingerprintResult = {
-              visitorId: result.visitorId,
-              confidence: result.confidence,
-              components: result.components
-            }
-          })()
-        </script>
-      </body>
-      </html>
-    `
-    
-    await page.setContent(html)
-    
-    // Wait for FingerprintJS to complete
-    await page.waitForFunction(() => window.fingerprintResult, { timeout: 10000 })
-    
-    // Extract the fingerprint result
-    const result = await page.evaluate(() => window.fingerprintResult)
-    
-    await browser.close()
-    
-    // Combine FingerprintJS result with system info for enhanced uniqueness
-    const systemInfo = await getFingerprintInfo()
-    const combinedData = {
-      fingerprintjs: result!.visitorId,
-      confidence: result!.confidence,
-      system: systemInfo,
-    }
-    
-    const combinedString = JSON.stringify(combinedData)
-    const combinedHash = createHash('sha256')
-      .update(combinedString)
+    const fingerprintInfo = await getEnhancedFingerprintInfo()
+    const fingerprintString = JSON.stringify(fingerprintInfo)
+    const fingerprintHash = createHash('sha256')
+      .update(fingerprintString)
       .digest()
       .toString('base64url')
-    
-    // No random suffix needed - FingerprintJS provides sufficient uniqueness
-    return `fp-${combinedHash}`
+
+    // No random suffix needed - comprehensive system data provides sufficient uniqueness
+    return `enhanced-${fingerprintHash}`
   } catch (error) {
     logger.warn(
       {
         errorMessage: error instanceof Error ? error.message : String(error),
         fingerprintType: 'enhanced_failed',
       },
-      'Enhanced fingerprinting failed, falling back to legacy'
+      'Enhanced CLI fingerprinting failed, falling back to legacy'
     )
     throw error
   }
 }
 
-// Main fingerprint function with hybrid approach
+// Legacy implementation with random suffix (still needed for collision avoidance)
+async function calculateLegacyFingerprint() {
+  const fingerprintInfo = await getLegacyFingerprintInfo()
+  const fingerprintString = JSON.stringify(fingerprintInfo)
+  const fingerprintHash = createHash('sha256')
+    .update(fingerprintString)
+    .digest()
+    .toString('base64url')
+
+  // Add 8 random characters to make the fingerprint unique even on identical hardware
+  const randomSuffix = randomBytes(6).toString('base64url').substring(0, 8)
+
+  return `legacy-${fingerprintHash}-${randomSuffix}`
+}
+
+// Main fingerprint function with CLI-only approach
 export async function calculateFingerprint(): Promise<string> {
   try {
-    // Try enhanced fingerprinting first
+    // Try enhanced CLI fingerprinting first
     const fingerprint = await calculateEnhancedFingerprint()
     logger.info(
       {
-        fingerprintType: 'enhanced',
+        fingerprintType: 'enhanced_cli',
         fingerprintId: fingerprint,
       },
-      'Enhanced fingerprint generated successfully'
+      'Enhanced CLI fingerprint generated successfully'
     )
     return fingerprint
   } catch (enhancedError) {
@@ -183,7 +188,7 @@ export async function calculateFingerprint(): Promise<string> {
         errorMessage: enhancedError instanceof Error ? enhancedError.message : String(enhancedError),
         fingerprintType: 'enhanced_failed_fallback',
       },
-      'Enhanced fingerprinting failed, using legacy fallback'
+      'Enhanced CLI fingerprinting failed, using legacy fallback'
     )
 
     try {

npm-app/src/fingerprint.ts

@@ -129,9 +129,11 @@ export function identifyUserWithFingerprint(
   // Enhanced properties with fingerprint metadata
   const enhancedProperties = {
     ...properties,
-    fingerprintType: properties?.fingerprintId?.startsWith('fp-') ? 'enhanced' : 
+    fingerprintType: properties?.fingerprintId?.startsWith('enhanced-') ? 'enhanced_cli' : 
+                    properties?.fingerprintId?.startsWith('fp-') ? 'enhanced_browser' :
                     properties?.fingerprintId?.startsWith('legacy-') ? 'legacy' : 'unknown',
-    hasEnhancedFingerprint: properties?.fingerprintId?.startsWith('fp-') || false,
+    hasEnhancedFingerprint: properties?.fingerprintId?.startsWith('enhanced-') || 
+                           properties?.fingerprintId?.startsWith('fp-') || false,
   }
 
   if (process.env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'prod') {