node-mac-recorder 2.16.11 → 2.16.13

package/.claude/settings.local.json

@@ -1,7 +1,7 @@
 {
   "permissions": {
     "allow": [
-      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconst MacRecorder = require(''./index.js'');\nconst recorder = new MacRecorder();\nrecorder.startRecording(''/tmp/test-final.mov'')\n  .then(success => {\n    console.log(''Recording start:'', success ? ''SUCCESS'' : ''FAILED'');\n    if (success) {\n      setTimeout(() => {\n        recorder.stopRecording().then(() => {\n          console.log(''Recording stopped'');\n          const fs = require(''fs'');\n          if (fs.existsSync(''/tmp/test-final.mov'')) {\n            console.log(''File created:'', Math.round(fs.statSync(''/tmp/test-final.mov'').size/1024) + ''KB'');\n          }\n        });\n      }, 2000);\n    }\n  })\n  .catch(console.error);\n\")"
+      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing Electron crash fix (macOS 14 simulation)...'');\nconst MacRecorder = require(''./index.js'');\nconst recorder = new MacRecorder();\n\nrecorder.on(''recordingStarted'', (details) => {\n  console.log(''✅ Recording started safely'');\n});\n\nrecorder.on(''stopped'', () => {\n  console.log(''✅ Recording stopped without crash'');\n});\n\nlet recordingStarted = false;\nrecorder.startRecording(''/tmp/crash-fix-test.mov'')\n  .then(success => {\n    console.log(''Start result:'', success ? ''✅ SUCCESS'' : ''❌ FAILED'');\n    if (success) {\n      recordingStarted = true;\n      // Test quick start/stop cycles to stress test memory handling\n      setTimeout(() => {\n        console.log(''⏹️ Quick stop test...'');\n        recorder.stopRecording().then(() => {\n          console.log(''✅ Quick stop completed'');\n          \n          // Test immediate restart\n          setTimeout(() => {\n            console.log(''🔄 Testing immediate restart...'');\n            recorder.startRecording(''/tmp/crash-fix-test2.mov'').then(() => {\n              setTimeout(() => {\n                recorder.stopRecording().then(() => {\n                  console.log(''🎉 Crash fix test completed successfully!'');\n                  const fs = require(''fs'');\n                  const files = [''/tmp/crash-fix-test.mov'', ''/tmp/crash-fix-test2.mov''];\n                  files.forEach(file => {\n                    if (fs.existsSync(file)) {\n                      const size = Math.round(fs.statSync(file).size/1024);\n                      console.log(''📹 '' + file + '':'', size + ''KB'');\n                    }\n                  });\n                });\n              }, 1000);\n            });\n          }, 500);\n        });\n      }, 2000);\n    }\n  })\n  .catch(err => {\n    console.error(''❌ Error:'', err);\n    if (recordingStarted) {\n      recorder.stopRecording();\n    }\n  });\n\")"
     ],
     "deny": [],
     "ask": []

package/package.json

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

package/src/avfoundation_recorder.mm

@@ -123,7 +123,7 @@ extern "C" bool startAVFoundationRecording(const std::string& outputPath,
         g_avCaptureRect = captureRect;
         g_avFrameNumber = 0;
         
-        // Start capture timer (15 FPS for compatibility)
+        // Start capture timer (10 FPS for Electron compatibility)
         dispatch_queue_t captureQueue = dispatch_queue_create("AVFoundationCaptureQueue", DISPATCH_QUEUE_SERIAL);
         g_avTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, captureQueue);
         
@@ -132,78 +132,118 @@ extern "C" bool startAVFoundationRecording(const std::string& outputPath,
             return false;
         }
         
-        uint64_t interval = NSEC_PER_SEC / 15; // 15 FPS
+        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 {
-                // Capture screen
-                CGImageRef screenImage = nil;
-                if (CGRectIsEmpty(g_avCaptureRect)) {
-                    screenImage = CGDisplayCreateImage(g_avDisplayID);
-                } else {
-                    CGImageRef fullScreen = CGDisplayCreateImage(g_avDisplayID);
-                    if (fullScreen) {
-                        screenImage = CGImageCreateWithImageInRect(fullScreen, g_avCaptureRect);
-                        CGImageRelease(fullScreen);
+                @try {
+                    // Capture screen with Electron-safe error handling
+                    CGImageRef screenImage = nil;
+                    if (CGRectIsEmpty(g_avCaptureRect)) {
+                        screenImage = CGDisplayCreateImage(g_avDisplayID);
+                    } else {
+                        CGImageRef fullScreen = CGDisplayCreateImage(g_avDisplayID);
+                        if (fullScreen) {
+                            screenImage = CGImageCreateWithImageInRect(fullScreen, g_avCaptureRect);
+                            CGImageRelease(fullScreen);
+                        }
                     }
-                }
-                
-                if (!screenImage) return;
-                
-                // Convert to pixel buffer
-                CVPixelBufferRef pixelBuffer = nil;
-                CVReturn cvRet = CVPixelBufferPoolCreatePixelBuffer(NULL, g_avPixelBufferAdaptor.pixelBufferPool, &pixelBuffer);
-                
-                if (cvRet == kCVReturnSuccess && pixelBuffer) {
-                    CVPixelBufferLockBaseAddress(pixelBuffer, 0);
-                    
-                    void *pixelData = CVPixelBufferGetBaseAddress(pixelBuffer);
-                    size_t bytesPerRow = CVPixelBufferGetBytesPerRow(pixelBuffer);
-                    
-                    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
                     
-                    // Match bitmap info to pixel format for compatibility
-                    CGBitmapInfo bitmapInfo;
-                    OSType currentPixelFormat = CVPixelBufferGetPixelFormatType(pixelBuffer);
-                    if (currentPixelFormat == kCVPixelFormatType_32ARGB) {
-                        bitmapInfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Big;
-                    } else { // kCVPixelFormatType_32BGRA
-                        bitmapInfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little;
+                    if (!screenImage) {
+                        NSLog(@"⚠️ Failed to capture screen image, skipping frame");
+                        return;
                     }
+                
+                    // Convert to pixel buffer with Electron-safe error handling
+                    CVPixelBufferRef pixelBuffer = nil;
+                    CVReturn cvRet = CVPixelBufferPoolCreatePixelBuffer(NULL, localPixelBufferAdaptor.pixelBufferPool, &pixelBuffer);
                     
-                    CGContextRef context = CGBitmapContextCreate(pixelData, 
-                                                               CVPixelBufferGetWidth(pixelBuffer),
-                                                               CVPixelBufferGetHeight(pixelBuffer), 
-                                                               8, bytesPerRow, colorSpace, bitmapInfo);
-                    
-                    if (context) {
-                        CGContextDrawImage(context, CGRectMake(0, 0, CVPixelBufferGetWidth(pixelBuffer), CVPixelBufferGetHeight(pixelBuffer)), screenImage);
-                        CGContextRelease(context);
-                    }
-                    CGColorSpaceRelease(colorSpace);
-                    CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
-                    
-                    // Write frame
-                    if (g_avVideoInput.readyForMoreMediaData) {
-                        CMTime frameTime = CMTimeAdd(g_avStartTime, CMTimeMakeWithSeconds(g_avFrameNumber / 15.0, 600));
-                        [g_avPixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:frameTime];
-                        g_avFrameNumber++;
+                    if (cvRet == kCVReturnSuccess && pixelBuffer) {
+                        CVPixelBufferLockBaseAddress(pixelBuffer, 0);
+                        
+                        void *pixelData = CVPixelBufferGetBaseAddress(pixelBuffer);
+                        if (!pixelData) {
+                            NSLog(@"⚠️ Failed to get pixel buffer base address");
+                            CVPixelBufferRelease(pixelBuffer);
+                            CGImageRelease(screenImage);
+                            return;
+                        }
+                        
+                        size_t bytesPerRow = CVPixelBufferGetBytesPerRow(pixelBuffer);
+                        CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+                        if (!colorSpace) {
+                            NSLog(@"⚠️ Failed to create color space");
+                            CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
+                            CVPixelBufferRelease(pixelBuffer);
+                            CGImageRelease(screenImage);
+                            return;
+                        }
+                        
+                        // Match bitmap info to pixel format for compatibility
+                        CGBitmapInfo bitmapInfo;
+                        OSType currentPixelFormat = CVPixelBufferGetPixelFormatType(pixelBuffer);
+                        if (currentPixelFormat == kCVPixelFormatType_32ARGB) {
+                            bitmapInfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Big;
+                        } else { // kCVPixelFormatType_32BGRA
+                            bitmapInfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little;
+                        }
+                        
+                        CGContextRef context = CGBitmapContextCreate(pixelData, 
+                                                                   CVPixelBufferGetWidth(pixelBuffer),
+                                                                   CVPixelBufferGetHeight(pixelBuffer), 
+                                                                   8, bytesPerRow, colorSpace, bitmapInfo);
+                        
+                        if (context) {
+                            CGContextDrawImage(context, CGRectMake(0, 0, CVPixelBufferGetWidth(pixelBuffer), CVPixelBufferGetHeight(pixelBuffer)), screenImage);
+                            CGContextRelease(context);
+                            
+                            // Write frame only if input is ready
+                            if (localVideoInput && localVideoInput.readyForMoreMediaData) {
+                                CMTime frameTime = CMTimeAdd(g_avStartTime, CMTimeMakeWithSeconds(g_avFrameNumber / 10.0, 600));
+                                BOOL appendSuccess = [localPixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:frameTime];
+                                if (appendSuccess) {
+                                    g_avFrameNumber++;
+                                } else {
+                                    NSLog(@"⚠️ Failed to append pixel buffer");
+                                }
+                            }
+                        } else {
+                            NSLog(@"⚠️ Failed to create bitmap context");
+                        }
+                        
+                        CGColorSpaceRelease(colorSpace);
+                        CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
+                        CVPixelBufferRelease(pixelBuffer);
+                    } else {
+                        NSLog(@"⚠️ Failed to create pixel buffer: %d", cvRet);
                     }
                     
-                    CVPixelBufferRelease(pixelBuffer);
+                    CGImageRelease(screenImage);
+                } @catch (NSException *exception) {
+                    NSLog(@"❌ Exception in AVFoundation capture loop: %@", exception.reason);
+                    g_avIsRecording = false; // Stop recording on exception to prevent crash
                 }
-                
-                CGImageRelease(screenImage);
             }
         });
         
         dispatch_resume(g_avTimer);
         g_avIsRecording = true;
         
-        NSLog(@"🎥 AVFoundation recording started: %dx%d @ 15fps", 
+        NSLog(@"🎥 AVFoundation recording started: %dx%d @ 10fps", 
               (int)recordingSize.width, (int)recordingSize.height);
         
         return true;
@@ -222,23 +262,38 @@ extern "C" bool stopAVFoundationRecording() {
     g_avIsRecording = false;
     
     @try {
-        // Stop timer
+        // 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