node-mac-recorder 2.4.3 → 2.4.5

package/package.json

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

package/src/window_selector.mm

@@ -221,8 +221,10 @@ bool hideScreenRecordingPreview();
 @implementation WindowSelectorDelegate
 - (void)selectButtonClicked:(id)sender {
     if (g_currentWindowUnderCursor) {
-        g_selectedWindowInfo = g_currentWindowUnderCursor;
-        cleanupWindowSelector();
+        g_selectedWindowInfo = [g_currentWindowUnderCursor copy];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            cleanupWindowSelector();
+        });
     }
 }
 
@@ -233,23 +235,22 @@ bool hideScreenRecordingPreview();
     // Get screen info from global array using button tag
     if (g_allScreens && screenIndex >= 0 && screenIndex < [g_allScreens count]) {
         NSDictionary *screenInfo = [g_allScreens objectAtIndex:screenIndex];
-        g_selectedScreenInfo = screenInfo;
-        
-        NSLog(@"🖥️ SCREEN BUTTON CLICKED: %@ (%@)", 
-              [screenInfo objectForKey:@"name"],
-              [screenInfo objectForKey:@"resolution"]);
-        
-        cleanupScreenSelector();
+        g_selectedScreenInfo = [screenInfo copy];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            cleanupScreenSelector();
+        });
     }
 }
 
 - (void)cancelButtonClicked:(id)sender {
-    NSLog(@"🚫 CANCEL BUTTON CLICKED: Selection cancelled");
-    // Clean up without selecting anything
     if (g_isScreenSelecting) {
-        cleanupScreenSelector();
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            cleanupScreenSelector();
+        });
     } else {
-        cleanupWindowSelector();
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            cleanupWindowSelector();
+        });
     }
 }
 
@@ -443,6 +444,11 @@ 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;
         
@@ -556,6 +562,10 @@ void updateOverlay() {
 
 // Cleanup function
 void cleanupWindowSelector() {
+    if (![NSThread isMainThread]) {
+        dispatch_async(dispatch_get_main_queue(), ^{ cleanupWindowSelector(); });
+        return;
+    }
     g_isWindowSelecting = false;
     
     // Stop tracking timer
@@ -595,6 +605,10 @@ void cleanupWindowSelector() {
 
 // 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;
@@ -674,6 +688,10 @@ 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
@@ -699,7 +717,13 @@ 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;
@@ -861,9 +885,12 @@ 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) {