ilabs-flir 2.1.36 → 2.1.37

package/android/Flir/build.gradle.kts

@@ -38,7 +38,7 @@ android {
 
 dependencies {
     // React Native
-    implementation("com.facebook.react:react-native:+")
+    implementation("com.facebook.react:react-native:+")66a6f83912ba50ae5553aff1f5b0
     
     // Kotlin coroutines
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")

package/ios/Flir/src/Flir-Bridging-Header.h

@@ -11,16 +11,40 @@
 
 // Note: React headers are provided by the app's build system
 // These imports are for documentation purposes when building within Xcode
-#if __has_include(<React/RCTBridgeModule.h>)
+// Prefer React/ headers, but fall back to ReactCore or local headers for different RN layouts
 #if __has_include(<React/RCTBridgeModule.h>)
 #import <React/RCTBridgeModule.h>
+#if __has_include(<React/RCTEventEmitter.h>)
 #import <React/RCTEventEmitter.h>
+#endif
+#if __has_include(<React/RCTLog.h>)
+#import <React/RCTLog.h>
+#endif
+#if __has_include(<React/RCTViewManager.h>)
+#import <React/RCTViewManager.h>
+#endif
 #elif __has_include(<ReactCore/RCTBridgeModule.h>)
 #import <ReactCore/RCTBridgeModule.h>
+#if __has_include(<ReactCore/RCTEventEmitter.h>)
+#import <ReactCore/RCTEventEmitter.h>
+#elif __has_include(<React/RCTEventEmitter.h>)
 #import <React/RCTEventEmitter.h>
+#endif
+#if __has_include(<ReactCore/RCTLog.h>)
+#import <ReactCore/RCTLog.h>
+#elif __has_include(<React/RCTLog.h>)
+#import <React/RCTLog.h>
+#endif
+#if __has_include(<ReactCore/RCTViewManager.h>)
+#import <ReactCore/RCTViewManager.h>
+#elif __has_include(<React/RCTViewManager.h>)
+#import <React/RCTViewManager.h>
+#endif
 #elif __has_include("RCTBridgeModule.h")
 #import "RCTBridgeModule.h"
 #import "RCTEventEmitter.h"
+#import "RCTLog.h"
+#import "RCTViewManager.h"
 #else
 #import <Foundation/Foundation.h>
 @interface RCTEventEmitter : NSObject
@@ -28,9 +52,6 @@
 @protocol RCTBridgeModule <NSObject>
 @end
 #endif
-#import <React/RCTLog.h>
-#import <React/RCTViewManager.h>
-#endif
 
 // FLIR module headers (local)
 #import "FlirEventEmitter.h"

package/ios/Flir/src/FlirEventEmitter.h

@@ -5,12 +5,19 @@
 //  Event emitter for sending FLIR events to React Native
 //
 
+// Prefer React/ headers, but fall back to ReactCore or local headers for different RN layouts
 #if __has_include(<React/RCTBridgeModule.h>)
 #import <React/RCTBridgeModule.h>
+#if __has_include(<React/RCTEventEmitter.h>)
 #import <React/RCTEventEmitter.h>
+#endif
 #elif __has_include(<ReactCore/RCTBridgeModule.h>)
 #import <ReactCore/RCTBridgeModule.h>
+#if __has_include(<ReactCore/RCTEventEmitter.h>)
+#import <ReactCore/RCTEventEmitter.h>
+#elif __has_include(<React/RCTEventEmitter.h>)
 #import <React/RCTEventEmitter.h>
+#endif
 #elif __has_include("RCTBridgeModule.h")
 #import "RCTBridgeModule.h"
 #import "RCTEventEmitter.h"

package/ios/Flir/src/FlirManager.swift

@@ -43,6 +43,7 @@ import ThermalSDK
     func onDeviceConnected(_ device: FlirDeviceInfo)
     func onDeviceDisconnected()
     func onFrameReceived(_ image: UIImage, width: Int, height: Int)
+    @objc optional func onFrameReceivedRaw(_ data: Data, width: Int, height: Int, bytesPerRow: Int, timestamp: Double)
     func onError(_ message: String)
     func onStateChanged(_ state: String, isConnected: Bool, isStreaming: Bool, isEmulator: Bool)
 }
@@ -188,6 +189,35 @@ import ThermalSDK
         return nil
     }
 
+    // Returns a NSDictionary with BGRA base64 data for the latest frame.
+    // Keys: width (Int), height (Int), bytesPerRow (Int), dataBase64 (String)
+    @objc public func latestFrameBitmapBase64() -> NSDictionary? {
+        guard let img = latestImage else { return nil }
+        guard let bmp = convertUIImageToBGRA(img) else { return nil }
+        let b64 = bmp.data.base64EncodedString()
+        return ["width": bmp.width, "height": bmp.height, "bytesPerRow": bmp.bytesPerRow, "dataBase64": b64]
+    }
+
+    // Convert a UIImage to BGRA (kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst).
+    private func convertUIImageToBGRA(_ image: UIImage) -> (data: Data, width: Int, height: Int, bytesPerRow: Int)? {
+        guard let cg = image.cgImage else { return nil }
+        let width = cg.width
+        let height = cg.height
+        let bytesPerRow = width * 4
+        let size = height * bytesPerRow
+        var data = Data(count: size)
+        let colorSpace = CGColorSpaceCreateDeviceRGB()
+        let bitmapInfo = CGBitmapInfo.byteOrder32Little.rawValue | CGImageAlphaInfo.premultipliedFirst.rawValue
+        let success = data.withUnsafeMutableBytes { (ptr: UnsafeMutableRawBufferPointer) -> Bool in
+            guard let base = ptr.baseAddress else { return false }
+            guard let ctx = CGContext(data: base, width: width, height: height, bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: colorSpace, bitmapInfo: bitmapInfo) else { return false }
+            let rect = CGRect(x: 0, y: 0, width: width, height: height)
+            ctx.draw(cg, in: rect)
+            return true
+        }
+        return success ? (data, width, height, bytesPerRow) : nil
+    }
+
     // Client lifecycle helpers: callers (UI/filters) can retain/release to ensure
     // discovery runs while any client is active.
     @objc public func retainClient(_ clientId: String) {
@@ -851,6 +881,23 @@ extension FlirManager: FLIRStreamDelegate {
                         height: Int(image.size.height)
                     )
                 }
+
+                // Also provide a raw BGRA bitmap callback (optional) to delegates and a
+                // queryable base64 bitmap dict for RN consumers. Conversion is done
+                // off the main thread to avoid blocking UI.
+                DispatchQueue.global(qos: .utility).async { [weak self, weak image] in
+                    guard let self = self, let image = image else { return }
+                    if let bmp = self.convertUIImageToBGRA(image) {
+                        let ts = Date().timeIntervalSince1970 * 1000.0
+                        DispatchQueue.main.async {
+                            // Notify the delegate if set (may be FlirModule or another consumer)
+                            self.delegate?.onFrameReceivedRaw?(bmp.data, width: bmp.width, height: bmp.height, bytesPerRow: bmp.bytesPerRow, timestamp: ts)
+
+                            // Post a system notification so multiple native observers can react
+                            NotificationCenter.default.post(name: Notification.Name("FlirFrameBitmapAvailableNative"), object: nil, userInfo: ["width": bmp.width, "height": bmp.height, "bytesPerRow": bmp.bytesPerRow, "timestamp": ts])
+                        }
+                    }
+                }
             }
         } catch {
             NSLog("[FlirManager] Streamer update error: \(error)")

package/ios/Flir/src/FlirModule.h

@@ -5,12 +5,19 @@
 //  React Native bridge module for FLIR thermal camera SDK
 //
 
+// Prefer React/ headers, but fall back to ReactCore or local headers for different RN layouts
 #if __has_include(<React/RCTBridgeModule.h>)
 #import <React/RCTBridgeModule.h>
+#if __has_include(<React/RCTEventEmitter.h>)
 #import <React/RCTEventEmitter.h>
+#endif
 #elif __has_include(<ReactCore/RCTBridgeModule.h>)
 #import <ReactCore/RCTBridgeModule.h>
+#if __has_include(<ReactCore/RCTEventEmitter.h>)
+#import <ReactCore/RCTEventEmitter.h>
+#elif __has_include(<React/RCTEventEmitter.h>)
 #import <React/RCTEventEmitter.h>
+#endif
 #elif __has_include("RCTBridgeModule.h")
 #import "RCTBridgeModule.h"
 #import "RCTEventEmitter.h"

package/ios/Flir/src/FlirModule.m

@@ -121,7 +121,7 @@ RCT_EXPORT_MODULE(FlirModule);
 - (NSArray<NSString *> *)supportedEvents {
   return @[
     @"FlirDeviceConnected", @"FlirDeviceDisconnected", @"FlirDevicesFound",
-    @"FlirFrameReceived", @"FlirError", @"FlirStateChanged",
+    @"FlirFrameReceived", @"FlirFrameBitmapAvailable", @"FlirError", @"FlirStateChanged",
     @"FlirBatteryUpdated"
   ];
 }
@@ -308,6 +308,22 @@ RCT_EXPORT_METHOD(isEmulator : (RCTPromiseResolveBlock)
   });
 }
 
+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")]) {
+      resolve([NSNull null]);
+      return;
+    }
+    NSDictionary *dict = ((NSDictionary * (*)(id, SEL)) objc_msgSend)(manager, sel_registerName("latestFrameBitmapBase64"));
+    if (!dict) {
+      resolve([NSNull null]);
+    } else {
+      resolve(dict);
+    }
+  });
+}
+
 RCT_EXPORT_METHOD(isDeviceConnected : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
@@ -431,6 +447,16 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
                  }];
 }
 
+- (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()
+  [[FlirEventEmitter shared] sendDeviceEvent:@"FlirFrameBitmapAvailable" body:@{
+    @"width": @(width),
+    @"height": @(height),
+    @"bytesPerRow": @(bytesPerRow),
+    @"timestamp": @(timestamp)
+  }];
+}
+
 - (void)onError:(NSString *)message {
   if (self.connectReject) {
     self.connectReject(@"ERR_FLIR", message, nil);

package/ios/Flir/src/FlirPublic.h

@@ -0,0 +1,50 @@
+// FlirPublic.h
+// Public C/ObjC API for the Flir library
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FlirDeviceInfo : NSObject
+@property (nonatomic, readonly) NSString *deviceId;
+@property (nonatomic, readonly) NSString *name;
+@property (nonatomic, readonly) NSString *communicationType;
+@property (nonatomic, readonly) BOOL isEmulator;
+- (NSDictionary *)toDictionary;
+@end
+
+@protocol FlirPublicDelegate <NSObject>
+- (void)onDevicesFound:(NSArray<FlirDeviceInfo *> *)devices;
+- (void)onDeviceConnected:(FlirDeviceInfo *)device;
+- (void)onDeviceDisconnected;
+- (void)onFrameReceived:(UIImage *)image width:(NSInteger)width height:(NSInteger)height;
+@optional
+- (void)onFrameReceivedRaw:(NSData *)data width:(NSInteger)width height:(NSInteger)height bytesPerRow:(NSInteger)bytesPerRow timestamp:(double)timestamp;
+- (void)onError:(NSString *)message;
+- (void)onStateChanged:(NSString *)state isConnected:(BOOL)isConnected isStreaming:(BOOL)isStreaming isEmulator:(BOOL)isEmulator;
+@end
+
+@interface FlirManager : NSObject
++ (instancetype)shared NS_SWIFT_NAME(shared);
+
+@property (nonatomic, weak, nullable) id<FlirPublicDelegate> delegate;
+
+// Lifecycle
+- (void)startDiscovery;
+- (void)stopDiscovery;
+- (void)connectToDevice:(NSString *)deviceId;
+- (void)disconnect;
+- (void)stop;
+
+// Frame accessors
+- (nullable NSDictionary *)latestFrameBitmapBase64; // { width, height, bytesPerRow, dataBase64 }
+- (nullable NSString *)latestFrameBase64;
+
+// Utilities
+- (NSInteger)getBatteryLevel;
+- (BOOL)isBatteryCharging;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/Flir/src/FlirViewManager.h

@@ -5,8 +5,13 @@
 //  React Native view manager for FLIR preview
 //
 
+// Prefer React/ headers, but support multiple RN header layouts
 #if __has_include(<React/RCTViewManager.h>)
 #import <React/RCTViewManager.h>
+#elif __has_include(<ReactCore/RCTViewManager.h>)
+#import <ReactCore/RCTViewManager.h>
+#elif __has_include("RCTViewManager.h")
+#import "RCTViewManager.h"
 #elif __has_include(<React/RCTUIManager.h>)
 #import <React/RCTUIManager.h>
 #else

package/package.json

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