node-mac-recorder 2.21.21 → 2.21.22

package/index.js

@@ -103,6 +103,7 @@ class MacRecorder extends EventEmitter {
 					position: device?.position ?? "unspecified",
 					transportType: device?.transportType ?? null,
 					isConnected: device?.isConnected ?? false,
+					isDefault: device?.isDefault === true,
 					hasFlash: device?.hasFlash ?? false,
 					supportsDepth: device?.supportsDepth ?? false,
 					deviceType: device?.deviceType ?? null,

package/package.json

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

package/src/audio_recorder.mm

@@ -224,10 +224,30 @@ static dispatch_queue_t g_audioCaptureQueue = nil;
         return YES;
     }
 
-    [self.session stopRunning];
+    // CRITICAL FIX: For external devices (especially Continuity Microphone),
+    // stopRunning can hang if device is disconnected. Use async approach.
+    MRLog(@"🛑 AudioRecorder: Stopping session (external device safe)...");
+
+    // Stop session on background thread to avoid blocking
+    AVCaptureSession *sessionToStop = self.session;
+    AVCaptureAudioDataOutput *outputToStop = self.audioOutput;
+
+    // Clear references FIRST to prevent new samples
     self.session = nil;
     self.audioOutput = nil;
 
+    // Stop session asynchronously with timeout protection
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        @autoreleasepool {
+            if ([sessionToStop isRunning]) {
+                MRLog(@"🛑 Stopping AVCaptureSession...");
+                [sessionToStop stopRunning];
+                MRLog(@"✅ AVCaptureSession stopped");
+            }
+            // Release happens automatically when block completes
+        }
+    });
+
     // CRITICAL FIX: Check if writer exists before trying to finish it
     if (self.writer) {
         // Only mark as finished if writerInput exists
@@ -243,16 +263,16 @@ static dispatch_queue_t g_audioCaptureQueue = nil;
             dispatch_semaphore_signal(semaphore);
         }];
 
-        // Reduced timeout to 2 seconds for faster response
-        dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
-        dispatch_semaphore_wait(semaphore, timeout);
+        // Reduced timeout to 1 second for external devices
+        dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC));
+        long result = dispatch_semaphore_wait(semaphore, timeout);
 
-        if (!finished) {
-            MRLog(@"⚠️ AudioRecorder: Timed out waiting for writer to finish");
+        if (result != 0 || !finished) {
+            MRLog(@"⚠️ AudioRecorder: Timed out waiting for writer (external device?) - forcing cancel");
             // Force cancel if timeout
             [self.writer cancelWriting];
         } else {
-            MRLog(@"✅ AudioRecorder stopped successfully");
+            MRLog(@"✅ AudioRecorder writer finished successfully");
         }
     } else {
         MRLog(@"⚠️ AudioRecorder: No writer to finish (no audio captured)");
@@ -264,6 +284,7 @@ static dispatch_queue_t g_audioCaptureQueue = nil;
     self.startTime = kCMTimeInvalid;
     self.outputPath = nil;
 
+    MRLog(@"✅ AudioRecorder stopped (safe for external devices)");
     return YES;
 }
 
@@ -334,11 +355,37 @@ NSArray<NSDictionary *> *listAudioCaptureDevices() {
                                position:AVCaptureDevicePositionUnspecified];
 
     for (AVCaptureDevice *device in session.devices) {
+        // PRIORITY FIX: MacBook built-in devices should be default, not external devices
+        // Check if this is a built-in device (MacBook's own microphone)
+        NSString *deviceName = device.localizedName ?: @"";
+        BOOL isBuiltIn = NO;
+
+        // Built-in detection: Check for "MacBook", "iMac", "Mac Studio", "Mac mini", "Mac Pro" in name
+        if ([deviceName rangeOfString:@"MacBook" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"iMac" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"Mac Studio" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"Mac mini" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"Mac Pro" options:NSCaseInsensitiveSearch].location != NSNotFound) {
+            isBuiltIn = YES;
+        }
+
+        // Also check for generic "Built-in" in name
+        if ([deviceName rangeOfString:@"Built-in" options:NSCaseInsensitiveSearch].location != NSNotFound) {
+            isBuiltIn = YES;
+        }
+
+        // External devices (Continuity, USB, etc.) should NOT be default
+        if ([deviceName rangeOfString:@"Continuity" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"iPhone" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"iPad" options:NSCaseInsensitiveSearch].location != NSNotFound) {
+            isBuiltIn = NO;
+        }
+
         NSDictionary *info = @{
             @"id": device.uniqueID ?: @"",
-            @"name": device.localizedName ?: @"Unknown Audio Device",
+            @"name": deviceName,
             @"manufacturer": device.manufacturer ?: @"",
-            @"isDefault": @(device.connected),
+            @"isDefault": @(isBuiltIn), // Only built-in devices are default
             @"transportType": @(device.transportType)
         };
         [devicesInfo addObject:info];

package/src/camera_recorder.mm

@@ -189,18 +189,58 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
                 position = @"unspecified";
                 break;
         }
-        
+
+        // PRIORITY FIX: MacBook built-in cameras should be default, not external cameras
+        // Check if this is a built-in camera (MacBook's own camera)
+        NSString *deviceName = device.localizedName ?: @"";
+        NSString *deviceType = device.deviceType ?: @"";
+        BOOL isBuiltIn = NO;
+
+        // Built-in detection: Check for common built-in camera names
+        if ([deviceName rangeOfString:@"FaceTime" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"iSight" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"Built-in" options:NSCaseInsensitiveSearch].location != NSNotFound) {
+            isBuiltIn = YES;
+        }
+
+        // Check device type for built-in wide angle camera
+        if (@available(macOS 10.15, *)) {
+            if ([deviceType isEqualToString:AVCaptureDeviceTypeBuiltInWideAngleCamera]) {
+                isBuiltIn = YES;
+            }
+        }
+
+        // External devices (Continuity Camera, iPhone, iPad, USB) should NOT be default
+        if (continuityCamera ||
+            [deviceName rangeOfString:@"iPhone" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"iPad" options:NSCaseInsensitiveSearch].location != NSNotFound ||
+            [deviceName rangeOfString:@"Continuity" options:NSCaseInsensitiveSearch].location != NSNotFound) {
+            isBuiltIn = NO;
+        }
+
+        // External device types should not be default
+        if (@available(macOS 14.0, *)) {
+            if ([deviceType isEqualToString:AVCaptureDeviceTypeExternal] ||
+                [deviceType isEqualToString:AVCaptureDeviceTypeContinuityCamera]) {
+                isBuiltIn = NO;
+            }
+        }
+        if ([deviceType isEqualToString:AVCaptureDeviceTypeExternalUnknown]) {
+            isBuiltIn = NO;
+        }
+
         NSDictionary *deviceInfo = @{
             @"id": device.uniqueID ?: @"",
-            @"name": device.localizedName ?: @"Unknown Camera",
+            @"name": deviceName,
             @"model": device.modelID ?: @"",
             @"manufacturer": device.manufacturer ?: @"",
             @"position": position ?: @"unspecified",
             @"transportType": @(device.transportType),
             @"isConnected": @(device.isConnected),
+            @"isDefault": @(isBuiltIn), // Only built-in cameras are default
             @"hasFlash": @(device.hasFlash),
             @"supportsDepth": @NO,
-            @"deviceType": device.deviceType ?: @"",
+            @"deviceType": deviceType,
             @"requiresContinuityCameraPermission": @(continuityCamera),
             @"maxResolution": @{
                 @"width": @(bestDimensions.width),
@@ -678,17 +718,33 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
         return YES;
     }
 
+    // CRITICAL FIX: For external cameras (especially Continuity Camera/iPhone),
+    // stopRunning can hang if device is disconnected. Use async approach.
+    MRLog(@"🛑 CameraRecorder: Stopping session (external device safe)...");
+
     self.isShuttingDown = YES;
     self.isRecording = NO;
 
-    @try {
-        [self.session stopRunning];
-    } @catch (NSException *exception) {
-        MRLog(@"⚠️ CameraRecorder: Exception while stopping session: %@", exception.reason);
-    }
-
+    // Stop delegate FIRST to prevent new frames
     [self.videoOutput setSampleBufferDelegate:nil queue:nil];
 
+    // Stop session on background thread to avoid blocking
+    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)");
+                }
+            } @catch (NSException *exception) {
+                MRLog(@"⚠️ CameraRecorder: Exception while stopping session: %@", exception.reason);
+            }
+            // Release happens automatically when block completes
+        }
+    });
+
     // CRITICAL FIX: Check if assetWriter exists before trying to finish it
     // If no frames were captured, assetWriter will be nil
     if (!self.assetWriter) {
@@ -709,12 +765,12 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
         dispatch_semaphore_signal(semaphore);
     }];
 
-    // Reduced timeout to 2 seconds for faster response
-    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC));
-    dispatch_semaphore_wait(semaphore, timeout);
+    // Reduced timeout to 1 second for external devices
+    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC));
+    long result = dispatch_semaphore_wait(semaphore, timeout);
 
-    if (!finished) {
-        MRLog(@"⚠️ CameraRecorder: Timed out waiting for writer to finish");
+    if (result != 0 || !finished) {
+        MRLog(@"⚠️ CameraRecorder: Timed out waiting for writer (external device?) - forcing cancel");
         // Force cancel if timeout
         [self.assetWriter cancelWriting];
     }
@@ -723,10 +779,11 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
     if (!success) {
         MRLog(@"⚠️ CameraRecorder: Writer finished with status %ld error %@", (long)self.assetWriter.status, self.assetWriter.error);
     } else {
-        MRLog(@"✅ CameraRecorder stopped successfully");
+        MRLog(@"✅ CameraRecorder writer finished successfully");
     }
 
     [self resetState];
+    MRLog(@"✅ CameraRecorder stopped (safe for external devices)");
     return success;
 }
 

package/src/mac_recorder.mm

@@ -827,6 +827,7 @@ Napi::Value GetCameraDevices(const Napi::CallbackInfo& info) {
                 NSString *position = camera[@"position"];
                 NSNumber *transportType = camera[@"transportType"];
                 NSNumber *isConnected = camera[@"isConnected"];
+                NSNumber *isDefault = camera[@"isDefault"];
                 NSNumber *hasFlash = camera[@"hasFlash"];
                 NSNumber *supportsDepth = camera[@"supportsDepth"];
                 
@@ -861,7 +862,11 @@ Napi::Value GetCameraDevices(const Napi::CallbackInfo& info) {
                 if (isConnected && [isConnected isKindOfClass:[NSNumber class]]) {
                     cameraObj.Set("isConnected", Napi::Boolean::New(env, [isConnected boolValue]));
                 }
-                
+
+                if (isDefault && [isDefault isKindOfClass:[NSNumber class]]) {
+                    cameraObj.Set("isDefault", Napi::Boolean::New(env, [isDefault boolValue]));
+                }
+
                 if (hasFlash && [hasFlash isKindOfClass:[NSNumber class]]) {
                     cameraObj.Set("hasFlash", Napi::Boolean::New(env, [hasFlash boolValue]));
                 }