node-mac-recorder 2.16.24 → 2.16.25

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.16.24",
+	"version": "2.16.25",
 	"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/window_selector.mm

@@ -2360,33 +2360,15 @@ Napi::Value GetSelectedWindowInfo(const Napi::CallbackInfo& info) {
             windowScreen = mainScreen;
         }
         
-        // CRITICAL FIX: Add screen information using real CGDirectDisplayID 
+        // Simple screen information - no complex mapping
         NSRect screenFrame = [windowScreen frame];
+        NSNumber *screenNumber = [windowScreen deviceDescription][@"NSScreenNumber"];
         
-        // Find real CGDirectDisplayID for this screen (matching GetDisplays logic)
-        CGDirectDisplayID realDisplayID = 0;
-        CGDirectDisplayID activeDisplays[32];
-        uint32_t displayCount;
-        CGGetActiveDisplayList(32, activeDisplays, &displayCount);
-        
-        for (uint32_t j = 0; j < displayCount; j++) {
-            CGDirectDisplayID candidateID = activeDisplays[j];
-            CGRect displayBounds = CGDisplayBounds(candidateID);
-            
-            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;
-                break;
-            }
-        }
-        
-        NSLog(@"🔍 Window screen mapping: Frame=(%.0f,%.0f,%.0fx%.0f) → CGDirectDisplayID=%u", 
+        NSLog(@"🔍 Window screen: Frame=(%.0f,%.0f,%.0fx%.0f) ScreenNumber=%@", 
               screenFrame.origin.x, screenFrame.origin.y, 
-              screenFrame.size.width, screenFrame.size.height, realDisplayID);
+              screenFrame.size.width, screenFrame.size.height, screenNumber);
         
-        result.Set("screenId", Napi::Number::New(env, realDisplayID));
+        result.Set("screenId", Napi::Number::New(env, [screenNumber unsignedIntValue]));
         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));