ilabs-flir 2.2.7 → 2.2.9

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()
@@ -407,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
             
@@ -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,6 +485,14 @@ 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)")
@@ -479,9 +503,33 @@ import ThermalSDK
             return
         }
         
-        // Run connection on background thread with timeout monitoring
-        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 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")
+            }
         }
 #else
         FlirLogger.logError(.connection, "FLIR SDK not available")
@@ -499,6 +547,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 {
@@ -517,11 +567,12 @@ import ThermalSDK
         
         // Handle authentication for generic cameras (network cameras)
         if identity.cameraType() == .generic {
-            FlirLogger.log(.connection, "Generic/network camera - starting authentication...")
+            FlirLogger.log(.connection, "⏱ Generic/network camera - AUTHENTICATION starting...")
             let certName = getCertificateName()
             var status = FLIRAuthenticationStatus.pending
             var attempts = 0
             let maxAttempts = 10 // 10 seconds max
+            let authStartTime = Date()
             
             while status == .pending && attempts < maxAttempts {
                 status = cam.authenticate(identity, trustedConnectionName: certName)
@@ -533,36 +584,30 @@ import ThermalSDK
             }
             
             if status == .pending {
-                FlirLogger.logError(.connection, "Authentication timeout after \(maxAttempts) seconds")
+                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
             }
             
-            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("Camera authentication failed")
-                }
-                return
-            }
+            let authDuration = Date().timeIntervalSince(authStartTime)
+            FlirLogger.log(.connection, "✅ Authentication completed in \(authDuration)s - 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
@@ -848,6 +893,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(
@@ -856,6 +907,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.7",
+  "version": "2.2.9",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",