ilabs-flir 2.1.401 → 2.2.1

package/ios/Flir/src/FlirManager.swift

@@ -509,6 +509,8 @@ import ThermalSDK
             connectedDeviceName = identity.deviceId()
             _isConnected = true
             
+            FlirLogger.log(.connection, "[Flir-BRIDGE-CONNECTION] Connected to: \(identity.deviceId())")
+            
             // Get camera info if available
             if let remoteControl = cam.getRemoteControl(),
                let cameraInfo = try? remoteControl.getCameraInformation() {
@@ -542,8 +544,10 @@ import ThermalSDK
                     communicationType: self.communicationInterfaceName(identity.communicationInterface()),
                     isEmulator: identity.communicationInterface() == .emulator
                 )
-                self.delegate?.onDeviceConnected(deviceInfo)
+                
+                // Emit connected state (matches Android emitDeviceState("connected"))
                 self.emitStateChange("connected")
+                self.delegate?.onDeviceConnected(deviceInfo)
             }
             
         } catch {

package/ios/Flir/src/FlirModule.m

@@ -97,7 +97,9 @@ static BOOL flir_isPreferSdkRotation(void) {
 @property(nonatomic, copy) RCTPromiseRejectBlock connectReject;
 @end
 
-@implementation FlirModule
+@implementation FlirModule {
+  NSInteger _listenerCount;
+}
 
 RCT_EXPORT_MODULE(FlirModule);
 
@@ -107,6 +109,7 @@ RCT_EXPORT_MODULE(FlirModule);
 
 - (instancetype)init {
   if (self = [super init]) {
+    _listenerCount = 0;
     // Wire up delegate
     id manager = flir_manager_shared();
     if (manager) {
@@ -127,11 +130,30 @@ RCT_EXPORT_MODULE(FlirModule);
 }
 
 RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
-  // Required for RCTEventEmitter
+  _listenerCount++;
+  NSLog(@"[FlirModule] addListener: %@ (count: %ld)", eventName, (long)_listenerCount);
+  
+  // When FlirDevicesFound listener is added, immediately emit current device list
+  // This handles the case where discovery happened before React Native mounted
+  if ([eventName isEqualToString:@"FlirDevicesFound"]) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      id manager = flir_manager_shared();
+      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);
+          [self onDevicesFound:devices];
+        }
+      }
+    });
+  }
 }
 
 RCT_EXPORT_METHOD(removeListeners : (NSInteger)count) {
-  // Required for RCTEventEmitter
+  _listenerCount -= count;
+  if (_listenerCount < 0) _listenerCount = 0;
+  NSLog(@"[FlirModule] removeListeners: %ld (remaining: %ld)", (long)count, (long)_listenerCount);
 }
 
 + (void)emitBatteryUpdateWithLevel:(NSInteger)level charging:(BOOL)charging {
@@ -410,9 +432,15 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
     }
   }
   
-  NSLog(@"[FlirModule] onDevicesFound - emitting FlirDevicesFound with %lu devices", (unsigned long)arr.count);
-  [self sendEventWithName:@"FlirDevicesFound" 
-                     body:@{@"devices" : arr, @"count" : @(arr.count)}];
+  NSLog(@"[FlirModule] onDevicesFound - %lu devices, listenerCount: %ld", (unsigned long)arr.count, (long)_listenerCount);
+  
+  if (_listenerCount > 0) {
+    NSLog(@"[FlirModule] emitting FlirDevicesFound event");
+    [self sendEventWithName:@"FlirDevicesFound" 
+                       body:@{@"devices" : arr, @"count" : @(arr.count)}];
+  } else {
+    NSLog(@"[FlirModule] ⚠️ No listeners registered yet - devices will be re-emitted when listener is added");
+  }
 }
 
 - (void)onDeviceConnected:(id)device {
@@ -429,8 +457,14 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
         addEntriesFromDictionary:((NSDictionary * (*)(id, SEL)) objc_msgSend)(
                                      device, sel_registerName("toDictionary"))];
   }
+  
+  // Add state info to match Android's FlirDeviceConnected event format
+  [body setObject:@"connected" forKey:@"state"];
+  [body setObject:@(YES) forKey:@"isConnected"];
+  [body setObject:@(NO) forKey:@"isStreaming"];  // streaming starts after connection
+  // isEmulator info should be in device dictionary already from toDictionary
 
-  NSLog(@"[FlirModule] onDeviceConnected - emitting FlirDeviceConnected event");
+  NSLog(@"[FlirModule] onDeviceConnected - emitting FlirDeviceConnected event with state info");
   [self sendEventWithName:@"FlirDeviceConnected" body:body];
 }
 

package/package.json

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