node-mac-recorder 2.12.3 → 2.12.5

package/package.json

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

package/src/screen_capture_kit.h

@@ -11,5 +11,9 @@ API_AVAILABLE(macos(12.3))
                                   error:(NSError **)error;
 + (void)stopRecording;
 + (BOOL)isRecording;
++ (BOOL)setupVideoWriterWithWidth:(NSInteger)width 
+                           height:(NSInteger)height 
+                       outputPath:(NSString *)outputPath 
+                     includeAudio:(BOOL)includeAudio;
 
 @end

package/src/screen_capture_kit.mm

@@ -3,21 +3,97 @@
 // Global state
 static SCStream *g_stream = nil;
 static id<SCStreamDelegate> g_streamDelegate = nil;
+static id<SCStreamOutput> g_streamOutput = nil;
 static BOOL g_isRecording = NO;
+static AVAssetWriter *g_assetWriter = nil;
+static AVAssetWriterInput *g_videoWriterInput = nil;
+static AVAssetWriterInput *g_audioWriterInput = nil;
+static NSString *g_outputPath = nil;
+static BOOL g_sessionStarted = NO;
+static AVAssetWriterInputPixelBufferAdaptor *g_pixelBufferAdaptor = nil;
 
 @interface ScreenCaptureKitRecorderDelegate : NSObject <SCStreamDelegate>
 @property (nonatomic, copy) void (^completionHandler)(NSURL *outputURL, NSError *error);
 @end
 
+@interface ScreenCaptureKitStreamOutput : NSObject <SCStreamOutput>
+@end
+
 @implementation ScreenCaptureKitRecorderDelegate
 - (void)stream:(SCStream *)stream didStopWithError:(NSError *)error {
     NSLog(@"ScreenCaptureKit recording stopped with error: %@", error);
+    
+    // Finalize video file
+    if (g_assetWriter && g_assetWriter.status == AVAssetWriterStatusWriting) {
+        [g_videoWriterInput markAsFinished];
+        if (g_audioWriterInput) {
+            [g_audioWriterInput markAsFinished];
+        }
+        [g_assetWriter finishWritingWithCompletionHandler:^{
+            NSLog(@"✅ ScreenCaptureKit video file finalized: %@", g_outputPath);
+        }];
+    }
+}
+@end
+
+@implementation ScreenCaptureKitStreamOutput
+- (void)stream:(SCStream *)stream didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer ofType:(SCStreamOutputType)type {
+    if (!g_assetWriter) {
+        return;
+    }
+    
+    // Start session on first sample
+    if (!g_sessionStarted && g_assetWriter.status == AVAssetWriterStatusWriting) {
+        CMTime presentationTime = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+        [g_assetWriter startSessionAtSourceTime:presentationTime];
+        g_sessionStarted = YES;
+        NSLog(@"📽️ ScreenCaptureKit video session started at time: %lld/%d", presentationTime.value, presentationTime.timescale);
+    }
+    
+    if (g_assetWriter.status != AVAssetWriterStatusWriting) {
+        return;
+    }
+    
+    switch (type) {
+        case SCStreamOutputTypeScreen:
+            if (g_pixelBufferAdaptor && g_pixelBufferAdaptor.assetWriterInput.isReadyForMoreMediaData) {
+                // Convert sample buffer to pixel buffer
+                CVPixelBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
+                if (pixelBuffer) {
+                    CMTime presentationTime = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+                    BOOL success = [g_pixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:presentationTime];
+                    if (!success) {
+                        NSLog(@"❌ Failed to append pixel buffer: %@", g_assetWriter.error);
+                    }
+                }
+            }
+            break;
+        case SCStreamOutputTypeAudio:
+            if (g_audioWriterInput && g_audioWriterInput.isReadyForMoreMediaData) {
+                BOOL success = [g_audioWriterInput appendSampleBuffer:sampleBuffer];
+                if (!success) {
+                    NSLog(@"❌ Failed to append audio sample: %@", g_assetWriter.error);
+                }
+            }
+            break;
+        case SCStreamOutputTypeMicrophone:
+            // Handle microphone input (if needed in future)
+            if (g_audioWriterInput && g_audioWriterInput.isReadyForMoreMediaData) {
+                BOOL success = [g_audioWriterInput appendSampleBuffer:sampleBuffer];
+                if (!success) {
+                    NSLog(@"❌ Failed to append microphone sample: %@", g_assetWriter.error);
+                }
+            }
+            break;
+    }
 }
 @end
 
 @implementation ScreenCaptureKitRecorder
 
 + (BOOL)isScreenCaptureKitAvailable {
+    // ScreenCaptureKit'i tekrar etkinleştir - video writer ile
+    
     if (@available(macOS 12.3, *)) {
         NSLog(@"🔍 ScreenCaptureKit availability check - macOS 12.3+ confirmed");
         
@@ -163,14 +239,49 @@ static BOOL g_isRecording = NO;
                 streamConfig.showsCursor = [config[@"captureCursor"] boolValue];
                 streamConfig.capturesAudio = [config[@"includeSystemAudio"] boolValue];
                 
-                // Create delegate
+                // Setup video writer
+                g_outputPath = config[@"outputPath"];
+                if (![self setupVideoWriterWithWidth:streamConfig.width 
+                                               height:streamConfig.height 
+                                         outputPath:g_outputPath 
+                                      includeAudio:[config[@"includeSystemAudio"] boolValue] || [config[@"includeMicrophone"] boolValue]]) {
+                    NSLog(@"❌ Failed to setup video writer");
+                    contentError = [NSError errorWithDomain:@"ScreenCaptureKitError" code:-3 userInfo:@{NSLocalizedDescriptionKey: @"Video writer setup failed"}];
+                    dispatch_semaphore_signal(semaphore);
+                    return;
+                }
+                
+                // Create delegate and output
                 g_streamDelegate = [[ScreenCaptureKitRecorderDelegate alloc] init];
+                g_streamOutput = [[ScreenCaptureKitStreamOutput alloc] init];
                 
                 // Create and start stream
                 g_stream = [[SCStream alloc] initWithFilter:filter 
                                               configuration:streamConfig 
                                                    delegate:g_streamDelegate];
                 
+                // Add stream output using correct API
+                NSError *outputError = nil;
+                BOOL outputAdded = [g_stream addStreamOutput:g_streamOutput 
+                                                        type:SCStreamOutputTypeScreen 
+                                              sampleHandlerQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0)
+                                                           error:&outputError];
+                if (!outputAdded) {
+                    NSLog(@"❌ Failed to add screen output: %@", outputError);
+                }
+                
+                if ([config[@"includeSystemAudio"] boolValue]) {
+                    if (@available(macOS 13.0, *)) {
+                        BOOL audioOutputAdded = [g_stream addStreamOutput:g_streamOutput 
+                                                                     type:SCStreamOutputTypeAudio 
+                                                           sampleHandlerQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0)
+                                                                        error:&outputError];
+                        if (!audioOutputAdded) {
+                            NSLog(@"❌ Failed to add audio output: %@", outputError);
+                        }
+                    }
+                }
+                
                 [g_stream startCaptureWithCompletionHandler:^(NSError *streamError) {
                     if (streamError) {
                         NSLog(@"❌ Failed to start ScreenCaptureKit recording: %@", streamError);
@@ -225,9 +336,30 @@ static BOOL g_isRecording = NO;
                 } else {
                     NSLog(@"ScreenCaptureKit recording stopped successfully");
                 }
+                
+                // Finalize video file
+                if (g_assetWriter && g_assetWriter.status == AVAssetWriterStatusWriting) {
+                    [g_videoWriterInput markAsFinished];
+                    if (g_audioWriterInput) {
+                        [g_audioWriterInput markAsFinished];
+                    }
+                    [g_assetWriter finishWritingWithCompletionHandler:^{
+                        NSLog(@"✅ ScreenCaptureKit video file finalized: %@", g_outputPath);
+                        
+                        // Cleanup
+                        g_assetWriter = nil;
+                        g_videoWriterInput = nil;
+                        g_audioWriterInput = nil;
+                        g_pixelBufferAdaptor = nil;
+                        g_outputPath = nil;
+                        g_sessionStarted = NO;
+                    }];
+                }
+                
                 g_isRecording = NO;
                 g_stream = nil;
                 g_streamDelegate = nil;
+                g_streamOutput = nil;
             }];
         }
     }
@@ -237,4 +369,81 @@ static BOOL g_isRecording = NO;
     return g_isRecording;
 }
 
++ (BOOL)setupVideoWriterWithWidth:(NSInteger)width 
+                           height:(NSInteger)height 
+                       outputPath:(NSString *)outputPath 
+                     includeAudio:(BOOL)includeAudio {
+    
+    // Create asset writer with MP4 format for better compatibility
+    NSURL *outputURL = [NSURL fileURLWithPath:outputPath];
+    NSError *error = nil;
+    g_assetWriter = [[AVAssetWriter alloc] initWithURL:outputURL fileType:AVFileTypeMPEG4 error:&error];
+    
+    if (error || !g_assetWriter) {
+        NSLog(@"❌ Failed to create asset writer: %@", error);
+        return NO;
+    }
+    
+    // Video writer input - basic settings for maximum compatibility
+    NSDictionary *videoSettings = @{
+        AVVideoCodecKey: AVVideoCodecTypeH264,
+        AVVideoWidthKey: @(width),
+        AVVideoHeightKey: @(height)
+    };
+    
+    g_videoWriterInput = [[AVAssetWriterInput alloc] initWithMediaType:AVMediaTypeVideo outputSettings:videoSettings];
+    g_videoWriterInput.expectsMediaDataInRealTime = YES;
+    
+    if (![g_assetWriter canAddInput:g_videoWriterInput]) {
+        NSLog(@"❌ Cannot add video input to asset writer");
+        return NO;
+    }
+    [g_assetWriter addInput:g_videoWriterInput];
+    
+    // Create pixel buffer adaptor for ScreenCaptureKit compatibility
+    NSDictionary *pixelBufferAttributes = @{
+        (NSString *)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA),
+        (NSString *)kCVPixelBufferWidthKey: @(width),
+        (NSString *)kCVPixelBufferHeightKey: @(height),
+        (NSString *)kCVPixelBufferIOSurfacePropertiesKey: @{}
+    };
+    
+    g_pixelBufferAdaptor = [[AVAssetWriterInputPixelBufferAdaptor alloc] 
+        initWithAssetWriterInput:g_videoWriterInput 
+        sourcePixelBufferAttributes:pixelBufferAttributes];
+    
+    if (!g_pixelBufferAdaptor) {
+        NSLog(@"❌ Cannot create pixel buffer adaptor");
+        return NO;
+    }
+    
+    // Audio writer input (if needed)
+    if (includeAudio) {
+        NSDictionary *audioSettings = @{
+            AVFormatIDKey: @(kAudioFormatMPEG4AAC),
+            AVSampleRateKey: @(44100.0),
+            AVNumberOfChannelsKey: @(2),
+            AVEncoderBitRateKey: @(128000)
+        };
+        
+        g_audioWriterInput = [[AVAssetWriterInput alloc] initWithMediaType:AVMediaTypeAudio outputSettings:audioSettings];
+        g_audioWriterInput.expectsMediaDataInRealTime = YES;
+        
+        if ([g_assetWriter canAddInput:g_audioWriterInput]) {
+            [g_assetWriter addInput:g_audioWriterInput];
+        }
+    }
+    
+    // Start writing (session will be started when first sample arrives)
+    if (![g_assetWriter startWriting]) {
+        NSLog(@"❌ Failed to start writing: %@", g_assetWriter.error);
+        return NO;
+    }
+    
+    g_sessionStarted = NO;  // Reset session flag
+    NSLog(@"✅ ScreenCaptureKit video writer setup complete: %@", outputPath);
+    
+    return YES;
+}
+
 @end