ilabs-flir 2.2.8 → 2.2.10

package/ios/Flir/src/FlirManager.swift

@@ -413,7 +413,7 @@ import ThermalSDK
         discoveryTimeoutWorkItem?.cancel()
         let timeoutWork = DispatchWorkItem { [weak self] in
             guard let self = self, self.isScanning else { return }
-            FlirLogger.log(.discovery, "⏱ Discovery timeout reached - stopping scan")
+            FlirLogger.log(.discovery, "❌ ⏱ DISCOVERY TIMEOUT triggered (8s) - stopping scan")
             self.discovery?.stop()
             self.isScanning = false
             
@@ -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,32 +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 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")
-            }
+        // 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")
@@ -537,6 +534,7 @@ import ThermalSDK
         }
 #endif
     }
+
     
 #if FLIR_ENABLED
     private func findIdentity(for deviceId: String) -> FLIRIdentity? {
@@ -546,6 +544,8 @@ import ThermalSDK
     private func performConnection(identity: FLIRIdentity) {
         // Use the proven connection pattern from FLIR SDK samples:
         // FLIROneCameraSwift uses: pair(identity, code:) then connect()
+        let startTime = Date()
+        FlirLogger.log(.connection, "⏱ performConnection STARTED for: \(identity.deviceId())")
         FlirLogger.log(.connection, "performConnection starting for: \(identity.deviceId())")
         
         if camera == nil {
@@ -563,45 +563,42 @@ import ThermalSDK
         }
         
         // Handle authentication for generic cameras (network cameras)
+        // Note: This uses a polling approach since the SDK doesn't provide async callback
+        // Reduced polling frequency to minimize blocking
         if identity.cameraType() == .generic {
-            FlirLogger.log(.connection, "Generic/network camera - starting authentication...")
+            FlirLogger.log(.connection, "Generic/network camera - attempting authentication...")
             let certName = getCertificateName()
-            var status = FLIRAuthenticationStatus.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... (\(attempts + 1)/\(maxAttempts))")
-                    Thread.sleep(forTimeInterval: 1.0)
-                    attempts += 1
-                }
-            }
+            let status = cam.authenticate(identity, trustedConnectionName: certName)
             
             if status == .pending {
-                FlirLogger.logError(.connection, "Authentication timeout after \(maxAttempts) seconds")
+                // For pending auth, just log and continue - user needs to approve on camera
+                FlirLogger.log(.connection, "Authentication pending - camera may require approval")
+                // Don't block here - proceed with connection attempt
+                // If auth is required, the connect() call will fail appropriately
+            } else if status == .notUsed || status == .trusted {
+                FlirLogger.log(.connection, "✅ Authentication status: \(status.rawValue)")
+            } else {
+                FlirLogger.logError(.connection, "Authentication failed with status: \(status.rawValue)")
                 DispatchQueue.main.async { [weak self] in
-                    self?.delegate?.onError("Camera authentication timeout - device may require approval")
+                    self?.emitStateChange("connection_failed")
+                    self?.delegate?.onError("Camera authentication failed")
                 }
                 return
             }
-            
-            FlirLogger.log(.connection, "Authentication status: \(status.rawValue)")
         }
         
         do {
             // Step 1: Pair with identity (required for FLIR One devices)
             // The code parameter is for BLE pairing, 0 for direct connection
-            FlirLogger.log(.connection, "Step 1: Pairing with device...")
+            FlirLogger.log(.connection, "⏱ Step 1: PAIRING starting... [time since start: \(Date().timeIntervalSince(startTime))s]")
             try cam.pair(identity, code: 0)
-            FlirLogger.log(.connection, "✅ Paired successfully with: \(identity.deviceId())")
+            FlirLogger.log(.connection, "✅ Step 1: PAIRED successfully [time: \(Date().timeIntervalSince(startTime))s]")
             
             // 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...")
+            FlirLogger.log(.connection, "⏱ Step 2: CONNECTING starting... [time: \(Date().timeIntervalSince(startTime))s]")
             try cam.connect()
-            FlirLogger.log(.connection, "✅ Connected successfully to: \(identity.deviceId())")
+            FlirLogger.log(.connection, "✅ Step 2: CONNECTED successfully [time: \(Date().timeIntervalSince(startTime))s]")
             
             // Update state
             connectedIdentity = identity
@@ -702,9 +699,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
@@ -737,6 +740,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)")
         }
     }
@@ -745,9 +751,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()
         
@@ -887,6 +899,12 @@ import ThermalSDK
     // MARK: - State Emission
     
     private func emitStateChange(_ state: String) {
+        let timestamp = Date()
+        let formatter = DateFormatter()
+        formatter.dateFormat = "HH:mm:ss.SSS"
+        let timeStr = formatter.string(from: timestamp)
+        FlirLogger.log(.connection, "⏱ [\(timeStr)] EMITTING STATE to RN: '\(state)'")
+        
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
             self.delegate?.onStateChanged(
@@ -895,6 +913,7 @@ import ThermalSDK
                 isStreaming: self._isStreaming,
                 isEmulator: self.isEmulator
             )
+            FlirLogger.log(.connection, "✅ [\(timeStr)] State '\(state)' emitted to RN")
         }
     }
     

package/ios/Flir/src/FlirModule.m

@@ -204,12 +204,15 @@ RCT_EXPORT_METHOD(setNetworkDiscoveryEnabled : (BOOL)enabled resolver : (
 
 RCT_EXPORT_METHOD(startDiscovery : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  NSLog(@"[FlirModule] [%@] ⏱ RN->startDiscovery called", [NSDate date]);
   dispatch_async(dispatch_get_main_queue(), ^{
     id manager = flir_manager_shared();
     if (manager &&
         [manager respondsToSelector:sel_registerName("startDiscovery")]) {
+      NSLog(@"[FlirModule] [%@] ⏱ Calling FlirManager.startDiscovery", [NSDate date]);
       ((void (*)(id, SEL))objc_msgSend)(manager,
                                         sel_registerName("startDiscovery"));
+      NSLog(@"[FlirModule] [%@] ⏱ FlirManager.startDiscovery returned", [NSDate date]);
     }
     resolve(@(YES));
   });
@@ -250,13 +253,12 @@ RCT_EXPORT_METHOD(getDiscoveredDevices : (RCTPromiseResolveBlock)
 
 RCT_EXPORT_METHOD(connectToDevice : (NSString *)deviceId resolver : (
     RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  NSLog(@"[FlirModule] [%@] ⏱ RN->connectToDevice called for: %@", [NSDate date], deviceId);
   dispatch_async(dispatch_get_main_queue(), ^{
-    NSLog(@"[FlirModule] connectToDevice called for: %@", deviceId);
-
     id manager = flir_manager_shared();
     if (manager &&
         [manager respondsToSelector:sel_registerName("connectToDevice:")]) {
-      NSLog(@"[FlirModule] Calling FlirManager.connectToDevice");
+      NSLog(@"[FlirModule] [%@] ⏱ Calling FlirManager.connectToDevice", [NSDate date]);
       
       // Store callbacks for event-driven updates (but don't block on them)
       self.connectResolve = nil;  // Don't use promise for blocking
@@ -266,10 +268,12 @@ RCT_EXPORT_METHOD(connectToDevice : (NSString *)deviceId resolver : (
       ((void (*)(id, SEL, id))objc_msgSend)(
           manager, sel_registerName("connectToDevice:"), deviceId);
       
+      NSLog(@"[FlirModule] [%@] ⏱ FlirManager.connectToDevice returned (async started)", [NSDate date]);
+      
       // Resolve immediately - connection status will come via events
       resolve(@(YES));
     } else {
-      NSLog(@"[FlirModule] FlirManager not found");
+      NSLog(@"[FlirModule] [%@] ❌ FlirManager not found", [NSDate date]);
       reject(@"ERR_NO_MANAGER", @"FlirManager not found", nil);
     }
   });

package/package.json

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