node-mac-recorder 2.21.28 → 2.21.30

package/package.json

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

package/src/camera_recorder.mm

@@ -754,31 +754,41 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
         return YES; // Success - nothing to finish
     }
 
-    if (self.assetWriterInput) {
-        [self.assetWriterInput markAsFinished];
+    AVAssetWriter *writer = self.assetWriter;
+    AVAssetWriterInput *writerInput = self.assetWriterInput;
+
+    if (writerInput) {
+        [writerInput markAsFinished];
     }
 
     __block BOOL finished = NO;
     dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
 
-    [self.assetWriter finishWritingWithCompletionHandler:^{
+    [writer finishWritingWithCompletionHandler:^{
         finished = YES;
         dispatch_semaphore_signal(semaphore);
     }];
 
-    // Reduced timeout to 1 second for external devices
-    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC));
+    // Allow generous flush time so final frames are preserved.
+    const int64_t primaryWaitSeconds = 3;
+    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(primaryWaitSeconds * NSEC_PER_SEC));
     long result = dispatch_semaphore_wait(semaphore, timeout);
 
     if (result != 0 || !finished) {
-        MRLog(@"⚠️ CameraRecorder: Timed out waiting for writer (external device?) - forcing cancel");
-        // Force cancel if timeout
-        [self.assetWriter cancelWriting];
+        MRLog(@"⚠️ CameraRecorder: Writer still finishing after %ds – waiting longer", (int)primaryWaitSeconds);
+        const int64_t extendedWaitSeconds = 5;
+        dispatch_time_t extendedTimeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(extendedWaitSeconds * NSEC_PER_SEC));
+        result = dispatch_semaphore_wait(semaphore, extendedTimeout);
+    }
+
+    if (result != 0 || !finished) {
+        MRLog(@"⚠️ CameraRecorder: Writer did not finish after extended wait – forcing cancel");
+        [writer cancelWriting];
     }
 
-    BOOL success = (self.assetWriter.status == AVAssetWriterStatusCompleted);
+    BOOL success = (writer.status == AVAssetWriterStatusCompleted);
     if (!success) {
-        MRLog(@"⚠️ CameraRecorder: Writer finished with status %ld error %@", (long)self.assetWriter.status, self.assetWriter.error);
+        MRLog(@"⚠️ CameraRecorder: Writer finished with status %ld error %@", (long)writer.status, writer.error);
     } else {
         MRLog(@"✅ CameraRecorder writer finished successfully");
     }

package/src/mac_recorder.mm

@@ -630,33 +630,51 @@ Napi::Value StopRecording(const Napi::CallbackInfo& info) {
         if (isAVFoundationRecording()) {
             MRLog(@"🛑 Stopping AVFoundation recording");
 
-            // CRITICAL FIX: Stop camera FIRST (synchronous)
-            if (isCameraRecording()) {
+            BOOL cameraWasRecording = isCameraRecording();
+            __block BOOL cameraStopResult = YES;
+            dispatch_group_t cameraStopGroup = NULL;
+
+            if (cameraWasRecording) {
                 MRLog(@"🛑 Stopping camera recording...");
-                bool cameraStopped = stopCameraRecording();
-                if (cameraStopped) {
-                    MRLog(@"✅ Camera stopped successfully");
-                } else {
-                    MRLog(@"⚠️ Camera stop may have timed out");
-                }
+                cameraStopResult = NO;
+                cameraStopGroup = dispatch_group_create();
+                dispatch_group_enter(cameraStopGroup);
+                // Stop camera on a background queue so audio/screen shutdown can proceed immediately.
+                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+                    cameraStopResult = stopCameraRecording() ? YES : NO;
+                    dispatch_group_leave(cameraStopGroup);
+                });
             }
 
-            // Stop standalone audio if used
+            // Stop standalone audio if used (ScreenCaptureKit fallback)
             if (g_usingStandaloneAudio && isStandaloneAudioRecording()) {
                 MRLog(@"🛑 Stopping standalone audio...");
                 stopStandaloneAudioRecording();
             }
 
-            // Stop AVFoundation recording
-            if (stopAVFoundationRecording()) {
-                g_isRecording = false;
-                g_usingStandaloneAudio = false;
+            bool avFoundationStopped = stopAVFoundationRecording();
+
+            if (cameraStopGroup) {
+                dispatch_time_t waitTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
+                long waitResult = dispatch_group_wait(cameraStopGroup, waitTime);
+                if (waitResult != 0) {
+                    MRLog(@"⚠️ Camera stop did not finish within 2 seconds (AVFoundation)");
+                    cameraStopResult = NO;
+                } else if (cameraStopResult) {
+                    MRLog(@"✅ Camera stopped successfully");
+                } else {
+                    MRLog(@"⚠️ Camera stop reported failure");
+                }
+            }
+
+            g_isRecording = false;
+            g_usingStandaloneAudio = false;
+
+            if (avFoundationStopped && (!cameraWasRecording || cameraStopResult)) {
                 MRLog(@"✅ AVFoundation recording stopped");
                 return Napi::Boolean::New(env, true);
             } else {
                 NSLog(@"❌ Failed to stop AVFoundation recording");
-                g_isRecording = false;
-                g_usingStandaloneAudio = false;
                 return Napi::Boolean::New(env, false);
             }
         }