node-mac-recorder 2.14.0 → 2.15.1

package/.claude/settings.local.json

@@ -31,7 +31,9 @@
       "Bash(ffmpeg:*)",
       "WebSearch",
       "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''🔍 Testing with proper permissions and Electron env'');\nconst MacRecorder = require(''./index'');\nconst recorder = new MacRecorder();\n\nasync function test() {\n  try {\n    const outputPath = ''./test-output/proper-test.mov'';\n    console.log(''📹 Starting recording...'');\n    const success = await recorder.startRecording(outputPath, {\n      captureCursor: true,\n      includeMicrophone: false,\n      includeSystemAudio: false\n    });\n    \n    if (success) {\n      console.log(''✅ Recording started - waiting 2 seconds'');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      console.log(''🛑 Stopping recording...'');\n      await recorder.stopRecording();\n      console.log(''✅ Test completed'');\n    } else {\n      console.log(''❌ Recording start failed'');\n    }\n  } catch (error) {\n    console.log(''❌ Error:'', error.message);\n  }\n}\n\ntest();\n\")",
-      "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''''🔍 Debugging frame writing...'''');\nconst MacRecorder = require(''''./index'''');\nconst recorder = new MacRecorder();\n\nasync function debugFrameWriting() {\n  try {\n    const outputPath = ''''./test-output/frame-debug.mov'''';\n    console.log(''''📹 Starting debug test...'''');\n    \n    const success = await recorder.startRecording(outputPath);\n    \n    if (success) {\n      console.log(''''⏱️ Recording for 2 seconds...'''');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      \n      console.log(''''🛑 Stopping...'''');\n      await recorder.stopRecording();\n      \n      // Wait for finalization\n      await new Promise(resolve => setTimeout(resolve, 1000));\n      \n    } else {\n      console.log(''''❌ Failed to start'''');\n    }\n  } catch (error) {\n    console.log(''''❌ Error:'''', error);\n  }\n}\n\ndebugFrameWriting();\n\")"
+      "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''''🔍 Debugging frame writing...'''');\nconst MacRecorder = require(''''./index'''');\nconst recorder = new MacRecorder();\n\nasync function debugFrameWriting() {\n  try {\n    const outputPath = ''''./test-output/frame-debug.mov'''';\n    console.log(''''📹 Starting debug test...'''');\n    \n    const success = await recorder.startRecording(outputPath);\n    \n    if (success) {\n      console.log(''''⏱️ Recording for 2 seconds...'''');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      \n      console.log(''''🛑 Stopping...'''');\n      await recorder.stopRecording();\n      \n      // Wait for finalization\n      await new Promise(resolve => setTimeout(resolve, 1000));\n      \n    } else {\n      console.log(''''❌ Failed to start'''');\n    }\n  } catch (error) {\n    console.log(''''❌ Error:'''', error);\n  }\n}\n\ndebugFrameWriting();\n\")",
+      "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''🔍 Testing with proper permissions and Electron env'');\nconst MacRecorder = require(''./index'');\nconst recorder = new MacRecorder();\n\nasync function test() {\n  try {\n    const outputPath = ''./test-output/crash-test.mov'';\n    console.log(''📹 Starting recording...'');\n    const success = await recorder.startRecording(outputPath, {\n      captureCursor: true,\n      includeMicrophone: false,\n      includeSystemAudio: false\n    });\n    \n    if (success) {\n      console.log(''✅ Recording started - waiting 3 seconds'');\n      await new Promise(resolve => setTimeout(resolve, 3000));\n      console.log(''🛑 Stopping recording...'');\n      await recorder.stopRecording();\n      console.log(''✅ Test completed without crash'');\n    } else {\n      console.log(''❌ Recording start failed'');\n    }\n  } catch (error) {\n    console.log(''❌ Error:'', error.message);\n    console.log(''Stack:'', error.stack);\n  }\n}\n\ntest();\n\")",
+      "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''🔍 Debugging frame writing...'');\nconst MacRecorder = require(''./index'');\nconst recorder = new MacRecorder();\n\nasync function debugFrameWriting() {\n  try {\n    const outputPath = ''./test-output/frame-debug.mov'';\n    console.log(''📹 Starting debug test...'');\n    \n    const success = await recorder.startRecording(outputPath);\n    \n    if (success) {\n      console.log(''⏱️ Recording for 2 seconds...'');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      \n      console.log(''🛑 Stopping...'');\n      await recorder.stopRecording();\n      \n      // Wait for finalization\n      await new Promise(resolve => setTimeout(resolve, 1000));\n      \n    } else {\n      console.log(''❌ Failed to start'');\n    }\n  } catch (error) {\n    console.log(''❌ Error:'', error);\n  }\n}\n\ndebugFrameWriting();\n\")"
     ],
     "deny": []
   }

package/package.json

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

package/src/screen_capture_kit.mm

@@ -5,6 +5,7 @@ static SCStream * API_AVAILABLE(macos(12.3)) g_stream = nil;
 static SCRecordingOutput * API_AVAILABLE(macos(15.0)) g_recordingOutput = nil;
 static id<SCStreamDelegate> API_AVAILABLE(macos(12.3)) g_streamDelegate = nil;
 static BOOL g_isRecording = NO;
+static BOOL g_isCleaningUp = NO;  // Prevent recursive cleanup
 static NSString *g_outputPath = nil;
 
 @interface PureScreenCaptureDelegate : NSObject <SCStreamDelegate>
@@ -13,6 +14,13 @@ static NSString *g_outputPath = nil;
 @implementation PureScreenCaptureDelegate
 - (void)stream:(SCStream * API_AVAILABLE(macos(12.3)))stream didStopWithError:(NSError *)error API_AVAILABLE(macos(12.3)) {
     NSLog(@"🛑 Pure ScreenCapture stream stopped");
+    
+    // Prevent recursive calls during cleanup
+    if (g_isCleaningUp) {
+        NSLog(@"⚠️ Already cleaning up, ignoring delegate callback");
+        return;
+    }
+    
     g_isRecording = NO;
     
     if (error) {
@@ -21,7 +29,12 @@ static NSString *g_outputPath = nil;
         NSLog(@"✅ Stream stopped cleanly");
     }
     
-    [ScreenCaptureKitRecorder finalizeRecording];
+    // Use dispatch_async to prevent potential deadlocks in Electron
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (!g_isCleaningUp) {  // Double-check before finalizing
+            [ScreenCaptureKitRecorder finalizeRecording];
+        }
+    });
 }
 @end
 
@@ -35,9 +48,14 @@ static NSString *g_outputPath = nil;
 }
 
 + (BOOL)startRecordingWithConfiguration:(NSDictionary *)config delegate:(id)delegate error:(NSError **)error {
-    if (g_isRecording) {
-        NSLog(@"⚠️ Already recording");
-        return NO;
+    @synchronized([ScreenCaptureKitRecorder class]) {
+        if (g_isRecording || g_isCleaningUp) {
+            NSLog(@"⚠️ Already recording or cleaning up (recording:%d cleaning:%d)", g_isRecording, g_isCleaningUp);
+            return NO;
+        }
+        
+        // Reset any stale state
+        g_isCleaningUp = NO;
     }
     
     g_outputPath = config[@"outputPath"];
@@ -45,14 +63,14 @@ static NSString *g_outputPath = nil;
     // Extract configuration options
     NSNumber *displayId = config[@"displayId"];
     NSNumber *windowId = config[@"windowId"];
-    NSValue *captureAreaValue = config[@"captureArea"];
+    NSDictionary *captureRect = config[@"captureRect"];
     NSNumber *captureCursor = config[@"captureCursor"];
     NSNumber *includeMicrophone = config[@"includeMicrophone"];
     NSNumber *includeSystemAudio = config[@"includeSystemAudio"];
     
     NSLog(@"🎬 Starting PURE ScreenCaptureKit recording (NO AVFoundation)");
-    NSLog(@"🔧 Config: cursor=%@ mic=%@ system=%@ display=%@ window=%@", 
-          captureCursor, includeMicrophone, includeSystemAudio, displayId, windowId);
+    NSLog(@"🔧 Config: cursor=%@ mic=%@ system=%@ display=%@ window=%@ crop=%@", 
+          captureCursor, includeMicrophone, includeSystemAudio, displayId, windowId, captureRect);
     
     // Get shareable content
     [SCShareableContent getShareableContentWithCompletionHandler:^(SCShareableContent *content, NSError *contentError) {
@@ -121,6 +139,20 @@ static NSString *g_outputPath = nil;
             recordingHeight = targetDisplay.height;
         }
         
+        // CROP AREA SUPPORT - Adjust dimensions and source rect
+        if (captureRect && captureRect[@"width"] && captureRect[@"height"]) {
+            CGFloat cropWidth = [captureRect[@"width"] doubleValue];
+            CGFloat cropHeight = [captureRect[@"height"] doubleValue];
+            
+            if (cropWidth > 0 && cropHeight > 0) {
+                NSLog(@"🔲 Crop area specified: %.0fx%.0f at (%.0f,%.0f)", 
+                      cropWidth, cropHeight, 
+                      [captureRect[@"x"] doubleValue], [captureRect[@"y"] doubleValue]);
+                recordingWidth = (NSInteger)cropWidth;
+                recordingHeight = (NSInteger)cropHeight;
+            }
+        }
+        
         // Configure stream with extracted options
         SCStreamConfiguration *streamConfig = [[SCStreamConfiguration alloc] init];
         streamConfig.width = recordingWidth;
@@ -129,6 +161,20 @@ static NSString *g_outputPath = nil;
         streamConfig.pixelFormat = kCVPixelFormatType_32BGRA;
         streamConfig.scalesToFit = NO;
         
+        // Apply crop area using sourceRect
+        if (captureRect && captureRect[@"x"] && captureRect[@"y"] && captureRect[@"width"] && captureRect[@"height"]) {
+            CGFloat cropX = [captureRect[@"x"] doubleValue];
+            CGFloat cropY = [captureRect[@"y"] doubleValue];
+            CGFloat cropWidth = [captureRect[@"width"] doubleValue];
+            CGFloat cropHeight = [captureRect[@"height"] doubleValue];
+            
+            if (cropWidth > 0 && cropHeight > 0) {
+                CGRect sourceRect = CGRectMake(cropX, cropY, cropWidth, cropHeight);
+                streamConfig.sourceRect = sourceRect;
+                NSLog(@"✂️ Crop sourceRect applied: (%.0f,%.0f) %.0fx%.0f", cropX, cropY, cropWidth, cropHeight);
+            }
+        }
+        
         // CURSOR SUPPORT
         BOOL shouldShowCursor = captureCursor ? [captureCursor boolValue] : YES;
         streamConfig.showsCursor = shouldShowCursor;
@@ -219,18 +265,29 @@ static NSString *g_outputPath = nil;
 }
 
 + (void)stopRecording {
-    if (!g_isRecording || !g_stream) {
+    if (!g_isRecording || !g_stream || g_isCleaningUp) {
+        NSLog(@"⚠️ Cannot stop: recording=%d stream=%@ cleaning=%d", g_isRecording, g_stream, g_isCleaningUp);
         return;
     }
     
     NSLog(@"🛑 Stopping pure ScreenCaptureKit recording");
+    g_isCleaningUp = YES;
     
-    [g_stream stopCaptureWithCompletionHandler:^(NSError *error) {
+    // Store stream reference to prevent it from being deallocated
+    SCStream *streamToStop = g_stream;
+    
+    [streamToStop stopCaptureWithCompletionHandler:^(NSError *error) {
         if (error) {
             NSLog(@"❌ Stop error: %@", error);
         }
         NSLog(@"✅ Pure stream stopped");
-        [ScreenCaptureKitRecorder finalizeRecording];
+        
+        // Finalize on main queue to prevent threading issues
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (g_isCleaningUp) {  // Only finalize if we initiated cleanup
+                [ScreenCaptureKitRecorder finalizeRecording];
+            }
+        });
     }];
 }
 
@@ -244,16 +301,23 @@ static NSString *g_outputPath = nil;
 }
 
 + (void)finalizeRecording {
-    NSLog(@"🎬 Finalizing pure ScreenCaptureKit recording");
-    
-    g_isRecording = NO;
-    
-    if (g_recordingOutput) {
-        // SCRecordingOutput finalizes automatically
-        NSLog(@"✅ Pure recording output finalized");
+    @synchronized([ScreenCaptureKitRecorder class]) {
+        if (g_isCleaningUp && g_isRecording == NO) {
+            NSLog(@"⚠️ Already finalizing, skipping duplicate call");
+            return;
+        }
+        
+        NSLog(@"🎬 Finalizing pure ScreenCaptureKit recording");
+        
+        g_isRecording = NO;
+        
+        if (g_recordingOutput) {
+            // SCRecordingOutput finalizes automatically
+            NSLog(@"✅ Pure recording output finalized");
+        }
+        
+        [ScreenCaptureKitRecorder cleanupVideoWriter];
     }
-    
-    [ScreenCaptureKitRecorder cleanupVideoWriter];
 }
 
 + (void)finalizeVideoWriter {
@@ -262,13 +326,31 @@ static NSString *g_outputPath = nil;
 }
 
 + (void)cleanupVideoWriter {
-    g_stream = nil;
-    g_recordingOutput = nil;
-    g_streamDelegate = nil;
-    g_isRecording = NO;
-    g_outputPath = nil;
-    
-    NSLog(@"🧹 Pure ScreenCaptureKit cleanup complete");
+    @synchronized([ScreenCaptureKitRecorder class]) {
+        NSLog(@"🧹 Starting ScreenCaptureKit cleanup");
+        
+        // Clean up in proper order to prevent crashes
+        if (g_stream) {
+            g_stream = nil;
+            NSLog(@"✅ Stream reference cleared");
+        }
+        
+        if (g_recordingOutput) {
+            g_recordingOutput = nil;
+            NSLog(@"✅ Recording output reference cleared");
+        }
+        
+        if (g_streamDelegate) {
+            g_streamDelegate = nil;
+            NSLog(@"✅ Stream delegate reference cleared");
+        }
+        
+        g_isRecording = NO;
+        g_isCleaningUp = NO;  // Reset cleanup flag
+        g_outputPath = nil;
+        
+        NSLog(@"🧹 Pure ScreenCaptureKit cleanup complete");
+    }
 }
 
 @end