node-mac-recorder 1.2.6 → 1.2.7

package/cursor-data-1751364226346.json

@@ -0,0 +1 @@
+[]

package/cursor-data-1751364314136.json

@@ -0,0 +1 @@
+[]

package/index.js

@@ -32,6 +32,8 @@ class MacRecorder extends EventEmitter {
 		this.cursorCaptureStartTime = null;
 		this.cursorCaptureFirstWrite = true;
 		this.lastCapturedData = null;
+		this.cursorDisplayInfo = null;
+		this.recordingDisplayInfo = null;
 
 		this.options = {
 			includeMicrophone: false, // Default olarak mikrofon kapalı
@@ -44,6 +46,10 @@ class MacRecorder extends EventEmitter {
 			displayId: null, // Hangi ekranı kaydedeceği (null = ana ekran)
 			windowId: null, // Hangi pencereyi kaydedeceği (null = tam ekran)
 		};
+
+		// Display cache için async initialization
+		this.cachedDisplays = null;
+		this.refreshDisplayCache();
 	}
 
 	/**
@@ -189,6 +195,16 @@ class MacRecorder extends EventEmitter {
 					// DisplayId'yi ayarla
 					if (targetDisplayId !== null) {
 						this.options.displayId = targetDisplayId;
+
+						// Recording için display bilgisini sakla (cursor capture için)
+						const targetDisplay = displays[targetDisplayId];
+						this.recordingDisplayInfo = {
+							displayId: targetDisplayId,
+							x: targetDisplay.x,
+							y: targetDisplay.y,
+							width: parseInt(targetDisplay.resolution.split("x")[0]),
+							height: parseInt(targetDisplay.resolution.split("x")[1]),
+						};
 					}
 
 					this.options.captureArea = {
@@ -210,6 +226,25 @@ class MacRecorder extends EventEmitter {
 			}
 		}
 
+		// DisplayId manuel ayarlanmışsa display bilgisini sakla
+		if (this.options.displayId !== null && !this.recordingDisplayInfo) {
+			try {
+				const displays = await this.getDisplays();
+				if (this.options.displayId < displays.length) {
+					const targetDisplay = displays[this.options.displayId];
+					this.recordingDisplayInfo = {
+						displayId: this.options.displayId,
+						x: targetDisplay.x,
+						y: targetDisplay.y,
+						width: parseInt(targetDisplay.resolution.split("x")[0]),
+						height: parseInt(targetDisplay.resolution.split("x")[1]),
+					};
+				}
+			} catch (error) {
+				console.warn("Display bilgisi alınamadı:", error.message);
+			}
+		}
+
 		// Çıkış dizinini oluştur
 		const outputDir = path.dirname(outputPath);
 		if (!fs.existsSync(outputDir)) {
@@ -291,6 +326,7 @@ class MacRecorder extends EventEmitter {
 				}
 
 				this.isRecording = false;
+				this.recordingDisplayInfo = null;
 
 				const result = {
 					code: success ? 0 : 1,
@@ -311,6 +347,7 @@ class MacRecorder extends EventEmitter {
 				resolve(result);
 			} catch (error) {
 				this.isRecording = false;
+				this.recordingDisplayInfo = null;
 				if (this.recordingTimer) {
 					clearInterval(this.recordingTimer);
 					this.recordingTimer = null;
@@ -458,16 +495,52 @@ class MacRecorder extends EventEmitter {
 
 	/**
 	 * Cursor capture başlatır - otomatik olarak dosyaya yazmaya başlar
+	 * Recording başlatılmışsa otomatik olarak display-relative koordinatlar kullanır
+	 * @param {string} filepath - Cursor data JSON dosya yolu
 	 */
-	async startCursorCapture(filepath) {
-		if (!filepath) {
-			throw new Error("File path is required");
+	async startCursorCapture(intervalOrFilepath = 100) {
+		let filepath;
+		let interval = 20; // Default 50 FPS
+
+		// Parameter parsing: number = interval, string = filepath
+		if (typeof intervalOrFilepath === "number") {
+			interval = Math.max(10, intervalOrFilepath); // Min 10ms
+			filepath = `cursor-data-${Date.now()}.json`;
+		} else if (typeof intervalOrFilepath === "string") {
+			filepath = intervalOrFilepath;
+		} else {
+			throw new Error(
+				"Parameter must be interval (number) or filepath (string)"
+			);
 		}
 
 		if (this.cursorCaptureInterval) {
 			throw new Error("Cursor capture is already running");
 		}
 
+		// Recording başlatılmışsa o display'i kullan, yoksa main display kullan
+		if (this.recordingDisplayInfo) {
+			this.cursorDisplayInfo = this.recordingDisplayInfo;
+		} else {
+			// Main display bilgisini al (her zaman relative koordinatlar için)
+			try {
+				const displays = await this.getDisplays();
+				const mainDisplay = displays.find((d) => d.isPrimary) || displays[0];
+				if (mainDisplay) {
+					this.cursorDisplayInfo = {
+						displayId: 0,
+						x: mainDisplay.x,
+						y: mainDisplay.y,
+						width: parseInt(mainDisplay.resolution.split("x")[0]),
+						height: parseInt(mainDisplay.resolution.split("x")[1]),
+					};
+				}
+			} catch (error) {
+				console.warn("Main display bilgisi alınamadı:", error.message);
+				this.cursorDisplayInfo = null; // Fallback: global koordinatlar
+			}
+		}
+
 		return new Promise((resolve, reject) => {
 			try {
 				// Dosyayı oluştur ve temizle
@@ -485,9 +558,29 @@ class MacRecorder extends EventEmitter {
 						const position = nativeBinding.getCursorPosition();
 						const timestamp = Date.now() - this.cursorCaptureStartTime;
 
+						// Global koordinatları display-relative'e çevir
+						let x = position.x;
+						let y = position.y;
+
+						if (this.cursorDisplayInfo) {
+							// Display offset'lerini çıkar
+							x = position.x - this.cursorDisplayInfo.x;
+							y = position.y - this.cursorDisplayInfo.y;
+
+							// Display bounds kontrolü - cursor display dışındaysa kaydetme
+							if (
+								x < 0 ||
+								y < 0 ||
+								x >= this.cursorDisplayInfo.width ||
+								y >= this.cursorDisplayInfo.height
+							) {
+								return; // Bu frame'i skip et
+							}
+						}
+
 						const cursorData = {
-							x: position.x,
-							y: position.y,
+							x: x,
+							y: y,
 							timestamp: timestamp,
 							cursorType: position.cursorType,
 							type: position.eventType || "move",
@@ -511,7 +604,7 @@ class MacRecorder extends EventEmitter {
 					} catch (error) {
 						console.error("Cursor capture error:", error);
 					}
-				}, 20); // 50 FPS - mouse event'leri yakalamak için daha hızlı
+				}, interval); // Configurable FPS
 
 				this.emit("cursorCaptureStarted", filepath);
 				resolve(true);
@@ -546,6 +639,7 @@ class MacRecorder extends EventEmitter {
 				this.lastCapturedData = null;
 				this.cursorCaptureStartTime = null;
 				this.cursorCaptureFirstWrite = true;
+				this.cursorDisplayInfo = null;
 
 				this.emit("cursorCaptureStopped");
 				resolve(true);
@@ -557,15 +651,97 @@ class MacRecorder extends EventEmitter {
 
 	/**
 	 * Anlık cursor pozisyonunu ve tipini döndürür
+	 * Display-relative koordinatlar döner (her zaman pozitif)
 	 */
 	getCursorPosition() {
 		try {
-			return nativeBinding.getCursorPosition();
+			const position = nativeBinding.getCursorPosition();
+
+			// Cursor hangi display'de ise o display'e relative döndür
+			return this.getDisplayRelativePositionSync(position);
 		} catch (error) {
 			throw new Error("Failed to get cursor position: " + error.message);
 		}
 	}
 
+	/**
+	 * Global koordinatları en uygun display'e relative çevirir (sync version)
+	 */
+	getDisplayRelativePositionSync(position) {
+		try {
+			// Cache'lenmiş displays'leri kullan
+			if (!this.cachedDisplays) {
+				// İlk çağrı - global koordinat döndür ve cache başlat
+				this.refreshDisplayCache();
+				return position;
+			}
+
+			// Cursor hangi display içinde ise onu bul
+			for (const display of this.cachedDisplays) {
+				const x = parseInt(display.x);
+				const y = parseInt(display.y);
+				const width = parseInt(display.resolution.split("x")[0]);
+				const height = parseInt(display.resolution.split("x")[1]);
+
+				if (
+					position.x >= x &&
+					position.x < x + width &&
+					position.y >= y &&
+					position.y < y + height
+				) {
+					// Bu display içinde
+					return {
+						x: position.x - x,
+						y: position.y - y,
+						cursorType: position.cursorType,
+						eventType: position.eventType,
+						displayId: display.id,
+						displayIndex: this.cachedDisplays.indexOf(display),
+					};
+				}
+			}
+
+			// Hiçbir display'de değilse main display'e relative döndür
+			const mainDisplay =
+				this.cachedDisplays.find((d) => d.isPrimary) || this.cachedDisplays[0];
+			if (mainDisplay) {
+				return {
+					x: position.x - parseInt(mainDisplay.x),
+					y: position.y - parseInt(mainDisplay.y),
+					cursorType: position.cursorType,
+					eventType: position.eventType,
+					displayId: mainDisplay.id,
+					displayIndex: this.cachedDisplays.indexOf(mainDisplay),
+					outsideDisplay: true,
+				};
+			}
+
+			// Fallback: global koordinat
+			return position;
+		} catch (error) {
+			// Hata durumunda global koordinat döndür
+			return position;
+		}
+	}
+
+	/**
+	 * Display cache'ini refresh eder
+	 */
+	async refreshDisplayCache() {
+		try {
+			this.cachedDisplays = await this.getDisplays();
+		} catch (error) {
+			console.warn("Display cache refresh failed:", error.message);
+		}
+	}
+
+	/**
+	 * getCurrentCursorPosition alias for getCursorPosition (backward compatibility)
+	 */
+	getCurrentCursorPosition() {
+		return this.getCursorPosition();
+	}
+
 	/**
 	 * Cursor capture durumunu döndürür
 	 */
@@ -574,6 +750,7 @@ class MacRecorder extends EventEmitter {
 			isCapturing: !!this.cursorCaptureInterval,
 			outputFile: this.cursorCaptureFile || null,
 			startTime: this.cursorCaptureStartTime || null,
+			displayInfo: this.cursorDisplayInfo || null,
 		};
 	}
 

package/package.json

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

package/src/cursor_tracker.mm

@@ -251,22 +251,13 @@ void cursorTimerCallback() {
             return;
         }
         
-        // Ana thread'de mouse pozisyonu al
-        __block NSPoint mouseLocation;
-        __block CGPoint location;
-        
-        if ([NSThread isMainThread]) {
-            mouseLocation = [NSEvent mouseLocation];
-        } else {
-            dispatch_sync(dispatch_get_main_queue(), ^{
-                mouseLocation = [NSEvent mouseLocation];
-            });
+        // CGEventGetLocation direkt global koordinat verir - çoklu ekran desteği için daha doğru
+        CGEventRef event = CGEventCreate(NULL);
+        CGPoint location = CGEventGetLocation(event);
+        if (event) {
+            CFRelease(event);
         }
         
-        CGDirectDisplayID mainDisplay = CGMainDisplayID();
-        size_t displayHeight = CGDisplayPixelsHigh(mainDisplay);
-        location = CGPointMake(mouseLocation.x, displayHeight - mouseLocation.y);
-        
         NSTimeInterval timestamp = [[NSDate date] timeIntervalSinceDate:g_trackingStartTime] * 1000; // milliseconds
         NSString *cursorType = getCursorType();
         
@@ -443,15 +434,13 @@ Napi::Value GetCursorPosition(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
     @try {
-        // NSEvent kullanarak mouse pozisyonu al (daha güvenli)
-        NSPoint mouseLocation = [NSEvent mouseLocation];
-        
-        // CGDisplayPixelsHigh ve CGDisplayPixelsWide ile koordinat dönüşümü
-        CGDirectDisplayID mainDisplay = CGMainDisplayID();
-        size_t displayHeight = CGDisplayPixelsHigh(mainDisplay);
-        
-        // macOS coordinate system (bottom-left origin) to screen coordinates (top-left origin)
-        CGPoint location = CGPointMake(mouseLocation.x, displayHeight - mouseLocation.y);
+        // NSEvent mouseLocation zaten global koordinatlarda (all displays combined)
+        // CGEventGetLocation kullanarak direkt global koordinat al - daha doğru
+        CGEventRef event = CGEventCreate(NULL);
+        CGPoint location = CGEventGetLocation(event);
+        if (event) {
+            CFRelease(event);
+        }
         
         NSString *cursorType = getCursorType();
         

package/cursor-data.json

@@ -1,359 +0,0 @@
-[
-	{
-		"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": 1971,
-		"y": 775,
-		"timestamp": 1596,
-		"cursorType": "default",
-		"type": "move"
-	},
-	{
-		"x": 1973,
-		"y": 775,
-		"timestamp": 1617,
-		"cursorType": "default",
-		"type": "move"
-	},
-	{
-		"x": 1975,
-		"y": 775,
-		"timestamp": 1659,
-		"cursorType": "default",
-		"type": "move"
-	},
-	{
-		"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": 1968,
-		"y": 787,
-		"timestamp": 1850,
-		"cursorType": "default",
-		"type": "move"
-	},
-	{
-		"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": 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": 1951,
-		"y": 863,
-		"timestamp": 3589,
-		"cursorType": "default",
-		"type": "move"
-	},
-	{
-		"x": 1956,
-		"y": 925,
-		"timestamp": 3609,
-		"cursorType": "default",
-		"type": "move"
-	},
-	{
-		"x": 1966,
-		"y": 983,
-		"timestamp": 3630,
-		"cursorType": "default",
-		"type": "move"
-	},
-	{
-		"x": 1970,
-		"y": 1006,
-		"timestamp": 3650,
-		"cursorType": "text",
-		"type": "move"
-	},
-	{
-		"x": 1978,
-		"y": 1042,
-		"timestamp": 3675,
-		"cursorType": "default",
-		"type": "move"
-	},
-	{
-		"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"
-	}
-]