node-mac-recorder 2.6.6 → 2.6.9

package/debug-screen-selection.js

@@ -0,0 +1,81 @@
+#!/usr/bin/env node
+
+const WindowSelector = require('./window-selector');
+const MacRecorder = require('./index');
+
+async function debugScreenSelection() {
+    console.log('🔍 Screen Selection Debug Test');
+    console.log('================================\n');
+
+    const selector = new WindowSelector();
+    const recorder = new MacRecorder();
+
+    try {
+        // First, let's see what displays MacRecorder sees
+        console.log('📺 MacRecorder displays:');
+        const macDisplays = await recorder.getDisplays();
+        macDisplays.forEach((display, i) => {
+            console.log(`   ${i}: ID=${display.id}, Name="${display.name}", Resolution=${display.resolution}, Primary=${display.isPrimary}`);
+        });
+        console.log('');
+
+        // Start screen selection
+        console.log('🖥️ Starting screen selection...');
+        console.log('   Move mouse to different screens and click "Start Record" on one of them');
+        console.log('');
+
+        const selectedScreen = await selector.selectScreen();
+        
+        console.log('✅ Screen selected!');
+        console.log('📊 Selected screen data:');
+        console.log(JSON.stringify(selectedScreen, null, 2));
+        
+        // Check if this ID exists in MacRecorder displays
+        const matchingDisplay = macDisplays.find(d => d.id === selectedScreen.id);
+        
+        if (matchingDisplay) {
+            console.log('\n✅ MATCH FOUND in MacRecorder displays:');
+            console.log(`   Selected: ${selectedScreen.name} (ID: ${selectedScreen.id})`);
+            console.log(`   MacRecorder: ${matchingDisplay.name} (ID: ${matchingDisplay.id})`);
+        } else {
+            console.log('\n❌ NO MATCH found in MacRecorder displays!');
+            console.log(`   Selected ID: ${selectedScreen.id}`);
+            console.log(`   Available IDs: ${macDisplays.map(d => d.id).join(', ')}`);
+        }
+
+        console.log('\n🎬 Testing actual recording...');
+        console.log('   Setting displayId option and starting short recording');
+        
+        // Set the display ID from screen selection
+        recorder.setOptions({
+            displayId: selectedScreen.id,
+            includeSystemAudio: false,
+            includeMicrophone: false
+        });
+
+        const testFile = `./test-output/screen-selection-test-${Date.now()}.mov`;
+        console.log(`   Recording file: ${testFile}`);
+        
+        await recorder.startRecording(testFile);
+        console.log('   Recording started...');
+        
+        // Record for 3 seconds
+        await new Promise(resolve => setTimeout(resolve, 3000));
+        
+        await recorder.stopRecording();
+        console.log('   Recording stopped');
+        
+        console.log('\n✅ Test completed! Check the recording to see if it captured the correct screen.');
+        
+    } catch (error) {
+        console.error('\n❌ Error during test:', error.message);
+        if (error.stack) {
+            console.error('Stack:', error.stack);
+        }
+        process.exit(1);
+    }
+}
+
+if (require.main === module) {
+    debugScreenSelection();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.6.6",
+	"version": "2.6.9",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [
@@ -42,7 +42,8 @@
 		"example:window-selector": "node examples/window-selector-example.js"
 	},
 	"dependencies": {
-		"node-addon-api": "^7.0.0"
+		"node-addon-api": "^7.0.0",
+		"node-mac-recorder": "^2.6.7"
 	},
 	"devDependencies": {
 		"node-gyp": "^10.0.0"

package/quick-screen-test.js

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+
+const WindowSelector = require('./window-selector');
+
+console.log('Starting screen selection...');
+console.log('Click "Start Record" on ANY screen then this will show the result:');
+
+const selector = new WindowSelector();
+
+selector.startScreenSelection().then(() => {
+    console.log('Screen selection UI shown');
+    
+    // Check every 500ms for selection
+    const checkInterval = setInterval(() => {
+        const selected = selector.getSelectedScreen();
+        if (selected) {
+            console.log('\n🎉 SCREEN SELECTED!');
+            console.log('Selected data:', JSON.stringify(selected, null, 2));
+            clearInterval(checkInterval);
+            process.exit(0);
+        }
+    }, 500);
+    
+    // Timeout after 15 seconds
+    setTimeout(() => {
+        console.log('\n⏰ Timeout - no screen selected');
+        clearInterval(checkInterval);
+        process.exit(1);
+    }, 15000);
+    
+}).catch(error => {
+    console.error('Error:', error.message);
+    process.exit(1);
+});

package/src/window_selector.mm

@@ -53,6 +53,7 @@ void updateScreenOverlays();
 // Custom overlay view class
 @interface WindowSelectorOverlayView : NSView
 @property (nonatomic, strong) NSDictionary *windowInfo;
+@property (nonatomic) BOOL isActiveWindow;
 @end
 
 @implementation WindowSelectorOverlayView
@@ -60,25 +61,44 @@ void updateScreenOverlays();
 - (instancetype)initWithFrame:(NSRect)frameRect {
     self = [super initWithFrame:frameRect];
     if (self) {
+        // Use layer for background instead of custom drawing
         self.wantsLayer = YES;
-        self.layer.backgroundColor = [[NSColor clearColor] CGColor];
-        // Ensure no borders or decorations
-        self.layer.borderWidth = 0.0;
-        self.layer.cornerRadius = 0.0;
+        self.isActiveWindow = YES; // Default to active for current window under mouse
+        
+        // Set purple background with border using layer
+        [self updateAppearance];
+        
+        // Window selector overlay view created
     }
     return self;
 }
 
-- (void)drawRect:(NSRect)dirtyRect {
-    [super drawRect:dirtyRect];
-    
-    if (!self.windowInfo) return;
+- (void)updateAppearance {
+    if (self.isActiveWindow) {
+        // Active window: brighter background
+        self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] CGColor];
+        // Active window appearance set
+    } else {
+        // Inactive window: dimmer background  
+        self.layer.backgroundColor = [[NSColor colorWithRed:0.4 green:0.2 blue:0.6 alpha:0.25] CGColor];
+        // Inactive window appearance set
+    }
     
-    // Background with transparency - purple tone (no border)
-    [[NSColor colorWithRed:0.5 green:0.3 blue:0.8 alpha:0.25] setFill];
-    NSRectFill(self.bounds);
+    // Purple border (same as screen selector)
+    self.layer.borderColor = [[NSColor colorWithRed:0.7 green:0.5 blue:1.0 alpha:0.6] CGColor];
+    self.layer.borderWidth = 4.0;
+    self.layer.cornerRadius = 0.0;
+}
+
+- (void)setIsActiveWindow:(BOOL)isActiveWindow {
+    if (_isActiveWindow != isActiveWindow) {
+        _isActiveWindow = isActiveWindow;
+        [self updateAppearance];
+    }
 }
 
+// Layer-based approach, no custom drawing needed
+
 @end
 
 // Recording preview overlay view - full screen with cutout
@@ -202,9 +222,9 @@ void updateScreenOverlays();
         NSDictionary *screenInfo = [g_allScreens objectAtIndex:screenIndex];
         g_selectedScreenInfo = [screenInfo retain];
         
-        NSLog(@"🖥️ SCREEN BUTTON CLICKED: %@ (%@)", 
+        NSLog(@"🖥️ SCREEN SELECTED: %@ (ID: %@)", 
               [screenInfo objectForKey:@"name"],
-              [screenInfo objectForKey:@"resolution"]);
+              [screenInfo objectForKey:@"id"]);
         
         cleanupScreenSelector();
     }
@@ -463,10 +483,13 @@ void updateOverlay() {
             if (!windowScreen) windowScreen = [NSScreen mainScreen];
             
             // Convert coordinates from CGWindow (top-left) to NSWindow (bottom-left) for the specific screen
-            CGFloat screenHeight = [windowScreen frame].size.height;
+            NSRect screenFrame = [windowScreen frame];
+            CGFloat screenHeight = screenFrame.size.height;
             CGFloat adjustedY = screenHeight - y - height;
             
-            // Use actual window coordinates without clamping to preserve overlay accuracy
+            // Window coordinates are in global space, overlay frame should be screen-relative
+            // Keep X coordinate as-is (already in global space which is what we want)
+            // Only convert Y from top-left to bottom-left coordinate system
             NSRect overlayFrame = NSMakeRect(x, adjustedY, width, height);
             
             NSString *windowTitle = [windowUnderCursor objectForKey:@"title"] ?: @"Untitled";
@@ -495,7 +518,6 @@ void updateOverlay() {
             
             // Update overlay view window info
             [(WindowSelectorOverlayView *)g_overlayView setWindowInfo:windowUnderCursor];
-            [g_overlayView setNeedsDisplay:YES];
             
             // Add/update info label above button
             NSTextField *infoLabel = nil;
@@ -917,20 +939,57 @@ bool startScreenSelection() {
         NSMutableArray *screenInfoArray = [[NSMutableArray alloc] init];
         g_screenOverlayWindows = [[NSMutableArray alloc] init];
         
+        // Get real display IDs like MacRecorder does
+        CGDirectDisplayID activeDisplays[32];
+        uint32_t displayCount;
+        CGError err = CGGetActiveDisplayList(32, activeDisplays, &displayCount);
+        
+        if (err != kCGErrorSuccess) {
+            NSLog(@"❌ Failed to get active display list: %d", err);
+            return false;
+        }
+
         for (NSInteger i = 0; i < [screens count]; i++) {
             NSScreen *screen = [screens objectAtIndex:i];
             NSRect screenFrame = [screen frame];
             
-            // Create screen info dictionary
+            // Get the real CGDirectDisplayID for this screen by matching frame
+            CGDirectDisplayID displayID = 0;
+            
+            // Find matching display by comparing bounds
+            for (uint32_t j = 0; j < displayCount; j++) {
+                CGDirectDisplayID candidateID = activeDisplays[j];
+                CGRect displayBounds = CGDisplayBounds(candidateID);
+                
+                // Compare screen frame with display bounds
+                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;
+                    // Screen matched to display ID
+                    break;
+                }
+            }
+            
+            // Fallback: use array index if no match found
+            if (displayID == 0 && i < displayCount) {
+                displayID = activeDisplays[i];
+                // Used fallback display ID
+            } else if (displayID == 0) {
+                NSLog(@"❌ Screen %ld could not get Display ID", (long)i);
+            }
+            
+            // Create screen info dictionary with real display ID
             NSMutableDictionary *screenInfo = [[NSMutableDictionary alloc] init];
-            [screenInfo setObject:[NSNumber numberWithInteger:i] forKey:@"id"];
+            [screenInfo setObject:[NSNumber numberWithUnsignedInt:displayID] forKey:@"id"]; // Real display ID
             [screenInfo setObject:[NSString stringWithFormat:@"Display %ld", (long)(i + 1)] forKey:@"name"];
             [screenInfo setObject:[NSNumber numberWithInt:(int)screenFrame.origin.x] forKey:@"x"];
             [screenInfo setObject:[NSNumber numberWithInt:(int)screenFrame.origin.y] forKey:@"y"];
             [screenInfo setObject:[NSNumber numberWithInt:(int)screenFrame.size.width] forKey:@"width"];
             [screenInfo setObject:[NSNumber numberWithInt:(int)screenFrame.size.height] forKey:@"height"];
             [screenInfo setObject:[NSString stringWithFormat:@"%.0fx%.0f", screenFrame.size.width, screenFrame.size.height] forKey:@"resolution"];
-            [screenInfo setObject:[NSNumber numberWithBool:(i == 0)] forKey:@"isPrimary"]; // First screen is primary
+            [screenInfo setObject:[NSNumber numberWithBool:(displayID == CGMainDisplayID())] forKey:@"isPrimary"]; // Real primary check
             [screenInfoArray addObject:screenInfo];
             
             // Create overlay window for this screen (FULL screen including menu bar)

package/test-real-screen-ids.js

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+const WindowSelector = require('./window-selector');
+
+async function testRealScreenIDs() {
+    console.log('Testing real screen ID generation...\n');
+    
+    const selector = new WindowSelector();
+    
+    // Start screen selection to generate screen info
+    console.log('Starting screen selection (will timeout in 3 seconds)...');
+    
+    const startPromise = selector.startScreenSelection();
+    
+    // Wait a bit for screen info to be generated
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    
+    // Try to get selected screen info (should be null since nothing selected)
+    const selectedInfo = selector.getSelectedScreen();
+    console.log('Selected screen info (should be null):', selectedInfo);
+    
+    // Clean up
+    try {
+        await selector.stopScreenSelection();
+    } catch (e) {
+        // Ignore
+    }
+    
+    console.log('\nTest completed. Check logs above for screen creation details.');
+}
+
+testRealScreenIDs().catch(console.error);