node-mac-recorder 2.21.18 → 2.21.20

package/CHANGELOG-SYNC.md

@@ -149,6 +149,77 @@ const audioFilePath = path.join(outputDir, `temp_audio_${sessionTimestamp}.mov`)
 
 ---
 
+### 5. RACE CONDITION KORUMASI - Durdurma Sırasında Başlatma Engelleme
+
+**Önceki Durum:**
+- stopRecording() çağrıldıktan sonra yeni kayıt başlatılabiliyordu
+- ScreenCaptureKit async durdururken g_isRecording senkron değişiyordu
+- Kayıt durduktan sonra bile devam edebiliyordu
+- Kamera ve ses ekrandan SONRA duruyordu (yanlış sıralama)
+
+**Yeni Durum:**
+- Stop işlemi sırasında yeni kayıt başlatılamıyor
+- g_isCleaningUp flag ile async koruma
+- Hızlı start/stop döngüleri güvenli çalışıyor
+- Kamera ve ses ekrandan ÖNCE duruyor (doğru sıralama)
+
+**Kod Değişiklikleri:**
+```objc
+// screen_capture_kit.mm
++ (void)stopRecording {
+    // Set cleanup flag IMMEDIATELY to prevent race conditions
+    @synchronized([ScreenCaptureKitRecorder class]) {
+        g_isCleaningUp = YES;
+    }
+
+    [streamToStop stopCaptureWithCompletionHandler:^(NSError *stopError) {
+        @synchronized([ScreenCaptureKitRecorder class]) {
+            g_isRecording = NO;
+            g_isCleaningUp = NO; // Reset when done
+        }
+        CleanupWriters();
+    }];
+}
+
+// Export C function for checking cleanup state
+BOOL isScreenCaptureKitCleaningUp() API_AVAILABLE(macos(12.3)) {
+    return [ScreenCaptureKitRecorder isCleaningUp];
+}
+
+// mac_recorder.mm
+// Check if ScreenCaptureKit is still cleaning up
+if (@available(macOS 12.3, *)) {
+    if (isScreenCaptureKitCleaningUp()) {
+        MRLog(@"⚠️ ScreenCaptureKit is still stopping - please wait");
+        return Napi::Boolean::New(env, false);
+    }
+}
+
+// Stop camera FIRST (synchronous) before screen
+if (isCameraRecording()) {
+    MRLog(@"🛑 Stopping camera recording...");
+    stopCameraRecording();
+}
+```
+
+**Test Sonucu:**
+```
+📋 Test 1: Normal stop/start (1 saniye ara)
+   ✅ Test 1 BAŞARILI
+
+📋 Test 2: Hızlı stop/start (100ms ara)
+   ✅ Test 2 BAŞARILI
+
+📋 Test 3: Çok hızlı stop/start (0ms ara - RACE CONDITION)
+   ✅ Recording 6 başlatılamadı (BEKLENİYOR): Recording is already in progress
+   ✅ Test 3 BAŞARILI (race condition yakalandı)
+
+✅ TÜM TESTLER BAŞARILI
+   Stop işlemi güvenilir çalışıyor
+```
+
+---
+
 ## 🧪 Test Komutları
 
 ```bash
@@ -161,6 +232,9 @@ node test-stop.js
 # Timestamp tutarlılığı testi
 node test-timestamp.js
 
+# Race condition testi (hızlı start/stop döngüleri)
+node test-stop-race.js
+
 # Cihaz listesi
 node check-devices.js
 ```
@@ -176,6 +250,7 @@ node check-devices.js
 | iPhone görünürlük | Görünmüyor | **Görünüyor** ✅ |
 | Timestamp tutarlılığı | Farklı | **Aynı** ✅ |
 | Dosya uzantıları | .webm (yanlış) | **.mov** ✅ |
+| Race condition | Kayıt devam ediyor | **Korunuyor** ✅ |
 
 ---
 
@@ -183,7 +258,8 @@ node check-devices.js
 
 **Değiştirilen:**
 - `index.js`: Senkronizasyon, timestamp, dosya isimleri
-- `src/mac_recorder.mm`: Kamera önce başlatma, timestamp aktarma
+- `src/mac_recorder.mm`: Kamera önce başlatma, timestamp aktarma, race condition kontrolü
+- `src/screen_capture_kit.mm`: g_isCleaningUp flag, async stop koruma
 - `src/camera_recorder.mm`: Hızlı durdurma, Continuity Camera
 - `src/audio_recorder.mm`: Hızlı durdurma, Continuity Audio, AVChannelLayoutKey
 
@@ -191,6 +267,7 @@ node check-devices.js
 - `test-real-stop.js`: Gerçek kayıt testi
 - `test-stop.js`: Hızlı durdurma testi
 - `test-timestamp.js`: Timestamp tutarlılığı testi
+- `test-stop-race.js`: Race condition testi
 - `check-devices.js`: Cihaz listesi
 
 ---
@@ -204,3 +281,4 @@ Tüm kayıt bileşenleri (ekran, ses, kamera, cursor) artık:
 - ✅ Doğru dosya uzantıları (.mov)
 - ✅ iPhone/Continuity desteği
 - ✅ Ses ve görüntü perfect sync
+- ✅ Race condition koruması (async stop sırasında başlatma engelleniyor)

package/index.js

@@ -449,8 +449,8 @@ class MacRecorder extends EventEmitter {
 				const originalBaseName = path.basename(outputPath, path.extname(outputPath));
 				const extension = path.extname(outputPath);
 
-				// Remove any existing timestamp from filename (pattern: -1234567890)
-				const cleanBaseName = originalBaseName.replace(/-\d{13}$/, '');
+				// Remove any existing timestamp from filename (pattern: -1234567890 or _1234567890)
+				const cleanBaseName = originalBaseName.replace(/[-_]\d{13}$/, '');
 
 				// Reconstruct path with sessionTimestamp
 				outputPath = path.join(outputDir, `${cleanBaseName}-${sessionTimestamp}${extension}`);

package/package.json

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

package/src/mac_recorder.mm

@@ -172,11 +172,20 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
     // This fixes the issue where macOS 14/13 users get "recording already in progress"
     MRLog(@"🧹 Cleaning up any previous recording state...");
     cleanupRecording();
-    
+
     if (g_isRecording) {
         MRLog(@"⚠️ Still recording after cleanup - forcing stop");
         return Napi::Boolean::New(env, false);
     }
+
+    // CRITICAL FIX: Check if ScreenCaptureKit is still cleaning up (async stop in progress)
+    if (@available(macOS 12.3, *)) {
+        extern BOOL isScreenCaptureKitCleaningUp();
+        if (isScreenCaptureKitCleaningUp()) {
+            MRLog(@"⚠️ ScreenCaptureKit is still stopping previous recording - please wait");
+            return Napi::Boolean::New(env, false);
+        }
+    }
     g_usingStandaloneAudio = false;
     
     std::string outputPath = info[0].As<Napi::String>().Utf8Value();
@@ -570,11 +579,25 @@ Napi::Value StopRecording(const Napi::CallbackInfo& info) {
     if (@available(macOS 12.3, *)) {
         if ([ScreenCaptureKitRecorder isRecording]) {
             MRLog(@"🛑 Stopping ScreenCaptureKit recording");
-            [ScreenCaptureKitRecorder stopRecording];
+
+            // CRITICAL FIX: Stop camera and audio FIRST (they are synchronous)
             if (isCameraRecording()) {
-                stopCameraRecording();
+                MRLog(@"🛑 Stopping camera recording...");
+                bool cameraStopped = stopCameraRecording();
+                if (cameraStopped) {
+                    MRLog(@"✅ Camera stopped successfully");
+                } else {
+                    MRLog(@"⚠️ Camera stop may have timed out");
+                }
             }
-            g_isRecording = false;
+
+            // Now stop ScreenCaptureKit (asynchronous)
+            // WARNING: [ScreenCaptureKitRecorder stopRecording] is ASYNC!
+            // It will set g_isRecording = NO in its completion handler
+            [ScreenCaptureKitRecorder stopRecording];
+
+            // DO NOT set g_isRecording here - let ScreenCaptureKit completion handler do it
+            // Otherwise we have a race condition where JS thinks recording stopped but it's still running
             g_usingStandaloneAudio = false;
             return Napi::Boolean::New(env, true);
         }
@@ -588,24 +611,32 @@ Napi::Value StopRecording(const Napi::CallbackInfo& info) {
     @try {
         if (isAVFoundationRecording()) {
             MRLog(@"🛑 Stopping AVFoundation recording");
-            if (stopAVFoundationRecording()) {
-                if (g_usingStandaloneAudio && isStandaloneAudioRecording()) {
-                    stopStandaloneAudioRecording();
-                }
-                if (isCameraRecording()) {
-                    stopCameraRecording();
+
+            // CRITICAL FIX: Stop camera FIRST (synchronous)
+            if (isCameraRecording()) {
+                MRLog(@"🛑 Stopping camera recording...");
+                bool cameraStopped = stopCameraRecording();
+                if (cameraStopped) {
+                    MRLog(@"✅ Camera stopped successfully");
+                } else {
+                    MRLog(@"⚠️ Camera stop may have timed out");
                 }
+            }
+
+            // Stop standalone audio if used
+            if (g_usingStandaloneAudio && isStandaloneAudioRecording()) {
+                MRLog(@"🛑 Stopping standalone audio...");
+                stopStandaloneAudioRecording();
+            }
+
+            // Stop AVFoundation recording
+            if (stopAVFoundationRecording()) {
                 g_isRecording = false;
                 g_usingStandaloneAudio = false;
+                MRLog(@"✅ AVFoundation recording stopped");
                 return Napi::Boolean::New(env, true);
             } else {
                 NSLog(@"❌ Failed to stop AVFoundation recording");
-                if (g_usingStandaloneAudio && isStandaloneAudioRecording()) {
-                    stopStandaloneAudioRecording();
-                }
-                if (isCameraRecording()) {
-                    stopCameraRecording();
-                }
                 g_isRecording = false;
                 g_usingStandaloneAudio = false;
                 return Napi::Boolean::New(env, false);
@@ -614,6 +645,7 @@ Napi::Value StopRecording(const Napi::CallbackInfo& info) {
     } @catch (NSException *exception) {
         NSLog(@"❌ Exception stopping AVFoundation: %@", exception.reason);
         g_isRecording = false;
+        g_usingStandaloneAudio = false;
         return Napi::Boolean::New(env, false);
     }
     

package/src/screen_capture_kit.mm

@@ -792,6 +792,12 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
 
     MRLog(@"🛑 Stopping pure ScreenCaptureKit recording");
 
+    // CRITICAL FIX: Set cleanup flag IMMEDIATELY to prevent race conditions
+    // This prevents startRecording from being called while stop is in progress
+    @synchronized([ScreenCaptureKitRecorder class]) {
+        g_isCleaningUp = YES;
+    }
+
     // Store stream reference to prevent it from being deallocated
     SCStream *streamToStop = g_stream;
 
@@ -807,6 +813,7 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
             // Reset recording state to allow new recordings
             @synchronized([ScreenCaptureKitRecorder class]) {
                 g_isRecording = NO;
+                g_isCleaningUp = NO; // CRITICAL: Reset cleanup flag when done
             }
 
             // Cleanup after stop completes
@@ -820,6 +827,19 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
     return g_isRecording;
 }
 
++ (BOOL)isCleaningUp {
+    return g_isCleaningUp;
+}
+
+@end
+
+// Export C function for checking cleanup state
+BOOL isScreenCaptureKitCleaningUp() API_AVAILABLE(macos(12.3)) {
+    return [ScreenCaptureKitRecorder isCleaningUp];
+}
+
+@implementation ScreenCaptureKitRecorder (Methods)
+
 + (BOOL)setupVideoWriter {
     // No setup needed - SCRecordingOutput handles everything
     return YES;