node-mac-recorder 2.16.23 → 2.16.25

package/.claude/settings.local.json

@@ -1,7 +1,7 @@
 {
   "permissions": {
     "allow": [
-      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing fixed window selector screen ID mapping...'');\nconst WindowSelector = require(''./window-selector.js'');\nconst selector = new WindowSelector();\n\nconst testResults = [];\n\nselector.checkPermissions().then(perms => {\n  console.log(''✅ Permissions OK'');\n  console.log('''');\n  console.log(''📋 Expected Screen IDs from MacRecorder:'');\n  console.log(''   MacBook (Primary): ID=1, Position=(0,0)'');\n  console.log(''   External Display: ID=3, Position=(-3440,-56)'');\n  console.log('''');\n  \n  return selector.startSelection();\n}).then(() => {\n  console.log(''✅ Window selection started'');\n  console.log(''🎯 Move cursor over windows on BOTH displays to see CGDirectDisplayID mapping logs'');\n  console.log('''');\n  \n  setTimeout(() => {\n    console.log(''⏰ Test complete - stopping window selection'');\n    selector.stopSelection();\n  }, 15000);\n  \n}).catch(console.error);\")"
+      "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\")"
     ],
     "deny": [],
     "ask": []

package/package.json

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

package/src/mac_recorder.mm

@@ -567,50 +567,24 @@ Napi::Value GetDisplays(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
     @try {
-        // Get displays using NSScreen instead of ScreenCapture
-        NSArray *screens = [NSScreen screens];
+        // Get active displays directly using CGDirectDisplayID
         NSMutableArray *displays = [NSMutableArray array];
-        
-        // Get real CGDirectDisplayIDs first
         CGDirectDisplayID activeDisplays[32];
         uint32_t displayCount;
         CGGetActiveDisplayList(32, activeDisplays, &displayCount);
         
-        for (NSUInteger i = 0; i < [screens count]; i++) {
-            NSScreen *screen = [screens objectAtIndex:i];
-            NSRect frame = [screen frame];
-            
-            // Find matching CGDirectDisplayID
-            CGDirectDisplayID displayID = 0;
-            bool isPrimary = false;
-            
-            for (uint32_t j = 0; j < displayCount; j++) {
-                CGDirectDisplayID candidateID = activeDisplays[j];
-                CGRect displayBounds = CGDisplayBounds(candidateID);
-                
-                if (fabs(frame.origin.x - displayBounds.origin.x) < 1.0 &&
-                    fabs(frame.origin.y - displayBounds.origin.y) < 1.0 &&
-                    fabs(frame.size.width - displayBounds.size.width) < 1.0 &&
-                    fabs(frame.size.height - displayBounds.size.height) < 1.0) {
-                    displayID = candidateID;
-                    isPrimary = (candidateID == CGMainDisplayID());
-                    break;
-                }
-            }
-            
-            // Fallback if no match found
-            if (displayID == 0 && i < displayCount) {
-                displayID = activeDisplays[i];
-                isPrimary = (displayID == CGMainDisplayID());
-            }
+        for (uint32_t i = 0; i < displayCount; i++) {
+            CGDirectDisplayID displayID = activeDisplays[i];
+            CGRect displayBounds = CGDisplayBounds(displayID);
+            bool isPrimary = (displayID == CGMainDisplayID());
             
             NSDictionary *displayInfo = @{
-                @"id": @(displayID),  // Use real display ID
-                @"name": [NSString stringWithFormat:@"Display %lu", (unsigned long)(i + 1)],
-                @"width": @((int)frame.size.width),
-                @"height": @((int)frame.size.height),
-                @"x": @((int)frame.origin.x),
-                @"y": @((int)frame.origin.y),
+                @"id": @(displayID),  // Direct CGDirectDisplayID
+                @"name": [NSString stringWithFormat:@"Display %u", (unsigned int)(i + 1)],
+                @"width": @((int)displayBounds.size.width),
+                @"height": @((int)displayBounds.size.height),
+                @"x": @((int)displayBounds.origin.x),
+                @"y": @((int)displayBounds.origin.y),
                 @"isPrimary": @(isPrimary)
             };
             [displays addObject:displayInfo];

package/src/screen_capture_kit.mm

@@ -77,6 +77,10 @@ static NSString *g_outputPath = nil;
     NSLog(@"🔧 Config: cursor=%@ mic=%@ system=%@ display=%@ window=%@ crop=%@", 
           captureCursor, includeMicrophone, includeSystemAudio, displayId, windowId, captureRect);
     
+    // CRITICAL DEBUG: Log EXACT audio parameter values
+    NSLog(@"🔍 AUDIO DEBUG: includeMicrophone type=%@ value=%d", [includeMicrophone class], [includeMicrophone boolValue]);
+    NSLog(@"🔍 AUDIO DEBUG: includeSystemAudio type=%@ value=%d", [includeSystemAudio class], [includeSystemAudio boolValue]);
+    
     // Get shareable content
     [SCShareableContent getShareableContentWithCompletionHandler:^(SCShareableContent *content, NSError *contentError) {
         if (contentError) {
@@ -87,6 +91,15 @@ static NSString *g_outputPath = nil;
         NSLog(@"✅ Got %lu displays, %lu windows for pure recording", 
               content.displays.count, content.windows.count);
         
+        // CRITICAL DEBUG: List all available displays in ScreenCaptureKit
+        NSLog(@"🔍 ScreenCaptureKit available displays:");
+        for (SCDisplay *display in content.displays) {
+            NSLog(@"   Display ID=%u, Size=%dx%d, Frame=(%.0f,%.0f,%.0fx%.0f)", 
+                  display.displayID, (int)display.width, (int)display.height,
+                  display.frame.origin.x, display.frame.origin.y,
+                  display.frame.size.width, display.frame.size.height);
+        }
+        
         SCContentFilter *filter = nil;
         NSInteger recordingWidth = 0;
         NSInteger recordingHeight = 0;
@@ -121,12 +134,20 @@ static NSString *g_outputPath = nil;
             
             if (displayId && [displayId integerValue] != 0) {
                 // Find specific display
+                NSLog(@"🎯 Looking for display ID=%@ in ScreenCaptureKit list", displayId);
                 for (SCDisplay *display in content.displays) {
+                    NSLog(@"   Checking display ID=%u vs requested=%u", display.displayID, [displayId unsignedIntValue]);
                     if (display.displayID == [displayId unsignedIntValue]) {
                         targetDisplay = display;
+                        NSLog(@"✅ FOUND matching display ID=%u", display.displayID);
                         break;
                     }
                 }
+                
+                if (!targetDisplay) {
+                    NSLog(@"❌ Display ID=%@ NOT FOUND in ScreenCaptureKit - using first display as fallback", displayId);
+                    targetDisplay = content.displays.firstObject;
+                }
             } else {
                 // Use first display
                 targetDisplay = content.displays.firstObject;
@@ -188,8 +209,10 @@ static NSString *g_outputPath = nil;
               recordingWidth, recordingHeight, shouldShowCursor);
         
         // AUDIO SUPPORT - Enable both microphone and system audio
+        NSLog(@"🔍 AUDIO PROCESSING: includeMicrophone=%@ includeSystemAudio=%@", includeMicrophone, includeSystemAudio);
         BOOL shouldCaptureMic = includeMicrophone ? [includeMicrophone boolValue] : NO;
         BOOL shouldCaptureSystemAudio = includeSystemAudio ? [includeSystemAudio boolValue] : NO;
+        NSLog(@"🔍 AUDIO COMPUTED: shouldCaptureMic=%d shouldCaptureSystemAudio=%d", shouldCaptureMic, shouldCaptureSystemAudio);
         
         // Enable audio if either microphone or system audio is requested
         if (@available(macOS 13.0, *)) {

package/src/window_selector.mm

@@ -2360,33 +2360,15 @@ Napi::Value GetSelectedWindowInfo(const Napi::CallbackInfo& info) {
             windowScreen = mainScreen;
         }
         
-        // CRITICAL FIX: Add screen information using real CGDirectDisplayID 
+        // Simple screen information - no complex mapping
         NSRect screenFrame = [windowScreen frame];
+        NSNumber *screenNumber = [windowScreen deviceDescription][@"NSScreenNumber"];
         
-        // Find real CGDirectDisplayID for this screen (matching GetDisplays logic)
-        CGDirectDisplayID realDisplayID = 0;
-        CGDirectDisplayID activeDisplays[32];
-        uint32_t displayCount;
-        CGGetActiveDisplayList(32, activeDisplays, &displayCount);
-        
-        for (uint32_t j = 0; j < displayCount; j++) {
-            CGDirectDisplayID candidateID = activeDisplays[j];
-            CGRect displayBounds = CGDisplayBounds(candidateID);
-            
-            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) {
-                realDisplayID = candidateID;
-                break;
-            }
-        }
-        
-        NSLog(@"🔍 Window screen mapping: Frame=(%.0f,%.0f,%.0fx%.0f) → CGDirectDisplayID=%u", 
+        NSLog(@"🔍 Window screen: Frame=(%.0f,%.0f,%.0fx%.0f) ScreenNumber=%@", 
               screenFrame.origin.x, screenFrame.origin.y, 
-              screenFrame.size.width, screenFrame.size.height, realDisplayID);
+              screenFrame.size.width, screenFrame.size.height, screenNumber);
         
-        result.Set("screenId", Napi::Number::New(env, realDisplayID));
+        result.Set("screenId", Napi::Number::New(env, [screenNumber unsignedIntValue]));
         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));