ilabs-flir 2.4.1 → 2.4.3

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

@@ -44,6 +44,9 @@ object FlirManager {
     private var isStreaming = false
     private var connectedDeviceId: String? = null
     private var connectedDeviceName: String? = null
+    
+    // Manual gating
+    var manualOnly: Boolean = true
 
     // Concurrency control
     private val shouldProcessFrames = java.util.concurrent.atomic.AtomicBoolean(false)
@@ -124,17 +127,33 @@ object FlirManager {
      */
     @Synchronized
     fun startDiscovery(retry: Boolean = false) {
+        if (manualOnly && !retry) {
+            Log.w(TAG, "🔭 [FLIR] Discovery blocked: manualOnly is enabled. Use startManualDiscovery() or disable the gate.")
+            return
+        }
+
         if (!isInitialized && reactContext != null) {
             init(reactContext!!)
         }
         
         if (isScanning && !retry) return
         
-        Log.i(TAG, "Starting FlirManager discovery...")
+        Log.i(TAG, "🔭 [FLIR] Starting discovery (retry=$retry)...")
         isScanning = true
         emitDeviceState("discovering")
         sdkManager?.scan()
     }
+
+    /**
+     * Explicitly starts discovery regardless of manualOnly flag.
+     * Use this for JS-triggered scans.
+     */
+    @Synchronized
+    fun startManualDiscovery() {
+        Log.i(TAG, "🔭 [FLIR] Manual discovery requested - opening gate.")
+        manualOnly = false
+        startDiscovery(true)
+    }
     
     /**
      * Start discovery with React context

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

@@ -145,7 +145,9 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
             palettes.forEach { result.pushString(it) }
             promise?.resolve(result)
         } catch (e: Throwable) {
-            promise?.reject("ERR_FLIR_PALETTES", e)
+            try {
+                promise?.reject("ERR_FLIR_PALETTES", e)
+            } catch (ignored: Exception) {}
         }
     }
 
@@ -163,7 +165,9 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
             }
             promise?.resolve(result)
         } catch (e: Throwable) {
-            promise?.reject("ERR_FLIR_PALETTE_ICONS", e)
+            try {
+                promise?.reject("ERR_FLIR_PALETTE_ICONS", e)
+            } catch (ignored: Exception) {}
         }
     }
 
@@ -234,7 +238,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
             // Ensure SDK is initialized with context before starting discovery
             FlirManager.init(reactContext)
             // With simplified API, just start discovery - emulators are discovered like any device
-            FlirManager.startDiscovery(true)
+            FlirManager.startManualDiscovery()
             promise?.resolve(true)
         } catch (e: Exception) {
             promise?.reject("ERR_FLIR_EMULATOR", e)
@@ -281,7 +285,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
         try {
             // Ensure SDK is initialized with context before starting discovery
             FlirManager.init(reactContext)
-            FlirManager.startDiscovery(true)
+            FlirManager.startManualDiscovery()
             promise?.resolve(true)
         } catch (e: Exception) {
             promise?.reject("ERR_FLIR_DISCOVERY", e)
@@ -336,7 +340,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
     @ReactMethod
     fun resumeFlirAfterPreview(promise: Promise?) {
         try {
-            FlirManager.startDiscovery(true)
+            FlirManager.startManualDiscovery()
             promise?.resolve(true)
         } catch (e: Exception) {
             promise?.reject("ERR_RESUME_FLIR", e)
@@ -345,17 +349,26 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
 
     @ReactMethod
     fun captureRadiometricSnapshot(path: String, promise: Promise?) {
+        val snapshotPromise = promise
+        var settled = java.util.concurrent.atomic.AtomicBoolean(false)
+        
         try {
             FlirManager.captureRadiometricSnapshot(path, object : FlirSdkManager.SnapshotCallback {
                 override fun onSnapshotSaved(savedPath: String) {
-                    promise?.resolve(savedPath)
+                    if (settled.compareAndSet(false, true)) {
+                        snapshotPromise?.resolve(savedPath)
+                    }
                 }
                 override fun onSnapshotError(message: String) {
-                    promise?.reject("ERR_RADIOMETRIC_SAVE", message)
+                    if (settled.compareAndSet(false, true)) {
+                        snapshotPromise?.reject("ERR_RADIOMETRIC_SAVE", message)
+                    }
                 }
             })
         } catch (e: Exception) {
-            promise?.reject("ERR_RADIOMETRIC_TRIGGER", e.message)
+            if (settled.compareAndSet(false, true)) {
+                promise?.reject("ERR_RADIOMETRIC_TRIGGER", e.message)
+            }
         }
     }
 
@@ -395,6 +408,16 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
         }
     }
     
+    @ReactMethod
+    fun setManualDiscoveryOnly(enabled: Boolean, promise: Promise?) {
+        try {
+            FlirManager.manualOnly = enabled
+            promise?.resolve(true)
+        } catch (e: Exception) {
+            promise?.reject("ERR_FLIR_GATE", e)
+        }
+    }
+
     @ReactMethod
     fun initializeSDK(promise: Promise?) {
         try {
@@ -409,7 +432,9 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
             result.putBoolean("initialized", false)
             result.putString("error", e.message ?: "Unknown error")
             result.putString("errorType", e.javaClass.simpleName)
-            promise?.resolve(result)
+            try {
+                promise?.resolve(result)
+            } catch (ignored: Exception) {}
         }
     }
     

package/android/Flir/src/main/java/flir/android/FlirSdkManager.java

@@ -83,7 +83,7 @@ public class FlirSdkManager {
         void onSnapshotError(String message);
     }
 
-    private SnapshotCallback snapshotCallback;
+    private volatile SnapshotCallback snapshotCallback;
 
     private FlirSdkManager(Context context) {
         this.context = context.getApplicationContext();
@@ -470,11 +470,13 @@ public class FlirSdkManager {
                                                 Log.i(TAG, "[SNAPSHOT] ✅ Success: Radiometric snapshot saved");
                                                 if (snapshotCallback != null) {
                                                     snapshotCallback.onSnapshotSaved(snapshotPath);
+                                                    snapshotCallback = null;
                                                 }
                                             } catch (java.io.IOException e) {
                                                 Log.e(TAG, "Failed to save radiometric snapshot", e);
                                                 if (snapshotCallback != null) {
                                                     snapshotCallback.onSnapshotError(e.getMessage());
+                                                    snapshotCallback = null;
                                                 }
                                             }
                                         }

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

@@ -28,10 +28,8 @@ class FlirView(context: ThemedReactContext) : FrameLayout(context) {
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        // Let the centralized manager handle discovery and streaming and emit events
-        try {
-            FlirManager.startDiscoveryAndConnect(context as ThemedReactContext)
-        } catch (ignored: Throwable) {}
+        // GATING: Automatic discovery on attach is disabled to enforce manual discovery
+        // FlirManager.startDiscoveryAndConnect(context as ThemedReactContext)
     }
 
     override fun onDetachedFromWindow() {

package/ios/Flir/src/FlirManager.swift

@@ -66,6 +66,9 @@ import ThermalSDK
     // Internal synchronization
     private let stateLock = NSObject()
     
+    // Manual gating
+    @objc public var manualOnly: Bool = true
+    
     // Palette and Snapshot state
     private var currentPaletteName: String = "WhiteHot"
     private var pendingSnapshotPath: String?
@@ -113,7 +116,12 @@ import ThermalSDK
     // MARK: - Discovery
     
     @objc public func startDiscovery() {
-        NSLog("[FlirManager] startDiscovery")
+        if manualOnly {
+            NSLog("[FlirManager] 🔭 Discovery blocked: manualOnly is enabled. Use startManualDiscovery() or disable the gate.")
+            return
+        }
+        
+        NSLog("[FlirManager] 🔭 startDiscovery (manualOnly=false)")
         
 #if FLIR_ENABLED
         discoveredDevices.removeAll()
@@ -133,6 +141,14 @@ import ThermalSDK
 #endif
     }
     
+    /// Explicitly starts discovery regardless of manualOnly flag.
+    /// Use this for JS-triggered scans.
+    @objc public func startManualDiscovery() {
+        NSLog("[FlirManager] 🔭 Manual discovery requested - opening gate.")
+        manualOnly = false
+        startDiscovery()
+    }
+    
     @objc public func stopDiscovery() {
         objc_sync_enter(stateLock); defer { objc_sync_exit(stateLock) }
         NSLog("[FlirManager] stopDiscovery")

package/ios/Flir/src/FlirModule.m

@@ -151,13 +151,15 @@ RCT_EXPORT_METHOD(startDiscovery : (RCTPromiseResolveBlock)
   dispatch_async(dispatch_get_main_queue(), ^{
     id manager = flir_manager_shared();
     if (manager &&
-        [manager respondsToSelector:sel_registerName("startDiscovery")]) {
-      NSLog(@"[FlirModule] [%@] ⏱ Calling FlirManager.startDiscovery",
+        [manager respondsToSelector:sel_registerName("startManualDiscovery")]) {
+      NSLog(@"[FlirModule] [%@] ⏱ Calling FlirManager.startManualDiscovery",
             [NSDate date]);
+      ((void (*)(id, SEL))objc_msgSend)(manager,
+                                         sel_registerName("startManualDiscovery"));
+    } else if (manager && [manager respondsToSelector:sel_registerName("startDiscovery")]) {
+      // Fallback for older manager versions
       ((void (*)(id, SEL))objc_msgSend)(manager,
                                          sel_registerName("startDiscovery"));
-      NSLog(@"[FlirModule] [%@] ⏱ FlirManager.startDiscovery returned",
-            [NSDate date]);
     }
     if (resolve) resolve(@(YES));
   });
@@ -291,6 +293,11 @@ RCT_EXPORT_METHOD(startEmulator : (NSString *)emulatorType resolver : (
       ((void (*)(id, SEL, id))objc_msgSend)(
           manager, sel_registerName("startEmulatorWithType:"), emulatorType ?: @"FLIR_ONE_EDGE");
 
+      // Opening the gate for emulator discovery too
+      if ([manager respondsToSelector:sel_registerName("setManualOnly:")]) {
+          ((void (*)(id, SEL, BOOL))objc_msgSend)(manager, sel_registerName("setManualOnly:"), NO);
+      }
+
       // Resolve immediately - connection status will come via events
       if (resolve) resolve(@(YES));
     } else {
@@ -445,7 +452,10 @@ RCT_EXPORT_METHOD(resumeFlirAfterPreview : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
     id manager = flir_manager_shared();
-    if (manager && [manager respondsToSelector:sel_registerName("startDiscovery")]) {
+    if (manager && [manager respondsToSelector:sel_registerName("startManualDiscovery")]) {
+      atomic_store(&_isCapturing, true);
+      ((void (*)(id, SEL))objc_msgSend)(manager, sel_registerName("startManualDiscovery"));
+    } else if (manager && [manager respondsToSelector:sel_registerName("startDiscovery")]) {
       atomic_store(&_isCapturing, true);
       ((void (*)(id, SEL))objc_msgSend)(manager, sel_registerName("startDiscovery"));
     }
@@ -455,6 +465,17 @@ RCT_EXPORT_METHOD(resumeFlirAfterPreview : (RCTPromiseResolveBlock)
 
 
 
+RCT_EXPORT_METHOD(setManualDiscoveryOnly : (BOOL)enabled resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    id manager = flir_manager_shared();
+    if (manager && [manager respondsToSelector:sel_registerName("setManualOnly:")]) {
+      ((void (*)(id, SEL, BOOL))objc_msgSend)(manager, sel_registerName("setManualOnly:"), enabled);
+    }
+    if (resolve) resolve(@(YES));
+  });
+}
+
 RCT_EXPORT_METHOD(getSDKStatus : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   if (resolve) resolve(@{@"available" : @(YES), @"arch" : @"arm64", @"platform" : @"iOS"});

package/package.json

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