node-mac-recorder 2.22.21 → 2.22.23

package/lib/cursorCapture/polling.js

@@ -105,6 +105,37 @@ function transformInputFrameGlobal(ifr, d) {
 	};
 }
 
+// Electron: AX caret cache — deferred refresh ile crash-safe
+const ELECTRON_AX_CACHE_MAX_AGE_MS = 500;
+
+function deferredRefreshElectronAXCache(recorder, nativeBinding) {
+	if (recorder._axDeferredPending) return;
+	if (!nativeBinding || typeof nativeBinding.getTextInputSnapshot !== "function") return;
+
+	recorder._axDeferredPending = true;
+	setImmediate(() => {
+		recorder._axDeferredPending = false;
+		try {
+			const snap = nativeBinding.getTextInputSnapshot();
+			if (snap && Number.isFinite(snap.caretX) && Number.isFinite(snap.caretY)) {
+				const d = recorder.cursorDisplayInfo;
+				const caretT = transformGlobalToVideo(snap.caretX, snap.caretY, d);
+				recorder._axCaretCache = {
+					caretX: caretT.x,
+					caretY: caretT.y,
+					inputFrame: snap.inputFrame
+						? transformInputFrameGlobal(snap.inputFrame, d)
+						: null,
+					csys: d && d.videoRelative ? "video-relative" : "global",
+					wallMs: Date.now(),
+				};
+			}
+		} catch {
+			// AX API hata verirse mevcut cache'i koru
+		}
+	});
+}
+
 /** @returns {boolean} Dosyaya textInput satırı yazıldı mı */
 function tryAppendSyntheticTextInputRow(recorder, nativeBinding, filepath, cursorData, timestamp) {
 	if (!IS_ELECTRON) {
@@ -122,6 +153,8 @@ function tryAppendSyntheticTextInputRow(recorder, nativeBinding, filepath, curso
 		wall - (recorder._electronSynthWallMs || 0) <
 		ELECTRON_SYNTH_THROTTLE_MS
 	) {
+		// Throttle aktif olsa bile AX cache yenilensin
+		deferredRefreshElectronAXCache(recorder, nativeBinding);
 		return false;
 	}
 	const vx = cursorData.x;
@@ -130,36 +163,28 @@ function tryAppendSyntheticTextInputRow(recorder, nativeBinding, filepath, curso
 		return false;
 	}
 
-	// Gerçek caret pozisyonunu accessibility API'den al
+	// Cached AX caret varsa gerçek caret pozisyonunu kullan
 	let caretX = vx;
 	let caretY = vy;
 	let inputFrame = { x: vx - 1, y: vy - 9, width: 2, height: 18 };
-	let hasRealCaret = false;
+	let coordinateSystem = cursorData.coordinateSystem;
 
-	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 cache = recorder._axCaretCache;
+	if (
+		cache &&
+		Number.isFinite(cache.caretX) &&
+		Number.isFinite(cache.caretY) &&
+		(wall - (cache.wallMs || 0)) < ELECTRON_AX_CACHE_MAX_AGE_MS
+	) {
+		caretX = cache.caretX;
+		caretY = cache.caretY;
+		if (cache.inputFrame) inputFrame = cache.inputFrame;
+		coordinateSystem = cache.csys || coordinateSystem;
 	}
 
+	// Sonraki frame için AX cache'i yenile (deferred — crash-safe)
+	deferredRefreshElectronAXCache(recorder, nativeBinding);
+
 	const tiRow = {
 		x: vx,
 		y: vy,
@@ -170,9 +195,7 @@ function tryAppendSyntheticTextInputRow(recorder, nativeBinding, filepath, curso
 		caretX,
 		caretY,
 		inputFrame,
-		coordinateSystem: hasRealCaret
-			? (recorder.cursorDisplayInfo?.videoRelative ? "video-relative" : "global")
-			: cursorData.coordinateSystem,
+		coordinateSystem,
 		recordingType: cursorData.recordingType,
 		videoInfo: cursorData.videoInfo || {},
 		displayInfo: cursorData.displayInfo || {},

package/package.json

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

package/src/avfoundation_recorder.mm

@@ -502,7 +502,8 @@ extern "C" bool stopAVFoundationRecording() {
         
         // Finish writing with null checks
         AVAssetWriterInput *writerInput = g_avVideoInput;
-        if (writerInput) {
+        AVAssetWriter *writerRef = g_avWriter;
+        if (writerInput && writerRef && writerRef.status == AVAssetWriterStatusWriting) {
             [writerInput markAsFinished];
         }
         

package/src/screen_capture_kit.mm

@@ -342,17 +342,23 @@ static void FinishWriter(AVAssetWriter *writer, AVAssetWriterInput *input) {
     if (!writer) {
         return;
     }
-    
-    if (input) {
+
+    // markAsFinished sadece AVAssetWriterStatusWriting (1) durumunda çağrılabilir
+    // Status 0 (Unknown) veya diğer durumlarda crash eder
+    if (input && writer.status == AVAssetWriterStatusWriting) {
         [input markAsFinished];
     }
-    
-    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-    [writer finishWritingWithCompletionHandler:^{
-        dispatch_semaphore_signal(semaphore);
-    }];
-    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC));
-    dispatch_semaphore_wait(semaphore, timeout);
+
+    if (writer.status == AVAssetWriterStatusWriting) {
+        dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+        [writer finishWritingWithCompletionHandler:^{
+            dispatch_semaphore_signal(semaphore);
+        }];
+        dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC));
+        dispatch_semaphore_wait(semaphore, timeout);
+    } else if (writer.status == AVAssetWriterStatusFailed) {
+        NSLog(@"⚠️ Writer already failed: %@", writer.error);
+    }
 }
 
 static void CleanupWriters(void) {
@@ -373,10 +379,10 @@ static void CleanupWriters(void) {
     }
     
     if (g_audioWriter) {
-        if (g_systemAudioInput) {
+        if (g_systemAudioInput && g_audioWriter.status == AVAssetWriterStatusWriting) {
             [g_systemAudioInput markAsFinished];
         }
-        if (g_microphoneAudioInput) {
+        if (g_microphoneAudioInput && g_audioWriter.status == AVAssetWriterStatusWriting) {
             [g_microphoneAudioInput markAsFinished];
         }
         FinishWriter(g_audioWriter, nil);