node-mac-recorder 2.22.18 → 2.22.20

package/lib/cursorCapture/polling.js

@@ -37,6 +37,31 @@ 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 {
+		displayId: di.displayId,
+		displayX: Number.isFinite(Number(di.displayX))
+			? Number(di.displayX)
+			: Number(di.x) || 0,
+		displayY: Number.isFinite(Number(di.displayY))
+			? Number(di.displayY)
+			: Number(di.y) || 0,
+		width: di.displayWidth ?? di.width,
+		height: di.displayHeight ?? di.height,
+	};
+}
+
 function transformGlobalToVideo(globalX, globalY, d) {
 	if (!d || !d.videoRelative) {
 		return {
@@ -80,28 +105,29 @@ function transformInputFrameGlobal(ifr, d) {
 	};
 }
 
+/** @returns {boolean} Dosyaya textInput satırı yazıldı mı */
 function tryAppendSyntheticTextInputRow(recorder, 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;
 	}
 
 	const tiRow = {
@@ -152,7 +178,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,
@@ -161,13 +187,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(
@@ -241,13 +262,7 @@ function tryAppendTextInput(
 					offsetY: d.videoOffsetY,
 				}
 			: {},
-		displayInfo: d
-			? {
-					displayId: d.displayId,
-					width: d.displayWidth,
-					height: d.displayHeight,
-				}
-			: {},
+		displayInfo: packDisplayInfoForExport(d),
 	};
 
 	if (
@@ -434,13 +449,7 @@ async function startCursorCapture(recorder, nativeBinding, intervalOrFilepath, o
 									offsetY: di.videoOffsetY,
 								}
 							: {},
-						displayInfo: di
-							? {
-									displayId: di.displayId,
-									width: di.displayWidth,
-									height: di.displayHeight,
-								}
-							: {},
+						displayInfo: packDisplayInfoForExport(di),
 					};
 
 					if (di?.multiWindowBounds && di.multiWindowBounds.length > 0) {
@@ -498,24 +507,24 @@ 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,
 							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.18",
+	"version": "2.22.20",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [