node-mac-recorder 2.18.5 → 2.18.6

package/index.js

@@ -705,18 +705,10 @@ class MacRecorder extends EventEmitter {
 			// Calculate video offset based on recording type
 			let videoOffsetX = 0;
 			let videoOffsetY = 0;
-			// CRITICAL FIX: Use physical dimensions for video when scale factor > 1 (AVFoundation)
-			// AVFoundation records at physical resolution, ScreenCaptureKit at logical resolution
-			let videoWidth, videoHeight;
-			if (options.displayInfo.scaleFactor && options.displayInfo.scaleFactor > 1.0) {
-				// AVFoundation case: use physical dimensions to match actual video size
-				videoWidth = options.displayInfo.physicalWidth || options.displayInfo.width || options.displayInfo.logicalWidth;
-				videoHeight = options.displayInfo.physicalHeight || options.displayInfo.height || options.displayInfo.logicalHeight;
-			} else {
-				// ScreenCaptureKit case: use logical dimensions
-				videoWidth = options.displayInfo.width || options.displayInfo.logicalWidth;
-				videoHeight = options.displayInfo.height || options.displayInfo.logicalHeight;
-			}
+			// UNIFIED CURSOR SYSTEM: Always use logical dimensions for cursor coordinates
+			// This ensures cursor tracking works consistently across all recording engines
+			let videoWidth = options.displayInfo.width || options.displayInfo.logicalWidth;
+			let videoHeight = options.displayInfo.height || options.displayInfo.logicalHeight;
 
 			if (options.recordingType === 'window' && options.windowId) {
 				// For window recording: offset = window position in display
@@ -749,6 +741,11 @@ class MacRecorder extends EventEmitter {
 				videoOffsetY: videoOffsetY,
 				videoWidth: videoWidth,
 				videoHeight: videoHeight,
+				// CRITICAL: Video output size for proper cursor scaling
+				videoOutputWidth: (options.displayInfo.scaleFactor > 1.0) ?
+					(options.displayInfo.physicalWidth || videoWidth) : videoWidth,
+				videoOutputHeight: (options.displayInfo.scaleFactor > 1.0) ?
+					(options.displayInfo.physicalHeight || videoHeight) : videoHeight,
 				videoRelative: true,
 				recordingType: options.recordingType || 'display',
 				// Store additional context for debugging
@@ -769,11 +766,14 @@ class MacRecorder extends EventEmitter {
 				scaleFactor: this.recordingDisplayInfo.scaleFactor || 1.0,
 				videoOffsetX: 0,
 				videoOffsetY: 0,
-				// CRITICAL FIX: Use physical dimensions for video when scale factor > 1 (AVFoundation)
-				videoWidth: (this.recordingDisplayInfo.scaleFactor > 1.0) ?
+				// UNIFIED CURSOR SYSTEM: Always use logical dimensions
+				videoWidth: this.recordingDisplayInfo.width || this.recordingDisplayInfo.logicalWidth,
+				videoHeight: this.recordingDisplayInfo.height || this.recordingDisplayInfo.logicalHeight,
+				// CRITICAL: Video output size for proper cursor scaling
+				videoOutputWidth: (this.recordingDisplayInfo.scaleFactor > 1.0) ?
 					(this.recordingDisplayInfo.physicalWidth || this.recordingDisplayInfo.width || this.recordingDisplayInfo.logicalWidth) :
 					(this.recordingDisplayInfo.width || this.recordingDisplayInfo.logicalWidth),
-				videoHeight: (this.recordingDisplayInfo.scaleFactor > 1.0) ?
+				videoOutputHeight: (this.recordingDisplayInfo.scaleFactor > 1.0) ?
 					(this.recordingDisplayInfo.physicalHeight || this.recordingDisplayInfo.height || this.recordingDisplayInfo.logicalHeight) :
 					(this.recordingDisplayInfo.height || this.recordingDisplayInfo.logicalHeight),
 				videoRelative: true,
@@ -828,19 +828,33 @@ class MacRecorder extends EventEmitter {
 							const displayRelativeY = position.y - this.cursorDisplayInfo.displayY;
 
 							// Step 2: Transform display-relative → video-relative coordinates
-							// videoWidth/Height already account for physical vs logical dimensions
 							x = displayRelativeX - this.cursorDisplayInfo.videoOffsetX;
 							y = displayRelativeY - this.cursorDisplayInfo.videoOffsetY;
-							coordinateSystem = "video-relative";
 
-							// Bounds check for video area using correct video dimensions
-							const outsideVideo = x < 0 || y < 0 ||
-								x >= this.cursorDisplayInfo.videoWidth ||
-								y >= this.cursorDisplayInfo.videoHeight;
+							// Step 3: Scale to match actual video output size (for AVFoundation physical scaling)
+							if (this.cursorDisplayInfo.videoOutputWidth && this.cursorDisplayInfo.videoOutputHeight) {
+								const scaleX = this.cursorDisplayInfo.videoOutputWidth / this.cursorDisplayInfo.videoWidth;
+								const scaleY = this.cursorDisplayInfo.videoOutputHeight / this.cursorDisplayInfo.videoHeight;
+
+								if (scaleX !== 1.0 || scaleY !== 1.0) {
+									x = x * scaleX;
+									y = y * scaleY;
+									coordinateSystem = "video-output-scaled";
+								} else {
+									coordinateSystem = "video-relative";
+								}
+							} else {
+								coordinateSystem = "video-relative";
+							}
+
+							// Bounds check for video area using actual video output dimensions
+							const checkWidth = this.cursorDisplayInfo.videoOutputWidth || this.cursorDisplayInfo.videoWidth;
+							const checkHeight = this.cursorDisplayInfo.videoOutputHeight || this.cursorDisplayInfo.videoHeight;
+							const outsideVideo = x < 0 || y < 0 || x >= checkWidth || y >= checkHeight;
 
 							// For debugging - add metadata if cursor is outside video area
 							if (outsideVideo) {
-								coordinateSystem = "video-relative-outside";
+								coordinateSystem = coordinateSystem + "-outside";
 							}
 						}
 

package/package.json

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