ilabs-flir 2.1.1 → 2.1.3

package/ios/Flir/src/FlirManager.swift

@@ -310,23 +310,57 @@ import ThermalSDK
             discovery?.delegate = self
         }
         
-        // Start discovery on all available interfaces
-        let interfaces: FLIRCommunicationInterface = [
+        // Build interfaces based on available permissions
+        // Always include Lightning, USB, Wireless BLE, and Emulator
+        var interfaces: FLIRCommunicationInterface = [
             .lightning,
-            .network,
             .flirOneWireless,
             .emulator
         ]
+        
+        // Only add network discovery if NSLocalNetworkUsageDescription is present
+        // This prevents crashes/errors when user doesn't have iOS developer registration
+        // or hasn't declared network permission
+        if shouldEnableNetworkDiscovery() {
+            interfaces.insert(.network)
+            NSLog("[FlirManager] Network discovery enabled (NSLocalNetworkUsageDescription present)")
+        } else {
+            NSLog("[FlirManager] Network discovery disabled (no NSLocalNetworkUsageDescription)")
+        }
+        
         discovery?.start(interfaces)
         
         emitStateChange("discovering")
-        NSLog("[FlirManager] Discovery started on interfaces: Lightning, Network, FlirOneWireless, Emulator")
+        NSLog("[FlirManager] Discovery started on interfaces: Lightning, \(interfaces.contains(.network) ? "Network, " : "")FlirOneWireless, Emulator")
 #else
         NSLog("[FlirManager] FLIR SDK not available - discovery disabled")
         delegate?.onError("FLIR SDK not available")
 #endif
     }
     
+    /// Check if network discovery should be enabled based on Info.plist permission
+    private func shouldEnableNetworkDiscovery() -> Bool {
+        // Check for explicit override first
+        let key = "ilabsFlir.networkDiscoveryEnabled"
+        if UserDefaults.standard.object(forKey: key) != nil {
+            return UserDefaults.standard.bool(forKey: key)
+        }
+        
+        // Safe default: require Local Network usage description to be present
+        if let desc = Bundle.main.object(forInfoDictionaryKey: "NSLocalNetworkUsageDescription") as? String,
+           !desc.isEmpty {
+            return true
+        }
+        
+        return false
+    }
+    
+    /// Allow explicit override of network discovery (called from React Native)
+    @objc public func setNetworkDiscoveryEnabled(_ enabled: Bool) {
+        UserDefaults.standard.set(enabled, forKey: "ilabsFlir.networkDiscoveryEnabled")
+        NSLog("[FlirManager] Network discovery override set to: \(enabled)")
+    }
+    
     @objc public func stopDiscovery() {
         NSLog("[FlirManager] Stopping discovery...")
         
@@ -366,64 +400,72 @@ import ThermalSDK
     }
     
     private func performConnection(identity: FLIRIdentity) {
-        do {
-            if camera == nil {
-                camera = FLIRCamera()
-                camera?.delegate = self
+        // Use the proven connection pattern from FLIR SDK samples:
+        // FLIROneCameraSwift uses: pair(identity, code:) then connect()
+        
+        if camera == nil {
+            camera = FLIRCamera()
+            camera?.delegate = self
+        }
+        
+        guard let cam = camera else {
+            NSLog("[FlirManager] Failed to create FLIRCamera")
+            DispatchQueue.main.async { [weak self] in
+                self?.delegate?.onError("Failed to create camera instance")
             }
-            
-            // Handle authentication for generic cameras
-            if identity.cameraType() == .generic {
-                let certName = getCertificateName()
-                var status = FLIRAuthenticationStatus.pending
-                while status == .pending {
-                    status = camera!.authenticate(identity, trustedConnectionName: certName)
-                    if status == .pending {
-                        NSLog("[FlirManager] Waiting for camera authentication approval...")
-                        Thread.sleep(forTimeInterval: 1.0)
-                    }
+            return
+        }
+        
+        // Handle authentication for generic cameras (network cameras)
+        if identity.cameraType() == .generic {
+            let certName = getCertificateName()
+            var status = FLIRAuthenticationStatus.pending
+            while status == .pending {
+                status = cam.authenticate(identity, trustedConnectionName: certName)
+                if status == .pending {
+                    NSLog("[FlirManager] Waiting for camera authentication approval...")
+                    Thread.sleep(forTimeInterval: 1.0)
                 }
             }
+            NSLog("[FlirManager] 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
+            try cam.pair(identity, code: 0)
+            NSLog("[FlirManager] Paired with: \(identity.deviceId())")
             
-            // Connect (support multiple SDK signatures via ObjC runtime)
-            var connectedOK = false
-            if let cam = camera {
-                if cam.responds(to: Selector(("connect:error:"))) {
-                    // Call connect:identity error:nil (ignore NSError pointer for compatibility)
-                    _ = cam.perform(Selector(("connect:error:")), with: identity, with: nil)
-                    connectedOK = true
-                } else if cam.responds(to: Selector(("connect:"))) {
-                    _ = cam.perform(Selector(("connect:")), with: identity)
-                    connectedOK = true
-                } else {
-                    NSLog("[FlirManager] No compatible connect API on FLIRCamera")
-                }
-            }
-
-            if connectedOK {
-                connectedIdentity = identity
-                connectedDeviceId = identity.deviceId()
-                connectedDeviceName = identity.deviceId()
-                _isConnected = true
-                NSLog("[FlirManager] Connected to: \(identity.deviceId())")
-            } else {
-                NSLog("[FlirManager] Connection failed: no compatible connect API")
-                DispatchQueue.main.async { [weak self] in
-                    self?.delegate?.onError("Connection failed: unsupported SDK API")
-                }
-                return
+            // Step 2: Connect (no identity parameter - uses paired identity)
+            try cam.connect()
+            NSLog("[FlirManager] Connected to: \(identity.deviceId())")
+            
+            // Update state
+            connectedIdentity = identity
+            connectedDeviceId = identity.deviceId()
+            connectedDeviceName = identity.deviceId()
+            _isConnected = true
+            
+            // Get camera info if available
+            if let remoteControl = cam.getRemoteControl(),
+               let cameraInfo = try? remoteControl.getCameraInformation() {
+                NSLog("[FlirManager] Camera info: \(cameraInfo)")
             }
             
             // Get streams
-            if let streams = camera?.getStreams(), !streams.isEmpty {
+            if let streams = cam.getStreams(), !streams.isEmpty {
                 NSLog("[FlirManager] Found \(streams.count) streams")
                 
-                // Auto-start first thermal stream
-                if let firstStream = streams.first {
-                    startStreamInternal(firstStream)
+                // Find and start the first thermal stream (preferred) or any stream
+                let thermalStream = streams.first { $0.isThermal } ?? streams.first
+                if let streamToStart = thermalStream {
+                    startStreamInternal(streamToStart)
                 }
+            } else {
+                NSLog("[FlirManager] No streams available on camera")
             }
             
+            // Notify delegate on main thread
             DispatchQueue.main.async { [weak self] in
                 guard let self = self else { return }
                 let deviceInfo = FlirDeviceInfo(
@@ -437,7 +479,9 @@ import ThermalSDK
             }
             
         } catch {
-            NSLog("[FlirManager] Connection failed: \(error)")
+            NSLog("[FlirManager] Connection failed: \(error.localizedDescription)")
+            _isConnected = false
+            camera = nil
             DispatchQueue.main.async { [weak self] in
                 self?.delegate?.onError("Connection failed: \(error.localizedDescription)")
             }

package/ios/Flir/src/FlirModule.m

@@ -156,6 +156,39 @@ RCT_EXPORT_METHOD(removeListeners:(NSInteger)count) {
 
 #pragma mark - Discovery Methods
 
+// Network discovery on iOS 14+ requires Local Network privacy keys.
+// In USB/Bluetooth-only builds (or when the user denied permission), attempting
+// Bonjour discovery can fail noisily or crash depending on SDK internals.
+// We default to enabling network discovery only when the host app declares
+// NSLocalNetworkUsageDescription, and allow an explicit override via
+// setNetworkDiscoveryEnabled.
+- (BOOL)shouldEnableNetworkDiscovery {
+    // Explicit override if app sets it.
+    NSString *key = @"ilabsFlir.networkDiscoveryEnabled";
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    if ([defaults objectForKey:key] != nil) {
+        return [defaults boolForKey:key];
+    }
+
+    // Safe default: require Local Network usage description to be present.
+    id desc = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocalNetworkUsageDescription"];
+    if ([desc isKindOfClass:[NSString class]] && ((NSString *)desc).length > 0) {
+        return YES;
+    }
+    return NO;
+}
+
+RCT_EXPORT_METHOD(setNetworkDiscoveryEnabled:(BOOL)enabled
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+#if FLIR_SDK_AVAILABLE
+    [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"ilabsFlir.networkDiscoveryEnabled"];
+    resolve(@(YES));
+#else
+    resolve(@(YES));
+#endif
+}
+
 RCT_EXPORT_METHOD(startDiscovery:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
 #if FLIR_SDK_AVAILABLE
@@ -197,11 +230,18 @@ RCT_EXPORT_METHOD(startDiscovery:(RCTPromiseResolveBlock)resolve
             self.discovery.delegate = self;
         }
         
-        // Start discovery on all available interfaces
+        // Start discovery on allowed interfaces.
+        // Always include wired/BLE/emulator. Only include network when the app has
+        // Local Network usage description (or the app explicitly enabled it).
         FLIRCommunicationInterface interfaces = FLIRCommunicationInterfaceLightning |
-                                                 FLIRCommunicationInterfaceNetwork |
                                                  FLIRCommunicationInterfaceFlirOneWireless |
-                                                 FLIRCommunicationInterfaceEmulator;
+                                                 FLIRCommunicationInterfaceEmulator |
+                                                 FLIRCommunicationInterfaceUSB;
+        if ([self shouldEnableNetworkDiscovery]) {
+            interfaces |= FLIRCommunicationInterfaceNetwork;
+        } else {
+            RCTLogInfo(@"[FlirModule] Network discovery disabled (missing NSLocalNetworkUsageDescription or overridden)");
+        }
         [self.discovery start:interfaces];
         
         [self emitStateChange:@"discovering"];
@@ -323,7 +363,7 @@ RCT_EXPORT_METHOD(connectToDevice:(NSString *)deviceId
     
     NSError *error = nil;
     
-    // Handle authentication for generic cameras
+    // Handle authentication for generic cameras (network cameras)
     if ([identity cameraType] == FLIRCameraType_generic) {
         NSString *certName = [self getCertificateName];
         FLIRAuthenticationStatus status = pending;
@@ -334,9 +374,34 @@ RCT_EXPORT_METHOD(connectToDevice:(NSString *)deviceId
                 [NSThread sleepForTimeInterval:1.0];
             }
         }
+        RCTLogInfo(@"[FlirModule] Authentication status: %d", (int)status);
     }
     
-    BOOL connected = [self.camera connect:identity error:&error];
+    // Use the proven connection pattern from FLIR SDK samples:
+    // Step 1: Pair with identity (required for FLIR One devices)
+    @try {
+        [self.camera pair:identity code:0];
+        RCTLogInfo(@"[FlirModule] Paired with: %@", [identity deviceId]);
+    } @catch (NSException *exception) {
+        RCTLogError(@"[FlirModule] Pair failed: %@", exception.reason);
+        NSError *pairError = [NSError errorWithDomain:@"FlirModule" code:1001 userInfo:@{NSLocalizedDescriptionKey: exception.reason ?: @"Pair failed"}];
+        if (completion) completion(NO, pairError);
+        return;
+    }
+    
+    // Step 2: Connect (no identity parameter - uses paired identity)
+    BOOL connected = NO;
+    @try {
+        [self.camera connect:&error];
+        connected = (error == nil);
+        if (connected) {
+            RCTLogInfo(@"[FlirModule] Connected to: %@", [identity deviceId]);
+        }
+    } @catch (NSException *exception) {
+        RCTLogError(@"[FlirModule] Connect exception: %@", exception.reason);
+        error = [NSError errorWithDomain:@"FlirModule" code:1002 userInfo:@{NSLocalizedDescriptionKey: exception.reason ?: @"Connect failed"}];
+        connected = NO;
+    }
     
     if (connected) {
         self.connectedIdentity = identity;
@@ -352,14 +417,25 @@ RCT_EXPORT_METHOD(connectToDevice:(NSString *)deviceId
         self.connectedDeviceName = displayName;
         self.isConnected = YES;
         
-        RCTLogInfo(@"[FlirModule] Connected to: %@", [identity deviceId]);
+        RCTLogInfo(@"[FlirModule] Successfully connected to: %@", displayName);
         
-        // Get available streams
+        // Get available streams and prefer thermal stream
         NSArray<FLIRStream *> *streams = [self.camera getStreams];
         if (streams.count > 0) {
             RCTLogInfo(@"[FlirModule] Found %lu streams", (unsigned long)streams.count);
-            // Auto-start first stream
-            [self startStreamInternal:streams[0]];
+            
+            // Find thermal stream (preferred) or use first stream
+            FLIRStream *streamToStart = nil;
+            for (FLIRStream *stream in streams) {
+                if (stream.isThermal) {
+                    streamToStart = stream;
+                    break;
+                }
+            }
+            if (!streamToStart) {
+                streamToStart = streams[0];
+            }
+            [self startStreamInternal:streamToStart];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -369,10 +445,12 @@ RCT_EXPORT_METHOD(connectToDevice:(NSString *)deviceId
         if (completion) completion(YES, nil);
     } else {
         RCTLogError(@"[FlirModule] Connection failed: %@", error.localizedDescription);
+        self.camera = nil;
         if (completion) completion(NO, error);
     }
 }
 
+
 - (NSString *)getCertificateName {
     NSString *bundleID = [[NSBundle mainBundle] bundleIdentifier] ?: @"com.flir.app";
     NSString *key = [NSString stringWithFormat:@"%@-cert-name", bundleID];
@@ -821,8 +899,15 @@ RCT_EXPORT_METHOD(isPreferSdkRotation:(RCTPromiseResolveBlock)resolve
 }
 
 - (void)discoveryError:(NSString *)error netServiceError:(int)nsnetserviceserror on:(FLIRCommunicationInterface)iface {
+    // Network discovery failures are expected when Local Network permission is missing/denied.
+    // Do not surface those as fatal errors; keep USB/BLE discovery running.
+    if ((iface & FLIRCommunicationInterfaceNetwork) == FLIRCommunicationInterfaceNetwork) {
+        RCTLogInfo(@"[FlirModule] Network discovery error (suppressed): %@ (%d)", error, nsnetserviceserror);
+        return;
+    }
+
     RCTLogError(@"[FlirModule] Discovery error: %@ (%d)", error, nsnetserviceserror);
-    
+
     dispatch_async(dispatch_get_main_queue(), ^{
         [[FlirEventEmitter shared] sendDeviceEvent:@"FlirError" body:@{
             @"error": error ?: @"Unknown discovery error",

package/package.json

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