ilabs-flir 2.0.7 → 2.0.8

package/ios/Flir/src/FLIRManager.h

@@ -0,0 +1,24 @@
+// ObjC shim to expose `FLIRManager` from the npm package and forward to `FlirManager` at runtime
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FLIRManager : NSObject
+
++ (instancetype)shared;
+
+- (BOOL)isAvailable;
+- (double)getTemperatureAtPoint:(int)x y:(int)y;
+- (double)getTemperatureAtNormalized:(double)nx y:(double)ny;
+- (int)getBatteryLevel;
+- (BOOL)isBatteryCharging;
+- (void)setPreferSdkRotation:(BOOL)prefer;
+- (BOOL)isPreferSdkRotation;
+- (nullable UIImage *)latestFrameImage;
+- (void)startDiscovery;
+- (void)stopDiscovery;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/Flir/src/FLIRManager.m

@@ -0,0 +1,153 @@
+// ObjC shim implementation forwarding to Swift `FlirManager` via runtime selectors
+#import "FLIRManager.h"
+#import <objc/message.h>
+
+@implementation FLIRManager
+
++ (instancetype)shared {
+    Class cls = NSClassFromString(@"FlirManager");
+    if (!cls) return nil;
+    SEL sel = sel_registerName("shared");
+    if (![cls respondsToSelector:sel]) return nil;
+    id (*msgSend0)(id, SEL) = (id (*)(id, SEL))objc_msgSend;
+    return msgSend0((id)cls, sel);
+}
+
+- (BOOL)isAvailable {
+    Class cls = NSClassFromString(@"FlirManager");
+    SEL sel = sel_registerName("isSDKAvailable");
+    if (!cls || ![cls respondsToSelector:sel]) return NO;
+    BOOL (*msgSend0)(id, SEL) = (BOOL (*)(id, SEL))objc_msgSend;
+    return msgSend0((id)cls, sel);
+}
+
+- (double)getTemperatureAtPoint:(int)x y:(int)y {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("getTemperatureAt: y:");
+    // Swift method name mangling may differ; fall back to method used by FlirModule
+    SEL selAlt = sel_registerName("getTemperatureAtPoint:y:");
+    SEL use = NULL;
+    if (inst && [inst respondsToSelector:sel]) use = sel;
+    if (inst && [inst respondsToSelector:selAlt]) use = selAlt;
+    if (!inst || !use) return NAN;
+    double (*msgSend2)(id, SEL, int, int) = (double (*)(id, SEL, int, int))objc_msgSend;
+    return msgSend2(inst, use, x, y);
+}
+
+- (double)getTemperatureAtNormalized:(double)nx y:(double)ny {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("getTemperatureAtNormalized:y:");
+    if (!inst || ![inst respondsToSelector:sel]) return NAN;
+    double (*msgSend2)(id, SEL, double, double) = (double (*)(id, SEL, double, double))objc_msgSend;
+    return msgSend2(inst, sel, nx, ny);
+}
+
+- (int)getBatteryLevel {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("getBatteryLevel");
+    if (!inst || ![inst respondsToSelector:sel]) return -1;
+    int (*msgSend0)(id, SEL) = (int (*)(id, SEL))objc_msgSend;
+    return msgSend0(inst, sel);
+}
+
+- (BOOL)isBatteryCharging {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("isBatteryCharging");
+    if (!inst || ![inst respondsToSelector:sel]) return NO;
+    BOOL (*msgSend0)(id, SEL) = (BOOL (*)(id, SEL))objc_msgSend;
+    return msgSend0(inst, sel);
+}
+
+- (void)setPreferSdkRotation:(BOOL)prefer {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("setPreferSdkRotation:");
+    if (!inst || ![inst respondsToSelector:sel]) return;
+    void (*msgSend1)(id, SEL, BOOL) = (void (*)(id, SEL, BOOL))objc_msgSend;
+    msgSend1(inst, sel, prefer);
+}
+
+- (BOOL)isPreferSdkRotation {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("isPreferSdkRotation");
+    if (!inst || ![inst respondsToSelector:sel]) return NO;
+    BOOL (*msgSend0)(id, SEL) = (BOOL (*)(id, SEL))objc_msgSend;
+    return msgSend0(inst, sel);
+}
+
+- (nullable NSString *)latestFrameBase64 {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("latestFrameBase64");
+    if (!inst || ![inst respondsToSelector:sel]) return nil;
+    id (*msgSend0)(id, SEL) = (id (*)(id, SEL))objc_msgSend;
+    return (NSString *)msgSend0(inst, sel);
+}
+
+- (void)retainClient:(NSString *)clientId {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("retainClient:");
+    if (!inst || ![inst respondsToSelector:sel]) return;
+    void (*msgSend1)(id, SEL, id) = (void (*)(id, SEL, id))objc_msgSend;
+    msgSend1(inst, sel, clientId);
+}
+
+- (void)releaseClient:(NSString *)clientId {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("releaseClient:");
+    if (!inst || ![inst respondsToSelector:sel]) return;
+    void (*msgSend1)(id, SEL, id) = (void (*)(id, SEL, id))objc_msgSend;
+    msgSend1(inst, sel, clientId);
+}
+
+- (void)setPalette:(NSString *)paletteName {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("setPalette:");
+    if (!inst || ![inst respondsToSelector:sel]) return;
+    void (*msgSend1)(id, SEL, id) = (void (*)(id, SEL, id))objc_msgSend;
+    msgSend1(inst, sel, paletteName);
+}
+
+- (void)setPaletteFromAcol:(double)acol {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("setPaletteFromAcol:");
+    if (!inst || ![inst respondsToSelector:sel]) return;
+    void (*msgSend1)(id, SEL, double) = (void (*)(id, SEL, double))objc_msgSend;
+    msgSend1(inst, sel, acol);
+}
+
+- (nullable NSString *)getPaletteNameFromAcol:(double)acol {
+    Class cls = NSClassFromString(@"FlirManager");
+    SEL sel = sel_registerName("getPaletteNameFromAcol:");
+    if (!cls || ![cls respondsToSelector:sel]) return nil;
+    id (*msgSend1)(id, SEL, double) = (id (*)(id, SEL, double))objc_msgSend;
+    return (NSString *)msgSend1((id)cls, sel, acol);
+}
+
+- (nullable UIImage *)latestFrameImage {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("latestImage");
+    SEL selAlt = sel_registerName("latestFrameImage");
+    SEL use = NULL;
+    if (inst && [inst respondsToSelector:selAlt]) use = selAlt;
+    else if (inst && [inst respondsToSelector:sel]) use = sel;
+    if (!inst || !use) return nil;
+    id (*msgSend0)(id, SEL) = (id (*)(id, SEL))objc_msgSend;
+    return (UIImage *)msgSend0(inst, use);
+}
+
+- (void)startDiscovery {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("startDiscovery");
+    if (!inst || ![inst respondsToSelector:sel]) return;
+    void (*msgSend0)(id, SEL) = (void (*)(id, SEL))objc_msgSend;
+    msgSend0(inst, sel);
+}
+
+- (void)stopDiscovery {
+    id inst = [[self class] shared];
+    SEL sel = sel_registerName("stopDiscovery");
+    if (!inst || ![inst respondsToSelector:sel]) return;
+    void (*msgSend0)(id, SEL) = (void (*)(id, SEL))objc_msgSend;
+    msgSend0(inst, sel);
+}
+
+@end

package/ios/Flir/src/FLIRManagerShim.swift

@@ -0,0 +1,48 @@
+import Foundation
+import UIKit
+
+@objc public class FLIRManager: NSObject {
+    @objc public static let shared = FLIRManager()
+
+    @objc public func isAvailable() -> Bool {
+        return FlirManager.isSDKAvailable
+    }
+
+    @objc public func getTemperatureAtPoint(x: Int, y: Int) -> Double {
+        // FlirManager currently doesn't expose a direct getTemperatureAtPoint API.
+        // Return NaN for now (consumers should handle NaN) until full parity is implemented.
+        return Double.nan
+    }
+
+    @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double) -> Double {
+        return Double.nan
+    }
+
+    @objc public func getBatteryLevel() -> Int {
+        return -1
+    }
+
+    @objc public func isBatteryCharging() -> Bool {
+        return false
+    }
+
+    @objc public func setPreferSdkRotation(_ prefer: Bool) {
+        // FlirManager doesn't currently support rotation preference; no-op
+    }
+
+    @objc public func isPreferSdkRotation() -> Bool {
+        return false
+    }
+
+    @objc public func latestFrameImage() -> UIImage? {
+        return FlirManager.shared.latestImage
+    }
+
+    @objc public func startDiscovery() {
+        FlirManager.shared.startDiscovery()
+    }
+
+    @objc public func stopDiscovery() {
+        FlirManager.shared.stopDiscovery()
+    }
+}

package/ios/Flir/src/FlirManager.swift

@@ -70,6 +70,9 @@ import ThermalSDK
     
     // Discovered devices
     private var discoveredDevices: [FlirDeviceInfo] = []
+    // Client lifecycle for discovery/connection ownership
+    private var activeClients: Set<String> = []
+    private var shutdownWorkItem: DispatchWorkItem? = nil
     
 #if FLIR_ENABLED
     private var discovery: FLIRDiscovery?
@@ -100,6 +103,164 @@ import ThermalSDK
     @objc public func getDiscoveredDevices() -> [FlirDeviceInfo] {
         return discoveredDevices
     }
+
+    // MARK: - Temperature & Battery Access
+
+    /// Returns a temperature data dictionary for the given pixel, or nil if unavailable.
+    @objc public func getTemperatureData(x: Int = -1, y: Int = -1) -> [String: Any]? {
+#if FLIR_ENABLED
+        guard let streamer = streamer else { return nil }
+        var result: [String: Any]? = nil
+        streamer.withThermalImage { thermalImage in
+            // Attempt to extract per-pixel measurements if available
+            if let measurements = thermalImage.measurements as? [NSNumber],
+               measurements.count > 0,
+               let img = streamer.getImage() {
+                let width = Int(img.size.width)
+                let height = Int(img.size.height)
+                if width > 0 && height > 0 && x >= 0 && y >= 0 && x < width && y < height {
+                    let idx = y * width + x
+                    if idx < measurements.count {
+                        let temp = measurements[idx].doubleValue
+                        result = ["temperature": temp]
+                    }
+                }
+            }
+            // Fallback: use lastTemperature if set
+            if result == nil && !lastTemperature.isNaN {
+                result = ["temperature": lastTemperature]
+            }
+        }
+        return result
+#else
+        return nil
+#endif
+    }
+
+    @objc public func getTemperatureAtPoint(_ x: Int, y: Int) -> Double {
+        if let data = getTemperatureData(x: x, y: y), let t = data["temperature"] as? Double {
+            return t
+        }
+        return Double.nan
+    }
+
+    @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double) -> Double {
+        guard let img = latestImage else { return Double.nan }
+        let px = Int(nx * Double(img.size.width))
+        let py = Int(y * Double(img.size.height))
+        return getTemperatureAtPoint(px, y: py)
+    }
+
+    @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 }
+        }
+#endif
+        return -1
+    }
+
+    @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 }
+        }
+#endif
+        return false
+    }
+
+    @objc public func latestFrameImage() -> UIImage? {
+        return latestImage
+    }
+
+    @objc public func latestFrameBase64() -> String? {
+        guard let img = latestImage else { return nil }
+        if let data = img.jpegData(compressionQuality: 0.7) {
+            return data.base64EncodedString()
+        }
+        if let data = img.pngData() {
+            return data.base64EncodedString()
+        }
+        return 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) {
+        DispatchQueue.main.async {
+            self.activeClients.insert(clientId)
+            self.shutdownWorkItem?.cancel()
+            self.shutdownWorkItem = nil
+            if self.activeClients.count == 1 {
+                self.startDiscovery()
+            }
+        }
+    }
+
+    @objc public func releaseClient(_ clientId: String) {
+        DispatchQueue.main.async {
+            self.activeClients.remove(clientId)
+            self.shutdownWorkItem?.cancel()
+            let work = DispatchWorkItem { [weak self] in
+                guard let self = self else { return }
+                if self.activeClients.isEmpty {
+                    self.stopDiscovery()
+                }
+            }
+            self.shutdownWorkItem = work
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: work)
+        }
+    }
+
+    // MARK: - Palette Control
+
+    /// Set palette by name (case-insensitive). If the SDK isn't available or the
+    /// palette cannot be found, this is a no-op.
+    @objc public func setPalette(_ paletteName: String) {
+#if FLIR_ENABLED
+        guard let streamer = streamer, let thermalImage = streamer.getImage() else {
+            NSLog("[FlirManager] Cannot set palette - no active streamer")
+            return
+        }
+
+        if let paletteManager = FLIRPaletteManager.defaultPalettes() {
+            for palette in paletteManager {
+                if let p = palette as? FLIRPalette, p.name.lowercased() == paletteName.lowercased() {
+                    thermalImage.palette = p
+                    NSLog("[FlirManager] ✅ Palette set to: \(paletteName)")
+                    return
+                }
+            }
+            NSLog("[FlirManager] Palette not found: \(paletteName)")
+        } else {
+            NSLog("[FlirManager] SDK not available - cannot set palette")
+        }
+#else
+        NSLog("[FlirManager] SDK not available - cannot set palette")
+#endif
+    }
+
+    /// Map a normalized acol value (0..1) to a palette name.
+    @objc public static func getPaletteNameFromAcol(_ acol: Float) -> String {
+        if acol < 0.125 { return "WhiteHot" }
+        else if acol < 0.25 { return "BlackHot" }
+        else if acol < 0.375 { return "Iron" }
+        else if acol < 0.5 { return "Rainbow" }
+        else if acol < 0.625 { return "Lava" }
+        else if acol < 0.75 { return "Arctic" }
+        else if acol < 0.875 { return "Coldest" }
+        else { return "Hottest" }
+    }
+
+    @objc public func setPaletteFromAcol(_ acol: Float) {
+        let paletteName = FlirManager.getPaletteNameFromAcol(acol)
+        NSLog("[FlirManager] Setting palette from acol=\(acol) -> \(paletteName)")
+        setPalette(paletteName)
+    }
     
     // MARK: - SDK Availability
     

package/ios/Flir/src/FlirModule.m

@@ -11,6 +11,7 @@
 #import "FlirState.h"
 #import <React/RCTLog.h>
 #import <React/RCTBridge.h>
+#import <objc/message.h>
 
 #if __has_include(<ThermalSDK/ThermalSDK.h>)
 #define FLIR_SDK_AVAILABLE 1
@@ -19,8 +20,62 @@
 #define FLIR_SDK_AVAILABLE 0
 #endif
 
-// Forward declare Swift class
-@class FlirManager;
+// Use runtime lookup to avoid a hard link-time dependency on `FLIRManager`.
+// This prevents duplicate-definition and missing-symbol build failures when
+// the Swift `FLIRManager` may or may not be available at build/link time.
+static id flir_manager_shared(void) {
+    Class cls = NSClassFromString(@"FLIRManager");
+    if (!cls) return nil;
+    SEL sel = sel_registerName("shared");
+    if (![cls respondsToSelector:sel]) return nil;
+    id (*msgSend0)(id, SEL) = (id (*)(id, SEL))objc_msgSend;
+    return msgSend0((id)cls, sel);
+}
+
+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);
+}
 
 @interface FlirModule() 
 #if FLIR_SDK_AVAILABLE
@@ -344,8 +399,8 @@ RCT_EXPORT_METHOD(getTemperatureAt:(nonnull NSNumber *)x
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
-        // Call into native FLIRManager to query temperature at point
-        double temp = [[FLIRManager shared] getTemperatureAtPoint:[x intValue] y:[y intValue]];
+        // Call into native FLIRManager to query temperature at point (runtime lookup)
+        double temp = flir_getTemperatureAtPoint([x intValue], [y intValue]);
         if (isnan(temp)) {
             resolve([NSNull null]);
         } else {
@@ -513,7 +568,7 @@ RCT_EXPORT_METHOD(getBatteryLevel:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
         #if FLIR_SDK_AVAILABLE
-        int level = [[FLIRManager shared] getBatteryLevel];
+        int level = flir_getBatteryLevel();
         resolve(@(level));
         #else
         resolve(@(-1));
@@ -525,7 +580,7 @@ RCT_EXPORT_METHOD(isBatteryCharging:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
         #if FLIR_SDK_AVAILABLE
-        BOOL ch = [[FLIRManager shared] isBatteryCharging];
+        BOOL ch = flir_isBatteryCharging();
         resolve(@(ch));
         #else
         resolve(@(NO));
@@ -537,8 +592,8 @@ RCT_EXPORT_METHOD(setPreferSdkRotation:(BOOL)prefer
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
-        @try {
-            [[FLIRManager shared] setPreferSdkRotation:prefer];
+            @try {
+            flir_setPreferSdkRotation(prefer);
             resolve(@(YES));
         } @catch (NSException *ex) {
             reject(@"ERR_FLIR_SET_ROTATION_PREF", ex.reason, nil);
@@ -549,7 +604,7 @@ RCT_EXPORT_METHOD(setPreferSdkRotation:(BOOL)prefer
 RCT_EXPORT_METHOD(isPreferSdkRotation:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
-        BOOL v = [[FLIRManager shared] isPreferSdkRotation];
+        BOOL v = flir_isPreferSdkRotation();
         resolve(@(v));
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -15,7 +15,6 @@
     "android/Flir/build.gradle.kts",
     "ios/Flir/src/",
     "ios/Flir/SDKLoader/",
-    
     "app.plugin.js",
     "Flir.podspec",
     "sdk-manifest.json",