node-mac-recorder 2.17.21 → 2.18.1

package/cursor-data-1751364226346.json

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

package/cursor-data-1751364314136.json

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

package/cursor-data.json

@@ -0,0 +1 @@
+[{"x":1151,"y":726,"timestamp":20,"cursorType":"text","type":"move"}

package/index.js

@@ -283,16 +283,25 @@ class MacRecorder extends EventEmitter {
 			}
 		}
 
-		// DisplayId manuel ayarlanmışsa display bilgisini sakla
-		if (this.options.displayId !== null && !this.recordingDisplayInfo) {
+		// Ensure recordingDisplayInfo is always set for cursor tracking
+		if (!this.recordingDisplayInfo) {
 			try {
 				const displays = await this.getDisplays();
-				const targetDisplay = displays.find(d => d.id === this.options.displayId);
+				let targetDisplay;
+
+				if (this.options.displayId !== null) {
+					// Manual displayId specified
+					targetDisplay = displays.find(d => d.id === this.options.displayId);
+				} else {
+					// Default to main display
+					targetDisplay = displays.find(d => d.isPrimary) || displays[0];
+				}
+
 				if (targetDisplay) {
 					this.recordingDisplayInfo = {
-						displayId: this.options.displayId,
-						x: targetDisplay.x,
-						y: targetDisplay.y,
+						displayId: targetDisplay.id,
+						x: targetDisplay.x || 0,
+						y: targetDisplay.y || 0,
 						width: parseInt(targetDisplay.resolution.split("x")[0]),
 						height: parseInt(targetDisplay.resolution.split("x")[1]),
 						// Add scaling information for cursor coordinate transformation
@@ -356,12 +365,19 @@ class MacRecorder extends EventEmitter {
 					this.isRecording = true;
 					this.recordingStartTime = Date.now();
 
-					// Start cursor tracking automatically with recording
-					let cursorOptions = {};
+					// Start unified cursor tracking for all recording types
+					// Use the same standard cursor tracking logic that works best (display-relative)
+					const standardCursorOptions = {
+						displayRelative: true,
+						displayInfo: this.recordingDisplayInfo,
+						recordingType: this.options.windowId ? 'window' :
+									  this.options.captureArea ? 'area' : 'display',
+						captureArea: this.options.captureArea,
+						windowId: this.options.windowId
+					};
 
-					// 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);
+					this.startCursorCapture(cursorFilePath, standardCursorOptions).catch(cursorError => {
+						console.warn('Unified cursor tracking failed:', cursorError.message);
 					});
 
 					// Timer başlat (progress tracking için)
@@ -456,11 +472,9 @@ class MacRecorder extends EventEmitter {
 
 				// Stop cursor tracking automatically
 				if (this.cursorCaptureInterval) {
-					try {
-						this.stopCursorCapture();
-					} catch (cursorError) {
+					this.stopCursorCapture().catch(cursorError => {
 						console.warn('Cursor tracking failed to stop:', cursorError.message);
-					}
+					});
 				}
 
 				// Timer durdur
@@ -638,18 +652,20 @@ 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
+	 * Unified cursor capture for all recording types - uses standardized display-relative coordinates
 	 * @param {string|number} intervalOrFilepath - Cursor data JSON dosya yolu veya interval
 	 * @param {Object} options - Cursor capture seçenekleri
-	 * @param {Object} options.windowInfo - Pencere bilgileri (window-relative koordinatlar için)
-	 * @param {boolean} options.windowRelative - Koordinatları pencereye göre relative yap
+	 * @param {boolean} options.displayRelative - Use display-relative coordinates (recommended)
+	 * @param {Object} options.displayInfo - Display information for coordinate transformation
+	 * @param {string} options.recordingType - Type of recording: 'display', 'window', 'area'
 	 */
 	async startCursorCapture(intervalOrFilepath = 100, options = {}) {
 		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;
@@ -663,28 +679,127 @@ class MacRecorder extends EventEmitter {
 			throw new Error("Cursor capture is already running");
 		}
 
+		// Use standardized display-relative coordinate system for all recording types
+		if (options.displayRelative && options.displayInfo) {
+			// Standardized display-relative coordinates for all recording types
+			this.cursorDisplayInfo = {
+				displayId: options.displayInfo.displayId || options.displayInfo.id,
+				x: options.displayInfo.x || 0,
+				y: options.displayInfo.y || 0,
+				width: options.displayInfo.width || options.displayInfo.logicalWidth,
+				height: options.displayInfo.height || options.displayInfo.logicalHeight,
+				displayRelative: true,
+				recordingType: options.recordingType || 'display',
+				// Store additional context for debugging
+				captureArea: options.captureArea,
+				windowId: options.windowId
+			};
+		} else if (this.recordingDisplayInfo) {
+			// Fallback: Use recording display info if available
+			this.cursorDisplayInfo = {
+				...this.recordingDisplayInfo,
+				displayRelative: true,
+				recordingType: options.recordingType || 'display'
+			};
+		} else {
+			// Final fallback: Main display global coordinates
+			try {
+				const displays = await this.getDisplays();
+				const mainDisplay = displays.find((d) => d.isPrimary) || displays[0];
+				if (mainDisplay) {
+					this.cursorDisplayInfo = {
+						displayId: mainDisplay.id,
+						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 {
-				// Native cursor tracking kullan - hem screen hem window için aynı yöntem
-				const success = nativeBinding.startCursorTracking(filepath);
+				// Dosyayı oluştur ve temizle
+				const fs = require("fs");
+				fs.writeFileSync(filepath, "[");
 
-				if (success) {
-					this.cursorCaptureFile = filepath;
-					this.cursorCaptureStartTime = Date.now();
-					this.cursorCaptureInterval = true; // Mark as active
+				this.cursorCaptureFile = filepath;
+				this.cursorCaptureStartTime = Date.now();
+				this.cursorCaptureFirstWrite = true;
+				this.lastCapturedData = null;
 
-					this.emit("cursorCaptureStarted", {
-						filepath: filepath,
-						timestamp: Date.now()
-					});
+				// JavaScript interval ile polling yap (daha sık - mouse event'leri yakalamak için)
+				this.cursorCaptureInterval = setInterval(() => {
+					try {
+						const position = nativeBinding.getCursorPosition();
+						const timestamp = Date.now() - this.cursorCaptureStartTime;
+
+						// Standardized coordinate transformation for all recording types
+						let x = position.x;
+						let y = position.y;
+						let coordinateSystem = "global";
+
+						// Apply display-relative transformation for all recording types
+						if (this.cursorDisplayInfo && this.cursorDisplayInfo.displayRelative) {
+							// Transform global → display-relative coordinates
+							x = position.x - this.cursorDisplayInfo.x;
+							y = position.y - this.cursorDisplayInfo.y;
+							coordinateSystem = "display-relative";
+
+							// Optional bounds check for display (don't skip, just note if outside)
+							const outsideDisplay = x < 0 || y < 0 ||
+								x >= this.cursorDisplayInfo.width ||
+								y >= this.cursorDisplayInfo.height;
+
+							// For debugging - add metadata if cursor is outside recording area
+							if (outsideDisplay) {
+								coordinateSystem = "display-relative-outside";
+							}
+						}
 
-					resolve({
-						filepath: filepath,
-						started: true
-					});
-				} else {
-					reject(new Error("Failed to start native cursor tracking"));
-				}
+						const cursorData = {
+							x: x,
+							y: y,
+							timestamp: timestamp,
+							unixTimeMs: Date.now(),
+							cursorType: position.cursorType,
+							type: position.eventType || "move",
+							coordinateSystem: coordinateSystem,
+							// Standardized metadata for all recording types
+							recordingType: this.cursorDisplayInfo?.recordingType || "display",
+							displayInfo: this.cursorDisplayInfo ? {
+								displayId: this.cursorDisplayInfo.displayId,
+								width: this.cursorDisplayInfo.width,
+								height: this.cursorDisplayInfo.height
+							} : null
+						};
+
+						// Sadece eventType değiştiğinde veya pozisyon değiştiğinde kaydet
+						if (this.shouldCaptureEvent(cursorData)) {
+							// Dosyaya ekle
+							const jsonString = JSON.stringify(cursorData);
+
+							if (this.cursorCaptureFirstWrite) {
+								fs.appendFileSync(filepath, jsonString);
+								this.cursorCaptureFirstWrite = false;
+							} else {
+								fs.appendFileSync(filepath, "," + jsonString);
+							}
+
+							// Son pozisyonu sakla
+							this.lastCapturedData = { ...cursorData };
+						}
+					} catch (error) {
+						console.error("Cursor capture error:", error);
+					}
+				}, interval); // Configurable FPS
+
+				this.emit("cursorCaptureStarted", filepath);
+				resolve(true);
 			} catch (error) {
 				reject(error);
 			}
@@ -694,34 +809,7 @@ class MacRecorder extends EventEmitter {
 	/**
 	 * Cursor capture durdurur - dosya yazma işlemini sonlandırır
 	 */
-	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() {
+	async stopCursorCapture() {
 		return new Promise((resolve, reject) => {
 			try {
 				if (!this.cursorCaptureInterval) {

package/package.json

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

package/publish.sh

@@ -3,6 +3,37 @@
 # Publish script for node-mac-recorder
 # Usage: ./publish.sh <patch|minor|major> "commit message"
 
+# Clean up development files before publishing
+echo "🧹 Cleaning up development files..."
+
+# Remove video files
+echo "   • Removing .mov and .mp4 files..."
+find . -name "*.mov" -type f -delete 2>/dev/null
+find . -name "*.mp4" -type f -delete 2>/dev/null
+
+# Remove files containing specific keywords
+echo "   • Removing files containing test, debug, example, demo, sample..."
+find . -type f -not -path "./node_modules/*" \( \
+    -name "*test*" -o \
+    -name "*debug*" -o \
+    -name "*example*" -o \
+    -name "*demo*" -o \
+    -name "*sample*" \
+\) -delete 2>/dev/null
+
+# Remove folders containing specific keywords
+echo "   • Removing folders containing test, debug, example, demo, sample..."
+find . -type d -not -path "./node_modules/*" \( \
+    -name "*test*" -o \
+    -name "*debug*" -o \
+    -name "*example*" -o \
+    -name "*demo*" -o \
+    -name "*sample*" \
+\) -exec rm -rf {} + 2>/dev/null
+
+echo "✅ Cleanup completed"
+echo ""
+
 # Check if correct number of arguments provided
 if [ $# -ne 2 ]; then
     echo "❌ Usage: $0 <patch|minor|major> \"commit message\""
@@ -26,24 +57,6 @@ if ! git rev-parse --git-dir > /dev/null 2>&1; then
     exit 1
 fi
 
-# Clean up test files and video files before publishing
-echo "🧹 Cleaning up test files and video files..."
-
-# Remove video files (MP4, MOV, AVI, etc.)
-find . -maxdepth 1 -type f \( -name "*.mp4" -o -name "*.mov" -o -name "*.avi" -o -name "*.mkv" -o -name "*.webm" \) -delete
-
-# Remove test output directories
-rm -rf test-output debug-output
-
-# Remove test files and temporary files
-find . -maxdepth 1 -type f \( -name "*test*.json" -o -name "*debug*.json" -o -name "*cursor*.json" -o -name "temp-*" -o -name "*-temp.*" -o -name "*.tmp" \) -delete
-
-# Remove test JavaScript files that shouldn't be published
-find . -maxdepth 1 -type f -name "*test*.js" ! -name "test.js" -delete
-find . -maxdepth 1 -type f -name "*debug*.js" -delete
-
-echo "✅ Cleanup completed"
-
 # Check if there are uncommitted changes
 if ! git diff --quiet || ! git diff --cached --quiet; then
     echo "📁 Adding all changes to git..."