node-mac-recorder 2.16.25 → 2.16.27

package/.claude/settings.local.json

@@ -1,7 +1,8 @@
 {
   "permissions": {
     "allow": [
-      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing external display recording WITH AUDIO - debug version...'');\nconst MacRecorder = require(''./index.js'');\nconst recorder = new MacRecorder();\n\nrecorder.startRecording(''/tmp/external-audio-debug.mov'', {\n  displayId: 3,  // External display\n  includeMicrophone: true,\n  includeSystemAudio: true,\n  captureCursor: true\n})\n  .then(success => {\n    console.log(''Start result:'', success ? ''✅ SUCCESS'' : ''❌ FAILED'');\n    if (success) {\n      setTimeout(() => {\n        console.log(''⏹️ Stopping recording...'');\n        recorder.stopRecording().then(() => {\n          console.log(''✅ Recording stopped'');\n          const fs = require(''fs'');\n          if (fs.existsSync(''/tmp/external-audio-debug.mov'')) {\n            const size = Math.round(fs.statSync(''/tmp/external-audio-debug.mov'').size/1024);\n            console.log(''📹 File size:'', size + ''KB'');\n            if (size > 100) {\n              console.log(''🎉 External display recording with audio SUCCESS!'');\n            } else {\n              console.log(''⚠️ File too small, may have failed'');\n            }\n          } else {\n            console.log(''❌ No output file created'');\n          }\n        });\n      }, 4000); // 4 seconds recording\n    }\n  })\n  .catch(console.error);\n\")"
+      "Bash(FORCE_AVFOUNDATION=1 node test-sequential.js)",
+      "Bash(grep:*)"
     ],
     "deny": [],
     "ask": []

package/package.json

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

package/src/screen_capture_kit.mm

@@ -329,7 +329,6 @@ static NSString *g_outputPath = nil;
     }
     
     NSLog(@"🛑 Stopping pure ScreenCaptureKit recording");
-    g_isCleaningUp = YES;
     
     // Store stream reference to prevent it from being deallocated
     SCStream *streamToStop = g_stream;
@@ -340,11 +339,12 @@ static NSString *g_outputPath = nil;
         }
         NSLog(@"✅ Pure stream stopped");
         
+        // Immediately reset recording state to allow new recordings
+        g_isRecording = NO;
+        
         // 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];
-            }
+            [ScreenCaptureKitRecorder cleanupVideoWriter];
         });
     }];
 }
@@ -360,13 +360,10 @@ static NSString *g_outputPath = nil;
 
 + (void)finalizeRecording {
     @synchronized([ScreenCaptureKitRecorder class]) {
-        if (g_isCleaningUp && g_isRecording == NO) {
-            NSLog(@"⚠️ Already finalizing, skipping duplicate call");
-            return;
-        }
-        
         NSLog(@"🎬 Finalizing pure ScreenCaptureKit recording");
         
+        // Set cleanup flag now that we're actually cleaning up
+        g_isCleaningUp = YES;
         g_isRecording = NO;
         
         if (g_recordingOutput) {

package/src/window_selector.mm

@@ -475,8 +475,45 @@ void updateScreenOverlays();
     NSLog(@"🔥 Current window under cursor: %@", g_currentWindowUnderCursor);
     
     if (g_currentWindowUnderCursor) {
-        g_selectedWindowInfo = [g_currentWindowUnderCursor retain];
-        NSLog(@"🔥 Selected window info set: %@", g_selectedWindowInfo);
+        // Get window's screen information for display ID
+        NSMutableDictionary *windowInfoWithDisplay = [g_currentWindowUnderCursor mutableCopy];
+        
+        // Get window bounds to determine which screen it's on
+        NSNumber *windowX = [g_currentWindowUnderCursor objectForKey:@"x"];
+        NSNumber *windowY = [g_currentWindowUnderCursor objectForKey:@"y"];
+        
+        if (windowX && windowY) {
+            CGFloat x = [windowX doubleValue];
+            CGFloat y = [windowY doubleValue];
+            
+            // Find the display that contains this window
+            CGDirectDisplayID activeDisplays[32];
+            uint32_t displayCount;
+            CGGetActiveDisplayList(32, activeDisplays, &displayCount);
+            
+            CGDirectDisplayID targetDisplayID = 0;
+            for (uint32_t i = 0; i < displayCount; i++) {
+                CGDirectDisplayID displayID = activeDisplays[i];
+                CGRect displayBounds = CGDisplayBounds(displayID);
+                
+                // Check if window center is within this display
+                if (x >= displayBounds.origin.x && x < displayBounds.origin.x + displayBounds.size.width &&
+                    y >= displayBounds.origin.y && y < displayBounds.origin.y + displayBounds.size.height) {
+                    targetDisplayID = displayID;
+                    break;
+                }
+            }
+            
+            if (targetDisplayID != 0) {
+                [windowInfoWithDisplay setObject:@(targetDisplayID) forKey:@"screenId"];
+                NSLog(@"🎯 Window on display ID: %u", targetDisplayID);
+            } else {
+                NSLog(@"⚠️ Could not determine display ID for window");
+            }
+        }
+        
+        g_selectedWindowInfo = [windowInfoWithDisplay retain];
+        NSLog(@"🔥 Selected window info with display ID: %@", g_selectedWindowInfo);
         cleanupWindowSelector();
     } else {
         NSLog(@"⚠️ No window under cursor when button clicked!");
@@ -2360,15 +2397,35 @@ Napi::Value GetSelectedWindowInfo(const Napi::CallbackInfo& info) {
             windowScreen = mainScreen;
         }
         
-        // Simple screen information - no complex mapping
+        // Convert NSScreen to CGDirectDisplayID properly
         NSRect screenFrame = [windowScreen frame];
         NSNumber *screenNumber = [windowScreen deviceDescription][@"NSScreenNumber"];
         
-        NSLog(@"🔍 Window screen: Frame=(%.0f,%.0f,%.0fx%.0f) ScreenNumber=%@", 
+        // Find the actual CGDirectDisplayID that matches this screen's frame
+        CGDirectDisplayID displayID = 0;
+        CGDirectDisplayID activeDisplays[32];
+        uint32_t displayCount;
+        CGGetActiveDisplayList(32, activeDisplays, &displayCount);
+        
+        for (uint32_t i = 0; i < displayCount; i++) {
+            CGDirectDisplayID candidateID = activeDisplays[i];
+            CGRect displayBounds = CGDisplayBounds(candidateID);
+            
+            // Match by screen frame coordinates
+            if (fabs(screenFrame.origin.x - displayBounds.origin.x) < 1.0 &&
+                fabs(screenFrame.origin.y - displayBounds.origin.y) < 1.0 &&
+                fabs(screenFrame.size.width - displayBounds.size.width) < 1.0 &&
+                fabs(screenFrame.size.height - displayBounds.size.height) < 1.0) {
+                displayID = candidateID;
+                break;
+            }
+        }
+        
+        NSLog(@"🔍 Window screen: Frame=(%.0f,%.0f,%.0fx%.0f) NSScreenNumber=%@ → CGDirectDisplayID=%u", 
               screenFrame.origin.x, screenFrame.origin.y, 
-              screenFrame.size.width, screenFrame.size.height, screenNumber);
+              screenFrame.size.width, screenFrame.size.height, screenNumber, displayID);
         
-        result.Set("screenId", Napi::Number::New(env, [screenNumber unsignedIntValue]));
+        result.Set("screenId", Napi::Number::New(env, displayID));
         result.Set("screenX", Napi::Number::New(env, (int)screenFrame.origin.x));
         result.Set("screenY", Napi::Number::New(env, (int)screenFrame.origin.y));
         result.Set("screenWidth", Napi::Number::New(env, (int)screenFrame.size.width));