node-mac-recorder 2.4.4 → 2.4.6

package/package.json

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

package/src/mac_recorder.mm

@@ -26,6 +26,7 @@ API_AVAILABLE(macos(12.3))
 @property (nonatomic, strong) AVAssetWriter *assetWriter;
 @property (nonatomic, strong) AVAssetWriterInput *videoInput;
 @property (nonatomic, strong) AVAssetWriterInput *audioInput;
+@property (nonatomic, strong) AVAssetWriterInputPixelBufferAdaptor *pixelBufferAdaptor;
 @property (nonatomic, strong) NSURL *outputURL;
 @property (nonatomic, assign) BOOL isWriting;
 @property (nonatomic, assign) CMTime startTime;
@@ -63,6 +64,13 @@ API_AVAILABLE(macos(12.3))
         return;
     }
     
+    // Check asset writer status before processing
+    if (self.assetWriter.status == AVAssetWriterStatusFailed) {
+        NSLog(@"❌ Asset writer has failed status: %@", self.assetWriter.error.localizedDescription);
+        self.startFailed = YES;
+        return;
+    }
+    
     // Start asset writer on first sample buffer
     if (!self.hasStartTime) {
         NSLog(@"🚀 Starting asset writer with first sample buffer");
@@ -88,10 +96,62 @@ API_AVAILABLE(macos(12.3))
         case SCStreamOutputTypeScreen: {
             NSLog(@"📺 Processing screen sample buffer");
             if (self.videoInput && self.videoInput.isReadyForMoreMediaData) {
-                BOOL success = [self.videoInput appendSampleBuffer:sampleBuffer];
-                NSLog(@"📺 Video sample buffer appended: %@", success ? @"SUCCESS" : @"FAILED");
+                // Check sample buffer validity
+                if (!CMSampleBufferIsValid(sampleBuffer)) {
+                    NSLog(@"⚠️ Invalid sample buffer received");
+                    return;
+                }
+                
+                // Check timing - ensure presentation time is advancing
+                CMTime currentTime = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+                NSLog(@"📺 Sample buffer PTS: %lld", currentTime.value);
+                
+                BOOL success = NO;
+                
+                // Try using pixel buffer adaptor for better compatibility
+                if (self.pixelBufferAdaptor && self.pixelBufferAdaptor.assetWriterInput.isReadyForMoreMediaData) {
+                    // Extract pixel buffer from sample buffer
+                    CVPixelBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
+                    if (pixelBuffer) {
+                        success = [self.pixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:currentTime];
+                        NSLog(@"📺 Pixel buffer appended via adaptor: %@", success ? @"SUCCESS" : @"FAILED");
+                    } else {
+                        // Fallback to direct sample buffer append
+                        success = [self.videoInput appendSampleBuffer:sampleBuffer];
+                        NSLog(@"📺 Sample buffer appended directly: %@", success ? @"SUCCESS" : @"FAILED");
+                    }
+                } else {
+                    // Fallback to direct sample buffer append
+                    success = [self.videoInput appendSampleBuffer:sampleBuffer];
+                    NSLog(@"📺 Video sample buffer appended (fallback): %@", success ? @"SUCCESS" : @"FAILED");
+                }
+                
+                if (!success) {
+                    // Log detailed error information
+                    NSLog(@"❌ Video input append failed - Asset Writer Status: %ld", (long)self.assetWriter.status);
+                    if (self.assetWriter.error) {
+                        NSLog(@"❌ Asset Writer Error: %@", self.assetWriter.error.localizedDescription);
+                    }
+                    
+                    // Check if asset writer has failed and mark for cleanup
+                    if (self.assetWriter.status == AVAssetWriterStatusFailed) {
+                        self.startFailed = YES;
+                    }
+                }
             } else {
-                NSLog(@"⚠️ Video input not ready for more data");
+                NSLog(@"⚠️ Video input not ready for more data - isReadyForMoreMediaData: %@", 
+                      self.videoInput.isReadyForMoreMediaData ? @"YES" : @"NO");
+                
+                // Also check pixel buffer adaptor readiness
+                if (self.pixelBufferAdaptor) {
+                    NSLog(@"📊 Pixel buffer adaptor ready: %@", 
+                          self.pixelBufferAdaptor.assetWriterInput.isReadyForMoreMediaData ? @"YES" : @"NO");
+                }
+                
+                // Log asset writer input status
+                NSLog(@"📊 Asset Writer Status: %ld, Video Input Status: readyForMoreMediaData=%@", 
+                      (long)self.assetWriter.status, 
+                      self.videoInput.isReadyForMoreMediaData ? @"YES" : @"NO");
             }
             break;
         }
@@ -100,6 +160,10 @@ API_AVAILABLE(macos(12.3))
             if (self.audioInput && self.audioInput.isReadyForMoreMediaData) {
                 BOOL success = [self.audioInput appendSampleBuffer:sampleBuffer];
                 NSLog(@"🔊 Audio sample buffer appended: %@", success ? @"SUCCESS" : @"FAILED");
+                
+                if (!success && self.assetWriter.error) {
+                    NSLog(@"❌ Audio append error: %@", self.assetWriter.error.localizedDescription);
+                }
             } else {
                 NSLog(@"⚠️ Audio input not ready for more data (or no audio input)");
             }
@@ -110,6 +174,10 @@ API_AVAILABLE(macos(12.3))
             if (self.audioInput && self.audioInput.isReadyForMoreMediaData) {
                 BOOL success = [self.audioInput appendSampleBuffer:sampleBuffer];
                 NSLog(@"🎤 Microphone sample buffer appended: %@", success ? @"SUCCESS" : @"FAILED");
+                
+                if (!success && self.assetWriter.error) {
+                    NSLog(@"❌ Microphone append error: %@", self.assetWriter.error.localizedDescription);
+                }
             } else {
                 NSLog(@"⚠️ Microphone input not ready for more data (or no audio input)");
             }
@@ -474,15 +542,30 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
     NSDictionary *videoSettings = @{
         AVVideoCodecKey: AVVideoCodecTypeH264,
         AVVideoWidthKey: @((NSInteger)videoSize.width),
-        AVVideoHeightKey: @((NSInteger)videoSize.height)
+        AVVideoHeightKey: @((NSInteger)videoSize.height),
+        AVVideoCompressionPropertiesKey: @{
+            AVVideoAverageBitRateKey: @(2000000), // 2 Mbps
+            AVVideoMaxKeyFrameIntervalKey: @30
+        }
     };
     
     g_scDelegate.videoInput = [[AVAssetWriterInput alloc] initWithMediaType:AVMediaTypeVideo outputSettings:videoSettings];
     g_scDelegate.videoInput.expectsMediaDataInRealTime = YES;
     
+    // Create pixel buffer adaptor for more robust handling
+    NSDictionary *pixelBufferAttributes = @{
+        (NSString*)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA),
+        (NSString*)kCVPixelBufferWidthKey: @((NSInteger)videoSize.width),
+        (NSString*)kCVPixelBufferHeightKey: @((NSInteger)videoSize.height),
+    };
+    
+    g_scDelegate.pixelBufferAdaptor = [[AVAssetWriterInputPixelBufferAdaptor alloc] 
+        initWithAssetWriterInput:g_scDelegate.videoInput 
+        sourcePixelBufferAttributes:pixelBufferAttributes];
+    
     if ([g_scDelegate.assetWriter canAddInput:g_scDelegate.videoInput]) {
         [g_scDelegate.assetWriter addInput:g_scDelegate.videoInput];
-        NSLog(@"✅ Video input added to asset writer");
+        NSLog(@"✅ Video input added to asset writer with pixel buffer adaptor");
     } else {
         NSLog(@"❌ Cannot add video input to asset writer");
     }

package/src/window_selector.mm

@@ -221,8 +221,10 @@ bool hideScreenRecordingPreview();
 @implementation WindowSelectorDelegate
 - (void)selectButtonClicked:(id)sender {
     if (g_currentWindowUnderCursor) {
-        g_selectedWindowInfo = g_currentWindowUnderCursor;
-        cleanupWindowSelector();
+        g_selectedWindowInfo = [g_currentWindowUnderCursor copy];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            cleanupWindowSelector();
+        });
     }
 }
 
@@ -233,23 +235,22 @@ bool hideScreenRecordingPreview();
     // Get screen info from global array using button tag
     if (g_allScreens && screenIndex >= 0 && screenIndex < [g_allScreens count]) {
         NSDictionary *screenInfo = [g_allScreens objectAtIndex:screenIndex];
-        g_selectedScreenInfo = screenInfo;
-        
-        NSLog(@"🖥️ SCREEN BUTTON CLICKED: %@ (%@)", 
-              [screenInfo objectForKey:@"name"],
-              [screenInfo objectForKey:@"resolution"]);
-        
-        cleanupScreenSelector();
+        g_selectedScreenInfo = [screenInfo copy];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            cleanupScreenSelector();
+        });
     }
 }
 
 - (void)cancelButtonClicked:(id)sender {
-    NSLog(@"🚫 CANCEL BUTTON CLICKED: Selection cancelled");
-    // Clean up without selecting anything
     if (g_isScreenSelecting) {
-        cleanupScreenSelector();
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            cleanupScreenSelector();
+        });
     } else {
-        cleanupWindowSelector();
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            cleanupWindowSelector();
+        });
     }
 }
 
@@ -565,6 +566,8 @@ void cleanupWindowSelector() {
         dispatch_async(dispatch_get_main_queue(), ^{ cleanupWindowSelector(); });
         return;
     }
+    
+    NSLog(@"🧹 Cleaning up window selector resources");
     g_isWindowSelecting = false;
     
     // Stop tracking timer
@@ -971,9 +974,15 @@ bool hideScreenRecordingPreview() {
 Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
+    // Electron safety check - prevent crashes with overlay windows
+    if (getenv("ELECTRON_VERSION") || getenv("ELECTRON_RUN_AS_NODE")) {
+        NSLog(@"⚠️ Window selector disabled in Electron environment to prevent crashes");
+        return Napi::Boolean::New(env, false);
+    }
+    
     if (g_isWindowSelecting) {
-        Napi::TypeError::New(env, "Window selection already in progress").ThrowAsJavaScriptException();
-        return env.Null();
+        NSLog(@"⚠️ Window selection already in progress");
+        return Napi::Boolean::New(env, false);
     }
     
     @try {
@@ -1270,14 +1279,20 @@ Napi::Value GetWindowSelectionStatus(const Napi::CallbackInfo& info) {
 Napi::Value ShowRecordingPreview(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
+    // Electron safety check - prevent crashes with overlay windows
+    if (getenv("ELECTRON_VERSION") || getenv("ELECTRON_RUN_AS_NODE")) {
+        NSLog(@"⚠️ Recording preview disabled in Electron environment to prevent crashes");
+        return Napi::Boolean::New(env, false);
+    }
+    
     if (info.Length() < 1) {
-        Napi::TypeError::New(env, "Window info object required").ThrowAsJavaScriptException();
-        return env.Null();
+        NSLog(@"⚠️ Window info object required");
+        return Napi::Boolean::New(env, false);
     }
     
     if (!info[0].IsObject()) {
-        Napi::TypeError::New(env, "Window info must be an object").ThrowAsJavaScriptException();
-        return env.Null();
+        NSLog(@"⚠️ Window info must be an object");
+        return Napi::Boolean::New(env, false);
     }
     
     @try {
@@ -1335,11 +1350,18 @@ Napi::Value HideRecordingPreview(const Napi::CallbackInfo& info) {
 Napi::Value StartScreenSelection(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
+    // Electron safety check - prevent crashes with overlay windows
+    if (getenv("ELECTRON_VERSION") || getenv("ELECTRON_RUN_AS_NODE")) {
+        NSLog(@"⚠️ Screen selector disabled in Electron environment to prevent crashes");
+        return Napi::Boolean::New(env, false);
+    }
+    
     @try {
         bool success = startScreenSelection();
         return Napi::Boolean::New(env, success);
         
     } @catch (NSException *exception) {
+        NSLog(@"❌ Screen selection error: %@", exception);
         return Napi::Boolean::New(env, false);
     }
 }

package/window-selector.js

@@ -32,6 +32,15 @@ class WindowSelector extends EventEmitter {
 		this.selectionTimer = null;
 		this.selectedWindow = null;
 		this.lastStatus = null;
+		
+		// Electron environment detection
+		this.isElectron = !!(process.versions && process.versions.electron) || 
+		                 !!(process.env.ELECTRON_VERSION) ||
+		                 !!(process.env.ELECTRON_RUN_AS_NODE);
+		
+		if (this.isElectron) {
+			console.warn("⚠️ WindowSelector: Running in Electron - some features disabled to prevent crashes");
+		}
 	}
 
 	/**
@@ -40,6 +49,10 @@ class WindowSelector extends EventEmitter {
 	 * Select butonuna basılınca seçim tamamlanır
 	 */
 	async startSelection() {
+		if (this.isElectron) {
+			throw new Error("Window selection is not supported in Electron environment due to stability issues");
+		}
+		
 		if (this.isSelecting) {
 			throw new Error("Window selection is already in progress");
 		}
@@ -291,6 +304,11 @@ class WindowSelector extends EventEmitter {
 	 * @returns {Promise<boolean>} Success/failure
 	 */
 	async showRecordingPreview(windowInfo) {
+		if (this.isElectron) {
+			console.warn("⚠️ Recording preview disabled in Electron environment");
+			return false;
+		}
+		
 		if (!windowInfo) {
 			throw new Error("Window info is required");
 		}
@@ -322,6 +340,10 @@ class WindowSelector extends EventEmitter {
 	 * @returns {Promise<boolean>} Success/failure
 	 */
 	async startScreenSelection() {
+		if (this.isElectron) {
+			throw new Error("Screen selection is not supported in Electron environment due to stability issues");
+		}
+		
 		try {
 			const success = nativeBinding.startScreenSelection();
 			if (success) {
@@ -434,6 +456,11 @@ class WindowSelector extends EventEmitter {
 	 * @returns {Promise<boolean>} Success/failure
 	 */
 	async showScreenRecordingPreview(screenInfo) {
+		if (this.isElectron) {
+			console.warn("⚠️ Screen recording preview disabled in Electron environment");
+			return false;
+		}
+		
 		if (!screenInfo) {
 			throw new Error("Screen info is required");
 		}