ilabs-flir 1.0.7 → 2.0.3

package/ios/Flir/SDKLoader/FlirSDKLoader.m

@@ -1,13 +1,27 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
-
-@interface RCT_EXTERN_MODULE(FlirDownloadManager, RCTEventEmitter)
-
-RCT_EXTERN_METHOD(isFlirAvailable:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(getDownloadSize:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(downloadFlirSDK:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(cancelDownload)
-RCT_EXTERN_METHOD(loadFlirFramework:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(deleteSDK:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-
-@end
+//
+//  FlirSDKLoader.m
+//  Flir
+//
+//  React Native bridge for FLIR SDK download manager
+//
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface RCT_EXTERN_MODULE (FlirDownloadManager, RCTEventEmitter)
+
+RCT_EXTERN_METHOD(isFlirAvailable : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getDownloadSize : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(downloadFlirSDK : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(cancelDownload)
+RCT_EXTERN_METHOD(loadFlirFramework : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(deleteSDK : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getSDKInfo : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject)
+
+@end

package/ios/Flir/SDKLoader/FlirSDKLoader.swift

@@ -1,175 +1,294 @@
-import Foundation
-import CommonCrypto
-
-@objc(FlirSDKLoader)
-public class FlirSDKLoader: RCTEventEmitter {
-    
-    private var downloadTask: URLSessionDownloadTask?
-    private var progressObservation: NSKeyValueObservation?
-    
-    // MARK: - SDK Paths
-    
-    private static var sdkDirectory: URL {
-        FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
-            .appendingPathComponent("FlirSDK", isDirectory: true)
-    }
-    
-    private static var thermalSDKPath: URL {
-        sdkDirectory.appendingPathComponent("ThermalSDK.framework")
-    }
-    
-    // MARK: - RCTEventEmitter
-    
-    override public static func moduleName() -> String! { "FlirDownloadManager" }
-    override public static func requiresMainQueueSetup() -> Bool { false }
-    override public func supportedEvents() -> [String]! {
-        ["FlirDownloadProgress", "FlirDownloadComplete", "FlirDownloadError"]
-    }
-    
-    // MARK: - Public API
-    
-    @objc func isFlirAvailable(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-        resolve(FileManager.default.fileExists(atPath: Self.thermalSDKPath.path))
-    }
-    
-    @objc func getDownloadSize(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-        guard let manifest = loadManifest() else {
-            resolve(104_857_600)
-            return
-        }
-        resolve(manifest.ios.sizeBytes)
-    }
-    
-    @objc func downloadFlirSDK(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        guard let manifest = loadManifest() else {
-            reject("E_MANIFEST", "Failed to load SDK manifest", nil)
-            return
-        }
-        
-        guard let url = URL(string: manifest.ios.downloadUrl) else {
-            reject("E_URL", "Invalid download URL", nil)
-            return
-        }
-        
-        let session = URLSession(configuration: .default)
-        downloadTask = session.downloadTask(with: url) { [weak self] tempURL, response, error in
-            guard let self = self else { return }
-            
-            if let error = error {
-                self.sendEvent(withName: "FlirDownloadError", body: ["error": error.localizedDescription])
-                reject("E_DOWNLOAD", error.localizedDescription, error)
-                return
-            }
-            
-            guard let tempURL = tempURL else {
-                self.sendEvent(withName: "FlirDownloadError", body: ["error": "No data received"])
-                reject("E_NODATA", "No data received", nil)
-                return
-            }
-            
-            do {
-                // Verify checksum
-                let data = try Data(contentsOf: tempURL)
-                let hash = self.sha256(data)
-                guard hash == manifest.ios.sha256 else {
-                    throw NSError(domain: "FlirSDK", code: -1, 
-                        userInfo: [NSLocalizedDescriptionKey: "Checksum verification failed"])
-                }
-                
-                // Create SDK directory
-                try FileManager.default.createDirectory(at: Self.sdkDirectory, 
-                    withIntermediateDirectories: true)
-                
-                // Unzip
-                try self.unzip(tempURL, to: Self.sdkDirectory)
-                
-                self.sendEvent(withName: "FlirDownloadComplete", body: [:])
-                resolve(true)
-            } catch {
-                self.sendEvent(withName: "FlirDownloadError", body: ["error": error.localizedDescription])
-                reject("E_INSTALL", error.localizedDescription, error)
-            }
-        }
-        
-        // Observe progress
-        progressObservation = downloadTask?.progress.observe(\.fractionCompleted) { [weak self] progress, _ in
-            let totalBytes = Int64(104_857_600)
-            let downloaded = Int64(Double(totalBytes) * progress.fractionCompleted)
-            self?.sendEvent(withName: "FlirDownloadProgress", body: [
-                "bytesDownloaded": downloaded,
-                "totalBytes": totalBytes,
-                "percent": progress.fractionCompleted * 100
-            ])
-        }
-        
-        downloadTask?.resume()
-    }
-    
-    @objc func cancelDownload() {
-        downloadTask?.cancel()
-        progressObservation?.invalidate()
-    }
-    
-    @objc func loadFlirFramework(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-        let binaryPath = Self.thermalSDKPath.appendingPathComponent("ThermalSDK").path
-        
-        guard let handle = dlopen(binaryPath, RTLD_NOW | RTLD_GLOBAL) else {
-            let error = String(cString: dlerror())
-            reject("E_LOAD", "Failed to load SDK: \(error)", nil)
-            return
-        }
-        
-        resolve(true)
-    }
-    
-    @objc func deleteSDK(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-        do {
-            try FileManager.default.removeItem(at: Self.sdkDirectory)
-            resolve(true)
-        } catch {
-            reject("E_DELETE", error.localizedDescription, error)
-        }
-    }
-    
-    // MARK: - Helpers
-    
-    private func loadManifest() -> SDKManifest? {
-        guard let bundle = Bundle(identifier: "org.cocoapods.Flir"),
-              let url = bundle.url(forResource: "sdk-manifest", withExtension: "json"),
-              let data = try? Data(contentsOf: url),
-              let manifest = try? JSONDecoder().decode(SDKManifest.self, from: data)
-        else { return nil }
-        return manifest
-    }
-    
-    private func sha256(_ data: Data) -> String {
-        var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
-        data.withUnsafeBytes { _ = CC_SHA256($0.baseAddress, CC_LONG(data.count), &hash) }
-        return hash.map { String(format: "%02x", $0) }.joined()
-    }
-    
-    private func unzip(_ source: URL, to destination: URL) throws {
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: "/usr/bin/unzip")
-        process.arguments = ["-o", "-q", source.path, "-d", destination.path]
-        try process.run()
-        process.waitUntilExit()
-        guard process.terminationStatus == 0 else {
-            throw NSError(domain: "FlirSDK", code: Int(process.terminationStatus),
-                userInfo: [NSLocalizedDescriptionKey: "Unzip failed"])
-        }
-    }
-}
-
-// MARK: - Models
-
-private struct SDKManifest: Codable {
-    let version: String
-    let ios: IOSManifest
-    
-    struct IOSManifest: Codable {
-        let downloadUrl: String
-        let sha256: String
-        let sizeBytes: Int64
-    }
-}
+import Foundation
+import CommonCrypto
+
+#if canImport(React)
+import React
+#endif
+
+/// FlirSDKLoader - Handles on-demand download of FLIR SDK xcframeworks
+@objc(FlirSDKLoader)
+public class FlirSDKLoader: RCTEventEmitter {
+    
+    private var downloadTask: URLSessionDownloadTask?
+    private var progressObservation: NSKeyValueObservation?
+    
+    // MARK: - SDK Paths
+    
+    private static var sdkDirectory: URL {
+        FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
+            .appendingPathComponent("FlirSDK", isDirectory: true)
+    }
+    
+    private static var thermalSDKPath: URL {
+        sdkDirectory.appendingPathComponent("ThermalSDK.xcframework")
+    }
+    
+    private static var legacyThermalSDKPath: URL {
+        sdkDirectory.appendingPathComponent("ThermalSDK.framework")
+    }
+    
+    // MARK: - RCTEventEmitter
+    
+    override public static func moduleName() -> String! { "FlirDownloadManager" }
+    override public static func requiresMainQueueSetup() -> Bool { false }
+    override public func supportedEvents() -> [String]! {
+        ["FlirDownloadProgress", "FlirDownloadComplete", "FlirDownloadError"]
+    }
+    
+    // MARK: - Public API
+    
+    /// Check if the FLIR SDK is available (downloaded)
+    @objc func isFlirAvailable(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        // Check for both xcframework (new) and framework (legacy)
+        let xcframeworkExists = FileManager.default.fileExists(atPath: Self.thermalSDKPath.path)
+        let frameworkExists = FileManager.default.fileExists(atPath: Self.legacyThermalSDKPath.path)
+        resolve(xcframeworkExists || frameworkExists)
+    }
+    
+    /// Get the expected download size
+    @objc func getDownloadSize(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        guard let manifest = loadManifest() else {
+            // Fallback estimate (~100MB)
+            resolve(104_857_600)
+            return
+        }
+        resolve(manifest.ios.sizeBytes)
+    }
+    
+    /// Download the FLIR SDK
+    @objc func downloadFlirSDK(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let manifest = loadManifest() else {
+            reject("E_MANIFEST", "Failed to load SDK manifest", nil)
+            return
+        }
+        
+        guard let url = URL(string: manifest.ios.downloadUrl) else {
+            reject("E_URL", "Invalid download URL", nil)
+            return
+        }
+        
+        NSLog("[FlirSDKLoader] Starting download from: \(url)")
+        
+        let session = URLSession(configuration: .default)
+        downloadTask = session.downloadTask(with: url) { [weak self] tempURL, response, error in
+            guard let self = self else { return }
+            
+            if let error = error {
+                NSLog("[FlirSDKLoader] Download error: \(error)")
+                self.sendEvent(withName: "FlirDownloadError", body: ["error": error.localizedDescription])
+                reject("E_DOWNLOAD", error.localizedDescription, error)
+                return
+            }
+            
+            guard let tempURL = tempURL else {
+                self.sendEvent(withName: "FlirDownloadError", body: ["error": "No data received"])
+                reject("E_NODATA", "No data received", nil)
+                return
+            }
+            
+            do {
+                // Verify checksum if provided
+                let data = try Data(contentsOf: tempURL)
+                if !manifest.ios.sha256.isEmpty {
+                    let hash = self.sha256(data)
+                    guard hash == manifest.ios.sha256 else {
+                        throw NSError(domain: "FlirSDK", code: -1, 
+                            userInfo: [NSLocalizedDescriptionKey: "Checksum verification failed (expected: \(manifest.ios.sha256), got: \(hash))"])
+                    }
+                    NSLog("[FlirSDKLoader] Checksum verified")
+                }
+                
+                // Create SDK directory
+                try FileManager.default.createDirectory(at: Self.sdkDirectory, 
+                    withIntermediateDirectories: true)
+                
+                // Unzip
+                try self.unzip(tempURL, to: Self.sdkDirectory)
+                
+                NSLog("[FlirSDKLoader] SDK installed successfully to: \(Self.sdkDirectory.path)")
+                self.sendEvent(withName: "FlirDownloadComplete", body: [:])
+                resolve(true)
+            } catch {
+                NSLog("[FlirSDKLoader] Installation error: \(error)")
+                self.sendEvent(withName: "FlirDownloadError", body: ["error": error.localizedDescription])
+                reject("E_INSTALL", error.localizedDescription, error)
+            }
+        }
+        
+        // Observe progress
+        progressObservation = downloadTask?.progress.observe(\.fractionCompleted) { [weak self] progress, _ in
+            let totalBytes = Int64(manifest.ios.sizeBytes > 0 ? manifest.ios.sizeBytes : 104_857_600)
+            let downloaded = Int64(Double(totalBytes) * progress.fractionCompleted)
+            self?.sendEvent(withName: "FlirDownloadProgress", body: [
+                "bytesDownloaded": downloaded,
+                "totalBytes": totalBytes,
+                "percent": progress.fractionCompleted * 100
+            ])
+        }
+        
+        downloadTask?.resume()
+    }
+    
+    /// Cancel any ongoing download
+    @objc func cancelDownload() {
+        downloadTask?.cancel()
+        progressObservation?.invalidate()
+        NSLog("[FlirSDKLoader] Download cancelled")
+    }
+    
+    /// Attempt to dynamically load the FLIR framework
+    @objc func loadFlirFramework(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        // Try xcframework first (new format)
+        var binaryPath = Self.thermalSDKPath.appendingPathComponent("ios-arm64/ThermalSDK.framework/ThermalSDK").path
+        
+        if !FileManager.default.fileExists(atPath: binaryPath) {
+            // Try legacy framework format
+            binaryPath = Self.legacyThermalSDKPath.appendingPathComponent("ThermalSDK").path
+        }
+        
+        guard FileManager.default.fileExists(atPath: binaryPath) else {
+            reject("E_NOTFOUND", "SDK binary not found at: \(binaryPath)", nil)
+            return
+        }
+        
+        guard let handle = dlopen(binaryPath, RTLD_NOW | RTLD_GLOBAL) else {
+            let error = String(cString: dlerror())
+            reject("E_LOAD", "Failed to load SDK: \(error)", nil)
+            return
+        }
+        
+        NSLog("[FlirSDKLoader] SDK loaded successfully")
+        resolve(true)
+    }
+    
+    /// Delete the downloaded SDK to free up space
+    @objc func deleteSDK(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        do {
+            if FileManager.default.fileExists(atPath: Self.sdkDirectory.path) {
+                try FileManager.default.removeItem(at: Self.sdkDirectory)
+                NSLog("[FlirSDKLoader] SDK deleted")
+            }
+            resolve(true)
+        } catch {
+            reject("E_DELETE", error.localizedDescription, error)
+        }
+    }
+    
+    /// Get SDK installation path info
+    @objc func getSDKInfo(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        let fm = FileManager.default
+        var info: [String: Any] = [
+            "sdkDirectory": Self.sdkDirectory.path,
+            "xcframeworkPath": Self.thermalSDKPath.path,
+            "frameworkPath": Self.legacyThermalSDKPath.path,
+            "xcframeworkExists": fm.fileExists(atPath: Self.thermalSDKPath.path),
+            "frameworkExists": fm.fileExists(atPath: Self.legacyThermalSDKPath.path)
+        ]
+        
+        // Get directory size if exists
+        if fm.fileExists(atPath: Self.sdkDirectory.path) {
+            if let size = directorySize(Self.sdkDirectory) {
+                info["sizeBytes"] = size
+                info["sizeMB"] = Double(size) / 1_000_000.0
+            }
+        }
+        
+        resolve(info)
+    }
+    
+    // MARK: - Helpers
+    
+    private func loadManifest() -> SDKManifest? {
+        // Try to load from bundle resources
+        let bundles = [
+            Bundle(identifier: "org.cocoapods.Flir"),
+            Bundle(for: FlirSDKLoader.self),
+            Bundle.main
+        ].compactMap { $0 }
+        
+        for bundle in bundles {
+            if let url = bundle.url(forResource: "sdk-manifest", withExtension: "json"),
+               let data = try? Data(contentsOf: url),
+               let manifest = try? JSONDecoder().decode(SDKManifest.self, from: data) {
+                return manifest
+            }
+            
+            // Also try resourceBundle
+            if let resourceBundle = bundle.url(forResource: "FlirSDKResources", withExtension: "bundle"),
+               let rb = Bundle(url: resourceBundle),
+               let url = rb.url(forResource: "sdk-manifest", withExtension: "json"),
+               let data = try? Data(contentsOf: url),
+               let manifest = try? JSONDecoder().decode(SDKManifest.self, from: data) {
+                return manifest
+            }
+        }
+        
+        NSLog("[FlirSDKLoader] Warning: Could not find sdk-manifest.json")
+        return nil
+    }
+    
+    private func sha256(_ data: Data) -> String {
+        var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
+        data.withUnsafeBytes { _ = CC_SHA256($0.baseAddress, CC_LONG(data.count), &hash) }
+        return hash.map { String(format: "%02x", $0) }.joined()
+    }
+    
+    private func unzip(_ source: URL, to destination: URL) throws {
+        // let process = Process()
+        // process.executableURL = URL(fileURLWithPath: "/usr/bin/unzip")
+        // process.arguments = ["-o", "-q", source.path, "-d", destination.path]
+        // try process.run()
+        // process.waitUntilExit()
+        // guard process.terminationStatus == 0 else {
+        //     throw NSError(domain: "FlirSDK", code: Int(process.terminationStatus),
+        //         userInfo: [NSLocalizedDescriptionKey: "Unzip failed with exit code \(process.terminationStatus)"])
+        // }
+    }
+    
+    private func directorySize(_ url: URL) -> Int64? {
+        guard let enumerator = FileManager.default.enumerator(at: url, includingPropertiesForKeys: [.fileSizeKey]) else {
+            return nil
+        }
+        
+        var total: Int64 = 0
+        for case let fileURL as URL in enumerator {
+            if let values = try? fileURL.resourceValues(forKeys: [.fileSizeKey]),
+               let size = values.fileSize {
+                total += Int64(size)
+            }
+        }
+        return total
+    }
+}
+
+// MARK: - Models
+
+private struct SDKManifest: Codable {
+    let version: String
+    let ios: IOSManifest
+    
+    struct IOSManifest: Codable {
+        let downloadUrl: String
+        let sha256: String
+        let sizeBytes: Int64
+        let xcframeworks: [String]?
+        let minDeploymentTarget: String?
+        
+        enum CodingKeys: String, CodingKey {
+            case downloadUrl
+            case sha256
+            case sizeBytes
+            case xcframeworks
+            case minDeploymentTarget
+        }
+        
+        init(from decoder: Decoder) throws {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            downloadUrl = try container.decode(String.self, forKey: .downloadUrl)
+            sha256 = try container.decodeIfPresent(String.self, forKey: .sha256) ?? ""
+            sizeBytes = try container.decodeIfPresent(Int64.self, forKey: .sizeBytes) ?? 0
+            xcframeworks = try container.decodeIfPresent([String].self, forKey: .xcframeworks)
+            minDeploymentTarget = try container.decodeIfPresent(String.self, forKey: .minDeploymentTarget)
+        }
+    }
+}

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

@@ -0,0 +1,34 @@
+//
+//  Flir-Bridging-Header.h
+//  Flir
+//
+//  Bridging header for Swift/Objective-C interoperability
+//  Note: This header is used when building the package as part of an app
+//
+
+#ifndef Flir_Bridging_Header_h
+#define Flir_Bridging_Header_h
+
+// 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>)
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+#import <React/RCTLog.h>
+#import <React/RCTViewManager.h>
+#endif
+
+// FLIR module headers (local)
+#import "FlirEventEmitter.h"
+#import "FlirModule.h"
+#import "FlirPreviewView.h"
+#import "FlirState.h"
+#import "FlirViewManager.h"
+
+// ThermalSDK if available
+#if __has_include(<ThermalSDK/ThermalSDK.h>)
+#import <ThermalSDK/ThermalSDK.h>
+#define FLIR_SDK_AVAILABLE 1
+#endif
+
+#endif /* Flir_Bridging_Header_h */

package/ios/Flir/src/FlirEventEmitter.h

@@ -1,12 +1,25 @@
-#import <React/RCTEventEmitter.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FlirEventEmitter : RCTEventEmitter <RCTBridgeModule>
-
-+ (instancetype)shared;
-- (void)sendDeviceEvent:(NSString *)name body:(id)body;
-
-@end
-
-NS_ASSUME_NONNULL_END
+//
+//  FlirEventEmitter.h
+//  Flir
+//
+//  Event emitter for sending FLIR events to React Native
+//
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FlirEventEmitter : RCTEventEmitter <RCTBridgeModule>
+
+/// Shared singleton instance (set after module initialization)
++ (nullable instancetype)shared;
+
+/// Send an event to JavaScript
+/// @param name Event name
+/// @param body Event payload
+- (void)sendDeviceEvent:(NSString *)name body:(id)body;
+
+@end
+
+NS_ASSUME_NONNULL_END