node-mac-recorder 2.11.0 → 2.12.1

package/package.json

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

package/src/mac_recorder.mm

@@ -183,12 +183,13 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
                     };
                 }
                 
-                // Use ScreenCaptureKit (will exclude overlay windows automatically)
+                // Use ScreenCaptureKit with window exclusion
                 NSError *sckError = nil;
                 if ([ScreenCaptureKitRecorder startRecordingWithConfiguration:sckConfig 
                                                                      delegate:g_delegate 
                                                                         error:&sckError]) {
-                    NSLog(@"✅ ScreenCaptureKit recording started with automatic overlay exclusion");
+                    NSLog(@"🎬 RECORDING METHOD: ScreenCaptureKit");
+                    NSLog(@"✅ ScreenCaptureKit recording started with window exclusion");
                     g_isRecording = true;
                     return Napi::Boolean::New(env, true);
                 } else {
@@ -198,6 +199,7 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
         }
         
         // Fallback: Use AVFoundation (older macOS or ScreenCaptureKit failure)
+        NSLog(@"🎬 RECORDING METHOD: AVFoundation");
         NSLog(@"📼 Falling back to AVFoundation - overlay windows may appear in recording");
         
         // Create capture session
@@ -356,6 +358,7 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
         NSURL *outputURL = [NSURL fileURLWithPath:[NSString stringWithUTF8String:outputPath.c_str()]];
         [g_movieFileOutput startRecordingToOutputFileURL:outputURL recordingDelegate:g_delegate];
         
+        NSLog(@"✅ AVFoundation recording started");
         g_isRecording = true;
         return Napi::Boolean::New(env, true);
         
@@ -374,8 +377,17 @@ Napi::Value StopRecording(const Napi::CallbackInfo& info) {
     }
     
     @try {
-        [g_movieFileOutput stopRecording];
-        [g_captureSession stopRunning];
+        if (g_movieFileOutput) {
+            [g_movieFileOutput stopRecording];
+        }
+        if (g_captureSession) {
+            [g_captureSession stopRunning];
+        }
+        
+        // Try to stop ScreenCaptureKit if it's being used
+        if (@available(macOS 12.3, *)) {
+            [ScreenCaptureKitRecorder stopRecording];
+        }
         
         g_isRecording = false;
         return Napi::Boolean::New(env, true);

package/src/screen_capture_kit.mm

@@ -59,19 +59,68 @@ static BOOL g_isRecording = NO;
                     }
                 }
                 
-                // Get current app windows to exclude
+                // Get current process and Electron app windows to exclude
                 NSMutableArray *excludedWindows = [NSMutableArray array];
+                NSMutableArray *excludedApps = [NSMutableArray array];
+                
+                // Exclude current Node.js process windows (overlay selectors)
                 for (SCWindow *window in content.windows) {
                     if (window.owningApplication.processID == currentPID) {
                         [excludedWindows addObject:window];
-                        NSLog(@"🚫 Excluding overlay window: %@ (PID: %d)", window.title, currentPID);
+                        NSLog(@"🚫 Excluding Node.js overlay window: %@ (PID: %d)", window.title, currentPID);
                     }
                 }
                 
-                // Create content filter - exclude current app windows
+                // Also try to exclude Electron app if running (common overlay use case)
+                for (SCWindow *window in content.windows) {
+                    NSString *appName = window.owningApplication.applicationName;
+                    NSString *windowTitle = window.title ? window.title : @"<No Title>";
+                    
+                    // Debug: Log all windows to see what we're dealing with (only for small subset)
+                    if ([appName containsString:@"Electron"] || [windowTitle containsString:@"camera"]) {
+                        NSLog(@"📋 Found potential exclude window: '%@' from app: '%@' (PID: %d, Level: %ld)", 
+                              windowTitle, appName, window.owningApplication.processID, (long)window.windowLayer);
+                    }
+                    
+                    // Comprehensive Electron window detection
+                    BOOL shouldExclude = NO;
+                    
+                    // Check app name patterns
+                    if ([appName containsString:@"Electron"] || 
+                        [appName isEqualToString:@"electron"] ||
+                        [appName isEqualToString:@"Electron Helper"]) {
+                        shouldExclude = YES;
+                    }
+                    
+                    // Check window title patterns
+                    if ([windowTitle containsString:@"Electron"] ||
+                        [windowTitle containsString:@"camera"] ||
+                        [windowTitle containsString:@"Camera"] ||
+                        [windowTitle containsString:@"overlay"] ||
+                        [windowTitle containsString:@"Overlay"]) {
+                        shouldExclude = YES;
+                    }
+                    
+                    // Check window properties (transparent, always on top windows)
+                    if (window.windowLayer > 100) { // High window levels (like alwaysOnTop)
+                        shouldExclude = YES;
+                        NSLog(@"📋 High-level window detected: '%@' (Level: %ld)", windowTitle, (long)window.windowLayer);
+                    }
+                    
+                    if (shouldExclude) {
+                        [excludedWindows addObject:window];
+                        NSLog(@"🚫 Excluding window: '%@' from %@ (PID: %d, Level: %ld)", 
+                              windowTitle, appName, window.owningApplication.processID, (long)window.windowLayer);
+                    }
+                }
+                
+                NSLog(@"📊 Total windows to exclude: %lu", (unsigned long)excludedWindows.count);
+                
+                // Create content filter - exclude overlay windows from recording
                 SCContentFilter *filter = [[SCContentFilter alloc] 
                     initWithDisplay:targetDisplay 
                     excludingWindows:excludedWindows];
+                NSLog(@"🎯 Using window-level exclusion for overlay prevention");
                 
                 // Create stream configuration
                 SCStreamConfiguration *streamConfig = [[SCStreamConfiguration alloc] init];

package/src/window_selector.mm

@@ -15,6 +15,23 @@ static NSButton *g_selectButton = nil;
 static NSTimer *g_trackingTimer = nil;
 static NSDictionary *g_selectedWindowInfo = nil;
 static NSMutableArray *g_allWindows = nil;
+
+// Functions to hide/show main overlay window during recording
+void hideAllOverlayWindows() {
+    if (g_overlayWindow && [g_overlayWindow isVisible]) {
+        [g_overlayWindow setAlphaValue:0.0];
+        [g_overlayWindow orderOut:nil];
+        NSLog(@"🫥 Hidden main overlay window for recording");
+    }
+}
+
+void showAllOverlayWindows() {
+    if (g_overlayWindow) {
+        [g_overlayWindow setAlphaValue:1.0];
+        [g_overlayWindow orderFront:nil];
+        NSLog(@"👁️ Restored main overlay window after recording");
+    }
+}
 static NSDictionary *g_currentWindowUnderCursor = nil;
 static bool g_bringToFrontEnabled = false; // Default disabled for overlay-only highlighting
 static bool g_hasToggledWindow = false; // Track if any window is currently toggled