node-mac-recorder 2.21.15 → 2.21.17

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/check-devices.js

@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+
+const MacRecorder = require('./index.js');
+const recorder = new MacRecorder();
+
+async function checkDevices() {
+	console.log('\n🔍 TÜM CİHAZLARI KONTROL ET:\n');
+
+	const cameras = await recorder.getCameraDevices();
+	console.log(`📹 Kamera Cihazları (${cameras.length}):`);
+	cameras.forEach(cam => {
+		console.log(`\n   - ${cam.name}`);
+		console.log(`     ID: ${cam.id}`);
+		console.log(`     Type: ${cam.deviceType || 'N/A'}`);
+		console.log(`     Manufacturer: ${cam.manufacturer}`);
+		console.log(`     Transport: ${cam.transportType}`);
+		console.log(`     Continuity: ${cam.requiresContinuityCameraPermission ? 'YES' : 'NO'}`);
+		console.log(`     Connected: ${cam.isConnected ? 'YES' : 'NO'}`);
+	});
+
+	const audio = await recorder.getAudioDevices();
+	console.log(`\n🎙️ Ses Cihazları (${audio.length}):`);
+	audio.forEach(aud => {
+		console.log(`\n   - ${aud.name}`);
+		console.log(`     ID: ${aud.id}`);
+		console.log(`     Manufacturer: ${aud.manufacturer}`);
+		console.log(`     Transport: ${aud.transportType}`);
+		console.log(`     Default: ${aud.isDefault ? 'YES' : 'NO'}`);
+	});
+
+	console.log('\n✅ İPUCU: iPhone bağlı değilse, Wi-Fi veya USB ile bağla\n');
+	console.log('Continuity Camera şartları:');
+	console.log('  1. iPhone ve Mac aynı Apple ID ile giriş yapmış olmalı');
+	console.log('  2. Her ikisinde de Bluetooth ve Wi-Fi açık olmalı');
+	console.log('  3. iPhone Handoff açık olmalı\n');
+}
+
+checkDevices().catch(err => console.error('Hata:', err));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.21.15",
+	"version": "2.21.17",
 	"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;
@@ -224,27 +223,47 @@ static dispatch_queue_t g_audioCaptureQueue = nil;
     if (!self.session) {
         return YES;
     }
-    
+
     [self.session stopRunning];
     self.session = nil;
     self.audioOutput = nil;
-    
+
+    // CRITICAL FIX: Check if writer exists before trying to finish it
     if (self.writer) {
-        [self.writerInput markAsFinished];
+        // Only mark as finished if writerInput exists
+        if (self.writerInput) {
+            [self.writerInput markAsFinished];
+        }
+
+        __block BOOL finished = NO;
         dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
         [self.writer finishWritingWithCompletionHandler:^{
+            finished = YES;
             dispatch_semaphore_signal(semaphore);
         }];
-        dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC));
+
+        // Reduced timeout to 2 seconds for faster response
+        dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
         dispatch_semaphore_wait(semaphore, timeout);
+
+        if (!finished) {
+            MRLog(@"⚠️ AudioRecorder: Timed out waiting for writer to finish");
+            // Force cancel if timeout
+            [self.writer cancelWriting];
+        } else {
+            MRLog(@"✅ AudioRecorder stopped successfully");
+        }
+    } else {
+        MRLog(@"⚠️ AudioRecorder: No writer to finish (no audio captured)");
     }
-    
+
     self.writer = nil;
     self.writerInput = nil;
     self.writerStarted = NO;
     self.startTime = kCMTimeInvalid;
     self.outputPath = nil;
-    
+
     return YES;
 }
 

package/src/camera_recorder.mm

@@ -677,44 +677,55 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
     if (!self.isRecording) {
         return YES;
     }
-    
+
     self.isShuttingDown = YES;
     self.isRecording = NO;
-    
+
     @try {
         [self.session stopRunning];
     } @catch (NSException *exception) {
         MRLog(@"⚠️ CameraRecorder: Exception while stopping session: %@", exception.reason);
     }
-    
+
     [self.videoOutput setSampleBufferDelegate:nil queue:nil];
-    
+
+    // CRITICAL FIX: Check if assetWriter exists before trying to finish it
+    // If no frames were captured, assetWriter will be nil
+    if (!self.assetWriter) {
+        MRLog(@"⚠️ CameraRecorder: No writer to finish (no frames captured)");
+        [self resetState];
+        return YES; // Success - nothing to finish
+    }
+
     if (self.assetWriterInput) {
         [self.assetWriterInput markAsFinished];
     }
-    
+
     __block BOOL finished = NO;
     dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-    
+
     [self.assetWriter finishWritingWithCompletionHandler:^{
         finished = YES;
         dispatch_semaphore_signal(semaphore);
     }];
-    
-    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC));
+
+    // Reduced timeout to 2 seconds for faster response
+    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
     dispatch_semaphore_wait(semaphore, timeout);
-    
+
     if (!finished) {
         MRLog(@"⚠️ CameraRecorder: Timed out waiting for writer to finish");
+        // Force cancel if timeout
+        [self.assetWriter cancelWriting];
     }
-    
+
     BOOL success = (self.assetWriter.status == AVAssetWriterStatusCompleted);
     if (!success) {
         MRLog(@"⚠️ CameraRecorder: Writer finished with status %ld error %@", (long)self.assetWriter.status, self.assetWriter.error);
     } else {
         MRLog(@"✅ CameraRecorder stopped successfully");
     }
-    
+
     [self resetState];
     return success;
 }

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