node-mac-recorder 2.24.15 → 2.24.17

package/CURSOR_MAPPING.md

@@ -19,25 +19,25 @@ Bu dosya, macOS native cursor type'larının Electron/CSS cursor constant'ların
 | `CURSOR_TYPES.copy` | `copy` | `NSCursor.dragCopyCursor` | ✅ |
 | `CURSOR_TYPES.alias` | `alias` | `NSCursor.dragLinkCursor` | ✅ |
 | `CURSOR_TYPES["not-allowed"]` | `not-allowed` | `NSCursor.operationNotAllowedCursor` | ✅ |
-| `CURSOR_TYPES.help` | `help` | Pattern: "help", "question" | ✅ |
-| `CURSOR_TYPES.progress` | `progress` | Pattern: "progress", "wait", "busy" | ✅ |
+| `CURSOR_TYPES.help` | `help` | HIServices `help` PNG/PDF | ✅ |
+| `CURSOR_TYPES.progress` | `progress` | HIServices `busybutclickable` | ✅ |
 
 ### Zoom Cursor'lar
 | Electron Constant | CSS Value | macOS Native | Durum |
 |-------------------|-----------|--------------|--------|
 | `CURSOR_TYPES.crosshair` | `crosshair` | `NSCursor.crosshairCursor` | ✅ |
-| `CURSOR_TYPES["zoom-in"]` | `zoom-in` | Pattern: "zoom" + NOT "out" | ✅ |
-| `CURSOR_TYPES["zoom-out"]` | `zoom-out` | Pattern: "zoom" + "out" | ✅ |
+| `CURSOR_TYPES["zoom-in"]` | `zoom-in` | `NSCursor.zoomInCursor` / HIServices `zoomin` | ✅ |
+| `CURSOR_TYPES["zoom-out"]` | `zoom-out` | `NSCursor.zoomOutCursor` / HIServices `zoomout` | ✅ |
 
 ### Resize Cursor'lar
 | Electron Constant | CSS Value | macOS Native | Durum |
 |-------------------|-----------|--------------|--------|
 | `CURSOR_TYPES["row-resize"]` | `row-resize` | `NSCursor.resizeUpDownCursor` | ✅ |
 | `CURSOR_TYPES["col-resize"]` | `col-resize` | `NSCursor.resizeLeftRightCursor` | ✅ |
-| `CURSOR_TYPES["ns-resize"]` | `ns-resize` | → maps to `row-resize` | ✅ |
-| `CURSOR_TYPES["nwse-resize"]` | `nwse-resize` | Pattern: "diagonal-down", "nwse" | ✅ |
-| `CURSOR_TYPES["nesw-resize"]` | `nesw-resize` | Pattern: "diagonal-up", "nesw" | ✅ |
-| `CURSOR_TYPES["all-scroll"]` | `all-scroll` | Pattern: "all-scroll", "omnidirectional" | ✅ |
+| `CURSOR_TYPES["ns-resize"]` | `ns-resize` | Dikey frame resize; `row-resize` ayrı tutulur | ✅ |
+| `CURSOR_TYPES["nwse-resize"]` | `nwse-resize` | Frame resize: sol üst / sağ alt | ✅ |
+| `CURSOR_TYPES["nesw-resize"]` | `nesw-resize` | Frame resize: sağ üst / sol alt | ✅ |
+| `CURSOR_TYPES["all-scroll"]` | `all-scroll` | HIServices `move` | ✅ |
 
 ### Mouse Events
 | Electron Constant | Event Type | Native Detection | Durum |
@@ -50,63 +50,42 @@ Bu dosya, macOS native cursor type'larının Electron/CSS cursor constant'ların
 | `MOUSE_EVENTS.WHEEL` | `wheel` | Scroll wheel events | ✅ |
 | `MOUSE_EVENTS.HOVER` | `hover` | Position stability | ✅ |
 
-## 🔧 Detection Methods
+## Algılama sırası
 
-### 1. Direct NSCursor Equality (En Güvenilir)
-```objc
-if (cursor == [NSCursor arrowCursor]) return @"default";
-if (cursor == [NSCursor IBeamCursor]) return @"text";
-```
-
-### 2. Pattern Matching (Cursor Name/Description)
-```objc
-if ([normalized containsString:@"resize"]) { ... }
-if ([normalized containsString:@"zoom"]) { ... }
-```
+1. `NSCursor.currentSystemCursor` ile ekranın gerçek imleci alınır. Kayıt işlemi arka plandayken uygulamanın kendi `currentCursor` değeri kullanılmaz.
+2. Görselin piksel içeriği ve hotspot'u sistem imleçlerinin fingerprint'leriyle karşılaştırılır. AppKit görselleri ile HIServices PNG/PDF kaynaklarının 1x ve 2x temsilleri tanıtılır. Chromium/WebKit'in `move` gibi CoreCursor varyantları AppKit üzerinden, sistem gölgesi dahil render edilir; ham PDF aynı piksel görüntüsünü üretmez.
+3. macOS 15 ve üzerinde frame resize'ın sekiz kenar/köşe konumu ve içe/dışa/iki yönlü çeşitleri; row/column resize'ın tek ve çift yönleri ayrı ayrı tanıtılır.
+4. Görsel eşleşmezse bilinen imleç adları kullanılır. Tanınmayan görseller `default` olur; sadece boyutuna bakarak resize, zoom veya hand tipi atanmaz.
+5. Sonuç desktop'taki SVG tiplerine normalize edilir. `context-menu` → `default`, `wait` → `progress`, `move` → `all-scroll`; tek yönlü resize tipleri ilgili eksene dönüştürülür.
 
-### 3. Shape-Based Detection (Hotspot + Aspect Ratio)
-```objc
-// Text cursor: narrow (0.50), center hotspot (0.44, 0.50)
-// Arrow cursor: medium (0.74), top-left hotspot (0.24, 0.17)
-// Pointer cursor: square (1.00), left-center hotspot (0.41, 0.25)
-```
+`CGSCurrentCursorSeed` bir değişiklik sayacıdır; tip kimliği olarak kullanılmaz. Eski `MAC_RECORDER_CURSOR_MAP` dosyalarındaki `seed` alanları yok sayılır, fingerprint ve privateName eşleştirmeleri desteklenir. Accessibility tahminleri yalnızca debug çıktısındadır.
 
-### 4. Accessibility API (Context-Aware)
-```objc
-AXUIElementCopyElementAtPosition() → role → cursor type
-```
+Konum değişmese bile cursor tipi değiştiğinde hareket/drag örneği kaydedilir.
 
-## 📝 Notlar
+## Test
 
-### İyileştirmeler (Latest)
-- ✅ `ns-resize` → `row-resize` mapping (Electron uyumluluğu)
-- ✅ `all-scroll` pattern detection eklendi
-- ✅ `progress` (wait/busy yerine)
-- ✅ `contextualMenuCursor` → `pointer` mapping
+macOS'ta, kurulu Node header'ları ve Xcode Command Line Tools ile:
 
-### Bilinen Sınırlamalar
-- Custom cursor'lar (resim-based) sadece pattern matching ile detect edilir
-- Bazı uygulamalar custom cursor implementation kullanır (tam detection garanti edilemez)
-- Shape-based detection sadece temel cursor'lar için optimize edilmiş
+```sh
+npm run test:cursor
+```
 
-## 🧪 Test Etme
+Test üretim kodunu derleyerek AppKit imleçlerini, bunların bağımsız 1x/2x bitmap kopyalarını, eski sistem kaynaklarını, isim eşleştirmelerini ve sabit konumdaki şekil değişikliklerini kontrol eder. AppKit sistem görsellerine erişim gerekir.
 
-Cursor detection'ı test etmek için:
+Gerçek WindowServer imlecini de doğrulamak için:
 
-```javascript
-const MacRecorder = require('./index.js');
-const recorder = new MacRecorder();
+```sh
+MAC_RECORDER_TEST_LIVE_CURSOR=1 npm run test:cursor
+```
 
-// Start cursor tracking
-await recorder.startCursorCapture('cursor-test.json', {
-    videoRelative: false
-});
+Bu seçenek imlecin altında kısa süreli bir test penceresi açar; test bitince pencere kapanır, önceki uygulama ve imleç geri yüklenir. Test sırasında fareyi hareket ettirmeyin.
 
-// Move mouse over different UI elements
-// Stop after a few seconds
-await recorder.stopCursorCapture();
+Gerçek Chromium CSS imleçleri ve `grab → grabbing → grab` basma/bırakma geçişi için (önce `npm run build`):
 
-// Check cursor-test.json for detected cursor types
+```sh
+MAC_RECORDER_ELECTRON=/path/to/Electron.app/Contents/MacOS/Electron npm run test:cursor:electron
 ```
 
-Her cursor event'inde `cursorType` field'ı Electron constant'larınızla uyumlu olacaktır.
+Bu test de kısa süreli bir pencere açar. Electron zaten test ortamında kuruluysa executable değişkeni gerekmez.
+
+Bilinmeyen özel uygulama görselleri veya gelecekte macOS'un sistem imleç görüntüsünü sağlamadığı durumlar `default` dönebilir. macOS 15 öncesindeki sistemler HIServices kaynakları ve mevcut NSCursor factory'leri üzerinden desteklenir.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.24.15",
+	"version": "2.24.17",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [
@@ -34,6 +34,8 @@
 	],
 	"scripts": {
 		"test": "node test.js",
+		"test:cursor": "node --test tests/cursor-detection.test.cjs",
+		"test:cursor:electron": "node --test tests/cursor-electron.test.cjs",
 		"install": "node install.js",
 		"build": "node-gyp build",
 		"rebuild": "node-gyp rebuild",

package/src/audio_recorder.mm

@@ -7,6 +7,34 @@
 static dispatch_queue_t g_audioCaptureQueue = nil;
 static NSString *g_lastStandaloneAudioOutputPath = nil;
 
+// A real PCM prefix survives readers/exporters that normalize track timestamps
+// and ignore MOV empty edits. Allocation is bounded even for a bad device PTS.
+static CMSampleBufferRef MRCreateSilentAudioPrefix(CMSampleBufferRef sample, double seconds) {
+    CMAudioFormatDescriptionRef format = CMSampleBufferGetFormatDescription(sample);
+    const AudioStreamBasicDescription *asbd = format ? CMAudioFormatDescriptionGetStreamBasicDescription(format) : NULL;
+    if (!asbd || asbd->mFormatID != kAudioFormatLinearPCM ||
+        !isfinite(seconds) || seconds <= 0 || seconds > 30 ||
+        !isfinite(asbd->mSampleRate) || asbd->mSampleRate <= 0 ||
+        asbd->mBytesPerFrame == 0) return NULL;
+    double frameCount = floor(seconds * asbd->mSampleRate);
+    double byteCount = frameCount * asbd->mBytesPerFrame;
+    if (frameCount < 1 || byteCount > 32 * 1024 * 1024) return NULL;
+    CMBlockBufferRef block = NULL;
+    OSStatus status = CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, NULL, (size_t)byteCount,
+        kCFAllocatorDefault, NULL, 0, (size_t)byteCount, 0, &block);
+    if (status != noErr || !block) return NULL;
+    status = CMBlockBufferFillDataBytes(0, block, 0, (size_t)byteCount);
+    CMSampleBufferRef silence = NULL;
+    if (status == noErr) {
+        CMSampleTimingInfo timing = { CMTimeMake(1, (int32_t)asbd->mSampleRate), kCMTimeZero, kCMTimeInvalid };
+        size_t frameSize = asbd->mBytesPerFrame;
+        CMSampleBufferCreateReady(kCFAllocatorDefault, block, format, (CMItemCount)frameCount,
+            1, &timing, 1, &frameSize, &silence);
+    }
+    CFRelease(block);
+    return silence;
+}
+
 @interface NativeAudioRecorder : NSObject<AVCaptureAudioDataOutputSampleBufferDelegate>
 
 @property (nonatomic, strong) AVAssetWriter *writer;
@@ -14,6 +42,7 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
 @property (nonatomic, strong) AVCaptureSession *session;
 @property (nonatomic, strong) AVCaptureAudioDataOutput *audioOutput;
 @property (nonatomic, assign) BOOL writerStarted;
+@property (nonatomic, assign) BOOL primaryPrefixWritten;
 @property (nonatomic, assign) CMTime startTime;
 @property (nonatomic, strong) NSString *outputPath;
 
@@ -78,8 +107,10 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
     AVFileType requestedFileType = AVFileTypeQuickTimeMovie;
     BOOL requestedWebM = NO;
     if (@available(macOS 15.0, *)) {
-        requestedFileType = @"public.webm";
-        requestedWebM = YES;
+        if (!MRSyncUsesPrimaryTimeline()) {
+            requestedFileType = @"public.webm";
+            requestedWebM = YES;
+        }
     }
     
     @try {
@@ -281,7 +312,8 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
     @catch (NSException *exception) { NSLog(@"[Recorder] Microphone delegate detach: %@", exception.reason); }
     [outputToStop release];
     if (g_audioCaptureQueue) dispatch_sync(g_audioCaptureQueue, ^{});
-    MRFinishAssetWriterSafely(self.writer, 8.0);
+    MRFinishAssetWriterSafely(self.writer, 8.0,
+        MRSyncUsesPrimaryTimeline() ? MRSyncGetStopLimitSeconds() : -1.0);
 
     self.writer = nil;
     self.writerInput = nil;
@@ -298,7 +330,8 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
 - (void)captureOutput:(AVCaptureOutput *)output didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnection *)connection {
     if (!self.session || output != self.audioOutput) return;
     @try {
-    if (MRSyncIsPaused()) {
+    BOOL primaryTimeline = MRSyncUsesPrimaryTimeline();
+    if (!primaryTimeline && MRSyncIsPaused()) {
         return;
     }
     if (!CMSampleBufferDataIsReady(sampleBuffer)) {
@@ -318,6 +351,11 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
     }
     
     CMTime timestamp = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+    CMClockRef captureClock = self.session.masterClock;
+    if (primaryTimeline) {
+        timestamp = MRSyncHostTimestamp(timestamp, captureClock);
+        if (!CMTIME_IS_NUMERIC(MRSyncPrimaryMediaTime(timestamp))) return;
+    }
 
     // Keep microphone warm-up outside the recording until the USB iPhone movie
     // output has actually started writing its first frame.
@@ -327,7 +365,7 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
 
     // A/V SYNC: Hold audio samples until camera produces first frame
     // This ensures both audio and camera files start from the same wall-clock moment
-    if (MRSyncShouldHoldAudioSample(timestamp)) {
+    if (!primaryTimeline && MRSyncShouldHoldAudioSample(timestamp)) {
         return;
     }
 
@@ -340,12 +378,25 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
         }
         [self.writer startSessionAtSourceTime:kCMTimeZero];
         self.writerStarted = YES;
-        self.startTime = timestamp;
+        self.primaryPrefixWritten = NO;
+        self.startTime = primaryTimeline ? MRSyncPrimaryStartTimestamp() : timestamp;
     }
     
     if (!self.writerInput.readyForMoreMediaData) {
         return;
     }
+
+    if (primaryTimeline && !self.primaryPrefixWritten) {
+        double leadingSeconds = CMTimeGetSeconds(MRSyncPrimaryMediaTime(timestamp));
+        CMSampleBufferRef silence = MRCreateSilentAudioPrefix(sampleBuffer, leadingSeconds);
+        if (silence) {
+            BOOL appended = [self.writerInput appendSampleBuffer:silence];
+            CFRelease(silence);
+            if (!appended) return;
+        }
+        self.primaryPrefixWritten = YES;
+        if (!self.writerInput.readyForMoreMediaData) return;
+    }
     
     if (CMTIME_IS_INVALID(self.startTime)) {
         self.startTime = timestamp;
@@ -372,7 +423,10 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
                         if (CMTIME_COMPARE_INLINE(adjustedPTS, <, kCMTimeZero)) {
                             adjustedPTS = kCMTimeZero;
                         }
-                        adjustedPTS = MRSyncAdjustForPauses(adjustedPTS);
+                        adjustedPTS = primaryTimeline
+                            ? MRSyncPrimaryMediaTime(MRSyncHostTimestamp(timingInfo[i].presentationTimeStamp, captureClock))
+                            : MRSyncAdjustForPauses(adjustedPTS);
+                        if (!CMTIME_IS_NUMERIC(adjustedPTS)) shouldDropBuffer = YES;
                         timingInfo[i].presentationTimeStamp = adjustedPTS;
                         
                         if (stopLimit > 0) {
@@ -392,7 +446,9 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
                         if (CMTIME_COMPARE_INLINE(adjustedDTS, <, kCMTimeZero)) {
                             adjustedDTS = kCMTimeZero;
                         }
-                        timingInfo[i].decodeTimeStamp = MRSyncAdjustForPauses(adjustedDTS);
+                        timingInfo[i].decodeTimeStamp = primaryTimeline
+                            ? MRSyncPrimaryMediaTime(MRSyncHostTimestamp(timingInfo[i].decodeTimeStamp, captureClock))
+                            : MRSyncAdjustForPauses(adjustedDTS);
                     }
                 }
                 
@@ -412,6 +468,9 @@ static NSString *g_lastStandaloneAudioOutputPath = nil;
         }
     }
 
+    // Never feed absolute device-clock timestamps into a zero-based iPhone
+    // writer if allocation or retiming failed.
+    if (primaryTimeline && bufferToAppend == sampleBuffer) shouldDropBuffer = YES;
     if (stopLimit > 0 && !shouldDropBuffer && bufferToAppend == sampleBuffer) {
         // No timing info available; approximate using buffer timestamp.
         CMTime pts = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);

package/src/camera_recorder.mm

@@ -111,6 +111,7 @@ static void MRCameraRemoveFileIfExists(NSString *path) {
 @property (nonatomic, strong) AVAssetWriterInputPixelBufferAdaptor *pixelBufferAdaptor;
 @property (nonatomic, assign) CMTime startTime;
 @property (nonatomic, assign) BOOL writerStarted;
+@property (nonatomic, assign) BOOL primaryPrefixWritten;
 @property (nonatomic, copy) NSString *outputPath;
 @property (nonatomic, copy) NSString *lastFinishedOutputPath;
 
@@ -510,7 +511,8 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
     if (self.stopInFlight || !self.isRecording || output != self.videoOutput) return;
     @try {
 
-    if (MRSyncIsPaused()) {
+    BOOL primaryTimeline = MRSyncUsesPrimaryTimeline();
+    if (!primaryTimeline && MRSyncIsPaused()) {
         return;
     }
 
@@ -532,6 +534,12 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
     }
 
     CMTime timestamp = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+    CMTime primaryMediaTime = kCMTimeInvalid;
+    if (primaryTimeline) {
+        timestamp = MRSyncHostTimestamp(timestamp, self.session.masterClock);
+        primaryMediaTime = MRSyncPrimaryMediaTime(timestamp);
+        if (!CMTIME_IS_NUMERIC(primaryMediaTime)) return;
+    }
 
     // Drop camera warm-up frames until the primary source (USB iPhone screen)
     // has committed its first frame. This keeps all files on one t=0 boundary.
@@ -549,7 +557,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
     [self completeStart:YES token:self.activeToken];
 
     // Hold camera frames until we see audio so timelines stay aligned
-    if (MRSyncShouldHoldVideoFrame(timestamp)) {
+    if (!primaryTimeline && MRSyncShouldHoldVideoFrame(timestamp)) {
         return;
     }
 
@@ -561,13 +569,16 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
         }
         [self.writer startSessionAtSourceTime:kCMTimeZero];  // CRITICAL: t=0 timeline
         self.writerStarted = YES;
+        self.primaryPrefixWritten = NO;
         
         // LIP SYNC FIX: Align camera startTime with audio's first timestamp for perfect lip sync
         // This ensures camera and audio start from the same reference point
         CMTime audioFirstTimestamp = MRSyncAudioFirstTimestamp();
         CMTime alignmentOffset = MRSyncVideoAlignmentOffset();
         
-        if (CMTIME_IS_VALID(audioFirstTimestamp)) {
+        if (primaryTimeline) {
+            self.startTime = MRSyncPrimaryStartTimestamp();
+        } else if (CMTIME_IS_VALID(audioFirstTimestamp)) {
             // Use audio's first timestamp as reference - this is the key to lip sync
             self.startTime = audioFirstTimestamp;
             CMTime offset = CMTimeSubtract(timestamp, audioFirstTimestamp);
@@ -606,7 +617,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
         // This should not happen if sync is working correctly
         adjustedTimestamp = kCMTimeZero;
     }
-    adjustedTimestamp = MRSyncAdjustForPauses(adjustedTimestamp);
+    adjustedTimestamp = primaryTimeline ? primaryMediaTime : MRSyncAdjustForPauses(adjustedTimestamp);
 
     // LIP SYNC FIX: Check stopLimit OR elapsed time to drop frames after recording duration
     // This prevents camera from recording longer than audio
@@ -650,6 +661,15 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
         return;
     }
 
+    // Keep a late camera's initial delay in the media itself. Some demuxers
+    // discard MOV empty edits and would otherwise pull the camera ahead of mic.
+    if (primaryTimeline && !self.primaryPrefixWritten) {
+        if (CMTimeCompare(adjustedTimestamp, kCMTimeZero) > 0 &&
+            ![self.pixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:kCMTimeZero]) return;
+        self.primaryPrefixWritten = YES;
+        if (!self.writerInput.readyForMoreMediaData) return;
+    }
+
     // Append to writer with normalized timestamp
     BOOL success = [self.pixelBufferAdaptor appendPixelBuffer:pixelBuffer
                                          withPresentationTime:adjustedTimestamp];