ilabs-flir 2.2.6 → 2.2.8

package/ios/Flir/src/FlirManager.swift

@@ -361,13 +361,19 @@ import ThermalSDK
         FlirLogger.log(.discovery, "Starting discovery...")
         
 #if FLIR_ENABLED
+        // Guard: prevent re-entry if already scanning
         if isScanning {
-            FlirLogger.log(.discovery, "Already scanning - skipping")
+            FlirLogger.log(.discovery, "⚠️ Discovery already in progress - ignoring duplicate startDiscovery call")
             return
         }
         
+        // Cancel any previous timeout and reset state
+        discoveryTimeoutWorkItem?.cancel()
+        discoveryTimeoutWorkItem = nil
+        
         isScanning = true
         discoveredDevices.removeAll()
+        identityMap.removeAll()
         
         if discovery == nil {
             discovery = FLIRDiscovery()
@@ -459,6 +465,16 @@ import ThermalSDK
         discoveryTimeoutWorkItem = nil
         discovery?.stop()
         isScanning = false
+        
+        // Emit final device list to RN so UI updates properly
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            self.delegate?.onDevicesFound(self.discoveredDevices)
+            if self.discoveredDevices.isEmpty {
+                self.emitStateChange("no_device_found")
+            }
+        }
+        
         FlirLogger.log(.discovery, "Discovery stopped")
 #endif
     }
@@ -469,19 +485,56 @@ import ThermalSDK
         FlirLogger.logConnectionAttempt(deviceId: deviceId)
         
 #if FLIR_ENABLED
+        // Guard: if already connected, disconnect first
+        if _isConnected {
+            FlirLogger.log(.connection, "⚠️ Already connected - disconnecting first...")
+            disconnect()
+            // Give disconnect a moment to complete
+            Thread.sleep(forTimeInterval: 0.5)
+        }
+        
         // Find the identity for this device
         guard let identity = findIdentity(for: deviceId) else {
             FlirLogger.logError(.connection, "Device not found in identity map: \(deviceId)")
-            delegate?.onError("Device not found: \(deviceId)")
+            DispatchQueue.main.async { [weak self] in
+                self?.emitStateChange("connection_failed")
+                self?.delegate?.onError("Device not found: \(deviceId)")
+            }
             return
         }
         
-        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+        // 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
+        }
+        
+        // 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 after \(timeoutSeconds) seconds - aborting")
+            
+            // Force cleanup
+            self.camera = nil
+            self._isConnected = false
+            self.connectedDeviceId = nil
+            
+            DispatchQueue.main.async {
+                self.emitStateChange("connection_failed")
+                self.delegate?.onError("Connection timeout - device not responding")
+            }
         }
 #else
         FlirLogger.logError(.connection, "FLIR SDK not available")
-        delegate?.onError("FLIR SDK not available")
+        DispatchQueue.main.async { [weak self] in
+            self?.delegate?.onError("FLIR SDK not available")
+        }
 #endif
     }
     
@@ -514,13 +567,26 @@ import ThermalSDK
             FlirLogger.log(.connection, "Generic/network camera - starting authentication...")
             let certName = getCertificateName()
             var status = FLIRAuthenticationStatus.pending
-            while status == .pending {
+            var attempts = 0
+            let maxAttempts = 10 // 10 seconds max
+            
+            while status == .pending && attempts < maxAttempts {
                 status = cam.authenticate(identity, trustedConnectionName: certName)
                 if status == .pending {
-                    FlirLogger.log(.connection, "Waiting for camera authentication approval...")
+                    FlirLogger.log(.connection, "Waiting for camera authentication approval... (\(attempts + 1)/\(maxAttempts))")
                     Thread.sleep(forTimeInterval: 1.0)
+                    attempts += 1
+                }
+            }
+            
+            if status == .pending {
+                FlirLogger.logError(.connection, "Authentication timeout after \(maxAttempts) seconds")
+                DispatchQueue.main.async { [weak self] in
+                    self?.delegate?.onError("Camera authentication timeout - device may require approval")
                 }
+                return
             }
+            
             FlirLogger.log(.connection, "Authentication status: \(status.rawValue)")
         }
         
@@ -532,6 +598,7 @@ import ThermalSDK
             FlirLogger.log(.connection, "✅ Paired successfully with: \(identity.deviceId())")
             
             // Step 2: Connect (no identity parameter - uses paired identity)
+            // Note: This can hang on some devices - ensure we have timeout in place
             FlirLogger.log(.connection, "Step 2: Connecting to device...")
             try cam.connect()
             FlirLogger.log(.connection, "✅ Connected successfully to: \(identity.deviceId())")
@@ -586,8 +653,14 @@ import ThermalSDK
         } catch {
             FlirLogger.logError(.connection, "Connection failed", error: error)
             _isConnected = false
+            _isStreaming = false
+            connectedDeviceId = nil
+            connectedDeviceName = nil
             camera = nil
+            
+            // CRITICAL: Always emit error state to RN so UI doesn't hang waiting
             DispatchQueue.main.async { [weak self] in
+                self?.emitStateChange("connection_failed")
                 self?.delegate?.onError("Connection failed: \(error.localizedDescription)")
             }
         }

package/package.json

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