node-mac-recorder 2.4.10 → 2.4.12

package/src/window_selector.mm

@@ -5,7 +5,6 @@
 #import <ApplicationServices/ApplicationServices.h>
 #import <Carbon/Carbon.h>
 #import <Accessibility/Accessibility.h>
-#import <ScreenCaptureKit/ScreenCaptureKit.h>
 
 // Global state for window selection
 static bool g_isWindowSelecting = false;
@@ -36,7 +35,6 @@ void cleanupWindowSelector();
 void updateOverlay();
 NSDictionary* getWindowUnderCursor(CGPoint point);
 NSArray* getAllSelectableWindows();
-NSArray* getAllSelectableWindowsLegacy();
 bool bringWindowToFront(int windowId);
 void cleanupRecordingPreview();
 bool showRecordingPreview(NSDictionary *windowInfo);
@@ -223,10 +221,8 @@ bool hideScreenRecordingPreview();
 @implementation WindowSelectorDelegate
 - (void)selectButtonClicked:(id)sender {
     if (g_currentWindowUnderCursor) {
-        g_selectedWindowInfo = [g_currentWindowUnderCursor copy];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            cleanupWindowSelector();
-        });
+        g_selectedWindowInfo = [g_currentWindowUnderCursor retain];
+        cleanupWindowSelector();
     }
 }
 
@@ -235,24 +231,25 @@ bool hideScreenRecordingPreview();
     NSInteger screenIndex = [button tag];
     
     // Get screen info from global array using button tag
-    if (g_allScreens && screenIndex >= 0 && screenIndex < (NSInteger)[g_allScreens count]) {
+    if (g_allScreens && screenIndex >= 0 && screenIndex < [g_allScreens count]) {
         NSDictionary *screenInfo = [g_allScreens objectAtIndex:screenIndex];
-        g_selectedScreenInfo = [screenInfo copy];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            cleanupScreenSelector();
-        });
+        g_selectedScreenInfo = [screenInfo retain];
+        
+        NSLog(@"🖥️ SCREEN BUTTON CLICKED: %@ (%@)", 
+              [screenInfo objectForKey:@"name"],
+              [screenInfo objectForKey:@"resolution"]);
+        
+        cleanupScreenSelector();
     }
 }
 
 - (void)cancelButtonClicked:(id)sender {
+    NSLog(@"🚫 CANCEL BUTTON CLICKED: Selection cancelled");
+    // Clean up without selecting anything
     if (g_isScreenSelecting) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            cleanupScreenSelector();
-        });
+        cleanupScreenSelector();
     } else {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            cleanupWindowSelector();
-        });
+        cleanupWindowSelector();
     }
 }
 
@@ -369,83 +366,8 @@ bool bringWindowToFront(int windowId) {
     }
 }
 
-// Get all selectable windows using ScreenCaptureKit
+// Get all selectable windows
 NSArray* getAllSelectableWindows() {
-    @autoreleasepool {
-        NSMutableArray *windows = [NSMutableArray array];
-        
-        // Check if ScreenCaptureKit is available (requires macOS 12.3+)
-        if (@available(macOS 12.3, *)) {
-            // Use dispatch_semaphore for synchronous SCShareableContent retrieval
-            dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-            __block SCShareableContent *content = nil;
-            __block NSError *error = nil;
-            
-            [SCShareableContent getShareableContentWithCompletionHandler:^(SCShareableContent *shareableContent, NSError *contentError) {
-                content = shareableContent;
-                error = contentError;
-                dispatch_semaphore_signal(semaphore);
-            }];
-            
-            // Wait for completion (timeout after 5 seconds)
-            dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC);
-            if (dispatch_semaphore_wait(semaphore, timeout) == 0 && content) {
-                NSLog(@"✅ ScreenCaptureKit: Found %lu windows", (unsigned long)content.windows.count);
-                
-                for (SCWindow *scWindow in content.windows) {
-                    // Skip windows without proper frame or title
-                    if (scWindow.frame.size.width < 50 || scWindow.frame.size.height < 50) continue;
-                    if (!scWindow.owningApplication) continue;
-                    
-                    // Skip system applications
-                    NSString *bundleId = scWindow.owningApplication.bundleIdentifier;
-                    NSString *appName = scWindow.owningApplication.applicationName;
-                    if ([bundleId hasPrefix:@"com.apple.dock"] ||
-                        [bundleId hasPrefix:@"com.apple.WindowServer"] ||
-                        [bundleId hasPrefix:@"com.apple.controlcenter"] ||
-                        [bundleId hasPrefix:@"com.apple.notificationcenterui"]) {
-                        continue;
-                    }
-                    
-                    // Convert SCWindow coordinates to match CGWindow coordinate system
-                    CGRect frame = scWindow.frame;
-                    int x = (int)frame.origin.x;
-                    int y = (int)frame.origin.y;  
-                    int width = (int)frame.size.width;
-                    int height = (int)frame.size.height;
-                    
-                    NSString *windowTitle = scWindow.title ?: @"Untitled";
-                    if ([windowTitle length] == 0) windowTitle = @"Untitled";
-                    
-                    NSDictionary *window = @{
-                        @"id": @(scWindow.windowID),
-                        @"title": windowTitle,
-                        @"appName": appName ?: @"Unknown App",
-                        @"x": @(x),
-                        @"y": @(y),
-                        @"width": @(width),
-                        @"height": @(height),
-                        @"bundleId": bundleId ?: @""
-                    };
-                    
-                    [windows addObject:window];
-                }
-            } else {
-                NSLog(@"❌ ScreenCaptureKit: Failed to get shareable content or timeout occurred");
-                // Fall back to CGWindowList as backup
-                return getAllSelectableWindowsLegacy();
-            }
-        } else {
-            NSLog(@"⚠️ ScreenCaptureKit not available, falling back to CGWindowList");
-            return getAllSelectableWindowsLegacy();
-        }
-        
-        return [windows copy];
-    }
-}
-
-// Legacy window enumeration using CGWindowList (fallback for older macOS)
-NSArray* getAllSelectableWindowsLegacy() {
     @autoreleasepool {
         NSMutableArray *windows = [NSMutableArray array];
         
@@ -521,11 +443,6 @@ NSDictionary* getWindowUnderCursor(CGPoint point) {
 
 // Update overlay to highlight window under cursor
 void updateOverlay() {
-    // Ensure AppKit usage on main thread
-    if (![NSThread isMainThread]) {
-        dispatch_async(dispatch_get_main_queue(), ^{ updateOverlay(); });
-        return;
-    }
     @autoreleasepool {
         if (!g_isWindowSelecting || !g_overlayWindow) return;
         
@@ -541,7 +458,8 @@ void updateOverlay() {
         
         if (windowUnderCursor && ![windowUnderCursor isEqualToDictionary:g_currentWindowUnderCursor]) {
             // Update current window
-            g_currentWindowUnderCursor = windowUnderCursor;
+            [g_currentWindowUnderCursor release];
+            g_currentWindowUnderCursor = [windowUnderCursor retain];
             
             // Update overlay position and size
             int x = [[windowUnderCursor objectForKey:@"x"] intValue];
@@ -632,6 +550,7 @@ void updateOverlay() {
             NSLog(@"🚪 WINDOW LEFT: %@ - \"%@\"", leftAppName, leftWindowTitle);
             
             [g_overlayWindow orderOut:nil];
+            [g_currentWindowUnderCursor release];
             g_currentWindowUnderCursor = nil;
         }
     }
@@ -639,12 +558,6 @@ void updateOverlay() {
 
 // Cleanup function
 void cleanupWindowSelector() {
-    if (![NSThread isMainThread]) {
-        dispatch_async(dispatch_get_main_queue(), ^{ cleanupWindowSelector(); });
-        return;
-    }
-    
-    NSLog(@"🧹 Cleaning up window selector resources");
     g_isWindowSelecting = false;
     
     // Stop tracking timer
@@ -669,25 +582,24 @@ void cleanupWindowSelector() {
     
     // Clean up delegate
     if (g_delegate) {
+        [g_delegate release];
         g_delegate = nil;
     }
     
     // Clean up data
     if (g_allWindows) {
+        [g_allWindows release];
         g_allWindows = nil;
     }
     
     if (g_currentWindowUnderCursor) {
+        [g_currentWindowUnderCursor release];
         g_currentWindowUnderCursor = nil;
     }
 }
 
 // Recording preview functions
 void cleanupRecordingPreview() {
-    if (![NSThread isMainThread]) {
-        dispatch_async(dispatch_get_main_queue(), ^{ cleanupRecordingPreview(); });
-        return;
-    }
     if (g_recordingPreviewWindow) {
         [g_recordingPreviewWindow close];
         g_recordingPreviewWindow = nil;
@@ -695,6 +607,7 @@ void cleanupRecordingPreview() {
     }
     
     if (g_recordingWindowInfo) {
+        [g_recordingWindowInfo release];
         g_recordingWindowInfo = nil;
     }
 }
@@ -707,7 +620,7 @@ bool showRecordingPreview(NSDictionary *windowInfo) {
         if (!windowInfo) return false;
         
         // Store window info
-        g_recordingWindowInfo = windowInfo;
+        g_recordingWindowInfo = [windowInfo retain];
         
         // Get main screen bounds for full screen overlay
         NSScreen *mainScreen = [NSScreen mainScreen];
@@ -767,10 +680,6 @@ bool hideRecordingPreview() {
 
 // Screen selection functions
 void cleanupScreenSelector() {
-    if (![NSThread isMainThread]) {
-        dispatch_async(dispatch_get_main_queue(), ^{ cleanupScreenSelector(); });
-        return;
-    }
     g_isScreenSelecting = false;
     
     // Remove key event monitor
@@ -784,11 +693,13 @@ void cleanupScreenSelector() {
         for (NSWindow *overlayWindow in g_screenOverlayWindows) {
             [overlayWindow close];
         }
+        [g_screenOverlayWindows release];
         g_screenOverlayWindows = nil;
     }
     
     // Clean up screen data
     if (g_allScreens) {
+        [g_allScreens release];
         g_allScreens = nil;
     }
 }
@@ -796,13 +707,7 @@ void cleanupScreenSelector() {
 bool startScreenSelection() {
     @try {
         if (g_isScreenSelecting) return false;
-        // Force to main thread
-        if (![NSThread isMainThread]) {
-            __block BOOL ok = NO;
-            dispatch_sync(dispatch_get_main_queue(), ^{ ok = startScreenSelection(); });
-            return ok;
-        }
-
+        
         // Get all available screens
         NSArray *screens = [NSScreen screens];
         if (!screens || [screens count] == 0) return false;
@@ -811,7 +716,7 @@ bool startScreenSelection() {
         NSMutableArray *screenInfoArray = [[NSMutableArray alloc] init];
         g_screenOverlayWindows = [[NSMutableArray alloc] init];
         
-        for (NSUInteger i = 0; i < [screens count]; i++) {
+        for (NSInteger i = 0; i < [screens count]; i++) {
             NSScreen *screen = [screens objectAtIndex:i];
             NSRect screenFrame = [screen frame];
             
@@ -934,11 +839,11 @@ bool startScreenSelection() {
             [overlayWindow makeKeyAndOrderFront:nil];
             
             [g_screenOverlayWindows addObject:overlayWindow];
-            screenInfo = nil;
+            [screenInfo release];
         }
         
-        g_allScreens = screenInfoArray;
-        screenInfoArray = nil;
+        g_allScreens = [screenInfoArray retain];
+        [screenInfoArray release];
         g_isScreenSelecting = true;
         
         // Add ESC key event monitor to cancel selection
@@ -964,12 +869,9 @@ bool startScreenSelection() {
 bool stopScreenSelection() {
     @try {
         if (!g_isScreenSelecting) return false;
-        if (![NSThread isMainThread]) {
-            __block BOOL ok = NO;
-            dispatch_sync(dispatch_get_main_queue(), ^{ ok = stopScreenSelection(); });
-            return ok;
-        }
+        
         cleanupScreenSelector();
+        NSLog(@"🖥️ SCREEN SELECTION: Stopped");
         return true;
         
     } @catch (NSException *exception) {
@@ -981,10 +883,11 @@ bool stopScreenSelection() {
 NSDictionary* getSelectedScreenInfo() {
     if (!g_selectedScreenInfo) return nil;
     
-    NSDictionary *result = g_selectedScreenInfo;
+    NSDictionary *result = [g_selectedScreenInfo retain];
+    [g_selectedScreenInfo release];
     g_selectedScreenInfo = nil;
     
-    return result;
+    return [result autorelease];
 }
 
 bool showScreenRecordingPreview(NSDictionary *screenInfo) {
@@ -999,10 +902,10 @@ bool showScreenRecordingPreview(NSDictionary *screenInfo) {
         NSArray *screens = [NSScreen screens];
         if (!screens || [screens count] == 0) return false;
         
-        NSUInteger selectedScreenId = (NSUInteger)[[screenInfo objectForKey:@"id"] intValue];
+        int selectedScreenId = [[screenInfo objectForKey:@"id"] intValue];
         
         // Create overlay for each screen except the selected one
-        for (NSUInteger i = 0; i < [screens count]; i++) {
+        for (NSInteger i = 0; i < [screens count]; i++) {
             if (i == selectedScreenId) continue; // Skip selected screen
             
             NSScreen *screen = [screens objectAtIndex:i];
@@ -1033,7 +936,7 @@ bool showScreenRecordingPreview(NSDictionary *screenInfo) {
             }
         }
         
-        NSLog(@"🎬 SCREEN RECORDING PREVIEW: Showing overlay for Screen %lu", (unsigned long)selectedScreenId);
+        NSLog(@"🎬 SCREEN RECORDING PREVIEW: Showing overlay for Screen %d", selectedScreenId);
         
         return true;
         
@@ -1051,50 +954,14 @@ bool hideScreenRecordingPreview() {
 Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
-    // Electron safety check - prevent NSWindow crashes
-    const char* electronVersion = getenv("ELECTRON_VERSION");
-    const char* electronRunAs = getenv("ELECTRON_RUN_AS_NODE");
-    
-    NSLog(@"🔍 Debug: electronVersion='%s', electronRunAs='%s'", 
-          electronVersion ? electronVersion : "null", 
-          electronRunAs ? electronRunAs : "null");
-    
-    if (electronVersion || electronRunAs) {
-        NSLog(@"🔍 Detected Electron environment - using safe mode");
-        
-        // In Electron, return window list without creating native NSWindow overlays
-        // The Electron app can handle UI selection itself
-        @try {
-            NSArray *windows = getAllSelectableWindows();
-            
-            if (!windows || [windows count] == 0) {
-                NSLog(@"❌ No selectable windows found");
-                return Napi::Boolean::New(env, false);
-            }
-            
-            // Store windows for later retrieval via getWindowSelectionStatus
-            g_allWindows = [getAllSelectableWindows() mutableCopy];
-            g_isWindowSelecting = true;
-            
-            // Return true to indicate windows are available
-            // Electron app should call getWindowSelectionStatus to get the list
-            NSLog(@"✅ Electron-safe mode: %lu windows available for selection", (unsigned long)[windows count]);
-            return Napi::Boolean::New(env, true);
-            
-        } @catch (NSException *exception) {
-            NSLog(@"❌ Exception in Electron-safe window selection: %@", [exception reason]);
-            return Napi::Boolean::New(env, false);
-        }
-    }
-    
     if (g_isWindowSelecting) {
-        NSLog(@"⚠️ Window selection already in progress");
-        return Napi::Boolean::New(env, false);
+        Napi::TypeError::New(env, "Window selection already in progress").ThrowAsJavaScriptException();
+        return env.Null();
     }
     
     @try {
         // Get all windows
-        g_allWindows = [getAllSelectableWindows() mutableCopy];
+        g_allWindows = [getAllSelectableWindows() retain];
         
         if (!g_allWindows || [g_allWindows count] == 0) {
             Napi::Error::New(env, "No selectable windows found").ThrowAsJavaScriptException();
@@ -1306,6 +1173,7 @@ Napi::Value GetSelectedWindowInfo(const Napi::CallbackInfo& info) {
         result.Set("screenHeight", Napi::Number::New(env, (int)screenFrame.size.height));
         
         // Clear selected window info after reading
+        [g_selectedWindowInfo release];
         g_selectedWindowInfo = nil;
         
         return result;
@@ -1387,13 +1255,13 @@ Napi::Value ShowRecordingPreview(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
     if (info.Length() < 1) {
-        NSLog(@"⚠️ Window info object required");
-        return Napi::Boolean::New(env, false);
+        Napi::TypeError::New(env, "Window info object required").ThrowAsJavaScriptException();
+        return env.Null();
     }
     
     if (!info[0].IsObject()) {
-        NSLog(@"⚠️ Window info must be an object");
-        return Napi::Boolean::New(env, false);
+        Napi::TypeError::New(env, "Window info must be an object").ThrowAsJavaScriptException();
+        return env.Null();
     }
     
     @try {
@@ -1425,7 +1293,7 @@ Napi::Value ShowRecordingPreview(const Napi::CallbackInfo& info) {
         }
         
         bool success = showRecordingPreview(windowInfo);
-        windowInfo = nil;
+        [windowInfo release];
         
         return Napi::Boolean::New(env, success);
         
@@ -1451,57 +1319,11 @@ Napi::Value HideRecordingPreview(const Napi::CallbackInfo& info) {
 Napi::Value StartScreenSelection(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
-    // Electron safety check - prevent NSWindow crashes
-    const char* electronVersion = getenv("ELECTRON_VERSION");
-    const char* electronRunAs = getenv("ELECTRON_RUN_AS_NODE");
-    
-    NSLog(@"🔍 Screen Debug: electronVersion='%s', electronRunAs='%s'", 
-          electronVersion ? electronVersion : "null", 
-          electronRunAs ? electronRunAs : "null");
-    
-    if (electronVersion || electronRunAs) {
-        NSLog(@"🔍 Detected Electron environment - using safe screen selection");
-        
-        // In Electron, return screen list without creating native NSWindow overlays
-        @try {
-            NSArray *screens = [NSScreen screens];
-            
-            if (!screens || [screens count] == 0) {
-                NSLog(@"❌ No screens available");
-                return Napi::Boolean::New(env, false);
-            }
-            
-            // Store screens and select first one automatically for Electron
-            g_allScreens = screens;
-            g_isScreenSelecting = true;
-            
-            NSScreen *mainScreen = [screens firstObject];
-            g_selectedScreenInfo = @{
-                @"id": @((int)[screens indexOfObject:mainScreen]),
-                @"width": @((int)mainScreen.frame.size.width),
-                @"height": @((int)mainScreen.frame.size.height),
-                @"x": @((int)mainScreen.frame.origin.x),
-                @"y": @((int)mainScreen.frame.origin.y)
-            };
-            
-            // Mark as complete so getSelectedScreenInfo returns the selection
-            g_isScreenSelecting = false;
-            
-            NSLog(@"✅ Electron-safe screen selection: %lu screens available", (unsigned long)[screens count]);
-            return Napi::Boolean::New(env, true);
-            
-        } @catch (NSException *exception) {
-            NSLog(@"❌ Exception in Electron-safe screen selection: %@", [exception reason]);
-            return Napi::Boolean::New(env, false);
-        }
-    }
-    
     @try {
         bool success = startScreenSelection();
         return Napi::Boolean::New(env, success);
         
     } @catch (NSException *exception) {
-        NSLog(@"❌ Screen selection error: %@", exception);
         return Napi::Boolean::New(env, false);
     }
 }
@@ -1593,7 +1415,7 @@ Napi::Value ShowScreenRecordingPreview(const Napi::CallbackInfo& info) {
         }
         
         bool success = showScreenRecordingPreview(screenInfo);
-        screenInfo = nil;
+        [screenInfo release];
         
         return Napi::Boolean::New(env, success);