node-mac-recorder 2.16.24 → 2.16.26

package/.claude/settings.local.json

@@ -1,7 +1,7 @@
 {
   "permissions": {
     "allow": [
-      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing external display recording WITH AUDIO - debug version...'');\nconst MacRecorder = require(''./index.js'');\nconst recorder = new MacRecorder();\n\nrecorder.startRecording(''/tmp/external-audio-debug.mov'', {\n  displayId: 3,  // External display\n  includeMicrophone: true,\n  includeSystemAudio: true,\n  captureCursor: true\n})\n  .then(success => {\n    console.log(''Start result:'', success ? ''✅ SUCCESS'' : ''❌ FAILED'');\n    if (success) {\n      setTimeout(() => {\n        console.log(''⏹️ Stopping recording...'');\n        recorder.stopRecording().then(() => {\n          console.log(''✅ Recording stopped'');\n          const fs = require(''fs'');\n          if (fs.existsSync(''/tmp/external-audio-debug.mov'')) {\n            const size = Math.round(fs.statSync(''/tmp/external-audio-debug.mov'').size/1024);\n            console.log(''📹 File size:'', size + ''KB'');\n            if (size > 100) {\n              console.log(''🎉 External display recording with audio SUCCESS!'');\n            } else {\n              console.log(''⚠️ File too small, may have failed'');\n            }\n          } else {\n            console.log(''❌ No output file created'');\n          }\n        });\n      }, 4000); // 4 seconds recording\n    }\n  })\n  .catch(console.error);\n\")"
+      "Bash(FORCE_AVFOUNDATION=1 node test-sequential.js)"
     ],
     "deny": [],
     "ask": []

package/package.json

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

package/src/mac_recorder.mm

@@ -567,50 +567,24 @@ Napi::Value GetDisplays(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
     @try {
-        // Get displays using NSScreen instead of ScreenCapture
-        NSArray *screens = [NSScreen screens];
+        // Get active displays directly using CGDirectDisplayID
         NSMutableArray *displays = [NSMutableArray array];
-        
-        // Get real CGDirectDisplayIDs first
         CGDirectDisplayID activeDisplays[32];
         uint32_t displayCount;
         CGGetActiveDisplayList(32, activeDisplays, &displayCount);
         
-        for (NSUInteger i = 0; i < [screens count]; i++) {
-            NSScreen *screen = [screens objectAtIndex:i];
-            NSRect frame = [screen frame];
-            
-            // Find matching CGDirectDisplayID
-            CGDirectDisplayID displayID = 0;
-            bool isPrimary = false;
-            
-            for (uint32_t j = 0; j < displayCount; j++) {
-                CGDirectDisplayID candidateID = activeDisplays[j];
-                CGRect displayBounds = CGDisplayBounds(candidateID);
-                
-                if (fabs(frame.origin.x - displayBounds.origin.x) < 1.0 &&
-                    fabs(frame.origin.y - displayBounds.origin.y) < 1.0 &&
-                    fabs(frame.size.width - displayBounds.size.width) < 1.0 &&
-                    fabs(frame.size.height - displayBounds.size.height) < 1.0) {
-                    displayID = candidateID;
-                    isPrimary = (candidateID == CGMainDisplayID());
-                    break;
-                }
-            }
-            
-            // Fallback if no match found
-            if (displayID == 0 && i < displayCount) {
-                displayID = activeDisplays[i];
-                isPrimary = (displayID == CGMainDisplayID());
-            }
+        for (uint32_t i = 0; i < displayCount; i++) {
+            CGDirectDisplayID displayID = activeDisplays[i];
+            CGRect displayBounds = CGDisplayBounds(displayID);
+            bool isPrimary = (displayID == CGMainDisplayID());
             
             NSDictionary *displayInfo = @{
-                @"id": @(displayID),  // Use real display ID
-                @"name": [NSString stringWithFormat:@"Display %lu", (unsigned long)(i + 1)],
-                @"width": @((int)frame.size.width),
-                @"height": @((int)frame.size.height),
-                @"x": @((int)frame.origin.x),
-                @"y": @((int)frame.origin.y),
+                @"id": @(displayID),  // Direct CGDirectDisplayID
+                @"name": [NSString stringWithFormat:@"Display %u", (unsigned int)(i + 1)],
+                @"width": @((int)displayBounds.size.width),
+                @"height": @((int)displayBounds.size.height),
+                @"x": @((int)displayBounds.origin.x),
+                @"y": @((int)displayBounds.origin.y),
                 @"isPrimary": @(isPrimary)
             };
             [displays addObject:displayInfo];

package/src/screen_capture_kit.mm

@@ -329,7 +329,6 @@ static NSString *g_outputPath = nil;
     }
     
     NSLog(@"🛑 Stopping pure ScreenCaptureKit recording");
-    g_isCleaningUp = YES;
     
     // Store stream reference to prevent it from being deallocated
     SCStream *streamToStop = g_stream;
@@ -340,11 +339,12 @@ static NSString *g_outputPath = nil;
         }
         NSLog(@"✅ Pure stream stopped");
         
+        // Immediately reset recording state to allow new recordings
+        g_isRecording = NO;
+        
         // Finalize on main queue to prevent threading issues
         dispatch_async(dispatch_get_main_queue(), ^{
-            if (g_isCleaningUp) {  // Only finalize if we initiated cleanup
-                [ScreenCaptureKitRecorder finalizeRecording];
-            }
+            [ScreenCaptureKitRecorder cleanupVideoWriter];
         });
     }];
 }
@@ -360,13 +360,10 @@ static NSString *g_outputPath = nil;
 
 + (void)finalizeRecording {
     @synchronized([ScreenCaptureKitRecorder class]) {
-        if (g_isCleaningUp && g_isRecording == NO) {
-            NSLog(@"⚠️ Already finalizing, skipping duplicate call");
-            return;
-        }
-        
         NSLog(@"🎬 Finalizing pure ScreenCaptureKit recording");
         
+        // Set cleanup flag now that we're actually cleaning up
+        g_isCleaningUp = YES;
         g_isRecording = NO;
         
         if (g_recordingOutput) {

package/src/window_selector.mm

@@ -2360,33 +2360,35 @@ Napi::Value GetSelectedWindowInfo(const Napi::CallbackInfo& info) {
             windowScreen = mainScreen;
         }
         
-        // CRITICAL FIX: Add screen information using real CGDirectDisplayID 
+        // Convert NSScreen to CGDirectDisplayID properly
         NSRect screenFrame = [windowScreen frame];
+        NSNumber *screenNumber = [windowScreen deviceDescription][@"NSScreenNumber"];
         
-        // Find real CGDirectDisplayID for this screen (matching GetDisplays logic)
-        CGDirectDisplayID realDisplayID = 0;
+        // Find the actual CGDirectDisplayID that matches this screen's frame
+        CGDirectDisplayID displayID = 0;
         CGDirectDisplayID activeDisplays[32];
         uint32_t displayCount;
         CGGetActiveDisplayList(32, activeDisplays, &displayCount);
         
-        for (uint32_t j = 0; j < displayCount; j++) {
-            CGDirectDisplayID candidateID = activeDisplays[j];
+        for (uint32_t i = 0; i < displayCount; i++) {
+            CGDirectDisplayID candidateID = activeDisplays[i];
             CGRect displayBounds = CGDisplayBounds(candidateID);
             
+            // Match by screen frame coordinates
             if (fabs(screenFrame.origin.x - displayBounds.origin.x) < 1.0 &&
                 fabs(screenFrame.origin.y - displayBounds.origin.y) < 1.0 &&
                 fabs(screenFrame.size.width - displayBounds.size.width) < 1.0 &&
                 fabs(screenFrame.size.height - displayBounds.size.height) < 1.0) {
-                realDisplayID = candidateID;
+                displayID = candidateID;
                 break;
             }
         }
         
-        NSLog(@"🔍 Window screen mapping: Frame=(%.0f,%.0f,%.0fx%.0f) → CGDirectDisplayID=%u", 
+        NSLog(@"🔍 Window screen: Frame=(%.0f,%.0f,%.0fx%.0f) NSScreenNumber=%@ → CGDirectDisplayID=%u", 
               screenFrame.origin.x, screenFrame.origin.y, 
-              screenFrame.size.width, screenFrame.size.height, realDisplayID);
+              screenFrame.size.width, screenFrame.size.height, screenNumber, displayID);
         
-        result.Set("screenId", Napi::Number::New(env, realDisplayID));
+        result.Set("screenId", Napi::Number::New(env, displayID));
         result.Set("screenX", Napi::Number::New(env, (int)screenFrame.origin.x));
         result.Set("screenY", Napi::Number::New(env, (int)screenFrame.origin.y));
         result.Set("screenWidth", Napi::Number::New(env, (int)screenFrame.size.width));