ilabs-flir 2.4.7 → 2.4.8

package/Flir.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Flir'
-  s.version      = '2.2.31'
+  s.version      = '2.4.8'
   s.summary      = 'FLIR Thermal SDK React Native - Bundled via postinstall'
   s.description  = <<-DESC
     A React Native wrapper for the FLIR Thermal SDK, providing thermal imaging

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

@@ -387,6 +387,8 @@ object FlirManager {
             }
             ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
                 .emit("FlirDeviceConnected", params)
+            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("FlirStateChanged", params)
         } catch (e: Exception) { }
     }
     

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

@@ -86,7 +86,37 @@ public class FlirSdkManager {
     private volatile SnapshotCallback snapshotCallback;
 
     private FlirSdkManager(Context context) {
-        this.context = context.getApplicationContext();
+        // We wrap the Application context to intercept and swallow IllegalArgumentException
+        // during unregisterReceiver. The FLIR SDK has a bug in WifiScanner where it attempts
+        // to unregister a receiver that wasn't registered, which bubbles up to JNI and crashes
+        // the app via std::terminate.
+        this.context = new android.content.ContextWrapper(context.getApplicationContext()) {
+            @Override
+            public Context getApplicationContext() {
+                return this;
+            }
+
+            @Override
+            public android.content.Intent registerReceiver(android.content.BroadcastReceiver receiver, android.content.IntentFilter filter) {
+                try {
+                    return super.registerReceiver(receiver, filter);
+                } catch (Exception e) {
+                    Log.w(TAG, "Suppressed registerReceiver error: " + e.getMessage());
+                    return null;
+                }
+            }
+
+            @Override
+            public void unregisterReceiver(android.content.BroadcastReceiver receiver) {
+                try {
+                    super.unregisterReceiver(receiver);
+                } catch (IllegalArgumentException e) {
+                    Log.w(TAG, "Suppressed SDK crash: Receiver not registered: " + e.getMessage());
+                } catch (Exception e) {
+                    Log.w(TAG, "Suppressed unregisterReceiver error: " + e.getMessage());
+                }
+            }
+        };
     }
 
     public static synchronized FlirSdkManager getInstance(Context context) {
@@ -106,8 +136,51 @@ public class FlirSdkManager {
         if (isInitialized.compareAndSet(false, true)) {
             Log.d(TAG, "Initializing FLIR SDK (async)...");
             
+            // Register a main thread looper protector to completely safeguard against WifiScanner supplicant receiver crashes
+            new android.os.Handler(android.os.Looper.getMainLooper()).post(new Runnable() {
+                @Override
+                public void run() {
+                    while (true) {
+                        try {
+                            android.os.Looper.loop();
+                        } catch (Throwable t) {
+                            String msg = t.getMessage();
+                            boolean isSuppressed = false;
+                            
+                            // Check if this is the notorious FLIR supplicant receiver crash
+                            if (t instanceof RuntimeException && t.getCause() instanceof IllegalArgumentException) {
+                                String causeMsg = t.getCause().getMessage();
+                                if (causeMsg != null && (causeMsg.contains("Receiver not registered") || causeMsg.contains("WifiScanner"))) {
+                                    isSuppressed = true;
+                                }
+                            } else if (msg != null && (msg.contains("Receiver not registered") || msg.contains("WifiScanner") || msg.contains("supplicant.STATE_CHANGE"))) {
+                                isSuppressed = true;
+                            }
+                            
+                            if (isSuppressed) {
+                                Log.w(TAG, "🔒 [FLIR LOOPER PROTECTOR] Intercepted and swallowed broadcast receiver crash: " + t.getMessage());
+                            } else {
+                                // For all other unexpected exceptions, forward to the standard uncaught exception handler
+                                Thread.UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
+                                if (handler != null) {
+                                    handler.uncaughtException(Thread.currentThread(), t);
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+            });
+
             executor.execute(() -> {
                 try {
+                    try {
+                        System.loadLibrary("c++_flir");
+                        Log.d(TAG, "Successfully loaded legacy libc++_flir.so for FLIR SDK.");
+                    } catch (UnsatisfiedLinkError e) {
+                        Log.e(TAG, "Could not explicitly load libc++_flir.so. FLIR initialization might fail.", e);
+                    }
+                    
                     ThermalSdkAndroid.init(context);
                     
                     // Small delay to ensure JNI linkage is stable

package/ios/Flir/src/FlirManager.swift

@@ -203,54 +203,39 @@ import ThermalSDK
             let camType = identity.cameraType()
             NSLog("[FlirManager] Camera type: \(camType.rawValue), interface: \(iface.rawValue)")
             
-            // ── AUTHENTICATE for network cameras ──
-            // Official FLIR CameraConnector sample checks .generic camera type,
-            // but FLIR One Edge Pro over network may report a different type.
-            // Check BOTH: camera type == .generic OR interface contains .network/.flirOneWireless
-            let needsAuth = (camType == .generic) || iface.contains(.network) || iface.contains(.flirOneWireless)
+            let isNetwork = (camType == .generic) || iface.contains(.network)
             
-            if needsAuth {
-                NSLog("[FlirManager] Network camera detected — authenticating...")
-                
-                // Use UUID-based persistent certificate name (matches FLIR sample).
-                // The camera has a bug where re-auth with a different name can conflict,
-                // so we generate a UUID once and persist it in UserDefaults.
-                let certName = self.getPersistentCertificateName()
-                NSLog("[FlirManager] Using certificate name: \(certName)")
+            // ── STEP 1: INITIAL TRUST HANDSHAKE (Network Cameras Only) ──
+            // DiscoverySampleSwift shows that for network cameras we first authenticate
+            // with a user-friendly device/app name to trigger the "Trust this device" prompt.
+            if isNetwork {
+                NSLog("[FlirManager] Network camera detected — initiating initial trust request...")
+                let appName = Bundle.main.infoDictionary?[kCFBundleNameKey as String] as? String ?? "AppFactory"
+                let trustName = "\(UIDevice.current.name) \(appName)"
                 
                 var status = FLIRAuthenticationStatus.pending
                 var attempts = 0
-                let maxAttempts = 30 // ~30 seconds timeout
+                let maxAttempts = 15 // 15 seconds window for initial prompt
                 
                 while status == .pending && attempts < maxAttempts {
-                    status = cam.authenticate(identity, trustedConnectionName: certName)
-                    NSLog("[FlirManager] Auth attempt \(attempts + 1)/\(maxAttempts) status: \(status.rawValue)")
-                    
+                    status = cam.authenticate(identity, trustedConnectionName: trustName)
+                    NSLog("[FlirManager] Initial trust attempt \(attempts + 1)/\(maxAttempts) status: \(status.rawValue)")
                     if status == .pending {
-                        // Camera waiting for user to press "Trust" on its screen
                         Thread.sleep(forTimeInterval: 1.0)
                     }
                     attempts += 1
                 }
-                
-                if status != .approved {
-                    NSLog("[FlirManager] Authentication failed/timed out: \(status.rawValue)")
-                    self.camera = nil
-                    DispatchQueue.main.async {
-                        self.emitStateChange("connection_failed")
-                        self.delegate?.onError("Camera authentication failed. Check the camera screen for a trust/approve prompt.")
-                    }
-                    return
-                }
-                NSLog("[FlirManager] Authentication approved ✅")
             }
             
-            // ── PAIR ──
+            // ── STEP 2: PAIRING (Always do this before final authentication!) ──
+            // Both FLIROneCameraSwift and DiscoverySampleSwift require pairing to be established
+            // before the camera's communication channels are authenticated and connected.
             do {
+                NSLog("[FlirManager] Pairing camera with code 0...")
                 try cam.pair(identity, code: 0)
-                NSLog("[FlirManager] Pair succeeded")
+                NSLog("[FlirManager] Pairing succeeded ✅")
             } catch {
-                NSLog("[FlirManager] Pair failed: \(error)")
+                NSLog("[FlirManager] Pairing failed: \(error)")
                 self._isConnected = false
                 self.camera = nil
                 DispatchQueue.main.async {
@@ -260,6 +245,37 @@ import ThermalSDK
                 return
             }
             
+            // ── STEP 3: FINAL AUTHENTICATION ──
+            // Use a persistent UUID certificate for network/wireless cameras to avoid trust conflicts.
+            // For standard classic FLIR ONE/Edge devices, use "dummy" as per FLIROneCameraSwift ViewController.swift.
+            let certName = isNetwork ? self.getPersistentCertificateName() : "dummy"
+            NSLog("[FlirManager] Performing final authentication with name: \(certName)")
+            
+            var status = FLIRAuthenticationStatus.pending
+            var attempts = 0
+            let maxAttempts = 30 // ~30 seconds timeout
+            
+            while status == .pending && attempts < maxAttempts {
+                status = cam.authenticate(identity, trustedConnectionName: certName)
+                NSLog("[FlirManager] Final auth attempt \(attempts + 1)/\(maxAttempts) status: \(status.rawValue)")
+                
+                if status == .pending {
+                    Thread.sleep(forTimeInterval: 1.0)
+                }
+                attempts += 1
+            }
+            
+            if status != .approved && isNetwork {
+                NSLog("[FlirManager] Final authentication failed or timed out: \(status.rawValue)")
+                self.camera = nil
+                DispatchQueue.main.async {
+                    self.emitStateChange("connection_failed")
+                    self.delegate?.onError("Camera authentication failed. Check the camera screen for a trust/approve prompt.")
+                }
+                return
+            }
+            NSLog("[FlirManager] Authentication approved ✅")
+            
             // ── CONNECT ──
             do {
                 try cam.connect()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.4.7",
+  "version": "2.4.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",