node-mac-recorder 2.4.0 → 2.4.2

package/index.js

@@ -5,16 +5,25 @@ const fs = require("fs");
 // Native modülü yükle
 let nativeBinding;
 try {
-	nativeBinding = require("./build/Release/mac_recorder.node");
+	// Prefer prebuild on arm64
+	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
+			);
+		}
 	}
 }
 

package/install.js

@@ -2,7 +2,7 @@ const { spawn } = require("child_process");
 const fs = require("fs");
 const path = require("path");
 
-console.log("🔨 Building native macOS recorder module...\n");
+console.log("🔨 Installing node-mac-recorder...\n");
 
 // Check if we're on macOS
 if (process.platform !== "darwin") {
@@ -10,7 +10,24 @@ if (process.platform !== "darwin") {
 	process.exit(1);
 }
 
-// Check if Xcode Command Line Tools are installed
+// Prefer prebuilds on supported platforms
+const prebuildPath = path.join(
+	__dirname,
+	"prebuilds",
+	`darwin-${process.arch}`,
+	"node.napi.node"
+);
+if (
+	process.platform === "darwin" &&
+	process.arch === "arm64" &&
+	fs.existsSync(prebuildPath)
+) {
+	console.log("✅ Using prebuilt binary:", prebuildPath);
+	console.log("🎉 node-mac-recorder is ready to use (no compilation needed)");
+	process.exit(0);
+}
+
+// Fallback to building from source
 console.log("🔍 Checking Xcode Command Line Tools...");
 const xcodebuild = spawn("xcode-select", ["--print-path"], { stdio: "pipe" });
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.4.0",
+	"version": "2.4.2",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [
@@ -37,6 +37,9 @@
 		"install": "node install.js",
 		"build": "node-gyp build",
 		"rebuild": "node-gyp rebuild",
+		"prebuild:node-arm64": "prebuildify --platform darwin --arch arm64 --napi --strip",
+		"prebuild:electron-arm64": "prebuildify --platform darwin --arch arm64 --napi --strip --targets electron@27.0.0",
+		"prebuild:all-arm64": "npm run prebuild:node-arm64 && npm run prebuild:electron-arm64",
 		"clean": "node-gyp clean",
 		"test:window-selector": "node window-selector-test.js",
 		"example:window-selector": "node examples/window-selector-example.js"
@@ -45,7 +48,8 @@
 		"node-addon-api": "^7.0.0"
 	},
 	"devDependencies": {
-		"node-gyp": "^10.0.0"
+		"node-gyp": "^10.0.0",
+		"prebuildify": "^6.0.1"
 	},
 	"gypfile": true
 }

package/src/mac_recorder.mm

@@ -124,29 +124,71 @@ API_AVAILABLE(macos(12.3))
 static SCStream *g_scStream = nil;
 static SCKRecorderDelegate *g_scDelegate = nil;
 static bool g_isRecording = false;
+static BOOL g_screenOutputAttached = NO;
+static BOOL g_audioOutputAttached = NO;
+static dispatch_queue_t g_outputQueue = NULL; // use a dedicated serial queue for sample handling
 
 // Helper function to cleanup ScreenCaptureKit recording resources
 void cleanupSCKRecording() {
     NSLog(@"🛑 Cleaning up ScreenCaptureKit recording");
-    
+
+    // Detach outputs first to prevent further callbacks into the delegate
+    if (g_scStream && g_scDelegate) {
+        NSError *rmError = nil;
+        if (g_screenOutputAttached) {
+            [g_scStream removeStreamOutput:g_scDelegate type:SCStreamOutputTypeScreen error:&rmError];
+            g_screenOutputAttached = NO;
+        }
+        if (g_audioOutputAttached) {
+            rmError = nil;
+            [g_scStream removeStreamOutput:g_scDelegate type:SCStreamOutputTypeAudio error:&rmError];
+            g_audioOutputAttached = NO;
+        }
+    }
+
     if (g_scStream) {
         NSLog(@"🛑 Stopping SCStream");
-        [g_scStream stopCaptureWithCompletionHandler:^(NSError * _Nullable error) {
+        SCStream *streamToStop = g_scStream; // keep local until stop completes
+        [streamToStop stopCaptureWithCompletionHandler:^(NSError * _Nullable error) {
             if (error) {
                 NSLog(@"❌ Error stopping SCStream: %@", error.localizedDescription);
             } else {
                 NSLog(@"✅ SCStream stopped successfully");
             }
+
+            // Finish writer after stream has stopped to ensure no further buffers arrive
+            if (g_scDelegate && g_scDelegate.assetWriter && g_scDelegate.isWriting) {
+                NSLog(@"🛑 Finishing asset writer (status: %ld)", (long)g_scDelegate.assetWriter.status);
+                g_scDelegate.isWriting = NO;
+
+                if (g_scDelegate.assetWriter.status == AVAssetWriterStatusWriting) {
+                    if (g_scDelegate.videoInput) {
+                        [g_scDelegate.videoInput markAsFinished];
+                    }
+                    if (g_scDelegate.audioInput) {
+                        [g_scDelegate.audioInput markAsFinished];
+                    }
+
+                    [g_scDelegate.assetWriter finishWritingWithCompletionHandler:^{
+                        NSLog(@"✅ Asset writer finished. Status: %ld", (long)g_scDelegate.assetWriter.status);
+                        if (g_scDelegate.assetWriter.error) {
+                            NSLog(@"❌ Asset writer error: %@", g_scDelegate.assetWriter.error.localizedDescription);
+                        }
+                    }];
+                } else if (g_scDelegate.assetWriter.status == AVAssetWriterStatusFailed) {
+                    NSLog(@"❌ Asset writer failed: %@", g_scDelegate.assetWriter.error.localizedDescription);
+                }
+            }
+
+            g_isRecording = false;
+            g_scStream = nil;
+            g_scDelegate = nil;
         }];
-        g_scStream = nil;
-    }
-    
-    if (g_scDelegate) {
-        if (g_scDelegate.assetWriter && g_scDelegate.isWriting) {
+    } else {
+        // No stream, just finalize writer if needed
+        if (g_scDelegate && g_scDelegate.assetWriter && g_scDelegate.isWriting) {
             NSLog(@"🛑 Finishing asset writer (status: %ld)", (long)g_scDelegate.assetWriter.status);
             g_scDelegate.isWriting = NO;
-            
-            // Only mark inputs as finished if asset writer is actually writing
             if (g_scDelegate.assetWriter.status == AVAssetWriterStatusWriting) {
                 if (g_scDelegate.videoInput) {
                     [g_scDelegate.videoInput markAsFinished];
@@ -154,23 +196,12 @@ void cleanupSCKRecording() {
                 if (g_scDelegate.audioInput) {
                     [g_scDelegate.audioInput markAsFinished];
                 }
-                
-                [g_scDelegate.assetWriter finishWritingWithCompletionHandler:^{
-                    NSLog(@"✅ Asset writer finished. Status: %ld", (long)g_scDelegate.assetWriter.status);
-                    if (g_scDelegate.assetWriter.error) {
-                        NSLog(@"❌ Asset writer error: %@", g_scDelegate.assetWriter.error.localizedDescription);
-                    }
-                }];
-            } else {
-                NSLog(@"⚠️ Asset writer not in writing status, cannot finish normally");
-                if (g_scDelegate.assetWriter.status == AVAssetWriterStatusFailed) {
-                    NSLog(@"❌ Asset writer failed: %@", g_scDelegate.assetWriter.error.localizedDescription);
-                }
+                [g_scDelegate.assetWriter finishWritingWithCompletionHandler:^{}];
             }
         }
+        g_isRecording = false;
         g_scDelegate = nil;
     }
-    g_isRecording = false;
 }
 
 // Check if ScreenCaptureKit is available
@@ -184,7 +215,7 @@ bool isScreenCaptureKitAvailable() {
 // NAPI Function: Start Recording with ScreenCaptureKit
 Napi::Value StartRecording(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
-    
+    @autoreleasepool {
     if (!isScreenCaptureKitAvailable()) {
         NSLog(@"ScreenCaptureKit requires macOS 12.3 or later");
         return Napi::Boolean::New(env, false);
@@ -472,19 +503,22 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
         }
     }
     
-    // Create callback queue for the delegate
-    dispatch_queue_t delegateQueue = dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0);
-    
+    // Create a dedicated serial queue for output callbacks
+    if (g_outputQueue == NULL) {
+        g_outputQueue = dispatch_queue_create("com.node-mac-recorder.stream-output", DISPATCH_QUEUE_SERIAL);
+    }
+
     // Create and start stream first
     g_scStream = [[SCStream alloc] initWithFilter:contentFilter configuration:config delegate:g_scDelegate];
     
     // Attach outputs to actually receive sample buffers
     NSLog(@"✅ Setting up stream output callback for sample buffers");
-    dispatch_queue_t outputQueue = dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0);
+    dispatch_queue_t outputQueue = g_outputQueue;
     NSError *outputError = nil;
     BOOL addedScreenOutput = [g_scStream addStreamOutput:g_scDelegate type:SCStreamOutputTypeScreen sampleHandlerQueue:outputQueue error:&outputError];
     if (addedScreenOutput) {
         NSLog(@"✅ Screen output attached to SCStream");
+        g_screenOutputAttached = YES;
     } else {
         NSLog(@"❌ Failed to attach screen output to SCStream: %@", outputError.localizedDescription);
     }
@@ -493,6 +527,7 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
         BOOL addedAudioOutput = [g_scStream addStreamOutput:g_scDelegate type:SCStreamOutputTypeAudio sampleHandlerQueue:outputQueue error:&outputError];
         if (addedAudioOutput) {
             NSLog(@"✅ Audio output attached to SCStream");
+            g_audioOutputAttached = YES;
         } else {
             NSLog(@"⚠️ Failed to attach audio output to SCStream (audio may be disabled): %@", outputError.localizedDescription);
         }
@@ -546,6 +581,7 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
     
     NSLog(@"🎬 Recording initialized successfully");
     return Napi::Boolean::New(env, true);
+    }
 }
 
 // NAPI Function: Stop Recording
@@ -560,6 +596,12 @@ Napi::Value StopRecording(const Napi::CallbackInfo& info) {
     return Napi::Boolean::New(env, true);
 }
 
+// NAPI Function: Get Recording Status (for JS compatibility)
+Napi::Value GetRecordingStatus(const Napi::CallbackInfo& info) {
+    Napi::Env env = info.Env();
+    return Napi::Boolean::New(env, g_isRecording);
+}
+
 // NAPI Function: Get Recording Status
 Napi::Value IsRecording(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
@@ -741,6 +783,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
     exports.Set("startRecording", Napi::Function::New(env, StartRecording));
     exports.Set("stopRecording", Napi::Function::New(env, StopRecording));
     exports.Set("isRecording", Napi::Function::New(env, IsRecording));
+    exports.Set("getRecordingStatus", Napi::Function::New(env, GetRecordingStatus));
     exports.Set("getDisplays", Napi::Function::New(env, GetDisplays));
     exports.Set("getWindows", Napi::Function::New(env, GetWindows));
     exports.Set("checkPermissions", Napi::Function::New(env, CheckPermissions));

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;