node-mac-recorder 2.2.1 → 2.4.1

package/src/screen_capture.mm

@@ -1,9 +1,6 @@
-<<<<<<< HEAD
-=======
 #import "screen_capture.h"
 #import <ScreenCaptureKit/ScreenCaptureKit.h>
 #import <AVFoundation/AVFoundation.h>
->>>>>>> screencapture
 #import <CoreGraphics/CoreGraphics.h>
 #import <AppKit/AppKit.h>
 
@@ -77,11 +74,7 @@
     NSURL *fileURL = [NSURL fileURLWithPath:filePath];
     CGImageDestinationRef destination = CGImageDestinationCreateWithURL(
         (__bridge CFURLRef)fileURL, 
-<<<<<<< HEAD
-        CFSTR("public.png"),
-=======
         (__bridge CFStringRef)@"public.png", 
->>>>>>> screencapture
         1, 
         NULL
     );
@@ -110,14 +103,6 @@
 
 + (CGImageRef)createScreenshotFromDisplay:(CGDirectDisplayID)displayID 
                                      rect:(CGRect)rect {
-<<<<<<< HEAD
-    if (CGRectIsNull(rect)) {
-        // Capture entire display
-        return CGDisplayCreateImage(displayID);
-    } else {
-        // Capture specific rect
-        return CGDisplayCreateImageForRect(displayID, rect);
-=======
     if (CGRectIsNull(rect) || CGRectIsEmpty(rect)) {
         rect = CGDisplayBounds(displayID);
     }
@@ -156,7 +141,6 @@ Napi::Value GetAvailableDisplays(const Napi::CallbackInfo& info) {
         displayObj.Set("isPrimary", Napi::Boolean::New(env, [[displayInfo objectForKey:@"isPrimary"] boolValue]));
         
         displaysArray.Set(static_cast<uint32_t>(i), displayObj);
->>>>>>> screencapture
     }
     
     return displaysArray;

package/test-sck.js

@@ -1,55 +1,3 @@
-<<<<<<< HEAD
-const nativeBinding = require('./build/Release/mac_recorder.node');
-
-console.log('=== ScreenCaptureKit Migration Test ===');
-console.log('ScreenCaptureKit available:', nativeBinding.isScreenCaptureKitAvailable());
-console.log('Displays:', nativeBinding.getDisplays().length);
-console.log('Audio devices:', nativeBinding.getAudioDevices().length);
-console.log('Permissions OK:', nativeBinding.checkPermissions());
-
-const displays = nativeBinding.getDisplays();
-console.log('\nDisplay info:', displays[0]);
-
-const audioDevices = nativeBinding.getAudioDevices();
-console.log('\nFirst audio device:', audioDevices[0]);
-
-// Test starting and stopping recording
-console.log('\n=== Recording Test ===');
-const outputPath = '/tmp/test-recording-sck.mov';
-
-try {
-    console.log('Starting recording...');
-    const success = nativeBinding.startRecording(outputPath, {
-        displayId: displays[0].id,
-        captureCursor: true,
-        includeMicrophone: false,
-        includeSystemAudio: false
-    });
-    
-    console.log('Recording started:', success);
-    
-    if (success) {
-        setTimeout(() => {
-            console.log('Stopping recording...');
-            const stopped = nativeBinding.stopRecording();
-            console.log('Recording stopped:', stopped);
-            
-            // Check if file was created
-            const fs = require('fs');
-            setTimeout(() => {
-                if (fs.existsSync(outputPath)) {
-                    const stats = fs.statSync(outputPath);
-                    console.log(`Recording file created: ${outputPath} (${stats.size} bytes)`);
-                } else {
-                    console.log('Recording file not found');
-                }
-            }, 1000);
-        }, 3000); // Record for 3 seconds
-    }
-} catch (error) {
-    console.error('Recording test failed:', error.message);
-}
-=======
 const MacRecorder = require('./index');
 
 function testScreenCaptureKit() {
@@ -105,5 +53,4 @@ function testScreenCaptureKit() {
     }
 }
 
-testScreenCaptureKit();
->>>>>>> screencapture
+testScreenCaptureKit();

package/window-selector.js

@@ -1,19 +1,27 @@
 const { EventEmitter } = require("events");
 const path = require("path");
 
-// Native modülü yükle
+// Native modülü yükle (arm64 prebuild öncelikli)
 let nativeBinding;
 try {
-	nativeBinding = require("./build/Release/mac_recorder.node");
+	if (process.platform === "darwin" && process.arch === "arm64") {
+		nativeBinding = require("./prebuilds/darwin-arm64/node.napi.node");
+	} else {
+		nativeBinding = require("./build/Release/mac_recorder.node");
+	}
 } catch (error) {
 	try {
-		nativeBinding = require("./build/Debug/mac_recorder.node");
-	} catch (debugError) {
-		throw new Error(
-			'Native module not found. Please run "npm run build" to compile the native module.\n' +
-				"Original error: " +
-				error.message
-		);
+		nativeBinding = require("./build/Release/mac_recorder.node");
+	} catch (_) {
+		try {
+			nativeBinding = require("./build/Debug/mac_recorder.node");
+		} catch (debugError) {
+			throw new Error(
+				'Native module not found. Please run "npm run build" to compile the native module.\n' +
+					"Original error: " +
+					error.message
+			);
+		}
 	}
 }
 
@@ -40,11 +48,11 @@ class WindowSelector extends EventEmitter {
 			try {
 				// Native window selection başlat
 				const success = nativeBinding.startWindowSelection();
-				
+
 				if (success) {
 					this.isSelecting = true;
 					this.selectedWindow = null;
-					
+
 					// Status polling timer başlat (higher frequency for overlay updates)
 					this.selectionTimer = setInterval(() => {
 						this.checkSelectionStatus();
@@ -72,7 +80,7 @@ class WindowSelector extends EventEmitter {
 		return new Promise((resolve, reject) => {
 			try {
 				const success = nativeBinding.stopWindowSelection();
-				
+
 				// Timer'ı durdur
 				if (this.selectionTimer) {
 					clearInterval(this.selectionTimer);
@@ -98,14 +106,14 @@ class WindowSelector extends EventEmitter {
 
 		try {
 			const status = nativeBinding.getWindowSelectionStatus();
-			
+
 			// Seçim tamamlandı mı kontrol et
 			if (status.hasSelectedWindow && !this.selectedWindow) {
 				const windowInfo = nativeBinding.getSelectedWindowInfo();
 				if (windowInfo) {
 					this.selectedWindow = windowInfo;
 					this.isSelecting = false;
-					
+
 					// Timer'ı durdur
 					if (this.selectionTimer) {
 						clearInterval(this.selectionTimer);
@@ -121,17 +129,20 @@ class WindowSelector extends EventEmitter {
 			if (this.lastStatus) {
 				const lastWindow = this.lastStatus.currentWindow;
 				const currentWindow = status.currentWindow;
-				
+
 				if (!lastWindow && currentWindow) {
 					// Yeni pencere üstüne gelindi
 					this.emit("windowEntered", currentWindow);
 				} else if (lastWindow && !currentWindow) {
 					// Pencere üstünden ayrıldı
 					this.emit("windowLeft", lastWindow);
-				} else if (lastWindow && currentWindow && 
-						  (lastWindow.id !== currentWindow.id || 
-						   lastWindow.title !== currentWindow.title || 
-						   lastWindow.appName !== currentWindow.appName)) {
+				} else if (
+					lastWindow &&
+					currentWindow &&
+					(lastWindow.id !== currentWindow.id ||
+						lastWindow.title !== currentWindow.title ||
+						lastWindow.appName !== currentWindow.appName)
+				) {
 					// Farklı bir pencereye geçildi
 					this.emit("windowLeft", lastWindow);
 					this.emit("windowEntered", currentWindow);
@@ -164,14 +175,14 @@ class WindowSelector extends EventEmitter {
 				isSelecting: this.isSelecting && nativeStatus.isSelecting,
 				hasSelectedWindow: !!this.selectedWindow,
 				selectedWindow: this.selectedWindow,
-				nativeStatus: nativeStatus
+				nativeStatus: nativeStatus,
 			};
 		} catch (error) {
 			return {
 				isSelecting: this.isSelecting,
 				hasSelectedWindow: !!this.selectedWindow,
 				selectedWindow: this.selectedWindow,
-				error: error.message
+				error: error.message,
 			};
 		}
 	}
@@ -205,7 +216,6 @@ class WindowSelector extends EventEmitter {
 
 				// Seçimi başlat
 				await this.startSelection();
-
 			} catch (error) {
 				this.removeAllListeners("windowSelected");
 				this.removeAllListeners("error");
@@ -242,7 +252,9 @@ class WindowSelector extends EventEmitter {
 			nativeBinding.setBringToFrontEnabled(enabled);
 			// Only log if explicitly setting, not on startup
 			if (arguments.length > 0) {
-				console.log(`🔄 Auto bring-to-front: ${enabled ? 'ENABLED' : 'DISABLED'}`);
+				console.log(
+					`🔄 Auto bring-to-front: ${enabled ? "ENABLED" : "DISABLED"}`
+				);
 			}
 		} catch (error) {
 			throw new Error(`Failed to set bring to front: ${error.message}`);
@@ -376,14 +388,14 @@ class WindowSelector extends EventEmitter {
 		try {
 			// Start screen selection
 			await this.startScreenSelection();
-			
+
 			// Poll for selection completion
 			return new Promise((resolve, reject) => {
 				let isResolved = false;
-				
+
 				const checkSelection = () => {
 					if (isResolved) return; // Prevent multiple resolutions
-					
+
 					const selectedScreen = this.getSelectedScreen();
 					if (selectedScreen) {
 						isResolved = true;
@@ -394,19 +406,19 @@ class WindowSelector extends EventEmitter {
 					} else {
 						// Selection was cancelled (probably ESC key)
 						isResolved = true;
-						reject(new Error('Screen selection was cancelled'));
+						reject(new Error("Screen selection was cancelled"));
 					}
 				};
-				
+
 				// Start polling
 				checkSelection();
-				
+
 				// Timeout after 60 seconds
 				setTimeout(() => {
 					if (!isResolved) {
 						isResolved = true;
 						this.stopScreenSelection();
-						reject(new Error('Screen selection timed out'));
+						reject(new Error("Screen selection timed out"));
 					}
 				}, 60000);
 			});
@@ -430,7 +442,9 @@ class WindowSelector extends EventEmitter {
 			const success = nativeBinding.showScreenRecordingPreview(screenInfo);
 			return success;
 		} catch (error) {
-			throw new Error(`Failed to show screen recording preview: ${error.message}`);
+			throw new Error(
+				`Failed to show screen recording preview: ${error.message}`
+			);
 		}
 	}
 
@@ -443,7 +457,9 @@ class WindowSelector extends EventEmitter {
 			const success = nativeBinding.hideScreenRecordingPreview();
 			return success;
 		} catch (error) {
-			throw new Error(`Failed to hide screen recording preview: ${error.message}`);
+			throw new Error(
+				`Failed to hide screen recording preview: ${error.message}`
+			);
 		}
 	}
 
@@ -460,10 +476,10 @@ class WindowSelector extends EventEmitter {
 			return {
 				screenRecording: false,
 				accessibility: false,
-				error: error.message
+				error: error.message,
 			};
 		}
 	}
 }
 
-module.exports = WindowSelector;
+module.exports = WindowSelector;

package/scripts/test-exclude.js

@@ -1,72 +0,0 @@
-/*
- Simple test runner: starts a 2s recording with ScreenCaptureKit and exclusions.
- */
-const fs = require("fs");
-const path = require("path");
-const MacRecorder = require("..");
-
-async function sleep(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-async function main() {
-	const recorder = new MacRecorder();
-	const outDir = path.resolve(process.cwd(), "test-output");
-	const outPath = path.join(outDir, `sc-exclude-${Date.now()}.mov`);
-	await fs.promises.mkdir(outDir, { recursive: true });
-
-	console.log("[TEST] Starting 2s recording with SC exclusions...");
-	// Try to ensure overlays are not active in this process
-
-	const perms = await recorder.checkPermissions();
-	if (!perms?.screenRecording) {
-		console.error(
-			"[TEST] Screen Recording permission is not granted. Enable it in System Settings → Privacy & Security → Screen Recording for Terminal/Node, then re-run."
-		);
-		process.exit(1);
-	}
-
-	try {
-		await recorder.startRecording(outPath, {
-			useScreenCaptureKit: true,
-			captureCursor: false,
-			excludedAppBundleIds: ["com.apple.Safari"],
-		});
-	} catch (e) {
-		console.error("[TEST] Failed to start recording:", e.message);
-		process.exit(1);
-	}
-
-	await sleep(2000);
-
-	try {
-		const result = await recorder.stopRecording();
-		console.log("[TEST] Stopped. Result:", result);
-	} catch (e) {
-		console.error("[TEST] Failed to stop recording:", e.message);
-		process.exit(1);
-	}
-
-	// SCRecordingOutput write may be async; wait up to 10s for the file
-	const deadline = Date.now() + 10000;
-	let stats = null;
-	while (Date.now() < deadline) {
-		if (fs.existsSync(outPath)) {
-			stats = fs.statSync(outPath);
-			if (stats.size > 0) break;
-		}
-		await sleep(200);
-	}
-
-	if (stats && fs.existsSync(outPath)) {
-		console.log(`[TEST] Output saved: ${outPath} (${stats.size} bytes)`);
-	} else {
-		console.error("[TEST] Output file not found or empty:", outPath);
-		process.exit(1);
-	}
-}
-
-main().catch((e) => {
-	console.error("[TEST] Unhandled error:", e);
-	process.exit(1);
-});

package/src/screen_capture_kit.mm

@@ -1,222 +0,0 @@
-#import "screen_capture_kit.h"
-#import <ScreenCaptureKit/ScreenCaptureKit.h>
-#import <AVFoundation/AVFoundation.h>
-
-static SCStream *g_scStream = nil;
-static SCRecordingOutput *g_scRecordingOutput = nil;
-static NSURL *g_outputURL = nil;
-static ScreenCaptureKitRecorder *g_scDelegate = nil;
-static NSArray<SCRunningApplication *> *g_appsToExclude = nil;
-static NSArray<SCWindow *> *g_windowsToExclude = nil;
-
-@interface ScreenCaptureKitRecorder () <SCRecordingOutputDelegate>
-@end
-
-@implementation ScreenCaptureKitRecorder
-
-+ (BOOL)isScreenCaptureKitAvailable {
-    if (@available(macOS 14.0, *)) {
-        Class streamClass = NSClassFromString(@"SCStream");
-        Class recordingOutputClass = NSClassFromString(@"SCRecordingOutput");
-        return (streamClass != nil && recordingOutputClass != nil);
-    }
-    return NO;
-}
-
-+ (BOOL)isRecording {
-    return g_scStream != nil;
-}
-
-+ (BOOL)startRecordingWithConfiguration:(NSDictionary *)config 
-                               delegate:(id)delegate 
-                                  error:(NSError **)error {
-    if (![self isScreenCaptureKitAvailable]) {
-        if (error) {
-            *error = [NSError errorWithDomain:@"ScreenCaptureKitRecorder"
-                                         code:-1
-                                     userInfo:@{NSLocalizedDescriptionKey: @"ScreenCaptureKit not available"}];
-        }
-        return NO;
-    }
-
-    if (g_scStream) {
-        return NO;
-    }
-
-    @try {
-        SCShareableContent *content = nil;
-        if (@available(macOS 13.0, *)) {
-            NSLog(@"[SCK] Fetching shareable content...");
-            content = [SCShareableContent currentShareableContent];
-        }
-        if (!content) {
-            if (error) { *error = [NSError errorWithDomain:@"ScreenCaptureKitRecorder" code:-2 userInfo:@{NSLocalizedDescriptionKey:@"Failed to get shareable content"}]; }
-            NSLog(@"[SCK] Failed to get shareable content");
-            return NO;
-        }
-
-        NSNumber *displayIdNumber = config[@"displayId"]; // CGDirectDisplayID
-        NSDictionary *captureArea = config[@"captureArea"]; // {x,y,width,height}
-        NSNumber *captureCursorNum = config[@"captureCursor"];
-        NSNumber *includeMicNum = config[@"includeMicrophone"];
-        NSNumber *includeSystemAudioNum = config[@"includeSystemAudio"];
-        NSArray<NSString *> *excludedBundleIds = config[@"excludedAppBundleIds"];
-        NSArray<NSNumber *> *excludedPIDs = config[@"excludedPIDs"];
-        NSArray<NSNumber *> *excludedWindowIds = config[@"excludedWindowIds"];
-        NSString *outputPath = config[@"outputPath"];
-
-        SCDisplay *targetDisplay = nil;
-        if (displayIdNumber) {
-            uint32_t wanted = (uint32_t)displayIdNumber.unsignedIntValue;
-            for (SCDisplay *d in content.displays) {
-                if (d.displayID == wanted) { targetDisplay = d; break; }
-            }
-        }
-        if (!targetDisplay) {
-            targetDisplay = content.displays.firstObject;
-            if (!targetDisplay) { NSLog(@"[SCK] No displays found"); return NO; }
-        }
-        NSLog(@"[SCK] Using displayID=%u", targetDisplay.displayID);
-
-        NSMutableArray<SCRunningApplication*> *appsToExclude = [NSMutableArray array];
-        if (excludedBundleIds.count > 0) {
-            for (SCRunningApplication *app in content.applications) {
-                if ([excludedBundleIds containsObject:app.bundleIdentifier]) {
-                    [appsToExclude addObject:app];
-                }
-            }
-        }
-        if (excludedPIDs.count > 0) {
-            for (SCRunningApplication *app in content.applications) {
-                if ([excludedPIDs containsObject:@(app.processID)]) {
-                    [appsToExclude addObject:app];
-                }
-            }
-        }
-
-        NSMutableArray<SCWindow*> *windowsToExclude = [NSMutableArray array];
-        if (excludedWindowIds.count > 0) {
-            for (SCWindow *w in content.windows) {
-                if ([excludedWindowIds containsObject:@(w.windowID)]) {
-                    [windowsToExclude addObject:w];
-                }
-            }
-        }
-
-        // Keep strong references to excluded items for the lifetime of the stream
-        g_appsToExclude = [appsToExclude copy];
-        g_windowsToExclude = [windowsToExclude copy];
-
-        SCContentFilter *filter = nil;
-        if (appsToExclude.count > 0) {
-            if (@available(macOS 13.0, *)) {
-                filter = [[SCContentFilter alloc] initWithDisplay:targetDisplay excludingApplications:(g_appsToExclude ?: @[]) exceptingWindows:(g_windowsToExclude ?: @[])];
-            }
-        }
-        if (!filter) {
-            if (@available(macOS 13.0, *)) {
-                filter = [[SCContentFilter alloc] initWithDisplay:targetDisplay excludingWindows:(g_windowsToExclude ?: @[])];
-            }
-        }
-        if (!filter) { NSLog(@"[SCK] Failed to create filter"); return NO; }
-
-        SCStreamConfiguration *cfg = [[SCStreamConfiguration alloc] init];
-        if (captureArea && captureArea[@"width"] && captureArea[@"height"]) {
-            CGRect displayFrame = targetDisplay.frame;
-            double x = [captureArea[@"x"] doubleValue];
-            double yBottom = [captureArea[@"y"] doubleValue];
-            double w = [captureArea[@"width"] doubleValue];
-            double h = [captureArea[@"height"] doubleValue];
-
-            // Convert bottom-left origin (used by legacy path) to top-left for SC
-            double y = displayFrame.size.height - yBottom - h;
-
-            // Clamp to display bounds to avoid invalid sourceRect
-            if (w < 1) w = 1; if (h < 1) h = 1;
-            if (x < 0) x = 0; if (y < 0) y = 0;
-            if (x + w > displayFrame.size.width) w = MAX(1, displayFrame.size.width - x);
-            if (y + h > displayFrame.size.height) h = MAX(1, displayFrame.size.height - y);
-
-            CGRect src = CGRectMake(x, y, w, h);
-            cfg.sourceRect = src;
-            cfg.width = (int)src.size.width;
-            cfg.height = (int)src.size.height;
-        } else {
-            CGRect displayFrame = targetDisplay.frame;
-            cfg.width = (int)displayFrame.size.width;
-            cfg.height = (int)displayFrame.size.height;
-        }
-        cfg.showsCursor = captureCursorNum.boolValue;
-        if (includeMicNum || includeSystemAudioNum) {
-            if (@available(macOS 13.0, *)) {
-                cfg.capturesAudio = YES;
-            }
-        }
-
-        if (@available(macOS 15.0, *)) {
-            g_scStream = [[SCStream alloc] initWithFilter:filter configuration:cfg delegate:nil];
-            NSLog(@"[SCK] Stream created. w=%d h=%d cursor=%@ audio=%@", cfg.width, cfg.height, cfg.showsCursor?@"YES":@"NO", (@available(macOS 13.0, *) ? (cfg.capturesAudio?@"YES":@"NO") : @"N/A"));
-
-            SCRecordingOutputConfiguration *recCfg = [[SCRecordingOutputConfiguration alloc] init];
-            g_outputURL = [NSURL fileURLWithPath:outputPath];
-            recCfg.outputURL = g_outputURL;
-            recCfg.outputFileType = AVFileTypeQuickTimeMovie;
-
-            id<SCRecordingOutputDelegate> delegateObject = (id<SCRecordingOutputDelegate>)delegate;
-            if (!delegateObject) {
-                if (!g_scDelegate) {
-                    g_scDelegate = [[ScreenCaptureKitRecorder alloc] init];
-                }
-                delegateObject = (id<SCRecordingOutputDelegate>)g_scDelegate;
-            }
-            g_scRecordingOutput = [[SCRecordingOutput alloc] initWithConfiguration:recCfg delegate:delegateObject];
-
-            NSError *addErr = nil;
-            BOOL added = [g_scStream addRecordingOutput:g_scRecordingOutput error:&addErr];
-            if (!added) {
-                NSLog(@"[SCK] addRecordingOutput failed: %@", addErr.localizedDescription);
-                if (error) { *error = addErr ?: [NSError errorWithDomain:@"ScreenCaptureKitRecorder" code:-3 userInfo:nil]; }
-                g_scRecordingOutput = nil; g_scStream = nil; g_outputURL = nil;
-                return NO;
-            }
-
-            [g_scStream startCaptureWithCompletionHandler:^(NSError * _Nullable err) {
-                if (err) {
-                    NSLog(@"[SCK] startCapture error: %@", err.localizedDescription);
-                    [g_scStream removeRecordingOutput:g_scRecordingOutput error:nil];
-                    g_scRecordingOutput = nil; g_scStream = nil; g_outputURL = nil;
-                } else {
-                    NSLog(@"[SCK] startCapture OK");
-                }
-            }];
-            // Return immediately; capture will start asynchronously
-            return YES;
-        }
-
-        return NO;
-    } @catch (__unused NSException *ex) {
-        return NO;
-    }
-}
-
-+ (void)stopRecording {
-    if (!g_scStream) { return; }
-    @try {
-        dispatch_semaphore_t sem = dispatch_semaphore_create(0);
-        [g_scStream stopCaptureWithCompletionHandler:^(NSError * _Nullable error) {
-            dispatch_semaphore_signal(sem);
-        }];
-        dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
-    } @catch (__unused NSException *ex) {
-    }
-    if (g_scRecordingOutput) {
-        [g_scStream removeRecordingOutput:g_scRecordingOutput error:nil];
-    }
-    g_scRecordingOutput = nil;
-    g_scStream = nil;
-    g_outputURL = nil;
-}
-
-@end
-
-