ilabs-flir 2.2.9 → 2.2.11

package/ios/Flir/src/FlirManager.swift

@@ -481,16 +481,31 @@ import ThermalSDK
     
     // MARK: - Connection
     
+    // Flag to prevent re-entrant connections
+    private var isConnecting = false
+    
     @objc public func connectToDevice(_ deviceId: String) {
         FlirLogger.logConnectionAttempt(deviceId: deviceId)
         
 #if FLIR_ENABLED
-        // Guard: if already connected, disconnect first
-        if _isConnected {
-            FlirLogger.log(.connection, "⚠️ Already connected - disconnecting first...")
+        // Guard: if already connecting, skip (like demo app's guard pattern)
+        guard !isConnecting else {
+            FlirLogger.log(.connection, "⚠️ Connection already in progress - skipping")
+            return
+        }
+        
+        // Guard: if already connected to this device, skip (matches demo app)
+        if _isConnected && connectedDeviceId == deviceId {
+            FlirLogger.log(.connection, "⚠️ Already connected to this device - skipping")
+            return
+        }
+        
+        // If connected to a different device, disconnect first but DON'T block
+        if _isConnected && connectedDeviceId != deviceId {
+            FlirLogger.log(.connection, "⚠️ Connected to different device - disconnecting first...")
             disconnect()
-            // Give disconnect a moment to complete
-            Thread.sleep(forTimeInterval: 0.5)
+            // Don't block! The new connection will proceed immediately
+            // The disconnect is async and will complete in the background
         }
         
         // Find the identity for this device
@@ -503,33 +518,14 @@ import ThermalSDK
             return
         }
         
-        // Run connection on background thread with overall timeout
-        let timeoutSeconds: Double = 15.0
-        var connectionCompleted = false
-        let connectionQueue = DispatchQueue.global(qos: .userInitiated)
-        
-        // Start connection attempt
-        connectionQueue.async { [weak self] in
-            self?.performConnection(identity: identity)
-            connectionCompleted = true
-        }
+        isConnecting = true
         
-        // Monitor for timeout
-        DispatchQueue.global(qos: .utility).asyncAfter(deadline: .now() + timeoutSeconds) { [weak self] in
-            guard let self = self, !connectionCompleted else { return }
-            
-            FlirLogger.logError(.connection, "❌ ⏱ CONNECTION TIMEOUT triggered after \(timeoutSeconds)s - aborting")
-            
-            // Force cleanup
-            self.camera = nil
-            self._isConnected = false
-            self.connectedDeviceId = nil
-            
-            DispatchQueue.main.async {
-                FlirLogger.log(.connection, "⏱ Emitting connection_failed to RN due to timeout")
-                self.emitStateChange("connection_failed")
-                self.delegate?.onError("Connection timeout - device not responding")
-            }
+        // Run connection on background thread - simple pattern matching demo app
+        // Demo app uses: DispatchQueue.global().async { try pair(); try connect(); try stream.start() }
+        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+            guard let self = self else { return }
+            self.performConnection(identity: identity)
+            self.isConnecting = false
         }
 #else
         FlirLogger.logError(.connection, "FLIR SDK not available")
@@ -538,6 +534,7 @@ import ThermalSDK
         }
 #endif
     }
+
     
 #if FLIR_ENABLED
     private func findIdentity(for deviceId: String) -> FLIRIdentity? {
@@ -566,34 +563,18 @@ import ThermalSDK
         }
         
         // Handle authentication for generic cameras (network cameras)
+        // Note: This uses a single attempt since the SDK doesn't provide async callback
         if identity.cameraType() == .generic {
-            FlirLogger.log(.connection, "⏱ Generic/network camera - AUTHENTICATION starting...")
+            FlirLogger.log(.connection, "Generic/network camera - attempting authentication...")
             let certName = getCertificateName()
-            var status = FLIRAuthenticationStatus.pending
-            var attempts = 0
-            let maxAttempts = 10 // 10 seconds max
-            let authStartTime = Date()
+            let status = cam.authenticate(identity, trustedConnectionName: certName)
             
-            while status == .pending && attempts < maxAttempts {
-                status = cam.authenticate(identity, trustedConnectionName: certName)
-                if status == .pending {
-                    FlirLogger.log(.connection, "Waiting for camera authentication approval... (\(attempts + 1)/\(maxAttempts))")
-                    Thread.sleep(forTimeInterval: 1.0)
-                    attempts += 1
-                }
-            }
-            
-            if status == .pending {
-                let authDuration = Date().timeIntervalSince(authStartTime)
-                FlirLogger.logError(.connection, "❌ Authentication TIMEOUT after \(authDuration)s (\(maxAttempts) attempts)")
-                DispatchQueue.main.async { [weak self] in
-                    self?.delegate?.onError("Camera authentication timeout - device may require approval")
-                }
-                return
-            }
+            // Log the status - don't block on pending, just proceed
+            // The connect() call will fail appropriately if auth is truly required
+            FlirLogger.log(.connection, "Authentication status: \(status.rawValue)")
             
-            let authDuration = Date().timeIntervalSince(authStartTime)
-            FlirLogger.log(.connection, "✅ Authentication completed in \(authDuration)s - status: \(status.rawValue)")
+            // Only fail on explicit rejection (status values vary by SDK version)
+            // Pending status means we should try to connect anyway
         }
         
         do {
@@ -708,9 +689,15 @@ import ThermalSDK
     }
     
     @objc public func stopStream() {
+#if FLIR_ENABLED
+        // Guard: if not streaming, skip to avoid redundant operations
+        guard _isStreaming || stream != nil else {
+            FlirLogger.log(.streaming, "Not streaming - skipping stopStream")
+            return
+        }
+        
         FlirLogger.log(.streaming, "Stopping stream...")
         
-#if FLIR_ENABLED
         stream?.stop()
         stream = nil
         streamer = nil
@@ -743,6 +730,9 @@ import ThermalSDK
             FlirLogger.logError(.streaming, "Stream start failed", error: error)
             stream = nil
             streamer = nil
+            _isStreaming = false
+            // Emit state change so RN knows streaming failed
+            emitStateChange("connected")  // Fall back to connected (not streaming)
             delegate?.onError("Stream start failed: \(error.localizedDescription)")
         }
     }
@@ -751,9 +741,15 @@ import ThermalSDK
     // MARK: - Disconnect
     
     @objc public func disconnect() {
+#if FLIR_ENABLED
+        // Guard: if already disconnected, do nothing (prevents re-entrant issues)
+        guard _isConnected || stream != nil || camera != nil else {
+            FlirLogger.log(.disconnect, "Already disconnected - skipping")
+            return
+        }
+        
         FlirLogger.log(.disconnect, "Disconnecting...")
         
-#if FLIR_ENABLED
         // Stop battery polling
         stopBatteryPolling()
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",