node-mac-recorder 2.16.12 → 2.16.13

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 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.12",
+	"version": "2.16.13",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [

package/src/avfoundation_recorder.mm

@@ -135,9 +135,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,7 +170,7 @@ 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) {
                         CVPixelBufferLockBaseAddress(pixelBuffer, 0);
@@ -201,9 +212,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 +264,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