node-mac-recorder 2.21.4 → 2.21.6

package/.claude/settings.local.json

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

package/package.json

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

package/src/camera_recorder.mm

@@ -127,11 +127,9 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
         [deviceTypes addObject:AVCaptureDeviceTypeExternalUnknown];
     }
 
-    // Only add Continuity Camera type if allowed
-    if (allowContinuity) {
-        if (@available(macOS 14.0, *)) {
-            [deviceTypes addObject:AVCaptureDeviceTypeContinuityCamera];
-        }
+    // ALWAYS add Continuity Camera type - filtering happens later
+    if (@available(macOS 14.0, *)) {
+        [deviceTypes addObject:AVCaptureDeviceTypeContinuityCamera];
     }
 
     AVCaptureDeviceDiscoverySession *discoverySession =

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

@@ -225,10 +225,15 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
 
 @implementation ScreenCaptureAudioOutput
 - (void)stream:(SCStream *)stream didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer ofType:(SCStreamOutputType)type API_AVAILABLE(macos(12.3)) {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        MRLog(@"🎤 First audio sample callback received from ScreenCaptureKit");
+    });
+
     if (!g_isRecording || !g_shouldCaptureAudio) {
         return;
     }
-    
+
     if (@available(macOS 13.0, *)) {
         if (type != SCStreamOutputTypeAudio) {
             return;
@@ -236,8 +241,9 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
     } else {
         return;
     }
-    
+
     if (!CMSampleBufferDataIsReady(sampleBuffer)) {
+        MRLog(@"⚠️ Audio sample buffer data not ready");
         return;
     }
     
@@ -263,11 +269,21 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
     }
     
     if (!g_audioInput.readyForMoreMediaData) {
+        static int notReadyCount = 0;
+        if (notReadyCount++ % 100 == 0) {
+            MRLog(@"⚠️ Audio input not ready for data (count: %d)", notReadyCount);
+        }
         return;
     }
-    
-    if (![g_audioInput appendSampleBuffer:sampleBuffer]) {
+
+    BOOL success = [g_audioInput appendSampleBuffer:sampleBuffer];
+    if (!success) {
         NSLog(@"⚠️ Failed appending audio sample buffer: %@", g_audioWriter.error);
+    } else {
+        static int appendCount = 0;
+        if (appendCount++ % 100 == 0) {
+            MRLog(@"✅ Audio sample appended successfully (count: %d)", appendCount);
+        }
     }
 }
 @end
@@ -365,13 +381,20 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
     [[NSFileManager defaultManager] removeItemAtURL:audioURL error:nil];
     
     NSError *writerError = nil;
+    // CRITICAL FIX: AVAssetWriter does NOT support WebM for audio
+    // Always use QuickTime Movie format (.mov) for audio files
     AVFileType requestedFileType = AVFileTypeQuickTimeMovie;
-    BOOL requestedWebM = NO;
-    if (@available(macOS 15.0, *)) {
-        requestedFileType = @"public.webm";
-        requestedWebM = YES;
+
+    // Ensure path has .mov extension for audio
+    NSString *audioPath = originalPath;
+    if (![audioPath.pathExtension.lowercaseString isEqualToString:@"mov"]) {
+        MRLog(@"⚠️ Audio path has wrong extension '%@', changing to .mov", audioPath.pathExtension);
+        audioPath = [[audioPath stringByDeletingPathExtension] stringByAppendingPathExtension:@"mov"];
+        g_audioOutputPath = audioPath;
     }
-    
+    audioURL = [NSURL fileURLWithPath:audioPath];
+    [[NSFileManager defaultManager] removeItemAtURL:audioURL error:nil];
+
     @try {
         g_audioWriter = [[AVAssetWriter alloc] initWithURL:audioURL fileType:requestedFileType error:&writerError];
     } @catch (NSException *exception) {
@@ -382,28 +405,6 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
         g_audioWriter = nil;
     }
     
-    if ((!g_audioWriter || writerError) && requestedWebM) {
-        MRLog(@"⚠️ ScreenCaptureKit audio writer unavailable (%@) – falling back to QuickTime container", writerError.localizedDescription);
-        NSString *fallbackPath = [[originalPath stringByDeletingPathExtension] stringByAppendingPathExtension:@"mov"];
-        if (!fallbackPath || [fallbackPath length] == 0) {
-            fallbackPath = [originalPath stringByAppendingString:@".mov"];
-        }
-        [[NSFileManager defaultManager] removeItemAtPath:fallbackPath error:nil];
-        NSURL *fallbackURL = [NSURL fileURLWithPath:fallbackPath];
-        g_audioOutputPath = fallbackPath;
-        writerError = nil;
-        @try {
-            g_audioWriter = [[AVAssetWriter alloc] initWithURL:fallbackURL fileType:AVFileTypeQuickTimeMovie error:&writerError];
-        } @catch (NSException *exception) {
-            NSDictionary *info = @{
-                NSLocalizedDescriptionKey: exception.reason ?: @"Failed to initialize audio writer"
-            };
-            writerError = [NSError errorWithDomain:@"ScreenCaptureKitRecorder" code:-202 userInfo:info];
-            g_audioWriter = nil;
-        }
-        audioURL = fallbackURL;
-    }
-    
     if (!g_audioWriter || writerError) {
         NSLog(@"❌ Failed to create audio writer: %@", writerError);
         return NO;
@@ -433,7 +434,10 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
     
     g_audioInput = [AVAssetWriterInput assetWriterInputWithMediaType:AVMediaTypeAudio outputSettings:audioSettings];
     g_audioInput.expectsMediaDataInRealTime = YES;
-    
+
+    MRLog(@"🎙️ Audio input created: sampleRate=%ld, channels=%ld, bitrate=192k",
+          (long)g_configuredSampleRate, (long)channelCount);
+
     if (![g_audioWriter canAddInput:g_audioInput]) {
         NSLog(@"❌ Audio writer cannot add input");
         return NO;
@@ -441,7 +445,8 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
     [g_audioWriter addInput:g_audioInput];
     g_audioWriterStarted = NO;
     g_audioStartTime = kCMTimeInvalid;
-    
+
+    MRLog(@"✅ Audio writer prepared successfully (path: %@)", g_audioOutputPath);
     return YES;
 }
 
@@ -608,24 +613,43 @@ 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;
         }
         
         if (@available(macos 13.0, *)) {
+            // capturesAudio enables audio capture (both mic and system audio)
             streamConfig.capturesAudio = g_shouldCaptureAudio;
-            streamConfig.sampleRate = g_configuredSampleRate;
-            streamConfig.channelCount = g_configuredChannelCount;
+            streamConfig.sampleRate = g_configuredSampleRate ?: 48000;
+            streamConfig.channelCount = g_configuredChannelCount ?: 2;
+
+            // excludesCurrentProcessAudio = YES means ONLY microphone
+            // excludesCurrentProcessAudio = NO means system audio + mic
             streamConfig.excludesCurrentProcessAudio = !shouldCaptureSystemAudio;
+
+            MRLog(@"🎤 Audio config (macOS 13+): capturesAudio=%d, excludeProcess=%d (mic=%d sys=%d)",
+                  g_shouldCaptureAudio, streamConfig.excludesCurrentProcessAudio,
+                  shouldCaptureMic, shouldCaptureSystemAudio);
         }
-        
+
         if (@available(macos 15.0, *)) {
+            // macOS 15+ has explicit microphone control
             streamConfig.captureMicrophone = shouldCaptureMic;
             if (microphoneDeviceId && microphoneDeviceId.length > 0) {
                 streamConfig.microphoneCaptureDeviceID = microphoneDeviceId;
             }
+            MRLog(@"🎤 Microphone (macOS 15+): enabled=%d, deviceID=%@",
+                  shouldCaptureMic, microphoneDeviceId ?: @"default");
         }
         
         // Apply crop area using sourceRect - CONVERT GLOBAL TO DISPLAY-RELATIVE COORDINATES

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);
-});