ilabs-flir 2.1.402 → 2.2.2

package/ios/Flir/src/FlirManager.swift

@@ -174,25 +174,35 @@ import ThermalSDK
     }
 
     @objc public func getBatteryLevel() -> Int {
-#if FLIR_ENABLED
-        if let cam = camera {
-            if let val = cam.value(forKey: "batteryLevel") as? Int { return val }
-            if let batt = cam.value(forKey: "battery") as? NSObject,
-               let lv = batt.value(forKey: "level") as? Int { return lv }
+        // Emulators don't have battery - return -1 immediately
+        if isEmulator {
+            return -1
         }
-#endif
+        
+#if FLIR_ENABLED
+        // Only try battery access on real hardware (not emulators)
+        // Note: KVC can throw NSException which Swift can't catch
+        // So we avoid using KVC entirely for battery
+        return -1  // TODO: Find safe API to access battery without KVC
+#else
         return -1
+#endif
     }
 
     @objc public func isBatteryCharging() -> Bool {
-#if FLIR_ENABLED
-        if let cam = camera {
-            if let ch = cam.value(forKey: "isCharging") as? Bool { return ch }
-            if let batt = cam.value(forKey: "battery") as? NSObject,
-               let ch = batt.value(forKey: "charging") as? Bool { return ch }
+        // Emulators don't have battery - return false immediately
+        if isEmulator {
+            return false
         }
-#endif
+        
+#if FLIR_ENABLED
+        // Only try battery access on real hardware (not emulators)
+        // Note: KVC can throw NSException which Swift can't catch
+        // So we avoid using KVC entirely for battery
+        return false  // TODO: Find safe API to access battery without KVC
+#else
         return false
+#endif
     }
 
     @objc public func latestFrameImage() -> UIImage? {
@@ -509,6 +519,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 +554,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 {
@@ -697,7 +711,10 @@ import ThermalSDK
     // MARK: - Battery Polling (like Android)
     
     private func startBatteryPolling() {
-        FlirLogger.log(.battery, "Starting battery polling timer (5s interval)")
+        // Don't poll battery on emulators - they don't have batteries
+        if isEmulator {
+            return
+        }
         
         // Cancel any existing timer
         stopBatteryPolling()
@@ -713,9 +730,6 @@ import ThermalSDK
     }
     
     private func stopBatteryPolling() {
-        if batteryPollingTimer != nil {
-            FlirLogger.log(.battery, "Stopping battery polling timer")
-        }
         batteryPollingTimer?.invalidate()
         batteryPollingTimer = nil
     }
@@ -724,13 +738,11 @@ import ThermalSDK
         let level = getBatteryLevel()
         let charging = isBatteryCharging()
         
-        // Only log and emit if values changed
+        // Only emit if values changed
         if level != lastPolledBatteryLevel || charging != lastPolledCharging {
             lastPolledBatteryLevel = level
             lastPolledCharging = charging
             
-            FlirLogger.logBattery(level: level, isCharging: charging)
-            
             // Emit to delegate/RN via notification
             NotificationCenter.default.post(
                 name: Notification.Name("FlirBatteryUpdated"),

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) {
@@ -126,7 +129,24 @@ RCT_EXPORT_MODULE(FlirModule);
   ];
 }
 
+- (void)startObserving {
+  // Called automatically by RCTEventEmitter when first listener is added
+  // This ensures the parent class knows we have listeners
+}
+
+- (void)stopObserving {
+  // Called automatically by RCTEventEmitter when last listener is removed
+}
+
 RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
+  _listenerCount++;
+  NSLog(@"[FlirModule] addListener: %@ (count: %ld)", eventName, (long)_listenerCount);
+  
+  // CRITICAL: Call parent to register with RCTEventEmitter's internal tracking
+  // Without this, sendEventWithName will show "no listeners registered" warning
+  // and may not deliver events properly
+  [super addListener:eventName];
+  
   // 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"]) {
@@ -145,7 +165,12 @@ RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
 }
 
 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);
+  
+  // CRITICAL: Call parent to unregister with RCTEventEmitter's internal tracking
+  [super removeListeners:count];
 }
 
 + (void)emitBatteryUpdateWithLevel:(NSInteger)level charging:(BOOL)charging {
@@ -226,18 +251,26 @@ RCT_EXPORT_METHOD(getDiscoveredDevices : (RCTPromiseResolveBlock)
 RCT_EXPORT_METHOD(connectToDevice : (NSString *)deviceId resolver : (
     RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    self.connectResolve = resolve;
-    self.connectReject = reject;
+    NSLog(@"[FlirModule] connectToDevice called for: %@", deviceId);
 
     id manager = flir_manager_shared();
     if (manager &&
         [manager respondsToSelector:sel_registerName("connectToDevice:")]) {
+      NSLog(@"[FlirModule] Calling FlirManager.connectToDevice");
+      
+      // Store callbacks for event-driven updates (but don't block on them)
+      self.connectResolve = nil;  // Don't use promise for blocking
+      self.connectReject = nil;
+      
+      // Initiate connection asynchronously
       ((void (*)(id, SEL, id))objc_msgSend)(
           manager, sel_registerName("connectToDevice:"), deviceId);
+      
+      // Resolve immediately - connection status will come via events
+      resolve(@(YES));
     } else {
+      NSLog(@"[FlirModule] FlirManager not found");
       reject(@"ERR_NO_MANAGER", @"FlirManager not found", nil);
-      self.connectResolve = nil;
-      self.connectReject = nil;
     }
   });
 }
@@ -269,16 +302,21 @@ RCT_EXPORT_METHOD(stopFlir : (RCTPromiseResolveBlock)
 RCT_EXPORT_METHOD(startEmulator : (NSString *)emulatorType resolver : (
     RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    self.connectResolve = resolve;
-    self.connectReject = reject;
+    NSLog(@"[FlirModule] startEmulator called for type: %@", emulatorType);
+    
     id manager = flir_manager_shared();
     if (manager && [manager respondsToSelector:sel_registerName(
                                                    "startEmulatorWithType:")]) {
-      // Swift: startEmulator(type: String) -> exposed as startEmulatorWithType:
-      // ? Or startEmulatorWith? Swift default naming: startEmulator(type:) ->
-      // startEmulatorWithType:
+      // Store callbacks for event-driven updates (but don't block on them)
+      self.connectResolve = nil;
+      self.connectReject = nil;
+      
+      // Initiate emulator start asynchronously
       ((void (*)(id, SEL, id))objc_msgSend)(
           manager, sel_registerName("startEmulatorWithType:"), emulatorType);
+      
+      // Resolve immediately - connection status will come via events
+      resolve(@(YES));
     } else {
       // Fallback if selector assumption wrong/mismatch
       reject(@"ERR_NOT_IMPL",
@@ -424,18 +462,18 @@ 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 {
-  if (self.connectResolve) {
-    self.connectResolve(@(YES));
-    self.connectResolve = nil;
-    self.connectReject = nil;
-  }
-
   // device is FlirDeviceInfo
   NSMutableDictionary *body = [NSMutableDictionary new];
   if ([device respondsToSelector:sel_registerName("toDictionary")]) {
@@ -483,11 +521,6 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
 }
 
 - (void)onError:(NSString *)message {
-  if (self.connectReject) {
-    self.connectReject(@"ERR_FLIR", message, nil);
-    self.connectResolve = nil;
-    self.connectReject = nil;
-  }
   NSLog(@"[FlirModule] onError - emitting FlirError: %@", message);
   [self sendEventWithName:@"FlirError"
                      body:@{@"error" : message ?: @"Unknown error"}];

package/package.json

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