dashcam 1.4.2-beta → 1.4.5-beta

package/lib/config.js

@@ -26,7 +26,8 @@ export const apiEndpoints = {
   production: 'https://testdriver-api.onrender.com'
 };
 
-export const API_ENDPOINT = apiEndpoints[ENV];
+// Allow TD_API_ROOT to override the endpoint
+export const API_ENDPOINT = process.env.TD_API_ROOT || apiEndpoints[ENV];
 
 // App configuration
 export const APP = {

package/lib/extension-logs/helpers.js

@@ -84,7 +84,13 @@ function filterWebEvents(
     event => event.type === 'INITIAL_TABS' || event.payload.tabId
   );
   const patterns = groupLogsStatuses
-    .map((status) => status.items.map((item) => item.item))
+    .map((status) => {
+      // Handle cases where items might not be set (e.g., during upload)
+      if (!status.items || !Array.isArray(status.items)) {
+        return status.patterns || [];
+      }
+      return status.items.map((item) => item.item);
+    })
     .flat();
 
   const newEvents = [];

package/lib/logs/index.js

@@ -123,7 +123,11 @@ async function trimLogs(groupLogStatuses, startMS, endMS, clientStartDate, clipI
         filteredEvents
       );
     } catch (error) {
-      logger.error('Error trimming log file', { file: status.fileLocation, error });
+      logger.error('Error trimming log file', { 
+        file: status.fileLocation, 
+        error: error.message,
+        stack: error.stack
+      });
     }
   });
 

package/lib/performanceTracker.js

@@ -0,0 +1,487 @@
+import os from 'os';
+import { logger } from './logger.js';
+import pidusage from 'pidusage';
+import { getTopProcesses } from './topProcesses.js';
+import fs from 'fs';
+import path from 'path';
+
+/**
+ * Tracks CPU and memory usage during recording
+ */
+class PerformanceTracker {
+  constructor() {
+    this.interval = null;
+    this.samples = [];
+    this.startTime = null;
+    this.pid = process.pid;
+    this.monitorInterval = 5000; // Sample every 5 seconds
+    this.lastNetworkStats = null; // Track previous network stats for delta calculation
+    this.performanceFile = null; // Path to performance data file
+  }
+
+  /**
+   * Get network I/O statistics
+   */
+  async getNetworkMetrics() {
+    try {
+      const networkInterfaces = os.networkInterfaces();
+      
+      // Get network stats using os module (basic approach)
+      // On macOS/Linux we can read from /proc/net/dev or use system commands
+      let totalBytesReceived = 0;
+      let totalBytesSent = 0;
+      
+      if (process.platform === 'darwin') {
+        // macOS - use netstat command
+        const { execSync } = await import('child_process');
+        try {
+          const output = execSync('netstat -ib', { encoding: 'utf8', timeout: 1000 });
+          const lines = output.split('\n');
+          
+          for (const line of lines) {
+            const parts = line.trim().split(/\s+/);
+            if (parts.length >= 7 && parts[0] !== 'Name') {
+              const ibytes = parseInt(parts[6]) || 0;
+              const obytes = parseInt(parts[9]) || 0;
+              totalBytesReceived += ibytes;
+              totalBytesSent += obytes;
+            }
+          }
+        } catch (error) {
+          logger.debug('Failed to get network stats from netstat', { error: error.message });
+        }
+      } else if (process.platform === 'linux') {
+        // Linux - read from /proc/net/dev
+        const fs = await import('fs');
+        try {
+          const netDev = fs.readFileSync('/proc/net/dev', 'utf8');
+          const lines = netDev.split('\n');
+          
+          for (const line of lines) {
+            if (line.includes(':')) {
+              const parts = line.split(':')[1].trim().split(/\s+/);
+              if (parts.length >= 9) {
+                totalBytesReceived += parseInt(parts[0]) || 0;
+                totalBytesSent += parseInt(parts[8]) || 0;
+              }
+            }
+          }
+        } catch (error) {
+          logger.debug('Failed to read /proc/net/dev', { error: error.message });
+        }
+      }
+      
+      const currentStats = {
+        bytesReceived: totalBytesReceived,
+        bytesSent: totalBytesSent,
+        timestamp: Date.now()
+      };
+      
+      // Calculate deltas (bytes per second)
+      let bytesReceivedPerSec = 0;
+      let bytesSentPerSec = 0;
+      
+      if (this.lastNetworkStats) {
+        const timeDelta = (currentStats.timestamp - this.lastNetworkStats.timestamp) / 1000; // seconds
+        if (timeDelta > 0) {
+          bytesReceivedPerSec = (currentStats.bytesReceived - this.lastNetworkStats.bytesReceived) / timeDelta;
+          bytesSentPerSec = (currentStats.bytesSent - this.lastNetworkStats.bytesSent) / timeDelta;
+        }
+      }
+      
+      this.lastNetworkStats = currentStats;
+      
+      return {
+        network: {
+          bytesReceived: currentStats.bytesReceived,
+          bytesSent: currentStats.bytesSent,
+          bytesReceivedPerSec,
+          bytesSentPerSec,
+          mbReceivedPerSec: bytesReceivedPerSec / (1024 * 1024),
+          mbSentPerSec: bytesSentPerSec / (1024 * 1024)
+        }
+      };
+    } catch (error) {
+      logger.warn('Failed to get network metrics', { error: error.message });
+      return {
+        network: {
+          bytesReceived: 0,
+          bytesSent: 0,
+          bytesReceivedPerSec: 0,
+          bytesSentPerSec: 0,
+          mbReceivedPerSec: 0,
+          mbSentPerSec: 0
+        }
+      };
+    }
+  }
+
+  /**
+   * Get current system-wide CPU and memory metrics
+   */
+  async getSystemMetrics() {
+    const totalMem = os.totalmem();
+    const freeMem = os.freemem();
+    const usedMem = totalMem - freeMem;
+    
+    // Get CPU info
+    const cpus = os.cpus();
+    
+    // Calculate average CPU usage across all cores
+    let totalIdle = 0;
+    let totalTick = 0;
+    
+    cpus.forEach(cpu => {
+      for (const type in cpu.times) {
+        totalTick += cpu.times[type];
+      }
+      totalIdle += cpu.times.idle;
+    });
+    
+    return {
+      system: {
+        totalMemory: totalMem,
+        freeMemory: freeMem,
+        usedMemory: usedMem,
+        memoryUsagePercent: (usedMem / totalMem) * 100,
+        cpuCount: cpus.length,
+        totalIdle,
+        totalTick
+      }
+    };
+  }
+
+  /**
+   * Get process-specific CPU and memory metrics
+   */
+  async getProcessMetrics() {
+    try {
+      const stats = await pidusage(this.pid);
+      return {
+        process: {
+          cpu: stats.cpu, // CPU usage percentage
+          memory: stats.memory, // Memory in bytes
+          ppid: stats.ppid,
+          pid: stats.pid,
+          ctime: stats.ctime,
+          elapsed: stats.elapsed,
+          timestamp: stats.timestamp
+        }
+      };
+    } catch (error) {
+      logger.warn('Failed to get process metrics', { error: error.message });
+      return {
+        process: {
+          cpu: 0,
+          memory: 0,
+          pid: this.pid
+        }
+      };
+    }
+  }
+
+  /**
+   * Get top processes by CPU and memory usage
+   */
+  async getTopProcessesData() {
+    try {
+      // Get top 10 processes using cross-platform implementation
+      const topProcs = await getTopProcesses(10);
+      
+      if (!topProcs || topProcs.length === 0) {
+        return {
+          topProcesses: [],
+          totalProcesses: 0
+        };
+      }
+      
+      // Get detailed stats using pidusage for each process
+      const detailedStats = [];
+      for (const proc of topProcs) {
+        try {
+          const stats = await pidusage(proc.pid);
+          detailedStats.push({
+            pid: proc.pid,
+            name: proc.name,
+            cpu: stats.cpu,
+            memory: stats.memory,
+            ppid: stats.ppid,
+            ctime: stats.ctime,
+            elapsed: stats.elapsed
+          });
+        } catch (error) {
+          // Process might have exited, use basic data from ps/PowerShell
+          logger.debug('Failed to get detailed stats for process, using basic data', { 
+            pid: proc.pid, 
+            error: error.message 
+          });
+          detailedStats.push({
+            pid: proc.pid,
+            name: proc.name,
+            cpu: proc.cpu || 0,
+            memory: proc.memBytes || (proc.mem || 0) * 1024 * 1024, // Convert % to rough bytes or use WS
+            ppid: 0,
+            ctime: 0,
+            elapsed: 0
+          });
+        }
+      }
+      
+      // Already sorted by CPU from getTopProcesses
+      return {
+        topProcesses: detailedStats,
+        totalProcesses: topProcs.length
+      };
+    } catch (error) {
+      logger.warn('Failed to get top processes', { error: error.message });
+      return {
+        topProcesses: [],
+        totalProcesses: 0
+      };
+    }
+  }
+
+  /**
+   * Collect a performance sample (with top processes)
+   */
+  async collectSample() {
+    const timestamp = Date.now();
+    const elapsedMs = this.startTime ? timestamp - this.startTime : 0;
+    
+    try {
+      // Collect all metrics including top processes
+      const [systemMetrics, processMetrics, networkMetrics, topProcessesData] = await Promise.all([
+        this.getSystemMetrics(),
+        this.getProcessMetrics(),
+        this.getNetworkMetrics(),
+        this.getTopProcessesData()
+      ]);
+      
+      const sample = {
+        timestamp,
+        elapsedMs,
+        ...systemMetrics,
+        ...processMetrics,
+        ...networkMetrics,
+        ...topProcessesData
+      };
+      
+      this.samples.push(sample);
+      
+      // Save sample to file immediately
+      if (this.performanceFile) {
+        try {
+          fs.appendFileSync(this.performanceFile, JSON.stringify(sample) + '\n');
+        } catch (error) {
+          logger.warn('Failed to write performance sample to file', { error: error.message });
+        }
+      }
+      
+      // Log sample in verbose mode
+      logger.verbose('Performance sample collected', {
+        elapsedSeconds: (elapsedMs / 1000).toFixed(1),
+        systemMemoryUsage: `${sample.system.memoryUsagePercent.toFixed(1)}%`,
+        processMemoryMB: (sample.process.memory / (1024 * 1024)).toFixed(1),
+        processCPU: `${sample.process.cpu.toFixed(1)}%`,
+        networkIn: `${sample.network.mbReceivedPerSec.toFixed(2)} MB/s`,
+        networkOut: `${sample.network.mbSentPerSec.toFixed(2)} MB/s`,
+        topProcessesCount: sample.topProcesses?.length || 0
+      });
+      
+    } catch (error) {
+      logger.warn('Failed to collect performance sample', { error: error.message });
+    }
+  }
+
+  /**
+   * Start tracking performance - lightweight version with system metrics only
+   */
+  start(outputDir = null) {
+    if (this.interval) {
+      logger.warn('Performance tracking already started');
+      return;
+    }
+    
+    this.startTime = Date.now();
+    this.samples = [];
+    
+    // Set up performance data file
+    if (outputDir) {
+      this.performanceFile = path.join(outputDir, 'performance.jsonl');
+      // Clear any existing file
+      try {
+        if (fs.existsSync(this.performanceFile)) {
+          fs.unlinkSync(this.performanceFile);
+        }
+      } catch (error) {
+        logger.warn('Failed to clear performance file', { error: error.message });
+      }
+    }
+    
+    logger.info('Starting performance tracking (with top processes)', { 
+      pid: this.pid,
+      monitorInterval: this.monitorInterval,
+      performanceFile: this.performanceFile
+    });
+    
+    // Collect initial sample
+    this.collectSample();
+    
+    // Start periodic collection every 5 seconds
+    this.interval = setInterval(() => {
+      this.collectSample();
+    }, this.monitorInterval);
+  }
+
+  /**
+   * Stop tracking and return summary
+   */
+  stop() {
+    if (this.interval) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+    
+    // If we have a performance file, read all samples from it
+    if (this.performanceFile && fs.existsSync(this.performanceFile)) {
+      try {
+        const fileContent = fs.readFileSync(this.performanceFile, 'utf8');
+        const lines = fileContent.trim().split('\n').filter(line => line.length > 0);
+        this.samples = lines.map(line => JSON.parse(line));
+        logger.info('Loaded performance samples from file', { 
+          sampleCount: this.samples.length,
+          file: this.performanceFile
+        });
+      } catch (error) {
+        logger.warn('Failed to read performance samples from file', { error: error.message });
+      }
+    }
+    
+    if (this.samples.length === 0) {
+      logger.warn('No performance samples collected');
+      return {
+        samples: [],
+        summary: null
+      };
+    }
+    
+    // Calculate summary statistics
+    const summary = this.calculateSummary();
+    
+    logger.info('Performance tracking stopped', {
+      totalSamples: this.samples.length,
+      duration: summary.durationMs,
+      avgProcessCPU: `${summary.avgProcessCPU.toFixed(1)}%`,
+      avgProcessMemoryMB: summary.avgProcessMemoryMB.toFixed(1),
+      maxProcessCPU: `${summary.maxProcessCPU.toFixed(1)}%`,
+      maxProcessMemoryMB: summary.maxProcessMemoryMB.toFixed(1)
+    });
+    
+    const result = {
+      samples: this.samples,
+      summary
+    };
+    
+    // DON'T delete the performance file - keep it for the stop command to read
+    // The stop command or uploader will clean it up after reading
+    logger.debug('Keeping performance file for upload', { file: this.performanceFile });
+    
+    // Reset in-memory state but keep file path for cleanup later
+    this.samples = [];
+    this.startTime = null;
+    // Don't reset this.performanceFile - caller may need it
+    
+    return result;
+  }
+
+  /**
+   * Calculate summary statistics from samples
+   */
+  calculateSummary() {
+    if (this.samples.length === 0) {
+      return null;
+    }
+    
+    const firstSample = this.samples[0];
+    const lastSample = this.samples[this.samples.length - 1];
+    
+    // Calculate averages and max values
+    let totalProcessCPU = 0;
+    let totalProcessMemory = 0;
+    let totalSystemMemoryUsage = 0;
+    let maxProcessCPU = 0;
+    let maxProcessMemory = 0;
+    let maxSystemMemoryUsage = 0;
+    
+    this.samples.forEach(sample => {
+      const processCPU = sample.process.cpu || 0;
+      const processMemory = sample.process.memory || 0;
+      const systemMemoryUsage = sample.system.memoryUsagePercent || 0;
+      
+      totalProcessCPU += processCPU;
+      totalProcessMemory += processMemory;
+      totalSystemMemoryUsage += systemMemoryUsage;
+      
+      maxProcessCPU = Math.max(maxProcessCPU, processCPU);
+      maxProcessMemory = Math.max(maxProcessMemory, processMemory);
+      maxSystemMemoryUsage = Math.max(maxSystemMemoryUsage, systemMemoryUsage);
+    });
+    
+    const count = this.samples.length;
+    
+    // Calculate network totals from last sample
+    const finalSample = this.samples[this.samples.length - 1];
+    const totalBytesReceived = finalSample.network?.bytesReceived || 0;
+    const totalBytesSent = finalSample.network?.bytesSent || 0;
+    
+    return {
+      durationMs: lastSample.timestamp - firstSample.timestamp,
+      sampleCount: count,
+      monitorInterval: this.monitorInterval,
+      // Process metrics
+      avgProcessCPU: totalProcessCPU / count,
+      maxProcessCPU,
+      avgProcessMemoryBytes: totalProcessMemory / count,
+      avgProcessMemoryMB: (totalProcessMemory / count) / (1024 * 1024),
+      maxProcessMemoryBytes: maxProcessMemory,
+      maxProcessMemoryMB: maxProcessMemory / (1024 * 1024),
+      // System metrics
+      avgSystemMemoryUsagePercent: totalSystemMemoryUsage / count,
+      maxSystemMemoryUsagePercent: maxSystemMemoryUsage,
+      totalSystemMemoryBytes: firstSample.system.totalMemory,
+      totalSystemMemoryGB: firstSample.system.totalMemory / (1024 * 1024 * 1024),
+      // Network metrics
+      totalBytesReceived,
+      totalBytesSent,
+      totalMBReceived: totalBytesReceived / (1024 * 1024),
+      totalMBSent: totalBytesSent / (1024 * 1024)
+    };
+  }
+
+  /**
+   * Check if tracking is active
+   */
+  isTracking() {
+    return this.interval !== null;
+  }
+
+  /**
+   * Cleanup performance file (call after upload)
+   */
+  cleanup() {
+    if (this.performanceFile && fs.existsSync(this.performanceFile)) {
+      try {
+        fs.unlinkSync(this.performanceFile);
+        logger.debug('Cleaned up performance file', { file: this.performanceFile });
+      } catch (error) {
+        logger.warn('Failed to cleanup performance file', { error: error.message });
+      }
+    }
+    this.performanceFile = null;
+  }
+}
+
+// Create singleton instance
+const performanceTracker = new PerformanceTracker();
+
+export { performanceTracker, PerformanceTracker };

package/lib/processManager.js

@@ -283,31 +283,50 @@ class ProcessManager {
       
       logger.info('Killing background process', { pid });
       
-      // Kill the process immediately - no graceful shutdown needed
-      // Video is already being streamed to disk, we'll fix it with FFmpeg
+      // Try graceful shutdown first with SIGTERM (allows cleanup handlers to run)
+      // Then use SIGKILL if process doesn't exit
       try {
-        process.kill(pid, 'SIGKILL');
-        logger.info('Sent SIGKILL to background process');
+        process.kill(pid, 'SIGTERM');
+        logger.info('Sent SIGTERM to background process');
       } catch (error) {
-        logger.error('Failed to kill background process', { error });
+        logger.error('Failed to send SIGTERM to background process', { error });
         throw new Error('Failed to stop background recording process');
       }
       
-      // Wait briefly for process to die
-      logger.debug('Waiting for background process to exit...');
-      const maxWaitTime = 5000; // 5 seconds should be plenty for SIGKILL
+      // Wait for graceful shutdown
+      logger.debug('Waiting for background process to exit gracefully...');
+      const maxGracefulWait = 3000; // 3 seconds for graceful shutdown
       const startWait = Date.now();
       
-      while (this.isProcessRunning(pid) && (Date.now() - startWait) < maxWaitTime) {
+      while (this.isProcessRunning(pid) && (Date.now() - startWait) < maxGracefulWait) {
         await new Promise(resolve => setTimeout(resolve, 100));
       }
       
+      // If still running, force kill with SIGKILL
       if (this.isProcessRunning(pid)) {
-        logger.error('Background process did not exit after SIGKILL');
-        throw new Error('Failed to kill background process');
+        logger.warn('Background process did not exit gracefully, sending SIGKILL');
+        try {
+          process.kill(pid, 'SIGKILL');
+          logger.info('Sent SIGKILL to background process');
+          
+          // Wait for SIGKILL to take effect
+          const maxKillWait = 2000; // 2 seconds should be plenty for SIGKILL
+          const killStart = Date.now();
+          while (this.isProcessRunning(pid) && (Date.now() - killStart) < maxKillWait) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+          
+          if (this.isProcessRunning(pid)) {
+            logger.error('Background process did not exit even after SIGKILL');
+            throw new Error('Failed to kill background process');
+          }
+        } catch (error) {
+          logger.error('Failed to SIGKILL background process', { error });
+          throw new Error('Failed to force kill background process');
+        }
       }
       
-      logger.info('Background process killed');
+      logger.info('Background process stopped');
       
       // Mark status as completed
       this.markStatusCompleted({