node-mac-recorder 2.17.17 → 2.17.19

package/index.js

@@ -359,53 +359,10 @@ class MacRecorder extends EventEmitter {
 					// Start cursor tracking automatically with recording
 					let cursorOptions = {};
 
-					// For window recording, use simplified window-relative coordinates
-					if (this.options.windowId) {
-						// Use cached window info from the earlier window detection
-						this.getWindows().then(windows => {
-							const targetWindow = windows.find(w => w.id === this.options.windowId);
-							if (targetWindow) {
-								// Start cursor capture with simplified window-relative tracking
-								this.startCursorCapture(cursorFilePath, {
-									windowRelative: true,
-									windowInfo: {
-										// Use original global window coordinates for reference
-										x: targetWindow.x,
-										y: targetWindow.y,
-										width: targetWindow.width,
-										height: targetWindow.height,
-										displayId: this.options.displayId,
-										// Persist capture area so we can rebuild global offsets reliably
-										captureArea: this.options.captureArea,
-										// Keep a snapshot of the window details for debugging/analytics
-										originalWindow: targetWindow,
-										// Store display info for multi-display coordinate fixes
-										targetDisplay: this.recordingDisplayInfo
-									}
-								}).catch(cursorError => {
-									console.warn('Window cursor tracking failed:', cursorError.message);
-									// Fallback to display recording
-									this.startCursorCapture(cursorFilePath).catch(fallbackError => {
-										console.warn('Fallback cursor tracking failed:', fallbackError.message);
-									});
-								});
-							}
-						}).catch(error => {
-							console.warn('Could not get window info for cursor tracking:', error.message);
-							// Fallback to display cursor tracking
-							this.startCursorCapture(cursorFilePath).catch(cursorError => {
-								console.warn('Cursor tracking failed to start:', cursorError.message);
-							});
-						});
-					} else {
-						// For display recording, use display-relative cursor tracking
-						this.startCursorCapture(cursorFilePath, {
-							displayRelative: true,
-							displayInfo: this.recordingDisplayInfo
-						}).catch(cursorError => {
-							console.warn('Display cursor tracking failed:', cursorError.message);
-						});
-					}
+					// Hem window hem display recording için aynı native cursor tracking kullan
+					this.startCursorCapture(cursorFilePath).catch(cursorError => {
+						console.warn('Cursor tracking failed to start:', cursorError.message);
+					});
 
 					// Timer başlat (progress tracking için)
 					this.recordingTimer = setInterval(() => {
@@ -916,7 +873,34 @@ class MacRecorder extends EventEmitter {
 	/**
 	 * Cursor capture durdurur - dosya yazma işlemini sonlandırır
 	 */
-	async stopCursorCapture() {
+	stopCursorCapture() {
+		if (!this.cursorCaptureInterval) {
+			return false;
+		}
+
+		try {
+			// Native cursor tracking'i durdur
+			const success = nativeBinding.stopCursorTracking();
+
+			this.cursorCaptureInterval = null;
+			this.cursorCaptureFile = null;
+			this.cursorCaptureStartTime = null;
+
+			this.emit("cursorCaptureStopped", {
+				timestamp: Date.now()
+			});
+
+			return success;
+		} catch (error) {
+			console.warn("Error stopping cursor tracking:", error.message);
+			return false;
+		}
+	}
+
+	/**
+	 * LEGACY: Eski JS-based cursor capture durdurmak için geriye uyumluluk
+	 */
+	async _legacyStopCursorCapture() {
 		return new Promise((resolve, reject) => {
 			try {
 				if (!this.cursorCaptureInterval) {

package/package.json

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

package/src/cursor_tracker.mm

@@ -601,13 +601,15 @@ CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef eve
         }
         
         // Cursor data oluştur
+        // Cursor data oluştur - global koordinat sistemi kullan
         NSDictionary *cursorInfo = @{
             @"x": @((int)location.x),
             @"y": @((int)location.y),
             @"timestamp": @(timestamp),
             @"unixTimeMs": @(unixTimeMs),
             @"cursorType": cursorType,
-            @"type": eventType
+            @"type": eventType,
+            @"coordinateSystem": @"global"
         };
         
         // Direkt dosyaya yaz
@@ -651,13 +653,15 @@ void cursorTimerCallback() {
         NSString *cursorType = getCursorType();
         
         // Cursor data oluştur
+        // Cursor data oluştur - global koordinat sistemi kullan
         NSDictionary *cursorInfo = @{
             @"x": @((int)location.x),
             @"y": @((int)location.y),
             @"timestamp": @(timestamp),
             @"unixTimeMs": @(unixTimeMs),
             @"cursorType": cursorType,
-            @"type": @"move"
+            @"type": @"move",
+            @"coordinateSystem": @"global"
         };
         
         // Direkt dosyaya yaz

package/test-output/unified-cursor-1758313640878.json

@@ -0,0 +1 @@
+[{"x":702,"y":607,"timestamp":119,"unixTimeMs":1758313640997,"cursorType":"text","type":"move","coordinateSystem":"display-relative"}

package/test-output/unified-cursor-1758313689471.json

@@ -0,0 +1 @@
+[{"x":702,"y":607,"timestamp":132,"unixTimeMs":1758313689604,"cursorType":"text","type":"move","coordinateSystem":"display-relative"}

package/test-unified-cursor.js

@@ -0,0 +1,75 @@
+#!/usr/bin/env node
+
+const MacRecorder = require('./index.js');
+const fs = require('fs');
+const path = require('path');
+
+async function testUnifiedCursorTracking() {
+    const recorder = new MacRecorder();
+
+    console.log('🎯 Testing unified cursor tracking...');
+
+    // Create test output directory
+    const outputDir = './test-output';
+    if (!fs.existsSync(outputDir)) {
+        fs.mkdirSync(outputDir);
+    }
+
+    const cursorFilePath = path.join(outputDir, `unified-cursor-${Date.now()}.json`);
+
+    try {
+        console.log('Starting native cursor tracking...');
+
+        // Test native cursor tracking
+        const result = await recorder.startCursorCapture(cursorFilePath);
+        console.log('✅ Cursor tracking started:', result);
+
+        console.log('\n🔥 Move your mouse around for 5 seconds...');
+
+        // Wait 5 seconds
+        await new Promise(resolve => setTimeout(resolve, 5000));
+
+        console.log('\nStopping cursor tracking...');
+        const stopped = recorder.stopCursorCapture();
+        console.log('✅ Cursor tracking stopped:', stopped);
+
+        // Wait a bit for file to be written
+        await new Promise(resolve => setTimeout(resolve, 1000));
+
+        // Check if file exists and has content
+        if (fs.existsSync(cursorFilePath)) {
+            const fileContent = fs.readFileSync(cursorFilePath, 'utf8');
+            console.log('📁 File size:', fileContent.length, 'bytes');
+
+            try {
+                const cursorData = JSON.parse(fileContent);
+                console.log('📊 Cursor data points:', cursorData.length);
+
+                if (cursorData.length > 0) {
+                    console.log('📍 First point:', cursorData[0]);
+                    console.log('📍 Last point:', cursorData[cursorData.length - 1]);
+
+                    // Check coordinate system
+                    const coordinateSystems = [...new Set(cursorData.map(p => p.coordinateSystem))];
+                    console.log('🔧 Coordinate systems used:', coordinateSystems);
+                }
+            } catch (parseError) {
+                console.log('⚠️ File content (first 500 chars):', fileContent.substring(0, 500));
+            }
+        } else {
+            console.log('❌ Output file not found:', cursorFilePath);
+        }
+
+    } catch (error) {
+        console.error('❌ Test failed:', error.message);
+    }
+}
+
+// Run test
+testUnifiedCursorTracking().then(() => {
+    console.log('\n✨ Test completed');
+    process.exit(0);
+}).catch(error => {
+    console.error('💥 Test error:', error);
+    process.exit(1);
+});