ilabs-flir 2.1.3 → 2.1.32

package/ios/Flir/src/FlirManager.swift

@@ -453,9 +453,10 @@ import ThermalSDK
             }
             
             // Get streams
-            if let streams = cam.getStreams(), !streams.isEmpty {
+            let streams = cam.getStreams()
+            if !streams.isEmpty {
                 NSLog("[FlirManager] Found \(streams.count) streams")
-                
+
                 // Find and start the first thermal stream (preferred) or any stream
                 let thermalStream = streams.first { $0.isThermal } ?? streams.first
                 if let streamToStart = thermalStream {

package/ios/Flir/src/FlirModule.m

@@ -99,6 +99,11 @@ static BOOL flir_isPreferSdkRotation(void) {
 @property (nonatomic, copy) NSString *connectedDeviceId;
 @property (nonatomic, copy) NSString *connectedDeviceName;
 @property (nonatomic, assign) double lastTemperature;
+
+- (void)emitStateChange:(NSString *)state;
+- (void)emitDeviceConnected;
+- (void)stopStreamInternal;
+
 @end
 
 @implementation FlirModule
@@ -377,26 +382,31 @@ RCT_EXPORT_METHOD(connectToDevice:(NSString *)deviceId
         RCTLogInfo(@"[FlirModule] Authentication status: %d", (int)status);
     }
     
-    // Use the proven connection pattern from FLIR SDK samples:
-    // Step 1: Pair with identity (required for FLIR One devices)
+    // Step 1: Pair with camera (required for FLIR One devices)
     @try {
-        [self.camera pair:identity code:0];
+        if (![self.camera pair:identity code:0 error:&error]) {
+            RCTLogError(@"[FlirModule] Pair failed: %@", error.localizedDescription);
+            if (completion) completion(NO, error);
+            return;
+        }
         RCTLogInfo(@"[FlirModule] Paired with: %@", [identity deviceId]);
     } @catch (NSException *exception) {
-        RCTLogError(@"[FlirModule] Pair failed: %@", exception.reason);
+        RCTLogError(@"[FlirModule] Pair exception: %@", 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)
+    // Step 2: Connect to camera
     BOOL connected = NO;
     @try {
-        [self.camera connect:&error];
-        connected = (error == nil);
-        if (connected) {
-            RCTLogInfo(@"[FlirModule] Connected to: %@", [identity deviceId]);
+        if (![self.camera connect:&error]) {
+            RCTLogError(@"[FlirModule] Connect failed: %@", error.localizedDescription);
+            if (completion) completion(NO, error);
+            return;
         }
+        connected = YES;
+        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"}];
@@ -422,7 +432,7 @@ RCT_EXPORT_METHOD(connectToDevice:(NSString *)deviceId
         // 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);
+            RCTLogInfo(@"[FlirModule] Found %lu stream(s)", (unsigned long)streams.count);
             
             // Find thermal stream (preferred) or use first stream
             FLIRStream *streamToStart = nil;
@@ -530,16 +540,26 @@ RCT_EXPORT_METHOD(stopFlir:(RCTPromiseResolveBlock)resolve
     newStream.delegate = self;
     
     NSError *error = nil;
-    if ([newStream start:&error]) {
-        self.isStreaming = YES;
-        [self emitStateChange:@"streaming"];
-        RCTLogInfo(@"[FlirModule] Stream started (thermal: %@)", newStream.isThermal ? @"YES" : @"NO");
-    } else {
-        RCTLogError(@"[FlirModule] Stream start failed: %@", error.localizedDescription);
+    // Use try-catch pattern from samples
+    @try {
+        if (![newStream start:&error]) {
+            RCTLogError(@"[FlirModule] Stream start failed: %@", error.localizedDescription);
+            self.stream = nil;
+            self.streamer = nil;
+            [[FlirEventEmitter shared] sendDeviceEvent:@"FlirError" body:@{@"error": error.localizedDescription ?: @"Stream start failed"}];
+            return;
+        }
+    } @catch (NSException *exception) {
+        RCTLogError(@"[FlirModule] Stream start exception: %@", exception.reason);
         self.stream = nil;
         self.streamer = nil;
-        [[FlirEventEmitter shared] sendDeviceEvent:@"FlirError" body:@{@"error": error.localizedDescription ?: @"Stream start failed"}];
+        [[FlirEventEmitter shared] sendDeviceEvent:@"FlirError" body:@{@"error": exception.reason ?: @"Stream start exception"}];
+        return;
     }
+    
+    self.isStreaming = YES;
+    [self emitStateChange:@"streaming"];
+    RCTLogInfo(@"[FlirModule] Stream started (thermal: %@)", newStream.isThermal ? @"YES" : @"NO");
 }
 
 - (void)stopStreamInternal {

package/package.json

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