ilabs-flir 2.2.15 → 2.2.16

package/ios/Flir/src/FlirManager.swift

@@ -52,6 +52,10 @@ import ThermalSDK
 @objc public class FlirManager: NSObject {
     @objc public static let shared = FlirManager()
     
+    // MARK: - Singleton
+    
+    @objc public static let shared = FlirManager()
+    
     // MARK: - Properties
     @objc public weak var delegate: FlirManagerDelegate?
     
@@ -307,10 +311,13 @@ import ThermalSDK
             
             if let measurements = thermalImage.measurements,
                let spot = try? measurements.addSpot(CGPoint(x: cx, y: cy)) {
-                if let value = spot.getValue() {
-                    result = value.value
-                }
-                measurements.remove(spot)
+                
+                // getValue() returns non-optional in some SDK versions, or optional in others.
+                // Compiler says it is NOT optional here, so direct assignment.
+                let value = spot.getValue()
+                result = value.value
+
+                try? measurements.remove(spot)
             }
         }
         return result
@@ -361,9 +368,35 @@ import ThermalSDK
 
     // MARK: - Battery (stub - not needed per user)
     
+    // MARK: - Battery (stub - not needed per user)
+    
     @objc public func getBatteryLevel() -> Int { return -1 }
     @objc public func isBatteryCharging() -> Bool { return false }
     
+    // MARK: - Shim Compatibility
+    
+    @objc public static var isSDKAvailable: Bool {
+        return true
+    }
+    
+    @objc public func setPalette(_ name: String) {
+        // stub
+    }
+    
+    @objc public func setPaletteFromAcol(_ acol: Float) {
+        // stub
+    }
+    
+    @objc public func retainClient(_ clientId: String) {
+        // simplified manager doesn't track retain counts per client yet
+        startDiscovery()
+    }
+    
+    @objc public func releaseClient(_ clientId: String) {
+        // simplified manager doesn't track retain counts per client yet
+        // stopDiscovery() // Optional: could stop if count == 0
+    }
+    
     // MARK: - Helpers
     
     private func emitStateChange(_ state: String) {

package/ios/Flir/src/FlirModule.m

@@ -7,6 +7,7 @@
 //
 
 #import "FlirModule.h"
+
 #import "FlirEventEmitter.h"
 #import "FlirState.h"
 #import <React/RCTBridge.h>
@@ -309,7 +310,8 @@ RCT_EXPORT_METHOD(getTemperatureAt : (nonnull NSNumber *)x y : (
     nonnull NSNumber *)y resolver : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    double temp = flir_getTemperatureAtPoint([x intValue], [y intValue]);
+    double temp = [[FLIRManager shared] getTemperatureAtPoint:[x intValue]
+                                                            y:[y intValue]];
     if (isnan(temp)) {
       resolve([NSNull null]);
     } else {
@@ -404,7 +406,7 @@ RCT_EXPORT_METHOD(getSDKStatus : (RCTPromiseResolveBlock)
 RCT_EXPORT_METHOD(getBatteryLevel : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    int level = flir_getBatteryLevel();
+    int level = [[FLIRManager shared] getBatteryLevel];
     resolve(@(level));
   });
 }
@@ -412,7 +414,7 @@ RCT_EXPORT_METHOD(getBatteryLevel : (RCTPromiseResolveBlock)
 RCT_EXPORT_METHOD(isBatteryCharging : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    BOOL ch = flir_isBatteryCharging();
+    BOOL ch = [[FLIRManager shared] isBatteryCharging];
     resolve(@(ch));
   });
 }
@@ -420,7 +422,7 @@ RCT_EXPORT_METHOD(isBatteryCharging : (RCTPromiseResolveBlock)
 RCT_EXPORT_METHOD(setPreferSdkRotation : (BOOL)prefer resolver : (
     RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    flir_setPreferSdkRotation(prefer);
+    [[FLIRManager shared] setPreferSdkRotation:prefer];
     resolve(@(YES));
   });
 }
@@ -428,7 +430,7 @@ RCT_EXPORT_METHOD(setPreferSdkRotation : (BOOL)prefer resolver : (
 RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    BOOL v = flir_isPreferSdkRotation();
+    BOOL v = [[FLIRManager shared] isPreferSdkRotation];
     resolve(@(v));
   });
 }

package/package.json

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

package/ios/Flir/src/FLIRManager.h

@@ -1,24 +0,0 @@
-// 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

@@ -1,153 +0,0 @@
-// 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