node-mac-recorder 2.22.19 → 2.22.21

package/lib/cursorCapture/polling.js

@@ -37,6 +37,16 @@ function shouldCaptureCursorSample(lastCapturedData, currentData) {
 	return false;
 }
 
+function appendCursorJsonLine(recorder, filepath, obj) {
+	const jsonString = JSON.stringify(obj);
+	if (recorder.cursorCaptureFirstWrite) {
+		fs.appendFileSync(filepath, jsonString);
+		recorder.cursorCaptureFirstWrite = false;
+	} else {
+		fs.appendFileSync(filepath, "," + jsonString);
+	}
+}
+
 function packDisplayInfoForExport(di) {
 	if (!di) return {};
 	return {
@@ -95,28 +105,59 @@ function transformInputFrameGlobal(ifr, d) {
 	};
 }
 
-function tryAppendSyntheticTextInputRow(recorder, filepath, cursorData, timestamp) {
+/** @returns {boolean} Dosyaya textInput satırı yazıldı mı */
+function tryAppendSyntheticTextInputRow(recorder, nativeBinding, filepath, cursorData, timestamp) {
 	if (!IS_ELECTRON) {
-		return;
+		return false;
 	}
 	const ct = cursorData.cursorType || "";
 	if (ct !== "text" && ct !== "vertical-text") {
-		return;
+		return false;
 	}
 	if (timestamp < ELECTRON_SYNTH_GRACE_MS) {
-		return;
+		return false;
 	}
 	const wall = Date.now();
 	if (
 		wall - (recorder._electronSynthWallMs || 0) <
 		ELECTRON_SYNTH_THROTTLE_MS
 	) {
-		return;
+		return false;
 	}
 	const vx = cursorData.x;
 	const vy = cursorData.y;
 	if (!Number.isFinite(vx) || !Number.isFinite(vy)) {
-		return;
+		return false;
+	}
+
+	// Gerçek caret pozisyonunu accessibility API'den al
+	let caretX = vx;
+	let caretY = vy;
+	let inputFrame = { x: vx - 1, y: vy - 9, width: 2, height: 18 };
+	let hasRealCaret = false;
+
+	if (nativeBinding && typeof nativeBinding.getTextInputSnapshot === "function") {
+		try {
+			const snap = nativeBinding.getTextInputSnapshot();
+			if (
+				snap &&
+				Number.isFinite(snap.caretX) &&
+				Number.isFinite(snap.caretY)
+			) {
+				// Global koordinatları video uzayına dönüştür
+				const d = recorder.cursorDisplayInfo;
+				const caretT = transformGlobalToVideo(snap.caretX, snap.caretY, d);
+				caretX = caretT.x;
+				caretY = caretT.y;
+				hasRealCaret = true;
+
+				if (snap.inputFrame) {
+					inputFrame = transformInputFrameGlobal(snap.inputFrame, d);
+				}
+			}
+		} catch {
+			// AX API hata verirse cursor pozisyonuna fallback
+		}
 	}
 
 	const tiRow = {
@@ -126,15 +167,12 @@ function tryAppendSyntheticTextInputRow(recorder, filepath, cursorData, timestam
 		unixTimeMs: wall,
 		cursorType: "text",
 		type: "textInput",
-		caretX: vx,
-		caretY: vy,
-		inputFrame: {
-			x: vx - 1,
-			y: vy - 9,
-			width: 2,
-			height: 18,
-		},
-		coordinateSystem: cursorData.coordinateSystem,
+		caretX,
+		caretY,
+		inputFrame,
+		coordinateSystem: hasRealCaret
+			? (recorder.cursorDisplayInfo?.videoRelative ? "video-relative" : "global")
+			: cursorData.coordinateSystem,
 		recordingType: cursorData.recordingType,
 		videoInfo: cursorData.videoInfo || {},
 		displayInfo: cursorData.displayInfo || {},
@@ -167,7 +205,7 @@ function tryAppendSyntheticTextInputRow(recorder, filepath, cursorData, timestam
 		Math.abs(le.caretY - tiRow.caretY) < 0.75 &&
 		timestamp - le.timestamp < 220
 	) {
-		return;
+		return false;
 	}
 	recorder._lastTextInputEmitted = {
 		caretX: tiRow.caretX,
@@ -176,13 +214,8 @@ function tryAppendSyntheticTextInputRow(recorder, filepath, cursorData, timestam
 	};
 	recorder._electronSynthWallMs = wall;
 
-	const jsonString = JSON.stringify(tiRow);
-	if (recorder.cursorCaptureFirstWrite) {
-		fs.appendFileSync(filepath, jsonString);
-		recorder.cursorCaptureFirstWrite = false;
-	} else {
-		fs.appendFileSync(filepath, "," + jsonString);
-	}
+	appendCursorJsonLine(recorder, filepath, tiRow);
+	return true;
 }
 
 function tryAppendTextInput(
@@ -501,24 +534,25 @@ async function startCursorCapture(recorder, nativeBinding, intervalOrFilepath, o
 						};
 					}
 
+					let wroteMoveSample = false;
 					if (shouldCaptureCursorSample(recorder.lastCapturedData, cursorData)) {
-						const jsonString = JSON.stringify(cursorData);
-						if (recorder.cursorCaptureFirstWrite) {
-							fs.appendFileSync(filepath, jsonString);
-							recorder.cursorCaptureFirstWrite = false;
-						} else {
-							fs.appendFileSync(filepath, "," + jsonString);
-						}
+						appendCursorJsonLine(recorder, filepath, cursorData);
 						recorder.lastCapturedData = { ...cursorData };
+						wroteMoveSample = true;
 					}
 
 					if (IS_ELECTRON) {
-						tryAppendSyntheticTextInputRow(
+						const textInputWritten = tryAppendSyntheticTextInputRow(
 							recorder,
+							nativeBinding,
 							filepath,
 							cursorData,
 							timestamp,
 						);
+						if (textInputWritten && !wroteMoveSample) {
+							appendCursorJsonLine(recorder, filepath, cursorData);
+							recorder.lastCapturedData = { ...cursorData };
+						}
 					} else {
 						queueDeferredTextInputSample(
 							recorder,

package/package.json

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