node-mac-recorder 2.21.3 → 2.21.5

package/.claude/settings.local.json

@@ -5,9 +5,12 @@
       "Bash(node:*)",
       "Bash(timeout:*)",
       "Bash(open:*)",
-      "Read(//Users/onur/codes/**)"
+      "Read(//Users/onur/codes/**)",
+      "Bash(log show:*)",
+      "Bash(MAC_RECORDER_DEBUG=1 node:*)",
+      "Read(//private/tmp/test-recording/**)"
     ],
     "deny": [],
     "ask": []
   }
-}
+}

package/package.json

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

package/src/camera_recorder.mm

@@ -109,34 +109,40 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
 
 + (NSArray<NSDictionary *> *)availableCameraDevices {
     NSMutableArray<NSDictionary *> *devicesInfo = [NSMutableArray array];
-    
+
     NSMutableArray<AVCaptureDeviceType> *deviceTypes = [NSMutableArray array];
     BOOL allowContinuity = MRAllowContinuityCamera();
-    
+
+    // Always include built-in and external cameras
     if (@available(macOS 10.15, *)) {
         [deviceTypes addObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
     } else {
         [deviceTypes addObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
     }
-    
-    if (allowContinuity) {
-        if (@available(macOS 14.0, *)) {
-            [deviceTypes addObject:AVCaptureDeviceTypeContinuityCamera];
-            [deviceTypes addObject:AVCaptureDeviceTypeExternal];
-        } else {
-            [deviceTypes addObject:AVCaptureDeviceTypeExternalUnknown];
-        }
+
+    // ALWAYS add external cameras - they should be available regardless of Continuity permission
+    if (@available(macOS 14.0, *)) {
+        [deviceTypes addObject:AVCaptureDeviceTypeExternal];
+    } else {
+        [deviceTypes addObject:AVCaptureDeviceTypeExternalUnknown];
     }
-    
+
+    // ALWAYS add Continuity Camera type - filtering happens later
+    if (@available(macOS 14.0, *)) {
+        [deviceTypes addObject:AVCaptureDeviceTypeContinuityCamera];
+    }
+
     AVCaptureDeviceDiscoverySession *discoverySession =
         [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes
                                                                mediaType:AVMediaTypeVideo
                                                                 position:AVCaptureDevicePositionUnspecified];
-    
+
     for (AVCaptureDevice *device in discoverySession.devices) {
         BOOL continuityCamera = MRIsContinuityCamera(device);
+        // ONLY skip Continuity cameras when permission is missing
+        // Regular USB/external cameras should ALWAYS be listed
         if (continuityCamera && !allowContinuity) {
-            // Skip Continuity cameras when entitlement/env flag is missing
+            MRLog(@"⏭️ Skipping Continuity Camera (permission required): %@", device.localizedName);
             continue;
         }
         

package/src/mac_recorder.mm

@@ -328,29 +328,29 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
                          (NSBundle.mainBundle.bundlePath && 
                           [NSBundle.mainBundle.bundlePath containsString:@"Electron"]);
         
-        if (isElectron) {
-            MRLog(@"⚡ Electron environment detected - continuing with ScreenCaptureKit");
-            MRLog(@"⚠️ Warning: ScreenCaptureKit in Electron may require additional stability measures");
-        }
-        
         // Check macOS version for ScreenCaptureKit compatibility
         NSOperatingSystemVersion osVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
         BOOL isM15Plus = (osVersion.majorVersion >= 15);
         BOOL isM14Plus = (osVersion.majorVersion >= 14);
         BOOL isM13Plus = (osVersion.majorVersion >= 13);
-        
-        MRLog(@"🖥️ macOS Version: %ld.%ld.%ld", 
+
+        MRLog(@"🖥️ macOS Version: %ld.%ld.%ld",
               (long)osVersion.majorVersion, (long)osVersion.minorVersion, (long)osVersion.patchVersion);
-        
-        // Force AVFoundation for debugging/testing
-        BOOL forceAVFoundation = (getenv("FORCE_AVFOUNDATION") != NULL);
-        if (forceAVFoundation) {
-            MRLog(@"🔧 FORCE_AVFOUNDATION environment variable detected - skipping ScreenCaptureKit");
+
+        if (isElectron) {
+            MRLog(@"⚡ Electron environment detected");
+            MRLog(@"🔧 CRITICAL FIX: Forcing AVFoundation for Electron stability");
+            MRLog(@"   Reason: ScreenCaptureKit has thread safety issues in Electron (SIGTRAP crashes)");
         }
-        
-        // Electron-first priority: This application is built for Electron.js
-        // macOS 15+ → ScreenCaptureKit (including Electron)
-        // macOS 14/13 → AVFoundation (including Electron)
+
+        // Force AVFoundation for debugging/testing OR Electron
+        BOOL forceAVFoundation = (getenv("FORCE_AVFOUNDATION") != NULL) || isElectron;
+        if (getenv("FORCE_AVFOUNDATION") != NULL) {
+            MRLog(@"🔧 FORCE_AVFOUNDATION environment variable detected");
+        }
+
+        // Electron-first priority: ALWAYS use AVFoundation in Electron for stability
+        // ScreenCaptureKit has severe thread safety issues in Electron causing SIGTRAP crashes
         if (isM15Plus && !forceAVFoundation) {
             if (isElectron) {
                 MRLog(@"⚡ ELECTRON PRIORITY: macOS 15+ Electron → ScreenCaptureKit with full support");

package/src/screen_capture_kit.mm

@@ -120,31 +120,33 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
 
 @implementation PureScreenCaptureDelegate
 - (void)stream:(SCStream * API_AVAILABLE(macos(12.3)))stream didStopWithError:(NSError *)error API_AVAILABLE(macos(12.3)) {
-    MRLog(@"🛑 Pure ScreenCapture stream stopped");
+    // ELECTRON FIX: Run cleanup on background thread to avoid blocking Electron
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        MRLog(@"🛑 Pure ScreenCapture stream stopped");
 
-    // Prevent recursive calls during cleanup
-    if (g_isCleaningUp) {
-        MRLog(@"⚠️ Already cleaning up, ignoring delegate callback");
-        return;
-    }
+        // Prevent recursive calls during cleanup
+        if (g_isCleaningUp) {
+            MRLog(@"⚠️ Already cleaning up, ignoring delegate callback");
+            return;
+        }
 
-    @synchronized([ScreenCaptureKitRecorder class]) {
-        g_isRecording = NO;
-    }
+        @synchronized([ScreenCaptureKitRecorder class]) {
+            g_isRecording = NO;
+        }
 
-    if (error) {
-        NSLog(@"❌ Stream error: %@", error);
-    } else {
-        MRLog(@"✅ Stream stopped cleanly");
-    }
+        if (error) {
+            NSLog(@"❌ Stream error: %@", error);
+        } else {
+            MRLog(@"✅ Stream stopped cleanly");
+        }
 
-    // ELECTRON FIX: Don't use dispatch_async to main queue - it can cause crashes
-    // Instead, finalize directly on current thread with synchronization
-    @synchronized([ScreenCaptureKitRecorder class]) {
-        if (!g_isCleaningUp) {
-            [ScreenCaptureKitRecorder finalizeRecording];
+        // Finalize on background thread with synchronization
+        @synchronized([ScreenCaptureKitRecorder class]) {
+            if (!g_isCleaningUp) {
+                [ScreenCaptureKitRecorder finalizeRecording];
+            }
         }
-    }
+    });
 }
 @end
 
@@ -460,16 +462,13 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
         // Reset any stale state
         g_isCleaningUp = NO;
 
-        // Set flag early to prevent race conditions in Electron
-        g_isRecording = YES;
+        // DON'T set g_isRecording here - wait for stream to actually start
+        // This prevents the "recording=1 stream=null" issue
     }
 
     NSString *outputPath = config[@"outputPath"];
     if (!outputPath || [outputPath length] == 0) {
         NSLog(@"❌ Invalid output path provided");
-        @synchronized([ScreenCaptureKitRecorder class]) {
-            g_isRecording = NO;
-        }
         return NO;
     }
     g_outputPath = outputPath;
@@ -495,15 +494,15 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
 
     // ELECTRON FIX: Get shareable content FULLY ASYNCHRONOUSLY
     // NO semaphores, NO blocking - pure async to prevent Electron crashes
-    [SCShareableContent getShareableContentWithCompletionHandler:^(SCShareableContent *content, NSError *contentError) {
-        @autoreleasepool {
-        if (contentError) {
-            NSLog(@"❌ Content error: %@", contentError);
-            @synchronized([ScreenCaptureKitRecorder class]) {
-                g_isRecording = NO;
+    // CRITICAL: Run on background queue to avoid blocking Electron's main thread
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        [SCShareableContent getShareableContentWithCompletionHandler:^(SCShareableContent *content, NSError *contentError) {
+            @autoreleasepool {
+            if (contentError) {
+                NSLog(@"❌ Content error: %@", contentError);
+                // No need to set g_isRecording=NO since it was never set to YES
+                return;  // Early return from completion handler block
             }
-            return;  // Early return from completion handler block
-        }
         
         MRLog(@"✅ Got %lu displays, %lu windows for pure recording", 
               content.displays.count, content.windows.count);
@@ -543,9 +542,7 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
                 recordingHeight = (NSInteger)targetWindow.frame.size.height;
             } else {
                 NSLog(@"❌ Window ID %@ not found", windowId);
-                @synchronized([ScreenCaptureKitRecorder class]) {
-                    g_isRecording = NO;
-                }
+                // No need to set g_isRecording=NO since it was never set to YES
                 return;  // Early return from completion handler block
             }
         }
@@ -575,9 +572,7 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
             
             if (!targetDisplay) {
                 NSLog(@"❌ Display not found");
-                @synchronized([ScreenCaptureKitRecorder class]) {
-                    g_isRecording = NO;
-                }
+                // No need to set g_isRecording=NO since it was never set to YES
                 return;  // Early return from completion handler block
             }
             
@@ -613,7 +608,15 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
         BOOL shouldCaptureMic = includeMicrophone ? [includeMicrophone boolValue] : NO;
         BOOL shouldCaptureSystemAudio = includeSystemAudio ? [includeSystemAudio boolValue] : NO;
         g_shouldCaptureAudio = shouldCaptureMic || shouldCaptureSystemAudio;
-        g_audioOutputPath = audioOutputPath;
+
+        // SAFETY: Ensure audioOutputPath is NSString, not NSURL or other type
+        if (audioOutputPath && ![audioOutputPath isKindOfClass:[NSString class]]) {
+            MRLog(@"⚠️ audioOutputPath type mismatch: %@, converting...", NSStringFromClass([audioOutputPath class]));
+            g_audioOutputPath = nil;
+        } else {
+            g_audioOutputPath = audioOutputPath;
+        }
+
         if (g_shouldCaptureAudio && (!g_audioOutputPath || [g_audioOutputPath length] == 0)) {
             NSLog(@"⚠️ Audio capture requested but no audio output path supplied – audio will be disabled");
             g_shouldCaptureAudio = NO;
@@ -680,9 +683,7 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
         NSError *writerError = nil;
         if (![ScreenCaptureKitRecorder prepareVideoWriterWithWidth:recordingWidth height:recordingHeight error:&writerError]) {
             NSLog(@"❌ Failed to prepare video writer: %@", writerError);
-            @synchronized([ScreenCaptureKitRecorder class]) {
-                g_isRecording = NO;
-            }
+            // No need to set g_isRecording=NO since it was never set to YES
             return;  // Early return from completion handler block
         }
         
@@ -695,29 +696,30 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
             g_audioStreamOutput = nil;
         }
         
+        // Create stream outputs and delegate
         g_streamDelegate = [[PureScreenCaptureDelegate alloc] init];
         g_stream = [[SCStream alloc] initWithFilter:filter configuration:streamConfig delegate:g_streamDelegate];
-        
+
+        // Check if stream was created successfully
         if (!g_stream) {
             NSLog(@"❌ Failed to create pure stream");
             CleanupWriters();
-            @synchronized([ScreenCaptureKitRecorder class]) {
-                g_isRecording = NO;
-            }
             return;  // Early return from completion handler block
         }
-        
+
+        MRLog(@"✅ Stream created successfully");
+
         NSError *outputError = nil;
         BOOL videoOutputAdded = [g_stream addStreamOutput:g_videoStreamOutput type:SCStreamOutputTypeScreen sampleHandlerQueue:g_videoQueue error:&outputError];
         if (!videoOutputAdded || outputError) {
             NSLog(@"❌ Failed to add video output: %@", outputError);
             CleanupWriters();
             @synchronized([ScreenCaptureKitRecorder class]) {
-                g_isRecording = NO;
+                g_stream = nil;
             }
             return;  // Early return from completion handler block
         }
-        
+
         if (g_shouldCaptureAudio) {
             if (@available(macOS 13.0, *)) {
                 NSError *audioError = nil;
@@ -726,7 +728,7 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
                     NSLog(@"❌ Failed to add audio output: %@", audioError);
                     CleanupWriters();
                     @synchronized([ScreenCaptureKitRecorder class]) {
-                        g_isRecording = NO;
+                        g_stream = nil;
                     }
                     return;  // Early return from completion handler block
                 }
@@ -735,27 +737,32 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
                 g_shouldCaptureAudio = NO;
             }
         }
-        
+
         MRLog(@"✅ Stream outputs configured (audio=%d)", g_shouldCaptureAudio);
         if (sessionTimestampNumber) {
             MRLog(@"🕒 Session timestamp: %@", sessionTimestampNumber);
         }
 
-        // ELECTRON FIX: Start capture FULLY ASYNCHRONOUSLY - NO blocking
+        // Start capture - can be async
         [g_stream startCaptureWithCompletionHandler:^(NSError *startError) {
             if (startError) {
                 NSLog(@"❌ Failed to start pure capture: %@", startError);
                 CleanupWriters();
                 @synchronized([ScreenCaptureKitRecorder class]) {
                     g_isRecording = NO;
+                    g_stream = nil;
                 }
             } else {
                 MRLog(@"🎉 PURE ScreenCaptureKit recording started successfully!");
-                // g_isRecording already set to YES at the beginning
+                // NOW set recording flag - stream is actually running
+                @synchronized([ScreenCaptureKitRecorder class]) {
+                    g_isRecording = YES;
+                }
             }
-        }];
+        }];  // End of startCaptureWithCompletionHandler
         }  // End of autoreleasepool
-    }];  // End of getShareableContentWithCompletionHandler
+        }];  // End of getShareableContentWithCompletionHandler
+    });  // End of dispatch_async
 
     // Return immediately - async completion will handle success/failure
     return YES;

package/scripts/test-multi-capture.js

@@ -1,103 +0,0 @@
-const MacRecorder = require("../index");
-const path = require("path");
-const fs = require("fs");
-
-async function main() {
-	const recorder = new MacRecorder();
-
-	// Optional: list audio and camera devices for reference
-	const audioDevices = await recorder.getAudioDevices();
-	const cameraDevices = await recorder.getCameraDevices();
-
-	console.log("Audio devices:");
-	audioDevices.forEach((device, idx) => {
-		console.log(`${idx + 1}. ${device.name} (id: ${device.id})`);
-	});
-
-	console.log("\nCamera devices:");
-	cameraDevices.forEach((device, idx) => {
-		console.log(`${idx + 1}. ${device.name} (id: ${device.id})`);
-	});
-
-	// Pick the first available devices (customize as needed)
-const preferredCamera = cameraDevices.find(device => !device.requiresContinuityCameraPermission);
-const selectedCameraId = preferredCamera ? preferredCamera.id : null;
-if (!selectedCameraId && cameraDevices.length > 0) {
-	console.warn("Skipping camera capture: only Continuity Camera devices detected. Add NSCameraUseContinuityCameraDeviceType to Info.plist or set ALLOW_CONTINUITY_CAMERA=1.");
-}
-
-if (selectedCameraId) {
-	console.log(`\nSelected camera: ${preferredCamera.name} (id: ${selectedCameraId})`);
-} else {
-	console.log("\nSelected camera: none (camera capture disabled)");
-}
-	const selectedMicId = audioDevices[0]?.id || null;
-
-if (selectedCameraId) {
-	recorder.setCameraDevice(selectedCameraId);
-	recorder.setCameraEnabled(true);
-}
-
-	recorder.setAudioSettings({
-		microphone: !!selectedMicId,
-		systemAudio: true,
-	});
-
-	if (selectedMicId) {
-		recorder.setAudioDevice(selectedMicId);
-	}
-
-	const outputDir = path.resolve(__dirname, "../tmp-tests");
-	if (!fs.existsSync(outputDir)) {
-		fs.mkdirSync(outputDir, { recursive: true });
-	}
-
-	const outputPath = path.join(outputDir, `test_capture_${Date.now()}.mov`);
-	console.log("\nStarting recording to:", outputPath);
-
-	recorder.on("recordingStarted", (payload) => {
-		console.log("recordingStarted", payload);
-	});
-	recorder.on("cameraCaptureStarted", (payload) => {
-		console.log("cameraCaptureStarted", payload);
-	});
-	recorder.on("audioCaptureStarted", (payload) => {
-		console.log("audioCaptureStarted", payload);
-	});
-	recorder.on("cameraCaptureStopped", (payload) => {
-		console.log("cameraCaptureStopped", payload);
-	});
-	recorder.on("audioCaptureStopped", (payload) => {
-		console.log("audioCaptureStopped", payload);
-	});
-	recorder.on("stopped", (payload) => {
-		console.log("stopped", payload);
-	});
-	recorder.on("completed", (filePath) => {
-		console.log("completed", filePath);
-	});
-
-	await recorder.startRecording(outputPath, {
-		includeMicrophone: !!selectedMicId,
-		includeSystemAudio: true,
-		captureCursor: true,
-		captureCamera: !!selectedCameraId,
-	});
-
-	console.log("Recording for 10 seconds...");
-	await new Promise((resolve) => setTimeout(resolve, 10_000));
-
-	const result = await recorder.stopRecording();
-	console.log("\nRecording finished:", result);
-
-	console.log("\nArtifacts:");
-	console.log("Video:", result.outputPath);
-	console.log("Camera:", result.cameraOutputPath);
-	console.log("Audio:", result.audioOutputPath);
-	console.log("Session timestamp:", result.sessionTimestamp);
-}
-
-main().catch((error) => {
-	console.error("Test capture failed:", error);
-	process.exit(1);
-});

package/test-electron-fix.js

@@ -1,90 +0,0 @@
-#!/usr/bin/env node
-/**
- * Test script for Electron crash fix
- * Tests ScreenCaptureKit recording with synchronous semaphore-based approach
- */
-
-const MacRecorder = require('./index.js');
-const path = require('path');
-const fs = require('fs');
-
-async function testRecording() {
-    console.log('🧪 Testing ScreenCaptureKit Electron crash fix...\n');
-
-    const recorder = new MacRecorder();
-
-    // Check permissions first
-    console.log('1️⃣ Checking permissions...');
-    const permissions = await recorder.checkPermissions();
-    console.log('   Permissions:', permissions);
-
-    if (!permissions.screenRecording) {
-        console.error('❌ Screen recording permission not granted');
-        console.log('   Please enable screen recording in System Settings > Privacy & Security');
-        process.exit(1);
-    }
-
-    // Get displays
-    console.log('\n2️⃣ Getting displays...');
-    const displays = await recorder.getDisplays();
-    console.log(`   Found ${displays.length} display(s):`);
-    displays.forEach(d => {
-        console.log(`   - Display ${d.id}: ${d.width}x${d.height} (Primary: ${d.isPrimary})`);
-    });
-
-    // Prepare output path
-    const outputDir = path.join(__dirname, 'test-output');
-    if (!fs.existsSync(outputDir)) {
-        fs.mkdirSync(outputDir, { recursive: true });
-    }
-
-    const outputPath = path.join(outputDir, `electron-fix-test-${Date.now()}.mov`);
-
-    try {
-        // Start recording
-        console.log('\n3️⃣ Starting recording...');
-        console.log(`   Output: ${outputPath}`);
-
-        await recorder.startRecording(outputPath, {
-            displayId: displays[0].id,
-            captureCursor: true,
-            includeMicrophone: false,
-            includeSystemAudio: false
-        });
-
-        console.log('✅ Recording started successfully!');
-        console.log('   Recording for 3 seconds...\n');
-
-        // Record for 3 seconds
-        await new Promise(resolve => setTimeout(resolve, 3000));
-
-        // Stop recording
-        console.log('4️⃣ Stopping recording...');
-        const result = await recorder.stopRecording();
-        console.log('✅ Recording stopped successfully!');
-        console.log('   Result:', result);
-
-        // Check output file
-        if (fs.existsSync(outputPath)) {
-            const stats = fs.statSync(outputPath);
-            console.log(`\n✅ Output file created: ${outputPath}`);
-            console.log(`   File size: ${(stats.size / 1024).toFixed(2)} KB`);
-        } else {
-            console.log('\n⚠️ Output file not found (may still be finalizing)');
-        }
-
-        console.log('\n🎉 Test completed successfully! No crashes detected.');
-        console.log('   The Electron crash fix appears to be working.\n');
-
-    } catch (error) {
-        console.error('\n❌ Test failed:', error.message);
-        console.error('   Stack:', error.stack);
-        process.exit(1);
-    }
-}
-
-// Run test
-testRecording().catch(error => {
-    console.error('Fatal error:', error);
-    process.exit(1);
-});