ilabs-flir 2.2.13 → 2.2.14

package/android/Flir/src/main/java/flir/android/FlirManager.kt

@@ -35,6 +35,10 @@ object FlirManager {
     private var isStreaming = false
     private var connectedDeviceId: String? = null
     private var connectedDeviceName: String? = null
+
+    // Concurrency control
+    private val shouldProcessFrames = java.util.concurrent.atomic.AtomicBoolean(false)
+    private val isUpdatingTexture = java.util.concurrent.atomic.AtomicBoolean(false)
     
     // Latest bitmap
     private var latestBitmap: Bitmap? = null
@@ -119,6 +123,7 @@ object FlirManager {
         val identity = devices.find { it.deviceId == deviceId }
         
         if (identity != null) {
+            shouldProcessFrames.set(true)
             sdkManager?.connect(identity)
         } else {
             Log.e(TAG, "Device not found: $deviceId")
@@ -130,6 +135,7 @@ object FlirManager {
      * Disconnect
      */
     fun disconnect() {
+        shouldProcessFrames.set(false)
         sdkManager?.disconnect()
         isConnected = false
         isStreaming = false
@@ -141,6 +147,7 @@ object FlirManager {
      * Stop everything
      */
     fun stop() {
+        shouldProcessFrames.set(false)
         disconnect()
         stopDiscovery()
         latestBitmap = null
@@ -229,14 +236,34 @@ object FlirManager {
         }
         
         override fun onFrame(bitmap: Bitmap) {
+            // IMMEDIATE STOP CHECK
+            if (!shouldProcessFrames.get()) {
+                return
+            }
+
             latestBitmap = bitmap
-            isStreaming = true
             
-            // Notify GL callback
-            textureCallback?.onTextureUpdate(bitmap, 0)
+            // If this is the first frame, notify JS that we are now streaming
+            if (!isStreaming) {
+                isStreaming = true
+                emitDeviceState("streaming")
+            }
+            
+            // NON-BLOCKING TEXTURE UPDATE (Drop frames if busy)
+            if (textureCallback != null) {
+                if (isUpdatingTexture.compareAndSet(false, true)) {
+                    try {
+                        textureCallback?.onTextureUpdate(bitmap, 0)
+                    } finally {
+                        isUpdatingTexture.set(false)
+                    }
+                } else {
+                    // Log.v(TAG, "Dropping frame - texture update busy")
+                }
+            }
             
-            // Notify RN
-            emitFrameToReactNative(bitmap)
+            // Notify RN - disabled
+            // emitFrameToReactNative(bitmap)
         }
         
         override fun onError(message: String) {
@@ -247,6 +274,8 @@ object FlirManager {
     // React Native Emitters
     
     private fun emitFrameToReactNative(bitmap: Bitmap) {
+        // PERF: Disabled to reduce bridge traffic
+        /*
         val now = System.currentTimeMillis()
         if (now - lastEmitMs.get() < minEmitIntervalMs) return
         lastEmitMs.set(now)
@@ -261,6 +290,7 @@ object FlirManager {
             ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
                 .emit("FlirFrameReceived", params)
         } catch (e: Exception) { }
+        */
     }
     
     private fun emitDeviceState(state: String) {

package/ios/Flir/src/FlirModule.m

@@ -13,6 +13,7 @@
 #import <React/RCTLog.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
+#import <stdatomic.h>
 
 // Import Swift-generated header for FlirManagerDelegate protocol
 #if __has_include("Flir-Swift.h")
@@ -36,61 +37,7 @@ static id flir_manager_shared(void) {
   return msgSend0((id)cls, sel);
 }
 
-// Helper for primitives
-static double flir_getTemperatureAtPoint(int x, int y) {
-  id inst = flir_manager_shared();
-  if (!inst)
-    return NAN;
-  SEL sel = sel_registerName("getTemperatureAtPoint:y:");
-  if (![inst respondsToSelector:sel])
-    return NAN;
-  double (*msgSend2)(id, SEL, int, int) =
-      (double (*)(id, SEL, int, int))objc_msgSend;
-  return msgSend2(inst, sel, x, y);
-}
-
-static int flir_getBatteryLevel(void) {
-  id inst = flir_manager_shared();
-  if (!inst)
-    return -1;
-  SEL sel = sel_registerName("getBatteryLevel");
-  if (![inst respondsToSelector:sel])
-    return -1;
-  int (*msgSend0)(id, SEL) = (int (*)(id, SEL))objc_msgSend;
-  return msgSend0(inst, sel);
-}
-
-static BOOL flir_isBatteryCharging(void) {
-  id inst = flir_manager_shared();
-  if (!inst)
-    return NO;
-  SEL sel = sel_registerName("isBatteryCharging");
-  if (![inst respondsToSelector:sel])
-    return NO;
-  BOOL (*msgSend0)(id, SEL) = (BOOL (*)(id, SEL))objc_msgSend;
-  return msgSend0(inst, sel);
-}
-static void flir_setPreferSdkRotation(BOOL prefer) {
-  id inst = flir_manager_shared();
-  if (!inst)
-    return;
-  SEL sel = sel_registerName("setPreferSdkRotation:");
-  if (![inst respondsToSelector:sel])
-    return;
-  void (*msgSend1)(id, SEL, BOOL) = (void (*)(id, SEL, BOOL))objc_msgSend;
-  msgSend1(inst, sel, prefer);
-}
-
-static BOOL flir_isPreferSdkRotation(void) {
-  id inst = flir_manager_shared();
-  if (!inst)
-    return NO;
-  SEL sel = sel_registerName("isPreferSdkRotation");
-  if (![inst respondsToSelector:sel])
-    return NO;
-  BOOL (*msgSend0)(id, SEL) = (BOOL (*)(id, SEL))objc_msgSend;
-  return msgSend0(inst, sel);
-}
+// ... helper primitives skipped in replace ...
 
 @interface FlirModule () <FlirManagerDelegate>
 @property(nonatomic, copy) RCTPromiseResolveBlock connectResolve;
@@ -99,6 +46,7 @@ static BOOL flir_isPreferSdkRotation(void) {
 
 @implementation FlirModule {
   NSInteger _listenerCount;
+  atomic_bool _isCapturing;
 }
 
 RCT_EXPORT_MODULE(FlirModule);
@@ -110,6 +58,7 @@ RCT_EXPORT_MODULE(FlirModule);
 - (instancetype)init {
   if (self = [super init]) {
     _listenerCount = 0;
+    atomic_store(&_isCapturing, false);
     // Wire up delegate
     id manager = flir_manager_shared();
     if (manager) {
@@ -124,8 +73,8 @@ RCT_EXPORT_MODULE(FlirModule);
 - (NSArray<NSString *> *)supportedEvents {
   return @[
     @"FlirDeviceConnected", @"FlirDeviceDisconnected", @"FlirDevicesFound",
-    @"FlirFrameReceived", @"FlirFrameBitmapAvailable", @"FlirError", @"FlirStateChanged",
-    @"FlirBatteryUpdated"
+    @"FlirFrameReceived", @"FlirFrameBitmapAvailable", @"FlirError",
+    @"FlirStateChanged", @"FlirBatteryUpdated"
   ];
 }
 
@@ -140,23 +89,27 @@ RCT_EXPORT_MODULE(FlirModule);
 
 RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
   _listenerCount++;
-  NSLog(@"[FlirModule] addListener: %@ (count: %ld)", eventName, (long)_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
+
+  // 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"));
+        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);
+          NSLog(
+              @"[FlirModule] addListener - re-emitting %lu discovered devices",
+              (unsigned long)devices.count);
           [self onDevicesFound:devices];
         }
       }
@@ -166,21 +119,26 @@ RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
 
 RCT_EXPORT_METHOD(removeListeners : (NSInteger)count) {
   _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
+  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 {
   NSDictionary *payload = @{@"level" : @(level), @"isCharging" : @(charging)};
-  NSLog(@"[FlirModule] Emitting battery update - level: %ld, charging: %d", (long)level, charging);
-  
+  NSLog(@"[FlirModule] Emitting battery update - level: %ld, charging: %d",
+        (long)level, charging);
+
   // Note: This is a class method, so we need to get the module instance
-  // For now, we'll just log - in production you'd need to get the module instance
-  // or convert this to an instance method
-  // [[FlirModule sharedInstance] sendEventWithName:@"FlirBatteryUpdated" body:payload];
+  // For now, we'll just log - in production you'd need to get the module
+  // instance or convert this to an instance method
+  // [[FlirModule sharedInstance] sendEventWithName:@"FlirBatteryUpdated"
+  // body:payload];
 }
 
 #pragma mark - Methods
@@ -209,10 +167,12 @@ RCT_EXPORT_METHOD(startDiscovery : (RCTPromiseResolveBlock)
     id manager = flir_manager_shared();
     if (manager &&
         [manager respondsToSelector:sel_registerName("startDiscovery")]) {
-      NSLog(@"[FlirModule] [%@] ⏱ Calling FlirManager.startDiscovery", [NSDate date]);
+      NSLog(@"[FlirModule] [%@] ⏱ Calling FlirManager.startDiscovery",
+            [NSDate date]);
       ((void (*)(id, SEL))objc_msgSend)(manager,
                                         sel_registerName("startDiscovery"));
-      NSLog(@"[FlirModule] [%@] ⏱ FlirManager.startDiscovery returned", [NSDate date]);
+      NSLog(@"[FlirModule] [%@] ⏱ FlirManager.startDiscovery returned",
+            [NSDate date]);
     }
     resolve(@(YES));
   });
@@ -253,23 +213,30 @@ 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);
+  NSLog(@"[FlirModule] [%@] ⏱ RN->connectToDevice called for: %@",
+        [NSDate date], deviceId);
   dispatch_async(dispatch_get_main_queue(), ^{
     id manager = flir_manager_shared();
     if (manager &&
         [manager respondsToSelector:sel_registerName("connectToDevice:")]) {
-      NSLog(@"[FlirModule] [%@] ⏱ Calling FlirManager.connectToDevice", [NSDate date]);
-      
+      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
+      self.connectResolve = nil; // Don't use promise for blocking
       self.connectReject = nil;
-      
+
+      // Enable capturing
+      atomic_store(&_isCapturing, true);
+
       // Initiate connection asynchronously
       ((void (*)(id, SEL, id))objc_msgSend)(
           manager, sel_registerName("connectToDevice:"), deviceId);
-      
-      NSLog(@"[FlirModule] [%@] ⏱ FlirManager.connectToDevice returned (async started)", [NSDate date]);
-      
+
+      NSLog(@"[FlirModule] [%@] ⏱ FlirManager.connectToDevice returned (async "
+            @"started)",
+            [NSDate date]);
+
       // Resolve immediately - connection status will come via events
       resolve(@(YES));
     } else {
@@ -285,6 +252,8 @@ RCT_EXPORT_METHOD(disconnect : (RCTPromiseResolveBlock)
     id manager = flir_manager_shared();
     if (manager &&
         [manager respondsToSelector:sel_registerName("disconnect")]) {
+      atomic_store(&_isCapturing, false);
+      [[FlirState shared] reset];
       ((void (*)(id, SEL))objc_msgSend)(manager,
                                         sel_registerName("disconnect"));
     }
@@ -297,6 +266,8 @@ RCT_EXPORT_METHOD(stopFlir : (RCTPromiseResolveBlock)
   dispatch_async(dispatch_get_main_queue(), ^{
     id manager = flir_manager_shared();
     if (manager && [manager respondsToSelector:sel_registerName("stop")]) {
+      atomic_store(&_isCapturing, false);
+      [[FlirState shared] reset];
       ((void (*)(id, SEL))objc_msgSend)(manager, sel_registerName("stop"));
     }
     resolve(@(YES));
@@ -307,18 +278,21 @@ RCT_EXPORT_METHOD(startEmulator : (NSString *)emulatorType resolver : (
     RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
     NSLog(@"[FlirModule] startEmulator called for type: %@", emulatorType);
-    
+
     id manager = flir_manager_shared();
     if (manager && [manager respondsToSelector:sel_registerName(
                                                    "startEmulatorWithType:")]) {
       // Store callbacks for event-driven updates (but don't block on them)
       self.connectResolve = nil;
       self.connectReject = nil;
-      
+
+      // Enable capturing
+      atomic_store(&_isCapturing, true);
+
       // 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 {
@@ -368,14 +342,18 @@ RCT_EXPORT_METHOD(isEmulator : (RCTPromiseResolveBlock)
   });
 }
 
-RCT_EXPORT_METHOD(getLatestFrameBitmap : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getLatestFrameBitmap : (RCTPromiseResolveBlock)
+                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
     id manager = flir_manager_shared();
-    if (!manager || ![manager respondsToSelector:sel_registerName("latestFrameBitmapBase64")]) {
+    if (!manager ||
+        ![manager
+            respondsToSelector:sel_registerName("latestFrameBitmapBase64")]) {
       resolve([NSNull null]);
       return;
     }
-    NSDictionary *dict = ((NSDictionary * (*)(id, SEL)) objc_msgSend)(manager, sel_registerName("latestFrameBitmapBase64"));
+    NSDictionary *dict = ((NSDictionary * (*)(id, SEL)) objc_msgSend)(
+        manager, sel_registerName("latestFrameBitmapBase64"));
     if (!dict) {
       resolve([NSNull null]);
     } else {
@@ -465,15 +443,17 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
                           objc_msgSend)(d, sel_registerName("toDictionary"))];
     }
   }
-  
-  NSLog(@"[FlirModule] onDevicesFound - %lu devices, listenerCount: %ld", (unsigned long)arr.count, (long)_listenerCount);
-  
+
+  NSLog(@"[FlirModule] onDevicesFound - %lu devices, listenerCount: %ld",
+        (unsigned long)arr.count, (long)_listenerCount);
+
   if (_listenerCount > 0) {
     NSLog(@"[FlirModule] emitting FlirDevicesFound event");
-    [self sendEventWithName:@"FlirDevicesFound" 
+    [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");
+    NSLog(@"[FlirModule] ⚠️ No listeners registered yet - devices will be "
+          @"re-emitted when listener is added");
   }
 }
 
@@ -485,30 +465,39 @@ 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
+  [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 with state info");
+  NSLog(@"[FlirModule] onDeviceConnected - emitting FlirDeviceConnected event "
+        @"with state info");
   [self sendEventWithName:@"FlirDeviceConnected" body:body];
 }
 
 - (void)onDeviceDisconnected {
-  NSLog(@"[FlirModule] onDeviceDisconnected - emitting FlirDeviceDisconnected event");
+  NSLog(@"[FlirModule] onDeviceDisconnected - emitting FlirDeviceDisconnected "
+        @"event");
   [self sendEventWithName:@"FlirDeviceDisconnected" body:@{}];
 }
 
 - (void)onFrameReceived:(UIImage *)image
                   width:(NSInteger)width
                  height:(NSInteger)height {
-  
-  // CRITICAL: Update shared state so native preview (FlirPreviewView) receives the texture
+
+  if (!atomic_load(&_isCapturing)) {
+    return;
+  }
+
+  // CRITICAL: Update shared state so native preview (FlirPreviewView) receives
+  // the texture
   [[FlirState shared] updateFrame:image];
 
-  // Also emit event for JS consumers (though slow, some might use it)
+  // PERF: Commented out to reduce bridge traffic (JS dev not using it)
+  /*
   [self sendEventWithName:@"FlirFrameReceived"
                      body:@{
                        @"width" : @(width),
@@ -516,16 +505,23 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
                        @"timestamp" :
                            @([[NSDate date] timeIntervalSince1970] * 1000)
                      }];
+  */
 }
 
-- (void)onFrameReceivedRaw:(NSData *)data width:(NSInteger)width height:(NSInteger)height bytesPerRow:(NSInteger)bytesPerRow timestamp:(double)timestamp {
-  // Emit a lightweight event to notify JS that a raw bitmap is available; raw bytes are available via getLatestFrameBitmap()
-  [self sendEventWithName:@"FlirFrameBitmapAvailable" body:@{
-    @"width": @(width),
-    @"height": @(height),
-    @"bytesPerRow": @(bytesPerRow),
-    @"timestamp": @(timestamp)
-  }];
+- (void)onFrameReceivedRaw:(NSData *)data
+                     width:(NSInteger)width
+                    height:(NSInteger)height
+               bytesPerRow:(NSInteger)bytesPerRow
+                 timestamp:(double)timestamp {
+  // Emit a lightweight event to notify JS that a raw bitmap is available; raw
+  // bytes are available via getLatestFrameBitmap()
+  [self sendEventWithName:@"FlirFrameBitmapAvailable"
+                     body:@{
+                       @"width" : @(width),
+                       @"height" : @(height),
+                       @"bytesPerRow" : @(bytesPerRow),
+                       @"timestamp" : @(timestamp)
+                     }];
 }
 
 - (void)onError:(NSString *)message {
@@ -544,7 +540,9 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
     @"isStreaming" : @(isStreaming),
     @"isEmulator" : @(isEmulator)
   };
-  NSLog(@"[FlirModule] onStateChanged - state: %@, connected: %d, streaming: %d", state, isConnected, isStreaming);
+  NSLog(
+      @"[FlirModule] onStateChanged - state: %@, connected: %d, streaming: %d",
+      state, isConnected, isStreaming);
   [self sendEventWithName:@"FlirStateChanged" body:body];
 }
 

package/ios/Flir/src/FlirState.m

@@ -7,6 +7,8 @@
 
 #import "FlirState.h"
 
+#import <stdatomic.h>
+
 static FlirState *_sharedState = nil;
 
 @implementation FlirState {
@@ -14,6 +16,7 @@ static FlirState *_sharedState = nil;
   int _imageWidth;
   int _imageHeight;
   dispatch_queue_t _accessQueue;
+  atomic_bool _isTextureBusy;
 }
 
 + (instancetype)shared {
@@ -33,6 +36,7 @@ static FlirState *_sharedState = nil;
     _imageHeight = 0;
     _accessQueue =
         dispatch_queue_create("com.flir.state.access", DISPATCH_QUEUE_SERIAL);
+    atomic_store(&_isTextureBusy, false);
   }
   return self;
 }
@@ -101,11 +105,18 @@ static FlirState *_sharedState = nil;
 
   // Invoke texture callback on main thread (for Metal filters, texture unit 7)
   if (self.onTextureUpdate) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (self.onTextureUpdate) {
-        self.onTextureUpdate(image, 7);
-      }
-    });
+    bool expected = false;
+    if (atomic_compare_exchange_strong(&_isTextureBusy, &expected, true)) {
+      dispatch_async(dispatch_get_main_queue(), ^{
+        @try {
+          if (self.onTextureUpdate) {
+            self.onTextureUpdate(image, 7);
+          }
+        } @finally {
+          atomic_store(&_isTextureBusy, false);
+        }
+      });
+    }
   }
 
   // Sample temperature at center point and invoke callback

package/package.json

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