ilabs-flir 2.2.3 → 2.2.5

package/ios/Flir/src/FlirManager.swift

@@ -49,7 +49,11 @@ 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
@@ -74,6 +78,9 @@ 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
+    private var discoveryTimeoutWorkItem: DispatchWorkItem? = nil
+    private var streamWatchdogWorkItem: DispatchWorkItem? = nil
     
     // Battery polling timer (like Android)
     private var batteryPollingTimer: Timer?
@@ -368,7 +375,12 @@ import ThermalSDK
         
         if discovery == nil {
             discovery = FLIRDiscovery()
-            discovery?.delegate = self
+            // 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")
+            }
             FlirLogger.log(.discovery, "Created FLIRDiscovery instance")
         }
         
@@ -399,6 +411,27 @@ 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.
+        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
+                    self.emitStateChange("no_device_found")
+                    self.delegate?.onError("Discovery timed out")
+                }
+            }
+        }
+        discoveryTimeoutWorkItem = discWork
+        DispatchQueue.main.asyncAfter(deadline: .now() + 8.0, execute: discWork)
 #else
         FlirLogger.logError(.discovery, "FLIR SDK not available - discovery disabled")
         delegate?.onError("FLIR SDK not available")
@@ -432,16 +465,12 @@ import ThermalSDK
         FlirLogger.log(.discovery, "Stopping discovery...")
         
 #if FLIR_ENABLED
+        discoveryTimeoutWorkItem?.cancel()
+        discoveryTimeoutWorkItem = nil
         discovery?.stop()
         isScanning = false
         FlirLogger.log(.discovery, "Discovery stopped")
-#endif
-    }
-    
-    // MARK: - Connection
-    
-    @objc public func connectToDevice(_ deviceId: String) {
-        FlirLogger.logConnectionAttempt(deviceId: deviceId)
+    #endif
         
 #if FLIR_ENABLED
         // Find the identity for this device
@@ -486,19 +515,29 @@ import ThermalSDK
             return
         }
         
-        // Handle authentication for generic cameras (network cameras)
+        // Fail-fast authentication for generic/network cameras (prevent indefinite blocking)
         if identity.cameraType() == .generic {
             FlirLogger.log(.connection, "Generic/network camera - starting authentication...")
             let certName = getCertificateName()
-            var status = FLIRAuthenticationStatus.pending
-            while status == .pending {
-                status = cam.authenticate(identity, trustedConnectionName: certName)
-                if status == .pending {
-                    FlirLogger.log(.connection, "Waiting for camera authentication approval...")
+            var authStatus = 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)")
                     Thread.sleep(forTimeInterval: 1.0)
+                    attempts += 1
                 }
             }
-            FlirLogger.log(.connection, "Authentication status: \(status.rawValue)")
+            FlirLogger.log(.connection, "Authentication status: \(authStatus.rawValue)")
+            if authStatus == .pending {
+                FlirLogger.logError(.connection, "Authentication timed out for device: \(identity.deviceId())")
+                DispatchQueue.main.async { [weak self] in
+                    self?.delegate?.onError("Authentication timed out")
+                }
+                return
+            }
         }
         
         do {
@@ -512,6 +551,7 @@ import ThermalSDK
             FlirLogger.log(.connection, "Step 2: Connecting to device...")
             try cam.connect()
             FlirLogger.log(.connection, "✅ Connected successfully to: \(identity.deviceId())")
+
             
             // Update state
             connectedIdentity = identity
@@ -609,10 +649,9 @@ import ThermalSDK
         FlirLogger.log(.streaming, "Stopping stream...")
         
 #if FLIR_ENABLED
-        stream?.stop()
-        stream = nil
-        streamer = nil
-        _isStreaming = false
+        // Cancel any pending watchdog to avoid false positives after an explicit stop
+        streamWatchdogWorkItem?.cancel()
+        streamWatchdogWorkItem = nil
         emitStateChange("connected")
         FlirLogger.log(.streaming, "Stream stopped")
 #endif
@@ -637,6 +676,28 @@ 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
@@ -916,14 +977,32 @@ 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
+        discovery?.stop()
+        isScanning = false
         DispatchQueue.main.async { [weak self] in
-            self?.delegate?.onError("Discovery error: \(error)")
+            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)")
         }
     }
     
     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
+        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 self.discoveredDevices.isEmpty {
+                self.emitStateChange("no_device_found")
+            }
+        }
+        // Cancel the timeout if discovery finished normally
+        discoveryTimeoutWorkItem?.cancel()
+        discoveryTimeoutWorkItem = nil
     }
 }
 

package/ios/Flir/src/FlirModule.m

@@ -155,9 +155,14 @@ RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
       if (manager) {
         NSArray *devices = ((NSArray * (*)(id, SEL))
                            objc_msgSend)(manager, sel_registerName("getDiscoveredDevices"));
-        if (devices && devices.count > 0) {
-          NSLog(@"[FlirModule] addListener - re-emitting %lu discovered devices", (unsigned long)devices.count);
+        // 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);
           [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.3",
+  "version": "2.2.5",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",