node-mac-recorder 2.21.29 → 2.21.31

package/package.json

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

package/src/camera_recorder.mm

@@ -724,27 +724,43 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
     MRLog(@"🛑 CameraRecorder: Stopping session (external device safe)...");
 
     self.isShuttingDown = YES;
-    self.isRecording = NO;
-
-    // Stop delegate FIRST to prevent new frames
-    [self.videoOutput setSampleBufferDelegate:nil queue:nil];
 
-    // Stop session on background thread to avoid blocking
+    // Stop session on background thread to avoid blocking, but wait briefly so we capture trailing frames.
     AVCaptureSession *sessionToStop = self.session;
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-        @autoreleasepool {
-            @try {
-                if ([sessionToStop isRunning]) {
-                    MRLog(@"🛑 Stopping AVCaptureSession (camera)...");
-                    [sessionToStop stopRunning];
-                    MRLog(@"✅ AVCaptureSession stopped (camera)");
+
+    dispatch_group_t sessionStopGroup = NULL;
+    if (sessionToStop) {
+        sessionStopGroup = dispatch_group_create();
+        dispatch_group_enter(sessionStopGroup);
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+            @autoreleasepool {
+                @try {
+                    if ([sessionToStop isRunning]) {
+                        MRLog(@"🛑 Stopping AVCaptureSession (camera)...");
+                        [sessionToStop stopRunning];
+                        MRLog(@"✅ AVCaptureSession stopped (camera)");
+                    }
+                } @catch (NSException *exception) {
+                    MRLog(@"⚠️ CameraRecorder: Exception while stopping session: %@", exception.reason);
                 }
-            } @catch (NSException *exception) {
-                MRLog(@"⚠️ CameraRecorder: Exception while stopping session: %@", exception.reason);
+                dispatch_group_leave(sessionStopGroup);
             }
-            // Release happens automatically when block completes
+        });
+    }
+
+    if (sessionStopGroup) {
+        dispatch_time_t sessionTimeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
+        long waitResult = dispatch_group_wait(sessionStopGroup, sessionTimeout);
+        if (waitResult != 0) {
+            MRLog(@"⚠️ CameraRecorder: AVCaptureSession stop timed out after 2s (continuing shutdown)");
         }
-    });
+    }
+
+    // Now detach delegate to prevent further callbacks
+    if (self.videoOutput) {
+        [self.videoOutput setSampleBufferDelegate:nil queue:nil];
+    }
+    self.isRecording = NO;
 
     // CRITICAL FIX: Check if assetWriter exists before trying to finish it
     // If no frames were captured, assetWriter will be nil
@@ -754,31 +770,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);
     }
 
-    BOOL success = (self.assetWriter.status == AVAssetWriterStatusCompleted);
+    if (result != 0 || !finished) {
+        MRLog(@"⚠️ CameraRecorder: Writer did not finish after extended wait – forcing cancel");
+        [writer cancelWriting];
+    }
+
+    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");
     }
@@ -791,7 +817,7 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
 - (void)captureOutput:(AVCaptureOutput *)output
  didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
         fromConnection:(AVCaptureConnection *)connection {
-    if (!self.isRecording || self.isShuttingDown) {
+    if (!self.isRecording) {
         return;
     }