node-mac-recorder 1.2.2 → 1.2.3

package/cursor-data.json

@@ -1,93 +1,359 @@
 [
 	{
-		"x": 1119,
-		"y": 1090,
-		"timestamp": 106,
+		"x": 1947,
+		"y": 780,
+		"timestamp": 85,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1950,
+		"y": 780,
+		"timestamp": 1476,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1954,
+		"y": 778,
+		"timestamp": 1500,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1958,
+		"y": 777,
+		"timestamp": 1518,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1963,
+		"y": 775,
+		"timestamp": 1541,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1967,
+		"y": 775,
+		"timestamp": 1595,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1119,
-		"y": 1080,
-		"timestamp": 407,
+		"x": 1971,
+		"y": 775,
+		"timestamp": 1596,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1119,
-		"y": 1066,
-		"timestamp": 423,
+		"x": 1973,
+		"y": 775,
+		"timestamp": 1617,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1119,
-		"y": 1042,
-		"timestamp": 446,
+		"x": 1975,
+		"y": 775,
+		"timestamp": 1659,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1119,
-		"y": 968,
-		"timestamp": 466,
+		"x": 1977,
+		"y": 775,
+		"timestamp": 1679,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1979,
+		"y": 775,
+		"timestamp": 1744,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1979,
+		"y": 777,
+		"timestamp": 1807,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1973,
+		"y": 782,
+		"timestamp": 1828,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1129,
-		"y": 906,
-		"timestamp": 487,
+		"x": 1968,
+		"y": 787,
+		"timestamp": 1850,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1153,
-		"y": 820,
-		"timestamp": 507,
+		"x": 1957,
+		"y": 793,
+		"timestamp": 1868,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1948,
+		"y": 799,
+		"timestamp": 1891,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1943,
+		"y": 802,
+		"timestamp": 1911,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1168,
-		"y": 782,
-		"timestamp": 528,
+		"x": 1937,
+		"y": 804,
+		"timestamp": 1933,
+		"cursorType": "default",
+		"type": "move"
+	},
+	{
+		"x": 1938,
+		"y": 800,
+		"timestamp": 2309,
+		"cursorType": "default",
+		"type": "move"
+	},
+	{
+		"x": 1939,
+		"y": 799,
+		"timestamp": 2329,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1940,
+		"y": 797,
+		"timestamp": 2435,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1941,
+		"y": 794,
+		"timestamp": 2477,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1941,
+		"y": 792,
+		"timestamp": 2500,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1942,
+		"y": 788,
+		"timestamp": 2518,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1943,
+		"y": 786,
+		"timestamp": 2560,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1945,
+		"y": 784,
+		"timestamp": 2707,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1945,
+		"y": 796,
+		"timestamp": 3544,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 1945,
+		"y": 817,
+		"timestamp": 3568,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1176,
-		"y": 764,
-		"timestamp": 549,
+		"x": 1951,
+		"y": 863,
+		"timestamp": 3589,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1176,
-		"y": 764,
-		"timestamp": 2578,
+		"x": 1956,
+		"y": 925,
+		"timestamp": 3609,
 		"cursorType": "default",
-		"type": "mousedown"
+		"type": "move"
 	},
 	{
-		"x": 1176,
-		"y": 764,
-		"timestamp": 2599,
+		"x": 1966,
+		"y": 983,
+		"timestamp": 3630,
 		"cursorType": "default",
 		"type": "move"
 	},
 	{
-		"x": 1176,
-		"y": 764,
-		"timestamp": 2724,
+		"x": 1970,
+		"y": 1006,
+		"timestamp": 3650,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1978,
+		"y": 1042,
+		"timestamp": 3675,
 		"cursorType": "default",
-		"type": "mouseup"
+		"type": "move"
 	},
 	{
-		"x": 1176,
-		"y": 764,
-		"timestamp": 2744,
+		"x": 1983,
+		"y": 1061,
+		"timestamp": 3693,
 		"cursorType": "default",
 		"type": "move"
+	},
+	{
+		"x": 1986,
+		"y": 1072,
+		"timestamp": 3713,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1990,
+		"y": 1082,
+		"timestamp": 3734,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1991,
+		"y": 1086,
+		"timestamp": 3755,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1993,
+		"y": 1091,
+		"timestamp": 3776,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1994,
+		"y": 1096,
+		"timestamp": 3797,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1995,
+		"y": 1099,
+		"timestamp": 3818,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1997,
+		"y": 1106,
+		"timestamp": 3841,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1997,
+		"y": 1109,
+		"timestamp": 3859,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 1998,
+		"y": 1116,
+		"timestamp": 3882,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 2000,
+		"y": 1120,
+		"timestamp": 3902,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 2000,
+		"y": 1123,
+		"timestamp": 3924,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 2001,
+		"y": 1126,
+		"timestamp": 3945,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 2001,
+		"y": 1129,
+		"timestamp": 3967,
+		"cursorType": "text",
+		"type": "move"
+	},
+	{
+		"x": 2002,
+		"y": 1135,
+		"timestamp": 3986,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 2002,
+		"y": 1142,
+		"timestamp": 4007,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 2002,
+		"y": 1146,
+		"timestamp": 4027,
+		"cursorType": "pointer",
+		"type": "move"
+	},
+	{
+		"x": 2002,
+		"y": 1151,
+		"timestamp": 4049,
+		"cursorType": "pointer",
+		"type": "move"
 	}
 ]

package/cursor-test.js

@@ -1,50 +1,22 @@
-const MacRecorder = require("./index");
-const path = require("path");
-const fs = require("fs");
-
-async function testCursorCapture() {
-	console.log("🎯 Cursor Capture Demo\n");
-
-	const recorder = new MacRecorder();
-	const outputPath = path.join(__dirname, "cursor-data.json");
-
-	try {
-		// Başlat
-		await recorder.startCursorCapture(outputPath);
-		console.log("✅ Kayıt başladı...");
-
-		// 5 saniye bekle
-		console.log("📱 5 saniye hareket ettirin, tıklayın...");
-
-		for (let i = 5; i > 0; i--) {
-			process.stdout.write(`⏳ ${i}... `);
-			await new Promise((resolve) => setTimeout(resolve, 1000));
-		}
-		console.log("\n");
-
-		// Durdur
-		await recorder.stopCursorCapture();
-		console.log("✅ Kayıt tamamlandı!");
-
-		// Sonuç
-		if (fs.existsSync(outputPath)) {
-			const data = JSON.parse(fs.readFileSync(outputPath, "utf8"));
-			console.log(`📄 ${data.length} event kaydedildi -> ${outputPath}`);
-
-			// Basit istatistik
-			const clicks = data.filter((d) => d.type === "mousedown").length;
-			if (clicks > 0) {
-				console.log(`🖱️  ${clicks} click algılandı`);
-			}
-		}
-	} catch (error) {
-		console.error("❌ Hata:", error.message);
-	}
+const MacRecorder = require("./index.js");
+
+const recorder = new MacRecorder();
+
+console.log("Starting cursor tracking test...");
+console.log(
+	"Move your cursor around different applications to test cursor type detection"
+);
+console.log("The test will run for 10 seconds");
+
+try {
+	recorder.startCursorCapture("./cursor-data.json");
+
+	setTimeout(() => {
+		recorder.stopCursorCapture();
+		console.log("Test completed. Check cursor-data.json for results");
+		process.exit(0);
+	}, 10000);
+} catch (error) {
+	console.error("Error during cursor tracking:", error);
+	process.exit(1);
 }
-
-// Direkt çalıştır
-if (require.main === module) {
-	testCursorCapture().catch(console.error);
-}
-
-module.exports = { testCursorCapture };

package/package.json

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

package/src/cursor_tracker.mm

@@ -43,47 +43,113 @@ static bool g_leftMouseDown = false;
 static bool g_rightMouseDown = false;
 static NSString *g_lastEventType = @"move";
 
-// Cursor type detection helper - gerçek cursor type'ı al
+// Event tap callback
+static CGEventRef eventTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *userInfo) {
+    return event;
+}
+
+// Cursor type detection helper - sistem genelindeki cursor type'ı al
 NSString* getCursorType() {
     @autoreleasepool {
         g_cursorTypeCounter++;
         
         @try {
-            // NSCursor.currentCursor kullanarak gerçek cursor type'ı al
-            NSCursor *currentCursor = [NSCursor currentCursor];
+            // Get current cursor info
+            NSCursor *currentCursor = [NSCursor currentSystemCursor];
+            NSString *cursorType = @"default";
+            
+            // Get cursor image info
+            NSImage *cursorImage = [currentCursor image];
+            NSPoint hotSpot = [currentCursor hotSpot];
+            NSSize imageSize = [cursorImage size];
             
-            if (currentCursor == [NSCursor arrowCursor]) {
-                g_lastDetectedCursorType = @"default";
-                return @"default";
-            } else if (currentCursor == [NSCursor pointingHandCursor]) {
-                g_lastDetectedCursorType = @"pointer";
+            // Check cursor type by comparing with standard cursors
+            if ([currentCursor isEqual:[NSCursor pointingHandCursor]] ||
+                (hotSpot.x >= 5 && hotSpot.x <= 7 && hotSpot.y >= 0 && hotSpot.y <= 4) ||
+                (hotSpot.x >= 12 && hotSpot.x <= 14 && hotSpot.y >= 7 && hotSpot.y <= 9)) {
                 return @"pointer";
-            } else if (currentCursor == [NSCursor IBeamCursor]) {
-                g_lastDetectedCursorType = @"text";
+            } else if ([currentCursor isEqual:[NSCursor IBeamCursor]] ||
+                      (hotSpot.x >= 3 && hotSpot.x <= 5 && hotSpot.y >= 8 && hotSpot.y <= 10 && 
+                       imageSize.width <= 10 && imageSize.height >= 16)) {
                 return @"text";
-            } else if (currentCursor == [NSCursor openHandCursor]) {
-                g_lastDetectedCursorType = @"grab";
-                return @"grab";
-            } else if (currentCursor == [NSCursor closedHandCursor]) {
-                g_lastDetectedCursorType = @"grabbing";
-                return @"grabbing";
-            } else if (currentCursor == [NSCursor resizeLeftRightCursor]) {
-                g_lastDetectedCursorType = @"ew-resize";
+            } else if ([currentCursor isEqual:[NSCursor resizeLeftRightCursor]]) {
                 return @"ew-resize";
-            } else if (currentCursor == [NSCursor resizeUpDownCursor]) {
-                g_lastDetectedCursorType = @"ns-resize";
+            } else if ([currentCursor isEqual:[NSCursor resizeUpDownCursor]]) {
                 return @"ns-resize";
-            } else if (currentCursor == [NSCursor crosshairCursor]) {
-                g_lastDetectedCursorType = @"crosshair";
-                return @"crosshair";
-            } else {
-                // Bilinmeyen cursor - default olarak dön
-                g_lastDetectedCursorType = @"default";
-                return @"default";
+            } else if ([currentCursor isEqual:[NSCursor openHandCursor]] || 
+                      [currentCursor isEqual:[NSCursor closedHandCursor]]) {
+                return @"grabbing";
             }
+            
+            // Check if we're in a drag operation
+            CGEventRef event = CGEventCreate(NULL);
+            if (event) {
+                CGEventType eventType = (CGEventType)CGEventGetType(event);
+                if (eventType == kCGEventLeftMouseDragged || 
+                    eventType == kCGEventRightMouseDragged) {
+                    CFRelease(event);
+                    return @"grabbing";
+                }
+                CFRelease(event);
+            }
+            
+            // Get the window under the cursor
+            CGPoint cursorPos = CGEventGetLocation(CGEventCreate(NULL));
+            AXUIElementRef systemWide = AXUIElementCreateSystemWide();
+            AXUIElementRef elementAtPosition = NULL;
+            AXError error = AXUIElementCopyElementAtPosition(systemWide, cursorPos.x, cursorPos.y, &elementAtPosition);
+            
+            if (error == kAXErrorSuccess && elementAtPosition) {
+                CFStringRef role = NULL;
+                error = AXUIElementCopyAttributeValue(elementAtPosition, kAXRoleAttribute, (CFTypeRef*)&role);
+                
+                if (error == kAXErrorSuccess && role) {
+                    NSString *elementRole = (__bridge_transfer NSString*)role;
+                    
+                    // Check for clickable elements that should show pointer cursor
+                    if ([elementRole isEqualToString:@"AXLink"] ||
+                        [elementRole isEqualToString:@"AXButton"] ||
+                        [elementRole isEqualToString:@"AXMenuItem"] ||
+                        [elementRole isEqualToString:@"AXRadioButton"] ||
+                        [elementRole isEqualToString:@"AXCheckBox"]) {
+                        return @"pointer";
+                    }
+                    
+                    // Check subrole for additional pointer cursor elements
+                    CFStringRef subrole = NULL;
+                    error = AXUIElementCopyAttributeValue(elementAtPosition, kAXSubroleAttribute, (CFTypeRef*)&subrole);
+                    if (error == kAXErrorSuccess && subrole) {
+                        NSString *elementSubrole = (__bridge_transfer NSString*)subrole;
+                        
+                        if ([elementSubrole isEqualToString:@"AXClickable"] ||
+                            [elementSubrole isEqualToString:@"AXDisclosureTriangle"] ||
+                            [elementSubrole isEqualToString:@"AXToolbarButton"] ||
+                            [elementSubrole isEqualToString:@"AXCloseButton"] ||
+                            [elementSubrole isEqualToString:@"AXMinimizeButton"] ||
+                            [elementSubrole isEqualToString:@"AXZoomButton"]) {
+                            return @"pointer";
+                        }
+                    }
+                    
+                    // Check for text elements
+                    if ([elementRole isEqualToString:@"AXTextField"] || 
+                        [elementRole isEqualToString:@"AXTextArea"] ||
+                        [elementRole isEqualToString:@"AXStaticText"]) {
+                        return @"text";
+                    }
+                }
+                
+                CFRelease(elementAtPosition);
+            }
+            
+            if (systemWide) {
+                CFRelease(systemWide);
+            }
+            
+            return cursorType;
+            
         } @catch (NSException *exception) {
-            // Hata durumunda default dön
-            g_lastDetectedCursorType = @"default";
+            NSLog(@"Error in getCursorType: %@", exception);
             return @"default";
         }
     }