node-mac-recorder 2.16.12 → 2.16.14

package/.claude/settings.local.json

@@ -1,7 +1,7 @@
 {
   "permissions": {
     "allow": [
-      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing fixed AVFoundation...'');\nconst MacRecorder = require(''./index.js'');\nconst recorder = new MacRecorder();\n\nrecorder.startRecording(''/tmp/electron-test2.mov'')\n  .then(success => {\n    console.log(''Start:'', success ? ''✅ SUCCESS'' : ''❌ FAILED'');\n    if (success) {\n      setTimeout(() => {\n        console.log(''⏹️ Stopping...'');\n        recorder.stopRecording().then(() => {\n          console.log(''✅ Stop completed'');\n          const fs = require(''fs'');\n          if (fs.existsSync(''/tmp/electron-test2.mov'')) {\n            console.log(''📹 File:'', Math.round(fs.statSync(''/tmp/electron-test2.mov'').size/1024) + ''KB'');\n            console.log(''🎉 Fix successful!'');\n          }\n        });\n      }, 2000);\n    }\n  })\n  .catch(console.error);\n\")"
+      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing AVFoundation area recording...'');\nconst MacRecorder = require(''./index.js'');\nconst recorder = new MacRecorder();\n\n// Test specific area recording (top-left 500x500)\nconst options = {\n  captureArea: {\n    x: 100,\n    y: 100, \n    width: 500,\n    height: 500\n  }\n};\n\nrecorder.startRecording(''/tmp/area-test.mov'', options)\n  .then(success => {\n    console.log(''Area recording:'', success ? ''✅ SUCCESS'' : ''❌ FAILED'');\n    if (success) {\n      setTimeout(() => {\n        recorder.stopRecording().then(() => {\n          console.log(''✅ Area recording complete'');\n          const fs = require(''fs'');\n          if (fs.existsSync(''/tmp/area-test.mov'')) {\n            const size = Math.round(fs.statSync(''/tmp/area-test.mov'').size/1024);\n            console.log(''📹 File size:'', size + ''KB'');\n          }\n        });\n      }, 2000);\n    }\n  })\n  .catch(console.error);\n\")"
     ],
     "deny": [],
     "ask": []

package/package.json

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

package/src/avfoundation_recorder.mm

@@ -53,9 +53,14 @@ extern "C" bool startAVFoundationRecording(const std::string& outputPath,
             return false;
         }
         
-        // Get display dimensions
+        // Get display dimensions - use width/height directly to avoid coordinate issues
         CGRect displayBounds = CGDisplayBounds(displayID);
-        CGSize recordingSize = captureRect.size.width > 0 ? captureRect.size : displayBounds.size;
+        CGSize displaySize = CGSizeMake(CGDisplayPixelsWide(displayID), CGDisplayPixelsHigh(displayID));
+        CGSize recordingSize = captureRect.size.width > 0 ? captureRect.size : displaySize;
+        
+        NSLog(@"🖥️ Display bounds: %.0f,%.0f %.0fx%.0f", displayBounds.origin.x, displayBounds.origin.y, displayBounds.size.width, displayBounds.size.height);
+        NSLog(@"🖥️ Display pixels: %.0fx%.0f", displaySize.width, displaySize.height);
+        NSLog(@"🎯 Recording size: %.0fx%.0f", recordingSize.width, recordingSize.height);
         
         // Video settings with macOS compatibility
         NSString *codecKey;
@@ -135,9 +140,20 @@ extern "C" bool startAVFoundationRecording(const std::string& outputPath,
         uint64_t interval = NSEC_PER_SEC / 10; // 10 FPS for Electron stability
         dispatch_source_set_timer(g_avTimer, dispatch_time(DISPATCH_TIME_NOW, 0), interval, interval / 10);
         
+        // Retain objects before passing to block to prevent deallocation
+        AVAssetWriterInput *localVideoInput = g_avVideoInput;
+        AVAssetWriterInputPixelBufferAdaptor *localPixelBufferAdaptor = g_avPixelBufferAdaptor;
+        
         dispatch_source_set_event_handler(g_avTimer, ^{
             if (!g_avIsRecording) return;
             
+            // Additional null checks for Electron safety
+            if (!localVideoInput || !localPixelBufferAdaptor) {
+                NSLog(@"⚠️ Video input or pixel buffer adaptor is nil, stopping recording");
+                g_avIsRecording = false;
+                return;
+            }
+            
             @autoreleasepool {
                 @try {
                     // Capture screen with Electron-safe error handling
@@ -159,9 +175,19 @@ extern "C" bool startAVFoundationRecording(const std::string& outputPath,
                 
                     // Convert to pixel buffer with Electron-safe error handling
                     CVPixelBufferRef pixelBuffer = nil;
-                    CVReturn cvRet = CVPixelBufferPoolCreatePixelBuffer(NULL, g_avPixelBufferAdaptor.pixelBufferPool, &pixelBuffer);
+                    CVReturn cvRet = CVPixelBufferPoolCreatePixelBuffer(NULL, localPixelBufferAdaptor.pixelBufferPool, &pixelBuffer);
                     
                     if (cvRet == kCVReturnSuccess && pixelBuffer) {
+                        // Check pixel buffer dimensions match screen image
+                        size_t bufferWidth = CVPixelBufferGetWidth(pixelBuffer);
+                        size_t bufferHeight = CVPixelBufferGetHeight(pixelBuffer);
+                        size_t imageWidth = CGImageGetWidth(screenImage);
+                        size_t imageHeight = CGImageGetHeight(screenImage);
+                        
+                        if (bufferWidth != imageWidth || bufferHeight != imageHeight) {
+                            NSLog(@"⚠️ Size mismatch! Buffer %zux%zu vs Image %zux%zu", bufferWidth, bufferHeight, imageWidth, imageHeight);
+                        }
+                        
                         CVPixelBufferLockBaseAddress(pixelBuffer, 0);
                         
                         void *pixelData = CVPixelBufferGetBaseAddress(pixelBuffer);
@@ -201,9 +227,9 @@ extern "C" bool startAVFoundationRecording(const std::string& outputPath,
                             CGContextRelease(context);
                             
                             // Write frame only if input is ready
-                            if (g_avVideoInput && g_avVideoInput.readyForMoreMediaData) {
+                            if (localVideoInput && localVideoInput.readyForMoreMediaData) {
                                 CMTime frameTime = CMTimeAdd(g_avStartTime, CMTimeMakeWithSeconds(g_avFrameNumber / 10.0, 600));
-                                BOOL appendSuccess = [g_avPixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:frameTime];
+                                BOOL appendSuccess = [localPixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:frameTime];
                                 if (appendSuccess) {
                                     g_avFrameNumber++;
                                 } else {
@@ -253,22 +279,36 @@ extern "C" bool stopAVFoundationRecording() {
     @try {
         // Stop timer with Electron-safe cleanup
         if (g_avTimer) {
+            // Mark as not recording FIRST to stop timer callbacks
+            g_avIsRecording = false;
+            
+            // Cancel timer and wait a brief moment for completion
             dispatch_source_cancel(g_avTimer);
+            
+            // Use async to avoid deadlock in Electron
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 100 * NSEC_PER_MSEC), dispatch_get_main_queue(), ^{
+                // Timer should be fully cancelled by now
+            });
+            
             g_avTimer = nil;
             NSLog(@"✅ AVFoundation timer stopped safely");
         }
         
-        // Finish writing
-        if (g_avVideoInput) {
-            [g_avVideoInput markAsFinished];
+        // Finish writing with null checks
+        AVAssetWriterInput *writerInput = g_avVideoInput;
+        if (writerInput) {
+            [writerInput markAsFinished];
         }
         
-        if (g_avWriter && g_avWriter.status == AVAssetWriterStatusWriting) {
+        AVAssetWriter *writer = g_avWriter;
+        if (writer && writer.status == AVAssetWriterStatusWriting) {
             dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-            [g_avWriter finishWritingWithCompletionHandler:^{
+            [writer finishWritingWithCompletionHandler:^{
                 dispatch_semaphore_signal(semaphore);
             }];
-            dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+            // Add timeout to prevent infinite wait in Electron
+            dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC);
+            dispatch_semaphore_wait(semaphore, timeout);
         }
         
         // Cleanup

package/src/window_selector.mm

@@ -875,25 +875,32 @@ void updateOverlay() {
             }
             
             // Determine if this is a primary display window
-            BOOL isPrimaryDisplayWindow = (x >= 0 && x <= 2048);  // Primary display width
+            NSArray *allScreens = [NSScreen screens];
+            NSScreen *primaryScreen = [allScreens objectAtIndex:0]; // Primary screen
+            NSRect primaryFrame = [primaryScreen frame];
+            BOOL isPrimaryDisplayWindow = (x >= primaryFrame.origin.x && 
+                                         x <= primaryFrame.origin.x + primaryFrame.size.width &&
+                                         y >= primaryFrame.origin.y &&
+                                         y <= primaryFrame.origin.y + primaryFrame.size.height);
             
             CGFloat localX, localY;
             if (isPrimaryDisplayWindow) {
-                // Primary display windows: Offset to their position in the combined overlay
-                // Primary display starts at (3440, 56) within the combined frame
-                localX = x + 3440;  // Primary starts 3440px from overlay origin
-                localY = ([g_overlayView frame].size.height - (y + 56)) - height;  // Y offset for primary
+                // Primary display windows: Calculate dynamic offset from combined frame
+                NSRect combinedFrame = [g_overlayWindow frame];
+                
+                // Calculate primary screen offset within combined frame
+                CGFloat primaryOffsetX = primaryFrame.origin.x - combinedFrame.origin.x;
+                CGFloat primaryOffsetY = primaryFrame.origin.y - combinedFrame.origin.y;
+                
+                localX = x + primaryOffsetX;
+                localY = ([g_overlayView frame].size.height - (y + primaryOffsetY)) - height;
+                
             } else {
                 // Secondary display windows: Apply standard coordinate transformation
                 localX = x - globalOffset.x;
                 localY = ([g_overlayView frame].size.height - (y - globalOffset.y)) - height;
             }
             
-            NSLog(@"🔧 COORDINATE DEBUG: Window (%d, %d) %dx%d [%@]", (int)x, (int)y, (int)width, (int)height, isPrimaryDisplayWindow ? @"PRIMARY" : @"SECONDARY");
-            NSLog(@"   GlobalOffset: (%.0f, %.0f)", globalOffset.x, globalOffset.y);
-            NSLog(@"   LocalCoords: (%.0f, %.0f)", localX, localY);
-            NSLog(@"   ViewFrame: %.0fx%.0f", [g_overlayView frame].size.width, [g_overlayView frame].size.height);
-            
             // Update overlay view window info for highlighting
             [overlayView setWindowInfo:targetWindow];
             [overlayView setHighlightFrame:NSMakeRect(localX, localY, width, height)];