node-mac-recorder 2.16.31 → 2.16.32

package/cursor-debug-test.js

@@ -0,0 +1,60 @@
+const MacRecorder = require('./index.js');
+
+console.log('🔍 Debugging cursor coordinate scaling issue...\n');
+
+const recorder = new MacRecorder();
+
+async function testCursorScaling() {
+    console.log('Getting display info...');
+    const displays = await recorder.getDisplays();
+    
+    displays.forEach((display, index) => {
+        console.log(`Display ${index}:`);
+        console.log(`  Resolution: ${display.resolution}`);
+        console.log(`  Position: (${display.x}, ${display.y})`);
+        console.log(`  Primary: ${display.isPrimary}`);
+        console.log(`  ID: ${display.id}`);
+    });
+    
+    console.log('\n🎯 Please move your mouse to different corners and press Enter...');
+    console.log('This will help us understand the coordinate mapping issue.\n');
+    
+    const readline = require('readline');
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    
+    let testCount = 0;
+    const testPositions = [
+        'Top-Left corner of the display',
+        'Top-Right corner of the display', 
+        'Bottom-Left corner of the display',
+        'Bottom-Right corner of the display',
+        'Center of the display'
+    ];
+    
+    function nextTest() {
+        if (testCount >= testPositions.length) {
+            console.log('\n✅ Test completed!');
+            rl.close();
+            process.exit(0);
+            return;
+        }
+        
+        console.log(`\n📍 Test ${testCount + 1}: Move mouse to ${testPositions[testCount]} and press Enter:`);
+        rl.question('', () => {
+            const position = recorder.getCursorPosition();
+            console.log(`   Raw cursor position: (${position.rawX || 'N/A'}, ${position.rawY || 'N/A'})`);
+            console.log(`   Logical cursor position: (${position.x}, ${position.y})`);
+            console.log(`   Scale factor: ${position.scaleFactor || 'N/A'}x`);
+            
+            testCount++;
+            nextTest();
+        });
+    }
+    
+    nextTest();
+}
+
+testCursorScaling().catch(console.error);

package/cursor-permission-test.js

@@ -0,0 +1,46 @@
+const MacRecorder = require('./index.js');
+
+async function testCursorPermissions() {
+    console.log('🔒 Testing cursor tracking permissions...\n');
+    
+    const recorder = new MacRecorder();
+    
+    // Check permissions first
+    console.log('1. Checking permissions:');
+    const permissions = await recorder.checkPermissions();
+    console.log('   Screen Recording:', permissions.screenRecording ? '✅' : '❌');
+    console.log('   Accessibility:', permissions.accessibility ? '✅' : '❌');
+    console.log('   Microphone:', permissions.microphone ? '✅' : '❌');
+    
+    if (permissions.error) {
+        console.log('   Error:', permissions.error);
+    }
+    
+    console.log('\n2. Testing direct cursor position (no capture):');
+    for (let i = 0; i < 5; i++) {
+        try {
+            const position = recorder.getCursorPosition();
+            console.log(`   Position ${i+1}: (${position.x}, ${position.y}) - ${position.cursorType}`);
+            
+            if (position.scaleFactor) {
+                console.log(`     Scale: ${position.scaleFactor}x, Display: (${position.displayInfo?.displayX}, ${position.displayInfo?.displayY})`);
+                console.log(`     Logical: ${position.displayInfo?.logicalWidth}x${position.displayInfo?.logicalHeight}`);
+                console.log(`     Physical: ${position.displayInfo?.physicalWidth}x${position.displayInfo?.physicalHeight}`);
+            }
+            
+            await new Promise(resolve => setTimeout(resolve, 500));
+        } catch (error) {
+            console.error(`   Error getting position ${i+1}:`, error.message);
+        }
+    }
+    
+    console.log('\n3. Testing cursor capture status:');
+    const status = recorder.getCursorCaptureStatus();
+    console.log('   Is Capturing:', status.isCapturing);
+    console.log('   Output File:', status.outputFile);
+    console.log('   Display Info:', status.displayInfo);
+    
+    process.exit(0);
+}
+
+testCursorPermissions().catch(console.error);

package/cursor-scaling-debug.js

@@ -0,0 +1,53 @@
+const MacRecorder = require('./index.js');
+
+async function debugCursorScaling() {
+    console.log('🔍 Debugging cursor scaling detection...\n');
+    
+    const recorder = new MacRecorder();
+    
+    // Get all displays
+    const displays = await recorder.getDisplays();
+    console.log('📺 Available displays:');
+    displays.forEach((display, index) => {
+        console.log(`   Display ${index}: ID=${display.id}, ${display.resolution} at (${display.x}, ${display.y}), Primary: ${display.isPrimary}`);
+    });
+    
+    console.log('\n🎯 Current cursor position analysis:');
+    const position = recorder.getCursorPosition();
+    
+    console.log(`   Logical position: (${position.x}, ${position.y})`);
+    console.log(`   Cursor type: ${position.cursorType}`);
+    console.log(`   Event type: ${position.eventType}`);
+    
+    if (position.scaleFactor) {
+        console.log(`   Scale factor detected: ${position.scaleFactor}x`);
+        if (position.displayInfo) {
+            const info = position.displayInfo;
+            console.log(`   Display bounds: (${info.displayX}, ${info.displayY})`);
+            console.log(`   Logical size: ${info.logicalWidth}x${info.logicalHeight}`);
+            console.log(`   Physical size: ${info.physicalWidth}x${info.physicalHeight}`);
+            console.log(`   Raw position: (${position.rawX}, ${position.rawY})`);
+        }
+    } else {
+        console.log(`   ❌ No scale factor detected`);
+        console.log(`   This could mean:`);
+        console.log(`     - getDisplayScalingInfo() didn't find the correct display`);
+        console.log(`     - Display detection logic needs debugging`);
+    }
+    
+    // Find which display the cursor is on
+    console.log('\n🔍 Manual display detection:');
+    displays.forEach((display, index) => {
+        const inX = position.x >= display.x && position.x < display.x + parseInt(display.resolution.split('x')[0]);
+        const inY = position.y >= display.y && position.y < display.y + parseInt(display.resolution.split('x')[1]);
+        const isInside = inX && inY;
+        
+        console.log(`   Display ${index} (${display.resolution}): ${isInside ? '✅ CURSOR IS HERE' : '❌'}`);
+        console.log(`     Bounds: X(${display.x} - ${display.x + parseInt(display.resolution.split('x')[0])}), Y(${display.y} - ${display.y + parseInt(display.resolution.split('x')[1])})`);
+        console.log(`     Cursor: X(${position.x}), Y(${position.y})`);
+    });
+    
+    process.exit(0);
+}
+
+debugCursorScaling().catch(console.error);

package/index.js

@@ -258,6 +258,9 @@ class MacRecorder extends EventEmitter {
 							y: targetDisplay.y,
 							width: parseInt(targetDisplay.resolution.split("x")[0]),
 							height: parseInt(targetDisplay.resolution.split("x")[1]),
+							// Add scaling information for cursor coordinate transformation
+							logicalWidth: parseInt(targetDisplay.resolution.split("x")[0]),
+							logicalHeight: parseInt(targetDisplay.resolution.split("x")[1]),
 						};
 					}
 
@@ -292,6 +295,9 @@ class MacRecorder extends EventEmitter {
 						y: targetDisplay.y,
 						width: parseInt(targetDisplay.resolution.split("x")[0]),
 						height: parseInt(targetDisplay.resolution.split("x")[1]),
+						// Add scaling information for cursor coordinate transformation
+						logicalWidth: parseInt(targetDisplay.resolution.split("x")[0]),
+						logicalHeight: parseInt(targetDisplay.resolution.split("x")[1]),
 					};
 				}
 			} catch (error) {
@@ -696,10 +702,32 @@ class MacRecorder extends EventEmitter {
 						let coordinateSystem = "global";
 
 						if (this.cursorDisplayInfo) {
-							// Offset'leri çıkar (display veya window)
-							// Y koordinat dönüşümü başlangıçta yapıldı
-							x = position.x - this.cursorDisplayInfo.x;
-							y = position.y - this.cursorDisplayInfo.y;
+							// CRITICAL FIX: Handle DPR scaling for cursor coordinates
+							// Get scaling information from native cursor position
+							const scaleFactor = position.scaleFactor || 1;
+							const displayInfo = position.displayInfo;
+							
+							// Convert logical cursor position to physical (if recording uses physical coordinates)
+							let physicalX = position.x;
+							let physicalY = position.y;
+							
+							if (scaleFactor > 1.1 && displayInfo) {
+								// Convert to display-relative logical, then to physical
+								const displayRelativeX = position.x - displayInfo.displayX;
+								const displayRelativeY = position.y - displayInfo.displayY;
+								
+								// Scale to physical coordinates
+								const physicalRelativeX = displayRelativeX * scaleFactor;
+								const physicalRelativeY = displayRelativeY * scaleFactor;
+								
+								// Convert back to global physical
+								physicalX = displayInfo.displayX + physicalRelativeX;
+								physicalY = displayInfo.displayY + physicalRelativeY;
+							}
+							
+							// Offset'leri çıkar (display veya window) - use physical coordinates
+							x = physicalX - this.cursorDisplayInfo.x;
+							y = physicalY - this.cursorDisplayInfo.y;
 
 							if (this.cursorDisplayInfo.windowRelative) {
 								// Window-relative koordinatlar

package/package.json

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

package/src/cursor_tracker.mm

@@ -209,17 +209,8 @@ CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef eve
             CGFloat scaleFactor = [[scalingInfo objectForKey:@"scaleFactor"] doubleValue];
             NSRect displayBounds = [[scalingInfo objectForKey:@"displayBounds"] rectValue];
             
-            if (scaleFactor > 1.1) {
-                // Convert to logical coordinates
-                CGFloat displayRelativeX = rawLocation.x - displayBounds.origin.x;
-                CGFloat displayRelativeY = rawLocation.y - displayBounds.origin.y;
-                
-                CGFloat logicalRelativeX = displayRelativeX / scaleFactor;
-                CGFloat logicalRelativeY = displayRelativeY / scaleFactor;
-                
-                location.x = displayBounds.origin.x + logicalRelativeX;
-                location.y = displayBounds.origin.y + logicalRelativeY;
-            }
+            // Keep logical coordinates - no scaling needed here
+            location = rawLocation;
         }
         NSDate *currentDate = [NSDate date];
         NSTimeInterval timestamp = [currentDate timeIntervalSinceDate:g_trackingStartTime] * 1000; // milliseconds
@@ -291,17 +282,8 @@ void cursorTimerCallback() {
             CGFloat scaleFactor = [[scalingInfo objectForKey:@"scaleFactor"] doubleValue];
             NSRect displayBounds = [[scalingInfo objectForKey:@"displayBounds"] rectValue];
             
-            if (scaleFactor > 1.1) {
-                // Convert to logical coordinates
-                CGFloat displayRelativeX = rawLocation.x - displayBounds.origin.x;
-                CGFloat displayRelativeY = rawLocation.y - displayBounds.origin.y;
-                
-                CGFloat logicalRelativeX = displayRelativeX / scaleFactor;
-                CGFloat logicalRelativeY = displayRelativeY / scaleFactor;
-                
-                location.x = displayBounds.origin.x + logicalRelativeX;
-                location.y = displayBounds.origin.y + logicalRelativeY;
-            }
+            // Keep logical coordinates - no scaling needed here
+            location = rawLocation;
         }
         
         NSDate *currentDate = [NSDate date];
@@ -491,16 +473,34 @@ NSDictionary* getDisplayScalingInfo(CGPoint globalPoint) {
             CGDirectDisplayID displayID = displayIDs[i];
             CGRect displayBounds = CGDisplayBounds(displayID);
             
+            NSLog(@"🔍 Display %u: bounds(%.0f,%.0f %.0fx%.0f), cursor(%.0f,%.0f)", 
+                  displayID, displayBounds.origin.x, displayBounds.origin.y, 
+                  displayBounds.size.width, displayBounds.size.height,
+                  globalPoint.x, globalPoint.y);
+            
+            // CRITICAL FIX: Manual bounds check for better coordinate system compatibility
+            BOOL isInBounds = (globalPoint.x >= displayBounds.origin.x && 
+                              globalPoint.x < displayBounds.origin.x + displayBounds.size.width &&
+                              globalPoint.y >= displayBounds.origin.y && 
+                              globalPoint.y < displayBounds.origin.y + displayBounds.size.height);
+            
+            NSLog(@"🔍 Manual bounds check: %s", isInBounds ? "INSIDE" : "OUTSIDE");
+            
             // Check if point is within this display
-            if (CGRectContainsPoint(displayBounds, globalPoint)) {
+            if (isInBounds) {
                 // Get display scaling info
                 CGSize logicalSize = displayBounds.size;
                 CGSize physicalSize = CGSizeMake(CGDisplayPixelsWide(displayID), CGDisplayPixelsHigh(displayID));
                 
+                NSLog(@"🔍 Scaling info: logical(%.0fx%.0f) physical(%.0fx%.0f)", 
+                      logicalSize.width, logicalSize.height, physicalSize.width, physicalSize.height);
+                
                 CGFloat scaleX = physicalSize.width / logicalSize.width;
                 CGFloat scaleY = physicalSize.height / logicalSize.height;
                 CGFloat scaleFactor = MAX(scaleX, scaleY);
                 
+                NSLog(@"🔍 Scale factors: X=%.2f, Y=%.2f, Final=%.2f", scaleX, scaleY, scaleFactor);
+                
                 return @{
                     @"displayID": @(displayID),
                     @"logicalSize": [NSValue valueWithSize:NSMakeSize(logicalSize.width, logicalSize.height)],
@@ -549,21 +549,9 @@ Napi::Value GetCursorPosition(const Napi::CallbackInfo& info) {
             CGFloat scaleFactor = [[scalingInfo objectForKey:@"scaleFactor"] doubleValue];
             NSRect displayBounds = [[scalingInfo objectForKey:@"displayBounds"] rectValue];
             
-            // CRITICAL FIX: Convert physical coordinates to logical coordinates
-            // CGEventGetLocation returns physical coordinates on Retina displays
-            if (scaleFactor > 1.1) {
-                // Convert to display-relative, then scale down to logical, then back to global logical
-                CGFloat displayRelativeX = rawLocation.x - displayBounds.origin.x;
-                CGFloat displayRelativeY = rawLocation.y - displayBounds.origin.y;
-                
-                // Scale down to logical coordinates
-                CGFloat logicalRelativeX = displayRelativeX / scaleFactor;
-                CGFloat logicalRelativeY = displayRelativeY / scaleFactor;
-                
-                // Convert back to global logical coordinates
-                logicalLocation.x = displayBounds.origin.x + logicalRelativeX;
-                logicalLocation.y = displayBounds.origin.y + logicalRelativeY;
-            }
+            // CGEventGetLocation returns LOGICAL coordinates (correct for JS layer)
+            // Keep logical coordinates - transformation happens in JS layer
+            logicalLocation = rawLocation;
         }
         
         NSString *cursorType = getCursorType();
@@ -602,12 +590,27 @@ Napi::Value GetCursorPosition(const Napi::CallbackInfo& info) {
         result.Set("cursorType", Napi::String::New(env, [cursorType UTF8String]));
         result.Set("eventType", Napi::String::New(env, [eventType UTF8String]));
         
-        // Add scaling debug info
+        // Add scaling info for coordinate transformation
         if (scalingInfo) {
             CGFloat scaleFactor = [[scalingInfo objectForKey:@"scaleFactor"] doubleValue];
+            NSSize logicalSize = [[scalingInfo objectForKey:@"logicalSize"] sizeValue];
+            NSSize physicalSize = [[scalingInfo objectForKey:@"physicalSize"] sizeValue];
+            NSRect displayBounds = [[scalingInfo objectForKey:@"displayBounds"] rectValue];
+            
             result.Set("scaleFactor", Napi::Number::New(env, scaleFactor));
             result.Set("rawX", Napi::Number::New(env, (int)rawLocation.x));
             result.Set("rawY", Napi::Number::New(env, (int)rawLocation.y));
+            
+            // Add display dimension info for JS coordinate transformation
+            Napi::Object displayInfo = Napi::Object::New(env);
+            displayInfo.Set("logicalWidth", Napi::Number::New(env, logicalSize.width));
+            displayInfo.Set("logicalHeight", Napi::Number::New(env, logicalSize.height));
+            displayInfo.Set("physicalWidth", Napi::Number::New(env, physicalSize.width));
+            displayInfo.Set("physicalHeight", Napi::Number::New(env, physicalSize.height));
+            displayInfo.Set("displayX", Napi::Number::New(env, displayBounds.origin.x));
+            displayInfo.Set("displayY", Napi::Number::New(env, displayBounds.origin.y));
+            
+            result.Set("displayInfo", displayInfo);
         }
         
         return result;