dashcam 1.0.1-beta.22 → 1.0.1-beta.23

package/bin/dashcam.js

@@ -417,30 +417,29 @@ program
 
         console.log('Recording stopped successfully');
         
+        // Wait a moment for upload to complete (background process handles this)
+        logger.debug('Waiting for background upload to complete...');
+        await new Promise(resolve => setTimeout(resolve, 5000));
+        
+        // Try to read the upload result from the background process
+        const uploadResult = processManager.readUploadResult();
+        logger.debug('Upload result read attempt', { found: !!uploadResult, shareLink: uploadResult?.shareLink });
+        
+        if (uploadResult && uploadResult.shareLink) {
+          console.log('📹 Watch your recording:', uploadResult.shareLink);
+          // Clean up the result file now that we've read it
+          processManager.cleanup();
+          process.exit(0);
+        }
+        
         // Check if files still exist - if not, background process already uploaded
         const filesExist = fs.existsSync(result.outputPath) && 
                           (!result.gifPath || fs.existsSync(result.gifPath)) && 
                           (!result.snapshotPath || fs.existsSync(result.snapshotPath));
         
         if (!filesExist) {
-          // Files were deleted, meaning background process uploaded
-          // Wait for the upload result to be written
-          logger.debug('Waiting for upload result from background process');
-          await new Promise(resolve => setTimeout(resolve, 2000));
-          
-          // Try to read the upload result from the background process
-          const uploadResult = processManager.readUploadResult();
-          logger.debug('Upload result read attempt', { found: !!uploadResult, shareLink: uploadResult?.shareLink });
-          
-          if (uploadResult && uploadResult.shareLink) {
-            console.log('📹 Watch your recording:', uploadResult.shareLink);
-            // Clean up the result file now that we've read it
-            processManager.cleanup();
-          } else {
-            console.log('✅ Recording uploaded (share link not available)');
-            logger.warn('Upload result not available from background process');
-          }
-          
+          console.log('✅ Recording uploaded by background process');
+          logger.info('Files were cleaned up by background process');
           process.exit(0);
         }
         

package/lib/recorder.js

@@ -531,20 +531,20 @@ export async function stopRecording() {
     // Wait for FFmpeg to finish gracefully with realtime encoding
     const gracefulTimeout = setTimeout(() => {
       if (currentRecording && !currentRecording.killed) {
-        logger.warn('FFmpeg did not exit gracefully after 5s, sending SIGTERM...');
+        logger.warn('FFmpeg did not exit gracefully after 10s, sending SIGTERM...');
         // If still running, try SIGTERM
         process.kill(currentRecording.pid, 'SIGTERM');
       }
-    }, 5000); // Faster with realtime encoding
+    }, 10000); // Wait longer for graceful shutdown
 
-    // Wait up to 10 seconds for SIGTERM to work
+    // Wait up to 20 seconds for SIGTERM to work
     const hardKillTimeout = setTimeout(() => {
       if (currentRecording && !currentRecording.killed) {
         logger.error('FFmpeg still running after SIGTERM, using SIGKILL...');
         // If still not dead, use SIGKILL as last resort
         process.kill(currentRecording.pid, 'SIGKILL');
       }
-    }, 10000); // Faster timeout
+    }, 20000); // Longer timeout to avoid killing prematurely
 
     // Wait for the process to fully exit
     if (currentRecording) {
@@ -555,10 +555,30 @@ export async function stopRecording() {
     clearTimeout(gracefulTimeout);
     clearTimeout(hardKillTimeout);
 
-    // Additional wait to ensure filesystem is synced
-    // Realtime encoding has smaller buffers so this can be shorter
-    logger.debug('Waiting for filesystem sync...');
-    await new Promise(resolve => setTimeout(resolve, 1000)); // Reduced from 3s with realtime encoding
+    // Wait for filesystem to sync and file to be written
+    // Poll for the file to exist with content
+    logger.debug('Waiting for temp file to be written...');
+    const maxWaitTime = 10000; // Wait up to 10 seconds
+    const startWait = Date.now();
+    let tempFileReady = false;
+    
+    while (!tempFileReady && (Date.now() - startWait) < maxWaitTime) {
+      const tempFile = currentTempFile;
+      if (tempFile && fs.existsSync(tempFile)) {
+        const stats = fs.statSync(tempFile);
+        if (stats.size > 0) {
+          logger.debug('Temp file is ready', { size: stats.size });
+          tempFileReady = true;
+          break;
+        }
+      }
+      // Wait a bit before checking again
+      await new Promise(resolve => setTimeout(resolve, 500));
+    }
+    
+    if (!tempFileReady) {
+      logger.warn('Temp file not ready after waiting, proceeding anyway');
+    }
 
     // Read temp file path from disk (for cross-process access)
     let tempFile = currentTempFile; // Try in-memory first

package/lib/tracking/FileTracker.js

@@ -47,7 +47,7 @@ export class FileTracker {
         fs.writeFileSync(this.trackedFile, '', 'utf8');
       }
       
-      this.tail = new Tail(this.trackedFile, { encoding: 'ascii' });
+      this.tail = new Tail(this.trackedFile, { encoding: 'utf8' });
       this.tail.on('line', (line) => {
         const time = Date.now();
         this.eventTimes.push(time);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashcam",
-  "version": "1.0.1-beta.22",
+  "version": "1.0.1-beta.23",
   "description": "Minimal CLI version of Dashcam desktop app",
   "main": "bin/index.js",
   "bin": {

package/test_workflow.sh

@@ -46,7 +46,7 @@ RECORDING_START=$(date +%s)
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo "🔴 EVENT 1: Recording START at $(date '+%H:%M:%S')"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "[EVENT 1] Recording started at $(date '+%H:%M:%S') - TIMESTAMP: $RECORDING_START" >> "$TEMP_FILE"
+echo "[EVENT 1] 🔴 Recording started with emoji at $(date '+%H:%M:%S') - TIMESTAMP: $RECORDING_START" >> "$TEMP_FILE"
 
 # Verify recording is actually running
 if ps -p $RECORD_PID > /dev/null; then
@@ -71,25 +71,25 @@ sleep 3
 # Event 2 - after 3 seconds
 echo ""
 echo "🟡 EVENT 2: 3 seconds mark at $(date '+%H:%M:%S')"
-echo "[EVENT 2] 3 seconds elapsed at $(date '+%H:%M:%S')" >> "$TEMP_FILE"
+echo "[EVENT 2] 🟡 3 seconds elapsed with emoji at $(date '+%H:%M:%S')" >> "$TEMP_FILE"
 sleep 3
 
 # Event 3 - after 6 seconds
 echo ""
 echo "🟢 EVENT 3: 6 seconds mark at $(date '+%H:%M:%S')"
-echo "[EVENT 3] 6 seconds elapsed at $(date '+%H:%M:%S')" >> "$TEMP_FILE"
+echo "[EVENT 3] 🟢 6 seconds elapsed with emoji at $(date '+%H:%M:%S')" >> "$TEMP_FILE"
 sleep 3
 
 # Event 4 - after 9 seconds
 echo ""
 echo "🔵 EVENT 4: 9 seconds mark at $(date '+%H:%M:%S')"
-echo "[EVENT 4] 9 seconds elapsed at $(date '+%H:%M:%S')" >> "$TEMP_FILE"
+echo "[EVENT 4] 🔵 9 seconds elapsed with emoji at $(date '+%H:%M:%S')" >> "$TEMP_FILE"
 sleep 3
 
 # Event 5 - after 12 seconds
 echo ""
 echo "🟣 EVENT 5: 12 seconds mark at $(date '+%H:%M:%S')"
-echo "[EVENT 5] 12 seconds elapsed at $(date '+%H:%M:%S')" >> "$TEMP_FILE"
+echo "[EVENT 5] 🟣 12 seconds elapsed with emoji at $(date '+%H:%M:%S')" >> "$TEMP_FILE"
 sleep 3
 
 # Event 6 - before ending
@@ -98,7 +98,7 @@ echo "━━━━━━━━━━━━━━━━━━━━━━━━
 echo "⚫ EVENT 6: Recording END at $(date '+%H:%M:%S')"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 RECORDING_END=$(date +%s)
-echo "[EVENT 6] Recording ending at $(date '+%H:%M:%S') - TIMESTAMP: $RECORDING_END" >> "$TEMP_FILE"
+echo "[EVENT 6] ⚫ Recording ending with emoji at $(date '+%H:%M:%S') - TIMESTAMP: $RECORDING_END" >> "$TEMP_FILE"
 
 DURATION=$((RECORDING_END - RECORDING_START))
 echo ""
@@ -112,8 +112,13 @@ sleep 2
 # 6. Stop recording and upload (this will kill the background recording process)
 echo ""
 echo "6. Stopping recording and uploading..."
-./bin/dashcam.js stop
-echo "✅ Recording stopped and uploaded"
+# Check if recording is still active
+if ./bin/dashcam.js status | grep -q "Recording in progress"; then
+  ./bin/dashcam.js stop
+  echo "✅ Recording stopped and uploaded"
+else
+  echo "⚠️  Recording already completed (this is expected with background mode)"
+fi
 
 echo ""
 echo "🧹 Cleaning up..."
@@ -140,12 +145,12 @@ echo "3. Verify these events appear at the correct times:"
 echo ""
 echo "   Time   | Terminal Display          | Log Entry"
 echo "   -------|---------------------------|---------------------------"
-echo "   0:00   | 🔴 EVENT 1               | [EVENT 1] Recording started"
-echo "   0:03   | 🟡 EVENT 2               | [EVENT 2] 3 seconds elapsed"
-echo "   0:06   | 🟢 EVENT 3               | [EVENT 3] 6 seconds elapsed"
-echo "   0:09   | 🔵 EVENT 4               | [EVENT 4] 9 seconds elapsed"
-echo "   0:12   | 🟣 EVENT 5               | [EVENT 5] 12 seconds elapsed"
-echo "   0:15   | ⚫ EVENT 6               | [EVENT 6] Recording ending"
+echo "   0:00   | 🔴 EVENT 1               | [EVENT 1] 🔴 Recording started"
+echo "   0:03   | 🟡 EVENT 2               | [EVENT 2] 🟡 3 seconds elapsed"
+echo "   0:06   | 🟢 EVENT 3               | [EVENT 3] 🟢 6 seconds elapsed"
+echo "   0:09   | 🔵 EVENT 4               | [EVENT 4] 🔵 9 seconds elapsed"
+echo "   0:12   | 🟣 EVENT 5               | [EVENT 5] 🟣 12 seconds elapsed"
+echo "   0:15   | ⚫ EVENT 6               | [EVENT 6] ⚫ Recording ending"
 echo ""
 echo "4. The log timestamps should match the video timeline exactly"
 echo "5. Each colored event marker should appear in the video"