ilabs-flir 2.2.5 → 2.2.7

package/ios/Flir/src/FlirManager.swift

@@ -49,11 +49,7 @@ import ThermalSDK
 }
 
 /// Main FLIR Manager - Singleton that manages all FLIR camera operations
-#if FLIR_ENABLED
-@objc public class FlirManager: NSObject, FLIRDiscoveryEventDelegate, FLIRDataReceivedDelegate, FLIRStreamDelegate {
-#else
 @objc public class FlirManager: NSObject {
-#endif
     @objc public static let shared = FlirManager()
     
     // MARK: - Properties
@@ -78,9 +74,8 @@ import ThermalSDK
     // Client lifecycle for discovery/connection ownership
     private var activeClients: Set<String> = []
     private var shutdownWorkItem: DispatchWorkItem? = nil
-    // Discovery & stream watchdogs to detect silent failures/timeouts
+    // Discovery timeout to prevent infinite scanning
     private var discoveryTimeoutWorkItem: DispatchWorkItem? = nil
-    private var streamWatchdogWorkItem: DispatchWorkItem? = nil
     
     // Battery polling timer (like Android)
     private var batteryPollingTimer: Timer?
@@ -93,6 +88,7 @@ import ThermalSDK
     private var stream: FLIRStream?
     private var streamer: FLIRThermalStreamer?
     private var connectedIdentity: FLIRIdentity?
+    private var identityMap: [String: FLIRIdentity] = [:]
 #endif
     
     private override init() {
@@ -375,12 +371,7 @@ import ThermalSDK
         
         if discovery == nil {
             discovery = FLIRDiscovery()
-            // Assign delegate only if we conform to the required discovery delegate protocol
-            if let dd = self as? FLIRDiscoveryEventDelegate {
-                discovery?.delegate = dd
-            } else {
-                FlirLogger.log(.discovery, "Warning: FlirManager does not conform to FLIRDiscoveryEventDelegate at runtime; delegate not assigned")
-            }
+            discovery?.delegate = self
             FlirLogger.log(.discovery, "Created FLIRDiscovery instance")
         }
         
@@ -411,27 +402,26 @@ import ThermalSDK
         discovery?.start(interfaces)
         
         emitStateChange("discovering")
-
-        // Cancel any previous discovery timeout and schedule a new one so
-        // the UI doesn't remain stuck when discovery yields no devices.
+        
+        // Set timeout to prevent infinite scanning (matches Android's 8-second timeout)
         discoveryTimeoutWorkItem?.cancel()
-        let discWork = DispatchWorkItem { [weak self] in
-            guard let self = self else { return }
-            if self.discoveredDevices.isEmpty && self.isScanning {
-                FlirLogger.logError(.discovery, "Discovery timed out with no devices")
-                self.discovery?.stop()
-                self.isScanning = false
-                DispatchQueue.main.async {
-                    // Notify native listeners that discovery finished with no devices
-                    self.delegate?.onDevicesFound(self.discoveredDevices)
-                    // Emit a state change so JS can set noDeviceFound = true
+        let timeoutWork = DispatchWorkItem { [weak self] in
+            guard let self = self, self.isScanning else { return }
+            FlirLogger.log(.discovery, "⏱ Discovery timeout reached - stopping scan")
+            self.discovery?.stop()
+            self.isScanning = false
+            
+            // Emit final device list and state
+            DispatchQueue.main.async {
+                self.delegate?.onDevicesFound(self.discoveredDevices)
+                if self.discoveredDevices.isEmpty {
                     self.emitStateChange("no_device_found")
-                    self.delegate?.onError("Discovery timed out")
+                    self.delegate?.onError("No FLIR devices found")
                 }
             }
         }
-        discoveryTimeoutWorkItem = discWork
-        DispatchQueue.main.asyncAfter(deadline: .now() + 8.0, execute: discWork)
+        discoveryTimeoutWorkItem = timeoutWork
+        DispatchQueue.main.asyncAfter(deadline: .now() + 8.0, execute: timeoutWork)
 #else
         FlirLogger.logError(.discovery, "FLIR SDK not available - discovery disabled")
         delegate?.onError("FLIR SDK not available")
@@ -470,28 +460,38 @@ import ThermalSDK
         discovery?.stop()
         isScanning = false
         FlirLogger.log(.discovery, "Discovery stopped")
-    #endif
+#endif
+    }
+    
+    // MARK: - Connection
+    
+    @objc public func connectToDevice(_ deviceId: String) {
+        FlirLogger.logConnectionAttempt(deviceId: deviceId)
         
 #if FLIR_ENABLED
         // 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
         }
         
+        // Run connection on background thread with timeout monitoring
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
             self?.performConnection(identity: identity)
         }
 #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
     }
     
 #if FLIR_ENABLED
-    private var identityMap: [String: FLIRIdentity] = [:]
-    
     private func findIdentity(for deviceId: String) -> FLIRIdentity? {
         return identityMap[deviceId]
     }
@@ -515,26 +515,37 @@ import ThermalSDK
             return
         }
         
-        // Fail-fast authentication for generic/network cameras (prevent indefinite blocking)
+        // Handle authentication for generic cameras (network cameras)
         if identity.cameraType() == .generic {
             FlirLogger.log(.connection, "Generic/network camera - starting authentication...")
             let certName = getCertificateName()
-            var authStatus = FLIRAuthenticationStatus.pending
+            var status = FLIRAuthenticationStatus.pending
             var attempts = 0
-            let maxAttempts = 10
-            while authStatus == .pending && attempts < maxAttempts {
-                authStatus = cam.authenticate(identity, trustedConnectionName: certName)
-                if authStatus == .pending {
-                    FlirLogger.log(.connection, "Authentication pending... attempt \(attempts + 1)")
+            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... (\(attempts + 1)/\(maxAttempts))")
                     Thread.sleep(forTimeInterval: 1.0)
                     attempts += 1
                 }
             }
-            FlirLogger.log(.connection, "Authentication status: \(authStatus.rawValue)")
-            if authStatus == .pending {
-                FlirLogger.logError(.connection, "Authentication timed out for device: \(identity.deviceId())")
+            
+            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)")
+            
+            if status != .authenticated {
+                FlirLogger.logError(.connection, "Authentication failed with status: \(status.rawValue)")
                 DispatchQueue.main.async { [weak self] in
-                    self?.delegate?.onError("Authentication timed out")
+                    self?.delegate?.onError("Camera authentication failed")
                 }
                 return
             }
@@ -548,10 +559,10 @@ 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())")
-
             
             // Update state
             connectedIdentity = identity
@@ -603,8 +614,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)")
             }
         }
@@ -649,9 +666,10 @@ import ThermalSDK
         FlirLogger.log(.streaming, "Stopping stream...")
         
 #if FLIR_ENABLED
-        // Cancel any pending watchdog to avoid false positives after an explicit stop
-        streamWatchdogWorkItem?.cancel()
-        streamWatchdogWorkItem = nil
+        stream?.stop()
+        stream = nil
+        streamer = nil
+        _isStreaming = false
         emitStateChange("connected")
         FlirLogger.log(.streaming, "Stream stopped")
 #endif
@@ -676,28 +694,6 @@ import ThermalSDK
             _isStreaming = true
             emitStateChange("streaming")
             FlirLogger.log(.streaming, "✅ Stream started successfully (thermal=\(newStream.isThermal))")
-
-            // Schedule a short watchdog to detect silent no-frame scenarios.
-            streamWatchdogWorkItem?.cancel()
-            let watch = DispatchWorkItem { [weak self] in
-                guard let self = self else { return }
-                if self._latestImage == nil {
-                    FlirLogger.logError(.streaming, "No frames received within watchdog period after stream start")
-                    // Attempt a soft restart
-                    do {
-                        self.stream?.stop()
-                        try self.stream?.start()
-                        FlirLogger.log(.streaming, "Attempted stream restart")
-                    } catch {
-                        FlirLogger.logError(.streaming, "Stream restart failed", error: error)
-                        DispatchQueue.main.async {
-                            self.delegate?.onError("No frames received after starting stream")
-                        }
-                    }
-                }
-            }
-            streamWatchdogWorkItem = watch
-            DispatchQueue.main.asyncAfter(deadline: .now() + 3.0, execute: watch)
         } catch {
             FlirLogger.logError(.streaming, "Stream start failed", error: error)
             stream = nil
@@ -977,12 +973,15 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
     public func discoveryError(_ error: String, netServiceError nsnetserviceserror: Int32, on iface: FLIRCommunicationInterface) {
         FlirLogger.logError(.discovery, "Discovery error: \(error) (code=\(nsnetserviceserror)) on interface: \(iface)")
         
-        // Stop scanning and emit current device list so UI can recover
+        // Stop scanning and cancel timeout on error
+        discoveryTimeoutWorkItem?.cancel()
+        discoveryTimeoutWorkItem = nil
         discovery?.stop()
         isScanning = false
+        
+        // Emit current device list (could be empty) so RN/UI can recover
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
-            // Re-emit device list (could be empty) so JS/UI can recover
             self.delegate?.onDevicesFound(self.discoveredDevices)
             self.delegate?.onError("Discovery error: \(error)")
         }
@@ -991,23 +990,27 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
     public func discoveryFinished(_ iface: FLIRCommunicationInterface) {
         FlirLogger.log(.discovery, "Discovery finished on interface: \(iface)")
         isScanning = false
-        // Emit final list so consumers can update even if discovery ended quietly
+        
+        // Cancel timeout since discovery finished normally
+        discoveryTimeoutWorkItem?.cancel()
+        discoveryTimeoutWorkItem = nil
+        
+        // CRITICAL: Emit final device list so RN layer doesn't hang waiting for results
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
             self.delegate?.onDevicesFound(self.discoveredDevices)
-            // If no devices were found, emit an explicit no_device_found state
+            // If no devices were found, emit explicit state so UI can show "no devices"
             if self.discoveredDevices.isEmpty {
                 self.emitStateChange("no_device_found")
             }
         }
-        // Cancel the timeout if discovery finished normally
-        discoveryTimeoutWorkItem?.cancel()
-        discoveryTimeoutWorkItem = nil
     }
 }
+#endif
 
 // MARK: - FLIRDataReceivedDelegate
 
+#if FLIR_ENABLED
 extension FlirManager: FLIRDataReceivedDelegate {
     public func onDisconnected(_ camera: FLIRCamera, withError error: Error?) {
         FlirLogger.logError(.disconnect, "Camera disconnected callback", error: error)
@@ -1029,9 +1032,12 @@ extension FlirManager: FLIRDataReceivedDelegate {
         }
     }
 }
+#endif
 
 // MARK: - FLIRStreamDelegate
 
+#if FLIR_ENABLED
+
 extension FlirManager: FLIRStreamDelegate {
     public func onError(_ error: Error) {
         FlirLogger.logError(.streaming, "Stream error", error: error)

package/ios/Flir/src/FlirModule.m

@@ -155,14 +155,9 @@ RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
       if (manager) {
         NSArray *devices = ((NSArray * (*)(id, SEL))
                            objc_msgSend)(manager, sel_registerName("getDiscoveredDevices"));
-        // Re-emit even if the device list is empty so JS listeners can
-        // observe a 'no devices found' state and avoid hanging while waiting.
-        if (devices) {
-          NSLog(@"[FlirModule] addListener - re-emitting discovered devices (count=%lu)", (unsigned long)devices.count);
+        if (devices && devices.count > 0) {
+          NSLog(@"[FlirModule] addListener - re-emitting %lu discovered devices", (unsigned long)devices.count);
           [self onDevicesFound:devices];
-        } else {
-          NSLog(@"[FlirModule] addListener - no discovered devices available to re-emit");
-          [self onDevicesFound:@[]];
         }
       }
     });

package/package.json

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