node-mac-recorder 2.22.17 → 2.22.19

package/lib/cursorCapture/polling.js

@@ -9,9 +9,13 @@ const IS_ELECTRON = !!(
 	process.versions.electron
 );
 
-const TEXT_INPUT_SAMPLE_MS = IS_ELECTRON ? 280 : 95;
+const NATIVE_TEXT_INPUT_SAMPLE_MS = 120;
+const NATIVE_TEXT_INPUT_GRACE_MS = 600;
 
-const TEXT_INPUT_GRACE_MS = IS_ELECTRON ? 3200 : 600;
+const ELECTRON_SYNTH_GRACE_MS = 400;
+const ELECTRON_SYNTH_THROTTLE_MS = 220;
+
+const DEFAULT_CURSOR_INTERVAL_MS = IS_ELECTRON ? 50 : 20;
 
 function shouldCaptureCursorSample(lastCapturedData, currentData) {
 	if (!lastCapturedData) {
@@ -33,6 +37,21 @@ function shouldCaptureCursorSample(lastCapturedData, currentData) {
 	return false;
 }
 
+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 {
@@ -76,6 +95,96 @@ function transformInputFrameGlobal(ifr, d) {
 	};
 }
 
+function tryAppendSyntheticTextInputRow(recorder, filepath, cursorData, timestamp) {
+	if (!IS_ELECTRON) {
+		return;
+	}
+	const ct = cursorData.cursorType || "";
+	if (ct !== "text" && ct !== "vertical-text") {
+		return;
+	}
+	if (timestamp < ELECTRON_SYNTH_GRACE_MS) {
+		return;
+	}
+	const wall = Date.now();
+	if (
+		wall - (recorder._electronSynthWallMs || 0) <
+		ELECTRON_SYNTH_THROTTLE_MS
+	) {
+		return;
+	}
+	const vx = cursorData.x;
+	const vy = cursorData.y;
+	if (!Number.isFinite(vx) || !Number.isFinite(vy)) {
+		return;
+	}
+
+	const tiRow = {
+		x: vx,
+		y: vy,
+		timestamp,
+		unixTimeMs: wall,
+		cursorType: "text",
+		type: "textInput",
+		caretX: vx,
+		caretY: vy,
+		inputFrame: {
+			x: vx - 1,
+			y: vy - 9,
+			width: 2,
+			height: 18,
+		},
+		coordinateSystem: cursorData.coordinateSystem,
+		recordingType: cursorData.recordingType,
+		videoInfo: cursorData.videoInfo || {},
+		displayInfo: cursorData.displayInfo || {},
+	};
+
+	if (cursorData.location) {
+		tiRow.location = cursorData.location;
+	}
+	if (cursorData.windowRelative) {
+		tiRow.windowRelative = cursorData.windowRelative;
+	}
+
+	if (
+		recorder.cursorCaptureFirstWrite &&
+		recorder.cursorCaptureSessionTimestamp
+	) {
+		tiRow._syncMetadata = {
+			videoStartTime: recorder.cursorCaptureSessionTimestamp,
+			cursorStartTime: recorder.cursorCaptureStartTime,
+			offsetMs:
+				recorder.cursorCaptureStartTime -
+				recorder.cursorCaptureSessionTimestamp,
+		};
+	}
+
+	const le = recorder._lastTextInputEmitted;
+	if (
+		le &&
+		Math.abs(le.caretX - tiRow.caretX) < 0.75 &&
+		Math.abs(le.caretY - tiRow.caretY) < 0.75 &&
+		timestamp - le.timestamp < 220
+	) {
+		return;
+	}
+	recorder._lastTextInputEmitted = {
+		caretX: tiRow.caretX,
+		caretY: tiRow.caretY,
+		timestamp,
+	};
+	recorder._electronSynthWallMs = wall;
+
+	const jsonString = JSON.stringify(tiRow);
+	if (recorder.cursorCaptureFirstWrite) {
+		fs.appendFileSync(filepath, jsonString);
+		recorder.cursorCaptureFirstWrite = false;
+	} else {
+		fs.appendFileSync(filepath, "," + jsonString);
+	}
+}
+
 function tryAppendTextInput(
 	recorder,
 	nativeBinding,
@@ -83,10 +192,13 @@ function tryAppendTextInput(
 	position,
 	timestamp,
 ) {
+	if (IS_ELECTRON) {
+		return;
+	}
 	if (typeof nativeBinding.getTextInputSnapshot !== "function") {
 		return;
 	}
-	if (timestamp < TEXT_INPUT_GRACE_MS) {
+	if (timestamp < NATIVE_TEXT_INPUT_GRACE_MS) {
 		return;
 	}
 	const ct = position.cursorType || "";
@@ -94,7 +206,10 @@ function tryAppendTextInput(
 		return;
 	}
 	const wall = Date.now();
-	if (wall - (recorder._tiSampleWallMs || 0) < TEXT_INPUT_SAMPLE_MS) {
+	if (
+		wall - (recorder._tiSampleWallMs || 0) <
+		NATIVE_TEXT_INPUT_SAMPLE_MS
+	) {
 		return;
 	}
 	recorder._tiSampleWallMs = wall;
@@ -141,13 +256,7 @@ function tryAppendTextInput(
 					offsetY: d.videoOffsetY,
 				}
 			: {},
-		displayInfo: d
-			? {
-					displayId: d.displayId,
-					width: d.displayWidth,
-					height: d.displayHeight,
-				}
-			: {},
+		displayInfo: packDisplayInfoForExport(d),
 	};
 
 	if (
@@ -194,10 +303,13 @@ function queueDeferredTextInputSample(
 	position,
 	timestamp,
 ) {
+	if (IS_ELECTRON) {
+		return;
+	}
 	if (typeof nativeBinding.getTextInputSnapshot !== "function") {
 		return;
 	}
-	if (timestamp < TEXT_INPUT_GRACE_MS) {
+	if (timestamp < NATIVE_TEXT_INPUT_GRACE_MS) {
 		return;
 	}
 	const ct = position.cursorType || "";
@@ -230,7 +342,7 @@ function queueDeferredTextInputSample(
 
 async function startCursorCapture(recorder, nativeBinding, intervalOrFilepath, options = {}) {
 	let filepath;
-	let interval = 20;
+	let interval = DEFAULT_CURSOR_INTERVAL_MS;
 
 	if (typeof intervalOrFilepath === "number") {
 		interval = Math.max(10, intervalOrFilepath);
@@ -283,6 +395,7 @@ async function startCursorCapture(recorder, nativeBinding, intervalOrFilepath, o
 			recorder.lastCapturedData = null;
 			recorder.cursorCaptureSessionTimestamp = recorder.sessionTimestamp;
 			recorder._tiSampleWallMs = 0;
+			recorder._electronSynthWallMs = 0;
 			recorder._lastTextInputEmitted = null;
 			recorder._tiDeferredPending = false;
 
@@ -330,13 +443,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) {
@@ -405,13 +512,22 @@ async function startCursorCapture(recorder, nativeBinding, intervalOrFilepath, o
 						recorder.lastCapturedData = { ...cursorData };
 					}
 
-					queueDeferredTextInputSample(
-						recorder,
-						nativeBinding,
-						filepath,
-						position,
-						timestamp,
-					);
+					if (IS_ELECTRON) {
+						tryAppendSyntheticTextInputRow(
+							recorder,
+							filepath,
+							cursorData,
+							timestamp,
+						);
+					} else {
+						queueDeferredTextInputSample(
+							recorder,
+							nativeBinding,
+							filepath,
+							position,
+							timestamp,
+						);
+					}
 				} catch (error) {
 					console.error("Cursor capture error:", error);
 				}
@@ -444,6 +560,7 @@ async function stopCursorCapture(recorder) {
 			recorder.cursorCaptureFirstWrite = true;
 			recorder.cursorDisplayInfo = null;
 			recorder._tiSampleWallMs = 0;
+			recorder._electronSynthWallMs = 0;
 			recorder._lastTextInputEmitted = null;
 			recorder._tiDeferredPending = false;
 

package/package.json

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