node-mac-recorder 2.22.10 → 2.22.12

package/package.json

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

package/src/cursor_tracker.mm

@@ -814,6 +814,10 @@ static bool g_leftMouseDown = false;
 static bool g_rightMouseDown = false;
 static NSString *g_lastEventType = @"move";
 
+// Text input (keyboard) tracking state
+static NSTimeInterval g_lastTextInputEmitTime = 0; // Throttle: son textInput event zamanı
+static const NSTimeInterval TEXT_INPUT_THROTTLE_MS = 50; // Min 50ms aralık (20 FPS)
+
 // Accessibility tabanlı cursor tip tespiti
 static NSString* detectCursorTypeUsingAccessibility(CGPoint cursorPos) {
     @autoreleasepool {
@@ -1942,6 +1946,125 @@ void writeToFile(NSDictionary *cursorData) {
     }
 }
 
+// Text input event: Klavye basıldığında focused text field'in caret pozisyonunu yakala
+static void emitTextInputEvent(NSTimeInterval timestamp, NSTimeInterval unixTimeMs, CGPoint mouseLocation) {
+    // Throttle: Çok sık emit etme (performans için)
+    if (unixTimeMs - g_lastTextInputEmitTime < TEXT_INPUT_THROTTLE_MS) {
+        return;
+    }
+
+    @autoreleasepool {
+        @try {
+            AXUIElementRef systemWide = AXUIElementCreateSystemWide();
+            if (!systemWide) return;
+
+            AXUIElementRef focusedElement = NULL;
+            AXError focusErr = AXUIElementCopyAttributeValue(
+                systemWide, kAXFocusedUIElementAttribute, (CFTypeRef *)&focusedElement);
+
+            if (focusErr != kAXErrorSuccess || !focusedElement) {
+                CFRelease(systemWide);
+                return;
+            }
+
+            // Focused element text field mi kontrol et
+            NSString *role = CopyAttributeString(focusedElement, kAXRoleAttribute);
+            BOOL isEditable = NO;
+            CopyAttributeBoolean(focusedElement, CFSTR("AXEditable"), &isEditable);
+
+            BOOL isTextField = StringEqualsAny(role, @[
+                @"AXTextField", @"AXTextArea", @"AXTextView",
+                @"AXTextEditor", @"AXSearchField",
+                @"AXComboBox"
+            ]) || isEditable;
+
+            if (!isTextField) {
+                CFRelease(focusedElement);
+                CFRelease(systemWide);
+                return;
+            }
+
+            // Input frame bilgisini al (AXPosition + AXSize)
+            CGPoint inputOrigin = CGPointZero;
+            CGSize inputSize = CGSizeZero;
+            AXValueRef positionValue = NULL;
+            AXValueRef sizeValue = NULL;
+
+            AXUIElementCopyAttributeValue(focusedElement, kAXPositionAttribute, (CFTypeRef *)&positionValue);
+            AXUIElementCopyAttributeValue(focusedElement, kAXSizeAttribute, (CFTypeRef *)&sizeValue);
+
+            if (positionValue) {
+                AXValueGetValue(positionValue, kAXValueTypeCGPoint, &inputOrigin);
+                CFRelease(positionValue);
+            }
+            if (sizeValue) {
+                AXValueGetValue(sizeValue, kAXValueTypeCGSize, &inputSize);
+                CFRelease(sizeValue);
+            }
+
+            // Caret pozisyonunu al (AXSelectedTextRange → AXBoundsForRange)
+            CGPoint caretPos = CGPointMake(inputOrigin.x, inputOrigin.y);
+            BOOL hasCaretPos = NO;
+
+            CFTypeRef selectedRangeValue = NULL;
+            AXError rangeErr = AXUIElementCopyAttributeValue(
+                focusedElement, CFSTR("AXSelectedTextRange"), &selectedRangeValue);
+
+            if (rangeErr == kAXErrorSuccess && selectedRangeValue) {
+                CFTypeRef boundsValue = NULL;
+                AXError boundsErr = AXUIElementCopyParameterizedAttributeValue(
+                    focusedElement, CFSTR("AXBoundsForRange"),
+                    selectedRangeValue, &boundsValue);
+
+                if (boundsErr == kAXErrorSuccess && boundsValue) {
+                    CGRect caretBounds = CGRectZero;
+                    if (AXValueGetValue((AXValueRef)boundsValue, kAXValueTypeCGRect, &caretBounds)) {
+                        // Caret'in dikey ortası
+                        caretPos = CGPointMake(
+                            caretBounds.origin.x,
+                            caretBounds.origin.y + caretBounds.size.height / 2.0
+                        );
+                        hasCaretPos = YES;
+                    }
+                    CFRelease(boundsValue);
+                }
+                CFRelease(selectedRangeValue);
+            }
+
+            // Caret alınamazsa input frame'in sol ortasını kullan
+            if (!hasCaretPos) {
+                caretPos = CGPointMake(inputOrigin.x + 4, inputOrigin.y + inputSize.height / 2.0);
+            }
+
+            // textInput event'i oluştur ve dosyaya yaz
+            NSDictionary *textInputInfo = @{
+                @"x": @((int)mouseLocation.x),
+                @"y": @((int)mouseLocation.y),
+                @"timestamp": @(timestamp),
+                @"unixTimeMs": @(unixTimeMs),
+                @"cursorType": @"text",
+                @"type": @"textInput",
+                @"caretX": @((int)caretPos.x),
+                @"caretY": @((int)caretPos.y),
+                @"inputFrame": @{
+                    @"x": @((int)inputOrigin.x),
+                    @"y": @((int)inputOrigin.y),
+                    @"width": @((int)inputSize.width),
+                    @"height": @((int)inputSize.height)
+                }
+            };
+
+            writeToFile(textInputInfo);
+            g_lastTextInputEmitTime = unixTimeMs;
+
+            CFRelease(focusedElement);
+            CFRelease(systemWide);
+        } @catch (NSException *exception) {
+            // Accessibility hata verirse sessizce devam et
+        }
+    }
+}
+
 // Event callback for mouse events
 CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon) {
     @autoreleasepool {
@@ -1982,6 +2105,10 @@ CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef eve
             case kCGEventOtherMouseDragged:
                 eventType = @"drag";
                 break;
+            case kCGEventKeyDown:
+                // Klavye event'i — text caret tracking için
+                emitTextInputEvent(timestamp, unixTimeMs, location);
+                return event; // Mouse event olarak işleme, ayrı handle edildi
             case kCGEventMouseMoved:
             default:
                 eventType = @"move";
@@ -1991,7 +2118,7 @@ CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef eve
         if (!ShouldEmitCursorEvent(location, cursorType, eventType)) {
             return event;
         }
-        
+
         // Cursor data oluştur
         NSDictionary *cursorInfo = @{
             @"x": @((int)location.x),
@@ -2001,7 +2128,7 @@ CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef eve
             @"cursorType": cursorType,
             @"type": eventType
         };
-        
+
         // Direkt dosyaya yaz
         writeToFile(cursorInfo);
         RememberCursorEvent(location, cursorType, eventType);
@@ -2140,6 +2267,7 @@ void cleanupCursorTracking() {
     g_lastDetectedCursorType = nil;
     g_cursorTypeCounter = 0;
     g_isFirstWrite = true;
+    g_lastTextInputEmitTime = 0;
     ResetCursorEventHistory();
 }
 
@@ -2180,7 +2308,7 @@ Napi::Value StartCursorTracking(const Napi::CallbackInfo& info) {
         g_trackingStartTime = [NSDate date];
         ResetCursorEventHistory();
         
-        // Create event tap for mouse events
+        // Create event tap for mouse + keyboard events
         CGEventMask eventMask = (CGEventMaskBit(kCGEventLeftMouseDown) |
                                 CGEventMaskBit(kCGEventLeftMouseUp) |
                                 CGEventMaskBit(kCGEventRightMouseDown) |
@@ -2190,7 +2318,8 @@ Napi::Value StartCursorTracking(const Napi::CallbackInfo& info) {
                                 CGEventMaskBit(kCGEventMouseMoved) |
                                 CGEventMaskBit(kCGEventLeftMouseDragged) |
                                 CGEventMaskBit(kCGEventRightMouseDragged) |
-                                CGEventMaskBit(kCGEventOtherMouseDragged));
+                                CGEventMaskBit(kCGEventOtherMouseDragged) |
+                                CGEventMaskBit(kCGEventKeyDown));
         
         bool eventTapActive = false;
         g_eventTap = CGEventTapCreate(kCGSessionEventTap,

package/src/electron_safe/screen_capture_electron.mm

@@ -50,6 +50,30 @@ static void initializeSafeQueue() {
     initializeSafeQueue();
 }
 
++ (BOOL)shouldAllowElectronWindows {
+    NSString *flag = [[[NSProcessInfo processInfo] environment] objectForKey:@"CREAVIT_ALLOW_ELECTRON_WINDOWS"];
+    if (!flag) return NO;
+
+    NSString *normalized = [[flag lowercaseString] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    return [normalized isEqualToString:@"1"] ||
+           [normalized isEqualToString:@"true"] ||
+           [normalized isEqualToString:@"yes"] ||
+           [normalized isEqualToString:@"on"];
+}
+
++ (BOOL)shouldSkipWindowOwner:(NSString *)appName {
+    if (!appName || appName.length == 0) return YES;
+    if ([appName containsString:@"WindowServer"] || [appName containsString:@"Dock"]) return YES;
+
+    if (![self shouldAllowElectronWindows]) {
+        if ([appName containsString:@"Electron"] || [appName containsString:@"node"]) {
+            return YES;
+        }
+    }
+
+    return NO;
+}
+
 + (BOOL)startRecordingWithPath:(NSString *)outputPath options:(NSDictionary *)options {
     if (@available(macOS 12.3, *)) {
         return [self startRecordingModern:outputPath options:options];
@@ -432,8 +456,7 @@ static void initializeSafeQueue() {
                         
                         NSString *appName = window.owningApplication.applicationName ?: @"Unknown";
                         
-                        // Skip Electron windows (our overlay)
-                        if ([appName containsString:@"Electron"] || [appName containsString:@"node"]) continue;
+                        if ([self shouldSkipWindowOwner:appName]) continue;
                         
                         NSDictionary *windowInfo = @{
                             @"id": @(window.windowID),

package/src/electron_safe/window_selector_electron.mm

@@ -12,6 +12,30 @@ static void initializeWindowQueue() {
     });
 }
 
+static BOOL ShouldAllowElectronWindows(void) {
+    NSString *flag = [[[NSProcessInfo processInfo] environment] objectForKey:@"CREAVIT_ALLOW_ELECTRON_WINDOWS"];
+    if (!flag) return NO;
+
+    NSString *normalized = [[flag lowercaseString] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    return [normalized isEqualToString:@"1"] ||
+           [normalized isEqualToString:@"true"] ||
+           [normalized isEqualToString:@"yes"] ||
+           [normalized isEqualToString:@"on"];
+}
+
+static BOOL ShouldSkipWindowOwner(NSString *appName) {
+    if (!appName || appName.length == 0) return YES;
+    if ([appName containsString:@"WindowServer"] || [appName containsString:@"Dock"]) return YES;
+
+    if (!ShouldAllowElectronWindows()) {
+        if ([appName containsString:@"Electron"] || [appName containsString:@"node"]) {
+            return YES;
+        }
+    }
+
+    return NO;
+}
+
 // NAPI Function: Get Windows (Electron-safe)
 Napi::Value GetWindowsElectronSafe(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
@@ -38,11 +62,7 @@ Napi::Value GetWindowsElectronSafe(const Napi::CallbackInfo& info) {
                                 
                                 NSString *appName = window.owningApplication.applicationName ?: @"Unknown";
                                 
-                                // Skip Electron windows (our overlay) and system windows
-                                if ([appName containsString:@"Electron"] || 
-                                    [appName containsString:@"node"] ||
-                                    [appName containsString:@"WindowServer"] ||
-                                    [appName containsString:@"Dock"]) continue;
+                                if (ShouldSkipWindowOwner(appName)) continue;
                                 
                                 NSDictionary *windowInfo = @{
                                     @"id": @(window.windowID),
@@ -94,11 +114,7 @@ Napi::Value GetWindowsElectronSafe(const Napi::CallbackInfo& info) {
                             NSString *appName = (__bridge NSString*)ownerName;
                             NSString *windowTitle = windowName ? (__bridge NSString*)windowName : @"";
                             
-                            // Skip Electron windows and system windows
-                            if ([appName containsString:@"Electron"] || 
-                                [appName containsString:@"node"] ||
-                                [appName containsString:@"WindowServer"] ||
-                                [appName containsString:@"Dock"]) continue;
+                            if (ShouldSkipWindowOwner(appName)) continue;
                             
                             // Get window bounds
                             CGRect bounds = CGRectZero;

package/src/window_selector.mm

@@ -56,6 +56,31 @@ static id g_screenKeyEventMonitor = nil;
 static NSTimer *g_screenTrackingTimer = nil;
 static NSInteger g_currentActiveScreenIndex = -1;
 
+static bool shouldAllowElectronWindows() {
+    NSString *flag = [[[NSProcessInfo processInfo] environment] objectForKey:@"CREAVIT_ALLOW_ELECTRON_WINDOWS"];
+    if (!flag) return false;
+
+    NSString *normalized = [[flag lowercaseString] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    return [normalized isEqualToString:@"1"] ||
+           [normalized isEqualToString:@"true"] ||
+           [normalized isEqualToString:@"yes"] ||
+           [normalized isEqualToString:@"on"];
+}
+
+static bool shouldSkipSelectableWindowOwner(NSString *windowOwner) {
+    if (!windowOwner || [windowOwner length] == 0) return true;
+    if ([windowOwner isEqualToString:@"WindowServer"]) return true;
+    if ([windowOwner isEqualToString:@"Dock"]) return true;
+
+    if (!shouldAllowElectronWindows()) {
+        if ([windowOwner containsString:@"Electron"] || [windowOwner containsString:@"node"]) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 // Record icon helpers
 static NSImage *CreateRecordIconImage(CGFloat size) {
     const CGFloat leadingInset = 24.0;
@@ -757,12 +782,7 @@ NSArray* getAllSelectableWindows() {
                 
                 // Skip system windows, dock, menu bar, etc.
                 if ([windowLayer intValue] != 0) continue; // Only normal windows
-                if (!windowOwner || [windowOwner length] == 0) continue;
-                if ([windowOwner isEqualToString:@"WindowServer"]) continue;
-                if ([windowOwner isEqualToString:@"Dock"]) continue;
-                
-                // Skip Electron windows (our own overlay)
-                if ([windowOwner containsString:@"Electron"] || [windowOwner containsString:@"node"]) continue;
+                if (shouldSkipSelectableWindowOwner(windowOwner)) continue;
                 
                 // Extract bounds
                 int x = [[bounds objectForKey:@"X"] intValue];
@@ -802,8 +822,7 @@ NSDictionary* getWindowUnderCursor(CGPoint point) {
         for (NSDictionary *window in g_allWindows) {
             NSString *appName = [window objectForKey:@"appName"];
             
-            // Skip Electron windows (our own overlay)
-            if (appName && ([appName containsString:@"Electron"] || [appName containsString:@"node"])) {
+            if (shouldSkipSelectableWindowOwner(appName)) {
                 continue;
             }