node-mac-recorder 2.17.13 → 2.17.15

package/package.json

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

package/src/cursor_tracker.mm

@@ -43,9 +43,9 @@ static NSTimeInterval g_lastCursorCheckTime = 0;
 static int g_sameCursorDetectionCount = 0;
 static NSString *g_pendingCursorType = nil;
 
-// Cursor stability constants
-static const NSTimeInterval CURSOR_STABILITY_THRESHOLD = 0.1; // 100ms
-static const int CURSOR_CONFIRMATION_COUNT = 2; // Need 2 consecutive detections
+// Cursor stability constants - minimal stability for real-time response
+static const NSTimeInterval CURSOR_STABILITY_THRESHOLD = 0.02; // 20ms (very fast)
+static const int CURSOR_CONFIRMATION_COUNT = 1; // Immediate response
 
 // Mouse button state tracking
 static bool g_leftMouseDown = false;
@@ -157,13 +157,48 @@ NSString* getCursorType() {
                         [elementRole isEqualToString:@"AXSearchField"]) {
                         contextualCursorType = @"text";
                     }
-                    // POINTER CURSORS - only for interactive elements
+                    // POINTER CURSORS - interactive elements with broader detection
                     else if ([elementRole isEqualToString:@"AXLink"] ||
                              [elementRole isEqualToString:@"AXButton"] ||
                              [elementRole isEqualToString:@"AXMenuItem"] ||
                              [elementRole isEqualToString:@"AXRadioButton"] ||
-                             [elementRole isEqualToString:@"AXCheckBox"]) {
+                             [elementRole isEqualToString:@"AXCheckBox"] ||
+                             [elementRole isEqualToString:@"AXPopUpButton"] ||
+                             [elementRole isEqualToString:@"AXTab"]) {
                         contextualCursorType = @"pointer";
+
+                        // Also check subroles for links and buttons
+                        CFStringRef subrole = NULL;
+                        AXError subroleError = AXUIElementCopyAttributeValue(elementAtPosition, kAXSubroleAttribute, (CFTypeRef*)&subrole);
+                        if (subroleError == kAXErrorSuccess && subrole) {
+                            NSString *elementSubrole = (__bridge_transfer NSString*)subrole;
+                            if ([elementSubrole isEqualToString:@"AXCloseButton"] ||
+                                [elementSubrole isEqualToString:@"AXMinimizeButton"] ||
+                                [elementSubrole isEqualToString:@"AXZoomButton"] ||
+                                [elementSubrole isEqualToString:@"AXToolbarButton"]) {
+                                contextualCursorType = @"pointer";
+                            }
+                        }
+                    }
+                    // WEB ELEMENTS - for web links that might not show as AXLink
+                    else if ([elementRole isEqualToString:@"AXGroup"] ||
+                             [elementRole isEqualToString:@"AXStaticText"]) {
+                        // Check if it's clickable/has action
+                        CFArrayRef actions = NULL;
+                        AXError actionsError = AXUIElementCopyActionNames(elementAtPosition, &actions);
+                        if (actionsError == kAXErrorSuccess && actions) {
+                            CFIndex actionCount = CFArrayGetCount(actions);
+                            for (CFIndex i = 0; i < actionCount; i++) {
+                                CFStringRef action = (CFStringRef)CFArrayGetValueAtIndex(actions, i);
+                                NSString *actionStr = (__bridge NSString*)action;
+                                if ([actionStr isEqualToString:@"AXPress"] ||
+                                    [actionStr isEqualToString:@"AXShowMenu"]) {
+                                    contextualCursorType = @"pointer";
+                                    break;
+                                }
+                            }
+                            CFRelease(actions);
+                        }
                     }
                     // WINDOW BORDER RESIZE - critical for resize detection
                     else if ([elementRole isEqualToString:@"AXWindow"]) {
@@ -226,9 +261,18 @@ NSString* getCursorType() {
                     else if ([elementRole isEqualToString:@"AXProgressIndicator"]) {
                         contextualCursorType = @"progress";
                     }
-                    // OTHER ELEMENTS - be conservative, don't assume pointer
+                    // DEFAULT AREAS - explicitly set default for known non-interactive elements
+                    else if ([elementRole isEqualToString:@"AXApplication"] ||
+                             [elementRole isEqualToString:@"AXWindow"] ||
+                             [elementRole isEqualToString:@"AXScrollArea"] ||
+                             [elementRole isEqualToString:@"AXScrollBar"] ||
+                             [elementRole isEqualToString:@"AXStaticText"] ||
+                             [elementRole isEqualToString:@"AXGroup"]) {
+                        // These are typically non-interactive - should be default cursor
+                        contextualCursorType = @"default";
+                    }
+                    // OTHER ELEMENTS - let NSCursor handle or default
                     else {
-                        // Don't override NSCursor for unknown elements
                         contextualCursorType = nil;
                     }
                 }
@@ -236,54 +280,68 @@ NSString* getCursorType() {
             }
             if (systemWide) CFRelease(systemWide);
 
-            // Layer 3: Intelligent fusion of NSCursor and contextual results
+            // Layer 3: Contextual-first approach (NSCursor is unreliable)
             NSString *detectedCursorType = @"default";
 
-            // Priority logic:
-            // 1. If contextual gives resize cursor, always use it (resize has highest priority)
-            if (contextualCursorType != nil &&
-                ([contextualCursorType hasSuffix:@"resize"] ||
-                 [contextualCursorType isEqualToString:@"col-resize"] ||
-                 [contextualCursorType isEqualToString:@"ns-resize"])) {
+            // Priority logic - contextual detection first:
+            // 1. If contextual gives ANY specific cursor, use it
+            if (contextualCursorType != nil) {
                 detectedCursorType = contextualCursorType;
             }
-            // 2. If NSCursor gives a definitive answer and no resize context, use it
-            else if (nsCursorType != nil) {
+            // 2. Fallback to NSCursor only for very specific cases
+            else if (nsCursorType != nil &&
+                     ([nsCursorType isEqualToString:@"text"] ||
+                      [nsCursorType isEqualToString:@"pointer"])) {
+                // Only trust NSCursor for text and pointer (most reliable)
                 detectedCursorType = nsCursorType;
             }
-            // 3. If NSCursor is nil/unknown, but contextual is available, use contextual
-            else if (contextualCursorType != nil) {
-                detectedCursorType = contextualCursorType;
+            // 3. Everything else defaults to default
+            else {
+                detectedCursorType = @"default";
             }
 
-            // Layer 4: Stability filtering to prevent oscillation
+            // Layer 4: Minimal stability - mostly real-time with quick default fallback
+            NSString *finalCursorType = detectedCursorType;
 
-            // Time-based stability check
+            // Quick validation and immediate response for most cases
             if (currentTime - g_lastCursorCheckTime > CURSOR_STABILITY_THRESHOLD) {
-                // Enough time has passed, reset counters
-                g_sameCursorDetectionCount = 0;
-                g_pendingCursorType = detectedCursorType;
-            }
-
-            // Check if detected cursor matches pending cursor
-            if ([detectedCursorType isEqualToString:g_pendingCursorType]) {
-                g_sameCursorDetectionCount++;
-
-                // If we have enough confirmations, update stable cursor
-                if (g_sameCursorDetectionCount >= CURSOR_CONFIRMATION_COUNT) {
+                // Update immediately for most cursor types
+                if ([detectedCursorType isEqualToString:@"default"] ||
+                    [detectedCursorType isEqualToString:@"text"] ||
+                    [detectedCursorType isEqualToString:@"pointer"]) {
+                    // High-confidence cursor types - update immediately
                     g_stableCursorType = detectedCursorType;
-                    g_lastDetectedCursorType = detectedCursorType;
+                    finalCursorType = detectedCursorType;
+                }
+                // Resize cursors need tiny bit of stability to avoid jitter
+                else if ([detectedCursorType hasSuffix:@"resize"]) {
+                    if ([detectedCursorType isEqualToString:g_pendingCursorType]) {
+                        g_sameCursorDetectionCount++;
+                        if (g_sameCursorDetectionCount >= CURSOR_CONFIRMATION_COUNT) {
+                            g_stableCursorType = detectedCursorType;
+                            finalCursorType = detectedCursorType;
+                        } else {
+                            finalCursorType = g_stableCursorType; // Keep previous
+                        }
+                    } else {
+                        g_pendingCursorType = detectedCursorType;
+                        g_sameCursorDetectionCount = 1;
+                        finalCursorType = g_stableCursorType; // Keep previous
+                    }
                 }
+                // Everything else - immediate update
+                else {
+                    g_stableCursorType = detectedCursorType;
+                    finalCursorType = detectedCursorType;
+                }
+
+                g_lastCursorCheckTime = currentTime;
             } else {
-                // Different cursor detected, start new pending
-                g_pendingCursorType = detectedCursorType;
-                g_sameCursorDetectionCount = 1;
+                // Too soon - use stable cursor
+                finalCursorType = g_stableCursorType;
             }
 
-            g_lastCursorCheckTime = currentTime;
-
-            // Final validation
-            NSString *finalCursorType = g_stableCursorType;
+            // Final fallback validation
             if (!finalCursorType || [finalCursorType length] == 0) {
                 finalCursorType = @"default";
             }