node-mac-recorder 2.21.15 → 2.21.16

package/.claude/settings.local.json

@@ -3,7 +3,8 @@
     "allow": [
       "Bash(ffmpeg:*)",
       "Bash(chmod:*)",
-      "Bash(node test-sync.js:*)"
+      "Bash(node test-sync.js:*)",
+      "Bash(node:*)"
     ],
     "deny": [],
     "ask": []

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.21.15",
+	"version": "2.21.16",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [

package/src/audio_recorder.mm

@@ -110,16 +110,7 @@ static dispatch_queue_t g_audioCaptureQueue = nil;
 
     MRLog(@"🎤 Audio format: %.0f Hz, %lu channel(s)", sampleRate, (unsigned long)channels);
 
-    AudioChannelLayout layout = {0};
-    size_t layoutSize = 0;
-    if (channels == 1) {
-        layout.mChannelLayoutTag = kAudioChannelLayoutTag_Mono;
-        layoutSize = sizeof(AudioChannelLayout);
-    } else if (channels == 2) {
-        layout.mChannelLayoutTag = kAudioChannelLayoutTag_Stereo;
-        layoutSize = sizeof(AudioChannelLayout);
-    }
-
+    // Create audio settings
     NSMutableDictionary *audioSettings = [@{
         AVFormatIDKey: @(kAudioFormatMPEG4AAC),
         AVSampleRateKey: @(sampleRate),
@@ -128,9 +119,17 @@ static dispatch_queue_t g_audioCaptureQueue = nil;
         AVEncoderAudioQualityKey: @(AVAudioQualityHigh)
     } mutableCopy];
 
-    if (layoutSize > 0) {
-        audioSettings[AVChannelLayoutKey] = [NSData dataWithBytes:&layout length:layoutSize];
-    }
+    // CRITICAL FIX: AVChannelLayoutKey is REQUIRED for ALL channel counts
+    // Force to stereo or mono for AAC compatibility
+    NSUInteger validChannels = (channels <= 1) ? 1 : 2; // Force to mono or stereo
+    audioSettings[AVNumberOfChannelsKey] = @(validChannels); // Update settings
+
+    AudioChannelLayout layout = {0};
+    layout.mChannelLayoutTag = (validChannels == 1) ? kAudioChannelLayoutTag_Mono : kAudioChannelLayoutTag_Stereo;
+    size_t layoutSize = sizeof(AudioChannelLayout);
+    audioSettings[AVChannelLayoutKey] = [NSData dataWithBytes:&layout length:layoutSize];
+
+    MRLog(@"🎤 Using %lu channel(s) for AAC encoding (original: %lu)", (unsigned long)validChannels, (unsigned long)channels);
     
     self.writerInput = [AVAssetWriterInput assetWriterInputWithMediaType:AVMediaTypeAudio outputSettings:audioSettings];
     self.writerInput.expectsMediaDataInRealTime = YES;

package/src/mac_recorder.mm

@@ -403,33 +403,50 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
                 
                     // Use ScreenCaptureKit with window exclusion and timeout protection
                     NSError *sckError = nil;
-                    
+
                     // Set timeout for ScreenCaptureKit initialization
                     // Attempt to start ScreenCaptureKit with safety wrapper
                     @try {
-                        if ([ScreenCaptureKitRecorder startRecordingWithConfiguration:sckConfig 
-                                                                             delegate:g_delegate 
+                        // CRITICAL SYNC FIX: Start camera BEFORE ScreenCaptureKit for perfect sync
+                        bool cameraStarted = true;
+                        if (captureCamera) {
+                            MRLog(@"🎯 SYNC: Starting camera recording first for parallel sync");
+                            cameraStarted = startCameraIfRequested(captureCamera, &cameraOutputPath, cameraDeviceId, outputPath, sessionTimestamp);
+                            if (!cameraStarted) {
+                                MRLog(@"❌ Camera start failed - aborting");
+                                return Napi::Boolean::New(env, false);
+                            }
+                            MRLog(@"✅ SYNC: Camera recording started");
+                        }
+
+                        // Now start ScreenCaptureKit immediately after camera
+                        MRLog(@"🎯 SYNC: Starting ScreenCaptureKit recording immediately");
+                        if ([ScreenCaptureKitRecorder startRecordingWithConfiguration:sckConfig
+                                                                             delegate:g_delegate
                                                                                 error:&sckError]) {
-                            
+
                             // ScreenCaptureKit başlatma başarılı - validation yapmıyoruz
                             MRLog(@"🎬 RECORDING METHOD: ScreenCaptureKit");
-                            MRLog(@"✅ ScreenCaptureKit recording started successfully");
-                            
-                            if (!startCameraIfRequested(captureCamera, &cameraOutputPath, cameraDeviceId, outputPath, sessionTimestamp)) {
-                                MRLog(@"❌ Camera start failed - stopping ScreenCaptureKit session");
-                                [ScreenCaptureKitRecorder stopRecording];
-                                g_isRecording = false;
-                                return Napi::Boolean::New(env, false);
-                            }
-                            
+                            MRLog(@"✅ SYNC: ScreenCaptureKit recording started successfully");
+
                             g_isRecording = true;
                             return Napi::Boolean::New(env, true);
                         } else {
                             NSLog(@"❌ ScreenCaptureKit failed to start");
                             NSLog(@"❌ Error: %@", sckError ? sckError.localizedDescription : @"Unknown error");
+
+                            // Cleanup camera if ScreenCaptureKit failed
+                            if (cameraStarted && isCameraRecording()) {
+                                stopCameraRecording();
+                            }
                         }
                     } @catch (NSException *sckException) {
                         NSLog(@"❌ Exception during ScreenCaptureKit startup: %@", sckException.reason);
+
+                        // Cleanup camera on exception
+                        if (isCameraRecording()) {
+                            stopCameraRecording();
+                        }
                     }
                     NSLog(@"❌ ScreenCaptureKit failed or unsafe - will fallback to AVFoundation");
                     
@@ -487,19 +504,27 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
                                                    NSString* audioDeviceId,
                                                    NSString* audioOutputPath);
 
+            // CRITICAL SYNC FIX: Start camera BEFORE screen recording for perfect sync
+            // This ensures both capture their first frame at approximately the same time
+            bool cameraStarted = true;
+            if (captureCamera) {
+                MRLog(@"🎯 SYNC: Starting camera recording first for parallel sync");
+                cameraStarted = startCameraIfRequested(captureCamera, &cameraOutputPath, cameraDeviceId, outputPath, sessionTimestamp);
+                if (!cameraStarted) {
+                    MRLog(@"❌ Camera start failed - aborting");
+                    return Napi::Boolean::New(env, false);
+                }
+                MRLog(@"✅ SYNC: Camera recording started");
+            }
+
+            // Now start screen recording immediately after camera
+            MRLog(@"🎯 SYNC: Starting screen recording immediately");
             bool avResult = startAVFoundationRecording(outputPath, displayID, windowID, captureRect,
                                                       captureCursor, includeMicrophone, includeSystemAudio, audioDeviceId, audioOutputPath);
-            
+
             if (avResult) {
                 MRLog(@"🎥 RECORDING METHOD: AVFoundation");
-                MRLog(@"✅ AVFoundation recording started successfully");
-                
-                if (!startCameraIfRequested(captureCamera, &cameraOutputPath, cameraDeviceId, outputPath, sessionTimestamp)) {
-                    MRLog(@"❌ Camera start failed - stopping AVFoundation session");
-                    stopAVFoundationRecording();
-                    g_isRecording = false;
-                    return Napi::Boolean::New(env, false);
-                }
+                MRLog(@"✅ SYNC: Screen recording started successfully");
 
                 // NOTE: Audio is handled internally by AVFoundation, no need for standalone audio
                 // AVFoundation integrates audio recording directly
@@ -509,10 +534,20 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
             } else {
                 NSLog(@"❌ AVFoundation recording failed to start");
                 NSLog(@"❌ Check permissions and output path validity");
+
+                // Cleanup camera if screen recording failed
+                if (cameraStarted && isCameraRecording()) {
+                    stopCameraRecording();
+                }
             }
         } @catch (NSException *avException) {
             NSLog(@"❌ Exception during AVFoundation startup: %@", avException.reason);
             NSLog(@"❌ Stack trace: %@", [avException callStackSymbols]);
+
+            // Cleanup camera on exception
+            if (isCameraRecording()) {
+                stopCameraRecording();
+            }
         }
         
         // Both ScreenCaptureKit and AVFoundation failed