node-mac-recorder 2.15.9 → 2.15.10

package/debug-coordinates.js

@@ -0,0 +1,69 @@
+const MacRecorder = require('./index');
+
+async function debugCoordinates() {
+    const recorder = new MacRecorder();
+    const displays = await recorder.getDisplays();
+    
+    console.log('🖥️ Display coordinates analysis:');
+    displays.forEach((display, index) => {
+        console.log(`Display ${index}: ${display.name}`);
+        console.log(`  ID: ${display.id}`);
+        console.log(`  Position: (${display.x}, ${display.y})`);
+        console.log(`  Size: ${display.width}x${display.height}`);
+        console.log(`  isPrimary: ${display.isPrimary}`);
+        console.log('');
+    });
+    
+    // Calculate combined frame like we do in native code
+    let combinedFrame = { x: 0, y: 0, width: 0, height: 0 };
+    let first = true;
+    
+    for (const display of displays) {
+        if (first) {
+            combinedFrame = {
+                x: display.x,
+                y: display.y, 
+                width: display.width,
+                height: display.height
+            };
+            first = false;
+        } else {
+            const minX = Math.min(combinedFrame.x, display.x);
+            const minY = Math.min(combinedFrame.y, display.y);
+            const maxX = Math.max(combinedFrame.x + combinedFrame.width, display.x + display.width);
+            const maxY = Math.max(combinedFrame.y + combinedFrame.height, display.y + display.height);
+            
+            combinedFrame = {
+                x: minX,
+                y: minY,
+                width: maxX - minX,
+                height: maxY - minY
+            };
+        }
+    }
+    
+    console.log('📐 Combined frame calculation:');
+    console.log(`  Origin: (${combinedFrame.x}, ${combinedFrame.y})`);
+    console.log(`  Size: ${combinedFrame.width}x${combinedFrame.height}`);
+    console.log('');
+    
+    console.log('🔄 Coordinate conversion examples:');
+    displays.forEach((display, index) => {
+        console.log(`Display ${index} (${display.name}):`);
+        const localOriginX = display.x - combinedFrame.x;
+        const localOriginY = display.y - combinedFrame.y;
+        console.log(`  Global offset from combined: (${localOriginX}, ${localOriginY})`);
+        
+        // Test window at display origin
+        const testWindowGlobalX = display.x + 100;
+        const testWindowGlobalY = display.y + 100;
+        const localWindowX = testWindowGlobalX - combinedFrame.x;
+        const localWindowY = testWindowGlobalY - combinedFrame.y;
+        
+        console.log(`  Test window at (${testWindowGlobalX}, ${testWindowGlobalY}) global`);
+        console.log(`  -> Local coordinates: (${localWindowX}, ${localWindowY})`);
+        console.log('');
+    });
+}
+
+debugCoordinates();

package/package.json

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

package/src/mac_recorder.mm

@@ -451,13 +451,47 @@ Napi::Value GetDisplays(const Napi::CallbackInfo& info) {
         NSArray *screens = [NSScreen screens];
         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());
+            }
+            
             NSDictionary *displayInfo = @{
-                @"id": @(i + 1),
+                @"id": @(displayID),  // Use real display ID
                 @"name": [NSString stringWithFormat:@"Display %lu", (unsigned long)(i + 1)],
-                @"width": @((int)screen.frame.size.width),
-                @"height": @((int)screen.frame.size.height)
+                @"width": @((int)frame.size.width),
+                @"height": @((int)frame.size.height),
+                @"x": @((int)frame.origin.x),
+                @"y": @((int)frame.origin.y),
+                @"isPrimary": @(isPrimary)
             };
             [displays addObject:displayInfo];
         }

package/test-window-selector-fix.js

@@ -0,0 +1,88 @@
+const MacRecorder = require('./index');
+const WindowSelector = MacRecorder.WindowSelector;
+
+async function testWindowSelector() {
+    console.log('🪟 Testing FIXED window selector multi-display...');
+    
+    const recorder = new MacRecorder();
+    const displays = await recorder.getDisplays();
+    
+    console.log('📊 Display setup:');
+    displays.forEach((display, index) => {
+        console.log(`  ${display.name}: ${display.resolution} at (${display.x}, ${display.y}) ${display.isPrimary ? '[PRIMARY]' : ''}`);
+    });
+    
+    const selector = new WindowSelector();
+    
+    try {
+        console.log('\n🔍 Starting window selection...');
+        console.log('   - Test windows on BOTH displays');
+        console.log('   - Check if buttons appear correctly positioned');
+        console.log('   - Primary display should now work correctly');
+        
+        await selector.startSelection();
+        
+        // Let it run for 20 seconds for thorough testing
+        await new Promise(resolve => setTimeout(resolve, 20000));
+        
+        console.log('🛑 Stopping window selection...');
+        await selector.stopSelection();
+        
+        console.log('✅ Window selector test completed!');
+        
+    } catch (error) {
+        console.log(`❌ Window selector test failed: ${error.message}`);
+        console.log(error.stack);
+    }
+}
+
+async function testSecondaryDisplayRecording() {
+    console.log('\n🎥 Testing secondary display recording...');
+    
+    const recorder = new MacRecorder();
+    const displays = await recorder.getDisplays();
+    
+    const secondaryDisplay = displays.find(d => !d.isPrimary);
+    if (!secondaryDisplay) {
+        console.log('⚠️ No secondary display found');
+        return;
+    }
+    
+    console.log(`🖥️ Testing recording on ${secondaryDisplay.name} (ID: ${secondaryDisplay.id})`);
+    
+    try {
+        const outputPath = `./test-output/secondary-display-fix-test.mov`;
+        
+        await recorder.startRecording(outputPath, {
+            displayId: secondaryDisplay.id,
+            captureCursor: true,
+            includeMicrophone: false,
+            includeSystemAudio: false
+        });
+        
+        console.log('✅ Recording started on secondary display');
+        
+        // Record for 3 seconds
+        await new Promise(resolve => setTimeout(resolve, 3000));
+        
+        await recorder.stopRecording();
+        console.log('✅ Recording completed on secondary display');
+        
+    } catch (error) {
+        console.log(`❌ Secondary display recording failed: ${error.message}`);
+    }
+}
+
+async function runTests() {
+    try {
+        await testWindowSelector();
+        await testSecondaryDisplayRecording();
+        
+        console.log('\n🎉 All tests completed!');
+        
+    } catch (error) {
+        console.log(`❌ Test suite failed: ${error.message}`);
+    }
+}
+
+runTests();