node-mac-recorder 2.4.11 → 2.4.13

package/window-selector.js

@@ -1,27 +1,19 @@
 const { EventEmitter } = require("events");
 const path = require("path");
 
-// Native modülü yükle (arm64 prebuild öncelikli)
+// Native modülü yükle
 let nativeBinding;
 try {
-	if (process.platform === "darwin" && process.arch === "arm64") {
-		nativeBinding = require("./prebuilds/darwin-arm64/node.napi.node");
-	} else {
-		nativeBinding = require("./build/Release/mac_recorder.node");
-	}
+	nativeBinding = require("./build/Release/mac_recorder.node");
 } catch (error) {
 	try {
-		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
-			);
-		}
+		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
+		);
 	}
 }
 
@@ -32,15 +24,6 @@ class WindowSelector extends EventEmitter {
 		this.selectionTimer = null;
 		this.selectedWindow = null;
 		this.lastStatus = null;
-		
-		// Electron environment detection
-		this.isElectron = !!(process.versions && process.versions.electron) || 
-		                 !!(process.env.ELECTRON_VERSION) ||
-		                 !!(process.env.ELECTRON_RUN_AS_NODE);
-		
-		if (this.isElectron) {
-			console.log("🔍 WindowSelector: Detected Electron environment - using safe mode");
-		}
 	}
 
 	/**
@@ -57,11 +40,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();
@@ -89,7 +72,7 @@ class WindowSelector extends EventEmitter {
 		return new Promise((resolve, reject) => {
 			try {
 				const success = nativeBinding.stopWindowSelection();
-
+				
 				// Timer'ı durdur
 				if (this.selectionTimer) {
 					clearInterval(this.selectionTimer);
@@ -115,14 +98,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);
@@ -138,20 +121,17 @@ 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);
@@ -174,59 +154,6 @@ class WindowSelector extends EventEmitter {
 		return this.selectedWindow;
 	}
 
-	/**
-	 * Electron'da kullanmak için mevcut pencereleri döndürür
-	 * @returns {Array} Available windows for selection
-	 */
-	async getAvailableWindows() {
-		if (this.isElectron) {
-			try {
-				// Start selection to populate window list (safe mode)
-				const success = nativeBinding.startWindowSelection();
-				if (success) {
-					// Get the populated window list
-					const status = nativeBinding.getWindowSelectionStatus();
-					
-					// Stop selection immediately
-					nativeBinding.stopWindowSelection();
-					
-					// Return windows from native status
-					// In Electron safe mode, these will be available without overlay
-					const MacRecorder = require("./index.js");
-					const recorder = new MacRecorder();
-					return await recorder.getWindows();
-				}
-			} catch (error) {
-				console.error("Error getting available windows in Electron:", error.message);
-			}
-		}
-		
-		// Fallback to regular MacRecorder method
-		try {
-			const MacRecorder = require("./index.js");
-			const recorder = new MacRecorder();
-			return await recorder.getWindows();
-		} catch (error) {
-			console.error("Error getting windows:", error.message);
-			return [];
-		}
-	}
-
-	/**
-	 * Electron'da pencere seçmek için - overlay olmadan
-	 * @param {Object} windowInfo - Selected window from getAvailableWindows()
-	 */
-	selectWindowById(windowInfo) {
-		if (!windowInfo || !windowInfo.id) {
-			throw new Error("Valid window info required");
-		}
-		
-		this.selectedWindow = windowInfo;
-		this.emit('windowSelected', windowInfo);
-		
-		return windowInfo;
-	}
-
 	/**
 	 * Seçim durumunu döndürür
 	 */
@@ -237,14 +164,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
 			};
 		}
 	}
@@ -278,6 +205,7 @@ class WindowSelector extends EventEmitter {
 
 				// Seçimi başlat
 				await this.startSelection();
+
 			} catch (error) {
 				this.removeAllListeners("windowSelected");
 				this.removeAllListeners("error");
@@ -314,9 +242,7 @@ 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}`);
@@ -450,14 +376,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;
@@ -468,19 +394,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);
 			});
@@ -504,9 +430,7 @@ 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}`);
 		}
 	}
 
@@ -519,9 +443,7 @@ 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}`);
 		}
 	}
 
@@ -538,10 +460,10 @@ class WindowSelector extends EventEmitter {
 			return {
 				screenRecording: false,
 				accessibility: false,
-				error: error.message,
+				error: error.message
 			};
 		}
 	}
 }
 
-module.exports = WindowSelector;
+module.exports = WindowSelector;